From a387833e87bd135db51aac75171b0a19f27fcbc7 Mon Sep 17 00:00:00 2001 From: chark1es Date: Mon, 27 Jan 2025 09:43:22 -0800 Subject: [PATCH 1/8] fix social media icons not fitting in box --- src/components/main_page/Landing.astro | 115 ++++++++++++------------- 1 file changed, 57 insertions(+), 58 deletions(-) diff --git a/src/components/main_page/Landing.astro b/src/components/main_page/Landing.astro index 8590395..ac2adde 100644 --- a/src/components/main_page/Landing.astro +++ b/src/components/main_page/Landing.astro @@ -8,65 +8,64 @@ import { MdEmail } from "react-icons/md"; ---
-
+

-

- UC San Diego IEEE -

-

- Join one of the largest IEEE student branch in the US! -

-

- IEEE @ UCSD is a pre-professional organization aiming to empower - engineers with practical experience through hands-on project - opportunities, insightful workshops, and panels with industry - professionals. We are a branch organization of the International - IEEE organization. -

- -
-
- - - - - - - - - - -
-
-
-
+

- circuit + Join one of the largest IEEE student branch in the US! +

+

+ IEEE @ UCSD is a pre-professional organization aiming to empower engineers + with practical experience through hands-on project opportunities, + insightful workshops, and panels with industry professionals. We are a + branch organization of the International IEEE organization. +

+ +
+
+ + + + + + + + + + +
+
+
+ circuit +
From 1a44c0fa0ac004485f65bdc3a610f49cde71d2ea Mon Sep 17 00:00:00 2001 From: chark1es Date: Mon, 27 Jan 2025 10:02:17 -0800 Subject: [PATCH 2/8] improve layout responsiveness --- src/components/main_page/Landing.astro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/main_page/Landing.astro b/src/components/main_page/Landing.astro index ac2adde..f81894e 100644 --- a/src/components/main_page/Landing.astro +++ b/src/components/main_page/Landing.astro @@ -7,7 +7,9 @@ import { RiInstagramFill } from "react-icons/ri"; import { MdEmail } from "react-icons/md"; --- -
+
From 43fb2f37d8b7687fe27f33c71b4d54be8ea60d73 Mon Sep 17 00:00:00 2001 From: chark1es Date: Mon, 27 Jan 2025 10:21:53 -0800 Subject: [PATCH 3/8] Fixed navbar issues --- src/components/core/Navbar.astro | 236 ++++++++++++------------- src/components/main_page/Divider.astro | 34 ++-- src/components/main_page/Landing.astro | 4 +- src/layouts/Layout.astro | 43 ++--- 4 files changed, 157 insertions(+), 160 deletions(-) diff --git a/src/components/core/Navbar.astro b/src/components/core/Navbar.astro index d046f60..bb4b76a 100644 --- a/src/components/core/Navbar.astro +++ b/src/components/core/Navbar.astro @@ -4,146 +4,140 @@ import whiteLogoHorizontal from "../../images/logos/white_logo_horizontal.svg"; import pages from "../../data/pages.json"; --- -
-
- +
+
+ - - - - + + + +
diff --git a/src/components/main_page/Divider.astro b/src/components/main_page/Divider.astro index e7f536d..a34a38f 100644 --- a/src/components/main_page/Divider.astro +++ b/src/components/main_page/Divider.astro @@ -1,14 +1,24 @@
-
-

- 02 -

-

- 2nd Largest in the US? -

- -
-

- The community of engineers at IEEE @ UCSD has consistently been one of the largest in the country. In 2021 and 2022, we won the 2nd Largest Student Branch Award in the US and we strive to win it again in the coming year. +

+

+ 02

-
+

+ 2nd Largest in the US? +

+
+

+ The community of engineers at IEEE @ UCSD has consistently been one of the + largest in the country. In 2021 and 2022, we won the 2nd Largest Student + Branch Award in the US and we strive to win it again in the coming year. +

+
diff --git a/src/components/main_page/Landing.astro b/src/components/main_page/Landing.astro index f81894e..3f2a599 100644 --- a/src/components/main_page/Landing.astro +++ b/src/components/main_page/Landing.astro @@ -7,9 +7,7 @@ import { RiInstagramFill } from "react-icons/ri"; import { MdEmail } from "react-icons/md"; --- -
+
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 9c9a4ac..61fe175 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -5,29 +5,24 @@ import InView from "../components/core/InView.astro"; --- - - - - - - - Astro Basics - - - + + + + + + + Astro Basics + + + +
+
-
- -
-
- - - +
+
+ +
+
+
+ From 9c114fb1dbee8c88ba0ea2882baebeef044309a8 Mon Sep 17 00:00:00 2001 From: chark1es Date: Mon, 27 Jan 2025 10:22:09 -0800 Subject: [PATCH 4/8] Fixed height issues relating to navbar --- src/components/board/Officers.astro | 83 +++++++++++++------------- src/components/core/Title.astro | 16 ++--- src/components/events/EventTitle.astro | 24 ++++---- src/components/find/FindTitle.astro | 45 ++++++++------ src/components/join/JoinTitle.astro | 49 +++++++++------ 5 files changed, 121 insertions(+), 96 deletions(-) diff --git a/src/components/board/Officers.astro b/src/components/board/Officers.astro index 2f03c1f..a5319ae 100644 --- a/src/components/board/Officers.astro +++ b/src/components/board/Officers.astro @@ -15,51 +15,50 @@ const currentFilter = "All"; ---
-
- About background image - About image -
+
+ About background image + About image +
-
- -

MEET THE BOARD

-
+
+ +

MEET THE BOARD

+
-

- Our board comprises 31 students of varying majors, colleges, and - interests! Feel free to reach out for any questions about our position - or experiences. -

+

+ Our board comprises 31 students of varying majors, colleges, and interests! + Feel free to reach out for any questions about our position or experiences. +

- + -
- { - officers.map((officer) => ( -
- -
- )) - } -
+
+ { + officers.map((officer) => ( +
+ +
+ )) + } +
diff --git a/src/components/core/Title.astro b/src/components/core/Title.astro index e6cd3c2..bf683d8 100644 --- a/src/components/core/Title.astro +++ b/src/components/core/Title.astro @@ -1,11 +1,13 @@ --- -const {title} = Astro.props; +const { title } = Astro.props; import { LiaDotCircle } from "react-icons/lia"; --- -
- -

- {title} -

-
\ No newline at end of file +
+ +

+ {title} +

+
diff --git a/src/components/events/EventTitle.astro b/src/components/events/EventTitle.astro index 7ce8d31..0b4faee 100644 --- a/src/components/events/EventTitle.astro +++ b/src/components/events/EventTitle.astro @@ -4,16 +4,16 @@ import eventbg from "../../images/eventbg.webp"; import { LiaDotCircle } from "react-icons/lia"; --- -
- Event Page Background -
- -

EVENTS

-
+
+ Event Page Background +
+ +

EVENTS

+
diff --git a/src/components/find/FindTitle.astro b/src/components/find/FindTitle.astro index 93134ca..0d502ba 100644 --- a/src/components/find/FindTitle.astro +++ b/src/components/find/FindTitle.astro @@ -3,21 +3,32 @@ import Link from "next/link"; import { LiaDotCircle } from "react-icons/lia"; --- -
-
-
- -

- Contact Us -

-
-

- The IEEE Project Space is an open-access, collaborative space located at EBU1-4710. Students can do homework or get access to basic electronic tools such as soldering stations, breadboard components, and Arduino and Raspberry PI parts! -

-
- - DISCORD - -
+
+
+
+ +

Contact Us

-
\ No newline at end of file +

+ The IEEE Project Space is an open-access, collaborative space located at EBU1-4710. Students can + do homework or get access to basic electronic tools such as soldering stations, + breadboard components, and Arduino and Raspberry PI parts! +

+
+ + DISCORD + +
+
+
diff --git a/src/components/join/JoinTitle.astro b/src/components/join/JoinTitle.astro index 988e775..f2222fc 100644 --- a/src/components/join/JoinTitle.astro +++ b/src/components/join/JoinTitle.astro @@ -3,22 +3,35 @@ import Link from "next/link"; import { LiaDotCircle } from "react-icons/lia"; --- -
-
-
- -

- Join Us -

-
-

- The IEEE Project Space is an open-access, collaborative space located at EBU1-4710. Students can do homework or get access to basic electronic tools such as soldering stations, breadboard components, and Arduino and Raspberry PI parts! -

-
- - JOIN - -
- +
+
+
+ +

Join Us

-
\ No newline at end of file +

+ The IEEE Project Space is an open-access, collaborative space located at EBU1-4710. Students can + do homework or get access to basic electronic tools such as soldering stations, + breadboard components, and Arduino and Raspberry PI parts! +

+
+ + JOIN + +
+
+
From 821d929428b83a9fd38c9502b81d76cad9464b8e Mon Sep 17 00:00:00 2001 From: chark1es Date: Mon, 27 Jan 2025 10:27:33 -0800 Subject: [PATCH 5/8] fix navbar mobile view --- src/components/core/Navbar.astro | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/components/core/Navbar.astro b/src/components/core/Navbar.astro index bb4b76a..b60eb09 100644 --- a/src/components/core/Navbar.astro +++ b/src/components/core/Navbar.astro @@ -8,8 +8,17 @@ import pages from "../../data/pages.json";
- + + IEEE UCSD Logo @@ -71,16 +80,18 @@ import pages from "../../data/pages.json"; id="mobile-menu" class="fixed inset-0 z-[51] hidden xl:hidden motion-safe:transition-transform motion-safe:duration-300 translate-x-full" > -
+
{ pages.map((page) => ( {page.name} From 9cff5f27314067a81b794026513b7674b6d5f9fc Mon Sep 17 00:00:00 2001 From: chark1es Date: Mon, 27 Jan 2025 10:45:20 -0800 Subject: [PATCH 6/8] fix border --- src/components/core/Navbar.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/core/Navbar.astro b/src/components/core/Navbar.astro index b60eb09..89dd7dc 100644 --- a/src/components/core/Navbar.astro +++ b/src/components/core/Navbar.astro @@ -6,7 +6,7 @@ import pages from "../../data/pages.json";
Date: Mon, 27 Jan 2025 11:25:42 -0800 Subject: [PATCH 7/8] fix mobile for Robocup page --- src/components/core/About.astro | 4 +- src/components/core/Subtitle.astro | 2 +- src/components/qp/Timeline.astro | 65 ++++++++++++------------- src/components/robocub/Contacts.astro | 12 ++--- src/components/robocub/Join.astro | 12 ++--- src/components/robocub/Subteam.astro | 16 ------ src/components/robocub/Subteams.astro | 16 +++--- src/components/signal/Competition.astro | 15 +++--- src/data/landing.js | 16 ------ src/data/qpTimeline.json | 62 ++++++++++++----------- src/data/roboTimeline.json | 30 ++++++++++++ src/layouts/Layout.astro | 2 +- src/pages/quarterly.astro | 3 +- src/pages/robocup.astro | 7 +-- 14 files changed, 127 insertions(+), 135 deletions(-) delete mode 100644 src/components/robocub/Subteam.astro delete mode 100644 src/data/landing.js create mode 100644 src/data/roboTimeline.json diff --git a/src/components/core/About.astro b/src/components/core/About.astro index 5633c44..15b5db9 100644 --- a/src/components/core/About.astro +++ b/src/components/core/About.astro @@ -4,14 +4,14 @@ const {title, text} = Astro.props; ---
-
+

{title}

-

+

{text}

\ No newline at end of file diff --git a/src/components/core/Subtitle.astro b/src/components/core/Subtitle.astro index 70857c4..6065c13 100644 --- a/src/components/core/Subtitle.astro +++ b/src/components/core/Subtitle.astro @@ -3,7 +3,7 @@ const {title} = Astro.props; import { LiaDotCircle } from "react-icons/lia"; --- -
+

{title} diff --git a/src/components/qp/Timeline.astro b/src/components/qp/Timeline.astro index 97b38d8..2dc3b72 100644 --- a/src/components/qp/Timeline.astro +++ b/src/components/qp/Timeline.astro @@ -1,54 +1,51 @@ --- -import qpTimeline from "../../data/qpTimeline.json"; -const { events } = qpTimeline; +const {timeline} = Astro.props; import Subtitle from "../core/Subtitle.astro"; --- -

+
- { - events.map((event, index) => ( + {timeline.map((event, index) => ( +
-
-
-
- {event.week} -
-
- {event.description} -
+
+
+ {event.week} +
+
+ {event.description}
- -
- -
-
-
- )) - } + +
+ +
+
+
+
+ ))}
diff --git a/src/components/robocub/Contacts.astro b/src/components/robocub/Contacts.astro index 3dbf361..77eca49 100644 --- a/src/components/robocub/Contacts.astro +++ b/src/components/robocub/Contacts.astro @@ -8,29 +8,29 @@ import { LiaDotCircle } from "react-icons/lia";
-
+

Contacts

-

+

To stay up to date, join discord server

-
+
-

Facebook

+

Facebook

-
+
-

Instagram

+

Instagram

diff --git a/src/components/robocub/Join.astro b/src/components/robocub/Join.astro index 107ec5d..36384d7 100644 --- a/src/components/robocub/Join.astro +++ b/src/components/robocub/Join.astro @@ -9,20 +9,20 @@ import robocup from "../../images/robocup.webp"; robocub competition image
-

+

We Are
Hiring

-
+

Join a community of beginner to experienced engineers from different disciplines and backgrounds @@ -33,10 +33,10 @@ import robocup from "../../images/robocup.webp";

Application form

diff --git a/src/components/robocub/Subteam.astro b/src/components/robocub/Subteam.astro deleted file mode 100644 index e698960..0000000 --- a/src/components/robocub/Subteam.astro +++ /dev/null @@ -1,16 +0,0 @@ ---- -import { FaGear, FaMicrochip, FaCode } from "react-icons/fa6"; -import { LuBrainCircuit } from "react-icons/lu"; -const { title, list } = Astro.props; ---- - -
-

- {title} -

-
    - {list.map((item: string) =>
  • • {item}
    • )} -
-
diff --git a/src/components/robocub/Subteams.astro b/src/components/robocub/Subteams.astro index 95bcb17..17321a2 100644 --- a/src/components/robocub/Subteams.astro +++ b/src/components/robocub/Subteams.astro @@ -1,6 +1,5 @@ --- import Subtitle from "../core/Subtitle.astro"; -import Subteam from "./Subteam.astro"; import subteams from "../../data/subteams.json"; import { IoIosArrowBack, IoIosArrowForward } from "react-icons/io"; import { FaGear, FaMicrochip, FaCode } from "react-icons/fa6"; @@ -11,9 +10,9 @@ const duplicatedSubteams = [...subteams, ...subteams, ...subteams]; const centerIndex = Math.floor(subteams.length); // center in the middle --- -
+
-
+