From 325ec0d0e38b884e61b8bc9363e0c2c131a3106f Mon Sep 17 00:00:00 2001
From: allisonpham7 <allisonppham@gmail.com>
Date: Sat, 7 Oct 2023 17:51:23 -0700
Subject: [PATCH 1/4] Edited subtitle

---
 package-lock.json           | 129 ++++++++++++++----------------------
 src/components/Subtitle.jsx |   8 ++-
 2 files changed, 55 insertions(+), 82 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c5c1985..2539f59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -198,9 +198,9 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.3.tgz",
-      "integrity": "sha512-X4te86vsbjsB7iO4usY9jLPtZ827Mbx+WcwNBGUOIuswuTAKQtzsuoxc/6KLxCMvogKG795MhrR1LDhYgDvasg=="
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-13.5.4.tgz",
+      "integrity": "sha512-LGegJkMvRNw90WWphGJ3RMHMVplYcOfRWf2Be3td3sUa+1AaxmsYyANsA+znrGCBjXJNi4XAQlSoEfUxs/4kIQ=="
     },
     "node_modules/@next/eslint-plugin-next": {
       "version": "13.5.3",
@@ -212,9 +212,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.3.tgz",
-      "integrity": "sha512-6hiYNJxJmyYvvKGrVThzo4nTcqvqUTA/JvKim7Auaj33NexDqSNwN5YrrQu+QhZJCIpv2tULSHt+lf+rUflLSw==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.5.4.tgz",
+      "integrity": "sha512-Df8SHuXgF1p+aonBMcDPEsaahNo2TCwuie7VXED4FVyECvdXfRT9unapm54NssV9tF3OQFKBFOdlje4T43VO0w==",
       "cpu": [
         "arm64"
       ],
@@ -227,9 +227,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.3.tgz",
-      "integrity": "sha512-UpBKxu2ob9scbpJyEq/xPgpdrgBgN3aLYlxyGqlYX5/KnwpJpFuIHU2lx8upQQ7L+MEmz+fA1XSgesoK92ppwQ==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.5.4.tgz",
+      "integrity": "sha512-siPuUwO45PnNRMeZnSa8n/Lye5ZX93IJom9wQRB5DEOdFrw0JjOMu1GINB8jAEdwa7Vdyn1oJ2xGNaQpdQQ9Pw==",
       "cpu": [
         "x64"
       ],
@@ -242,9 +242,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.3.tgz",
-      "integrity": "sha512-5AzM7Yx1Ky+oLY6pHs7tjONTF22JirDPd5Jw/3/NazJ73uGB05NqhGhB4SbeCchg7SlVYVBeRMrMSZwJwq/xoA==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.5.4.tgz",
+      "integrity": "sha512-l/k/fvRP/zmB2jkFMfefmFkyZbDkYW0mRM/LB+tH5u9pB98WsHXC0WvDHlGCYp3CH/jlkJPL7gN8nkTQVrQ/2w==",
       "cpu": [
         "arm64"
       ],
@@ -257,9 +257,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.3.tgz",
-      "integrity": "sha512-A/C1shbyUhj7wRtokmn73eBksjTM7fFQoY2v/0rTM5wehpkjQRLOXI8WJsag2uLhnZ4ii5OzR1rFPwoD9cvOgA==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.5.4.tgz",
+      "integrity": "sha512-YYGb7SlLkI+XqfQa8VPErljb7k9nUnhhRrVaOdfJNCaQnHBcvbT7cx/UjDQLdleJcfyg1Hkn5YSSIeVfjgmkTg==",
       "cpu": [
         "arm64"
       ],
@@ -272,9 +272,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.3.tgz",
-      "integrity": "sha512-FubPuw/Boz8tKkk+5eOuDHOpk36F80rbgxlx4+xty/U71e3wZZxVYHfZXmf0IRToBn1Crb8WvLM9OYj/Ur815g==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.5.4.tgz",
+      "integrity": "sha512-uE61vyUSClnCH18YHjA8tE1prr/PBFlBFhxBZis4XBRJoR+txAky5d7gGNUIbQ8sZZ7LVkSVgm/5Fc7mwXmRAg==",
       "cpu": [
         "x64"
       ],
@@ -287,9 +287,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.3.tgz",
-      "integrity": "sha512-DPw8nFuM1uEpbX47tM3wiXIR0Qa+atSzs9Q3peY1urkhofx44o7E1svnq+a5Q0r8lAcssLrwiM+OyJJgV/oj7g==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.5.4.tgz",
+      "integrity": "sha512-qVEKFYML/GvJSy9CfYqAdUexA6M5AklYcQCW+8JECmkQHGoPxCf04iMh7CPR7wkHyWWK+XLt4Ja7hhsPJtSnhg==",
       "cpu": [
         "x64"
       ],
@@ -302,9 +302,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.3.tgz",
-      "integrity": "sha512-zBPSP8cHL51Gub/YV8UUePW7AVGukp2D8JU93IHbVDu2qmhFAn9LWXiOOLKplZQKxnIPUkJTQAJDCWBWU4UWUA==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.5.4.tgz",
+      "integrity": "sha512-mDSQfqxAlfpeZOLPxLymZkX0hYF3juN57W6vFHTvwKlnHfmh12Pt7hPIRLYIShk8uYRsKPtMTth/EzpwRI+u8w==",
       "cpu": [
         "arm64"
       ],
@@ -317,9 +317,9 @@
       }
     },
     "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.3.tgz",
-      "integrity": "sha512-ONcL/lYyGUj4W37D4I2I450SZtSenmFAvapkJQNIJhrPMhzDU/AdfLkW98NvH1D2+7FXwe7yclf3+B7v28uzBQ==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.5.4.tgz",
+      "integrity": "sha512-aoqAT2XIekIWoriwzOmGFAvTtVY5O7JjV21giozBTP5c6uZhpvTWRbmHXbmsjZqY4HnEZQRXWkSAppsIBweKqw==",
       "cpu": [
         "ia32"
       ],
@@ -332,9 +332,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.3.tgz",
-      "integrity": "sha512-2Vz2tYWaLqJvLcWbbTlJ5k9AN6JD7a5CN2pAeIzpbecK8ZF/yobA39cXtv6e+Z8c5UJuVOmaTldEAIxvsIux/Q==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.5.4.tgz",
+      "integrity": "sha512-cyRvlAxwlddlqeB9xtPSfNSCRy8BOa4wtMo0IuI9P7Y0XT2qpDrpFKRyZ7kUngZis59mPVla5k8X1oOJ8RxDYg==",
       "cpu": [
         "x64"
       ],
@@ -3017,18 +3017,17 @@
       "dev": true
     },
     "node_modules/next": {
-      "version": "13.5.3",
-      "resolved": "https://registry.npmjs.org/next/-/next-13.5.3.tgz",
-      "integrity": "sha512-4Nt4HRLYDW/yRpJ/QR2t1v63UOMS55A38dnWv3UDOWGezuY0ZyFO1ABNbD7mulVzs9qVhgy2+ppjdsANpKP1mg==",
+      "version": "13.5.4",
+      "resolved": "https://registry.npmjs.org/next/-/next-13.5.4.tgz",
+      "integrity": "sha512-+93un5S779gho8y9ASQhb/bTkQF17FNQOtXLKAj3lsNgltEcF0C5PMLLncDmH+8X1EnJH1kbqAERa29nRXqhjA==",
       "dependencies": {
-        "@next/env": "13.5.3",
+        "@next/env": "13.5.4",
         "@swc/helpers": "0.5.2",
         "busboy": "1.6.0",
         "caniuse-lite": "^1.0.30001406",
-        "postcss": "8.4.14",
+        "postcss": "8.4.31",
         "styled-jsx": "5.1.1",
-        "watchpack": "2.4.0",
-        "zod": "3.21.4"
+        "watchpack": "2.4.0"
       },
       "bin": {
         "next": "dist/bin/next"
@@ -3037,15 +3036,15 @@
         "node": ">=16.14.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "13.5.3",
-        "@next/swc-darwin-x64": "13.5.3",
-        "@next/swc-linux-arm64-gnu": "13.5.3",
-        "@next/swc-linux-arm64-musl": "13.5.3",
-        "@next/swc-linux-x64-gnu": "13.5.3",
-        "@next/swc-linux-x64-musl": "13.5.3",
-        "@next/swc-win32-arm64-msvc": "13.5.3",
-        "@next/swc-win32-ia32-msvc": "13.5.3",
-        "@next/swc-win32-x64-msvc": "13.5.3"
+        "@next/swc-darwin-arm64": "13.5.4",
+        "@next/swc-darwin-x64": "13.5.4",
+        "@next/swc-linux-arm64-gnu": "13.5.4",
+        "@next/swc-linux-arm64-musl": "13.5.4",
+        "@next/swc-linux-x64-gnu": "13.5.4",
+        "@next/swc-linux-x64-musl": "13.5.4",
+        "@next/swc-win32-arm64-msvc": "13.5.4",
+        "@next/swc-win32-ia32-msvc": "13.5.4",
+        "@next/swc-win32-x64-msvc": "13.5.4"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.1.0",
@@ -3062,29 +3061,6 @@
         }
       }
     },
-    "node_modules/next/node_modules/postcss": {
-      "version": "8.4.14",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.4",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
     "node_modules/node-releases": {
       "version": "2.0.13",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
@@ -3381,10 +3357,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.30",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
-      "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
-      "dev": true,
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -4572,14 +4547,6 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
-    },
-    "node_modules/zod": {
-      "version": "3.21.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
-      "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
     }
   }
 }
diff --git a/src/components/Subtitle.jsx b/src/components/Subtitle.jsx
index 56e68b1..b442f81 100644
--- a/src/components/Subtitle.jsx
+++ b/src/components/Subtitle.jsx
@@ -1,5 +1,11 @@
 const Subtitle = ({ title }) => {
-  return <div>Subtitle</div>;
+  return (
+    <div>
+      Subtitle
+      <h2>Testing subtitle</h2>
+      <p>Testing paragraph.</p>
+    </div>
+  );
 };
 
 export default Subtitle;

From 0dc544c6b0c7acfa73259cdd1c06949427840d68 Mon Sep 17 00:00:00 2001
From: allisonpham7 <allisonppham@gmail.com>
Date: Thu, 12 Oct 2023 02:52:22 -0700
Subject: [PATCH 2/4] Add Subtitle

---
 src/app/page.js             |  2 ++
 src/components/Subtitle.jsx | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/app/page.js b/src/app/page.js
index 7f02076..5a6c71e 100644
--- a/src/app/page.js
+++ b/src/app/page.js
@@ -2,6 +2,7 @@ import About from "@/components/home/About";
 import Landing from "@/components/home/Landing";
 import Projects from "@/components/home/Projects";
 import WhyJoin from "@/components/home/Contacts";
+import Subtitle from "@/components/Subtitle";
 const Home = () => {
   return (
     <>
@@ -9,6 +10,7 @@ const Home = () => {
       <About />
       <WhyJoin />
       <Projects />
+      <Subtitle />
     </>
   );
 };
diff --git a/src/components/Subtitle.jsx b/src/components/Subtitle.jsx
index b442f81..66c65d5 100644
--- a/src/components/Subtitle.jsx
+++ b/src/components/Subtitle.jsx
@@ -1,9 +1,14 @@
-const Subtitle = ({ title }) => {
+import React from "react";
+const Subtitle = ({ title = "| Motivation" }) => {
+  // const Subtitle = ({ title }) => {
+  const blueColor = "#1151D3";
+  const greenColor = "#80C393";
   return (
     <div>
-      Subtitle
-      <h2>Testing subtitle</h2>
-      <p>Testing paragraph.</p>
+      <h2 style={{ color: blueColor }}>{title}</h2>
+      <p style={{ color: greenColor }}>
+        Rural communities are already disadvantaged socioeconomically
+      </p>
     </div>
   );
 };

From a7f86e396cb199652c2849165a63680cf97e38e6 Mon Sep 17 00:00:00 2001
From: menthy-wu <wumengxuan0728@gmail.com>
Date: Thu, 2 Nov 2023 23:50:43 -0700
Subject: [PATCH 3/4] fix styling

---
 src/app/page.js             |  5 ++++-
 src/components/Subtitle.jsx | 17 ++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/app/page.js b/src/app/page.js
index 5a6c71e..2129c45 100644
--- a/src/app/page.js
+++ b/src/app/page.js
@@ -10,7 +10,10 @@ const Home = () => {
       <About />
       <WhyJoin />
       <Projects />
-      <Subtitle />
+      <Subtitle
+        title="Motivation"
+        descripton="  Rural communities are already disadvantaged socioeconomically"
+      />
     </>
   );
 };
diff --git a/src/components/Subtitle.jsx b/src/components/Subtitle.jsx
index 66c65d5..414745c 100644
--- a/src/components/Subtitle.jsx
+++ b/src/components/Subtitle.jsx
@@ -1,14 +1,13 @@
-import React from "react";
-const Subtitle = ({ title = "| Motivation" }) => {
-  // const Subtitle = ({ title }) => {
-  const blueColor = "#1151D3";
-  const greenColor = "#80C393";
+const Subtitle = ({ title, descripton }) => {
   return (
     <div>
-      <h2 style={{ color: blueColor }}>{title}</h2>
-      <p style={{ color: greenColor }}>
-        Rural communities are already disadvantaged socioeconomically
-      </p>
+      <div className="flex items-center gap-1">
+        <div className="bg-ewb-green h-5 w-1" />
+        <div className="text-ewb-blue-200 text-2xl font-bold">{title}</div>
+      </div>
+      <div className="text-ewb-green font-semibold text-lg ml-2">
+        {descripton}
+      </div>
     </div>
   );
 };

From c3a34272edf7b2815e0c06b886e5330769d6fdf9 Mon Sep 17 00:00:00 2001
From: menthy-wu <wumengxuan0728@gmail.com>
Date: Thu, 2 Nov 2023 23:51:24 -0700
Subject: [PATCH 4/4] remove from page

---
 src/app/page.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/app/page.js b/src/app/page.js
index 2129c45..0ca661a 100644
--- a/src/app/page.js
+++ b/src/app/page.js
@@ -2,7 +2,7 @@ import About from "@/components/home/About";
 import Landing from "@/components/home/Landing";
 import Projects from "@/components/home/Projects";
 import WhyJoin from "@/components/home/Contacts";
-import Subtitle from "@/components/Subtitle";
+
 const Home = () => {
   return (
     <>
@@ -10,10 +10,6 @@ const Home = () => {
       <About />
       <WhyJoin />
       <Projects />
-      <Subtitle
-        title="Motivation"
-        descripton="  Rural communities are already disadvantaged socioeconomically"
-      />
     </>
   );
 };