diff --git a/client/src/components/Content/Philosophy.tsx b/client/src/components/Content/Philosophy.tsx index bef4023..0ce4e5c 100644 --- a/client/src/components/Content/Philosophy.tsx +++ b/client/src/components/Content/Philosophy.tsx @@ -1,12 +1,20 @@ +import Card from "../_ui/Card/Card"; import Page from "../_ui/Page/Page"; export default function Philosophy() { return (

The Express Spices Philosophy

+

+ Things and stuff and things and stuff and things and stuff and things and stuff and things and stuff and things.
+ Furthermore, things and stuff and things and stuff and things and stuff and things and stuff and things and stuff and things. +

-

Things and stuff and things and stuff and things and stuff and things and stuff and things and stuff and things.

-

Furthermore, things and stuff and things and stuff and things and stuff and things and stuff and things and stuff and things.

+ + +

+ We care a lot about things and stuff at Express Spice Market. If you're ever concerned about our things and stuff we will do what we can to alleviate your concerns. +

) } \ No newline at end of file diff --git a/client/src/components/Home.tsx b/client/src/components/Home.tsx index 4bcc83c..f95ce50 100644 --- a/client/src/components/Home.tsx +++ b/client/src/components/Home.tsx @@ -1,5 +1,6 @@ import { useNavigate } from "react-router-dom" import Button from "./_ui/Button/Button"; +import Card from "./_ui/Card/Card"; import Page from "./_ui/Page/Page"; export default function Home() { @@ -7,14 +8,21 @@ export default function Home() { return ( -

The finest spice shop on the internet.

-

Or at the very least, what their website could look like.

+ +

The finest spice shop on the internet.

+

Or at the very least, what their website could look like.

+
-
- - - -
+ + + +

Our mission: to deliver quality herbs and spices.
See our offerings and learn more about us below:

+
+ + + +
+
) } \ No newline at end of file diff --git a/client/src/components/Nav/Navbar.scss b/client/src/components/Nav/Navbar.scss index eca2898..dffe5e4 100644 --- a/client/src/components/Nav/Navbar.scss +++ b/client/src/components/Nav/Navbar.scss @@ -1,5 +1,22 @@ +@import "../../sass/helpers/variables"; + #navbar-section { - background-color: green; + background-color: $coffee; display: flex; align-items: baseline; + justify-content: space-between; + + a { + margin: 0 0 0 1rem; + color: $nutmeg; + } + + .user-data { + display: flex; + width: 50%; + justify-content: flex-end; + .ui-button-component { + margin: 0 6px; + } + } } \ No newline at end of file diff --git a/client/src/components/Nav/Navbar.tsx b/client/src/components/Nav/Navbar.tsx index e3c539d..07051d0 100644 --- a/client/src/components/Nav/Navbar.tsx +++ b/client/src/components/Nav/Navbar.tsx @@ -1,6 +1,7 @@ import { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; import { useSupabase } from "../../supabase/SupabaseContext" +import Button from "../_ui/Button/Button"; import "./Navbar.scss"; export default function Navbar() { @@ -24,15 +25,15 @@ export default function Navbar() { user?.email && ( <>

{user.email}

- + ) } { - user ? : ( + user ? : ( <> - - + + ) } diff --git a/client/src/components/Product/AllProducts.tsx b/client/src/components/Product/AllProducts.tsx index 7f3882e..fe1229d 100644 --- a/client/src/components/Product/AllProducts.tsx +++ b/client/src/components/Product/AllProducts.tsx @@ -9,7 +9,7 @@ import ProductCard from "./ProductCard"; export default function AllProducts() { const [productData, setProductData] = useState(); - const [view, setView] = useState(

Loading...

); + const [view, setView] = useState(

Loading...

); useEffect(() => { getAllProducts() @@ -23,10 +23,10 @@ export default function AllProducts() { useEffect(() => { setView( - +

Product Catalog

- +

Filter results by: