Merge pull request #12 from codedthemes/bugfix

login url main routes name change

src/layouts/full/vertical-sidebar/sidebarItem.ts

@@ -44,7 +44,7 @@ const sidebarItem: menu[] = [
       {
         title: 'Login',
         icon: CircleIcon,
-        to: '/auth/login'
+        to: '/auth/login1'
       },
       {
         title: 'Register',

src/router/AuthRoutes.ts

@@ -7,7 +7,7 @@ const AuthRoutes = {
   children: [
     {
       name: 'Login',
-      path: '/auth/login',
+      path: '/auth/login1',
       component: () => import('@/views/authentication/auth/LoginPage.vue')
     },
     {

src/router/MainRoutes.ts

@@ -1,9 +1,9 @@
 const MainRoutes = {
   path: '/main',
   meta: {
-    requiresAuth: false
+    requiresAuth: true
   },
-  redirect: '/dashboard/default',
+  redirect: '/main/dashboard/default',
   component: () => import('@/layouts/full/FullLayout.vue'),
   children: [
     {

src/router/index.ts

@@ -32,14 +32,14 @@ interface AuthStore {
 
 router.beforeEach(async (to, from, next) => {
   // redirect to login page if not logged in and trying to access a restricted page
-  const publicPages = ['/auth/login'];
+  const publicPages = ['/auth/login1'];
   const authRequired = !publicPages.includes(to.path);
   const auth: AuthStore = useAuthStore();
 
   if (to.matched.some((record) => record.meta.requiresAuth)) {
     if (authRequired && !auth.user) {
       auth.returnUrl = to.fullPath;
-      return next('/auth/login');
+      return next('/auth/login1');
     } else next();
   } else {
     next();

src/stores/auth.ts

@@ -22,12 +22,12 @@ export const useAuthStore = defineStore({
       // store user details and jwt in local storage to keep user logged in between page refreshes
       localStorage.setItem('user', JSON.stringify(user));
       // redirect to previous url or default to home page
-      router.push(this.returnUrl || '/dashboard/default');
+      router.push(this.returnUrl || '/');
     },
     logout() {
       this.user = null;
       localStorage.removeItem('user');
-      router.push('/auth/login');
+      router.push('/auth/login1');
     }
   }
 });

src/types/index.d.ts

@@ -0,0 +1 @@
+declare module 'lodash';

src/views/authentication/authForms/AuthRegister.vue

@@ -97,7 +97,7 @@ function validate() {
   </v-form>
   <div class="mt-5 text-right">
     <v-divider />
-    <v-btn variant="plain" to="/auth/login" class="mt-2 text-capitalize mr-n2">Already have an account?</v-btn>
+    <v-btn variant="plain" to="/auth/login1" class="mt-2 text-capitalize mr-n2">Already have an account?</v-btn>
   </div>
 </template>
 <style lang="scss">