diff --git a/public/apprenticeship/discord.svg b/public/apprenticeship/discord.svg new file mode 100644 index 0000000..30146b0 --- /dev/null +++ b/public/apprenticeship/discord.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/meetup/Gallery/1.webp b/public/bitdev/Gallery/1.webp similarity index 100% rename from public/meetup/Gallery/1.webp rename to public/bitdev/Gallery/1.webp diff --git a/public/meetup/Gallery/10.webp b/public/bitdev/Gallery/10.webp similarity index 100% rename from public/meetup/Gallery/10.webp rename to public/bitdev/Gallery/10.webp diff --git a/public/meetup/Gallery/11.webp b/public/bitdev/Gallery/11.webp similarity index 100% rename from public/meetup/Gallery/11.webp rename to public/bitdev/Gallery/11.webp diff --git a/public/meetup/Gallery/12.webp b/public/bitdev/Gallery/12.webp similarity index 100% rename from public/meetup/Gallery/12.webp rename to public/bitdev/Gallery/12.webp diff --git a/public/meetup/Gallery/2.webp b/public/bitdev/Gallery/2.webp similarity index 100% rename from public/meetup/Gallery/2.webp rename to public/bitdev/Gallery/2.webp diff --git a/public/meetup/Gallery/3.webp b/public/bitdev/Gallery/3.webp similarity index 100% rename from public/meetup/Gallery/3.webp rename to public/bitdev/Gallery/3.webp diff --git a/public/meetup/Gallery/4.webp b/public/bitdev/Gallery/4.webp similarity index 100% rename from public/meetup/Gallery/4.webp rename to public/bitdev/Gallery/4.webp diff --git a/public/meetup/Gallery/5.webp b/public/bitdev/Gallery/5.webp similarity index 100% rename from public/meetup/Gallery/5.webp rename to public/bitdev/Gallery/5.webp diff --git a/public/meetup/Gallery/6.webp b/public/bitdev/Gallery/6.webp similarity index 100% rename from public/meetup/Gallery/6.webp rename to public/bitdev/Gallery/6.webp diff --git a/public/meetup/Gallery/7.webp b/public/bitdev/Gallery/7.webp similarity index 100% rename from public/meetup/Gallery/7.webp rename to public/bitdev/Gallery/7.webp diff --git a/public/meetup/Gallery/8.webp b/public/bitdev/Gallery/8.webp similarity index 100% rename from public/meetup/Gallery/8.webp rename to public/bitdev/Gallery/8.webp diff --git a/public/meetup/Gallery/9.webp b/public/bitdev/Gallery/9.webp similarity index 100% rename from public/meetup/Gallery/9.webp rename to public/bitdev/Gallery/9.webp diff --git a/public/meetup/bitdevs_1.webp b/public/bitdev/bitdevs_1.webp similarity index 100% rename from public/meetup/bitdevs_1.webp rename to public/bitdev/bitdevs_1.webp diff --git a/public/meetup/bitdevs_2.webp b/public/bitdev/bitdevs_2.webp similarity index 100% rename from public/meetup/bitdevs_2.webp rename to public/bitdev/bitdevs_2.webp diff --git a/public/meetup/bitdevs_3.webp b/public/bitdev/bitdevs_3.webp similarity index 100% rename from public/meetup/bitdevs_3.webp rename to public/bitdev/bitdevs_3.webp diff --git a/public/fonts/Satoshi-Regular.otf b/public/fonts/Satoshi-Regular.otf new file mode 100644 index 0000000..ddaadc0 Binary files /dev/null and b/public/fonts/Satoshi-Regular.otf differ diff --git a/public/home/headerbg.webp b/public/home/headerbg.webp index f8ce387..d6a641d 100644 Binary files a/public/home/headerbg.webp and b/public/home/headerbg.webp differ diff --git a/public/logo/1.png b/public/logo/1.png index 8c9b1a3..f459d2a 100644 Binary files a/public/logo/1.png and b/public/logo/1.png differ diff --git a/public/logo/2.png b/public/logo/2.png index b986118..f654d41 100644 Binary files a/public/logo/2.png and b/public/logo/2.png differ diff --git a/public/logo/3.png b/public/logo/3.png index d150f81..5183034 100644 Binary files a/public/logo/3.png and b/public/logo/3.png differ diff --git a/public/logo/4.png b/public/logo/4.png index 76d77de..2b75821 100644 Binary files a/public/logo/4.png and b/public/logo/4.png differ diff --git a/public/testimonial/lazy.webp b/public/testimonial/lazy.webp index 89b443e..25f5029 100644 Binary files a/public/testimonial/lazy.webp and b/public/testimonial/lazy.webp differ diff --git a/src/components/apprenticeship/About.astro b/src/components/apprenticeship/About.astro index 74ab434..f4795fa 100644 --- a/src/components/apprenticeship/About.astro +++ b/src/components/apprenticeship/About.astro @@ -6,7 +6,7 @@ About the Fellowship -

+

What is it? The Bitshala Fellowship Program is a unique opportunity for you to take your first step and dive into working in @@ -15,7 +15,7 @@ educational initiative, here's where your contributions to Bitcoin begin, and an enlightening career.

-

+

Who is it for? This program is for people who are eager to kickstart their Bitcoin Development Career or delve into @@ -23,7 +23,7 @@ you’re passionate about Bitcoin development and education, you indeed belong here.

-

+

How to join? Interested? Start contributing to the below-listed projects, or sketch your own tech/non-tech education diff --git a/src/components/apprenticeship/Apply.jsx b/src/components/apprenticeship/Apply.jsx index 577be00..9aa11cd 100644 --- a/src/components/apprenticeship/Apply.jsx +++ b/src/components/apprenticeship/Apply.jsx @@ -413,7 +413,7 @@ const Apply = () => { {selectedTab === "devProjects" && (

{devQuestion.map((question, index) => { if ( @@ -645,7 +645,7 @@ const Apply = () => { {selectedTab === "educationProgram" && ( {educationQuestion.map( (question, index) => { diff --git a/src/components/apprenticeship/CatalystInitiative.astro b/src/components/apprenticeship/CatalystInitiative.astro index b702692..59b180a 100644 --- a/src/components/apprenticeship/CatalystInitiative.astro +++ b/src/components/apprenticeship/CatalystInitiative.astro @@ -42,7 +42,7 @@ const list = [ > Explore Our Education Programs -

+

Got a fresh idea for a technical educational project? We’d love to hear it! Below, we showcase initiatives our Catalysts are already pursuing—use these as inspiration @@ -70,7 +70,7 @@ const list = [ {item.leadBy} -

{item.desc}
+
{item.desc}
Explore Dev Projects -

+

Here are open-source projects ready for your innovation and expertise. Each project offers a unique opportunity to contribute to the Bitcoin community's growth and diff --git a/src/components/apprenticeship/OurApprentices.astro b/src/components/apprenticeship/OurApprentices.astro index 9f070e6..64dc4f5 100644 --- a/src/components/apprenticeship/OurApprentices.astro +++ b/src/components/apprenticeship/OurApprentices.astro @@ -54,7 +54,7 @@ const educators = [ > Our Fellows -

+

Here are our driven individuals who are shaping the future of Bitcoin through innovation and education.

diff --git a/src/components/bitspace/About.astro b/src/components/bitspace/About.astro index 875098b..0ab1086 100644 --- a/src/components/bitspace/About.astro +++ b/src/components/bitspace/About.astro @@ -6,7 +6,7 @@ About the space -

+

What is Bitspace? @@ -15,14 +15,14 @@ individuals passionate about Bitcoin can come together to work, learn, and grow in a collaborative environment.

-

+

Who is it for? Bitspace is for Bitcoin enthusiasts, developers, entrepreneurs, and anyone interested in the Bitcoin ecosystem. Whether you’re a seasoned expert or just getting started, you're welcome here.

-

+

Why did Bitspace come to be? @@ -31,7 +31,7 @@ space, we aim to facilitate collaboration, education, and growth within the Bitcoin ecosystem in India.

-

+

Where are we in Bangalore? diff --git a/src/components/bitspace/CollabWithUs.astro b/src/components/bitspace/CollabWithUs.astro index c804152..d80e7ff 100644 --- a/src/components/bitspace/CollabWithUs.astro +++ b/src/components/bitspace/CollabWithUs.astro @@ -1,14 +1,12 @@

Collaborate with us

-

+

We’re open to collaborating on Bitcoin events, workshops, educational initiatives, and hosting other Bitcoin-related or community activities. Reach out to us diff --git a/src/components/bitspace/JoinTheSpace.astro b/src/components/bitspace/JoinTheSpace.astro index 6d8e33e..48a0dd7 100644 --- a/src/components/bitspace/JoinTheSpace.astro +++ b/src/components/bitspace/JoinTheSpace.astro @@ -6,7 +6,7 @@ Join the space -

+

Want to co-work at Bitspace? @@ -14,7 +14,7 @@ to start co-working at the space. This helps us maintain a trusted and engaged community.

-

+

How to get invited/referred? Attend our events, workshops, community activities, @@ -25,7 +25,7 @@

-
+
Contact us to get the finer details
diff --git a/src/components/bitspace/PreviousEvents.astro b/src/components/bitspace/PreviousEvents.astro index 3f85d15..e89969e 100644 --- a/src/components/bitspace/PreviousEvents.astro +++ b/src/components/bitspace/PreviousEvents.astro @@ -50,7 +50,7 @@ const list = [ > Previous Events -

+

Check out some of the exciting events we've hosted in the past...

diff --git a/src/components/bitspace/UpcomingEvents.astro b/src/components/bitspace/UpcomingEvents.astro index 078a163..742d071 100644 --- a/src/components/bitspace/UpcomingEvents.astro +++ b/src/components/bitspace/UpcomingEvents.astro @@ -19,7 +19,7 @@ const list = [ > Upcoming Events at Bitspace -

+

Stay updated with our latest events, workshops, and meetups designed to enhance your Bitcoin knowledge and network with fellow enthusiasts. @@ -87,7 +87,7 @@ const list = [

-
+
Want to receive calendar invites for events automatically?
@@ -95,7 +95,7 @@ const list = [ Yes, that’ll be great! diff --git a/src/components/cohortPages/CohortDetails.astro b/src/components/cohortPages/CohortDetails.astro index e85b4a3..28757a1 100644 --- a/src/components/cohortPages/CohortDetails.astro +++ b/src/components/cohortPages/CohortDetails.astro @@ -31,7 +31,7 @@ const { format } = Astro.props;

{item.name}

-

{item.desc}

+

{item.desc}

)) } diff --git a/src/components/cohortPages/common/CohortDetails.astro b/src/components/cohortPages/common/CohortDetails.astro index f4d5615..306457e 100644 --- a/src/components/cohortPages/common/CohortDetails.astro +++ b/src/components/cohortPages/common/CohortDetails.astro @@ -26,7 +26,7 @@ const { format } = Astro.props;

{item.name}

-

{item.desc}

+

{item.desc}

)) } diff --git a/src/components/cohortPages/lbtcl/About.astro b/src/components/cohortPages/lbtcl/About.astro index 3dba5e4..878568e 100644 --- a/src/components/cohortPages/lbtcl/About.astro +++ b/src/components/cohortPages/lbtcl/About.astro @@ -45,7 +45,7 @@ const takeaways = [ >June 2025 -

+

What is it? The LBTCL Cohort is a hands-on, immersive cohort -

+

Who is it for? This cohort is tailored for -

+

What are the prerequisites? @@ -107,7 +107,7 @@ const takeaways = [

-

+

What is the fellowship program? diff --git a/src/components/cohortPages/mb/About.astro b/src/components/cohortPages/mb/About.astro index 0b44d83..cdc0b19 100644 --- a/src/components/cohortPages/mb/About.astro +++ b/src/components/cohortPages/mb/About.astro @@ -45,7 +45,7 @@ const takeaways = [ >April, 2025 -

+

What is it? It's a comprehensive, structured learning adventure -

+

Who is it for? This cohort is -

+

What are the prerequisites? @@ -99,7 +99,7 @@ const takeaways = [

-

+

What is the fellowship program? diff --git a/src/components/common/AboutUs.astro b/src/components/common/AboutUs.astro index cad55cf..4e05e4d 100644 --- a/src/components/common/AboutUs.astro +++ b/src/components/common/AboutUs.astro @@ -6,7 +6,7 @@ About -

+

Bitshala is a grass-root education initiative led by Indian Bitcoiners, focused on strengthening the @@ -16,7 +16,7 @@ > Our mission is to equip people with the skills and knowledge needed to contribute to Bitcoin FOSS projects.

-

+

While a lot of Blockchain courses exist out there to provide surface-level API lessons on EVM like "smart contracts", the technical knowledge requirements for @@ -33,7 +33,7 @@ parallel subject domains, not well organized and spread across the internet.

-

+

Thus Bitshala aims to provide the ground for ideating, producing, and publishing different categories of content in Open Source to satisfy the varied learning diff --git a/src/components/common/Carousel.jsx b/src/components/common/Carousel.jsx index 2a3e0ac..662b75d 100644 --- a/src/components/common/Carousel.jsx +++ b/src/components/common/Carousel.jsx @@ -28,7 +28,7 @@ const slides = [ title: "Bengaluru BITDEVS", content: "Join us offline for an evening of diving deep into Bitcoin tech with bitcoiners", - targetLink: "/meetup", + targetLink: "/bitdev", cta: "Tell me more → ", }, { @@ -51,50 +51,65 @@ const slides = [ function Carousel() { return ( -

-

+
+

“Bitcoin seems really technical,
is it hard to get started?"

+

+ “Bitcoin seems really
technical, is it hard + to
get started?" +

-

+

Don’t worry, our club activities, meetups, and study - cohorts, will help make
your Bitcoin journey, + cohorts, will help make
your Bitcoin journey much more smoother, accessible, and fun.

-
+

+ Don’t worry, our club activities,
meetups, + and study cohorts, will help
make your + Bitcoin journey much more
smoother, + accessible, and fun. +

+
{slides.map((slide, index) => (
-

+

{slide.title}

-

+

{slide.content}

{slide.cta}
))}
-

- And, we totally understand, Bitcoin Tech can seem - overwhelming in the start but
it’s hard +

+ And, we totally understand, Bitcoin Tech
can + seem overwhelming in the start but it’s
hard mostly if you’re trying to learn alone.

+
); } diff --git a/src/components/common/Footer.astro b/src/components/common/Footer.astro index bb06b56..579e33c 100644 --- a/src/components/common/Footer.astro +++ b/src/components/common/Footer.astro @@ -21,7 +21,7 @@ const list = [ name: "IRL Funzzz ", subMenu: [ { name: "Bitspace", link: "/bitspace" }, - { name: "BITDEVS", link: "/meetup" }, + { name: "BITDEVS", link: "/bitdev" }, ], }, { @@ -52,28 +52,20 @@ const list = [
-
+
We got a discord community of hungry
and passionate Bitcoin @@ -84,14 +76,13 @@ const list = [ target="_blank" >
Ahh.. I think I'll fit right in!
-
@@ -99,16 +90,15 @@ const list = [ class="ml-3 grid grid-cols-2 p-2 lg:ml-24 lg:mr-56 lg:w-3/5 lg:grid-cols-4" > { - list.map((item) => ( <>
-

+

{item.name}

    {item.subMenu.map((subItem) => ( -
  • +
  • ))}
-
)) }
-
+
@@ -154,12 +143,19 @@ const list = [ >
-

+

+ Copyright © 2024
Bitshala +

+
diff --git a/src/components/common/Navbar.jsx b/src/components/common/Navbar.jsx index 4c8a19d..cc861db 100644 --- a/src/components/common/Navbar.jsx +++ b/src/components/common/Navbar.jsx @@ -28,7 +28,7 @@ const Navbar = () => { link: "/#irl_funzzz", subMenu: [ { name: "Bitspace", link: "/bitspace" }, - { name: "BITDEVS", link: "/meetup" }, + { name: "BITDEVS", link: "/bitdev" }, ], }, { @@ -55,7 +55,7 @@ const Navbar = () => { return (
-

+ +

Bitshala is a grassroots education initiative
.
Our mission is to equip people with the
skills and knowledge needed to contribute
to Bitcoin FOSS projects. -
We want you to be part of the revolution. +
Together, we’re cultivating a stronger,
+ more robust, and more resilient open-source
+ Bitcoin ecosystem.

Trusted and Supported by

@@ -80,7 +90,7 @@ const colabList = [ Bitshala Logo @@ -92,19 +102,19 @@ const colabList = [ class="m-5 flex flex-col rounded-3xl border-2 border-black border-opacity-5 bg-peach lg:m-0 lg:mb-32 lg:flex-row" >

In collaboration with

{ colabList.map((li) => ( Bitshala Logo diff --git a/src/components/home/JourneyGuide.astro b/src/components/home/JourneyGuide.astro index 0acb411..27f7eb6 100644 --- a/src/components/home/JourneyGuide.astro +++ b/src/components/home/JourneyGuide.astro @@ -43,7 +43,7 @@ const list = [ { title: "Collaborate and build together with Bitcoin Devs in real life", - desc: "Take your learning offline and collaborate in-person with other Bitcoin devs, building real solutions together at Bitspace located in Bengaluru, India lorem ipsum dolor sit amet", + desc: "Take your learning offline and collaborate in-person with other Bitcoin devs, building real solutions together at Bitspace located in Bengaluru, India", link: "/bitspace", buttonText: "I’d like to know more about Bitspace →", step: "Step 05", @@ -58,13 +58,20 @@ const list = [ >

+ “And, if I wanted to start
my Bitcoin dev + journey
with you, what would
that look + like?" +

+

“And, if I wanted to start my Bitcoin dev journey with you, what would that look like?"

Well, we’re glad you asked! Here’s what your journey could look like with us... @@ -81,16 +88,18 @@ const list = [ } flex-col`} >

-

+

{item.step}

{item.title}

-

{item.desc}

+

+ {item.desc} +

{item.buttonText} diff --git a/src/components/home/LinkCohort.astro b/src/components/home/LinkCohort.astro index 38b0043..2d4da74 100644 --- a/src/components/home/LinkCohort.astro +++ b/src/components/home/LinkCohort.astro @@ -4,21 +4,21 @@

- It’s not just all about learning;
it’s about it’s about growing together.

- It’s not
just all about
learning;
+ It’s not
just about
learning;
it’s about
growing together.

-

+

Our community of developers,
learners, and enthusiasts is where
ideas are shared, challenges are
tackled, and Bitcoin careers are
born. @@ -38,25 +36,31 @@

+ Take the first step
and begin your
+ Bitcoin journey! +

+
-
+
I’m in! Take me to Discord
diff --git a/src/components/home/Testimonial.astro b/src/components/home/Testimonial.astro index d104271..69d36fd 100644 --- a/src/components/home/Testimonial.astro +++ b/src/components/home/Testimonial.astro @@ -15,10 +15,16 @@ const imageList = [

+ Hear from others who’ve
been in the same place
you are right now +

+

Hear from others who’ve been in the
same place you are right now @@ -44,12 +50,21 @@ const imageList = [ }

-
+
-

+

+ P.S. "If I could do it, you can too"
is what + they’re all trying to say :) +

+ + diff --git a/src/components/home/TestimonialMobile.jsx b/src/components/home/TestimonialMobile.jsx index 7fda4ff..020a59e 100644 --- a/src/components/home/TestimonialMobile.jsx +++ b/src/components/home/TestimonialMobile.jsx @@ -33,13 +33,13 @@ const TestimonialMobile = () => { {item.name}
-

+

{item.name}

-

+

{item.cohort}

diff --git a/src/components/meetup/About.astro b/src/components/meetup/About.astro index fdb9e17..e940b9c 100644 --- a/src/components/meetup/About.astro +++ b/src/components/meetup/About.astro @@ -5,7 +5,7 @@ let details = { name: "Silent Payments Deep Dive", desc: " Get ready for another exciting Bitcoin Tech Meetup in Bangalore, this time diving deep into the world of Silent Payments! We'll explore how this innovative tech enhances privacy and efficiency within the Bitcoin", month: "March", - img: "/meetup/bitdevs_3.webp", + img: "/bitdev/bitdevs_3.webp", link: "https://discord.com/invite/STeQFVEWf9", isHappening: false, }; diff --git a/src/components/meetup/gallery.jsx b/src/components/meetup/gallery.jsx index 079b578..913d690 100644 --- a/src/components/meetup/gallery.jsx +++ b/src/components/meetup/gallery.jsx @@ -1,17 +1,17 @@ import { useState } from "react"; const images = [ - "/meetup/Gallery/1.webp", - "/meetup/Gallery/2.webp", - "/meetup/Gallery/3.webp", - "/meetup/Gallery/4.webp", - "/meetup/Gallery/5.webp", - "/meetup/Gallery/6.webp", - "/meetup/Gallery/7.webp", - "/meetup/Gallery/8.webp", - "/meetup/Gallery/9.webp", - "/meetup/Gallery/10.webp", - "/meetup/Gallery/11.webp", - "/meetup/Gallery/12.webp", + "/bitdev/Gallery/1.webp", + "/bitdev/Gallery/2.webp", + "/bitdev/Gallery/3.webp", + "/bitdev/Gallery/4.webp", + "/bitdev/Gallery/5.webp", + "/bitdev/Gallery/6.webp", + "/bitdev/Gallery/7.webp", + "/bitdev/Gallery/8.webp", + "/bitdev/Gallery/9.webp", + "/bitdev/Gallery/10.webp", + "/bitdev/Gallery/11.webp", + "/bitdev/Gallery/12.webp", "/bitspace/Gallery/1.webp", "/bitspace/Gallery/2.webp", "/bitspace/Gallery/3.webp", diff --git a/src/components/meetup/slider.jsx b/src/components/meetup/slider.jsx index 26938ae..ed25c95 100644 --- a/src/components/meetup/slider.jsx +++ b/src/components/meetup/slider.jsx @@ -7,21 +7,21 @@ import { Pagination, Navigation } from "swiper/modules"; const list = [ { id: 1, - url: "/meetup/bitdevs_1.webp", + url: "/bitdev/bitdevs_1.webp", title: "BIP324", desc: "Bengaluru witnessed a vibrant gathering of Bitcoiners and FOSS enthusiasts, where Stratospher unveiled BIP324's potential. It was an evening rich with conversations, connections, and celebration!", link: "https://discord.com/invite/STeQFVEWf9", }, { id: 2, - url: "/meetup/bitdevs_2.webp", + url: "/bitdev/bitdevs_2.webp", title: "Miniscript and Descriptors", desc: "Bengaluru had a blast unwrapping the secrets of miniscript and descriptors with fellow Bitcoin buffs over great conversations and snacks!", link: "https://discord.com/invite/STeQFVEWf9", }, { id: 3, - url: "/meetup/bitdevs_3.webp", + url: "/bitdev/bitdevs_3.webp", title: "Privacy Tech and Silent Payments", desc: "Get ready for another exciting Bitcoin Tech Meetup in Bangalore, this time diving deep into the world of Silent Payments! We'll explore how this innovative tech enhances privacy and efficiency within the Bitcoin network.", link: "https://discord.com/invite/STeQFVEWf9", @@ -65,7 +65,7 @@ const Slider = () => {

{item.title}

-

+

{item.desc}

{

{item.title}

-

{item.desc}

+

{item.desc}

{item.link && ( {item.name}

-

{item.desc}

+

{item.desc}

)) } diff --git a/src/components/talks/VideoCard.astro b/src/components/talks/VideoCard.astro index f736d41..98f1b68 100644 --- a/src/components/talks/VideoCard.astro +++ b/src/components/talks/VideoCard.astro @@ -17,7 +17,7 @@ const { video } = Astro.props as { {`Episode 0${video.index}`}
{`${video.title.slice(0, 80)}..`}
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 4dda519..44236b4 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -132,16 +132,6 @@ const { title, headerProps, isVisible } = Astro.props;