diff --git a/src/components/board/Filter.astro b/src/components/board/Filter.astro index 890703d..a829fb9 100644 --- a/src/components/board/Filter.astro +++ b/src/components/board/Filter.astro @@ -1,3 +1,166 @@ --- +const { filters, currentFilter } = Astro.props; +--- ---- \ No newline at end of file +
+
+
+ { + filters.map((filter) => ( + + )) + } +
+ + diff --git a/src/components/board/Officer.astro b/src/components/board/Officer.astro index 343a74e..b97d6c1 100644 --- a/src/components/board/Officer.astro +++ b/src/components/board/Officer.astro @@ -2,31 +2,53 @@ import { FaGear } from "react-icons/fa6"; import { MdEmail } from "react-icons/md"; import Link from "next/link"; -const {name, position, picture, email} = Astro.props; +const { name, position, picture, email } = Astro.props; --- -
-
- - -

+ +

+
+ + +

{email}

-
- officer -
- +
+ officer +
+
-
-

+

+

{name}

-
+
{position}
-
+

- -
\ No newline at end of file +
diff --git a/src/components/board/Officers.astro b/src/components/board/Officers.astro index f892387..ea4b547 100644 --- a/src/components/board/Officers.astro +++ b/src/components/board/Officers.astro @@ -4,16 +4,37 @@ import { Image } from "astro:assets"; import neko from "../../images/neko.png"; import { LiaDotCircle } from "react-icons/lia"; import Officer from "../board/Officer.astro"; +import Filter from "../board/Filter.astro"; import officers from "../../data/officers.json"; + +// Get all unique types and add 'All' option +const typeOrder = ["Executives", "Internal", "Events", "Projects"]; +const types = ["All", ...typeOrder]; + +const currentFilter = "All"; --- +<<<<<<< HEAD
+======= +
+
+>>>>>>> chark1es-main About background image About image>>>>>> chark1es-main />
@@ -22,19 +43,38 @@ import officers from "../../data/officers.json";

MEET THE BOARD

+<<<<<<< HEAD

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. +

+ + + +>>>>>>> chark1es-main
{ officers.map((officer) => ( - +
+ +
)) }
diff --git a/src/components/robocub/Subteam.astro b/src/components/robocub/Subteam.astro index 7044658..e698960 100644 --- a/src/components/robocub/Subteam.astro +++ b/src/components/robocub/Subteam.astro @@ -1,22 +1,16 @@ --- import { FaGear, FaMicrochip, FaCode } from "react-icons/fa6"; import { LuBrainCircuit } from "react-icons/lu"; -const {title, list}=Astro.props; +const { title, list } = Astro.props; --- -
+

{title}

    - {list.map((item)=>( -
  • • {item}
  • - ))} + {list.map((item: string) =>
  • • {item}
  • )}
-
- {title==="Mechanical" && } - {title==="Electrical" && } - {title==="AI" && } - {title==="Embedded" && } -
-
\ No newline at end of file +
diff --git a/src/components/robocub/Subteams.astro b/src/components/robocub/Subteams.astro index 62c4780..95bcb17 100644 --- a/src/components/robocub/Subteams.astro +++ b/src/components/robocub/Subteams.astro @@ -1,13 +1,243 @@ --- import Subtitle from "../core/Subtitle.astro"; import Subteam from "./Subteam.astro"; -import subteams from "../../data/subteams.json" +import subteams from "../../data/subteams.json"; +import { IoIosArrowBack, IoIosArrowForward } from "react-icons/io"; +import { FaGear, FaMicrochip, FaCode } from "react-icons/fa6"; +import { LuBrainCircuit } from "react-icons/lu"; + +// duplicate the array 3 times for smoother looping +const duplicatedSubteams = [...subteams, ...subteams, ...subteams]; +const centerIndex = Math.floor(subteams.length); // center in the middle --- -
+ +
-
- {subteams.map((subteam)=>( - - ))} +
+ + +
-
\ No newline at end of file +
+ + + + diff --git a/src/data/subteams.json b/src/data/subteams.json index 5e965d9..c720958 100644 --- a/src/data/subteams.json +++ b/src/data/subteams.json @@ -1,20 +1,32 @@ [ - { - "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" - ] - } + { + "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" + ] + }, + { + "title": "AI", + "list": [ + "Design decision making algorithms using behavioral trees", + "Conduct testing with simulation" + ] + } ]