@live-change/user-frontend 0.9.39 → 0.9.41

package/front/src/password/Password.vue

@@ -78,6 +78,7 @@
   import Portal from 'primevue/portal';
   import BaseInput from '@primevue/core/baseinput';
   import PasswordStyle from 'primevue/password/style';
+  import { useId } from 'vue';
 
   export default {
     name: 'Password',
@@ -224,6 +225,12 @@
     inject: {
       $pcFluid: { default: null }
     },
+    setup() {
+      const uid = useId()
+      return {
+        uid
+      }
+    },
     data() {
       return {
         overlayVisible: false,
@@ -453,7 +460,7 @@
         return this.promptLabel || this.$primevue.config.locale.passwordPrompt;
       },
       overlayUniqueId() {
-        return this.$id + '_overlay';
+        return this.uid + '_overlay';
       }
     },
     watch: {

package/front/src/router.js

@@ -60,8 +60,9 @@ import { client as useClient } from '@live-change/vue3-ssr'
 
 export function installUserRedirects(router, app, config) {
   const client = useClient(app._context)
-  if(typeof window === 'undefined') return
-  router.beforeEach(async (to, from) => {
+  router.afterEach(async (to, from) => {
+    console.log("AFTER EACH", to, from)
+    if(typeof window === 'undefined') return
     if(to?.matched.find(m => m?.meta.signedIn)) {
       if(!client.value.user) {
         console.log("REDIRECT TO LOGIN BECAUSE PAGE REQUIRES LOGIN!")
@@ -72,15 +73,12 @@ export function installUserRedirects(router, app, config) {
           query: to.query,
           hash: to.hash
         })
+        setTimeout(() => {
+          router.push({ name: 'user:signInEmail' })
+        }, 50)
         return { name: 'user:signInEmail' }
       }
     }
-    if(to?.matched.find(m => m?.meta.signedOut)) {
-      if(client.value.user) {
-        console.log("REDIRECT TO USER INDEX BECAUSE PAGE REQUIRES LOGOUT!")
-        return { name: 'user:settings' }
-      }
-    }
     if(to && to.name === 'user:signInEmail' && from?.matched.find(m => m?.meta.saveForSignIn)) {
       console.log("SAVE FOR LOGIN", from)
       localStorage.redirectAfterSignIn = JSON.stringify({
@@ -91,6 +89,14 @@ export function installUserRedirects(router, app, config) {
       })
     }
   })
+  router.beforeEach(async (to, from) => {
+    if(to?.matched.find(m => m?.meta.signedOut)) {
+      if(client.value.user) {
+        console.log("REDIRECT TO USER INDEX BECAUSE PAGE REQUIRES LOGOUT!")
+        return { name: 'user:settings' }
+      }
+    }
+  })
 }
 
 export function createRouter(app, config) {

package/front/src/settings/Settings.vue

@@ -1,7 +1,11 @@
 <template>
-  <div class="flex relative lg:static bg-surface-50 dark:bg-surface-950" style="height: calc(100vh - 88px)">
-    <div id="settings-menu" class="bg-surface-0 hidden flex-shrink-0 absolute left-0 h-full
-       top-0 z-1 border-r-1 border-r-surface-300 dark:border-r-surface-750 select-none md:static md:block" style="width:280px">
+  <div class="flex relative lg:static bg-surface-50 dark:bg-surface-950" 
+       style="height: calc(100vh - 88px)">
+    <div id="settings-menu" 
+         class="bg-surface-0 dark:bg-surface-950 flex-shrink-0 absolute left-0 h-full
+                top-0 z-1 border-r-1 border-r-surface-300 dark:border-r-surface-700 select-none
+                hidden md:static md:block"
+        style="width:280px">
       <SettingsMenu />
     </div>
 

package/front/src/settings/SettingsMenuItem.vue

@@ -1,10 +1,11 @@
 <template>
   <li class="block">
     <router-link :to="{ name }"
-                 :class="route.name == name ? 'text-blue-500' : 'text-700'"
+                 :class="route.name == name ? 'text-primary-500 dark:text-primary-300' : 'text-surface-700 dark:text-surface-300'"
                  v-ripple
-                 class="flex align-items-center cursor-pointer p-3 hover:surface-100
-                          border-round transition-colors transition-duration-150 p-ripple no-underline">
+                 class="flex align-items-center cursor-pointer p-3                       
+                        hover:bg-surface-100 dark:hover:bg-surface-800
+                          rounded-border transition-colors transition-duration-150 p-ripple no-underline">
       <i class="pi mr-2" :class="'pi-'+icon"></i>
       <span class="font-medium">{{ label }}</span>
     </router-link>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-frontend",
-  "version": "0.9.39",
+  "version": "0.9.41",
   "scripts": {
     "memDev": "node --inspect --expose-gc server/start.js memDev --enableSessions --initScript ./init.js --dbAccess",
     "localDevInit": "rm tmp.db; node server/start.js localDev --enableSessions --initScript ./init.js",
@@ -22,29 +22,29 @@
   },
   "type": "module",
   "dependencies": {
-    "@live-change/cli": "^0.9.39",
-    "@live-change/dao": "^0.9.39",
-    "@live-change/dao-vue3": "^0.9.39",
-    "@live-change/dao-websocket": "^0.9.39",
-    "@live-change/email-service": "^0.9.39",
-    "@live-change/framework": "^0.9.39",
-    "@live-change/identicon-service": "^0.9.39",
-    "@live-change/image-frontend": "^0.9.39",
-    "@live-change/message-authentication-service": "^0.9.39",
-    "@live-change/notification-service": "^0.9.39",
-    "@live-change/password-authentication-service": "^0.9.39",
-    "@live-change/pattern": "^0.9.39",
-    "@live-change/secret-code-service": "^0.9.39",
-    "@live-change/secret-link-service": "^0.9.39",
-    "@live-change/security-frontend": "^0.9.39",
-    "@live-change/security-service": "^0.9.39",
-    "@live-change/session-service": "^0.9.39",
-    "@live-change/timer-service": "^0.9.39",
-    "@live-change/upload-service": "^0.9.39",
-    "@live-change/user-identification-service": "^0.9.39",
-    "@live-change/user-service": "^0.9.39",
-    "@live-change/vue3-components": "^0.9.39",
-    "@live-change/vue3-ssr": "^0.9.39",
+    "@live-change/cli": "^0.9.41",
+    "@live-change/dao": "^0.9.41",
+    "@live-change/dao-vue3": "^0.9.41",
+    "@live-change/dao-websocket": "^0.9.41",
+    "@live-change/email-service": "^0.9.41",
+    "@live-change/framework": "^0.9.41",
+    "@live-change/identicon-service": "^0.9.41",
+    "@live-change/image-frontend": "^0.9.41",
+    "@live-change/message-authentication-service": "^0.9.41",
+    "@live-change/notification-service": "^0.9.41",
+    "@live-change/password-authentication-service": "^0.9.41",
+    "@live-change/pattern": "^0.9.41",
+    "@live-change/secret-code-service": "^0.9.41",
+    "@live-change/secret-link-service": "^0.9.41",
+    "@live-change/security-frontend": "^0.9.41",
+    "@live-change/security-service": "^0.9.41",
+    "@live-change/session-service": "^0.9.41",
+    "@live-change/timer-service": "^0.9.41",
+    "@live-change/upload-service": "^0.9.41",
+    "@live-change/user-identification-service": "^0.9.41",
+    "@live-change/user-service": "^0.9.41",
+    "@live-change/vue3-components": "^0.9.41",
+    "@live-change/vue3-ssr": "^0.9.41",
     "@vueuse/core": "^12.3.0",
     "codeceptjs-assert": "^0.0.5",
     "codeceptjs-video-helper": "0.1.3",
@@ -65,7 +65,7 @@
     "wtfnode": "^0.9.1"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "^0.9.39",
+    "@live-change/codeceptjs-helper": "^0.9.41",
     "codeceptjs": "^3.6.10",
     "generate-password": "1.7.1",
     "playwright": "1.49.1",
@@ -76,5 +76,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "BSD-3-Clause",
   "description": "",
-  "gitHead": "f4452af484b26bb40e252cdcf4492706cd453c4d"
+  "gitHead": "88ccfef9ea84e2de85935f771d2b03dabfa8d845"
 }