build: update conifg for new site

astro.config.mjs

@@ -5,7 +5,7 @@ import react from "@astrojs/react";
 
 // https://astro.build/config
 export default defineConfig({
-  site: "https://bitshala.github.io",
-  base: "/website-v2",
+  site: "https://www.bitshala.org",
+  base: "/",
   integrations: [tailwind(), react()],
 });

src/components/cohort/Checkerboard.astro

@@ -20,7 +20,7 @@
       class="bg-orange px-5 pt-5 xl:w-1/2 xl:px-32 xl:pt-32"
     >
       <img
-        src="/website-v2/cohort/checkerboard1.webp"
+        src="/cohort/checkerboard1.webp"
         class="w-auto"
         alt="Cohort Community"
       />
@@ -31,7 +31,7 @@
       class="bg-orange px-5 pt-5 xl:w-1/2 xl:px-32 xl:pt-32"
     >
       <img
-        src="/website-v2/cohort/checkerboard2.webp"
+        src="/cohort/checkerboard2.webp"
         class="w-auto"
         alt="Structured Cohort"
       />
@@ -71,7 +71,7 @@
       class="bg-orange px-5 pt-5 xl:w-1/2 xl:px-32 xl:pt-32"
     >
       <img
-        src="/website-v2/cohort/checkerboard3.webp"
+        src="/cohort/checkerboard3.webp"
         class="w-auto"
         alt="Cohort Job Board"
       />

src/components/cohort/CohortCard.astro

@@ -2,27 +2,27 @@
 const cardsList = [
   {
     name: "Mastering Bitcoin by Andreas M. ",
-    img: "/website-v2/cohort/masteringBitcoin.webp",
+    img: "/cohort/masteringBitcoin.webp",
     desc: "Mastering Bitcoin, a foundational tutorial, provides in-depth insights into Bitcoin and its applications, equipping participants with a robust understanding.",
-    url: "/website-v2/cohorts/mb",
+    url: "/cohorts/mb",
   },
   {
     name: "Learning Bitcoin From Command Line",
-    img: "/website-v2/cohort/lbtcl.webp",
+    img: "/cohort/lbtcl.webp",
     desc: "Learning Bitcoin via CLI is a comprehensive tutorial series that teaches you how to use Bitcoin Core through the command line.",
-    url: "/website-v2/cohorts/lbtcl",
+    url: "/cohorts/lbtcl",
   },
   {
     name: "Bitcoin Protocol Development",
-    img: "/website-v2/cohort/bpd.webp",
+    img: "/cohort/bpd.webp",
     desc: "BPD delves into the core protocols, offering a deeper theoretical understanding of Bitcoin's technical intricacies, enabling you to contribute to protocol development.",
-    url: "/website-v2/cohorts/bpd",
+    url: "/cohorts/bpd",
   },
   {
     name: "Programming Bitcoin by Jimmy Song",
-    img: "/website-v2/cohort/programmingBitcoin.webp",
+    img: "/cohort/programmingBitcoin.webp",
     desc: "Programming Bitcoin, a comprehensive tutorial on Bitcoin Core, unlocks the intricacies of Bitcoin development.",
-    url: "/website-v2/cohorts/pb",
+    url: "/cohorts/pb",
   },
 ];
 ---

src/components/cohortPages/MeetYourTAs.astro

@@ -21,7 +21,7 @@ const { team, color } = Astro.props;
         class={`my-3 flex rounded-lg ${member.bgColor} `}
       >
         <img
-          src={`/website-v2/people/${member.image}.png`}
+          src={`/people/${member.image}.png`}
           class="mt-2 h-28 items-center p-3 align-middle "
           alt={member.name}
         />
@@ -34,14 +34,14 @@ const { team, color } = Astro.props;
             </p>
             <a href={member.github} target="_blank">
               <img
-                src="/website-v2/people/github.png"
+                src="/people/github.png"
                 class="mr-3 mt-3 h-8 rounded-xl bg-white "
                 alt="Github"
               />
             </a>
             <a href={member.twitter} target="_blank">
               <img
-                src="/website-v2/people/twitter.png"
+                src="/people/twitter.png"
                 class="mr-3 mt-3 h-8 rounded-xl bg-white "
                 alt="Twitter"
               />

src/components/common/Carousel.jsx

@@ -1,28 +1,28 @@
 import { useState } from "react";
 const slides = [
   {
-    url: "/website-v2/activities/cohort.webp",
+    url: "/activities/cohort.webp",
     title: "Bitcoin Study Cohorts",
     content:
       "You, with fellow learners collectively explore selected texts over several weeks in a structured self-study format. You gain hands-on experience and in-depth insights into Bitcoin’s technical aspects. And also receive certificates to celebrate your wins!",
-    targetLink: "/website-v2/cohorts",
+    targetLink: "/cohorts",
   },
   {
-    url: "/website-v2/carousel/talks.webp",
+    url: "/carousel/talks.webp",
     title: "Bitcoin Talk",
     content:
       "You get to listen to insightful conversations with experienced Bitcoin developers as they share their journeys, provide valuable advice, and offer suggestions for newcomers in the exciting world of Bitcoin development.",
-    targetLink: "/website-v2/talks",
+    targetLink: "/talks",
   },
   {
-    url: "/website-v2/carousel/reviewClub.webp",
+    url: "/carousel/reviewClub.webp",
     title: "Bitcoin Core Review Club",
     content:
       "You get hand-on experience into the inner workings of Bitcoin Core and understand how experienced contributors review PRs. You’ll also develop a deeper understanding of Bitcoin’s design principles while sharpening your adversarial-thinking skills.",
-    targetLink: "/website-v2/review",
+    targetLink: "/review",
   },
   {
-    url: "/website-v2/activities/cohort.webp",
+    url: "/activities/cohort.webp",
     title: "Discord Community",
     content:
       "Come and become a part of our vibrant community of Bitcoin enthusiasts. Here, you can engage in discussions, challenge ideas, and explore Bitcoin opportunities with like-minded peers passionate about shaping the future of decentralized finance.",

src/components/common/Footer.astro

@@ -17,11 +17,11 @@ const list1 = [
 const list2 = [
   {
     name: "Home",
-    link: "/website-v2/",
+    link: "/",
   },
   {
     name: "Team",
-    link: "/website-v2/#our_people",
+    link: "/#our_people",
   },
   {
     name: "Contact",
@@ -32,15 +32,15 @@ const list2 = [
 const list3 = [
   {
     name: "Bitcoin Study Cohort",
-    link: "/website-v2/cohorts",
+    link: "/cohorts",
   },
   {
     name: "Bitcoin Review Club",
-    link: "/website-v2/review",
+    link: "/review",
   },
   {
     name: "Bitcoin Talks",
-    link: "/website-v2/talks",
+    link: "/talks",
   },
 ];
 ---
@@ -68,11 +68,11 @@ const list3 = [
 
   <hr class="opacity-20" />
   <div
-    class="grid grid-cols-3 divide-x bg-[url('/website-v2/footer/bitshala.png')] bg-cover lg:grid-cols-5"
+    class="grid grid-cols-3 divide-x bg-[url('/footer/bitshala.png')] bg-cover lg:grid-cols-5"
   >
     <div class="m-3 hidden p-3 lg:inline">
       <img
-        src="/website-v2/footer/logo.png"
+        src="/footer/logo.png"
         class="mb-60 h-16"
         alt="Bitshala Logo"
       />

src/components/common/hamburger.tsx

@@ -63,22 +63,22 @@ const SideMenu = () => {
   const links = [
     {
       name: "Home",
-      url: "/website-v2/",
+      url: "/",
       desc: "Back to the home page.",
     },
     {
       name: "Cohorts",
-      url: "/website-v2/cohorts",
+      url: "/cohorts",
       desc: "Learn About our Study Cohorts",
     },
     {
       name: "Review Club",
-      url: "/website-v2/review",
+      url: "/review",
       desc: "Enjoy the Bitcoin PR Review Club",
     },
     {
       name: "Talks",
-      url: "/website-v2/talks",
+      url: "/talks",
       desc: "Learn about Bitcoin through insightful conversations",
     },
     {

src/components/home/LinkCohort.astro

@@ -5,8 +5,9 @@
     <p
       class="p-2 text-center font-header text-xl font-semibold text-white lg:mx-24 lg:p-20 lg:text-8xl"
     >
-      Kickstart <span class="text-orange"
-        > Bitcoin Career</span> now!
+      Kickstart <span class="text-orange">
+        Bitcoin Career</span
+      > now!
     </p>
   </div>
   <div class="mt-5 flex">
@@ -16,7 +17,7 @@
     >
       <a
         class="p-2 text-center text-sm md:text-xl lg:my-1 lg:p-0 xl:text-3xl"
-        href="/website-v2/cohorts"
+        href="/cohorts"
       >
         Next cohort begins 3rd Jan
       </a>

src/components/home/People.astro

@@ -18,7 +18,7 @@ import { ta, dev, advisors } from "../common/list.js";
         class={`flex w-full items-center rounded-xl ${member.bgColor} ${member.textColor}}`}
       >
         <img
-          src={`/website-v2/people/${member.image}.png`}
+          src={`/people/${member.image}.png`}
           class="h-28 items-center p-3 lg:h-40"
         />
         <div class="flex w-full flex-col">
@@ -35,7 +35,7 @@ import { ta, dev, advisors } from "../common/list.js";
                 class="group"
               >
                 <img
-                  src="/website-v2/people/github.png"
+                  src="/people/github.png"
                   class="m-1 h-6 rounded bg-peach group-hover:bg-white lg:h-10"
                 />
               </a>
@@ -45,7 +45,7 @@ import { ta, dev, advisors } from "../common/list.js";
                 class="group"
               >
                 <img
-                  src="/website-v2/people/twitter.png"
+                  src="/people/twitter.png"
                   class="m-1 h-6 rounded bg-peach group-hover:bg-white lg:h-10"
                 />
               </a>
@@ -66,7 +66,7 @@ import { ta, dev, advisors } from "../common/list.js";
         class={`flex w-full items-center rounded-xl ${member.bgColor} ${member.textColor}}`}
       >
         <img
-          src={`/website-v2/people/${member.image}.png`}
+          src={`/people/${member.image}.png`}
           class="h-28 items-center p-3 lg:h-40"
         />
         <div class="flex w-full flex-col">
@@ -83,7 +83,7 @@ import { ta, dev, advisors } from "../common/list.js";
                 class="group"
               >
                 <img
-                  src="/website-v2/people/github.png"
+                  src="/people/github.png"
                   class="m-1 h-6 rounded bg-peach group-hover:bg-white lg:h-10"
                 />
               </a>
@@ -93,7 +93,7 @@ import { ta, dev, advisors } from "../common/list.js";
                 class="group"
               >
                 <img
-                  src="/website-v2/people/twitter.png"
+                  src="/people/twitter.png"
                   class="m-1 h-6 rounded bg-peach group-hover:bg-white lg:h-10"
                 />
               </a>
@@ -120,7 +120,7 @@ import { ta, dev, advisors } from "../common/list.js";
         class={`flex w-full items-center rounded-xl ${member.bgColor} ${member.textColor}}`}
       >
         <img
-          src={`/website-v2/people/${member.image}.png`}
+          src={`/people/${member.image}.png`}
           class="h-28 items-center p-3 lg:h-40"
         />
         <div class="flex w-full flex-col">
@@ -137,7 +137,7 @@ import { ta, dev, advisors } from "../common/list.js";
                 target="_blank"
               >
                 <img
-                  src="/website-v2/people/twitter.png"
+                  src="/people/twitter.png"
                   class="m-1 h-8 rounded bg-peach group-hover:bg-white lg:h-10 "
                 />
               </a>

src/components/home/Testimonial.astro

@@ -4,19 +4,19 @@ const list = [
     title: "Game-changer for Bitcoin Education!",
     desc: "The questions and practical exercises. I think they are very well designed to make you deeply reflect on the studied topic. It help me a lot to consolidate knowledge. The kindle and super fast support from bitshala team and the rest of bitshala comunity. Sharing knowledge, experience and a lot of good stuff. I was awesome to me you all. I loved the day when instead of following the planned agenda and discussing the weekly questions, there was a debate on philosophical and profound topics about money and  bitcoin. It was great",
     name: "Lazysatoshi, Learning Bitcoin via CLI",
-    image: "/website-v2/testimonial/lazy.webp",
+    image: "/testimonial/lazy.webp",
   },
   {
     title: "Transformative Learning Community",
     desc: "I feel elated to be a part of the first cohort of graduates from Bitshala, and I hope that it turns into a beacon of Bitcoin literacy in India. It's a tailor-made platform and an avenue of great resources  for those who are keen on traversing on a path to learning and imparting Bitcoin education.",
     name: "Faisal, Learning Bitcoin via CLI",
-    image: "/website-v2/testimonial/faisal.webp",
+    image: "/testimonial/faisal.webp",
   },
   {
     title: "Rich and Empowering Learning Experience",
     desc: "The LBTCL-cohort was an unbelievably rich and empowering exercise in learning the finer details of a Bitcoin node and transactions. Raj and Setu have made the experience worth so much by their sheer enthusiasm and dedication, that it leaves a mark on you. The mentorship and the community at Bitshala is invaluable, and like Bitcoin, it will gradually then suddenly take the world by storm",
     name: "Shreyan, Learning Bitcoin via CLI",
-    image: "/website-v2/testimonial/shreyan.webp",
+    image: "/testimonial/shreyan.webp",
   },
 ];
 ---
@@ -60,7 +60,7 @@ const list = [
   </p>
   <div
     style={{
-      backgroundImage: `url(/website-v2/testimonial/background.webp)`,
+      backgroundImage: `url(/testimonial/background.webp)`,
       backgroundSize: "cover",
       backgroundRepeat: "no-repeat",
       backgroundPosition: "center",

src/layouts/Layout.astro

@@ -22,7 +22,7 @@ const { title, headerProps } = Astro.props;
     <meta name="viewport" content="width=device-width" />
     <link
       rel="icon"
-      href="/website-v2/footer/logo.png"
+      href="/footer/logo.png"
       sizes="any"
       type="image/svg+xml"
     />
@@ -34,11 +34,8 @@ const { title, headerProps } = Astro.props;
       class="fixed left-0 top-0 z-50 w-full bg-black bg-opacity-[0.5] p-4 backdrop-blur-sm"
     >
       <div class="m-auto flex w-full justify-between">
-        <a href="/website-v2">
-          <img
-            src="/website-v2/footer/logo.png"
-            class="h-16"
-          />
+        <a href="/">
+          <img src="/footer/logo.png" class="h-16" />
         </a>
         <Hamburger client:only />
       </div>
@@ -67,16 +64,14 @@ const { title, headerProps } = Astro.props;
   <style>
     @font-face {
       font-family: "Aeonik Fono";
-      src: url("/website-v2/fonts/AeonikFono.otf")
-        format("opentype");
+      src: url("/fonts/AeonikFono.otf") format("opentype");
       font-weight: normal;
       font-style: normal;
       font-display: swap;
     }
     @font-face {
       font-family: "Firs Neue";
-      src: url("/website-v2/fonts/FirsNeue.ttf")
-        format("truetype");
+      src: url("/fonts/FirsNeue.ttf") format("truetype");
       font-weight: bold;
       font-style: normal;
       font-display: swap;

src/pages/cohorts/bpd.astro

@@ -16,7 +16,7 @@ const headerProps = {
   title="Bitcoin Protocol Dev"
   headerProps={headerProps}
 >
-  <CohortHeader img="/website-v2/cohort/bpd.webp" />
+  <CohortHeader img="/cohort/bpd.webp" />
   <Description
     takeaways={[
       {

src/pages/cohorts/index.astro

@@ -32,7 +32,7 @@ const headerProps = {
   heading:
     "Learning Bitcoin alone can be a daunting journey.",
   subheading: "Join our cohort and find your tribe",
-  image: "/website-v2/cohort/hero.webp",
+  image: "/cohort/hero.webp",
   headingColor: "text-white",
   subheadingColor: "text-white",
 };