Merge pull request 'feature/51-teamoverview-badge-org' (#59 ) from feature/51-teamoverview-badge-org into dev

Reviewed-on: #59 close #51
😬 use actual team id for RunnersOverview badge
2021-02-07 12:12:57 +00:00 · 2021-02-07 12:18:34 +01:00 · 2021-02-07 12:11:09 +01:00 · 2021-01-30 17:56:58 +01:00 · 2021-01-30 17:56:40 +01:00
2 changed files with 16 additions and 8 deletions
--- a/src/components/RunnersOverview.svelte
+++ b/src/components/RunnersOverview.svelte
@@ -86,7 +86,16 @@
                    {/if}
                  </td>
                  <td class="px-6 py-4 whitespace-nowrap">
-                    {runner.group.name}
+                    {#if runner.group.responseType === 'RUNNERTEAM'}
+                      <a
+                        href="../teams/{runner.group.id}"
+                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{runner.group.name}</a>
+                    {/if}
+                    {#if runner.group.responseType === 'RUNNERORGANIZATION'}
+                      <a
+                        href="../orgs/{runner.group.id}"
+                        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{runner.group.name}</a>
+                    {/if}
                  </td>
                  <td class="px-6 py-4 whitespace-nowrap">{runner.distance}</td>
                  {#if active_deletes[runner.id] === true}
--- a/src/components/TeamsOverview.svelte
+++ b/src/components/TeamsOverview.svelte
@@ -80,8 +80,7 @@
                  <td class="px-6 py-4 whitespace-nowrap">
                    <div class="flex items-center">
                      <div class="ml-4">
-                        <div
-                          class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
                          {t.name}
                        </div>
                      </div>
@@ -90,10 +89,11 @@
                  <td class="px-6 py-4 whitespace-nowrap">
                    <div class="flex items-center">
                      <div class="ml-4">
-                        <div
-                          class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
                          {#if t.parentGroup}
-                            {t.parentGroup.name}
+                            <a
+                              href="../orgs/{t.parentGroup.id}"
+                              class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{t.parentGroup.name}</a>
                          {:else}no organization specified{/if}
                        </div>
                      </div>
@@ -102,8 +102,7 @@
                  <td class="px-6 py-4 whitespace-nowrap">
                    <div class="flex items-center">
                      <div class="ml-4">
-                        <div
-                          class="text-sm font-medium text-gray-900">
+                        <div class="text-sm font-medium text-gray-900">
                          {#if t.contact}
                            {JSON.stringify(t.contact)}
                          {:else}no contact specified{/if}
Author	SHA1	Message	Date
Philipp Dormann	e7291a31f3	Merge pull request 'feature/51-teamoverview-badge-org' (#59 ) from feature/51-teamoverview-badge-org into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #59 close #51	2021-02-07 12:12:57 +00:00
Philipp Dormann	1fac0c8640	😬 use actual team id for RunnersOverview badge ref #51	2021-02-07 12:18:34 +01:00
Philipp Dormann	f0be73c2cd	Merge commit '65f49489ad2e0cff30560e4c326ca7294d7f6190' into feature/51-teamoverview-badge-org	2021-02-07 12:11:09 +01:00
Philipp Dormann	a02be78df5	RunnersOverview badge to team/org ref #51	2021-01-30 17:56:58 +01:00
Philipp Dormann	3490abe9a7	Org badge in TeamsOverview ref #51	2021-01-30 17:56:40 +01:00