PR1: Moved the routes array to RouteConfig.js

src/Components/Routing/PrivateRoute.js

@@ -1,16 +1,31 @@
 import React from 'react';
 import { Route, Redirect } from 'react-router-dom';
+import { membershipState } from '../../Enums';
+import { allowedIf } from '../../Routes';
+import { useUser } from '../../Components/context/UserContext';
 
 export default function PrivateRoute({
   component: Component,
   appProps,
   ...params
 }) {
+  const { user } = useUser();
+
+  // Check if the user's access level matches with route's access grant
+  const PERMISSION_LOOKUP_TABLE = {
+    [allowedIf.MEMBER]: user?.accessLevel >= membershipState.MEMBER,
+    [allowedIf.OFFICER_OR_ADMIN]: user?.accessLevel >= membershipState.OFFICER,
+    [allowedIf.AUTHENTICATED]: !!appProps.authenticated,
+    [allowedIf.UNAUTHENTICATED]: !appProps.authenticated,
+  };
+
+  const isAllowed = PERMISSION_LOOKUP_TABLE[appProps.allowed] ?? false;
+
   return (
     <Route
       {...params}
       render={(props) => {
-        if (appProps.allowed) {
+        if (isAllowed) {
           return <Component {...appProps} {...props} />;
         } else if (appProps.authenticated) {
           return (

src/Routes.js

@@ -0,0 +1,184 @@
+import Overview from './Pages/Overview/Overview.js';
+import Login from './Pages/Login/Login.js';
+import ForgotPassword from './Pages/ForgotPassword/ForgotPassword.js';
+import ResetPasswordPage from './Pages/ForgotPassword/ResetPassword.js';
+import Profile from './Pages/Profile/MemberView/Profile.js';
+import LedSign from './Pages/LedSign/LedSign.js';
+import EditUserInfo from './Pages/UserManager/EditUserInfo.js';
+import MembershipApplication from './Pages/MembershipApplication/MembershipApplication.js';
+import VerifyEmailPage from './Pages/MembershipApplication/VerifyEmail.js';
+import Printing from './Pages/2DPrinting/2DPrinting.js';
+import AdvertisementAdmin from './Pages/Advertisement/AdvertisementAdmin.js';
+import AboutPage from './Pages/About/About.js';
+import ProjectsPage from './Pages/Projects/Projects.js';
+import URLShortenerPage from './Pages/URLShortener/URLShortener.js';
+import EmailPreferencesPage from './Pages/EmailPreferences/EmailPreferences.js';
+import sendUnsubscribeEmail from './Pages/Profile/admin/SendUnsubscribeEmail.js';
+import Messaging from './Pages/Messaging/Messaging.js';
+import Home from './Pages/Home/Home.js';
+import CardReader from './Pages/CardReader/CardReader.js';
+
+// Declare an enum for permission check
+export const allowedIf = {
+  UNAUTHENTICATED: 'UNAUTHENTICATED',
+  AUTHENTICATED: 'AUTHENTICATED',
+  MEMBER: 'MEMBER',
+  OFFICER_OR_ADMIN: 'OFFICER_OR_ADMIN',
+};
+
+export const notAuthenticatedRoutes = [
+  {
+    Component: Login,
+    path: '/login*',
+    pageName: 'Login',
+    allowedIf: allowedIf.UNAUTHENTICATED,
+    redirect: '/',
+    queryParams: {
+      redirect: 'redirect',
+    },
+  },
+  {
+    Component: ForgotPassword,
+    path: '/forgot',
+    pageName: 'Forgot Password',
+    allowedIf: allowedIf.UNAUTHENTICATED,
+    redirect: '/'
+  },
+  {
+    Component: MembershipApplication,
+    path: '/register',
+    pageName: 'Sign Up',
+    allowedIf: allowedIf.UNAUTHENTICATED,
+    redirect: '/'
+  },
+];
+
+const authenticatedRoutes = [
+  {
+    Component: Profile,
+    path: '/profile',
+    pageName: 'Profile',
+    allowedIf: allowedIf.AUTHENTICATED,
+    redirect: '/login'
+  },
+];
+
+export const memberRoutes = [
+  {
+    Component: Printing,
+    path: '/2DPrinting',
+    pageName: '2D Printing',
+    allowedIf: allowedIf.MEMBER,
+    redirect: '/login'
+  },
+  {
+    Component: Messaging,
+    path: '/messaging/:id?',
+    pageName: 'Messaging',
+    allowedIf: allowedIf.MEMBER,
+    redirect: '/login'
+  },
+  ...authenticatedRoutes,
+];
+
+export const officerOrAdminRoutes = [
+  // new for Overview
+  {
+    Component: Overview,
+    path: '/user-manager',
+    pageName: 'User Manager',
+    allowedIf: allowedIf.OFFICER_OR_ADMIN,
+    redirect: '/',
+    inAdminNavbar: true
+  },
+  //
+  // {
+  //   Component: EmailPage,
+  //   path: '/email-list',
+  //   allowedIf: userIsOfficerOrAdmin,
+  //   redirect: '/',
+  //   inAdminNavbar: true
+  // },
+  {
+    Component: LedSign,
+    path: '/led-sign',
+    pageName: 'Led Sign',
+    allowedIf: allowedIf.OFFICER_OR_ADMIN,
+    redirect: '/',
+    inAdminNavbar: true
+  },
+  {
+    Component: EditUserInfo,
+    path: '/user/edit/:id',
+    pageName: 'Edit User Info',
+    allowedIf: allowedIf.OFFICER_OR_ADMIN,
+    redirect: '/',
+    inAdminNavbar: true
+  },
+  {
+    Component: URLShortenerPage,
+    path: '/short',
+    pageName: 'URL Shortener Page',
+    allowedIf: allowedIf.OFFICER_OR_ADMIN,
+    inAdminNavbar: true,
+    redirect: '/',
+  },
+  {
+    Component: sendUnsubscribeEmail,
+    path: '/unsub',
+    pageName: 'Send Unsubscribe Email',
+    allowedIf: allowedIf.OFFICER_OR_ADMIN,
+    inAdminNavbar: true,
+    redirect: '/',
+  },
+  {
+    Component: AdvertisementAdmin,
+    path: '/advertisement-admin',
+    pageName: 'Advertisement Admin',
+    allowedIf: allowedIf.OFFICER_OR_ADMIN,
+    redirect: '/',
+    inAdminNavbar: true
+  },
+  {
+    Component: CardReader,
+    path: '/card-reader',
+    pageName: 'Card Reader',
+    allowedIf: allowedIf.OFFICER_OR_ADMIN,
+    redirect: '/',
+    inAdminNavbar: true
+  },
+  ...memberRoutes,
+];
+
+export const signedOutRoutes = [
+  {
+    Component: Home,
+    path: '/',
+    pageName: 'Home Page'
+  },
+  {
+    Component: VerifyEmailPage,
+    path: '/verify',
+    pageName: 'Verify Email'
+  },
+  {
+    Component: ResetPasswordPage,
+    path: '/reset',
+    pageName: 'Reset Password'
+  },
+  {
+    Component: AboutPage,
+    path: '/about',
+    pageName: 'About Us'
+  },
+  {
+    Component: ProjectsPage,
+    path: '/projects',
+    pageName: 'Projects'
+  },
+  {
+    Component: EmailPreferencesPage,
+    path: '/emailPreferences',
+    pageName: 'Email Preferences'
+  },
+];

src/Routing.js

@@ -3,155 +3,19 @@ import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
 
 import PrivateRoute from './Components/Routing/PrivateRoute';
 import NavBarWrapper from './Components/Navbar/NavBarWrapper';
-import Overview from './Pages/Overview/Overview';
-import Login from './Pages/Login/Login';
-import ForgotPassword from './Pages/ForgotPassword/ForgotPassword';
-import ResetPasswordPage from './Pages/ForgotPassword/ResetPassword';
-import Profile from './Pages/Profile/MemberView/Profile';
-import LedSign from './Pages/LedSign/LedSign';
-import EditUserInfo from './Pages/UserManager/EditUserInfo';
 
-import Home from './Pages/Home/Home.js';
 import NotFoundPage from './Pages/NotFoundPage/NotFoundPage';
-import MembershipApplication from
-  './Pages/MembershipApplication/MembershipApplication.js';
-import VerifyEmailPage from './Pages/MembershipApplication/VerifyEmail.js';
-import Printing from './Pages/2DPrinting/2DPrinting.js';
-import AdvertisementAdmin from './Pages/Advertisement/AdvertisementAdmin.js';
-
-import { membershipState } from './Enums';
-
-import AboutPage from './Pages/About/About';
-import ProjectsPage from './Pages/Projects/Projects';
-import URLShortenerPage from './Pages/URLShortener/URLShortener';
-
-import EmailPreferencesPage from './Pages/EmailPreferences/EmailPreferences';
-
-import sendUnsubscribeEmail from './Pages/Profile/admin/SendUnsubscribeEmail';
-import Messaging from './Pages/Messaging/Messaging.js';
-
-import CardReader from './Pages/CardReader/CardReader.js';
 
 import { useUser } from './Components/context/UserContext';
 
+import { officerOrAdminRoutes, notAuthenticatedRoutes, signedOutRoutes } from './Routes.js';
+
 export default function Routing({ appProps }) {
   const { user, setUser } = useUser();
   const userIsAuthenticated = appProps.authenticated;
-  const userIsMember =
-    userIsAuthenticated &&
-    user &&
-    user.accessLevel === membershipState.MEMBER;
-  const userIsOfficerOrAdmin =
-    userIsAuthenticated &&
-    user &&
-    user.accessLevel >= membershipState.OFFICER;
-  const signedInRoutes = [
-    // new for Overview
-    {
-      Component: Overview,
-      path: '/user-manager',
-      allowedIf: userIsOfficerOrAdmin,
-      redirect: '/',
-      inAdminNavbar: true
-    },
-    //
-    // {
-    //   Component: EmailPage,
-    //   path: '/email-list',
-    //   allowedIf: userIsOfficerOrAdmin,
-    //   redirect: '/',
-    //   inAdminNavbar: true
-    // },
-    {
-      Component: LedSign,
-      path: '/led-sign',
-      allowedIf: userIsOfficerOrAdmin,
-      redirect: '/',
-      inAdminNavbar: true
-    },
-    {
-      Component: Printing,
-      path: '/2DPrinting',
-      allowedIf: userIsMember || userIsOfficerOrAdmin,
-      redirect: '/login'
-    },
-    {
-      Component: Login,
-      path: '/login*',
-      allowedIf: !userIsAuthenticated,
-      redirect: '/',
-      queryParams: {
-        redirect: 'redirect',
-      },
-    },
-    {
-      Component: ForgotPassword,
-      path: '/forgot',
-      allowedIf: !userIsAuthenticated,
-      redirect: '/'
-    },
-    {
-      Component: MembershipApplication,
-      path: '/register',
-      allowedIf: !userIsAuthenticated,
-      redirect: '/'
-    },
-    {
-      Component: Profile,
-      path: '/profile',
-      allowedIf: userIsAuthenticated,
-      redirect: '/login'
-    },
-    {
-      Component: EditUserInfo,
-      path: '/user/edit/:id',
-      allowedIf: userIsOfficerOrAdmin,
-      redirect: '/',
-      inAdminNavbar: true
-    },
-    {
-      Component: URLShortenerPage,
-      path: '/short',
-      allowedIf: userIsOfficerOrAdmin,
-      inAdminNavbar: true,
-      redirect: '/',
-    },
-    {
-      Component: sendUnsubscribeEmail,
-      path: '/unsub',
-      allowedIf: userIsOfficerOrAdmin,
-      inAdminNavbar: true,
-      redirect: '/',
-    },
-    {
-      Component: Messaging,
-      path: '/messaging/:id?',
-      allowedIf: userIsMember || userIsOfficerOrAdmin,
-      redirect: '/login'
-    },
-    {
-      Component: AdvertisementAdmin,
-      path: '/advertisement-admin',
-      allowedIf: userIsOfficerOrAdmin,
-      redirect: '/',
-      inAdminNavbar: true
-    },
-    {
-      Component: CardReader,
-      path: '/card-reader',
-      allowedIf: userIsOfficerOrAdmin,
-      redirect: '/',
-      inAdminNavbar: true
-    },
-  ];
-  const signedOutRoutes = [
-    { Component: Home, path: '/' },
-    { Component: VerifyEmailPage, path: '/verify' },
-    { Component: ResetPasswordPage, path: '/reset' },
-    { Component: AboutPage, path: '/about'},
-    { Component: ProjectsPage, path: '/projects'},
-    { Component: EmailPreferencesPage, path: '/emailPreferences' },
-  ];
+
+  const signedInRoutes = [...officerOrAdminRoutes, ...notAuthenticatedRoutes];
+
   return (
     <div>
       <Switch>