From b567fa345b9b0600ff84c43fa9a2dd252cefcab9 Mon Sep 17 00:00:00 2001
From: Chloe <tissueissueisawesome@gmail.com>
Date: Wed, 10 Jul 2024 19:34:04 +1000
Subject: [PATCH 1/2] add devsoc to resources

---
 frontend/public/assets/devsoc_logo.svg      | 50 +++++++++++++++++++
 frontend/src/components/Resources/index.tsx | 53 ++++++++++++++++-----
 2 files changed, 91 insertions(+), 12 deletions(-)
 create mode 100644 frontend/public/assets/devsoc_logo.svg

diff --git a/frontend/public/assets/devsoc_logo.svg b/frontend/public/assets/devsoc_logo.svg
new file mode 100644
index 0000000..fdb4727
--- /dev/null
+++ b/frontend/public/assets/devsoc_logo.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.9.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 601.2 164.3" style="enable-background:new 0 0 601.2 164.3;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#3C424B;}
+	.st1{fill:#FFFFFF;}
+	.st2{opacity:0;}
+	.st3{fill:#D9807E;}
+</style>
+<path class="st1" d="M202.9,108.8c-1,0.9-2.2,1.8-3.8,2.6c-1.5,0.9-3.3,1.7-5.4,2.4s-4.3,1.3-6.8,1.8c-2.5,0.4-5.1,0.7-7.9,0.7
+	c-4.8,0-9.1-0.7-12.9-2c-3.8-1.3-7-3.3-9.6-5.9c-2.6-2.6-4.6-5.7-6-9.3c-1.4-3.6-2.1-7.8-2.1-12.4c0-4.9,0.8-9.3,2.4-13
+	s3.7-6.8,6.5-9.3c2.7-2.5,5.9-4.3,9.6-5.6c3.7-1.2,7.6-1.8,11.9-1.8c2.9,0,5.8,0.4,8.8,1.1c3,0.8,5.8,2,8.4,3.9s4.6,4.3,6.2,7.4
+	c1.6,3.1,2.4,7,2.4,11.7c0,3.2-0.4,6.7-1.1,10.5h-40.5c0.1,2.4,0.6,4.4,1.5,6.1s2.2,3,3.7,4.1c1.5,1.1,3.3,1.8,5.3,2.3
+	c2,0.5,4.1,0.7,6.4,0.7c4.5,0,8.2-0.5,11.1-1.6c2.9-1.1,5.2-2.3,7-3.8L202.9,108.8L202.9,108.8z M178.6,68.6c-1.9,0-3.8,0.3-5.5,0.8
+	c-1.7,0.5-3.3,1.3-4.7,2.3s-2.5,2.3-3.4,3.8s-1.4,3.2-1.6,5.2h27.7c0-3.7-1-6.7-3.1-8.9S182.8,68.6,178.6,68.6L178.6,68.6z"/>
+<path class="st1" d="M245.5,97.7h0.8l12.6-39.2h15.7l-21.5,56.2h-15.6l-24.2-56.2h17L245.5,97.7L245.5,97.7z"/>
+<path class="st1" d="M323,99.2c0-1.5-0.9-2.7-2.8-3.6c-1.8-0.9-4.1-1.7-6.8-2.5c-2.7-0.8-5.7-1.5-8.9-2.3s-6.2-1.9-8.9-3.3
+	s-5-3.2-6.8-5.3c-1.8-2.1-2.8-4.9-2.8-8.3c0-2.8,0.6-5.2,1.9-7.3s2.9-3.9,5.1-5.3c2.1-1.5,4.7-2.6,7.6-3.3c3-0.8,6.2-1.1,9.6-1.1
+	c3.7,0,6.9,0.3,9.7,0.8c2.8,0.5,5.2,1.2,7.2,1.9s3.8,1.6,5.3,2.5s2.7,1.8,3.8,2.5l-6.2,10c-1.1-0.7-2.4-1.4-3.9-2.1s-3-1.4-4.6-2
+	s-3.3-1.1-5.1-1.5s-3.5-0.6-5.2-0.6c-3.1,0-5.7,0.4-7.6,1.2c-2,0.8-2.9,2.1-2.9,3.8c0,1.3,0.9,2.4,2.8,3.3c1.8,0.8,4.1,1.6,6.8,2.3
+	c2.7,0.7,5.7,1.5,8.9,2.3c3.2,0.8,6.2,1.9,8.9,3.2s5,3,6.8,5.1c1.8,2.1,2.8,4.8,2.8,8.1c0,5.7-2.1,10.2-6.2,13.4s-10.3,4.9-18.5,4.9
+	c-6.5,0-12-1-16.7-2.9s-8.5-4.1-11.3-6.7l6.8-10.6c1,0.8,2.3,1.7,3.9,2.8c1.6,1,3.4,1.9,5.5,2.8c2,0.8,4.2,1.5,6.5,2.1
+	c2.3,0.6,4.5,0.8,6.8,0.8c2.4,0,4.5-0.4,6.2-1.2C322.1,102.5,323,101.1,323,99.2L323,99.2z"/>
+<path class="st1" d="M349.2,86.6c0-4.7,0.7-8.9,2.1-12.6c1.4-3.7,3.5-6.8,6.1-9.3c2.6-2.5,5.8-4.5,9.4-5.8s7.7-2,12.2-2
+	c4.7,0,8.9,0.7,12.6,2.1c3.7,1.4,6.8,3.4,9.4,6c2.5,2.6,4.5,5.7,5.8,9.4s2,7.7,2,12.1c0,4.7-0.7,8.9-2.1,12.6
+	c-1.4,3.7-3.5,6.8-6.1,9.3c-2.6,2.6-5.8,4.5-9.4,5.8s-7.7,2-12.2,2c-4.7,0-8.9-0.7-12.6-2.1s-6.8-3.4-9.4-6
+	c-2.5-2.6-4.5-5.7-5.8-9.4S349.2,91,349.2,86.6z M364.3,86.6c0,2.5,0.3,4.8,1,6.9s1.6,3.9,2.9,5.5c1.3,1.6,2.8,2.8,4.6,3.7
+	s3.9,1.3,6.2,1.3c4.4,0,7.9-1.4,10.6-4.2c2.7-2.8,4.1-7.2,4.1-13.2c0-5.2-1.3-9.3-3.8-12.5c-2.5-3.2-6.2-4.8-10.9-4.8
+	c-2.1,0-4,0.3-5.9,1c-1.8,0.6-3.4,1.7-4.7,3.1c-1.3,1.4-2.3,3.2-3.1,5.4C364.6,80.9,364.3,83.5,364.3,86.6L364.3,86.6z"/>
+<path class="st1" d="M474.1,109.3c-3.1,2.3-6.7,4.1-10.8,5.2s-8.4,1.7-12.9,1.7c-4.9,0-9.2-0.7-13-2.1c-3.8-1.4-7-3.4-9.6-6
+	s-4.5-5.7-5.9-9.4s-2-7.7-2-12.1c0-4.7,0.8-8.9,2.4-12.6c1.6-3.7,3.8-6.8,6.6-9.3c2.8-2.5,6.1-4.5,10-5.8s8-2,12.5-2
+	c4.2,0,8.1,0.5,11.8,1.5c3.7,1,6.5,1.9,8.4,2.8V81h-12.4V70.6c-2.3-0.5-4.6-0.8-7-0.8c-2.1,0-4.2,0.3-6.2,1s-3.9,1.7-5.5,3
+	c-1.6,1.4-2.9,3.1-3.9,5.2c-1,2.1-1.5,4.6-1.5,7.5c0,2.4,0.4,4.6,1.2,6.6c0.8,2,2,3.8,3.5,5.3s3.4,2.7,5.6,3.5
+	c2.2,0.9,4.7,1.3,7.4,1.3c4.3,0,7.8-0.6,10.5-1.8c2.7-1.2,4.8-2.2,6.1-3.2L474.1,109.3L474.1,109.3z"/>
+<g class="st2">
+	<path class="st1" d="M78,47.5h27.4c20.2,0,33.3,13.3,33.3,33.7s-12.8,35.5-34,35.5H78L78,47.5L78,47.5z M93,104.6h11.2
+		c13.3,0,19.1-9.9,19.1-23.3c0-11.3-5.5-21.7-19.1-21.7H92.9L93,104.6L93,104.6z"/>
+</g>
+<polygon class="st3" points="534.6,51.2 534.6,66.9 562.9,85.8 562.9,87.4 534.6,106.2 534.6,122 580.5,91.4 580.5,81.8 "/>
+<polygon class="st3" points="65.3,51.2 65.3,66.9 37,85.8 37,87.4 65.3,106.2 65.3,122 19.5,91.4 19.5,81.8 "/>
+<rect x="464.5" y="72.8" transform="matrix(0.3582 -0.9336 0.9336 0.3582 250.9007 523.5304)" class="st3" width="83.5" height="12.9"/>
+<path class="st1" d="M109.9,36h23.5v48.5c0,5.6,0.3,11.2,0.9,16.6c0,0.4,0,0.8,0.1,1.1h7.2v12.3h-18.1l-1.5-7.2h-0.4
+	c-0.8,1.3-1.8,2.6-3,3.6c-1.3,1.1-2.7,2-4.3,2.8c-1.6,0.8-3.3,1.4-5.2,1.8c-1.9,0.4-3.7,0.6-5.6,0.6c-3.5,0-6.8-0.6-9.9-1.7
+	s-5.8-2.9-8.1-5.2s-4.2-5.3-5.5-9c-1.3-3.6-2-7.9-2-12.9s0.7-9.1,2.2-12.8c1.5-3.7,3.5-6.9,6.1-9.5c2.6-2.6,5.6-4.6,9.2-6
+	c3.5-1.4,7.4-2.1,11.6-2.1c2.3,0,4.5,0.1,6.6,0.4s3.8,0.7,5.3,1.3V48.4h-8.9C109.9,48.4,109.9,36,109.9,36z M106.9,103.8
+	c2.8,0,5.4-0.7,7.6-2.1c2.2-1.4,3.7-3.4,4.3-6V71.9c-1.1-0.8-2.5-1.4-4.3-1.8c-1.8-0.4-3.8-0.6-5.8-0.6s-4,0.3-5.9,1
+	c-1.9,0.7-3.6,1.7-5.1,3.2c-1.5,1.5-2.6,3.3-3.5,5.7s-1.3,5.2-1.3,8.5c0,4.8,1.2,8.7,3.6,11.6C98.9,102.4,102.4,103.8,106.9,103.8
+	L106.9,103.8z"/>
+</svg>
diff --git a/frontend/src/components/Resources/index.tsx b/frontend/src/components/Resources/index.tsx
index 8d2a0b0..9004e8c 100644
--- a/frontend/src/components/Resources/index.tsx
+++ b/frontend/src/components/Resources/index.tsx
@@ -3,8 +3,10 @@ import { resourceCards, stage1, stage2, stage3 } from '../../../public/data/reso
 
 const boxStyling =
   'border border-[#595F6D] rounded-lg hover:border-[#788093] hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
-const socialsBoxStyling =
-  'xl:col-span-1 col-span-3 flex justify-center pt-2 pb-2 border border-[#595F6D] hover:border-[#788093] rounded-lg hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
+// const socialsBoxStyling =
+//   'xl:col-span-1 col-span-3 flex justify-center pt-2 pb-2 border border-[#595F6D] hover:border-[#788093] rounded-lg hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
+const logostyle =
+  'grow-on-hover cursor-pointer transform transition-transform duration-300 hover:scale-105';
 
 const Resources = () => {
   return (
@@ -16,23 +18,35 @@ const Resources = () => {
             <h2 className="font-bold text-6xl">RESOURCES</h2>
           </div>
 
+          <div className="flex">
+            <span className="text-lg">Made by</span>
+            <Image
+              src="/assets/csesoc_logo.svg"
+              alt="CSESoc Logo"
+              width={100}
+              height={100}
+              className="pl-2"
+            />
+          </div>
+
           <div className="py-8 bg-no-repeat bg-center">
             <div className="grid grid-cols-4 1 gap-x-9 gap-y-5">
-              {stage1.map((item: resourceCards) => {
+              {stage3.map((item: resourceCards) => {
                 return (
                   <a
                     key={item.id}
                     href={item.href}
                     target="_blank"
-                    className={`col-span-4 p-5 ${boxStyling} flex`}
+                    className={`md:col-span-2 col-span-4 p-5 ${boxStyling} flex`}
                   >
-                    <div className="flex justify-center align-middle items-center pl-2 pr-10">
+                    <div className="flex align-middle items-center pt-2 pb-4 pr-10">
                       <Image
                         src={item.svg}
                         alt={item.alt}
                         draggable="false"
                         width={item.width}
                         height={item.height}
+                        className="rounded-md"
                       />
                     </div>
                     <div>
@@ -42,16 +56,32 @@ const Resources = () => {
                   </a>
                 );
               })}
+            </div>
+          </div>
 
-              {stage2.map((item: resourceCards) => {
+          <a href="https://devsoc.app/" target="_blank" rel="noopener noreferrer">
+            <div className={`flex ${logostyle}`}>
+              <span className="text-lg">Made by</span>
+              <Image
+                src="/assets/devsoc_logo.svg"
+                alt="DevSoc Logo"
+                width={110}
+                height={110}
+                className="pl-1"
+              />
+            </div>
+          </a>
+          <div className="py-8 bg-no-repeat bg-center">
+            <div className="grid grid-cols-4 1 gap-x-9 gap-y-5">
+              {stage1.map((item: resourceCards) => {
                 return (
                   <a
                     key={item.id}
                     href={item.href}
                     target="_blank"
-                    className={`xl:col-span-1 col-span-4 p-5 ${boxStyling}`}
+                    className={`col-span-4 p-5 ${boxStyling} flex`}
                   >
-                    <div className="flex align-middle items-center pt-2 pb-4">
+                    <div className="flex justify-center align-middle items-center pl-2 pr-10">
                       <Image
                         src={item.svg}
                         alt={item.alt}
@@ -68,22 +98,21 @@ const Resources = () => {
                 );
               })}
 
-              {stage3.map((item: resourceCards) => {
+              {stage2.map((item: resourceCards) => {
                 return (
                   <a
                     key={item.id}
                     href={item.href}
                     target="_blank"
-                    className={`md:col-span-2 col-span-4 p-5 ${boxStyling} flex`}
+                    className={`xl:col-span-1 col-span-4 p-5 ${boxStyling}`}
                   >
-                    <div className="flex align-middle items-center pt-2 pb-4 pr-10">
+                    <div className="flex align-middle items-center pt-2 pb-4">
                       <Image
                         src={item.svg}
                         alt={item.alt}
                         draggable="false"
                         width={item.width}
                         height={item.height}
-                        className="rounded-md"
                       />
                     </div>
                     <div>

From 7e8b0e3ca8a937a534a589620882843a0e7e63c9 Mon Sep 17 00:00:00 2001
From: Chloe <tissueissueisawesome@gmail.com>
Date: Mon, 15 Jul 2024 16:02:17 +1000
Subject: [PATCH 2/2] removing commented out code and moving styles for logo to
 inline

---
 frontend/src/components/Resources/index.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Resources/index.tsx b/frontend/src/components/Resources/index.tsx
index 9004e8c..796b36c 100644
--- a/frontend/src/components/Resources/index.tsx
+++ b/frontend/src/components/Resources/index.tsx
@@ -2,12 +2,8 @@ import Image from 'next/image';
 import { resourceCards, stage1, stage2, stage3 } from '../../../public/data/resourceCards';
 
 const boxStyling =
-  'border border-[#595F6D] rounded-lg hover:border-[#788093] hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
-// const socialsBoxStyling =
-//   'xl:col-span-1 col-span-3 flex justify-center pt-2 pb-2 border border-[#595F6D] hover:border-[#788093] rounded-lg hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
-const logostyle =
-  'grow-on-hover cursor-pointer transform transition-transform duration-300 hover:scale-105';
-
+    'border border-[#595F6D] rounded-lg hover:border-[#788093] hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300';
+  
 const Resources = () => {
   return (
     <section className="bg-no-repeat bg-center py-8 px-15 min-h-screen flex justify-center items-center">
@@ -60,7 +56,9 @@ const Resources = () => {
           </div>
 
           <a href="https://devsoc.app/" target="_blank" rel="noopener noreferrer">
-            <div className={`flex ${logostyle}`}>
+            <div
+              className={`flex grow-on-hover cursor-pointer transform transition-transform duration-300 hover:scale-105`}
+            >
               <span className="text-lg">Made by</span>
               <Image
                 src="/assets/devsoc_logo.svg"