From 81332abdb0ce7c8a087d9418319e575d7612648f Mon Sep 17 00:00:00 2001
From: sajjadtalkhabi <97734061+sajjadtalkhabi@users.noreply.github.com>
Date: Tue, 18 Aug 2026 09:08:45 +0330
Subject: [PATCH] fix: bugs

---
 src/features/auth/composables/useRedirectAfterLogin.js | 3 +--
 src/router/guards.js                                   | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/features/auth/composables/useRedirectAfterLogin.js b/src/features/auth/composables/useRedirectAfterLogin.js
index 78e3d08..edf182e 100644
--- a/src/features/auth/composables/useRedirectAfterLogin.js
+++ b/src/features/auth/composables/useRedirectAfterLogin.js
@@ -2,8 +2,7 @@ import { useAuthStore } from '@/store/auth'
 import { useRoute, useRouter } from 'vue-router'
 import { MAIN_SITE_URL, ROLE_HOME_ROUTES } from '@/enums'
 
-export const shouldLandOnMainSite = (auth) =>
-  auth.role !== 'admin' && auth.user?.status === 'approved'
+const shouldLandOnMainSite = (auth) => auth.role !== 'admin' && auth.user?.status === 'approved'
 
 export const useRedirectAfterLogin = () => {
   const router = useRouter()
diff --git a/src/router/guards.js b/src/router/guards.js
index 56de0fe..f1843ce 100644
--- a/src/router/guards.js
+++ b/src/router/guards.js
@@ -1,7 +1,6 @@
+import { ROLE_HOME_ROUTES } from '@/enums'
 import { useAuthStore } from '@/store/auth'
-import { MAIN_SITE_URL, ROLE_HOME_ROUTES } from '@/enums'
 import { tokenService } from '@/services/api/token-service'
-import { shouldLandOnMainSite } from '@/features/auth/composables/useRedirectAfterLogin'
 
 const APP_TITLE = 'مدرسه بانو'
 
@@ -20,10 +19,6 @@ export const guestGuard = (to) => {
   if (!to.meta?.requiresGuest) return
   if (tokenService.hasToken()) {
     const auth = useAuthStore()
-    if (shouldLandOnMainSite(auth)) {
-      window.location.href = MAIN_SITE_URL
-      return false
-    }
     return { name: ROLE_HOME_ROUTES[auth.role] || 'student-dashboard' }
   }
   return