@live-change/user-frontend 0.8.130 → 0.8.132

package/front/src/router.js

@@ -64,7 +64,7 @@ export function installUserRedirects(router, app, config) {
     if(to?.matched.find(m => m?.meta.signedIn)) {
       if(!client.value.user) {
         console.log("REDIRECT TO LOGIN BECAUSE PAGE REQUIRES LOGIN!")
-        router.redirectAfterSignIn = to.fullPath
+        router.redirectAfterSignIn = JSON.stringify(to.fullPath)
         return { name: 'user:signInEmail' }
       }
     }
@@ -76,7 +76,7 @@ export function installUserRedirects(router, app, config) {
     }
     if(to && to.name === 'user:signInEmail' && from?.matched.find(m => m?.meta.saveForSignIn)) {
       console.log("SAVE FOR LOGIN", from.fullPath)
-      localStorage.redirectAfterLogin = from.fullPath
+      router.redirectAfterSignIn = JSON.stringify(to.fullPath)
     }
   })
 }

package/front/src/sign/SignInFinished.vue

@@ -3,8 +3,8 @@
     <div class="surface-card border-round shadow-2 p-4">
       <div class="text-900 font-medium mb-3 text-xl mb-4">Signed In</div>
       <p class="mt-0 p-0 line-height-3">Congratulations! You have successfully logged in to your account.</p>
-      <div v-if="afterSignIn" class="flex flex-row align-items-center">
-        <router-link :to="afterSignIn" class="no-underline">
+      <div v-if="afterSignIn" class="flex flex-row justify-content-center align-items-center">
+        <router-link :to="JSON.parse(afterSignIn)" class="no-underline">
           <Button label="Next" v-ripple />
         </router-link>
         <p class="ml-4" v-if="isMounted && redirectTime">
@@ -35,15 +35,15 @@
   import pluralize from 'pluralize'
 
   const afterSignIn = computed( () => isMounted.value && localStorage.redirectAfterSignIn )
-  let redirectTime
+  const redirectTime = ref()
   onMounted(() => {
-    redirectTime = new Date(Date.now() + 10 * 1000)
+    redirectTime.value = new Date(Date.now() + 10 * 1000)
     setTimeout(() => {
       if (afterSignIn.value) {
         localStorage.removeItem('redirectAfterSignIn')
-        router.push(afterSignIn.value)
+        router.push(JSON.parse(afterSignIn.value))
       }
-    }, 10 * 1000)
+    }, redirectTime.value - currentTime.value)
   })
 </script>
 

package/front/src/sign/SignUpFinished.vue

@@ -8,9 +8,17 @@
       </div>
       <p class="mt-0 p-0 line-height-3">
         Congratulations! You have successfully created your account.
-        <span v-if="needPassword">
+        <span v-if="needPassword && !afterSignIn">
           You can now set password to secure your account.
         </span>
+        <div v-else-if="afterSignIn" class="flex flex-row justify-content-center align-items-center">
+          <router-link :to="JSON.parse(afterSignIn)" class="no-underline">
+            <Button label="Next" v-ripple />
+          </router-link>
+          <p class="ml-4" v-if="isMounted && redirectTime">
+            Redirect in {{ pluralize('second', Math.ceil((redirectTime - currentTime) / 1000), true) }}...
+          </p>
+        </div>
         <p v-else>
 
           Setup your <router-link :to="{ name: 'user:identification' }">profile</router-link>
@@ -19,7 +27,7 @@
       </p>
     </div>
 
-    <div class="surface-card p-4 shadow-2 border-round mt-2" v-if="needPassword">
+    <div class="surface-card p-4 shadow-2 border-round mt-2" v-if="needPassword && !afterSignIn">
       <div class="text-center mb-5">
         <div class="text-900 text-3xl font-medium mb-3">
           {{ passwordExists ? 'Change password' : 'Set password' }}
@@ -82,6 +90,10 @@
   import { live, path } from '@live-change/vue3-ssr'
   import { computed, ref, onMounted } from 'vue'
 
+  import { currentTime } from "@live-change/frontend-base"
+
+  import pluralize from 'pluralize'
+
   import { useRouter } from 'vue-router'
   const router = useRouter()
 
@@ -99,6 +111,18 @@
     live(path().phone?.myUserPhones())
   ])
 
+  const afterSignIn = computed( () => isMounted.value && localStorage.redirectAfterSignIn )
+  const redirectTime = ref()
+  onMounted(() => {
+    redirectTime.value = new Date(Date.now() + 10 * 1000)
+    setTimeout(() => {
+      if (afterSignIn.value) {
+        localStorage.removeItem('redirectAfterSignIn')
+        router.push(JSON.parse(afterSignIn.value))
+      }
+    }, redirectTime.value - currentTime.value)
+  })
+
   const needPassword = computed(() => (!passwordExists.value
     && (emails.value?.length > 0 || phones.value?.length > 0)
   ))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/user-frontend",
-  "version": "0.8.130",
+  "version": "0.8.132",
   "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.8.130",
-    "@live-change/dao": "^0.8.130",
-    "@live-change/dao-vue3": "^0.8.130",
-    "@live-change/dao-websocket": "^0.8.130",
-    "@live-change/email-service": "^0.8.130",
-    "@live-change/framework": "^0.8.130",
-    "@live-change/identicon-service": "^0.8.130",
-    "@live-change/image-frontend": "^0.8.130",
-    "@live-change/message-authentication-service": "^0.8.130",
-    "@live-change/notification-service": "^0.8.130",
-    "@live-change/password-authentication-service": "^0.8.130",
-    "@live-change/pattern": "^0.8.130",
-    "@live-change/secret-code-service": "^0.8.130",
-    "@live-change/secret-link-service": "^0.8.130",
-    "@live-change/security-frontend": "^0.8.130",
-    "@live-change/security-service": "^0.8.130",
-    "@live-change/session-service": "^0.8.130",
-    "@live-change/timer-service": "^0.8.130",
-    "@live-change/upload-service": "^0.8.130",
-    "@live-change/user-identification-service": "^0.8.130",
-    "@live-change/user-service": "^0.8.130",
-    "@live-change/vue3-components": "^0.8.130",
-    "@live-change/vue3-ssr": "^0.8.130",
+    "@live-change/cli": "^0.8.132",
+    "@live-change/dao": "^0.8.132",
+    "@live-change/dao-vue3": "^0.8.132",
+    "@live-change/dao-websocket": "^0.8.132",
+    "@live-change/email-service": "^0.8.132",
+    "@live-change/framework": "^0.8.132",
+    "@live-change/identicon-service": "^0.8.132",
+    "@live-change/image-frontend": "^0.8.132",
+    "@live-change/message-authentication-service": "^0.8.132",
+    "@live-change/notification-service": "^0.8.132",
+    "@live-change/password-authentication-service": "^0.8.132",
+    "@live-change/pattern": "^0.8.132",
+    "@live-change/secret-code-service": "^0.8.132",
+    "@live-change/secret-link-service": "^0.8.132",
+    "@live-change/security-frontend": "^0.8.132",
+    "@live-change/security-service": "^0.8.132",
+    "@live-change/session-service": "^0.8.132",
+    "@live-change/timer-service": "^0.8.132",
+    "@live-change/upload-service": "^0.8.132",
+    "@live-change/user-identification-service": "^0.8.132",
+    "@live-change/user-service": "^0.8.132",
+    "@live-change/vue3-components": "^0.8.132",
+    "@live-change/vue3-ssr": "^0.8.132",
     "@vueuse/core": "^10.11.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.8.130",
+    "@live-change/codeceptjs-helper": "^0.8.132",
     "codeceptjs": "^3.6.5",
     "generate-password": "1.7.1",
     "playwright": "^1.41.2",
@@ -76,5 +76,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "BSD-3-Clause",
   "description": "",
-  "gitHead": "9fbe1673e887249a034819694bb283f948488731"
+  "gitHead": "2a89523fb97da895d65247edfecdc325fb37095e"
 }