Merge branch 'main' into dependabot/npm_and_yarn/remark-gfm-4.0.1

Author: 3kh0

README.md

@@ -4,21 +4,28 @@
 
 Hack Club's new website. This codebase is what runs on [hackclub.com](https://hackclub.com). For new developers getting started, run the following in your terminal:
 
-Download the code to your computer:
+1. Download the code to your computer:
 
-    $ git clone https://github.com/hackclub/site && cd site
+    ```bash
+    git clone https://github.com/hackclub/site && cd site
+    ```
 
-Install dependencies:
+2. Install dependencies:
 
-    $ yarn
+    ```bash
+    yarn
+    ```
 
-Start running the website on your computer:
+3. Start running the website on your computer:
 
-    $ yarn dev
+    ```bash
+    yarn dev
+    ```
 
-And then open up your web browser and go to [localhost:3000](http://localhost:3000).
+4. Open up your web browser and go to [localhost:3000](http://localhost:3000)
 
-Please note: There are a number of redirects and rewrites essential to the website's functionality, which you can see in [next.config.mjs](./next.config.mjs).
+> [!NOTE]
+> There are a number of redirects and rewrites essential to the website's functionality, which you can see in [next.config.mjs](./next.config.mjs).
 
 Powered by [Next.js] with [MDX], [Theme UI], & [Hack Club Theme].
 
@@ -35,11 +42,11 @@ See something that could be better? Make a PR! Have an easter egg idea? Make a P
 If you need to add content to the site, here's how you can:
 
 <details> <summary>Create a new card</summary>
-<img width="600" alt="Screenshot 2023-08-16 at 9 09 55 PM" src="https://github.com/hackclub/site/assets/65808924/fed45800-c834-4e4c-ad87-a21e01414fa9">
+<img width="600" alt="Screenshot of the Sprig card" src="https://github.com/hackclub/site/assets/65808924/fed45800-c834-4e4c-ad87-a21e01414fa9">
 
 Most things on the homepage are cards, modular components that can easily be added and removed according to relevancy to Hack Clubbers. There are 3 main sections: connection, open-source, and IRL community. Most new cards will likely fall within the first two sections!
 
-First, you can create a new file under [components/index/cards](components/index/cards/) with the name of your new event/project. Next add `import CardModel from './card-model'` and add whatever you want :) Finally, use a <Buttons> component (`import Buttons from './button'`) to highlight call-to-action buttons. If it's the main button, use the primary prop to add a background color!
+First, you can create a new file under [components/index/cards](components/index/cards/) with the name of your new event/project. Next add `import CardModel from './card-model'` and add whatever you want :) Finally, use a `<Buttons>` component (`import Buttons from './button'`) to highlight call-to-action buttons. If it's the main button, use the primary prop to add a background color!
 
 Your challenge: try and make the card as unique as possible, like a mini poster! Not sure where to start? Look at other cards on the page :)
 
@@ -48,7 +55,7 @@ Your challenge: try and make the card as unique as possible, like a mini poster!
 <details>
 <summary>Add to the carousel</summary>
 
-<img width="600" alt="Screenshot 2023-08-16 at 9 09 11 PM" src="https://github.com/hackclub/site/assets/65808924/044660eb-fb3d-43b6-a270-64a3fe51f3ca">
+<img width="600" alt="Screenshot of a carousel section" src="https://github.com/hackclub/site/assets/65808924/044660eb-fb3d-43b6-a270-64a3fe51f3ca">
 
 If there's a Hack Club or Hack Club community-led project (past or present) that Hack Clubbers can get involved in, please add it to [lib/carousel.json](lib/carousel.json) and add your card to the end of the json file. An example looks like this:
 
@@ -61,12 +68,12 @@ If there's a Hack Club or Hack Club community-led project (past or present) that
     "description": "Our open love letter to hackers",
     "img": "https://a.slack-edge.com/production-standard-emoji-assets/14.0/apple-large/1f4bb@2x.png",
     "link": "/hackers-wanted"
-  }
+}
 ```
 
 </details>
 
-Every week, [thousands of people](https://plausible.io/hackclub.com) visit hackclub.com. What story to you want to tell?
+Every week, thousands of people visit hackclub.com. What story to you want to tell?
 
 _Have questions? Join us in [#hackclub-site-dev](https://hackclub.slack.com/archives/C036BTDGP43) and to learn more about the style guide at Hack Club check [this](https://hackclub.com/brand/) out_
 

components/bio.js

@@ -23,7 +23,7 @@ export default function Bio({ popup = true, spanTwo = false, ...props }) {
           zIndex: !popup ? 1003 : 5,
           maxHeight: '90vh',
           overflowY: 'hidden',
-          overscrollBehavior: 'contain',
+          overscrollBehavior: 'auto',
           gridColumn: !spanTwo ? null : [null, null, '1 / span 2'],
           position: 'relative'
         }}

components/nav.js

@@ -143,7 +143,7 @@ const Navigation = props => (
     <NextLink href="/hackathons" passHref>
       <Link>Hackathons</Link>
     </NextLink>
-    <Link href="/slack">Community</Link>
+    <Link href="https://slack.hackclub.com">Join</Link>
     <NextLink href="https://toolbox.hackclub.com/" passHref>
       <Link>Toolbox</Link>
     </NextLink>

package.json

@@ -38,7 +38,7 @@
     "animated-value": "^0.2.4",
     "animejs": "^3.2.2",
     "axios": "^1.13.3",
-    "camelcase": "^8.0.0",
+    "camelcase": "^9.0.0",
     "cookies-next": "^4.3.0",
     "country-list": "^2.3.0",
     "country-list-js": "^3.1.8",
@@ -62,7 +62,7 @@
     "nextjs-current-url": "^1.0.3",
     "openai": "^4.86.1",
     "pcb-stackup": "^4.2.8",
-    "rc-dialog": "^9.6.0",
+    "rc-dialog": "^10.0.0",
     "react": "^17.0.2",
     "react-beautiful-dnd": "^13.1.1",
     "react-before-after-slider-component": "^1.1.8",

pages/amas/index.js

@@ -172,7 +172,7 @@ const Page = ({ upcoming, past }) => (
               <Image
                 width={128}
                 height={128}
-                unoptimized={event.amaAvatar.startsWith('https://cachet.')}
+                unoptimized={true}
                 src={event.amaAvatar}
                 alt={event.title}
               />

public/acknowledged.json

@@ -689,7 +689,7 @@
     "bio": "",
     "slackId": "U07VC9705D4",
     "email": "",
-    "website": "",
+    "website": "https://shymike.dev",
     "avatar": "https://cachet.dunkirk.sh/users/U07VC9705D4/r"
   },
   {

yarn.lock

@@ -3046,10 +3046,10 @@ camelcase@^5.3.1:
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz"
-  integrity sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==
+camelcase@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-9.0.0.tgz#451bbe18e34a2d2646bd62340c9278edd36db381"
+  integrity sha512-TO9xmyXTZ9HUHI8M1OnvExxYB0eYVS/1e5s7IDMTAoIcwUd+aNcFODs6Xk83mobk0velyHFQgA1yIrvYc6wclw==
 
 camelize@^1.0.0:
   version "1.0.1"
@@ -7571,10 +7571,10 @@ raw-body@2.4.1:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc-dialog@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.6.0.tgz"
-  integrity sha512-ApoVi9Z8PaCQg6FsUzS8yvBEQy0ZL2PkuvAgrmohPkN3okps5WZ5WQWPc1RNuiOKaAYv8B97ACdsFU5LizzCqg==
+rc-dialog@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-10.0.0.tgz#d1a8fa3f7f41a0fc7732665418eff24628c57fc9"
+  integrity sha512-KdQjqNknesFtIdz5dGcVpqWqqMg6PeWq6Jodv9gVPXtQ3Kr8Ik7RSWauhlMbidNiwSSvTUvkDQmdawhypob1JQ==
   dependencies:
     "@babel/runtime" "^7.10.1"
     "@rc-component/portal" "^1.0.0-8"