From 659a5946e6b9235e176d16f67e25146386b385e3 Mon Sep 17 00:00:00 2001
From: kelly <kelly@ucr-secure-32-10-13-177-14.wnet.ucr.edu>
Date: Thu, 18 Jan 2024 18:23:50 -0800
Subject: [PATCH 1/4] created footer

---
 src/components/Footer.js | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/components/Footer.js b/src/components/Footer.js
index 6c261a9..5cd22ee 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -1,7 +1,40 @@
-import React from "react";
+import logo from "@/public/assets/FooterLogo.svg";
+import Image from "next/image";
+
+import {
+  FaInstagram,
+  FaDiscord,
+  FaYoutube,
+  FaSlack,
+  FaEnvelope,
+  FaMediumM,
+} from "react-icons/fa";
 
 const Footer = () => {
-  return <div>Footer</div>;
+  return (
+    <div className="bg-black flex w-full pl-6 pb-14 pt-28">
+      <div className="grid grid-cols-11 text-white justify-between w-full ">
+        <div className="flex justify-start col-span-5 mr-10">
+          <Image src={logo} />
+        </div>
+        <div className="font-montserrat flex flex-col space-y-8 min-w-fit text-right pt-7 mb-6 col-span-3">
+          <div className="text-xl font-semibold">contact us!</div>
+          <div className="text-xl font-semibold pb-10">
+            Winston Chung Hall, 446 N Campus Dr, Riverside, CA 92507
+          </div>
+          <div className="text-xl font-semibold">714-749-5576</div>
+        </div>
+        <div className="bg-white w-1 h-52 flex justify-start ml-16 mt-7"></div>
+        <div className="grid grid-cols-2 gap-10 space-x-2 text-5xl mt-7 cols-span-2">
+          <FaInstagram />
+          <FaDiscord />
+          <FaYoutube />
+          <FaSlack />
+          <FaEnvelope />
+          <FaMediumM />
+        </div>
+      </div>
+    </div>
+  );
 };
-
 export default Footer;

From 99de1b425c4af1b54fa1324ca7adb2d865e31de1 Mon Sep 17 00:00:00 2001
From: Raidah Fairooz <rfair008@ucr.edu>
Date: Mon, 22 Jan 2024 23:58:41 -0800
Subject: [PATCH 2/4] fixed grids

---
 src/components/Footer.js | 70 +++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/components/Footer.js b/src/components/Footer.js
index 8db6e6a..b21d5b0 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -13,41 +13,45 @@ import {
 
 const Footer = () => {
   return (
-    <div className="bg-black flex w-full pl-6 pb-10 pt-24 pr-28">
-      <div className="grid grid-cols-9 text-white justify-between">
-        <div className="flex justify-start mr-10 col-span-4 w-full">
-          <Image src={logo} />
-        </div>
-        <div className="font-montserrat flex flex-col space-y-8 min-w-fit text-right pt-7 mb-6 ml-18 col-span-3">
-          <div className="text-xl font-semibold">contact us!</div>
-          <div className="text-xl font-semibold pb-10">
-            Winston Chung Hall, 446 N Campus Dr, Riverside, CA 92507
+    <div className="grid grid-cols-2 gap-8 text-white bg-black w-full pt-24 pb-4">
+      <div className="flex justify-start ">
+        <Image src={logo} />
+      </div>
+      <div className="grid grid-cols-3 divide-x-4 divide-white justify-center items-center ">
+        <div className="font-montserrat h-5/6 grid col-span-2 justify-center items-center ">
+          <div className="text-xl font-semibold flex justify-end">
+            contact us!
+          </div>
+          <div className="text-xl font-semibold flex justify-end">
+            Winston Chung Hall, 446 N Campus Dr, <br /> Riverside, CA 92507
+          </div>
+          <div className="text-xl font-semibold flex justify-end">
+            714-749-5576
           </div>
-          <div className="text-xl font-semibold">714-749-5576</div>
         </div>
-        <div className="bg-white w-1 h-52 flex justify-start mt-7 ml-16"></div>
-        <div
-          className="grid grid-cols-2 gap-10 space-x-2 text-5xl mt-7 w-5/6 h-5/6"
-          style={{ cursor: "pointer" }}
-        >
-          <Link href="instagram-link">
-            <FaInstagram />
-          </Link>
-          <Link href="discord-link">
-            <FaDiscord />
-          </Link>
-          <Link href="youtube-link">
-            <FaYoutube />
-          </Link>
-          <Link href="slack-link">
-            <FaSlack />
-          </Link>
-          <Link href="email-link">
-            <FaEnvelope />
-          </Link>
-          <Link href="medium-link">
-            <FaMediumM />
-          </Link>
+        <div className="grid grid-cols-2 text-5xl text-white h-5/6 hover:curson-pointer ">
+          <div className="flex justify-between flex-col items-center">
+            <Link href="https://github.com/acm-ucr/hsp-website/pull/16/files">
+              <FaInstagram />
+            </Link>
+            <Link href="discord-link">
+              <FaDiscord />
+            </Link>
+            <Link href="youtube-link">
+              <FaYoutube />
+            </Link>
+          </div>
+          <div className="flex justify-between flex-col items-start">
+            <Link href="slack-link">
+              <FaSlack />
+            </Link>
+            <Link href="email-link">
+              <FaEnvelope />
+            </Link>
+            <Link href="medium-link">
+              <FaMediumM />
+            </Link>
+          </div>
         </div>
       </div>
     </div>

From 3e38726a474d5187f12c6af807c6f06c1bd86932 Mon Sep 17 00:00:00 2001
From: kelly <kelly@ucr-secure-32-10-13-179-236.wnet.ucr.edu>
Date: Tue, 23 Jan 2024 09:45:31 -0800
Subject: [PATCH 3/4] made icons white

---
 src/components/Footer.js | 74 ++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/src/components/Footer.js b/src/components/Footer.js
index 8db6e6a..67e5cf7 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -1,3 +1,4 @@
+import React from "react";
 import logo from "@/public/assets/FooterLogo.svg";
 import Image from "next/image";
 import Link from "next/link";
@@ -13,41 +14,48 @@ import {
 
 const Footer = () => {
   return (
-    <div className="bg-black flex w-full pl-6 pb-10 pt-24 pr-28">
-      <div className="grid grid-cols-9 text-white justify-between">
-        <div className="flex justify-start mr-10 col-span-4 w-full">
-          <Image src={logo} />
-        </div>
-        <div className="font-montserrat flex flex-col space-y-8 min-w-fit text-right pt-7 mb-6 ml-18 col-span-3">
-          <div className="text-xl font-semibold">contact us!</div>
-          <div className="text-xl font-semibold pb-10">
-            Winston Chung Hall, 446 N Campus Dr, Riverside, CA 92507
+    <div className="grid grid-cols-2 gap-8 text-white bg-black w-full pt-24 pb-4">
+      <div className="flex justify-start ">
+        <Image src={logo} />
+      </div>
+      <div className="grid grid-cols-3 divide-x-4 divide-white justify-center items-center ">
+        <div className="font-montserrat h-5/6 grid col-span-2 justify-center items-center ">
+          <div className="text-xl font-semibold flex justify-end">
+            contact us!
+          </div>
+          <div className="text-xl font-semibold flex justify-end">
+            Winston Chung Hall, 446 N Campus Dr, <br /> Riverside, CA 92507
+          </div>
+          <div className="text-xl font-semibold flex justify-end">
+            714-749-5576
           </div>
-          <div className="text-xl font-semibold">714-749-5576</div>
         </div>
-        <div className="bg-white w-1 h-52 flex justify-start mt-7 ml-16"></div>
-        <div
-          className="grid grid-cols-2 gap-10 space-x-2 text-5xl mt-7 w-5/6 h-5/6"
-          style={{ cursor: "pointer" }}
-        >
-          <Link href="instagram-link">
-            <FaInstagram />
-          </Link>
-          <Link href="discord-link">
-            <FaDiscord />
-          </Link>
-          <Link href="youtube-link">
-            <FaYoutube />
-          </Link>
-          <Link href="slack-link">
-            <FaSlack />
-          </Link>
-          <Link href="email-link">
-            <FaEnvelope />
-          </Link>
-          <Link href="medium-link">
-            <FaMediumM />
-          </Link>
+        <div className="grid grid-cols-2 text-5xl h-5/6 hover:curson-pointer ">
+          <div className="flex justify-between flex-col items-center">
+            <Link
+              className="text-white"
+              href="https://github.com/acm-ucr/hsp-website/pull/16/files"
+            >
+              <FaInstagram />
+            </Link>
+            <Link className="text-white" href="discord-link">
+              <FaDiscord />
+            </Link>
+            <Link className="text-white" href="youtube-link">
+              <FaYoutube />
+            </Link>
+          </div>
+          <div className="flex justify-between flex-col items-start">
+            <Link className="text-white" href="slack-link">
+              <FaSlack />
+            </Link>
+            <Link className="text-white" href="email-link">
+              <FaEnvelope />
+            </Link>
+            <Link className="text-white" href="medium-link">
+              <FaMediumM />
+            </Link>
+          </div>
         </div>
       </div>
     </div>

From 8cf28573372fa4b448e654b34cc5749e5de5cbf9 Mon Sep 17 00:00:00 2001
From: kelly <kelly@ucr-secure-32-10-13-179-236.wnet.ucr.edu>
Date: Tue, 23 Jan 2024 10:10:36 -0800
Subject: [PATCH 4/4] made icons white

---
 src/components/Footer.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/Footer.js b/src/components/Footer.js
index c4e9d6e..70040a4 100644
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@@ -32,24 +32,27 @@ const Footer = () => {
         </div>
         <div className="grid grid-cols-2 text-5xl text-white h-5/6 hover:curson-pointer ">
           <div className="flex justify-between flex-col items-center">
-            <Link href="https://github.com/acm-ucr/hsp-website/pull/16/files">
+            <Link
+              className="text-white "
+              href="https://github.com/acm-ucr/hsp-website/pull/16/files"
+            >
               <FaInstagram />
             </Link>
-            <Link href="discord-link">
+            <Link className="text-white" href="discord-link">
               <FaDiscord />
             </Link>
-            <Link href="youtube-link">
+            <Link className="text-white" href="youtube-link">
               <FaYoutube />
             </Link>
           </div>
           <div className="flex justify-between flex-col items-start">
-            <Link href="slack-link">
+            <Link className="text-white" href="slack-link">
               <FaSlack />
             </Link>
-            <Link href="email-link">
+            <Link className="text-white" href="email-link">
               <FaEnvelope />
             </Link>
-            <Link href="medium-link">
+            <Link className="text-white" href="medium-link">
               <FaMediumM />
             </Link>
           </div>