Merge branch 'main' of https://git.ieeeucsd.org/Webmaster/dev-ieeeucsd-org into cwu423

README.md

@@ -3,12 +3,14 @@
 Development version of the IEEE UC San Diego student branch website.
 
 ## Figma Design
--   [IEEE UCSD Website Design](https://www.figma.com/design/AihoR936yUmYrMoCZJ0LF7/UCSD-IEEE?node-id=0-1&t=ajK9lKroQFJbokFS-1)
+
+- [IEEE UCSD Website Design](https://www.figma.com/design/AihoR936yUmYrMoCZJ0LF7/UCSD-IEEE?node-id=0-1&t=ajK9lKroQFJbokFS-1)
+
 ## Getting Started
 
 Prerequisites:
 
--   [Bun](https://bun.sh) - Fast all-in-one JavaScript runtime & toolkit
+- [Bun](https://bun.sh) - Fast all-in-one JavaScript runtime & toolkit
 
 ### Installation
 
@@ -46,9 +48,14 @@ bun run start
 
 ## Built with:
 
--   [Astro](https://astro.build) - Web framework for content-driven websites
--   [React](https://react.dev) - UI components
--   [TailwindCSS](https://tailwindcss.com) - Styling
--   [MDX](https://mdxjs.com) - Enhanced Markdown
--   [Expressive Code](https://expressive-code.com) - Beautiful code blocks
--   [Node.js Adapter](https://docs.astro.build/en/guides/integrations-guide/node/) - Server-side rendering
+- [Astro](https://astro.build) - Web framework for content-driven websites
+- [React](https://react.dev) - UI components
+- [TailwindCSS](https://tailwindcss.com) - Styling
+- [MDX](https://mdxjs.com) - Enhanced Markdown
+- [Expressive Code](https://expressive-code.com) - Beautiful code blocks
+- [Node.js Adapter](https://docs.astro.build/en/guides/integrations-guide/node/) - Server-side rendering
+
+## Contributors:
+
+- Charles Nguyen
+- Shing Hung

src/components/board/Filter.astro

@@ -0,0 +1,3 @@
+---
+
+---

src/pages/events.astro

@@ -2,14 +2,14 @@
 import Layout from "../layouts/Layout.astro";
 import EventTitle from "../components/events/EventTitle.astro";
 import { Image } from "astro:assets";
-import join from "../../public/join.png";
+import eventborder from "../../public/eventborder.png";
 import calendar from "../../public/calendar2.png";
 import UpcomingEvents from "../components/events/UpcomingEvents.astro";
 ---
 
 <Layout>
-    <Image src={join} alt="JOIN US" class="absolute left-[1vw] w-[4vw] top-[60vh]" />
-    <Image src={join} alt="JOIN US" class="absolute right-[1vw] w-[4vw] top-[60vh]" />
+    <Image src={eventborder} alt="JOIN US" class="absolute left-[1vw] w-[4vw] top-[60vh]" />
+    <Image src={eventborder} alt="JOIN US" class="absolute right-[1vw] w-[4vw] top-[60vh]" />
     <EventTitle />
     <UpcomingEvents />
     <div class="flex justify-center pb-[10%]">

src/pages/find.astro

@@ -5,9 +5,12 @@ import Findus from "../components/join/Findus.astro";
 import FindTitle from "../components/find/FindTitle.astro";
 import { Image } from "astro:assets";
 import event from "../../public/event.jpg";
+import contactbroder from "../../public/contactbroder.png"
 ---
 
 <Layout>
+    <Image src={contactbroder} alt="JOIN US" class="absolute left-[1vw] w-[4vw] top-[60vh]" />
+    <Image src={contactbroder} alt="JOIN US" class="absolute right-[1vw] w-[4vw] top-[60vh]" />
     <FindTitle />
     <div class="w-full flex justify-center">
         <Image

src/pages/projects.astro

@@ -4,12 +4,12 @@ import Title from "../components/core/Title.astro";
 import QP from "../components/projects/QP.astro";
 import AP from "../components/projects/AP.astro";
 import { Image } from "astro:assets";
-import join from "../../public/join.png";
+import projectsborder from "../../public/projectsborder.png";
 ---
 
 <Layout>
-    <Image src={join} alt="JOIN US" class="absolute left-[1vw] w-[4vw] top-[60vh]" />
-    <Image src={join} alt="JOIN US" class="absolute right-[1vw] w-[4vw] top-[60vh]" />
+    <Image src={projectsborder} alt="JOIN US" class="absolute left-[1vw] w-[4vw] top-[60vh]" />
+    <Image src={projectsborder} alt="JOIN US" class="absolute right-[1vw] w-[4vw] top-[60vh]" />
     <Title title="PROJECTS" />
     <QP />
     <AP />