Merge pull request #1 from Tianyou-Xie/dev

Merge about and readme features to main
Tianyou-Xie · May 8, 2024 · ad0e7a1 · ad0e7a1
2 parents b16aeea + 105a44b
commit ad0e7a1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/client/src/index.tsx b/client/src/index.tsx
@@ -4,6 +4,7 @@ import ReactDOM from 'react-dom/client';
 import { Route, Switch } from 'wouter';
 import IndexPage from './pages';
 import GoodbyePage from './pages/goodbye';
+import About from './pages/about';
 
 import './index.css';
 
@@ -12,7 +13,7 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
 		<Switch>
 			<Route path='/' component={IndexPage} />
 			<Route path='/goodbye' component={GoodbyePage} />
-
+			<Route path='/about' component={About} />
 			<Route>404 Not Found</Route>
 		</Switch>
 	</React.StrictMode>,

diff --git a/client/src/pages/about/index.tsx b/client/src/pages/about/index.tsx
@@ -0,0 +1,19 @@
+const About = () => {
+    return (
+        <html>
+        <body>
+        Team Name: BBY-07
+        Team Members:
+        <ul>
+            <li> Ole Lammers </li>
+            <li> Kamal Dolikay </li>
+            <li> Marcus V Lages </li>
+            <li> Tianyou Xie </li>
+            <li> Samarjit Bhogal </li>
+        </ul>
+        </body>
+        </html>
+    );
+}
+
+export default About;