Skip to content

Commit

Permalink
Merge branch 'main' into navbar
Browse files Browse the repository at this point in the history
  • Loading branch information
keraliss authored Oct 1, 2024
2 parents faf820b + 0bc726c commit 6249292
Show file tree
Hide file tree
Showing 14 changed files with 165 additions and 131 deletions.
Binary file added public/home/about.webp
Binary file not shown.
Binary file added public/logo/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logo/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logo/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/logo/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/cohort/CohortCard.astro
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const cardsList = [
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: "/cohorts/lbtcl",
status: "Registration Open",
status: "Coming Soon",
},
{
name: "Bitcoin Protocol Development",
Expand All @@ -26,7 +26,7 @@ const cardsList = [
img: "/cohort/pb.webp",
desc: "Programming Bitcoin, a comprehensive tutorial on Bitcoin Core, unlocks the intricacies of Bitcoin development.",
url: "/cohorts/pb",
status: "Coming Soon",
status: "Registration Open",
},
];
---
Expand Down
2 changes: 1 addition & 1 deletion src/components/cohortPages/lbtcl/About.astro
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const takeaways = [
</h1>
<h3 class="mb-5 font-header text-xl lg:text-3xl">
Cohort Kicking off on <span class="text-orange"
>13th September 2024</span
>June 2025</span
>
</h3>
<p class="font-base text-base md:text-lg lg:text-2xl">
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/AboutUs.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="lg:p-8">
<h1
class="mb-8 mt-28 text-center font-header text-3xl font-bold md:text-6xl lg:text-8xl"
class="mb-8 mt-8 text-center font-header text-3xl font-bold md:text-6xl lg:text-8xl"
id="about_us"
>
About
Expand Down
252 changes: 136 additions & 116 deletions src/components/common/Footer.astro
Original file line number Diff line number Diff line change
@@ -1,143 +1,163 @@
---
const list1 = [
const list = [
{
name: "Twitter",
link: "https://twitter.com/bitshala_org",
},
{
name: "YouTube",
link: "https://www.youtube.com/@bitshala/videos",
},
{
name: "LinkedIn",
link: "https://www.linkedin.com/company/bitshala",
},
];
const list2 = [
{
name: "Home",
link: "/",
},
{
name: "Team",
link: "/#our_people",
},
{
name: "Contact",
link: "mailto:[email protected]",
},
];
const list3 = [
{
name: "Bitcoin Study Cohort",
link: "/cohorts",
},
{
name: "Fellowship",
link: "/fellowship",
},
{
name: "Meetups",
link: "/meetup",
},
{
name: "Reading Club",
link: "/readingClub",
},
{
name: "Bitcoin Review Club",
link: "/review",
name: "Org ",
subMenu: [
{ name: "About", link: "/about" },
{
name: "Contact us",
link: "/bitspace/#contact_us",
},
],
},
{
name: "Optech",
link: "/optech",
name: "Bitcoin Career ",
subMenu: [
{ name: "Study cohorts", link: "/cohorts" },
{ name: "Fellowship", link: "/fellowship" },
],
},
{
name: "Bitcoin Talks",
link: "/talks",
name: "IRL Funzzz ",
subMenu: [
{ name: "Bitspace", link: "/bitspace" },
{ name: "BITDEVS", link: "/meetup" },
],
},
{
name: "Bitspace",
link: "/bitspace",
name: "Social Clubs ",
subMenu: [
{
name: "Latest in Bitcoin Tech",
link: "/optech",
},
{ name: "Reading Club", link: "/readingClub" },
{
name: "Bitcoin PR Review Club",
link: "/review",
},
{
name: "Hands-on Lightning",
link: "https://discord.gg/7PGCfrwZ?event=1284138868777553962",
},
{ name: "Bitcoin Talks", link: "/talks" },
],
},
];
---

<footer class="mt-5">
<hr class="opacity-20" />
<div
class="items-center justify-between bg-peach px-3 py-10 sm:flex sm:flex-col md:flex md:flex-row"
>
<div
class="mb-3 text-lg sm:w-full md:ml-5 md:w-3/6 md:text-xl xl:text-3xl"
>
We got a <span class="font-bold"
>discord community</span
> of hungry and passionate Bitcoin developers....
</div>
<a
href="https://discord.com/invite/STeQFVEWf9"
target="_blank"
>
<footer class="mt-5 bg-black pb-10 text-white lg:py-14">
<div>
<div class="flex flex-col lg:flex-row">
<div
class="rounded-lg border-2 border-dotted p-2 text-sm hover:bg-orange hover:text-white md:text-xl lg:mr-5 lg:px-10 lg:py-5 xl:text-3xl"
class="hidden justify-center p-10 lg:flex lg:w-2/5"
>
Ahh.. I think I'll fit right in
<img
src="/footer/logo.png"
class="h-16"
alt="Bitshala Logo"
/>
<div>
<p
class="ml-2 mt-1 font-header text-2xl font-bold"
>
Bitshala
</p>
<p class="text-md ml-2">
A Pathshala for Bitcoin
</p>
</div>
</div>
</a>
</div>

<hr class="opacity-20" />
<div
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="/footer/logo.png"
class="mb-60 h-16"
alt="Bitshala Logo"
/>
<div>Copyright © 2024 Bitshala</div>
</div>
<div class="m-3 p-3">
{
list1.map((li) => (
<a href={li.link} target="_blank">
<div class="my-1 text-sm hover:font-header lg:text-xl">
{li.name}
<div class="lg:w-3/5">
<div
class="m-3 rounded-lg bg-white p-4 text-lg text-black lg:m-10 lg:flex lg:w-fit lg:px-10 lg:text-2xl"
>
<div class="p-5">
We got a <span class="font-bold"
>discord community</span
> of hungry <br /> and passionate Bitcoin
developers....
</div>
<a
href="https://discord.com/invite/STeQFVEWf9"
target="_blank"
>
<div
class="rounded-lg bg-black p-5 text-white hover:bg-orange lg:mt-3 lg:px-2"
>
Ahh.. I think I'll fit right in!
</div>
</a>
))
}
</div>
<div class="m-3 p-3">
{
list2.map((li) => (
<a href={li.link}>
<div class="my-1 text-sm hover:font-header lg:text-xl">
{li.name}
</div>
</a>
))
}
</div>
</div>
</div>
<div class="m-3 p-3">
</div>
<div class="flex flex-col lg:flex-row-reverse">
<div
class="ml-3 grid grid-cols-2 p-2 lg:ml-24 lg:mr-56 lg:w-3/5 lg:grid-cols-4"
>
{
list3.map((li) => (
<a href={li.link}>
<div class="my-1 text-sm hover:font-header lg:text-xl">
{li.name}
list.map((item) => (
<>
<div class="my-4 ">
<p class=" my-2 text-lg text-white text-opacity-60">
{item.name}
</p>
<ul>
{item.subMenu.map((subItem) => (
<li class="my-2 font-header text-xl lg:gap-3">
<a
href={subItem.link}
class="hover:text-orange"
>
{subItem.name}
</a>
</li>
))}
</ul>
</div>
</a>
</>
))
}
</div>
<div class="m-3 hidden p-3 lg:inline">
<div class="mt-80 flex justify-end">
Cypherpunks write code !
<div
class="mt-5 flex flex-row-reverse items-center px-3 sm:justify-between lg:ml-28 lg:w-2/5 lg:flex-col lg:justify-normal"
>
<div class="flex gap-4">
<a href="https://x.com/bitshala">
<img
src="/logo/1.png"
class="h-5 lg:h-10"
alt=""
/>
</a>
<a href="https://www.youtube.com/@bitshala">
<img
src="/logo/2.png"
class="h-5 lg:h-10"
alt=""
/>
</a>
<a href="https://www.linkedin.com/company/bitshala">
<img
src="/logo/3.png"
class="h-5 lg:h-10"
alt=""
/>
</a>
<a
href="https://primal.net/p/npub1m495fdq2e8jleptdq6ruzpmz0esjttln2rjx7dxj9w4zvxs48y3q5pu22l"
>
<img
src="/logo/4.png"
class="h-5 lg:h-10"
alt=""
/>
</a>
</div>
<p class="text-md mt-5 px-1">
Copyright © 2024 Bitshala
</p>
</div>
</div>
</footer>
2 changes: 1 addition & 1 deletion src/components/common/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export const dev = [
},
{
name: "Paperpsych",
desc: "If he’s not designing, he’s writing copy or tweeting, if he’s not doing that, he’s planning events. If not that... he’s watching Mad Men!",
desc: "If he’s not designing, he’s writing copy, if he’s not doing that, he’s planning some events. If not that.. he’s probably watching Mad Men!",
image: "paperpsych",
bgColor: "bg-orange",
textColor: "text-black",
Expand Down
5 changes: 3 additions & 2 deletions src/layouts/Layout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,11 @@ const { title, headerProps, isVisible } = Astro.props;
<Navbar client:load />



<div class=`${isVisible ? "block" : "hidden"}`>
<Notification
message="Register for upcoming LBTCL Study Cohort"
url="/cohorts/lbtcl/#applicationForm"
message="Register for upcoming PB Study Cohort"
url="/cohorts/pb/#applicationForm"
client:only
/>
</div>
Expand Down
17 changes: 15 additions & 2 deletions src/pages/about.astro
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,22 @@ const headerProps = {

<Layout
title="About Us"
headerProps={headerProps}
isVisible={isVisible}
headerProps={{
image: "/home/about.webp",
}}
isVisible={true}
>
<div
slot="headerChild"
class="h[30vh] flex flex-col justify-between lg:h-[70vh]"
>
<h1
class="mt-28 text-center font-header text-4xl text-white lg:text-8xl xl:text-9xl"
>
Get to know us <br />
a little better
</h1>
</div>
<AboutUs />
<People />
</Layout>
6 changes: 3 additions & 3 deletions src/pages/cohorts/lbtcl.astro
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const headerProps = {
};
const role = "lbtcl_cohort";
const cohortName = "Learning Bitcoin Through Command Line";
const isVisible = false;
const isVisible = true;
---

<Layout
Expand All @@ -29,7 +29,7 @@ const isVisible = false;
format={[
{
name: "Commencement date",
desc: "13th September 2024",
desc: "June 2025",
},
// {
// name: "Registration deadline",
Expand Down Expand Up @@ -116,7 +116,7 @@ const isVisible = false;
client:only
cohortName={cohortName}
role={role}
regOpen={true}
regOpen={false}
/>
</div>
<CohortGraduates />
Expand Down
Loading

0 comments on commit 6249292

Please sign in to comment.