diff --git a/frontend/src/routes/AppRoutes.tsx b/frontend/src/routes/AppRoutes.tsx
index e226060..eef8676 100644
--- a/frontend/src/routes/AppRoutes.tsx
+++ b/frontend/src/routes/AppRoutes.tsx
@@ -6,8 +6,9 @@ import MainPage from "../main-page/MainPage";
import Login from "../Login";
import Register from "../Register";
import RegisterLanding from "../RegisterLanding";
-import { getAppStore } from "../external/bcanSatchel/store"
+import { getAppStore } from "../external/bcanSatchel/store";
import RestrictedPage from "../main-page/restricted/RestrictedPage";
+import Footer from "../main-page/Footer";
/**
* AppRoutes:
@@ -18,34 +19,70 @@ const AppRoutes = observer(() => {
const { isAuthenticated } = useAuthContext();
const user = getAppStore().user;
+ const FooterLayout = ({ children }: { children: React.ReactNode }) => {
+ return (
+
+ );
+ };
+
return (
: }
+ element={
+ isAuthenticated ? (
+
+ ) : (
+
+
+
+ )
+ }
/>
:
+ isAuthenticated ? (
+
+ ) : (
+
+
+
+ )
}
- />
+ />
}
+ element={
+
+
+
+ }
+ />
+
+
+
+ }
/>
- } />
-
+
{/* Check user status and render MainPage or redirect */}
-
- :
- }
+ user?.position === "Inactive" ? (
+
+ ) : (
+
+ )
+ }
/>
-
+
{
);
});
-export default AppRoutes;
\ No newline at end of file
+export default AppRoutes;
diff --git a/frontend/src/styles/Footer.css b/frontend/src/styles/Footer.css
index 4911d45..fe1cce9 100644
--- a/frontend/src/styles/Footer.css
+++ b/frontend/src/styles/Footer.css
@@ -1,31 +1,28 @@
.footer {
- display: flex;
- justify-content: space-evenly;
- align-items: center;
- flex-direction: column;
- height: 100%;
-flex-grow: 1;
+ display: flex;
+ justify-content: space-evenly;
+ align-items: center;
+ flex-direction: column;
+ flex-grow: 1;
-
- background-color: white;
- border-color: var(--color-grey-100);
- width: 100%;
- padding: 1em;
-
- /* Text */
- font-size: 1.3rem;
- color: var(--color-grey-700);
+ border-color: var(--color-grey-100);
+ width: 100%;
+ padding: 1em;
+
+ /* Text */
+ font-size: var(--font-size-base);
+ color: var(--color-grey-700);
}
.text-block {
- width: 50%;
- display: flex;
- flex-direction: column;
- padding: 8px;
+ width: 50%;
+ display: flex;
+ flex-direction: column;
+ padding: 8px;
}
.northeastern-uni-caption {
- font-size: 0.90rem;
- line-height: 1rem;
- color: var(--color-grey-600);
-}
\ No newline at end of file
+ font-size: var(--font-size-sm);
+ line-height: 1rem;
+ color: var(--color-grey-600);
+}
diff --git a/frontend/src/styles/index.css b/frontend/src/styles/index.css
index e75001e..a4ad591 100644
--- a/frontend/src/styles/index.css
+++ b/frontend/src/styles/index.css
@@ -68,6 +68,7 @@
--color-grey-400: #ced4da;
--color-grey-300: #dee2e6;
--color-grey-200: #e9ecef;
+ --color-grey-150: #F2F2F2;
--color-grey-100: #f8f9fa;
--color-black: #000000;
@@ -80,7 +81,7 @@
color-scheme: light dark;
color: rgba(0, 0, 0, 0.87);
- background-color: var(--color-grey-200);
+ background-color: var(--color-grey-150);
font-synthesis: none;
text-rendering: optimizeLegibility;
diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts
index 557ecb6..9b53cff 100644
--- a/frontend/tailwind.config.ts
+++ b/frontend/tailwind.config.ts
@@ -62,6 +62,7 @@ export default {
400: "#CED4DA",
300: "#DEE2E6",
200: "#E9ECEF",
+ 150: "#F2F2F2",
100: "#F8F9FA",
},