diff --git a/frontend/public/csesLogo.png b/frontend/public/csesLogo.png new file mode 100644 index 0000000..b31b41b Binary files /dev/null and b/frontend/public/csesLogo.png differ diff --git a/frontend/public/ucsdLogo.png b/frontend/public/ucsdLogo.png new file mode 100644 index 0000000..36323c8 Binary files /dev/null and b/frontend/public/ucsdLogo.png differ diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 2a21084..90bcc50 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -10,6 +10,7 @@ import { AddProduct } from "../src/pages/AddProduct"; import { EditProduct } from "../src/pages/EditProduct"; import { IndividualProductPage } from "../src/pages/Individual-product-page"; import { PageNotFound } from "../src/pages/PageNotFound"; +import { AboutUsPage } from "../src/pages/AboutUs"; import FirebaseProvider from "../src/utils/FirebaseProvider"; import { SavedProducts } from "./pages/SavedProducts"; @@ -58,6 +59,7 @@ const router = createBrowserRouter([ ), }, + { path: "/about-us", element: }, { path: "*", element: , diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index b35b3c6..0e6e144 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -1,4 +1,11 @@ -import { faBars, faCartShopping, faUser, faXmark, faHeart } from "@fortawesome/free-solid-svg-icons"; +import { + faBars, + faCartShopping, + faUser, + faXmark, + faHeart, + faMoneyBill, +} from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { useContext, useEffect, useRef, useState } from "react"; import { FirebaseContext } from "src/utils/FirebaseProvider"; @@ -70,13 +77,23 @@ export function Navbar() { hidden={user === null} onClick={() => (window.location.href = "/saved-products")} className="font-inter px-4 py-1 bg-transparent border-transparent rounded hover:bg-ucsd-darkblue transition-colors" + > + + Saved + + +
  • +
  • @@ -129,6 +146,20 @@ export function Navbar() { Products
  • +
  • + +
  • {user ? ( +
    About Us
    +
    + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt + ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation + ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in + reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur + sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id + est laborum. +
    + +
    + cses + ucsd +
    + + ); +}