From 47b4575b508698f658fdecce462b4732d3901437 Mon Sep 17 00:00:00 2001 From: Shing Hung Date: Thu, 16 Jan 2025 16:22:07 -0800 Subject: [PATCH 1/2] Add mobile view and correct information for index page and join page --- .env.example | 2 - src/components/core/Footer.astro | 10 +-- src/components/core/Question.astro | 6 +- src/components/core/Questions.astro | 4 +- src/components/core/Social.astro | 78 ++++++++++----------- src/components/join/BuildingLocation.astro | 8 +-- src/components/join/Findus.astro | 3 +- src/components/join/Involvement.astro | 16 ++--- src/components/join/Involvements.astro | 12 ++-- src/components/join/JoinTitle.astro | 12 ++-- src/components/join/OAH.astro | 8 +-- src/components/join/Resource.jsx | 12 ++-- src/components/join/Resources.jsx | 18 ++--- src/components/main_page/About.astro | 26 ++++--- src/components/main_page/Activities.astro | 10 +-- src/components/main_page/Activity.astro | 14 ++-- src/components/main_page/Divider.astro | 15 ++-- src/components/main_page/Landing.astro | 43 ++++++------ src/data/activities.json | 8 +-- src/data/faq.json | 16 ++--- src/images/jellyfish.png | Bin 0 -> 91468 bytes src/pages/join.astro | 4 +- 22 files changed, 159 insertions(+), 166 deletions(-) delete mode 100644 .env.example create mode 100644 src/images/jellyfish.png diff --git a/.env.example b/.env.example deleted file mode 100644 index e153873..0000000 --- a/.env.example +++ /dev/null @@ -1,2 +0,0 @@ -CALENDAR_API_KEY=YOUR_API_KEY -EVENT_CALENDAR_ID=YOUR_EVENT_CALENDAR_ID \ No newline at end of file diff --git a/src/components/core/Footer.astro b/src/components/core/Footer.astro index 316a03d..db12d2b 100644 --- a/src/components/core/Footer.astro +++ b/src/components/core/Footer.astro @@ -5,22 +5,22 @@ import whiteLogoHorizontal from "../../images/logos/white_logo_horizontal.svg"; import { IoHeart } from "react-icons/io5"; --- -
+
IEEE UCSD Logo
-

+

made by IEEE UCSD webmasters with

- +
diff --git a/src/components/core/Question.astro b/src/components/core/Question.astro index 2f8d67b..ba998be 100644 --- a/src/components/core/Question.astro +++ b/src/components/core/Question.astro @@ -1,11 +1,11 @@ --- const {question, answer} = Astro.props; --- -
-

+

+

{question}

-

+

{answer}

diff --git a/src/components/core/Questions.astro b/src/components/core/Questions.astro index 8b67fc2..b10f878 100644 --- a/src/components/core/Questions.astro +++ b/src/components/core/Questions.astro @@ -4,8 +4,8 @@ import { LiaDotCircle } from "react-icons/lia"; const {faq} = Astro.props; --- -
-
+
+

Frequently Asked Questions diff --git a/src/components/core/Social.astro b/src/components/core/Social.astro index 9d962f9..df98eef 100644 --- a/src/components/core/Social.astro +++ b/src/components/core/Social.astro @@ -1,71 +1,71 @@ --- import { LiaDotCircle } from "react-icons/lia"; import { Image } from "astro:assets"; -import evan from "../../images/evan.png"; -import { FaDiscord, FaFacebook } from "react-icons/fa"; +import jellyfish from "../../images/jellyfish.png"; +import { FaDiscord } from "react-icons/fa"; import { RiInstagramFill } from "react-icons/ri"; +import { MdEmail } from "react-icons/md"; import Link from "next/link"; --- -

-
+
+

Social Media

-

- Lorem ipsum is placeholder text commonly used in the graphic, print, and - publishing industries f +

+ Stay connected with us on Discord, Facebook, and Instagram! We regularly post information on upcoming events and competitions.

-
- -
- -
-

Discord

- - - -
- -
-

Facebook

- - +
-

Instagram

+

Instagram

+ + + +
+ +
+

Discord

+ + + +
+ +
+

Email

cat placeholder
diff --git a/src/components/join/BuildingLocation.astro b/src/components/join/BuildingLocation.astro index 1d69b1e..2b500eb 100644 --- a/src/components/join/BuildingLocation.astro +++ b/src/components/join/BuildingLocation.astro @@ -4,12 +4,12 @@
-

Each officer has their own OAH

-

Check out our calendar!

+

Each officer has their own OAH

+

Check out our calendar!