diff --git a/src/app/_components/footer.tsx b/src/app/_components/footer.tsx
new file mode 100644
index 00000000..4ec13920
--- /dev/null
+++ b/src/app/_components/footer.tsx
@@ -0,0 +1,91 @@
+import { Box, Container, Link, Paper, Typography, useTheme } from '@mui/material';
+import NextLink from 'next/link';
+
+function ImgCopyright() {
+ return (
+
+ Thank you to CMDR RaZ uryel for the background image
+
+ );
+}
+function Copyright() {
+ return (
+
+ {'Copyright © '}
+
+ United Systems Cooperative
+ {' '}
+ {new Date().getFullYear()}
+ {'.'}
+
+ );
+}
+
+function SiteMap() {
+ return (
+
+
+ Home
+ {' '}
+ |{' '}
+
+ About
+ {' '}
+ |{' '}
+
+ Information
+ {' '}
+ |{' '}
+
+ USC Builds
+ {' '}
+ |{' '}
+
+ Massacre Tracker
+ {' '}
+ |{' '}
+
+ Merch
+ {' '}
+ |{' '}
+
+ Admin
+ {' '}
+ |{' '}
+
+ Developer
+ {' '}
+ |{' '}
+
+ Release Notes
+
+
+ );
+}
+
+export const Footer = ({ version }: { version: string }) => {
+ return (
+
+
+
+
+
+
+
+ Version: {version}
+
+
+
+
+ );
+};
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 1f7a25c6..a5849c09 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,9 +1,11 @@
import { theme } from '@/styles/theme';
-import { CssBaseline, ThemeProvider } from '@mui/material';
+import { Box, CssBaseline, ThemeProvider } from '@mui/material';
import { AppRouterCacheProvider } from '@mui/material-nextjs/v14-appRouter';
import { Roboto } from 'next/font/google';
import { AuthSessionProvider } from './_components/auth-session-provider';
import { Navbar } from './_components/navbar';
+import { Footer } from './_components/footer';
+import info from '../../package.json';
const roboto = Roboto({
weight: ['300', '400', '500', '700'],
@@ -20,8 +22,13 @@ export default function RootLayout({ children }: { children: React.ReactNode })
-
- {children}
+
+
+
+ {children}
+
+
+
diff --git a/src/pages/not-found.tsx b/src/app/not-found.tsx
similarity index 72%
rename from src/pages/not-found.tsx
rename to src/app/not-found.tsx
index ebdd414f..2fe24276 100644
--- a/src/pages/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -1,22 +1,23 @@
import { Box, Container, Link, Paper, Typography } from '@mui/material';
-import Head from 'next/head';
+import { Metadata } from 'next';
import Image from 'next/image';
import NextLink from 'next/link';
import errorImg from 'public/img/404.jpg';
-const NotFoundPage = () => {
+export const metadata: Metadata = {
+ title: 'United Systems Cooperative',
+ description: 'not found page',
+};
+
+export default function NotFoundPage() {
return (
<>
-
- United Systems Cooperative
-
-
Mistakes were made
You were hyperdicted... escape destruction by going{' '}
-
+
home
.
@@ -31,6 +32,4 @@ const NotFoundPage = () => {
>
);
-};
-
-export default NotFoundPage;
+}
diff --git a/src/layouts/components/footer.tsx b/src/layouts/components/footer.tsx
index 8f0c498d..aacdf16f 100644
--- a/src/layouts/components/footer.tsx
+++ b/src/layouts/components/footer.tsx
@@ -24,39 +24,39 @@ function Copyright() {
function SiteMap() {
return (
-
+
Home
{' '}
|{' '}
-
+
About
{' '}
|{' '}
-
+
Information
{' '}
|{' '}
-
+
USC Builds
{' '}
|{' '}
-
+
Massacre Tracker
{' '}
|{' '}
-
+
Merch
{' '}
|{' '}
-
+
Admin
{' '}
|{' '}
-
+
Developer
{' '}
|{' '}
-
+
Release Notes
diff --git a/src/layouts/components/navLink.tsx b/src/layouts/components/navLink.tsx
index 027278f0..e5b08cfa 100644
--- a/src/layouts/components/navLink.tsx
+++ b/src/layouts/components/navLink.tsx
@@ -3,13 +3,10 @@ import { useRouter } from 'next/router';
import { cloneElement } from 'react';
export default function NavLink({ href, children }: { href: string; children: JSX.Element }) {
- const router = useRouter();
+ const pathName = useRouter().pathname;
let className = children.props.className || '';
- if (
- href === router.pathname ||
- (router.pathname.length > 1 && router.pathname.startsWith(href))
- ) {
+ if (pathName && (href === pathName || (href.length > 1 && pathName.startsWith(href)))) {
className = `${className} active`;
}