diff --git a/bun.lockb b/bun.lockb index 0bfd701..580ac50 100644 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/src/components/events/EventTitle.astro b/src/components/events/EventTitle.astro index dcb1f0e..6bdb194 100644 --- a/src/components/events/EventTitle.astro +++ b/src/components/events/EventTitle.astro @@ -1,15 +1,19 @@ --- import { Image } from "astro:assets"; -import eventbg from "../../../public/eventbg.png" +import eventbg from "/eventbg.png"; import { LiaDotCircle } from "react-icons/lia"; ---
- Event Page Background -
- -

- EVENTS -

+ Event Page Background +
+ +

EVENTS

-
\ No newline at end of file +
diff --git a/src/components/qp/Step.astro b/src/components/qp/Step.astro index 38bb6c9..b02486f 100644 --- a/src/components/qp/Step.astro +++ b/src/components/qp/Step.astro @@ -1,10 +1,14 @@ --- -const {text, number, col, position} = Astro.props; +const { text, number, col, position, width } = Astro.props; --- -
-

+

+

{number}

{text} -
\ No newline at end of file +
diff --git a/src/components/qp/Steps.astro b/src/components/qp/Steps.astro index 25e9dea..685584e 100644 --- a/src/components/qp/Steps.astro +++ b/src/components/qp/Steps.astro @@ -1,18 +1,41 @@ --- -import Step from "./Step.astro" -import steps from "../../data/steps.json" -import Subtitle from "../core/Subtitle.astro" +import Step from "./Step.astro"; +import steps from "../../data/steps.json"; +import Subtitle from "../core/Subtitle.astro"; --- +
-
- {steps.map((step)=>( - - ))} +
+
+ { + steps + .slice(0, 3) + .map((step) => ( + + )) + } +
+
+ { + steps + .slice(3, 5) + .map((step) => ( + + )) + } +
-
\ No newline at end of file +
diff --git a/src/components/qp/Timeline.astro b/src/components/qp/Timeline.astro new file mode 100644 index 0000000..fb5bfce --- /dev/null +++ b/src/components/qp/Timeline.astro @@ -0,0 +1,54 @@ +--- +import qpTimeline from "../../data/qpTimeline.json"; +const { events } = qpTimeline; +import Subtitle from "../core/Subtitle.astro"; +--- + +
+ + +
+
+
+ + { + events.map((event, index) => ( +
+
+
+
+ {event.week} +
+
+ {event.description} +
+
+
+ +
+ +
+
+
+
+ )) + } +
+
diff --git a/src/data/qpTimeline.json b/src/data/qpTimeline.json new file mode 100644 index 0000000..0432116 --- /dev/null +++ b/src/data/qpTimeline.json @@ -0,0 +1,32 @@ +{ + "events": [ + { + "week": "Week 1", + "description": "Submit Applications" + }, + { + "week": "Week 2", + "description": "QP groups are formed, QP Kickoff" + }, + { + "week": "Week 3", + "description": "Mentor Assignments" + }, + { + "week": "Week 4", + "description": "Workathon #1" + }, + { + "week": "Week 6", + "description": "Workathon #2, Milestone #1" + }, + { + "week": "Week 8", + "description": "Workathon #3, Milestone #2" + }, + { + "week": "Week 9/10", + "description": "Final submission, QP Showcase!" + } + ] +} diff --git a/src/data/steps.json b/src/data/steps.json index b4eed5f..b1868dc 100644 --- a/src/data/steps.json +++ b/src/data/steps.json @@ -1,32 +1,34 @@ [ - { - "text": "Prospective participants who are interested in joining Quaterly Project will fill out QP interest form, which can be founded on the bottom of this page.", - "number": "01", - "col": "2", - "position": "bottom-0 right-[2%] " - }, - { - "text": "Participants will be put into teams of 5 based on their experience and interests", - "number": "02", - "col": "2", - "position": " top-0 left-[2%] " - }, - { - "text": "Each team will be assigned a mentor.", - "number": "03", - "col": "1", - "position": "bottom-0" - }, - { - "text": "At the end of the quarter, teams will showcase their project to judges including professors, industry experts, IEEE officers, and fellow participants", - "number": "04", - "col": "3", - "position": "bottom-0 right-[2%] " - }, - { - "text": "Winning teams will walk away with prizes!", - "number": "05", - "col": "2", - "position": "top-0 right-[5%]" - } + { + "text": "Prospective participants who are interested in joining Quaterly Project will fill out QP interest form, which can be founded on the bottom of this page.", + "number": "01", + "col": "2", + "position": "bottom-0 right-[2%] " + }, + { + "text": "Participants will be put into teams of 5 based on their experience and interests", + "number": "02", + "col": "1", + "position": " top-0 left-[2%] ", + "width": "col-span-1" + }, + { + "text": "Each team will be assigned a mentor.", + "number": "03", + "col": "1", + "position": "bottom-0" + }, + { + "text": "At the end of the quarter, teams will showcase their project to judges including professors, industry experts, IEEE officers, and fellow participants", + "number": "04", + "col": "2", + "position": "bottom-0 right-[2%] " + }, + { + "text": "Winning teams will walk away with prizes!", + "number": "05", + "col": "1", + "position": "top-0 right-[5%]", + "width": "col-span-1" + } ] diff --git a/src/pages/404.astro b/src/pages/404.astro index f962f0d..58de44d 100644 --- a/src/pages/404.astro +++ b/src/pages/404.astro @@ -1,3 +1,7 @@ -
- 404 ERROR -
\ No newline at end of file +--- +import Layout from "../layouts/Layout.astro"; +--- + + +
404 ERROR
+ diff --git a/src/pages/find.astro b/src/pages/find.astro index 8711ab6..0ff1b6b 100644 --- a/src/pages/find.astro +++ b/src/pages/find.astro @@ -4,13 +4,17 @@ import Social from "../components/core/Social.astro"; 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 event from "../../public/event.jpg"; ---
- board group photos + board group photos
diff --git a/src/pages/quarterly.astro b/src/pages/quarterly.astro index 468cb4a..47bbe03 100644 --- a/src/pages/quarterly.astro +++ b/src/pages/quarterly.astro @@ -5,22 +5,37 @@ import About from "../components/core/About.astro"; import Steps from "../components/qp/Steps.astro"; import PastProjects from "../components/qp/PastProjects.astro"; import { Image } from "astro:assets"; -import qp from "../../public/qp.png" +import qp from "../../public/qp.png"; import Mentorship from "../components/qp/Mentorship.astro"; import qpborder from "../../public/qpborder.png"; import Join from "../components/qp/Join.astro"; import Carousel from "../components/qp/Carousel.astro"; -import Timeline from "../components/core/Timeline.astro"; +import Timeline from "../components/qp/Timeline.astro"; --- - JOIN US - JOIN US + JOIN US + JOIN US <div class="w-full flex justify-center my-[3%]"> - <Image src={qp} alt="board group photos" class=" w-2/3 rounded-full object-cover aspect-[2.5/1]"/> + <Image + src={qp} + alt="board group photos" + class="w-2/3 rounded-full object-cover aspect-[2.5/1]" + /> </div> - <About title="What is Quarterly Project?" text="Getting started on hardware development or want to make your own project? Need something to put on your resume? IEEE's Quarterly Projects aims to provide students with project experience in a span of 10 weeks. During QP, students will acquire skills used in the industry such as C++ and the prototyping process with the assistance of our mentors. At the end of the quarter, students will demonstrate their projects at QP Showcase in front of other students, professors, and industry professionals!" /> + <About + title="What is Quarterly Project?" + text="Getting started on hardware development or want to make your own project? Need something to put on your resume? IEEE's Quarterly Projects aims to provide students with project experience in a span of 10 weeks. During QP, students will acquire skills used in the industry such as C++ and the prototyping process with the assistance of our mentors. At the end of the quarter, students will demonstrate their projects at QP Showcase in front of other students, professors, and industry professionals!" + /> <Steps /> <Timeline /> <PastProjects /> diff --git a/tailwind.config.mjs b/tailwind.config.mjs index 91b76e7..924bb36 100644 --- a/tailwind.config.mjs +++ b/tailwind.config.mjs @@ -1,10 +1,11 @@ /** @type {import('tailwindcss').Config} */ export default { content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"], + safelist: ["col-span-1", "col-span-2", "col-span-3", "col-span-4"], theme: { extend: { boxShadow: { - 'glow': '0 0 0.5vw 0.1vw rgba(255, 255, 255, 0.3), 0 0 1vw 0.5vw rgba(255, 255, 255, 0.1)', + glow: "0 0 0.5vw 0.1vw rgba(255, 255, 255, 0.3), 0 0 1vw 0.5vw rgba(255, 255, 255, 0.1)", }, colors: { ieee: { @@ -13,7 +14,7 @@ export default { "blue-100": "#88BFEC", "blue-300": "#233363", }, - + // Project Page Card colors project_card_bg: "#0d1324", },