From c91f032a2d0584ce73fb20480a0df8b08c75a9ea Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Fri, 19 Jul 2024 15:13:14 +0800
Subject: [PATCH] Login Routes re

---
 src/routes/LoginRoutes.js | 227 ++++++++++++++++++--------------------
 src/routes/index.js       |   6 +-
 2 files changed, 111 insertions(+), 122 deletions(-)

diff --git a/src/routes/LoginRoutes.js b/src/routes/LoginRoutes.js
index 835823f..965cac9 100644
--- a/src/routes/LoginRoutes.js
+++ b/src/routes/LoginRoutes.js
@@ -1,5 +1,4 @@
-import { lazy, useContext } from 'react';
-import { SysContext } from "components/SysSettingProvider"
+import { lazy } from 'react';
 
 // project import
 import Loadable from 'components/Loadable';
@@ -40,121 +39,111 @@ const Payment_FPS_CallBack = Loadable(lazy(() => import('pages/Payment/FPS/fpsca
 
 // ==============================|| AUTH ROUTING ||============================== //
 
-export default function LoginRoutes(){
-
-  const { sysSetting } = useContext(SysContext);
-
-  return  {
-    path: '/',
-    element: <MainLayout />,
-    children: [
-      {
-        path: 'login',
-        element: <AuthLogin />
-      },
-      ... sysSetting?.allowRegistration ?[
-        {
-          path: 'register',
-          element: <AuthRegister />
-        },
-        {
-          path: 'registerFrom',
-          element: <RegisterForm />
-        },
-        {
-          path: 'registerFromOrganization',
-          element: <BusRegisterForm />
-        },
-        {
-          path: 'iAmSmartRegisterFrom',
-          element: <IAmSmartRegister />
-        },
-        {
-          path: 'iamsmart/registrycallback',
-          element: <IAmSmart_RegistryCallback/>
-        },
-        {
-          path: 'verify/:verifyCode/:email',
-          element: <VerifyPage/>
-        },
-      ]:[]
-      ,
-      {
-        path: 'error',
-        element: <ErrorPage/>
-      },
-      {
-        path: 'privacyPolicy',
-        element: <PrivacyPolicyPage/>
-      },
-      {
-        path: 'aboutUs',
-        element: <AboutUsPage/>
-      },
-      {
-        path: 'iamsmart/logincallback',
-        element: <IAmSmart_DirectLoginCallback/>
-      },
-      {
-        path: 'iamsmart/loginfallback',
-        element: <IAmSmart_FailCallback/>
-      },
-      {
-        path: 'iamsmart/notverify',
-        element: <FailCallback_VerifyMail/>
-      },
-      {
-        path: 'iamsmart/authcallback',
-        element: <IAmSmart_AuthCallback/>
-      },
-      {
-        path: 'iamsmart/loginFail',
-        element: <IAmSmart_FailCallback/>
-      },
-      {
-        path: 'testfps',
-        element: <Testfps/>
-      },
-      {
-        path: 'testfpscallback',
-        element: <Payment_FPS_CallBack/>
-      },
-      {
-        path: 'forgot/password',
-        element: <ForgotPassword/>
-      },
-      {
-        path: 'forgot/password/sent',
-        element: <AfterForgotPasswordPage/>
-      },
-      {
-        path: 'forgot/password/verify/:verifyCode/:email',
-        element: <ForgotPassword_Callback/>
-      },
-      {
-        path: 'forgot/password/success',
-        element: <ForgotPassword_Success/>
-      },
-      {
-        path: 'forgot/username',
-        element: <ForgotUsername/>
-      },
-      {
-        path: 'forgot/username/sent',
-        element: <AfterForgotUsernamePage/>
-      },
-      {
-        path: 'forgot/username/verify/:verifyCode/:email',
-        element: <ForgotUsername_Callback/>
-      },
-      {
-        path: 'forgot/username/success',
-        element: <ForgotUsername_Success/>
-      },
-    ]
-  };
-}
-
-// export default LoginRoutes;
-
+const LoginRoutes = {
+  path: '/',
+  element: <MainLayout />,
+  children: [
+    {
+      path: 'login',
+      element: <AuthLogin />
+    },
+    {
+      path: 'register',
+      element: <AuthRegister />
+    },
+    {
+      path: 'registerFrom',
+      element: <RegisterForm />
+    },
+    {
+      path: 'registerFromOrganization',
+      element: <BusRegisterForm />
+    },
+    {
+      path: 'iAmSmartRegisterFrom',
+      element: <IAmSmartRegister />
+    },
+    {
+      path: 'error',
+      element: <ErrorPage/>
+    },
+    {
+      path: 'privacyPolicy',
+      element: <PrivacyPolicyPage/>
+    },
+    {
+      path: 'aboutUs',
+      element: <AboutUsPage/>
+    },
+    {
+      path: 'iamsmart/logincallback',
+      element: <IAmSmart_DirectLoginCallback/>
+    },
+    {
+      path: 'iamsmart/loginfallback',
+      element: <IAmSmart_FailCallback/>
+    },
+    {
+      path: 'iamsmart/notverify',
+      element: <FailCallback_VerifyMail/>
+    },
+    {
+      path: 'iamsmart/authcallback',
+      element: <IAmSmart_AuthCallback/>
+    },
+    {
+      path: 'iamsmart/registrycallback',
+      element: <IAmSmart_RegistryCallback/>
+    },
+    {
+      path: 'iamsmart/loginFail',
+      element: <IAmSmart_FailCallback/>
+    },
+    {
+      path: 'verify/:verifyCode/:email',
+      element: <VerifyPage/>
+    },
+    {
+      path: 'testfps',
+      element: <Testfps/>
+    },
+    {
+      path: 'testfpscallback',
+      element: <Payment_FPS_CallBack/>
+    },
+    {
+      path: 'forgot/password',
+      element: <ForgotPassword/>
+    },
+    {
+      path: 'forgot/password/sent',
+      element: <AfterForgotPasswordPage/>
+    },
+    {
+      path: 'forgot/password/verify/:verifyCode/:email',
+      element: <ForgotPassword_Callback/>
+    },
+    {
+      path: 'forgot/password/success',
+      element: <ForgotPassword_Success/>
+    },
+    {
+      path: 'forgot/username',
+      element: <ForgotUsername/>
+    },
+    {
+      path: 'forgot/username/sent',
+      element: <AfterForgotUsernamePage/>
+    },
+    {
+      path: 'forgot/username/verify/:verifyCode/:email',
+      element: <ForgotUsername_Callback/>
+    },
+    {
+      path: 'forgot/username/success',
+      element: <ForgotUsername_Success/>
+    },
+  ]
+};
 
+export default LoginRoutes;
diff --git a/src/routes/index.js b/src/routes/index.js
index ea0c4e8..178822c 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -51,9 +51,9 @@ export default function ThemeRoutes() {
             path: '/dashboard',
             element: <Navigate to="/login" />
     },
-    isUserLoggedIn() && isINDLoggedIn() || isUserLoggedIn() && isORGLoggedIn() ? PublicUserRoutes : LoginRoutes(),
-    isUserLoggedIn() && isGLDLoggedIn() ? SettingRoutes : LoginRoutes(),
-    isUserLoggedIn() && isGLDLoggedIn() ? GLDUserRoutes : LoginRoutes(),
+    isUserLoggedIn() && isINDLoggedIn() || isUserLoggedIn() && isORGLoggedIn() ? PublicUserRoutes : LoginRoutes,
+    isUserLoggedIn() && isGLDLoggedIn() ? SettingRoutes : LoginRoutes,
+    isUserLoggedIn() && isGLDLoggedIn() ? GLDUserRoutes : LoginRoutes,
     !isUserLoggedIn() ? {
         path: '*',
         element: <Navigate to="/login" />