🐞 bugfix for svelte x tailwind class names

ref #125
almost fixed...
2021-04-07 21:35:01 +02:00 · 2021-04-07 21:28:21 +02:00 · 2021-04-07 20:25:04 +02:00 · 2021-04-06 16:47:37 +02:00 · 2021-04-06 14:42:37 +00:00 · 2021-04-05 16:23:24 +02:00
5 changed files with 49 additions and 20 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,18 @@
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 #### [0.12.1](https://git.odit.services/lfk/frontend/compare/0.12.0...0.12.1)
 - Merge pull request 'ImportRunnerModal Cancel Button feature/122-import_cancel' (#123) from feature/112-import_cancel into dev [`1f428a5`](https://git.odit.services/lfk/frontend/commit/1f428a535e3ae619cbf8db51d04255aac8dd8614)
 - Added cancel button for the first stage of runner import [`0c40966`](https://git.odit.services/lfk/frontend/commit/0c409669700d3a8096cc04716154b0fdca458fe5)
 - Escape now triggers foll modal close (including reset) instead of just hiding th modal [`9da071f`](https://git.odit.services/lfk/frontend/commit/9da071fe9ba067160334682bf00163e3630fe919)
 #### [0.12.0](https://git.odit.services/lfk/frontend/compare/0.11.0...0.12.0)
 > 5 April 2021
 - Merge pull request 'feature/108_vite_migration' (#118) from feature/108_vite_migration into dev [`#108`](https://git.odit.services/lfk/frontend/issues/108)
 - 🚀RELEASE v0.12.0 [`892a04f`](https://git.odit.services/lfk/frontend/commit/892a04f28930481715eb486b1ef4efeb98a6e999)
 - Fixed package version [`27cc972`](https://git.odit.services/lfk/frontend/commit/27cc9727f1d02d186c3ccadb06e5b4b1b1d6202d)
 - Merge pull request 'Implmented certificate generation feature/119-Certificate_generation' (#120) from feature/119-Certificate_generation into dev [`f0738d4`](https://git.odit.services/lfk/frontend/commit/f0738d451b02e4a298b5f9cb8ab0be16aed10a38)
 - The PFS Prefixes now get translated via i18n [`bfacfec`](https://git.odit.services/lfk/frontend/commit/bfacfec76511cae3015f52698fdcbd80a7a15981)
--- a/index.html
+++ b/index.html
@@ -13,7 +13,7 @@
 </head>
 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.12.0-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.12.1-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.0",
+	"version": "0.12.1",
 	"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/src/components/dashboard/Dashboard.svelte
+++ b/src/components/dashboard/Dashboard.svelte
@@ -5,16 +5,22 @@
  import { router } from "tinro";
  import NoComponentLoaded from "../base/NoComponentLoaded.svelte";
  import { AuthService } from "@odit/lfk-client-js";
-  $: navOpen = false;
+  $: navOpen = true;
  function logout() {
    localForage.clear();
    location.replace("/");
  }
 </script>
 <style>
  .collapsed_navigation {
    @apply -translate-x-full;
  }
 </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 md:translate-x-0 bg-gray-50">
    <a href="/" class="flex items-center px-4 py-5">
@@ -297,14 +303,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 +325,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/ImportRunnerModal.svelte
+++ b/src/components/runners/ImportRunnerModal.svelte
@@ -34,7 +34,7 @@
    document.onkeydown = (e) => {
      e = e || window.event;
      if (e.key === "Escape") {
-        import_modal_open = false;
+        cancelModal();
      }
      if (e.keyCode === 13) {
        //
@@ -281,6 +281,16 @@
                  bind:files
                  type="file" />
              </div>
              <div class="overflow-hidden relative mt-4 mb-4">
                <button
                  on:click={() => {
                    cancelModal();
                  }}
                  type="button"
                  class="w-full rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-600 text-base font-medium text-white hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 md:ml-40 mr-0 sm:ml-0 sm:w-auto sm:text-sm">
                  {$_('cancel')}
                </button>
              </div>
            {/if}
            {#if json_output.length > 0}
              {#if opened_from === 'OrgOverview'}
Author	SHA1	Message	Date
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
Nicolai Ort	834ff8fa63	🚀RELEASE v0.12.1 All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-06 16:47:37 +02:00
Nicolai Ort	1f428a535e	Merge pull request 'ImportRunnerModal Cancel Button feature/122-import_cancel' (#123 ) from feature/112-import_cancel into dev All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #123	2021-04-06 14:42:37 +00:00
Nicolai Ort	0c40966970	Added cancel button for the first stage of runner import ref #112	2021-04-05 16:23:24 +02:00
Nicolai Ort	9da071fe9b	Escape now triggers foll modal close (including reset) instead of just hiding th modal ref #112	2021-04-05 16:14:43 +02:00