diff --git a/public/merch/crewneck.png b/public/merch/crewneck.png new file mode 100644 index 0000000..344fbfe Binary files /dev/null and b/public/merch/crewneck.png differ diff --git a/public/merch/keychains.png b/public/merch/keychains.png new file mode 100644 index 0000000..e88dc30 Binary files /dev/null and b/public/merch/keychains.png differ diff --git a/public/merch/lanyard.png b/public/merch/lanyard.png new file mode 100644 index 0000000..64c28dd Binary files /dev/null and b/public/merch/lanyard.png differ diff --git a/public/merch/stickers.png b/public/merch/stickers.png new file mode 100644 index 0000000..af63c75 Binary files /dev/null and b/public/merch/stickers.png differ diff --git a/public/merch/t-shirt1.png b/public/merch/t-shirt1.png new file mode 100644 index 0000000..6396a58 Binary files /dev/null and b/public/merch/t-shirt1.png differ diff --git a/public/merch/t-shirt2.png b/public/merch/t-shirt2.png new file mode 100644 index 0000000..af6102f Binary files /dev/null and b/public/merch/t-shirt2.png differ diff --git a/public/merch/tote.png b/public/merch/tote.png new file mode 100644 index 0000000..6adc53d Binary files /dev/null and b/public/merch/tote.png differ diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 5b2ffdc..c47a863 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -51,15 +51,8 @@ const Footer = () => { Wall of Fame { - disabled && notifications.show({ - title: 'Coming soon~', - message: '', - color: "red" - }) - }} - className={` transition-colors duration-300 ease-out ${disabled ? "opacity-50" : "hover:text-aqua-2"}`} + href={"/merchandise"} + className={`transition-colors duration-300 ease-out hover:text-aqua-2`} > Merchandise diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 0b1111a..1e95adf 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -76,7 +76,7 @@ const Navbar = () => { Wall of Fame - + Merchandise diff --git a/src/pages/merchandise.tsx b/src/pages/merchandise.tsx index 8537dc6..24f5eb4 100644 --- a/src/pages/merchandise.tsx +++ b/src/pages/merchandise.tsx @@ -1,3 +1,4 @@ +import { Button } from "@/components/elements/Button"; import Image from "next/image" interface CardProps { @@ -9,12 +10,18 @@ interface CardProps { function Card(props: CardProps) { return ( -
- -

{props.preorder}

-

{props.name}

-

{props.price}

-
+ +
+ +

Preorder Now!

+

{props.name}

+

{props.price}

+
+
) } @@ -28,13 +35,13 @@ export default function Merch() {

Exclusive Preorders!

- - - - - - - + + + + + + +