From b8d4351735a5442fa41a67e13fec19b9b9c46762 Mon Sep 17 00:00:00 2001
From: Eric <eric.wu3@student.unsw.edu.au>
Date: Thu, 11 Jul 2024 18:23:45 +1000
Subject: [PATCH 1/3] Adding Merch Store Link to nav bar and hamburger

---
 frontend/public/assets/merch-store-icon.svg | 12 ++++++++++++
 frontend/src/components/Hamburger.tsx       |  3 +++
 frontend/src/components/Navbar.tsx          | 10 ++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 frontend/public/assets/merch-store-icon.svg

diff --git a/frontend/public/assets/merch-store-icon.svg b/frontend/public/assets/merch-store-icon.svg
new file mode 100644
index 0000000..5d0bcfb
--- /dev/null
+++ b/frontend/public/assets/merch-store-icon.svg
@@ -0,0 +1,12 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="#ffffff">
+
+<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
+<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+
+<g id="SVGRepo_iconCarrier"> <path d="M6.29977 5H21L19 12H7.37671M20 16H8L6 3H3M9 20C9 20.5523 8.55228 21 8 21C7.44772 21 7 20.5523 7 20C7 19.4477 7.44772 19 8 19C8.55228 19 9 19.4477 9 20ZM20 20C20 20.5523 19.5523 21 19 21C18.4477 21 18 20.5523 18 20C18 19.4477 18.4477 19 19 19C19.5523 19 20 19.4477 20 20Z" stroke="#ffffff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/> </g>
+
+</svg>
\ No newline at end of file
diff --git a/frontend/src/components/Hamburger.tsx b/frontend/src/components/Hamburger.tsx
index 401f4c5..b3f5a3a 100644
--- a/frontend/src/components/Hamburger.tsx
+++ b/frontend/src/components/Hamburger.tsx
@@ -50,6 +50,9 @@ export default function Hamburger() {
               <li className="py-2 text-lg">
                 <Link href={'./contact-us'}>Contact Us</Link>
               </li>
+              <li className="py-2 text-lg">
+                <a href="https://csesoc-merch.square.site/">Merchandise</a>
+              </li>
             </ul>
           </motion.div>
         )}
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index f28f4d4..1e0c3fa 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -40,6 +40,16 @@ const Navbar = () => {
           <Link href="/contact-us">
             <div className="text-xl">{'//'} contact us</div>
           </Link>
+          <a href="https://csesoc-merch.square.site/" className='flex xl:gap-3 lg:gap-1.5 md:gap-0.8 duration-300 hover:scale-105'>
+            <div className="text-xl">{'//'} merch store</div>
+            <Image
+              src="/assets/merch-store-icon.svg"
+              alt="Merchandise Store Icon"
+              width={30}
+              height={30}
+              draggable={false}
+            />
+          </a>
         </div>
         <div className="md:hidden xl:hidden lg:hidden text-right font-bold block">
           <Hamburger />

From 5adfbe927c992b1c244347bf93f14dc5bdc5abdf Mon Sep 17 00:00:00 2001
From: Eric <eric.wu3@student.unsw.edu.au>
Date: Thu, 18 Jul 2024 18:21:58 +1000
Subject: [PATCH 2/3] Adding suggested changes

---
 frontend/src/components/Hamburger.tsx | 2 +-
 frontend/src/components/Navbar.tsx    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Hamburger.tsx b/frontend/src/components/Hamburger.tsx
index b3f5a3a..c43decb 100644
--- a/frontend/src/components/Hamburger.tsx
+++ b/frontend/src/components/Hamburger.tsx
@@ -51,7 +51,7 @@ export default function Hamburger() {
                 <Link href={'./contact-us'}>Contact Us</Link>
               </li>
               <li className="py-2 text-lg">
-                <a href="https://csesoc-merch.square.site/">Merchandise</a>
+                <a href="https://csesoc-merch.square.site/">Merch Store</a>
               </li>
             </ul>
           </motion.div>
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index 1e0c3fa..5a5be91 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -40,13 +40,12 @@ const Navbar = () => {
           <Link href="/contact-us">
             <div className="text-xl">{'//'} contact us</div>
           </Link>
-          <a href="https://csesoc-merch.square.site/" className='flex xl:gap-3 lg:gap-1.5 md:gap-0.8 duration-300 hover:scale-105'>
-            <div className="text-xl">{'//'} merch store</div>
+          <a target="_blank" href="https://csesoc-merch.square.site/" className='flex'>
             <Image
               src="/assets/merch-store-icon.svg"
               alt="Merchandise Store Icon"
-              width={30}
-              height={30}
+              width={29}
+              height={29}
               draggable={false}
             />
           </a>

From a2dbfd44cd657ac78530c274e48855ee98f0be94 Mon Sep 17 00:00:00 2001
From: Eric <eric.wu3@student.unsw.edu.au>
Date: Thu, 1 Aug 2024 16:37:16 +1000
Subject: [PATCH 3/3] Making hamburger link open in seperate tab

---
 frontend/src/components/Hamburger.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Hamburger.tsx b/frontend/src/components/Hamburger.tsx
index c43decb..567ca00 100644
--- a/frontend/src/components/Hamburger.tsx
+++ b/frontend/src/components/Hamburger.tsx
@@ -51,7 +51,7 @@ export default function Hamburger() {
                 <Link href={'./contact-us'}>Contact Us</Link>
               </li>
               <li className="py-2 text-lg">
-                <a href="https://csesoc-merch.square.site/">Merch Store</a>
+                <a target="_blank" href="https://csesoc-merch.square.site/">Merch Store</a>
               </li>
             </ul>
           </motion.div>