@adminforth/open-signup 1.0.6 → 1.0.7

package/Changelog.md

@@ -0,0 +1,7 @@
+
+
+
+## [v1.0.7]
+
+# Added
+- next param support

package/custom/SignupPage.vue

@@ -121,7 +121,7 @@
                     {{$t('Please check your email at')}} {{ sentToEmail }} {{$t('to confirm your email address.')}}
                   </div> 
                   <p class="text-gray-500 dark:text-gray-400 font-sm text-right mt-3">
-                      {{$t('or')}} <Link to="/login">{{ toLoginText }}</Link>
+                      {{$t('Already have an account?')}} <Link :to="`/login${route.query.next ? `?next=${route.query.next}` : ''}`">{{ $t('login here') }}</Link>
                   </p>
                 </div>
             </div>
@@ -133,7 +133,7 @@
 
 
 <script setup lang="ts">
-import { onMounted, ref, computed, Ref } from 'vue';
+import { onMounted, ref, computed, Ref, onBeforeMount } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
 import { callAdminForthApi, loadFile, applyRegexValidation } from '@/utils';
@@ -161,7 +161,6 @@ const sentToEmail: Ref<string> = ref('');
 
 const requestEmailConfirmation = computed(() => route.meta.requestEmailConfirmation);
 const verifyToken = computed(() => route.query.token);
-const toLoginText = computed(() => verifyToken.value ? t('Go to login') : t('Back to login'));
 const isPasswordNeeded = computed(() => !requestEmailConfirmation.value || (requestEmailConfirmation.value && verifyToken.value));
 
 const user = useUserStore();
@@ -230,7 +229,36 @@ const passwordConstraints: Ref<{
   validation: '',
 });
 
+// implement something similar to beforeEnter
+// beforeEnter: async (to, from, next) => {
+//         if(localStorage.getItem('isAuthorized') === 'true') {
+//           // check if url has next=... and redirect to it
+//           console.log('to.query', to.query)
+//           if (to.query.next) {
+//             next(to.query.next.toString())
+//           } else {
+//             next({name: 'home'});
+//           }
+//         } else {
+//           next()
+//         }
+//       } 
+
+onBeforeMount(() => {
+  if (localStorage.getItem('isAuthorized') === 'true') {
+    // if route has next param, redirect
+    coreStore.fetchMenuAndResource();
+    if (route.query.next) {
+      router.push(route.query.next.toString());
+    } else {
+      router.push({ name: 'home' });
+    }
+  }
+})
+
 onMounted(async () => {
+
+
   await coreStore.getPublicConfig();
   // getPasswordConstraints
   passwordConstraints.value = await callAdminForthApi({

package/custom/SignupUnderLogin.vue

@@ -1,7 +1,7 @@
 <template>
   <p class="text-gray-500 dark:text-gray-400 font-sm text-left mt-3">
     {{$t('Have no account?')}} 
-    <Link to="/signup">
+    <Link :to="`/signup${route.query.next ? `?next=${route.query.next}` : ''}`">
       {{$t('sign up now')}}
     </Link>
   </p>
@@ -9,5 +9,8 @@
 
 <script setup>
 import Link from '@/afcl/Link.vue';
+import { useRoute } from 'vue-router';
+
+const route = useRoute();
 
 </script>

package/dist/custom/SignupPage.vue

@@ -121,7 +121,7 @@
                     {{$t('Please check your email at')}} {{ sentToEmail }} {{$t('to confirm your email address.')}}
                   </div> 
                   <p class="text-gray-500 dark:text-gray-400 font-sm text-right mt-3">
-                      {{$t('or')}} <Link to="/login">{{ toLoginText }}</Link>
+                      {{$t('Already have an account?')}} <Link :to="`/login${route.query.next ? `?next=${route.query.next}` : ''}`">{{ $t('login here') }}</Link>
                   </p>
                 </div>
             </div>
@@ -133,7 +133,7 @@
 
 
 <script setup lang="ts">
-import { onMounted, ref, computed, Ref } from 'vue';
+import { onMounted, ref, computed, Ref, onBeforeMount } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
 import { callAdminForthApi, loadFile, applyRegexValidation } from '@/utils';
@@ -161,7 +161,6 @@ const sentToEmail: Ref<string> = ref('');
 
 const requestEmailConfirmation = computed(() => route.meta.requestEmailConfirmation);
 const verifyToken = computed(() => route.query.token);
-const toLoginText = computed(() => verifyToken.value ? t('Go to login') : t('Back to login'));
 const isPasswordNeeded = computed(() => !requestEmailConfirmation.value || (requestEmailConfirmation.value && verifyToken.value));
 
 const user = useUserStore();
@@ -230,7 +229,36 @@ const passwordConstraints: Ref<{
   validation: '',
 });
 
+// implement something similar to beforeEnter
+// beforeEnter: async (to, from, next) => {
+//         if(localStorage.getItem('isAuthorized') === 'true') {
+//           // check if url has next=... and redirect to it
+//           console.log('to.query', to.query)
+//           if (to.query.next) {
+//             next(to.query.next.toString())
+//           } else {
+//             next({name: 'home'});
+//           }
+//         } else {
+//           next()
+//         }
+//       } 
+
+onBeforeMount(() => {
+  if (localStorage.getItem('isAuthorized') === 'true') {
+    // if route has next param, redirect
+    coreStore.fetchMenuAndResource();
+    if (route.query.next) {
+      router.push(route.query.next.toString());
+    } else {
+      router.push({ name: 'home' });
+    }
+  }
+})
+
 onMounted(async () => {
+
+
   await coreStore.getPublicConfig();
   // getPasswordConstraints
   passwordConstraints.value = await callAdminForthApi({

package/dist/custom/SignupUnderLogin.vue

@@ -1,7 +1,7 @@
 <template>
   <p class="text-gray-500 dark:text-gray-400 font-sm text-left mt-3">
     {{$t('Have no account?')}} 
-    <Link to="/signup">
+    <Link :to="`/signup${route.query.next ? `?next=${route.query.next}` : ''}`">
       {{$t('sign up now')}}
     </Link>
   </p>
@@ -9,5 +9,8 @@
 
 <script setup>
 import Link from '@/afcl/Link.vue';
+import { useRoute } from 'vue-router';
+
+const route = useRoute();
 
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/open-signup",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",