edits

GenerateNU · Apr 17, 2024 · 79210dc · 79210dc
1 parent b805336
commit 79210dc
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 27 deletions.
diff --git a/website/package-lock.json b/website/package-lock.json
diff --git a/website/package.json b/website/package.json
@@ -16,6 +16,7 @@
     "mui": "^0.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-router-dom": "^6.22.3",
     "react-scripts": "^5.0.1",
     "typescript": "^4.9.5",
     "web-vitals": "^2.1.4"

diff --git a/website/src/App.tsx b/website/src/App.tsx
@@ -1,33 +1,18 @@
-// src/App.tsx
-
 import React from 'react';
 import AboutPage from './components/AboutPage';
-import logo from './logo.svg';
 import './App.css';
-import ProductPurchasePage from './ProductPurchasePage';
+import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
+import ProductPurchasePage from './components/ProductPurchasePage';
 
 const App: React.FC = () => {
   return (
-    <div className=" h-full w-full">
-      <AboutPage />
-    <div className="App">
-    <div>
-      <ProductPurchasePage />
-    </div>
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.tsx</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
+    <div className="h-full w-full">
+      <Router>
+      <Routes>
+        <Route path="/" element={<AboutPage />} />
+        <Route path="/product-purchase" element={<ProductPurchasePage />} />
+      </Routes>
+    </Router>
     </div>
   );
 };

diff --git a/website/src/ProductPurchasePage.tsx → ...te/src/components/ProductPurchasePage.tsx b/website/src/ProductPurchasePage.tsx → ...te/src/components/ProductPurchasePage.tsx
@@ -1,5 +1,7 @@
-import PersonalInfoForm from './PersonalInfoForm';
-import BigGrayWordmark from './BigGrayWordmarkSVG';
+import PersonalInfoForm from '../PersonalInfoForm';
+import BigGrayWordmark from '../BigGrayWordmarkSVG';
+import Footer from './Footer';
+import MailingList from './MailingList';
 
 function ProductPurchasePage() {
   return (
@@ -10,7 +12,7 @@ function ProductPurchasePage() {
             <div className='bigWordmark'>
               <BigGrayWordmark />
             </div>
-            <PersonalInfoForm/>
+              <PersonalInfoForm/>
           </div>
         </div>
       </div>
@@ -36,6 +38,9 @@ function ProductPurchasePage() {
         </div>
       </div>
     </div>
+    <div>
+      <Footer />
+    </div>
   </div>
   );
 }