From f372799ba7489c05d315468ba337988d6cc5f0a9 Mon Sep 17 00:00:00 2001
From: rajarshimaitra <rajarshi149@gmail.com>
Date: Mon, 18 Dec 2023 13:07:23 +0530
Subject: [PATCH 1/2] copy review club and cohort main page

---
 src/components/cohort/Checkerboard.astro  | 28 ++++++++---------------
 src/components/review/HowDoesItWork.astro | 14 +++---------
 src/pages/cohorts/index.astro             | 20 +++++++---------
 src/pages/review.astro                    | 28 +++++++++++------------
 4 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/src/components/cohort/Checkerboard.astro b/src/components/cohort/Checkerboard.astro
index 7884ad0..628eca1 100644
--- a/src/components/cohort/Checkerboard.astro
+++ b/src/components/cohort/Checkerboard.astro
@@ -5,14 +5,12 @@
     >
       <span class="text-orange"></span>
       <h1 class="font-header text-3xl xl:text-6xl">
-        A close-knit community to <span class="text-orange"
-          >grow together</span
+        Live cohorts with <span class="text-orange"
+          >like-minded bitcoiners</span
         > with
       </h1>
       <p class="my-10 xl:text-2xl">
-        A community of like-minded individuals – a tribe of
-        learners who, like you, are hungry for knowledge and
-        connection.
+        Whether from India, SEA, or outside, cohorts are the best way to discover other bitcoiners with similar hunger, curiosity, physical location, and technical acumen.
       </p>
     </div>
     <div
@@ -37,15 +35,12 @@
       class="flex flex-col items-center justify-center bg-peach p-5 xl:w-1/2 xl:p-10 xl:px-40"
     >
       <h1 class="font-header text-3xl xl:text-6xl">
-        A roadmap that leads<span class="text-orange"
-          >beyond the beginner phase</span
+        Guided but focussed on <span class="text-orange"
+          >self-study</span
         >
       </h1>
       <p class="my-10 xl:text-2xl">
-        A structured path, a guided journey to progress from
-        surface-level understanding to a deeper
-        comprehension of Bitcoin's technical intricacies and
-        broader implications.
+        Our curriculum, teaching assistants and assistance is available all the time, for free. But Bitcoin is for sovereign and not sleeps. Only you can teach yourself.
       </p>
     </div>
   </div>
@@ -54,15 +49,12 @@
       class="my-5 flex flex-col items-center justify-center bg-peach p-5 xl:my-0 xl:w-1/2 xl:p-10 xl:px-40"
     >
       <h1 class="font-header text-3xl xl:text-6xl">
-        An <span class="text-orange">
-          opportunity to break into</span
-        > the world of Bitcoin Development
+        Work at <span class="text-orange">
+          Bitcoin FOSS </span
+        > or ventures
       </h1>
       <p class="my-10 xl:text-2xl">
-        An opportunity to gain hands-on experience with a
-        network of experienced Bitcoin developers giving you
-        the support you need to take your first steps into
-        the development world of Bitcoin.
+        Your contributions during and beyond the cohort can earn you an opportunity to work via BitShala incubated FOSS projects and job board.
       </p>
     </div>
     <div
diff --git a/src/components/review/HowDoesItWork.astro b/src/components/review/HowDoesItWork.astro
index 992a067..e30a46c 100644
--- a/src/components/review/HowDoesItWork.astro
+++ b/src/components/review/HowDoesItWork.astro
@@ -7,7 +7,7 @@ const list = [
   },
   {
     name: "Join the Community ",
-    desc: "Join the Discord server where the link to join the review club call is shared and where PR-related discussions take place.",
+    desc: "Join the Discord server where the link to join the review club jitsi is shared and where PR-related discussions take place.",
   },
   {
     name: "Engage in Discussions",
@@ -33,19 +33,11 @@ const list = [
 const format = [
   {
     name: "Format",
-    desc: "Online virtual classroom",
+    desc: "Online virtual club",
   },
   {
     name: "Structure",
-    desc: "Live sessions, once a week QnA",
-  },
-  {
-    name: "Categories",
-    desc: "Wallets, UTXOs, Transactions",
-  },
-  {
-    name: "Duration",
-    desc: "08 weeks",
+    desc: "Bi-weekly, Technical, QnA",
   },
 ];
 const team = [
diff --git a/src/pages/cohorts/index.astro b/src/pages/cohorts/index.astro
index fdb50ac..62b55c5 100644
--- a/src/pages/cohorts/index.astro
+++ b/src/pages/cohorts/index.astro
@@ -10,35 +10,31 @@ import Checkerboard from "../../components/cohort/Checkerboard.astro";
 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. ",
+    a: "The Bitcoin Study Cohort operates as an eight-week structured program that focuses on a comprehensive tutorial, such as ”Mastering Bitcoin”, ”Learning Bitcoin via CLI”, “Bitcoin Protocol Development” and “Programming Bitcoin”. Participants engage in self-study, group discussions, and hands-on assignments using tools like bitcoin-cli and a local bitcoind regtest node. The program covers various aspects of Bitcoin programming and development.",
   },
   {
     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. ",
+    a: "Prerequisites may vary based on the specific cohort, as seen in the details provided under each cohort ”Mastering Bitcoin”, ”Learning Bitcoin via CLI”, “Bitcoin Protocol Development” and “Programming Bitcoin”.

Beginners are suggested to get started with ”Mastering Bitcoin” or “Learning Bitcoin via CLI”.

Individuals with a prior understanding of Bitcoin and, in some cases, basic CLI/programming knowledge are encouraged to apply for “Bitcoin Protocol Development” and “Programming Bitcoin“.",
   },
   {
     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. ",
+    a: "Our cohorts are free and open source (FOSS) and will always be. If you want to run your study program you are free to fork our git repo (containing study material, Q&A, assignment) and run it on your own.",
   },
   {
     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. ",
+    a: "Participants in the Bitcoin Study Cohort receive comprehensive guidance through weekly group sessions, discussions, and hands-on exercises. The cohorts cover specific chapters of relevant tutorials, encouraging active participation and engagement. Teaching Assistants (TAs) are available during group sessions to clarify doubts, and participants may receive certificates upon successful completion.",
   },
   {
-    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: "Will I get a job after completing the cohort?",
+    a: "Bitcoin is for the sovereign and not for sheep. Most FOSS projects and ventures look for proof of work before hiring. Your graduating certificate is one of those and can help in opening doors but we advise you to contribute to open-source projects (at BitShala or beyond) to increase your chances of getting hired. 
FOSS projects incubated by BitShala hire contributors based on the quality of engagement and contributions. We also have a job board to help you find the right Bitcoin gig/work.",
   },
 ];
 ---
 
 <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"
+    heading="Learning Bitcoin alone can be a daunting journey."
+    subheading="Join our cohort and find your tribe"
     image="/website-v2/cohort/hero.png"
     headingColor="text-white"
     subheadingColor="text-white"
diff --git a/src/pages/review.astro b/src/pages/review.astro
index 4c8fedb..194874b 100644
--- a/src/pages/review.astro
+++ b/src/pages/review.astro
@@ -22,36 +22,36 @@ const videoConfig = isProd
 
 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: "How does the Review Club work?",
+    a: "Each week we take up one active PR and we go through it in depth. The PR summary and QnA are posted in a github issue. A live discussion session over jitsi is organized on the PR topic and the recording is published in our youtube.",
   },
   {
-    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: "Who can join the Review Club",
+    a: "Anyone aspiring to contribute into Bitcoin Core can benefit from the club. Although understanding of basic programming and Bitcoin is desirable, its not strictly necessary to get started with. If you are a curious mind, passionate about Bitcoin, have urges to contribute to the most impactful open-source project in the world, this club is for you.",
   },
   {
-    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: "How to prepare for the Club",
+    a: "The week's PR summary is posted in the github issue with the list of QnA and discussion topics. Participants are expected to go though the PR, understand the summary, prepare for the QnA and take active participation in the discussion. This is not a fun club for passive listening. But an intense active learning session.",
   },
   {
-    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: "What are the pre-requisites?",
+    a: "The pre-requisites are listed in the section above as well as in the github readme. Participants are expected to go through them before joining their first club.",
   },
   {
-    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 are the major expected learnings from The review Club",
+    a: "By participating in the review club, you can expect to gather thorough understanding of the architecture of Bitcoin Core, various modules and folder structure, the functional and unit testing framework and general workflows and good-practices for submitting a good and helpful review.",
   },
   {
-    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: "What's next after Review Club",
+    a: "Once you have participated in enough clubs, understood Bitcoin Core's design architecture, functional tests, and basic PR review steps, you should move ahead with independent reviewing of other PRs of core, and eventually attempt making your own PR to core.",
   },
 ];
 ---
 
 <Layout title="PR Review Club">
   <Header
-    heading="Ever wondered about the inner workings of Bitcoin Core?"
-    subheading="Then you’re invited to get your hands dirty with experienced contributors and live PR discussions."
+    heading="Inner glimpses of Bitcoin Core"
+    subheading="A bi-weekly PR Review Club with experienced core contributors to get your hands dirty with Bitcoin Core Development."
     image="/website-v2/header/PR_Review_Hero.png"
     headingColor="text-white"
     subheadingColor="text-white"

From fbc5ed2fc7b942ea3eccf3affe4aa86843162946 Mon Sep 17 00:00:00 2001
From: emjshrx <emjshrx@gmail.com>
Date: Mon, 18 Dec 2023 13:21:41 +0530
Subject: [PATCH 2/2] refac: remove weird characters

---
 src/pages/cohorts/index.astro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/cohorts/index.astro b/src/pages/cohorts/index.astro
index 62b55c5..254d61f 100644
--- a/src/pages/cohorts/index.astro
+++ b/src/pages/cohorts/index.astro
@@ -14,7 +14,7 @@ const faqConfig = [
   },
   {
     q: "Who can join the Bitcoin Study Cohort?",
-    a: "Prerequisites may vary based on the specific cohort, as seen in the details provided under each cohort ”Mastering Bitcoin”, ”Learning Bitcoin via CLI”, “Bitcoin Protocol Development” and “Programming Bitcoin”.

Beginners are suggested to get started with ”Mastering Bitcoin” or “Learning Bitcoin via CLI”.

Individuals with a prior understanding of Bitcoin and, in some cases, basic CLI/programming knowledge are encouraged to apply for “Bitcoin Protocol Development” and “Programming Bitcoin“.",
+    a: "Prerequisites may vary based on the specific cohort, as seen in the details provided under each cohort ”Mastering Bitcoin”, ”Learning Bitcoin via CLI”, “Bitcoin Protocol Development” and “Programming Bitcoin”.Beginners are suggested to get started with ”Mastering Bitcoin” or “Learning Bitcoin via CLI”.Individuals with a prior understanding of Bitcoin and, in some cases, basic CLI/programming knowledge are encouraged to apply for “Bitcoin Protocol Development” and “Programming Bitcoin“.",
   },
   {
     q: "Is there a fee to join the cohort?",
@@ -26,7 +26,7 @@ const faqConfig = [
   },
   {
     q: "Will I get a job after completing the cohort?",
-    a: "Bitcoin is for the sovereign and not for sheep. Most FOSS projects and ventures look for proof of work before hiring. Your graduating certificate is one of those and can help in opening doors but we advise you to contribute to open-source projects (at BitShala or beyond) to increase your chances of getting hired. 
FOSS projects incubated by BitShala hire contributors based on the quality of engagement and contributions. We also have a job board to help you find the right Bitcoin gig/work.",
+    a: "Bitcoin is for the sovereign and not for sheep. Most FOSS projects and ventures look for proof of work before hiring. Your graduating certificate is one of those and can help in opening doors but we advise you to contribute to open-source projects (at BitShala or beyond) to increase your chances of getting hired. FOSS projects incubated by BitShala hire contributors based on the quality of engagement and contributions. We also have a job board to help you find the right Bitcoin gig/work.",
   },
 ];
 ---