Merge pull request 'Added runner team's parentorg name to runenr overciew' (#129 ) from feature/128-runner_orgs into dev

Reviewed-on: #129
Switched to html entity
2021-04-08 17:29:27 +00:00 · 2021-04-08 18:00:47 +02:00 · 2021-04-08 17:58:49 +02:00 · 2021-04-08 17:34:32 +02:00 · 2021-04-08 17:34:04 +02:00 · 2021-04-08 17:30:23 +02:00
7 changed files with 56 additions and 24 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,27 @@
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 #### [0.12.4](https://git.odit.services/lfk/frontend/compare/0.12.3...0.12.4)
 - 🚑 [HOTFIX] - drop "svelte-infinite-loading" [`d0ab3dd`](https://git.odit.services/lfk/frontend/commit/d0ab3dda78bbad2cea18a2491056530897d56607)
 #### [0.12.3](https://git.odit.services/lfk/frontend/compare/0.12.2...0.12.3)
 > 8 April 2021
 - Merge pull request 'fix' (#126) from bugfix/125-mobile into dev [`#125`](https://git.odit.services/lfk/frontend/issues/125)
 - almost fixed... [`495a6b2`](https://git.odit.services/lfk/frontend/commit/495a6b22bd8036593f390bdb862d325524cefbcc)
 - 🐞 bugfix for svelte x tailwind class names [`b6b07cf`](https://git.odit.services/lfk/frontend/commit/b6b07cf30cc6533bd5dbfec1f813c16fde85634d)
 - fix [`0acaffb`](https://git.odit.services/lfk/frontend/commit/0acaffbdfa359e52654a5afe2788aa59fe6f9036)
 - 🚀RELEASE v0.12.3 [`d9cf51b`](https://git.odit.services/lfk/frontend/commit/d9cf51b4bbc2136594a03c5d0eeb8cb3f3440b2a)
 - custom css fix for collapsed_navigation [`ffbc243`](https://git.odit.services/lfk/frontend/commit/ffbc243194c7faeb4fe61c12711a1c441c3994ef)
 - new license file version [CI SKIP] [`aa17f24`](https://git.odit.services/lfk/frontend/commit/aa17f242209f7e7cecff774ace7a35b581adec1f)
 #### [0.12.2](https://git.odit.services/lfk/frontend/compare/0.12.1...0.12.2)
 > 7 April 2021
 - 🚀RELEASE v0.12.2 [`6043bc4`](https://git.odit.services/lfk/frontend/commit/6043bc45174d51ab110b0ed10a8679d96127ab87)
 - Merge pull request 'feature/110-virtual_list' (#124) from feature/110-virtual_list into dev [`e6ed066`](https://git.odit.services/lfk/frontend/commit/e6ed066e3ffabba6519f94d801d21a27819d0492)
 - wip on virtuallist [`6304116`](https://git.odit.services/lfk/frontend/commit/6304116edb7f5e3c7b67c15e0b1740d34c513155)
 - fixed height table [`4cad86c`](https://git.odit.services/lfk/frontend/commit/4cad86cf852468428d77103d052c6974b17c34c3)
--- a/index.html
+++ b/index.html
@@ -13,7 +13,7 @@
 </head>
 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.12.2-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.12.4-RELEASE_INFO</span>
  <noscript>You need to enable JavaScript to run this app.</noscript>
  <script src="/env.js"></script>
  <script type="module" src="/src/main.js"></script>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.12.2",
+	"version": "0.12.4",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev": "vite",
@@ -13,7 +13,7 @@
 		"check-password-strength": "2.0.2",
 		"@odit/lfk-client-js": "0.10.1",
 		"@odit/license-exporter": "0.0.11",
-		"@sveltejs/vite-plugin-svelte": "1.0.0-next.5",
+		"@sveltejs/vite-plugin-svelte": "1.0.0-next.6",
 		"@types/html-minifier": "4.0.0",
 		"auto-changelog": "2.2.1",
 		"autoprefixer": "10.2.5",
@@ -28,12 +28,12 @@
 		"svelte-i18n": "3.3.9",
 		"svelte-preprocess": "4.7.0",
 		"svelte-select": "3.17.0",
-		"tailwindcss": "2.0.4",
+		"tailwindcss": "2.1.1",
 		"tinro": "0.6.1",
 		"toastify-js": "1.10.0",
 		"validator": "13.5.2",
 		"vite": "2.1.5",
-		"vite-plugin-windicss": "0.12.2",
+		"vite-plugin-windicss": "0.12.5",
 		"xlsx": "0.16.9"
 	},
 	"release-it": {
--- a/public/licenses.json
+++ b/public/licenses.json
--- a/src/components/cards/CardsOverview.svelte
+++ b/src/components/cards/CardsOverview.svelte
@@ -1,6 +1,5 @@
 <script>
-  import { getLocaleFromNavigator, json, _ } from "svelte-i18n";
+  import { _ } from "svelte-i18n";
  import InfiniteLoading from 'svelte-infinite-loading';
  import { RunnerCardService } from "@odit/lfk-client-js";
  import store from "../../store";
  import Toastify from "toastify-js";
--- a/src/components/dashboard/Dashboard.svelte
+++ b/src/components/dashboard/Dashboard.svelte
@@ -12,11 +12,21 @@
  }
 </script>
 <style>
  .collapsed_navigation {
    transform: translateX(-100%);
  }
  @media (min-width: 768px) {
    .collapsed_navigation {
      transform: translateX(0px);
    }
  }
 </style>
 <section class="min-h-screen bg-gray-50">
-  <nav
+  <div
-    class:-translate-x-full={!navOpen}
+    class:collapsed_navigation={!navOpen}
-    class:translate-x-0={navOpen}
+    class="select-none fixed top-0 left-0 z-20 h-full pb-10 overflow-x-hidden overflow-y-auto transition origin-left transform border-r w-60 bg-gray-50">
    class="select-none fixed top-0 left-0 z-20 h-full pb-10 overflow-x-hidden overflow-y-auto transition origin-left transform border-r w-60 md:translate-x-0 bg-gray-50">
    <a href="/" class="flex items-center px-4 py-5">
      <img src="/lfk-logo.png" alt="Logo" class="h-10" />
      <h3 class="text-lg">Lauf für Kaya! Admin</h3>
@@ -297,14 +307,15 @@
        <span>{$_('logout')}</span>
      </span>
    </nav>
-  </nav>
+  </div>
  <div class="ml-0 transition md:ml-60">
    <header
      on:click={() => {
        navOpen = true;
      }}
      class="flex items-center justify-between w-full px-4 bg-white border-b h-14 md:hidden">
-      <button class="block btn btn-light md:hidden">
+      <button
        on:click={() => {
          navOpen = true;
        }}
        class="block btn btn-light md:hidden">
        <span class="sr-only">Menu</span><svg
          class="w-4 h-4"
          xmlns="http://www.w3.org/2000/svg"
@@ -318,10 +329,13 @@
      <NoComponentLoaded />
    </slot>
  </div>
-  <div
+  {#if navOpen === true}
-    on:click={() => {
+    <div
-      navOpen = false;
+      on:click={() => {
-    }}
+        navOpen = false;
-    class:hidden={!navOpen}
+        console.log({ navOpen });
-    class="fixed inset-0 z-10 w-screen h-screen bg-black bg-opacity-25 md:hidden" />
+      }}
      class:hidden={!navOpen}
      class="fixed inset-0 z-10 w-screen h-screen bg-black bg-opacity-25 md:hidden" />
  {/if}
 </section>
--- a/src/components/runners/RunnersOverview.svelte
+++ b/src/components/runners/RunnersOverview.svelte
@@ -197,7 +197,7 @@
                      {#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>
+                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{runner.group.parentGroup.name} &gt; {runner.group.name}</a>
                      {/if}
                      {#if runner.group.responseType === 'RUNNERORGANIZATION'}
                        <a
Author	SHA1	Message	Date
Nicolai Ort	ef81b8adf9	Merge pull request 'Added runner team's parentorg name to runenr overciew' (#129 ) from feature/128-runner_orgs into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #129	2021-04-08 17:29:27 +00:00
Nicolai Ort	8a7d635cef	Switched to html entity ref #128	2021-04-08 18:00:47 +02:00
Nicolai Ort	4c259c1eef	Added runner team's parentorg name to runenr overciew ref #128	2021-04-08 17:58:49 +02:00
Philipp Dormann	5b4ede5e2f	🚀RELEASE v0.12.4 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-08 17:34:32 +02:00
Philipp Dormann	d0ab3dda78	🚑 [HOTFIX] - drop "svelte-infinite-loading" Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-08 17:34:04 +02:00
Philipp Dormann	d9cf51b4bb	🚀RELEASE v0.12.3 Some checks failed continuous-integration/drone/push Build is failing Details	2021-04-08 17:30:23 +02:00
Philipp Dormann	aa17f24220	new license file version [CI SKIP]	2021-04-08 15:28:50 +00:00
Philipp Dormann	cf60edf7d4	Merge pull request 'fix' (#126 ) from bugfix/125-mobile into dev Some checks failed continuous-integration/drone/push Build is failing Details Reviewed-on: #126 close #125	2021-04-08 15:27:22 +00:00
Philipp Dormann	ffbc243194	custom css fix for collapsed_navigation ref #125	2021-04-07 21:44:29 +02:00
Philipp Dormann	b6b07cf30c	🐞 bugfix for svelte x tailwind class names ref #125	2021-04-07 21:35:01 +02:00
Philipp Dormann	495a6b22bd	almost fixed...	2021-04-07 21:28:21 +02:00
Philipp Dormann	0acaffbdfa	fix ref #125	2021-04-07 20:25:04 +02:00