Merge pull request #58 from Bitshala/cleanup1

fix: do a round of clean up
Bitshala · Dec 3, 2023 · e7e6168 · e7e6168
2 parents af3bce3 + 1b59a09
commit e7e6168
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 74 deletions.
diff --git a/public/favicon.svg b/public/favicon.svg
diff --git a/src/components/cohort/Checkerboard.astro b/src/components/cohort/Checkerboard.astro
@@ -19,7 +19,7 @@
       class="bg-orange px-5 pt-5 xl:w-1/2 xl:px-32 xl:pt-32"
     >
       <img
-        src="/website-v2/public/cohort/checkerboard1.png"
+        src="/website-v2/cohort/checkerboard1.png"
         class="w-auto"
       />
     </div>
@@ -29,7 +29,7 @@
       class="bg-orange px-5 pt-5 xl:w-1/2 xl:px-32 xl:pt-32"
     >
       <img
-        src="/website-v2/public/cohort/checkerboard2.png"
+        src="/website-v2/cohort/checkerboard2.png"
         class="w-auto"
       />
     </div>
@@ -69,7 +69,7 @@
       class="bg-orange px-5 pt-5 xl:w-1/2 xl:px-32 xl:pt-32"
     >
       <img
-        src="/website-v2/public/cohort/checkerboard3.png"
+        src="/website-v2/cohort/checkerboard3.png"
         class="w-auto"
       />
     </div>

diff --git a/src/components/cohort/CohortCard.astro b/src/components/cohort/CohortCard.astro
@@ -3,27 +3,26 @@ const cardsList = [
   {
     name: "Learning Bitcoin From Command Line",
     img: "/website-v2/cohort/lbtcl.png",
-    no: "02",
     desc: "Donec laoreet congue justo at rhoncus. Nam aliquet suscipit feugiat...",
-    url: "/website-v2/lbtcl",
+    url: "/website-v2/cohorts/lbtcl",
   },
   {
     name: "Mastering Bitcoin by Andreas M. ",
     img: "/website-v2/cohort/masteringBitcoin.png",
-    no: "01",
     desc: "Donec laoreet congue justo at rhoncus. Nam aliquet suscipit feugiat...",
+    url: "/website-v2/cohorts/lbtcl",
   },
   {
     name: "Learning Bitcoin From Command Line",
     img: "/website-v2/cohort/lbtcl.png",
-    no: "02",
     desc: "Donec laoreet congue justo at rhoncus. Nam aliquet suscipit feugiat...",
+    url: "/website-v2/cohorts/lbtcl",
   },
   {
     name: "Mastering Bitcoin by Andreas M. ",
     img: "/website-v2/cohort/masteringBitcoin.png",
-    no: "01",
     desc: "Donec laoreet congue justo at rhoncus. Nam aliquet suscipit feugiat...",
+    url: "/website-v2/cohorts/mb",
   },
 ];
 ---
@@ -32,19 +31,17 @@ const cardsList = [
   class="grid grid-cols-1 gap-10 pl-6 pr-14 md:-translate-y-24 md:grid-cols-2 xl:grid-cols-4"
 >
   {
-    cardsList.map((card) => (
+    cardsList.map((card, index) => (
       <div>
         <div
           class={`rounded-2xl  ${
-            Number(card.no) % 2 == 0
-              ? "bg-orange"
-              : "bg-black"
+            index % 2 == 0 ? "bg-orange" : "bg-black"
           } my-2  p-3 text-white`}
         >
           <img src={card.img} class="w-fit" />
           <div class="my-2 px-3">
             <p class="text-sm lg:text-xl">
-              cohort #{card.no}
+              cohort #0{index + 1}
             </p>
             <h1 class="text-2xl font-semibold lg:text-4xl">
               {card.name}
@@ -54,13 +51,9 @@ const cardsList = [
           <a href={card.url}>
             <button
               class={`my-2 w-full rounded-lg text-base lg:text-xl ${
-                Number(card.no) % 2 == 0
-                  ? "bg-white"
-                  : "bg-black"
+                index % 2 == 0 ? "bg-white" : "bg-black"
               } px-3 py-5 font-semibold ${
-                Number(card.no) % 2 == 0
-                  ? "text-black"
-                  : "text-white"
+                index % 2 == 0 ? "text-black" : "text-white"
               } border-2 border-dotted border-white `}
             >
               Visit the Cohort Page

diff --git a/src/components/common/Footer.astro b/src/components/common/Footer.astro
@@ -44,7 +44,7 @@ const list3 = [
   },
   {
     name: "Bitcoin Study Cohort",
-    link: "/website-v2/cohort",
+    link: "/website-v2/cohorts",
   },
   {
     name: "Bitcoin Review Club",

diff --git a/src/components/common/hamburger.tsx b/src/components/common/hamburger.tsx
@@ -56,14 +56,14 @@ const Hamburger = () => {
 
 const SideMenu = () => {
   const links = [
+    { name: "Cohorts", url: "/website-v2/cohorts" },
+    { name: "Review Club", url: "/website-v2/review" },
+    { name: "Talks", url: "/website-v2/talks" },
     {
-      name: "Discord",
+      name: "Join our Discord !",
       url: "https://discord.gg/ekzAUeeR",
       tar: "_blank",
     },
-    { name: "Cohorts", url: "/website-v2/cohort" },
-    { name: "Review Club", url: "/website-v2/review" },
-    { name: "Talks", url: "/website-v2/talks" },
   ];
   return (
     <div className="flex h-full w-full flex-col pb-[10%]">

diff --git a/src/components/home/LinkCohort.astro b/src/components/home/LinkCohort.astro
@@ -15,11 +15,12 @@
     <button
       class="w-1/3 rounded-xl bg-white text-sm font-semibold hover:bg-orange hover:text-white lg:mr-5 lg:px-10 lg:py-5"
     >
-      <p
+      <a
         class="p-2 text-center text-sm md:text-xl lg:my-1 lg:p-0 xl:text-3xl"
+        href="/website-v2/cohorts"
       >
         Checkout Upcoming Study Cohorts
-      </p>
+      </a>
     </button>
     <div class="w-1/3"></div>
   </div>

diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
@@ -10,12 +10,16 @@ const { title } = Astro.props;
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <meta name="description" content="Astro description" />
+    <meta
+      name="description"
+      content="Bitshala: A Pathshala for Bitcoin"
+    />
     <meta name="viewport" content="width=device-width" />
     <link
       rel="icon"
+      href="/website-v2/favicon.svg"
+      sizes="any"
       type="image/svg+xml"
-      href="/favicon.svg"
     />
     <meta name="generator" content={Astro.generator} />
     <title>{title}</title>

diff --git a/src/pages/bpd.astro → src/pages/cohorts/bpd.astro b/src/pages/bpd.astro → src/pages/cohorts/bpd.astro
@@ -1,15 +1,15 @@
 ---
-import Layout from "../layouts/Layout.astro";
-import Header from "../components/common/Header.astro";
-import Carousel from "../components/common/Carousel";
-import Footer from "../components/common/Footer.astro";
-import Description from "../components/cohortPages/Description.astro";
-import CohortStructure from "../components/cohortPages/CohortStructure.astro";
-import CohortDetails from "../components/cohortPages/CohortDetails.astro";
-import Syllabus from "../components/cohortPages/Syllabus.astro";
+import Layout from "../../layouts/Layout.astro";
+import Header from "../../components/common/Header.astro";
+import Carousel from "../../components/common/Carousel";
+import Footer from "../../components/common/Footer.astro";
+import Description from "../../components/cohortPages/Description.astro";
+import CohortStructure from "../../components/cohortPages/CohortStructure.astro";
+import CohortDetails from "../../components/cohortPages/CohortDetails.astro";
+import Syllabus from "../../components/cohortPages/Syllabus.astro";
 ---
 
-<Layout title="BPD">
+<Layout title="Bitcoin Protocol Dev">
   <Header
     heading=""
     subheading=""

diff --git a/src/pages/cohort.astro → src/pages/cohorts/index.astro b/src/pages/cohort.astro → src/pages/cohorts/index.astro
@@ -1,11 +1,11 @@
 ---
-import Layout from "../layouts/Layout.astro";
-import CohortCard from "../components/cohort/CohortCard.astro";
-import Footer from "../components/common/Footer.astro";
-import Carousel from "../components/common/Carousel";
-import Header from "../components/common/Header.astro";
-import { CollapseList } from "../components/cohort/CollapseList";
-import Checkerboard from "../components/cohort/Checkerboard.astro";
+import Layout from "../../layouts/Layout.astro";
+import CohortCard from "../../components/cohort/CohortCard.astro";
+import Footer from "../../components/common/Footer.astro";
+import Carousel from "../../components/common/Carousel";
+import Header from "../../components/common/Header.astro";
+import { CollapseList } from "../../components/cohort/CollapseList";
+import Checkerboard from "../../components/cohort/Checkerboard.astro";
 
 const faqConfig = [
   {
@@ -35,7 +35,7 @@ const faqConfig = [
 ];
 ---
 
-<Layout title="Welcome to Bitshala">
+<Layout title="Bitshala Cohorts">
   <Header
     heading="Dive Deeeeeper into Bitcoin Development with a community of learners"
     subheading="Study Cohorts Paving the Way to Bitcoin Mastery"
@@ -54,4 +54,3 @@ const faqConfig = [
   <Carousel client:visible />
   <Footer />
 </Layout>
- ../components/cohort/CollapseList
diff --git a/src/pages/lbtcl.astro → src/pages/cohorts/lbtcl.astro b/src/pages/lbtcl.astro → src/pages/cohorts/lbtcl.astro
@@ -1,15 +1,15 @@
 ---
-import Layout from "../layouts/Layout.astro";
-import Header from "../components/common/Header.astro";
-import Carousel from "../components/common/Carousel";
-import Footer from "../components/common/Footer.astro";
-import Description from "../components/cohortPages/Description.astro";
-import CohortStructure from "../components/cohortPages/CohortStructure.astro";
-import CohortDetails from "../components/cohortPages/CohortDetails.astro";
-import Syllabus from "../components/cohortPages/Syllabus.astro";
+import Layout from "../../layouts/Layout.astro";
+import Header from "../../components/common/Header.astro";
+import Carousel from "../../components/common/Carousel";
+import Footer from "../../components/common/Footer.astro";
+import Description from "../../components/cohortPages/Description.astro";
+import CohortStructure from "../../components/cohortPages/CohortStructure.astro";
+import CohortDetails from "../../components/cohortPages/CohortDetails.astro";
+import Syllabus from "../../components/cohortPages/Syllabus.astro";
 ---
 
-<Layout title="LBTCL">
+<Layout title="LBTCL Cohort">
   <Header
     heading=""
     subheading=""

diff --git a/src/pages/mb.astro → src/pages/cohorts/mb.astro b/src/pages/mb.astro → src/pages/cohorts/mb.astro
@@ -1,15 +1,15 @@
 ---
-import Layout from "../layouts/Layout.astro";
-import Header from "../components/common/Header.astro";
-import Carousel from "../components/common/Carousel";
-import Footer from "../components/common/Footer.astro";
-import Description from "../components/cohortPages/Description.astro";
-import CohortStructure from "../components/cohortPages/CohortStructure.astro";
-import CohortDetails from "../components/cohortPages/CohortDetails.astro";
-import Syllabus from "../components/cohortPages/Syllabus.astro";
+import Layout from "../../layouts/Layout.astro";
+import Header from "../../components/common/Header.astro";
+import Carousel from "../../components/common/Carousel";
+import Footer from "../../components/common/Footer.astro";
+import Description from "../../components/cohortPages/Description.astro";
+import CohortStructure from "../../components/cohortPages/CohortStructure.astro";
+import CohortDetails from "../../components/cohortPages/CohortDetails.astro";
+import Syllabus from "../../components/cohortPages/Syllabus.astro";
 ---
 
-<Layout title="MB">
+<Layout title="Mastering Bitcoin">
   <Header
     heading=""
     subheading=""

diff --git a/src/pages/pb.astro → src/pages/cohorts/pb.astro b/src/pages/pb.astro → src/pages/cohorts/pb.astro
@@ -1,15 +1,15 @@
 ---
-import Layout from "../layouts/Layout.astro";
-import Header from "../components/common/Header.astro";
-import Carousel from "../components/common/Carousel";
-import Footer from "../components/common/Footer.astro";
-import Description from "../components/cohortPages/Description.astro";
-import CohortStructure from "../components/cohortPages/CohortStructure.astro";
-import CohortDetails from "../components/cohortPages/CohortDetails.astro";
-import Syllabus from "../components/cohortPages/Syllabus.astro";
+import Layout from "../../layouts/Layout.astro";
+import Header from "../../components/common/Header.astro";
+import Carousel from "../../components/common/Carousel";
+import Footer from "../../components/common/Footer.astro";
+import Description from "../../components/cohortPages/Description.astro";
+import CohortStructure from "../../components/cohortPages/CohortStructure.astro";
+import CohortDetails from "../../components/cohortPages/CohortDetails.astro";
+import Syllabus from "../../components/cohortPages/Syllabus.astro";
 ---
 
-<Layout title="PB">
+<Layout title="Programming Bitcoin">
   <Header
     heading=""
     subheading=""

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -43,7 +43,7 @@ import Header from "../components/common/Header.astro";
           >Dive into the Rabbit Hole</a
         >
         <a
-          href="/website-v2/cohort"
+          href="/website-v2/cohorts"
           class="text-m mx-3 flex w-1/2 items-center justify-center rounded-lg p-4 text-center text-white outline-dashed outline-white lg:text-2xl"
           >Check out the Study Cohorts</a
         >

diff --git a/src/pages/review.astro b/src/pages/review.astro
@@ -10,6 +10,7 @@ import {
   getPlaylistDetails,
 } from "../scripts/googleApi";
 import HowDoesItWork from "../components/review/HowDoesItWork.astro";
+import { CollapseList } from "../components/cohort/CollapseList";
 
 const isProd = import.meta.env.PROD;
 const videoConfig = isProd
@@ -18,6 +19,33 @@ const videoConfig = isProd
       import.meta.env.GOOGLE_KEY,
     )
   : mockedVideoConfig.slice(-6);
+
+const faqConfig = [
+  {
+    q: "How does the Bitcoin Study Cohort work?",
+    a: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
+  },
+  {
+    q: "Who can join the Bitcoin Study Cohort?",
+    a: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
+  },
+  {
+    q: "Is there a fee to join the cohort?",
+    a: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
+  },
+  {
+    q: "What resources are provided to participants?",
+    a: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
+  },
+  {
+    q: "Is there a fee to join the cohort?",
+    a: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
+  },
+  {
+    q: "What resources are provided to participants?",
+    a: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ",
+  },
+];
 ---
 
 <Layout title="PR Review Club">
@@ -31,6 +59,11 @@ const videoConfig = isProd
   <HowDoesItWork />
   <VideoList videoConfig={videoConfig} />
   <EssentialStudyMaterial />
+  <CollapseList
+    listConfig={faqConfig}
+    header="Checkout some of the FAQs"
+    client:visible
+  />
   <Carousel client:visible />
   <Footer />
 </Layout>