diff --git a/public/model.png b/public/model.png
new file mode 100644
index 0000000..dce9a6f
Binary files /dev/null and b/public/model.png differ
diff --git a/public/roboborder.png b/public/roboborder.png
new file mode 100644
index 0000000..980feaa
Binary files /dev/null and b/public/roboborder.png differ
diff --git a/src/components/core/About.astro b/src/components/core/About.astro
new file mode 100644
index 0000000..5633c44
--- /dev/null
+++ b/src/components/core/About.astro
@@ -0,0 +1,17 @@
+---
+import { LiaDotCircle } from "react-icons/lia";
+const {title, text} = Astro.props;
+---
+
+
+
+
+
+ {title}
+
+
+
+
+ {text}
+
+
\ No newline at end of file
diff --git a/src/components/core/Question.astro b/src/components/core/Question.astro
new file mode 100644
index 0000000..1765961
--- /dev/null
+++ b/src/components/core/Question.astro
@@ -0,0 +1,14 @@
+---
+const {question, answer} = Astro.props;
+---
+
+
+ {question}
+
+
+ {answer}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/core/Questions.astro b/src/components/core/Questions.astro
new file mode 100644
index 0000000..8b67fc2
--- /dev/null
+++ b/src/components/core/Questions.astro
@@ -0,0 +1,22 @@
+---
+import Question from "./Question.astro"
+import { LiaDotCircle } from "react-icons/lia";
+const {faq} = Astro.props;
+
+---
+
+
+
+
+ Frequently Asked Questions
+
+
+
+ {faq.map((question)=>(
+
+ ))}
+
+
\ No newline at end of file
diff --git a/src/components/qp/TimeStamp.astro b/src/components/core/TimeStamp.astro
similarity index 100%
rename from src/components/qp/TimeStamp.astro
rename to src/components/core/TimeStamp.astro
diff --git a/src/components/core/Timeline.astro b/src/components/core/Timeline.astro
new file mode 100644
index 0000000..aa15e86
--- /dev/null
+++ b/src/components/core/Timeline.astro
@@ -0,0 +1,7 @@
+---
+import Subtitle from "../core/Subtitle.astro";
+---
+
+
+
+
\ No newline at end of file
diff --git a/src/components/join/Questions.astro b/src/components/join/Questions.astro
index c3ae8c9..cf16f79 100644
--- a/src/components/join/Questions.astro
+++ b/src/components/join/Questions.astro
@@ -1,7 +1,8 @@
---
import Question from "./Question.astro"
import { LiaDotCircle } from "react-icons/lia";
-import faq from "../../data/faq.json"
+const {faq} = Astro.props;
+
---
- 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!
-
-
\ No newline at end of file
diff --git a/src/components/qp/Join.astro b/src/components/qp/Join.astro
index b7b52fe..1534f4d 100644
--- a/src/components/qp/Join.astro
+++ b/src/components/qp/Join.astro
@@ -15,7 +15,7 @@ import jonathan from "../../../public/about3.png"
-
+
How to join
diff --git a/src/components/qp/Timeline.astro b/src/components/qp/Timeline.astro
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/robocub/RoboTitle.astro b/src/components/robocub/RoboTitle.astro
new file mode 100644
index 0000000..4fe57ad
--- /dev/null
+++ b/src/components/robocub/RoboTitle.astro
@@ -0,0 +1,10 @@
+---
+import Title from "../core/Title.astro";
+import { Image } from "astro:assets";
+import model from "../../../public/model.png"
+---
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/join.astro b/src/pages/join.astro
index b18728a..1332167 100644
--- a/src/pages/join.astro
+++ b/src/pages/join.astro
@@ -3,11 +3,12 @@ import Layout from "../layouts/Layout.astro";
import Social from "../components/core/Social.astro";
import JoinTitle from "../components/join/JoinTitle.astro";
import Resources from "../components/join/Resources.jsx";
-import Questions from "../components/join/Questions.astro";
+import Questions from "../components/core/Questions.astro";
import Involvements from "../components/join/Involvements.astro";
import Findus from "../components/join/Findus.astro";
import { Image } from "astro:assets";
import join from "../../public/join.png";
+import faq from "../data/faq.json";
---
@@ -16,7 +17,7 @@ import join from "../../public/join.png";
-
+
diff --git a/src/pages/quarterly.astro b/src/pages/quarterly.astro
index d8a3dcc..468cb4a 100644
--- a/src/pages/quarterly.astro
+++ b/src/pages/quarterly.astro
@@ -1,7 +1,7 @@
---
import Layout from "../layouts/Layout.astro";
import Title from "../components/core/Title.astro";
-import About from "../components/qp/About.astro";
+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";
@@ -10,6 +10,7 @@ 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";
---
@@ -19,8 +20,9 @@ import Carousel from "../components/qp/Carousel.astro";
-
+
+
diff --git a/src/pages/robocup.astro b/src/pages/robocup.astro
index fc723cf..72f5412 100644
--- a/src/pages/robocup.astro
+++ b/src/pages/robocup.astro
@@ -1,7 +1,23 @@
---
import Layout from "../layouts/Layout.astro";
+import Questions from "../components/core/Questions.astro";
+import faq from "../data/faq.json";
+import About from "../components/core/About.astro";
+import RoboTitle from "../components/robocub/RoboTitle.astro";
+import Link from "next/link"
+import { Image } from "astro:assets";
+import roboborder from "../../public/roboborder.png";
---
- QP
+
+
+
+
+