Merge branch 'main' into climate-fixes

components/background-image.js

@@ -32,7 +32,7 @@ const BGImg = ({
         bottom: 0
       },
       '> span': { height: '100% !important', width: '100% !important' },
-      img: { objectFit: 'cover', objectPosition: 'center 100%' },
+      img: { objectFit: 'cover', objectPosition: 'center center' },
       '~ *': { position: 'relative' }
     }}
   >

components/footer.js

@@ -110,7 +110,7 @@ const Footer = ({ dark = false, children, ...props }) => (
           </Heading>
           <Link href="https://events.hackclub.com/">Community Events</Link>
           <Link href="https://toolbox.hackclub.com/">Toolbox</Link>
-          <Link href="https://hackclub.com/map">Clubs Map</Link>
+          <Link href="https://directory.hackclub.com/">Clubs Directory</Link>
           <Link href="https://hackclub.com/conduct/">Code of Conduct</Link>
         </Box>
         <Box sx={{ gridColumn: ['span 2', 'span 1'] }}>

components/index/carousel-cards.js

@@ -56,7 +56,7 @@ export default function CarouselCards({
           // variant="interactive"
           sx={{
             mr: 3,
-            backgroundColor: background,
+            background,
             position: 'relative',
             color: 'white',
             width: ['200px', '300px', '300px'],

lib/carousel.json

@@ -1,4 +1,13 @@
 [
+  {
+    "background": "linear-gradient(to bottom right, #993CCF 0%, rgba(170, 77, 181, 0.95) 17.19%, rgba(193, 99, 146, 0.90) 31.77%, rgba(223, 129, 101, 0.71) 52.08%, rgba(240, 146, 75, 0.60) 63.54%)",
+    "titleColor": "white",
+    "descriptionColor": "white",
+    "title": "Jams",
+    "description": "Collaborative coding workshops where sparks ignite, fears dissolve, and inventions come to life",
+    "img": "https://cloud-7xyxcf3f6-hack-club-bot.vercel.app/0new_project__3_.png",
+    "link": "https://jams.hackclub.com"
+  },
   {
     "background": "#000",
     "titleColor": "yellow",

pages/index.js

@@ -26,7 +26,7 @@ import Clubs from '../components/index/cards/clubs'
 import Workshops from '../components/index/cards/workshops'
 import Bank from '../components/index/cards/bank'
 import Hackathons from '../components/index/cards/hackathons'
-import AssembleImgFile from '../public/home/assemble.jpg'
+import OuternetImgFile from '../public/home/outernet-110.jpg'
 import Announcement from '../components/announcement'
 import Konami from 'react-konami-code'
 import JSConfetti from 'js-confetti'
@@ -174,8 +174,8 @@ function Page({
           }}
         >
           <BGImg
-            src={AssembleImgFile}
-            alt="Hack Clubbers assemble at Figma HQ for the first IRL hackathon in SF since 2020: Assemble. 📸 Photo by Kunal Botla, Hack Clubber in MA!"
+            src={OuternetImgFile}
+            alt="Hack Clubbers gather in the great outdoors of Cabot, VT, for an experience unlike any other: Outernet. 📸 Photo by Matt Gleich, Hack Clubber in NH!"
             priority
             gradient="linear-gradient(rgba(0,0,0,0.4), rgba(0,0,0,0.45))"
           />
@@ -280,7 +280,7 @@ function Page({
           >
             <Badge
               as="a"
-              href="https://www.youtube.com/watch?v=PnK4gzO6S3Q"
+              href="https://outernet.hackclub.com/"
               target="_blank"
               rel="noopener"
               variant="pill"
@@ -295,9 +295,9 @@ function Page({
                 transition: '0.3s ease'
                 // mixBlendMode: 'multiply'
               }}
-              title="📸 Photo by Kunal Botla, Hack Clubber in MA!"
+              title="📸 Photo by Matt Gleich, Hack Clubber in NH!"
             >
-              Hackers at Assemble in SF
+              Hackers at Outernet in VT
             </Badge>
           </Box>
         </Box>

pages/team.js

@@ -172,14 +172,11 @@ export default function Team() {
                       pronouns="she/her"
                     />
                     <Bio
-                      name="Sam Poder"
-                      teamRole="Engineering & Operations"
-                      text={`Originally from Australia, Sam's family moved to Singapore when he was young. He now runs a Hack Club at his school in Singapore. 
-                Sam has worked on all sorts of Hack Club projects, focusing on web development and logistics. Outside of Hack Club, Sam enjoys traveling with his family 
-                and participating in academic competitions with his friends.`}
-                      img="https://change-my-pfp.vercel.app/api/current/"
+                      name="Deven Jadhav"
+                      teamRole="Events"
+                      text="Deven is a Hack Clubber from India who enjoys building meaningful things at the intersections of art and technology. He also loves music and plays the guitar & drums! Along with this, he also likes talking to strangers over the internet and having interesting & deep conversations. He is also a sucker for nature photography and enjoys hikes and treks into the wild!"
+                      img="https://github.com/devenjadhav.png"
                       pronouns="he/him"
-                      href="https://github.com/sampoder"
                     />
                     <Bio
                       name="Hugo Hu"
@@ -335,14 +332,7 @@ export default function Team() {
                       img="https://cloud-oubklmp6c-hack-club-bot.vercel.app/0arianna_profile_photo.png"
                       pronouns="she/her"
                     />
-                    <Bio
-                      name="Deven Jadhav"
-                      teamRole="Operations"
-                      text="Deven is a Hack Clubber from India who enjoys building meaningful things at the intersections of art and technology. He also loves music and plays the guitar & drums! Along with this, he also likes talking to strangers over the internet and having interesting & deep conversations. He is also a sucker for nature photography and enjoys hikes and treks into the wild!"
-                      img="https://github.com/devenjadhav.png"
-                      pronouns="he/him"
-                      spanTwo
-                    />
+                    
                   </Grid>
                 </Box>
 
@@ -453,12 +443,6 @@ export default function Team() {
                 img="https://github.com/kunalbotla.png"
                 pronouns="he/him"
               />
-              <Bio
-                name="Al Harder-Hyde"
-                teamRole="Project Manager"
-                img="https://scrapbook.hackclub.com/al.png"
-                pronouns="they/them"
-              />
               <Bio
                 name="Ella Xu"
                 teamRole="Clubs Engineering"
@@ -473,6 +457,14 @@ export default function Team() {
                 img="/team/ced.png"
                 pronouns="he/him"
               />
+              <Bio
+                name="Sam Poder"
+                teamRole="Engineering & Operations"
+                text={`Originally from Australia, Sam's family moved to Singapore when he was young. In Singapore, he ran a Hack Club at his school and multiple hackathons with his friends. During his time in Hack Club, he worked on everything from events to engineering. The wildest things from his time at Hack Club include 4am rickshaw rides in New Delhi, attempting to oversee several raves, rickrolling the Slack twice, losing his voice waking up hundreds of sleeping hackers and heartstopping late-night launches. Now at university, Sam will never forget the crazy times at Hack Club and will always have his friends from Hack Club.`}
+                img="https://change-my-pfp.vercel.app/api/current/"
+                pronouns="he/him"
+                href="https://github.com/sampoder"
+              />
               <Bio
                 img="/team/athul.jpg"
                 name="Athul Blesson"