From 0acaffbdfa359e52654a5afe2788aa59fe6f9036 Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 7 Apr 2021 20:25:04 +0200 Subject: [PATCH 1/4] fix ref #125 --- src/components/dashboard/Dashboard.svelte | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/components/dashboard/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte index b7957edf..05e56c70 100644 --- a/src/components/dashboard/Dashboard.svelte +++ b/src/components/dashboard/Dashboard.svelte @@ -1,21 +1,27 @@
+ class:bg-opacity-0={!navOpen} + class:bg-opacity-25={navOpen} + class="fixed inset-0 z-10 w-screen h-screen bg-black md:hidden bg-opacity-0" /> + {/if} + From 495a6b22bd8036593f390bdb862d325524cefbcc Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 7 Apr 2021 21:28:21 +0200 Subject: [PATCH 2/4] almost fixed... --- package.json | 6 +- src/components/dashboard/Dashboard.svelte | 556 +++++++++++----------- 2 files changed, 280 insertions(+), 282 deletions(-) diff --git a/package.json b/package.json index fccd4bfa..821b5ded 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/src/components/dashboard/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte index 05e56c70..d3945493 100644 --- a/src/components/dashboard/Dashboard.svelte +++ b/src/components/dashboard/Dashboard.svelte @@ -1,207 +1,293 @@
- + + {/if}
{ - navOpen = true; - }} class="flex items-center justify-between w-full px-4 bg-white border-b h-14 md:hidden"> -
- {#if navOpen} -
{ - navOpen = false; - console.log({navOpen}); - }} - class:bg-opacity-0={!navOpen} - class:bg-opacity-25={navOpen} - class="fixed inset-0 z-10 w-screen h-screen bg-black md:hidden bg-opacity-0" /> - {/if} -
+ {#if navOpen === true} +
{ + navOpen = false; + console.log({ navOpen }); + }} + class:hidden={!navOpen} + class="fixed inset-0 z-10 w-screen h-screen bg-black bg-opacity-25 md:hidden" /> + {/if} + From b6b07cf30cc6533bd5dbfec1f813c16fde85634d Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 7 Apr 2021 21:35:01 +0200 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9E=20bugfix=20for=20svelte=20x=20?= =?UTF-8?q?tailwind=20class=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ref #125 --- src/components/dashboard/Dashboard.svelte | 522 +++++++++++----------- 1 file changed, 262 insertions(+), 260 deletions(-) diff --git a/src/components/dashboard/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte index d3945493..4b282666 100644 --- a/src/components/dashboard/Dashboard.svelte +++ b/src/components/dashboard/Dashboard.svelte @@ -12,282 +12,196 @@ } + +
- {#if navOpen} -
- - Logo -

Lauf für Kaya! Admin

+
+ + Logo +

Lauf für Kaya! Admin

+ +
- {/if} + fill="currentColor" + d="M2 4h2v16H2V4zm4 0h1v16H6V4zm2 0h2v16H8V4zm3 0h2v16h-2V4zm3 0h2v16h-2V4zm3 0h1v16h-1V4zm2 0h3v16h-3V4z" /> + Scans + + {/if} + {#if store.state.jwtinfo.userdetails.permissions.includes('CONTACT:GET')} + + + + {$_('contacts')} + + {/if} + {#if store.state.jwtinfo.userdetails.permissions.includes('STATION:GET')} + + + + {$_('scanstations')} + + {/if} + + + + + {$_('settings')} + + + + + {$_('about')} + + { + AuthService.authControllerLogout(); + logout(); + }}> + + + {$_('logout')} + + +
From ffbc243194c7faeb4fe61c12711a1c441c3994ef Mon Sep 17 00:00:00 2001 From: Philipp Dormann Date: Wed, 7 Apr 2021 21:44:29 +0200 Subject: [PATCH 4/4] custom css fix for collapsed_navigation ref #125 --- src/components/dashboard/Dashboard.svelte | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/dashboard/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte index 4b282666..2a56a5e3 100644 --- a/src/components/dashboard/Dashboard.svelte +++ b/src/components/dashboard/Dashboard.svelte @@ -5,7 +5,7 @@ import { router } from "tinro"; import NoComponentLoaded from "../base/NoComponentLoaded.svelte"; import { AuthService } from "@odit/lfk-client-js"; - $: navOpen = true; + $: navOpen = false; function logout() { localForage.clear(); location.replace("/"); @@ -14,15 +14,19 @@
+ 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"> Logo

Lauf für Kaya! Admin