🚀RELEASE v0.2.0

Merge branch 'feature/12-user-management' into dev
[tmp] - disable darkmode + re-enable sw
2021-01-11 21:17:35 +01:00 · 2021-01-11 21:17:12 +01:00 · 2021-01-11 21:17:05 +01:00 · 2021-01-11 21:10:40 +01:00 · 2021-01-11 21:08:44 +01:00 · 2021-01-11 21:08:39 +01:00
12 changed files with 270 additions and 207 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,10 +2,23 @@
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 #### [0.2.0](https://git.odit.services/lfk/frontend/compare/0.1.6...0.2.0)
 - 🔒 added rendering based on permission level [`5937a0d`](https://git.odit.services/lfk/frontend/commit/5937a0d7ce970d38ddb0e4c6a02d11f8c8b53e9b)
 - ❌ UserDetail - delete [`4512272`](https://git.odit.services/lfk/frontend/commit/4512272c1c2a5c861d8ac4c9908244df125dc3d9)
 - 🖊 UserDetail - reactivity on edit + update functionality [`ce1f384`](https://git.odit.services/lfk/frontend/commit/ce1f3842e0f581d9e94ea6079cf223d945f7465d)
 - [tmp] - disable darkmode + re-enable sw [`c7679b7`](https://git.odit.services/lfk/frontend/commit/c7679b7a67b362a7fbf796f612892bdfac50731c)
 - 🕕 set manual refresh time to 2min [`be629e5`](https://git.odit.services/lfk/frontend/commit/be629e5c6b076bf9a28dcc953e97478d244d8413)
 - 🐞 [tmp] - nginx.conf - disable .js file caching [`e6ac34b`](https://git.odit.services/lfk/frontend/commit/e6ac34bde8d288a45e83fc6723a2bbe952f2622a)
 - ℹ update jwtinfo store on token refresh [`6356968`](https://git.odit.services/lfk/frontend/commit/63569684a392bf0c24c9c2efd7945114d1a230a5)
 #### [0.1.6](https://git.odit.services/lfk/frontend/compare/0.1.5...0.1.6)
 > 10 January 2021
 - ✨ 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)
 - 🚀RELEASE v0.1.6 [`ee01c3a`](https://git.odit.services/lfk/frontend/commit/ee01c3a059c435add68938657955cbd2c5851c50)
 - 📧 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)
--- a/nginx.conf
+++ b/nginx.conf
@ -9,7 +9,7 @@ http {
        location / {
            try_files $uri $uri/ /index.html;
        }
-        location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
+        location ~* \.(?:ico|css|gif|jpe?g|png)$ {
            expires 1y;
            add_header Pragma public;
            add_header Cache-Control "public";
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
 	"name": "@odit/lfk-frontend",
-	"version": "0.1.6",
+	"version": "0.2.0",
 	"scripts": {
 		"i18n-order": "node order.js",
 		"dev": "snowpack dev",
--- a/public/index.html
+++ b/public/index.html
@ -13,7 +13,7 @@
 </head>
 <body>
-  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.1.6-RELEASE_INFO</span>
+  <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.2.0-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/App.svelte
+++ b/src/App.svelte
@ -49,7 +49,7 @@
  OpenAPI.BASE = config.baseurl;
  import { register as registerSW } from "./swmodule";
  store.init();
-  // registerSW();
+  registerSW();
 </script>
 <Route>
--- a/src/components/AddUserModal.svelte
+++ b/src/components/AddUserModal.svelte
@ -2,7 +2,7 @@
  import { _ } from "svelte-i18n";
  import { clickOutside } from "./outsideclick";
  import { focusTrap } from "svelte-focus-trap";
-  import { tracks as tracksstore } from "../store.js";
+  import { tracks as usersstore } from "../store.js";
  import { UserService } from "@odit/lfk-client-js";
  import isEmail from "validator/es/lib/isEmail";
  import Toastify from "toastify-js";
@ -68,11 +68,11 @@
            backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
          }).showToast();
          let storeval = [];
-          tracksstore.subscribe((val) => {
+          usersstore.subscribe((val) => {
            storeval = val;
          });
          storeval.push(result);
-          tracksstore.set(storeval);
+          usersstore.set(storeval);
        })
        .catch((err) => {
          //
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@ -1,9 +1,12 @@
 <script>
  import { _ } from "svelte-i18n";
-  const releaseinfo = document
+  $: releaseinfo = "";
  setTimeout(() => {
    releaseinfo = document
      .getElementById("buildinfo")
      .textContent.replace("RELEASE_INFO-", "")
      .replace("-RELEASE_INFO", "");
  }, 1500);
  const year = new Date().getFullYear();
 </script>
--- a/src/components/UserDetail.svelte
+++ b/src/components/UserDetail.svelte
@ -1,28 +1,50 @@
 <script>
  import { _ } from "svelte-i18n";
  import lodashIsEqual from "lodash.isequal";
  import store from "../store";
  import { UserService } from "@odit/lfk-client-js";
  import "gridjs/dist/theme/mermaid.css";
  import PromiseError from "./PromiseError.svelte";
  export let params;
  const user_promise = UserService.userControllerGetOne(params.userid);
  let data_loaded = false;
-  let original_data = undefined;
+  $: delete_triggered = false;
  $: original_data = {};
  $: editable_userdata = undefined;
  user_promise.then((data) => {
    data_loaded = true;
-    original_data = data;
+    original_data = Object.assign(original_data, data);
    editable_userdata = data;
  });
-  // $: changes_performed = lodashIsEqual(original_data, editable_userdata);
+  $: changes_performed = !lodashIsEqual(original_data, editable_userdata);
  $: changes_performed = !lodashIsEqual({ test: 1 }, { test: 1 });
  function submit() {
    if (data_loaded === true && changes_performed === true) {
      console.log("ok, submitting...");
      console.log(editable_userdata);
      UserService.userControllerPut(original_data.id, editable_userdata)
        .then((resp) => {
          console.log(resp);
          Object.assign(original_data, editable_userdata);
          original_data = editable_userdata;
          Object.assign(original_data, editable_userdata);
        })
        .catch((err) => {
          console.log(err);
        });
    } else {
      console.log("no changes performed");
    }
  }
  function deleteUser() {
    UserService.userControllerRemove(original_data.id, true)
      .then((resp) => {
        console.log(resp);
        location.replace("./");
      })
      .catch((err) => {
        console.log(err);
      });
  }
 </script>
 {#await user_promise}
@ -63,36 +85,47 @@
                <polyline points="12 5 19 12 12 19" /></svg>
            </li>
            <li class="flex items-center">
-              <span class="mr-2">{user.firstname}
+              <span class="mr-2">{original_data.firstname}
-                {user.middlename || ''}
+                {original_data.middlename || ''}
-                {user.lastname}</span>
+                {original_data.lastname}</span>
            </li>
          </ol>
        </nav>
      </div>
    </div>
    <div class="mb-8 text-3xl font-extrabold leading-tight">
-      {user.firstname}
+      {original_data.firstname}
-      {user.middlename || ''}
+      {original_data.middlename || ''}
-      {user.lastname}
+      {original_data.lastname}
-      <span data-id="user_actions_${user.id}">
+      <span data-id="user_actions_${editable_userdata.id}">
        {#if store.state.jwtinfo.userdetails.permissions.includes('USER:DELETE')}
          {#if delete_triggered}
            <button
-          class="hidden w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-green-400 text-base font-medium text-white sm:w-auto sm:text-sm"
+              on:click={deleteUser}
-          data-userid="${user.id}"
+              class="w-full justify-center 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 sm:ml-3 sm:w-auto sm:text-sm">{$_('confirm-delete')}</button>
          onclick="user__delete_cancel()">{$_('cancel')}</button>
            <button
-          class="hidden w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-red-500 text-base font-medium text-white sm:w-auto sm:text-sm"
+              on:click={() => {
-          data-userid="${user.id}"
+                delete_triggered = !delete_triggered;
-          onclick="user__delete_confirm()">{$_('confirm-delete')}</button>
+              }}
              class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-400 text-base font-medium text-white sm:w-auto sm:text-sm">{$_('cancel')}</button>
          {/if}
          {#if !delete_triggered}
            <button
              on:click={() => {
                delete_triggered = true;
              }}
              type="button"
              class="w-full justify-center 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 sm:ml-3 sm:w-auto sm:text-sm">{$_('delete-user')}</button>
          {/if}
        {/if}
        {#if !delete_triggered}
          <button
            disabled={!changes_performed}
            class:opacity-50={!changes_performed}
            type="button"
            on:click={submit}
            class="w-full justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">{$_('save-changes')}</button>
        {/if}
      </span>
    </div>
@ -101,7 +134,7 @@
      <img
        alt={$_('profile-picture')}
        class="inline-block h-20 w-20 rounded-full overflow-hidden bg-gray-100"
-        src={user.profilePic} />
+        src={editable_userdata.profilePic} />
      <!-- <span
        class="inline-block h-12 w-12 rounded-full overflow-hidden bg-gray-100"><svg
          class="h-full w-full text-gray-300"
--- a/src/components/Users.svelte
+++ b/src/components/Users.svelte
@ -1,13 +1,16 @@
 <script>
  import { _ } from "svelte-i18n";
  import store from "../store";
  import AddUserModal from "./AddUserModal.svelte";
  export let modal_open = false;
  import UsersOverview from "./UsersOverview.svelte";
  console.log(store.state.jwtinfo.userdetails.permissions);
 </script>
 <section class="container p-5">
  <span class="mb-1 text-3xl font-extrabold leading-tight">
    {$_('users')}
    {#if store.state.jwtinfo.userdetails.permissions.includes('USER:CREATE')}
      <button
        on:click={() => {
          modal_open = true;
@ -16,8 +19,12 @@
        class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
        {$_('create-user')}
      </button>
    {/if}
  </span>
  <p class="mb-8 text-lg text-gray-500">{$_('manage-admin-users')}</p>
  <UsersOverview />
 </section>
-<AddUserModal bind:modal_open />
+
 {#if store.state.jwtinfo.userdetails.permissions.includes('USER:CREATE')}
  <AddUserModal bind:modal_open />
 {/if}
--- a/src/components/UsersOverview.svelte
+++ b/src/components/UsersOverview.svelte
@ -5,6 +5,7 @@
  const users_promise = UserService.userControllerGetAll();
  import "gridjs/dist/theme/mermaid.css";
  import { users as usersstore } from "../store.js";
  import store from "../store";
  import UsersEmptyState from "./UsersEmptyState.svelte";
  $: searchvalue = "";
  $: active_deletes = [];
@ -19,14 +20,15 @@
  });
 </script>
-{#await users_promise}
+{#if store.state.jwtinfo.userdetails.permissions.includes('USER:GET')}
  {#await users_promise}
    <div
      class="bg-teal-lightest border-t-4 border-teal rounded-b text-teal-darkest px-4 py-3 shadow-md my-2"
      role="alert">
      <p class="font-bold">users are being loaded...</p>
      <p class="text-sm">{$_('this-might-take-a-moment')}</p>
    </div>
-{:then users}
+  {:then users}
    {#if userscache.length === 0}
      <UsersEmptyState />
    {:else}
@ -156,12 +158,14 @@
                      <a
                        href="./{u.id}"
                        class="text-indigo-600 hover:text-indigo-900">Edit</a>
                      {#if store.state.jwtinfo.userdetails.permissions.includes('USER:DELETE')}
                        <button
                          on:click={() => {
                            active_deletes[u.id] = true;
                          }}
                          tabindex="0"
                          class="ml-4 text-red-600 hover:text-red-900 cursor-pointer">Delete</button>
                      {/if}
                    </td>
                  {/if}
                </tr>
@ -171,11 +175,12 @@
        </table>
      </div>
    {/if}
-{:catch error}
+  {:catch error}
    <div class="text-white px-6 py-4 border-0 rounded relative mb-4 bg-red-500">
      <span class="inline-block align-middle mr-8">
        <b class="capitalize">{$_('general_promise_error')}</b>
        {error}
      </span>
    </div>
-{/await}
+  {/await}
 {/if}
--- a/src/store.js
+++ b/src/store.js
@ -27,6 +27,8 @@ const store = () => {
 			AuthService.authControllerRefresh({ token: state.auth.refresh_token }).then((auth) => {
 				console.log('got new auth');
 				OpenAPI.TOKEN = auth.access_token;
 				const jwtinfo = JSON.parse(atob(auth.access_token.split('.')[1]));
 				state.jwtinfo = jwtinfo;
 				localForage.setItem('logindata', auth);
 			});
 		},
@ -39,8 +41,8 @@ const store = () => {
 				//
 				state.refreshInterval = setInterval(() => {
 					this.refreshAuth();
-					// 4min
+					// 2min
-				}, 4 * 60000);
+				}, 2 * 60000);
 				//
 				return state;
 			});
--- a/tailwind.config.js
+++ b/tailwind.config.js
@ -2,7 +2,7 @@ module.exports = {
 	purge: {
 		content: [ './src/**/*.svelte' ]
 	},
-	darkMode: 'media',
+	// darkMode: 'media',
 	variants: {},
 	plugins: [],
 	theme: {
Author	SHA1	Message	Date
Philipp Dormann	77690702c0	🚀RELEASE v0.2.0 All checks were successful continuous-integration/drone/push Build is passing Details	2021-01-11 21:17:35 +01:00
Philipp Dormann	e0093480d9	Merge branch 'feature/12-user-management' into dev	2021-01-11 21:17:12 +01:00
Philipp Dormann	c7679b7a67	[tmp] - disable darkmode + re-enable sw	2021-01-11 21:17:05 +01:00
Philipp Dormann	e6ac34bde8	🐞 [tmp] - nginx.conf - disable .js file caching Some checks reported errors continuous-integration/drone/push Build was killed Details	2021-01-11 21:10:40 +01:00
Philipp Dormann	8c4b595c30	Merge branch 'dev' into feature/12-user-management	2021-01-11 21:08:44 +01:00
Philipp Dormann	be629e5c6b	🕕 set manual refresh time to 2min Some checks reported errors continuous-integration/drone/push Build was killed Details	2021-01-11 21:08:39 +01:00
Philipp Dormann	63569684a3	ℹ update jwtinfo store on token refresh	2021-01-11 21:08:14 +01:00
Philipp Dormann	5937a0d7ce	🔒 added rendering based on permission level ref #12	2021-01-11 21:07:30 +01:00
Philipp Dormann	4512272c1c	❌ UserDetail - delete ref #12	2021-01-11 21:06:47 +01:00
Philipp Dormann	ce1f3842e0	🖊 UserDetail - reactivity on edit + update functionality ref #12	2021-01-11 20:41:57 +01:00