Merge pull request #187 from HackMelbourne/dev

Dev
HackMelbourne · Aug 4, 2024 · 7e67017 · 7e67017
2 parents 6b5b319 + 264c499
commit 7e67017
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 31 deletions.
diff --git a/src/assets/images/Hoodie-2024/Hoodie-2024.png b/src/assets/images/Hoodie-2024/Hoodie-2024.png
diff --git a/src/features/BannerStandard/BannerStandard.tsx b/src/features/BannerStandard/BannerStandard.tsx
@@ -1,7 +1,7 @@
-import { Link } from 'react-router-dom';
-import { motion } from 'framer-motion';
+import { Link } from "react-router-dom";
+import { motion } from "framer-motion";
 
-import HMButton from '../../components/Button/HMButton';
+import HMButton from "../../components/Button/HMButton";
 
 interface BannerInfo {
   img: string;
@@ -45,7 +45,7 @@ function BannerStandard({ img, title, desc, button, link }: BannerInfo) {
       initial="hidden"
       whileInView="show">
       <motion.div className="md:w-[440px] md:h-[505px] shrink-0 self-stretch" variants={item} custom={1}>
-        <img src={img} alt={title}/>
+        <img src={img} alt={title} />
       </motion.div>
 
       <div className="flex flex-col items-center md:items-start gap-5 self-stretch md:self-auto">
@@ -62,7 +62,7 @@ function BannerStandard({ img, title, desc, button, link }: BannerInfo) {
         </motion.div>
 
         <motion.div variants={item} custom={-1}>
-          <HMButton text={button} color="neutral" style="border" link={link}></HMButton>
+          <HMButton text={button} color="primary" style="border" link={link}></HMButton>
         </motion.div>
       </div>
     </motion.div>

diff --git a/src/features/Navbar/NavbarPill.tsx b/src/features/Navbar/NavbarPill.tsx
@@ -4,8 +4,7 @@ import { NavbarPillProps } from "./NavbarPillProps";
 const NavbarPill = ({ title, desc, Icon, image, link } : NavbarPillProps) => {
   return (
       <Link to={link}>
-        <div className="relative w-full flex gap-4 items-center justify-center px-3 py-4 mt-2 rounded-md border border-white bg-center bg-cover"
-          style={{ backgroundImage: `url(${image})` }}>
+        <div className="relative w-full flex gap-4 items-center justify-center px-3 py-4 mt-2 rounded-md border bg-center bg-cover bg-yellow-700/40 ">
             <div className="absolute inset-0 bg-black opacity-50 z-0"></div>
             <Icon className="relative w-8 h-8 z-10" />
             <div className="relative flex flex-col gap-1 z-10">

diff --git a/src/layouts/Layout.tsx b/src/layouts/Layout.tsx
@@ -72,31 +72,35 @@ const Layout = () => {
     },
   ];
 
-  const calenderPills: NavbarPillProps[] = [
-    {
-      title: "Calender",
-      desc: "See what's going on!",
-      Icon: FaCalendar,
-      image: "/img/temp-bg.jpg",
-      link: "/upcoming/calendar",
-    },
-    {
-      title: "Links",
-      desc: "Signups, events and more",
-      Icon: FaLink,
-      image: "/img/temp-bg.jpg",
-      link: "/upcoming/links",
-    },
+  const linkPills: NavbarPillProps[] = [];
+
+  const calendarPills: NavbarPillProps[] = [
+    // {
+    //   title: "Calendar",
+    //   desc: "See what's going on!",
+    //   Icon: FaCalendar,
+    //   image: "/img/temp-bg.jpg",
+    //   link: "/upcoming/calendar",
+    // },
+    // {
+    //   title: "Links",
+    //   desc: "Signups, events and more",
+    //   Icon: FaLink,
+    //   image: "/img/temp-bg.jpg",
+    //   link: "/upcoming/links",
+    // },
   ];
 
   const sponsorPills: NavbarPillProps[] = [];
 
+  const blogPills: NavbarPillProps[] = [];
+
   const nav = {
     clubname: "HackMelbourne",
     logo: "/img/HM_White_Transparent.png",
-    pages: ["Home", "About", "Upcoming", "Sponsors"],
-    links: ["/", "/about/meettheteam", "/upcoming/calendar", "/sponsors"],
-    pills: [homePills, aboutPills, calenderPills, sponsorPills],
+    pages: ["About", "Links", "Calendar", "Sponsors", "Blog"],
+    links: ["/about/meettheteam", "upcoming/links", "/upcoming/calendar", "/sponsors", "/blogs"],
+    pills: [aboutPills, linkPills, calendarPills, sponsorPills, blogPills],
   };
 
   const footer = {

diff --git a/src/layouts/Navbar.tsx b/src/layouts/Navbar.tsx
@@ -131,8 +131,8 @@ const Navbar = ({ clubname, logo, pages, links, pills }: Nav) => {
   return (
     <div className="flex justify-center" onMouseLeave={()=>setActivePage(null)}>
       {isDesktopMenuOpen && (
-      <nav className="w-screen max-w-[800px] fixed pt-8 z-40 px-8">
-        <div className="max-w-[800px] grow rounded-md bg-black/20 backdrop-blur-md border flex justify-between items-center px-5 py-3">
+      <nav className="w-screen max-w-screen-lg fixed pt-8 z-40 px-8">
+        <div className="max-w-screen-lg grow rounded-md bg-black/20 backdrop-blur-md border flex justify-between items-center px-5 py-3">
           <Link to={links[0]} className="flex items-center justify-start gap-2 font-bold" onClick={handleLinkClick}>
             <img src={logo} className="h-8 w-8"></img>
             {clubname}

diff --git a/src/routes/Root.tsx b/src/routes/Root.tsx
@@ -10,7 +10,7 @@ import HackiethonImage from "../assets/images/Hackiethon-2022/Hackiethon2.jpg";
 import MelbHackImage from "../assets/images/MelbourneHack-2023/MelbourneHack.jpg";
 
 // Hoodie Imports
-import HoodieBack from "../assets/images/Hoodie-2023/HM_Hoodie_Back.png";
+import HoodieBack from "../assets/images/Hoodie-2024/Hoodie-2024.png";
 
 // Constants
 import { UMSU_LINK } from "../constants";
@@ -57,10 +57,10 @@ function Root() {
 
   const hoodie = {
     img: HoodieBack,
-    title: "HackMelbourne 2023 Exclusive Hoodie",
-    desc: "Remember the amazing year of 2023 and our achievements.",
+    title: "HackMelbourne 2024 Exclusive Hoodie",
+    desc: "See a super comfy hoodie and support our efforts across 2024 for only $55!",
     button: "See details",
-    link: "",
+    link: "https://docs.google.com/forms/d/e/1FAIpQLSehAHqWj4rofplkEzLk3BYyHr3h72n_sqWz55zYqTgTTnZ6Gg/viewform",
   };
 
   const jointeam = {