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

src/components/core/Timeline.astro

@@ -1,7 +0,0 @@
----
-import Subtitle from "../core/Subtitle.astro";
----
-
-<div class="flex flex-col items-center my-[5%]">
-    <Subtitle title="Timeline" />
-</div>

src/components/robocub/Join.astro

@@ -3,11 +3,9 @@ import Link from "next/link";
 import { GoArrowDownRight } from "react-icons/go";
 import { Image } from "astro:assets";
 import robocup from "../../../public/robocup.png";
-import Subtitle from "../core/Subtitle.astro";
 ---
 
 <div class="flex flex-col items-center relative my-[10%]">
-    <Subtitle title="Join" />
     <Image src={robocup} alt="robocub competition image" class="w-3/5 rounded-[2vw] object-cover aspect-[8/5] opacity-40"/>
     <Link href="/" target="_blank" className="absolute aspect-[8/5] w-3/5 p-[5%] group -bottom-[3%]">
         <div class="w-full flex justify-end items-center h-4/5">

src/components/robocub/Subteam.astro

@@ -0,0 +1,22 @@
+---
+import { FaGear, FaMicrochip, FaCode } from "react-icons/fa6";
+import { LuBrainCircuit } from "react-icons/lu";
+const {title, list}=Astro.props;
+---
+
+<div class="px-[10%] relative flex flex-col justify-center items-center w-[20vw] h-[43vh] bg-gradient-to-b from-ieee-blue-100/25 to-ieee-black backdrop-blur rounded-[2vw] border-white/40 border-[0.1vw]">
+    <p class="text-[1.5vw] mb-[10%] font-semibold pt-[10%]">
+        {title}
+    </p>
+    <ul class="text-[1vw] font-light">
+        {list.map((item)=>(
+            <li>&#8226; {item}</li>
+         ))}
+    </ul>
+    <div class="-top-[10%] w-fit p-[5%] shadow-ieee-blue-300 text-[3.2vw] bg-gradient-to-b from-ieee-blue-100 to-ieee-blue-300 rounded-full absolute">
+        {title==="Mechanical" && <FaGear />}
+        {title==="Electrical" && <FaMicrochip />}
+        {title==="AI" && <LuBrainCircuit />}
+        {title==="Embedded" && <FaCode />}
+    </div>
+</div>

src/components/robocub/Subteams.astro

@@ -0,0 +1,13 @@
+---
+import Subtitle from "../core/Subtitle.astro";
+import Subteam from "./Subteam.astro";
+import subteams from "../../data/subteams.json"
+---
+<div class="flex flex-col items-center my-[10%]">
+    <Subtitle title="Subteams" />
+    <div class="grid grid-flow-col gap-[1.5vw] mt-[3%]">
+        {subteams.map((subteam)=>(
+            <Subteam title={subteam.title} list={subteam.list} />
+         ))}
+    </div>
+</div>

src/components/signal/Contacts.astro

@@ -0,0 +1,29 @@
+---
+import { FaDiscord} from "react-icons/fa";
+import Link from "next/link";
+import { LiaDotCircle } from "react-icons/lia";
+---
+
+<div class="flex justify-center my-[10%]">
+    <div class="w-1/2 flex justify-between">
+        <div>
+            <div class="flex items-center text-[2.5vw]">
+                <LiaDotCircle className=" mr-[1vw] pt-[0.5%]"/>
+                <p>
+                    Contacts
+                </p>
+            </div>
+            <p class="text-[1.1vw] ml-[5%] text-nowrap">
+                To stay up to date, join discord server
+            </p>
+        </div>
+        <Link href="https://www.facebook.com/ieeeucsd" target="_blank" className="mr-[20%] flex flex-col items-center">
+            <div class="border-[0.15vw] rounded-full shadow-glow hover:scale-110 duration-300 p-[1vw] text-[2.2vw] text-ieee-black/80 border-ieee-blue-100 bg-gradient-radial from-white via-white to-white/40">
+                <FaDiscord />
+            </div>
+            <p class="text-[1.3vw] font-semibold">Facebook</p>
+        </Link>
+    </div>
+
+</div>
+

src/data/subteams.json

@@ -0,0 +1,20 @@
+[
+    {
+        "title": "Mechanical",
+        "list": ["Design the Mechanisms and Structure of the Robot",
+                "Fabricate and assemble robot design",
+                "Integrate electronics and other hardware"]
+    },
+    {
+        "title": "Electrical",
+        "list": ["Design circuits to power and control robot subsystems",
+                "Work with mechanical team to assemble electronics in the robots"]
+    },
+    {
+        "title": "Embedded",
+        "list": ["Communicate between software and hardware",
+                "Provide low level software interface and API",
+                "Handle and sample data using math/physics knowledge"
+                ]
+    }
+]

src/pages/robocup.astro

@@ -9,6 +9,8 @@ import { Image } from "astro:assets";
 import roboborder from "../../public/roboborder.png";
 import Join from "../components/robocub/Join.astro";
 import Contacts from "../components/robocub/Contacts.astro";
+import Subteams from "../components/robocub/Subteams.astro";
+import Timeline from "../components/qp/Timeline.astro";
 ---
 
 <Layout>
@@ -21,6 +23,8 @@ import Contacts from "../components/robocub/Contacts.astro";
             Past Team Description Paper
         </Link>
     </div>
+    <Subteams />
+    <Timeline />
     <Join/>
     <Questions faq={faq}/>
     <Contacts/>

src/pages/signal.astro

@@ -1,7 +1,14 @@
 ---
 import Layout from "../layouts/Layout.astro";
+import Contacts from "../components/signal/Contacts.astro";
+import About from "../components/core/About.astro";
+import Title from "../components/core/Title.astro";
 ---
 
 <Layout>
-    QP
+    <p class="text-ieee-yellow text-[1.2vw] absolute top-[27.5vh] left-[15.5vw]">COMING SOON (New UCSD IEEE branch)</p>
+    <Title title="Signal Processing" />
+    <About title="What is Signal Processing" text="Currently, we are focusing on the IEEE Signal Processing Cup (an annual signal processing competition). However, we might do projects in the future."/>
+    <Contacts />
+
 </Layout>