Merge branch 'main' of github.com:devforth/adminforth into main

Author: ivictbor

adminforth/documentation/docs/tutorial/03-Customization/01-branding.md

@@ -83,11 +83,8 @@ In `index.ts` file set the `styles` property in the configuration:
 const admin = new AdminForth({
   ...
   customization: {
-//diff-add
     styles: {
-//diff-add
       colors: {
-//diff-add
         light: {
 //diff-add
           // color for links, icons etc.
@@ -101,11 +98,8 @@ const admin = new AdminForth({
           sidebar: { main: '#f9fafb', text: '#213045' },
 //diff-add
           sidebar: {main:'#571e58', text:'white'},
-//diff-add
         },
-//diff-add
       }
-//diff-add
     } 
   },
   ...

adminforth/spa/src/router/index.ts

@@ -15,19 +15,19 @@ const router = createRouter({
         title: 'Login', 
         customLayout: true 
       },
-      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()
-        }
-      }
+      // 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()
+      //   }
+      // }
     },
     {
       path: '/resource/:resourceId',

adminforth/spa/src/views/LoginView.vue

@@ -113,18 +113,19 @@
 <script setup>
 
 import { getCustomComponent } from '@/utils';
-import { onMounted, ref, computed } from 'vue';
+import { onBeforeMount, onMounted, ref, computed } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { useUserStore } from '@/stores/user';
 import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbite';
 import { callAdminForthApi, loadFile } from '@/utils';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { Button, Checkbox } from '@/afcl';
 
 const passwordInput = ref(null);
 const usernameInput = ref(null);
 const rememberMeValue= ref(false);
 
+const route = useRoute();
 const router = useRouter();
 const inProgress = ref(false);
 
@@ -139,6 +140,18 @@ const backgroundPosition = computed(() => {
   return coreStore.config?.loginBackgroundPosition || '1/2';
 });
 
+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 () => {
     if (coreStore.config?.demoCredentials) {
       const [username, password] = coreStore.config.demoCredentials.split(':');