+ {[
+ { label: "Shop", path: "/products" },
+ { label: "Sell", path: "/sell" },
+ { label: "Student Organizations", path: "/organizations" },
+ ].map((val) => (
-
-
- {user ? (
-
- ) : (
-
- )}
-
-
+ ))}
+
+
diff --git a/frontend/src/index.css b/frontend/src/index.css
index b5c61c9..d26d7a0 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,3 +1,5 @@
+@import url("https://fonts.googleapis.com/css2?family=Rubik:wght@300;400;500;600;700&display=swap");
+
@tailwind base;
@tailwind components;
@tailwind utilities;
diff --git a/frontend/src/pages/Home.tsx b/frontend/src/pages/Home.tsx
index 3843f61..b5eada6 100644
--- a/frontend/src/pages/Home.tsx
+++ b/frontend/src/pages/Home.tsx
@@ -1,55 +1,33 @@
import { useContext } from "react";
-import { Helmet } from "react-helmet-async";
import { Navigate } from "react-router-dom";
+import { Header } from "src/components/Header";
import { FirebaseContext } from "src/utils/FirebaseProvider";
const buttonStyles =
- "bg-slate-800 text-white py-3 px-4 rounded-md mt-2 hover:bg-slate-900 transition-colors w-full sm:w-fit flex flex-row gap-3 justify-center";
+ "text-gray-400 text-lg border-2 shadow-md py-2 px-4 rounded-full hover:bg-gray-200 transition-colors w-full sm:w-fit flex items-center justify-center";
export function Home() {
- const { user, openGoogleAuthentication, signOutFromFirebase } = useContext(FirebaseContext);
+ const { user, openGoogleAuthentication } = useContext(FirebaseContext);
if (user) {
return
;
}
return (
- <>
-
- Low-Price Center
-
-
-
-
- Welcome to
-
- Low-Price Center
-
-
-
- An online marketplace made by and for UCSD students
- to buy and sell goods.
-
-
- {user ? (
-
- ) : (
-
- )}
-
-
-
-
-
- >
+
+
+
+
+ Low
+ Price Center
+
+
+
Log in to sell on Low Price Center
+
+
+
+
);
}
diff --git a/frontend/src/pages/Marketplace.tsx b/frontend/src/pages/Marketplace.tsx
index a80effd..0e8ef17 100644
--- a/frontend/src/pages/Marketplace.tsx
+++ b/frontend/src/pages/Marketplace.tsx
@@ -1,9 +1,10 @@
-import { useState, useEffect, useContext } from "react";
+import { useContext, useEffect, useState } from "react";
import { Helmet } from "react-helmet-async";
+import { get, post } from "src/api/requests";
+import { Header } from "src/components/Header";
import Product from "src/components/Product";
import SearchBar from "src/components/SearchBar";
import { FirebaseContext } from "src/utils/FirebaseProvider";
-import { get, post } from "src/api/requests";
export function Marketplace() {
const [products, setProducts] = useState<
@@ -50,6 +51,7 @@ export function Marketplace() {
return (
<>
+
Low-Price Center Marketplace
@@ -86,6 +88,7 @@ export function Marketplace() {
))}
+