From a8a2a00576239eb270699d0deaa442498205898d Mon Sep 17 00:00:00 2001 From: AbbyHoyt Date: Fri, 20 Feb 2026 19:05:54 -0800 Subject: [PATCH 1/4] Added meta tag placeholders to fill in. --- src/components/Button/Button.js | 4 ++-- src/components/Button/Button.scss | 16 ++++++---------- src/components/Navbar/Navbar.scss | 2 +- src/pages/AboutUs/AboutUs.js | 2 ++ src/pages/Events/Events.js | 2 ++ src/pages/GetInvolved/GetInvolved.js | 2 ++ src/pages/Homepage/Homepage.js | 2 ++ 7 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js index e66d7a6..9ce5eb7 100644 --- a/src/components/Button/Button.js +++ b/src/components/Button/Button.js @@ -30,8 +30,8 @@ export const Button = ({type = 'default', link, buttonText, onClick}) => { return (
- {type === 'external' && } - {type === 'internal' && } + {type === 'external' && } + {type === 'internal' && } {type === 'default' && }
) diff --git a/src/components/Button/Button.scss b/src/components/Button/Button.scss index adfb050..056d20f 100644 --- a/src/components/Button/Button.scss +++ b/src/components/Button/Button.scss @@ -1,20 +1,16 @@ @import '../../variables.scss'; .button-component { - button { background-color: $TrickFireGreen; padding: 0.65rem 1rem; border: none; - - a { - font-family: $font-heading; - color: $Black; - text-decoration: none; - text-transform: uppercase; - font-weight: 600; - font-size: 1.5rem; - } + font-family: $font-heading; + color: $Black; + text-decoration: none; + text-transform: uppercase; + font-weight: 600; + font-size: 1.5rem; } button:hover { diff --git a/src/components/Navbar/Navbar.scss b/src/components/Navbar/Navbar.scss index 952c3d3..fee48d2 100644 --- a/src/components/Navbar/Navbar.scss +++ b/src/components/Navbar/Navbar.scss @@ -7,7 +7,7 @@ border-bottom: solid 1px white; position: fixed; - z-index: 1; + z-index: 2; .subpage-link { color: $White; diff --git a/src/pages/AboutUs/AboutUs.js b/src/pages/AboutUs/AboutUs.js index e66a54c..1dbf565 100644 --- a/src/pages/AboutUs/AboutUs.js +++ b/src/pages/AboutUs/AboutUs.js @@ -68,6 +68,8 @@ export const AboutUs = () => { return (
+ + { return (
+ +

Events

diff --git a/src/pages/GetInvolved/GetInvolved.js b/src/pages/GetInvolved/GetInvolved.js index 41be8d1..791457f 100644 --- a/src/pages/GetInvolved/GetInvolved.js +++ b/src/pages/GetInvolved/GetInvolved.js @@ -10,6 +10,8 @@ const disciplines = ['Software Engineering', 'Mechanical Engineering', 'Electric export const GetInvolved = () => { return (
+ + { return (
+ + Date: Fri, 20 Feb 2026 19:16:22 -0800 Subject: [PATCH 2/4] Wrote metadata content (page descriptions). --- src/pages/AboutUs/AboutUs.js | 2 +- src/pages/Events/Events.js | 2 +- src/pages/GetInvolved/GetInvolved.js | 2 +- src/pages/Homepage/Homepage.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/AboutUs/AboutUs.js b/src/pages/AboutUs/AboutUs.js index 1dbf565..58101c5 100644 --- a/src/pages/AboutUs/AboutUs.js +++ b/src/pages/AboutUs/AboutUs.js @@ -68,7 +68,7 @@ export const AboutUs = () => { return (
- + { return (
- +
diff --git a/src/pages/GetInvolved/GetInvolved.js b/src/pages/GetInvolved/GetInvolved.js index 791457f..5294377 100644 --- a/src/pages/GetInvolved/GetInvolved.js +++ b/src/pages/GetInvolved/GetInvolved.js @@ -10,7 +10,7 @@ const disciplines = ['Software Engineering', 'Mechanical Engineering', 'Electric export const GetInvolved = () => { return (
- + { return (
- + From 9d485596d4771dcb837cc85e27463849ac8a3c01 Mon Sep 17 00:00:00 2001 From: CharlotteHoyt Date: Fri, 20 Feb 2026 20:58:34 -0800 Subject: [PATCH 3/4] Fixed so many spelling/grammar issues, also had the home page and about us page flipped (fixed now). --- src/pages/AboutUs/AboutUs.js | 2 +- src/pages/GetInvolved/GetInvolved.js | 2 +- src/pages/Homepage/Homepage.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/AboutUs/AboutUs.js b/src/pages/AboutUs/AboutUs.js index 58101c5..c965f06 100644 --- a/src/pages/AboutUs/AboutUs.js +++ b/src/pages/AboutUs/AboutUs.js @@ -68,7 +68,7 @@ export const AboutUs = () => { return (
- + { return (
- + { return (
- + From 027332b707af5a362c89332af978a12ab90ea99c Mon Sep 17 00:00:00 2001 From: CharlotteHoyt Date: Fri, 20 Feb 2026 21:00:54 -0800 Subject: [PATCH 4/4] Made one very long sentence two reasonably long sentences. --- src/pages/Homepage/Homepage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Homepage/Homepage.js b/src/pages/Homepage/Homepage.js index 270a34c..ad36b5b 100644 --- a/src/pages/Homepage/Homepage.js +++ b/src/pages/Homepage/Homepage.js @@ -9,7 +9,7 @@ import { HomeEvent } from '../../components/HomeEvent/HomeEvent' export const Homepage = () => { return (
- +