Merge branch 'main' into reteps/multi-calendar

sigpwny · Sep 8, 2024 · 3148d25 · 3148d25
2 parents 8ea7ab5 + 4bbc9c1
commit 3148d25
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 23 deletions.
diff --git a/_global/content/events/fallctf/2023/index.mdx b/_global/content/events/fallctf/2023/index.mdx
@@ -13,6 +13,8 @@ location: CIF 3039
 card_image:
   background_color: "#000000"
   background: fallctf-23-event-page-graphic.png
+credit:
+  - SIGPwny
 sponsors:
   - John Deere
   - Battelle

diff --git a/_global/content/events/fallctf/2024/index.mdx b/_global/content/events/fallctf/2024/index.mdx
@@ -6,13 +6,20 @@ duration: PT6H
 timezone: America/Chicago
 location: CIF 3039
 description: Fall CTF is a 6-hour hacking competition for UIUC students hosted
-  by SIGPwny. UIUC students of all backgrounds are welcome, including beginners!
+  by SIGPwny and WiCyS @ Illinois. UIUC students of all backgrounds are welcome, including beginners!
   Work in teams of two on challenges related to web hacking, reverse
   engineering, binary exploitation, and more! Plus, free food, free swag, and
-  companies! Come learn and have fun with us!
+  companies!
 card_image:
   background: fallctf-2024.png
   background_color: "#000000"
+credit:
+  - SIGPwny
+  - WiCyS @ Illinois
+sponsors:
+  - John Deere
+  - Battelle
+  - Hudson River Trading
 links:
   - name: website
     url: https://2024.fallctf.com/

diff --git a/_global/content/meetings/fa2024/2024-09-08/index.mdx b/_global/content/meetings/fa2024/2024-09-08/index.mdx
@@ -4,9 +4,10 @@ time_start: 2024-09-08T19:00:00.000Z
 duration: ""
 week_number: 1
 credit:
-  - Minh Duong
+  - George Huebner
+  - Adarsh Krishnan
 featured: true
-location: Siebel CS 1404 (Pending)
+location: Siebel CS (room pending)
 description: Learn how to set up your laptop to get started hacking!
 card_image:
   background: img_0074.jpeg

diff --git a/_global/content/meetings/fa2024/2024-09-12/devtools.png b/_global/content/meetings/fa2024/2024-09-12/devtools.png
diff --git a/_global/content/meetings/fa2024/2024-09-12/index.mdx b/_global/content/meetings/fa2024/2024-09-12/index.mdx
@@ -0,0 +1,26 @@
+---
+title: Web Hacking I
+time_start: 2024-09-12T23:00:00.000Z
+duration: ""
+week_number: 2
+credit:
+  - Jake Mayer
+  - Emma Shu
+featured: true
+location: Siebel CS 1404
+description: Come learn about the technology that runs the web, how it works,
+  and how to manipulate it!
+card_image:
+  background: devtools.png
+  alt: A simplified representation of browser devtools
+live_video_url: https://illinois.zoom.us/j/88259988323?pwd=pPsaodXzlaR88evk9AlCU79U5mqxB3.1
+tags:
+  - web
+  - intro
+  - javascript
+  - cookies
+  - devtools
+---
+## Summary
+
+Come learn about the technology that runs the web, how it works, and how to manipulate it! We'll cover the basics of HTML, CSS, and JavaScript, plus an intro to how HTTP servers actually transmit this data via requests and responses. You'll also learn about the devtools feature in most browsers, which allows you to observe the functions of websites.
diff --git a/_global/content/meetings/sp2024/2024-03-18/index.mdx b/_global/content/meetings/sp2024/2024-03-18/index.mdx
@@ -4,15 +4,15 @@ time_start: 2024-03-18T22:00:00.000Z
 duration: PT2H
 week_number: 9
 credit:
-  - Women in CyberSecurity
+  - WiCyS @ Illinois
   - SIGPwny
 featured: true
 location: Everitt Lab 1306
 tags:
   - ctf
   - social
 ---
-Join SIGPwny and Women in Cybersecurity (WiCyS) at our upcoming Cryptography CTF! This is a beginner-friendly CTF that will take place on Monday, March 18th from 5-7 PM in Everitt 1306. There will be pizza, snacks, and potential prizes to win! Teams may have up to 3 members.
+Join SIGPwny and Women in CyberSecurity (WiCyS @ Illinois) at our upcoming Cryptography CTF! This is a beginner-friendly CTF that will take place on Monday, March 18th from 5-7 PM in Everitt 1306. There will be pizza, snacks, and potential prizes to win! Teams may have up to 3 members.
 
 Prize Distributions:
 

diff --git a/_global/content/profiles/member/ian-klatzco/index.mdx b/_global/content/profiles/member/ian-klatzco/index.mdx
@@ -1,13 +1,16 @@
 ---
-name: "Ian Klatzco"
-profile_image: "./profile.jpg"
-handle: "ian5v"
-title: "Ex-President"
-role: "alum"
 period: "2019"
-bio: "security consultant"
-weight: 0
+name: Ian Klatzco
+profile_image: ./profile.jpg
+handle: ian5v
+bio: life should be respectful and fun
+pronouns: gamer
 links:
-  - {name: "twitter", url: "https://twitter.com/ian5v"}
-  - {name: "website", url: "https://klatz.co"}
----
+  - name: twitter
+    url: https://twitter.com/ian5v
+  - name: website
+    url: https://klatz.co
+role: alum
+title: Ex-President
+weight: -1
+---
diff --git a/_global/content/profiles/org/sandia/index.mdx b/_global/content/profiles/org/sandia/index.mdx
@@ -2,8 +2,10 @@
 name: Sandia National Laboratories
 profile_image: icon.jpg
 role: sponsor
+title: Tracer FIRE 2025 Sponsor
 handle: SandiaLabs
 weight: 5
 card_image:
   foreground: snl-logo.svg
+is_workshop_sponsor: true
 ---
diff --git a/_global/content/profiles/org/wicys/index.mdx b/_global/content/profiles/org/wicys/index.mdx
@@ -1,8 +1,8 @@
 ---
-name: "Women in CyberSecurity"
+name: "WiCyS @ Illinois"
 profile_image: "./wicys.png"
 role: org
-title: "University of Illinois"
+title: "Women in CyberSecurity"
 handle: "wicys.illinois"
 weight: 0
 links:

diff --git a/sigpwny.com/public/Fall_CTF_2024_Sponsorship.pdf b/sigpwny.com/public/Fall_CTF_2024_Sponsorship.pdf
diff --git a/sigpwny.com/public/SIGPwny_Year_Round_Sponsorship_2023.pdf b/sigpwny.com/public/SIGPwny_Year_Round_Sponsorship_2023.pdf
diff --git a/sigpwny.com/public/sigpwny_yearly_sponsorship.pdf b/sigpwny.com/public/sigpwny_yearly_sponsorship.pdf
diff --git a/sigpwny.com/src/pages/index.astro b/sigpwny.com/src/pages/index.astro
@@ -24,7 +24,7 @@ import imgHome6 from '@/assets/home-promo/home-6.jpg';
         <p>
           {consts.description}
         </p>
-        <Link href="/#about" class="btn-primary">Learn about us</Link>
+        <Link href="/join" class="btn-primary">Join Us</Link>
       </div>
       <div class="flex lg:order-1 gap-8 pr-20 sm:columns-2 sm:p-0 md:pr-20 lg:columns-3 lg:gap-12 lg:p-0 lg:pb-2 xl:gap-16 2xl:gap-16 2xl:px-28">
         <span class="skeleton-shimmer h-fit grow-0 flex-row rounded-xl pointer-events-none select-none border-surface-100 border-2 mt-6 w-full flex">

diff --git a/sigpwny.com/src/pages/sponsors.astro b/sigpwny.com/src/pages/sponsors.astro
@@ -8,13 +8,13 @@ import { getProfilesFromNames } from '@/utils/profiles';
 
 const activeSponsors = (await getCollection('profiles', ({ data }) => data.is_workshop_sponsor)).map((x) => x.data);
 const eventsData = await getCollection('events');
-const events = await Promise.all(eventsData.map(async (x) => (
+const events = (await Promise.all(eventsData.map(async (x) => (
   {
     ...x.data,
     // Add sponsor_profiles, which is a list of resolved profiles from names in sponsors
     sponsors_profiles: x.data.sponsors ? (await getProfilesFromNames(x.data.sponsors)) : undefined,
   }
-)));
+)))).sort((a, b) => dayjs(b.time_start).diff(dayjs(a.time_start)));
 // Filter for events that:
 // - occured in the past year or in the future
 // - are the most recent event in each event series
@@ -30,7 +30,7 @@ const recentEvents = events.filter((event) => {
   ) return false;
   uniqSeries.add(event.series);
   return true;
-}).sort((a, b) => dayjs(b.time_start).diff(dayjs(a.time_start)));
+});
 ---
 <Layout
   title="Sponsors"

diff --git a/sigpwny.com/src/redirects.json b/sigpwny.com/src/redirects.json
@@ -137,6 +137,6 @@
   },
   "/year": {
     "status": 302,
-    "destination": "/SIGPwny_Year_Round_Sponsorship_2023.pdf"
+    "destination": "/sigpwny_yearly_sponsorship.pdf"
   }
 }