🚀RELEASE v0.1.6

🔒 UserDetail - added basic layout for permission change
ref #12
2021-01-10 18:19:45 +01:00 · 2021-01-10 18:14:11 +01:00 · 2021-01-10 18:02:36 +01:00 · 2021-01-10 17:55:13 +01:00 · 2021-01-10 17:54:50 +01:00 · 2021-01-10 17:34:12 +01:00
9 changed files with 172 additions and 15 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,35 @@

 All notable changes to this project will be documented in this file. Dates are displayed in UTC.

+#### [0.1.6](https://git.odit.services/lfk/frontend/compare/0.1.5...0.1.6)
+
+- ✨ UsersOverview - user delete [`f0c100a`](https://git.odit.services/lfk/frontend/commit/f0c100aee47d6a5aeb0995db79b268f33bf316e9)
+- 🔒 UserDetail - added basic layout for permission change [`81c1537`](https://git.odit.services/lfk/frontend/commit/81c1537bada2c87127385d9110d48459cd1b505f)
+- 📧 UserDetail - email input [`f856c6a`](https://git.odit.services/lfk/frontend/commit/f856c6ae3792c93aee148339d89e3978db6e9293)
+- ✨ UserDetail multiselect layout for groups [`98ecfab`](https://git.odit.services/lfk/frontend/commit/98ecfab0325e35c5418775f7162049b56e5f332f)
+- UserDetail - placeholder for permission picker 🔒 [`b948b8c`](https://git.odit.services/lfk/frontend/commit/b948b8c1a48e5b4bc6a083139d26100ef4499970)
+
+#### [0.1.5](https://git.odit.services/lfk/frontend/compare/0.1.4...0.1.5)
+
+> 10 January 2021
+
+- Merge commit '16f572480ad55425890061f9dad65fe85f2f39ad' into dev [`#30`](https://git.odit.services/lfk/frontend/issues/30)
+- 🚀RELEASE v0.1.5 [`330755c`](https://git.odit.services/lfk/frontend/commit/330755c63e3405533a5da79c84ef4f379eb43e1c)
+- ⤵ load dynamic build info in Footer component [`c089bb3`](https://git.odit.services/lfk/frontend/commit/c089bb39298fb1067093c2fa81101130c214947c)
+- 📅 dynamic copyright year in Footer component [`b8a9e4f`](https://git.odit.services/lfk/frontend/commit/b8a9e4f272f925999b9a032dd009f7498acbfae0)
+- 👀 improved Footer layout + display on Login component [`43b4065`](https://git.odit.services/lfk/frontend/commit/43b406592ebe115cea04a8dbf36874c0a5bdd7e9)
+- ✨ added versionbuilder.js script [`1dd6674`](https://git.odit.services/lfk/frontend/commit/1dd6674faad686c0048a62b4cd25ab21b5c8b04f)
+- ⚡ add versionbuilder script to release hook [`16f5724`](https://git.odit.services/lfk/frontend/commit/16f572480ad55425890061f9dad65fe85f2f39ad)
+- 🔨 sample build of index.html with versionbuilder script [`3caa1fc`](https://git.odit.services/lfk/frontend/commit/3caa1fc277b99ee767c1e1fc4a28fd247d98e659)
+
 #### [0.1.4](https://git.odit.services/lfk/frontend/compare/0.1.3...0.1.4)

+> 10 January 2021
+
 - Merge commit '45ec97066f425ac2ac66914be649cbd5a1038e10' into dev [`#20`](https://git.odit.services/lfk/frontend/issues/20)
 - 🌎 add remaining translation keys for filepond [`45ec970`](https://git.odit.services/lfk/frontend/commit/45ec97066f425ac2ac66914be649cbd5a1038e10)
 - add basic i18n logic to filepond [`b08c0f1`](https://git.odit.services/lfk/frontend/commit/b08c0f145a13d295b2a51c7a6da76faceb80a90c)
+- 🚀RELEASE v0.1.4 [`4674b52`](https://git.odit.services/lfk/frontend/commit/4674b52717e388122e113553b8a136c649ce030c)
 - 🌎 About - i18n [`692c906`](https://git.odit.services/lfk/frontend/commit/692c906cd26bdb7f7d730b90734d23748e0ab451)
 - ✨ About - change license modal icon to "legal" [`0e31ba2`](https://git.odit.services/lfk/frontend/commit/0e31ba212f99d90b133bc242e5b4d163aa99b93b)
 - new license file version [CI SKIP] [`4f3837a`](https://git.odit.services/lfk/frontend/commit/4f3837ac45a5df9a7476fd68ec9c069dc6b128cd)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.1.4",
+	"version": "0.1.6",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev": "snowpack dev",
@@ -51,7 +51,7 @@
 			"publish": false
 		},
 		"hooks": {
-			"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit  && git add CHANGELOG.md"
+			"after:bump": "npx auto-changelog --commit-limit false -p -u --hide-credit && git add CHANGELOG.md && node versionbuilder.js  && git add public/index.html"
 		}
 	}
 }
--- a/public/index.html
+++ b/public/index.html
@@ -13,6 +13,7 @@
 </head>

 <body>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.1.6-RELEASE_INFO</span>
  <noscript>You need to enable JavaScript to run this app.</noscript>
  <script src="/env.js"></script>
  <script defer type="module" src="/_dist_/index.js"></script>
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@@ -1,15 +1,32 @@
 <script>
  import { _ } from "svelte-i18n";
+  const releaseinfo = document
+    .getElementById("buildinfo")
+    .textContent.replace("RELEASE_INFO-", "")
+    .replace("-RELEASE_INFO", "");
+  const year = new Date().getFullYear();
 </script>

-<footer class="container">
-  <hr class="mt-2 mb-4 border-b-1 border-gray-300" />
+<footer class="p-5 w-full">
  <p class="text-sm text-gray-500 mt-4">
-    Lauf für Kaya! Läufersystem - Copyright © 2020 + proudly powered by
+    Lauf für Kaya! Läufersystem - Copyright ©
+    {year}
+    + proudly powered by
    <a
      class="underline"
      href="https://odit.services"
      rel="noopener,noreferrer"
      target="_blank">ODIT.Services</a>
  </p>
+  <p class="text-sm text-gray-500 mt-4">
+    <a
+      class="underline"
+      target="_blank"
+      rel="noopener, noreferrer"
+      href="https://git.odit.services/lfk/frontend/">LfK!Frontend</a>@<a
+      class="underline"
+      target="_blank"
+      rel="noopener, noreferrer"
+      href="https://git.odit.services/lfk/frontend/src/tag/{releaseinfo}">{releaseinfo}</a>
+  </p>
 </footer>
--- a/src/components/Login.svelte
+++ b/src/components/Login.svelte
@@ -4,6 +4,7 @@
  import { _ } from "svelte-i18n";
  store.init();
  import { OpenAPI, AuthService } from "@odit/lfk-client-js";
+  import Footer from "./Footer.svelte";
  import Toastify from "toastify-js";
  // ------
  let username = "demo";
@@ -140,3 +141,4 @@
    </div>
  </div>
 </div>
+<Footer />
--- a/src/components/UserDetail.svelte
+++ b/src/components/UserDetail.svelte
@@ -165,6 +165,79 @@
        name="lastname"
        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
    </div>
+    <div class="text-sm w-full">
+      <label
+        for="email"
+        class="font-medium text-gray-700">{$_('e-mail-adress')}</label>
+      <input
+        autocomplete="off"
+        placeholder={$_('e-mail-adress')}
+        type="email"
+        bind:value={editable_userdata.email}
+        name="email"
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2" />
+    </div>
+    <div class="text-sm w-full">
+      <span class="font-medium">{$_('groups')}</span>
+      <select
+        class="mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm rounded-l-md sm:text-sm border-gray-300 border bg-gray-50 text-gray-500 dark:bg-gray-900 dark:text-gray-100 rounded-md p-2"
+        multiple>
+        <option>Admins</option>
+        <option>Finanzen</option>
+        <option>...</option>
+      </select>
+    </div>
+    <div class="text-sm w-full">
+      <span class="font-medium">Permissions</span>
+      <div
+        class="border-4 border-dashed rounded h-96 mb-4 p-5 text-lg text-center">
+        <!--  -->
+        <div class="flex flex-wrap -mx-1 overflow-hidden">
+          <div class="my-1 px-1 w-full overflow-hidden sm:w-1/2">
+            <button
+              type="button"
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-gray-600 text-base font-medium text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:ml-3 sm:w-auto sm:text-sm">&gt;</button>
+          </div>
+
+          <div class="my-1 px-1 w-full overflow-hidden sm:w-1/2">
+            <button
+              type="button"
+              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-gray-600 text-base font-medium text-white hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-500 sm:ml-3 sm:w-auto sm:text-sm">&lt;</button>
+          </div>
+        </div>
+        <!--  -->
+        <div class="flex flex-wrap -mx-1 overflow-hidden">
+          <div class="my-1 px-1 w-full overflow-hidden sm:w-1/2">
+            <div
+              class="border-4 border-dashed rounded mb-4 p-5 text-lg text-center">
+              <p
+                class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input">
+                DEMO_PERMISSION
+              </p>
+              <p
+                class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input">
+                DEMO_PERMISSION
+              </p>
+            </div>
+          </div>
+
+          <div class="my-1 px-1 w-full overflow-hidden sm:w-1/2">
+            <div
+              class="border-4 border-dashed rounded mb-4 p-5 text-lg text-center">
+              <p
+                class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input">
+                DEMO_PERMISSION
+              </p>
+              <p
+                class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 bg-gray-200 p-2 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input">
+                DEMO_PERMISSION
+              </p>
+            </div>
+          </div>
+        </div>
+        TODO: permission picker 🔒
+      </div>
+    </div>
  </section>
 {:catch error}
  <PromiseError {error} />
--- a/src/components/UsersOverview.svelte
+++ b/src/components/UsersOverview.svelte
@@ -7,6 +7,7 @@
  import { users as usersstore } from "../store.js";
  import UsersEmptyState from "./UsersEmptyState.svelte";
  $: searchvalue = "";
+  $: active_deletes = [];
  $: userscache = [];
  $: advanced_search = false;
  usersstore.subscribe((val) => {
@@ -120,16 +121,49 @@
                      class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{g.name}</a>
                  {/each}
                </td>
-                <td
-                  class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
-                  <a
-                    href="./{u.id}"
-                    class="text-indigo-600 hover:text-indigo-900">Edit</a>
-                  <span
-                    tabindex="0"
-                    href="#"
-                    class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">Delete</span>
-                </td>
+                {#if active_deletes[u.id] === true}
+                  <td
+                    class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                    <button
+                      on:click={() => {
+                        active_deletes[u.id] = false;
+                      }}
+                      tabindex="0"
+                      class="ml-4 text-indigo-600 hover:text-indigo-900 cursor-pointer">Cancel
+                      Delete</button>
+                    <button
+                      on:click={() => {
+                        UserService.userControllerRemove(u.id, true)
+                          .then((resp) => {
+                            console.log(resp);
+                            // user deleted
+                            users_promise.then((data) => {
+                              console.log(data);
+                              usersstore.set(data);
+                            });
+                          })
+                          .catch((err) => {
+                            // error deleting user
+                          });
+                      }}
+                      tabindex="0"
+                      class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">Confirm
+                      Delete</button>
+                  </td>
+                {:else}
+                  <td
+                    class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+                    <a
+                      href="./{u.id}"
+                      class="text-indigo-600 hover:text-indigo-900">Edit</a>
+                    <button
+                      on:click={() => {
+                        active_deletes[u.id] = true;
+                      }}
+                      tabindex="0"
+                      class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">Delete</button>
+                  </td>
+                {/if}
              </tr>
            {/if}
          {/each}
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -71,6 +71,7 @@
    "general-stats": "General Stats",
    "general_promise_error": "😢 Error",
    "goback": "Go Home",
+    "groups": "Groups",
    "hallo": "hello",
    "installed-version": "Installed version",
    "invalid-mail-reset": "the provided email is invalid",
--- a/versionbuilder.js
+++ b/versionbuilder.js
@@ -0,0 +1,5 @@
+const fs = require('fs');
+const package = JSON.parse(fs.readFileSync(`./package.json`, { encoding: 'utf-8' }));
+const original = fs.readFileSync(`./public/index.html`, { encoding: 'utf-8' });
+let out = original.replace(/RELEASE_INFO-(\S)+-RELEASE_INFO/gi, 'RELEASE_INFO-' + package.version + '-RELEASE_INFO');
+fs.writeFileSync(`./public/index.html`, out);
Author	SHA1	Message	Date
Philipp Dormann	ee01c3a059	🚀RELEASE v0.1.6 All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-10 18:19:45 +01:00
Philipp Dormann	81c1537bad	🔒 UserDetail - added basic layout for permission change ref #12	2021-01-10 18:14:11 +01:00
Philipp Dormann	98ecfab032	✨ UserDetail multiselect layout for groups ref #12	2021-01-10 18:02:36 +01:00
Philipp Dormann	b948b8c1a4	UserDetail - placeholder for permission picker 🔒 ref #12	2021-01-10 17:55:13 +01:00
Philipp Dormann	f856c6ae37	📧 UserDetail - email input ref #12	2021-01-10 17:54:50 +01:00
Philipp Dormann	2dd2580530	Merge branch 'dev' into feature/12-user-management	2021-01-10 17:34:12 +01:00
Philipp Dormann	330755c63e	🚀RELEASE v0.1.5 All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-10 17:18:55 +01:00
Philipp Dormann	9cf0174b41	Merge commit '16f572480ad55425890061f9dad65fe85f2f39ad' into dev close #30	2021-01-10 17:18:33 +01:00
Philipp Dormann	16f572480a	⚡ add versionbuilder script to release hook ref #30	2021-01-10 17:18:16 +01:00
Philipp Dormann	b8a9e4f272	📅 dynamic copyright year in Footer component ref #30	2021-01-10 17:17:07 +01:00
Philipp Dormann	c089bb3929	⤵ load dynamic build info in Footer component ref #30	2021-01-10 17:16:51 +01:00
Philipp Dormann	3caa1fc277	🔨 sample build of index.html with versionbuilder script ref #30	2021-01-10 17:16:07 +01:00
Philipp Dormann	43b406592e	👀 improved Footer layout + display on Login component ref #30	2021-01-10 17:15:46 +01:00
Philipp Dormann	1dd6674faa	✨ added versionbuilder.js script ref #30	2021-01-10 17:15:01 +01:00
Philipp Dormann	f0c100aee4	✨ UsersOverview - user delete ref #12	2021-01-10 15:16:02 +01:00