Index meetings by semester (#272)

* feat: display meeting indexes by semester fix: improve calendar event handling and metadata refactor: update button class names and styles across multiple components * fix: Make legacy redirects more specific to allow meetings by semester index pages to load * feat: add MeetingTypeBadge component and integrate it into MeetingRow; consolidate `/meetings/all/` generation, * feat: overhaul meeting rows
sigpwny · Jan 7, 2025 · 81cd684 · 81cd684
1 parent 9e2c83a
commit 81cd684
Show file tree

Hide file tree

Showing 38 changed files with 1,028 additions and 367 deletions.
diff --git a/_global/components/Icons/fluentui.tsx b/_global/components/Icons/fluentui.tsx
@@ -84,18 +84,48 @@ export const ChevronCircleRightRegular = (props: TSVGElementProps) => (
   </SvgWrapper>
 );
 
+export const ChevronLeftFilled = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M10.2603 3.20041C10.5639 3.48226 10.5814 3.95681 10.2996 4.26034L6.77348 8L10.2996 11.7397C10.5814 12.0432 10.5639 12.5177 10.2603 12.7996C9.9568 13.0815 9.48226 13.0639 9.2004 12.7603L5.2004 8.51034C4.9332 8.22258 4.9332 7.77743 5.2004 7.48966L9.20041 3.23966C9.48226 2.93613 9.95681 2.91856 10.2603 3.20041Z"/>
+  </SvgWrapper>
+);
+
+export const ChevronLeftRegular = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M10.3536 3.14645C10.5488 3.34171 10.5488 3.65829 10.3536 3.85355L6.20711 8L10.3536 12.1464C10.5488 12.3417 10.5488 12.6583 10.3536 12.8536C10.1583 13.0488 9.84171 13.0488 9.64645 12.8536L5.14645 8.35355C4.95118 8.15829 4.95118 7.84171 5.14645 7.64645L9.64645 3.14645C9.84171 2.95118 10.1583 2.95118 10.3536 3.14645Z"/>
+  </SvgWrapper>
+);
+
+export const ChevronRightFilled = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M5.73966 3.20041C5.43613 3.48226 5.41856 3.95681 5.70041 4.26034L9.22652 8L5.70041 11.7397C5.41856 12.0432 5.43613 12.5177 5.73967 12.7996C6.0432 13.0815 6.51775 13.0639 6.7996 12.7603L10.7996 8.51034C11.0668 8.22258 11.0668 7.77743 10.7996 7.48966L6.7996 3.23966C6.51775 2.93613 6.0432 2.91856 5.73966 3.20041Z"/>
+  </SvgWrapper>
+);
+
 export const ChevronRightRegular = (props: TSVGElementProps) => (
   <SvgWrapper {...props}>
     <path d="M5.64645 3.14645C5.45118 3.34171 5.45118 3.65829 5.64645 3.85355L9.79289 8L5.64645 12.1464C5.45118 12.3417 5.45118 12.6583 5.64645 12.8536C5.84171 13.0488 6.15829 13.0488 6.35355 12.8536L10.8536 8.35355C11.0488 8.15829 11.0488 7.84171 10.8536 7.64645L6.35355 3.14645C6.15829 2.95118 5.84171 2.95118 5.64645 3.14645Z" />
   </SvgWrapper>
 );
 
+export const ChevronUpDownFilled = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M4.21967 6.53033C4.51256 6.82322 4.98744 6.82322 5.28033 6.53033L8 3.81066L10.7197 6.53033C11.0126 6.82322 11.4874 6.82322 11.7803 6.53033C12.0732 6.23744 12.0732 5.76256 11.7803 5.46967L8.53033 2.21967C8.23744 1.92678 7.76256 1.92678 7.46967 2.21967L4.21967 5.46967C3.92678 5.76256 3.92678 6.23744 4.21967 6.53033ZM4.21967 9.46967C4.51256 9.17678 4.98744 9.17678 5.28033 9.46967L8 12.1893L10.7197 9.46967C11.0126 9.17678 11.4874 9.17678 11.7803 9.46967C12.0732 9.76256 12.0732 10.2374 11.7803 10.5303L8.53033 13.7803C8.23744 14.0732 7.76256 14.0732 7.46967 13.7803L4.21967 10.5303C3.92678 10.2374 3.92678 9.76256 4.21967 9.46967Z"/>
+  </SvgWrapper>
+);
+
 export const ClockRegular = (props: TSVGElementProps) => (
   <SvgWrapper {...props}>
     <path d="M8 2C11.3137 2 14 4.68629 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8C2 4.68629 4.68629 2 8 2ZM8 3C5.23858 3 3 5.23858 3 8C3 10.7614 5.23858 13 8 13C10.7614 13 13 10.7614 13 8C13 5.23858 10.7614 3 8 3ZM7.50153 5C7.74699 5 7.95114 5.17688 7.99347 5.41012L8.00153 5.5V8H9.5C9.77614 8 10 8.22386 10 8.5C10 8.74546 9.82312 8.94961 9.58988 8.99194L9.5 9H7.50153C7.25607 9 7.05192 8.82312 7.00958 8.58988L7.00153 8.5V5.5C7.00153 5.22386 7.22538 5 7.50153 5Z" />
   </SvgWrapper>
 );
 
+export const DocumentPdfFilled = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M4.49976 9.00299C4.22361 9.00299 3.99976 9.22685 3.99976 9.50299V11.503C3.99976 11.7791 4.22361 12.003 4.49976 12.003C4.7759 12.003 4.99976 11.7791 4.99976 11.503V11.3366H5.33296C5.97736 11.3366 6.49976 10.8142 6.49976 10.1698C6.49976 9.52538 5.97736 9.00299 5.33296 9.00299H4.49976ZM5.33296 10.3366H4.99976V10.003H5.33296C5.42508 10.003 5.49976 10.0777 5.49976 10.1698C5.49976 10.2619 5.42508 10.3366 5.33296 10.3366ZM10.0005 9.50236C10.0008 9.22646 10.2246 9.00299 10.5005 9.00299H11.4988C11.7749 9.00299 11.9988 9.22685 11.9988 9.50299C11.9988 9.77913 11.7749 10.003 11.4988 10.003H10.9998L10.9994 10.3375H11.4988C11.7749 10.3375 11.9988 10.5613 11.9988 10.8375C11.9988 11.1136 11.7749 11.3375 11.4988 11.3375H11L11.0005 11.5017C11.0012 11.7779 10.7779 12.0023 10.5017 12.003C10.2256 12.0037 10.0012 11.7804 10.0005 11.5043L9.99878 10.8368L10.0005 9.50236ZM7.49829 9.00299C7.22215 9.00299 6.99829 9.22685 6.99829 9.50299V11.503C6.99829 11.7791 7.22215 12.003 7.49829 12.003H7.99974C8.82816 12.003 9.49973 11.3314 9.49974 10.503C9.49974 9.67457 8.82817 9.00299 7.99974 9.00299H7.49829ZM7.99829 11.003V10.003H7.99974C8.27588 10.003 8.49974 10.2269 8.49974 10.503C8.49974 10.7791 8.27588 11.003 7.99974 11.003H7.99829ZM9 2.00195H4.5C3.67157 2.00195 3 2.67353 3 3.50195V7.08413C2.4174 7.29005 2 7.84567 2 8.49878V12.502C2 13.3304 2.67157 14.002 3.5 14.002H12.5C13.3284 14.002 14 13.3304 14 12.502V8.49878C14 7.84567 13.5826 7.29005 13 7.08413V5.99994H10.5C9.67157 5.99994 9 5.32837 9 4.49994V2.00195ZM3.5 7.99878H12.5C12.7761 7.99878 13 8.22264 13 8.49878V12.502C13 12.7781 12.7761 13.002 12.5 13.002H3.5C3.22386 13.002 3 12.7781 3 12.502V8.49878C3 8.22264 3.22386 7.99878 3.5 7.99878ZM12.7056 4.99994H10.5C10.2239 4.99994 10 4.77608 10 4.49994V2.29746L12.7056 4.99994Z"/>
+  </SvgWrapper>
+);
+
 export const FlagRegular = (props: TSVGElementProps) => (
   <SvgWrapper {...props}>
     <path d="M4 9V3H12.0284L10.0931 5.70938C9.96896 5.88323 9.96896 6.11677 10.0931 6.29062L12.0284 9H4ZM4 10H13C13.4067 10 13.6432 9.54032 13.4069 9.20938L11.1145 6L13.4069 2.79062C13.6432 2.45968 13.4067 2 13 2H3.5C3.22386 2 3 2.22386 3 2.5V13.5C3 13.7761 3.22386 14 3.5 14C3.77614 14 4 13.7761 4 13.5V10Z"/>
@@ -114,6 +144,18 @@ export const HatGraduationRegular = (props: TSVGElementProps) => (
   </SvgWrapper>
 );
 
+export const InfoFilled = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M8 1C11.866 1 15 4.13401 15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8C1 4.13401 4.13401 1 8 1ZM8.00001 6.24907C8.41369 6.24907 8.74905 5.91371 8.74905 5.50003C8.74905 5.08635 8.41369 4.751 8.00001 4.751C7.58633 4.751 7.25098 5.08635 7.25098 5.50003C7.25098 5.91371 7.58633 6.24907 8.00001 6.24907ZM8.5 7.5C8.5 7.22386 8.27614 7 8 7C7.72386 7 7.5 7.22386 7.5 7.5V10.5C7.5 10.7761 7.72386 11 8 11C8.27614 11 8.5 10.7761 8.5 10.5V7.5Z"/>
+  </SvgWrapper>
+);
+
+export const InfoRegular = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M8.49902 7.49998C8.49902 7.22384 8.27517 6.99998 7.99902 6.99998C7.72288 6.99998 7.49902 7.22384 7.49902 7.49998V10.5C7.49902 10.7761 7.72288 11 7.99902 11C8.27517 11 8.49902 10.7761 8.49902 10.5V7.49998ZM8.74807 5.50001C8.74807 5.91369 8.41271 6.24905 7.99903 6.24905C7.58535 6.24905 7.25 5.91369 7.25 5.50001C7.25 5.08633 7.58535 4.75098 7.99903 4.75098C8.41271 4.75098 8.74807 5.08633 8.74807 5.50001ZM8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1ZM2 8C2 4.68629 4.68629 2 8 2C11.3137 2 14 4.68629 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8Z"/>
+  </SvgWrapper>
+);
+
 export const LinkRegular = (props: TSVGElementProps) => (
   <SvgWrapper {...props}>
     <path d="M9.49999 4H10.5C12.433 4 14 5.567 14 7.5C14 9.36856 12.5357 10.8951 10.6941 10.9948L10.5023 11L9.5023 11.0046C9.22616 11.0059 9.00127 10.783 8.99999 10.5069C8.99888 10.2614 9.17481 10.0565 9.40787 10.0131L9.4977 10.0046L10.5 10C11.8807 10 13 8.88071 13 7.5C13 6.17452 11.9685 5.08996 10.6644 5.00532L10.5 5H9.49999C9.22386 5 8.99999 4.77614 8.99999 4.5C8.99999 4.25454 9.17687 4.05039 9.41012 4.00806L9.49999 4H10.5H9.49999ZM5.5 4H6.5C6.77614 4 7 4.22386 7 4.5C7 4.74546 6.82312 4.94961 6.58988 4.99194L6.5 5H5.5C4.11929 5 3 6.11929 3 7.5C3 8.82548 4.03154 9.91004 5.33562 9.99468L5.5 10H6.5C6.77614 10 7 10.2239 7 10.5C7 10.7455 6.82312 10.9496 6.58988 10.9919L6.5 11H5.5C3.567 11 2 9.433 2 7.5C2 5.63144 3.46428 4.10487 5.30796 4.00518L5.5 4H6.5H5.5ZM5.50023 7L10.5002 7.0023C10.7764 7.00242 11.0001 7.22638 11 7.50252C10.9999 7.74798 10.8229 7.95205 10.5897 7.99428L10.4998 8.0023L5.49977 8C5.22363 7.99987 4.99987 7.77591 5 7.49977C5.00011 7.25431 5.17708 7.05024 5.41035 7.00801L5.50023 7Z" />
@@ -145,6 +187,18 @@ export const OpenRegular = (props: TSVGElementProps) => (
   </SvgWrapper>
 );
 
+export const PlayCircleFilled = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M2 8C2 4.68629 4.68629 2 8 2C11.3137 2 14 4.68629 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8ZM10.5 8C10.5 7.81993 10.4032 7.65377 10.2465 7.56499L7.61975 6.07654C7.11977 5.79323 6.5 6.1544 6.5 6.72907V9.27099C6.5 9.84566 7.11978 10.2068 7.61976 9.92351L10.2465 8.43502C10.4032 8.34624 10.5 8.18008 10.5 8Z"/>
+  </SvgWrapper>
+);
+
+export const PlayFilled = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M6.23541 2.1919C5.2355 1.62944 4 2.352 4 3.49925V12.4995C4 13.6468 5.23546 14.3693 6.23537 13.8069L14.2356 9.30692C15.2551 8.73348 15.2551 7.26566 14.2357 6.69219L6.23541 2.1919Z"/>
+  </SvgWrapper>
+);
+
 export const ShieldFilled = (props: TSVGElementProps) => (
   <SvgWrapper {...props}>
     <path d="M7.64728 2.14638C7.84268 1.95105 8.15946 1.95123 8.35464 2.14678C9.5947 3.38913 10.9689 4 12.5 4C12.7761 4 13 4.22386 13 4.5V7.50126C13 10.7196 11.3587 12.9075 8.15811 13.9743C8.05548 14.0086 7.94452 14.0086 7.84189 13.9743C4.64126 12.9075 3 10.7196 3 7.50126V4.5C3 4.22386 3.22386 4 3.5 4C5.02923 4 6.40416 3.38902 7.64728 2.14638Z" />
@@ -167,4 +221,16 @@ export const ShieldKeyholeRegular = (props: TSVGElementProps) => (
   <SvgWrapper {...props}>
     <path d="M9.25 7.25C9.25 7.76258 8.94148 8.2031 8.5 8.39599V9.50358C8.5 9.77973 8.27614 10.0036 8 10.0036C7.72386 10.0036 7.5 9.77973 7.5 9.50358V8.39599C7.05852 8.2031 6.75 7.76258 6.75 7.25C6.75 6.55964 7.30964 6 8 6C8.69036 6 9.25 6.55964 9.25 7.25ZM7.14309 2.04175C6.78097 2.2883 6.21583 2.61563 5.42482 2.91681C4.6399 3.21566 3.90375 3.36204 3.36353 3.43333C3.09405 3.46889 2.87509 3.48554 2.72547 3.49331C2.6507 3.49719 2.5934 3.49885 2.55593 3.49954L2.50489 3.50003C2.37157 3.49872 2.24323 3.55072 2.14842 3.64449C2.05344 3.73841 2 3.86643 2 4V6.75508C2 9.40779 3.4013 11.8632 5.68525 13.2124L7.74707 14.4305C7.90399 14.5232 8.09891 14.5232 8.2558 14.4304L10.3162 13.2126C12.5993 11.8632 14 9.40823 14 6.7561V4C14 3.86598 13.9462 3.73757 13.8507 3.64358C13.7552 3.54964 13.626 3.49794 13.4921 3.50007L13.4421 3.49981C13.4048 3.49928 13.3478 3.49787 13.2735 3.49426C13.1246 3.48705 12.9066 3.47109 12.6384 3.43602C12.1006 3.36573 11.3679 3.21959 10.5869 2.91771C9.79733 2.61248 9.22913 2.28442 8.86335 2.03774C8.68039 1.91435 8.54795 1.81124 8.46371 1.74141C8.4256 1.70981 8.38768 1.6777 8.35191 1.64343C8.2576 1.55073 8.13037 1.49913 7.99807 1.50001C7.86585 1.50089 7.73916 1.55434 7.64611 1.64819L7.53744 1.74536C7.45475 1.81517 7.32423 1.91842 7.14309 2.04175ZM3 6.75508V4.47725C3.14066 4.46608 3.30705 4.44945 3.49436 4.42473C4.09055 4.34605 4.90577 4.18447 5.78065 3.85136C6.64943 3.52057 7.28362 3.15585 7.70588 2.86835C7.82102 2.78996 7.92034 2.71735 8.00434 2.65277C8.08878 2.71677 8.18861 2.78886 8.30421 2.86682C8.72757 3.15233 9.362 3.51631 10.2264 3.85045C11.0994 4.18794 11.9134 4.34976 12.5088 4.42759C12.6947 4.45189 12.86 4.46809 13 4.47888V6.7561C13 9.05461 11.7861 11.1822 9.80736 12.3518L8.00133 13.4192L6.19388 12.3515C4.21446 11.1821 3 9.0541 3 6.75508Z"/>
   </SvgWrapper>
+);
+
+export const VideoClipFilled = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M2 5.5C2 4.11929 3.11929 3 4.5 3H11.5C12.8807 3 14 4.11929 14 5.5V10.5C14 11.8807 12.8807 13 11.5 13H4.5C3.11929 13 2 11.8807 2 10.5V5.5ZM6.5 5.82056V10.1794C6.5 10.4293 6.77363 10.5828 6.98686 10.4525L10.246 8.46076C10.5906 8.2502 10.5906 7.74977 10.246 7.53921L6.98686 5.54751C6.77363 5.4172 6.5 5.57067 6.5 5.82056Z"/>
+  </SvgWrapper>
+);
+
+export const VideoFilled = (props: TSVGElementProps) => (
+  <SvgWrapper {...props}>
+    <path d="M1 5.5C1 4.11929 2.11929 3 3.5 3H7.5C8.88071 3 10 4.11929 10 5.5V10.5C10 11.8807 8.88071 13 7.5 13H3.5C2.11929 13 1 11.8807 1 10.5V5.5ZM13.0355 11.7782L10.8999 10.3036C10.9129 10.2115 10.9197 10.1173 10.9197 10.0215V5.98047C10.9197 5.88463 10.9129 5.79037 10.8999 5.69813L13.0355 4.22353C13.8647 3.65101 14.9958 4.24453 14.9958 5.25216V10.7496C14.9958 11.7572 13.8647 12.3507 13.0355 11.7782Z"/>
+  </SvgWrapper>
 );
diff --git a/_global/configs.ts b/_global/configs.ts
@@ -21,9 +21,9 @@ const sigpwnyConfig : ISiteConfig = {
     { name: `Publications`, url: `/publications/`},
     // { name: `Events`, url: `/events/` },
     { name: `Sponsors`, url: `/sponsors/` },
+    { name: `Join`, url: `/join/` },
   ],
   navCallToActionLinks: [
-    { name: `Join`, url: `/join/` }
   ],
   socialLinks: [
     { name: `Discord`, url: `https://discord.gg/cWcZ6a9` },

diff --git a/_global/content/events/fallctf/2023/index.mdx b/_global/content/events/fallctf/2023/index.mdx
@@ -32,7 +32,7 @@ links:
 ## Registration
 Registration for the CTF competition platform is now available!
 
-<a href="https://fallctf.sigpwny.com/" class="btn-primary mb-2">Register on CTFd</a>
+<a href="https://fallctf.sigpwny.com/" class="button btn-primary mb-2">Register on CTFd</a>
 
 <p class="mt-4">
 Registration via Google Forms for a free shirt and electronic badge has closed. If you previously registered beforehand, please make sure to bring your iCard to the event (or show your ID on the Illinois app). If you did not register on Google Forms, we will be handing out any remaining shirts later in the event. We will also be raffling off extra electronic badges.

diff --git a/_global/content/meetings/fa2023/general/2023-11-02/index.mdx b/_global/content/meetings/fa2023/general/2023-11-02/index.mdx
@@ -23,4 +23,4 @@ We are excited to have both our sponsor CrowdStrike and UIUC's Privacy and Cyber
 
 Pizza will be provided!
 
-<a href="https://falcon.events/landing#H5M4" class="btn-primary">Live Scavenger Hunt</a>
+<a href="https://falcon.events/landing#H5M4" class="button btn-primary">Live Scavenger Hunt</a>
diff --git a/_global/content/meetings/fa2024/purple/2024-10-15/index.mdx b/_global/content/meetings/fa2024/purple/2024-10-15/index.mdx
@@ -1,5 +1,5 @@
 ---
-title: Active Directory 1
+title: Active Directory I
 type: purple
 time_start: 2024-10-16T00:00:00.000Z
 duration: ""

diff --git a/_global/content/meetings/fa2024/purple/2024-11-05/index.mdx b/_global/content/meetings/fa2024/purple/2024-11-05/index.mdx
@@ -1,5 +1,5 @@
 ---
-title: Active Directory 3
+title: Active Directory III
 type: purple
 time_start: 2024-11-05T19:00:00-06:00
 duration: ""

diff --git a/_global/content/meetings/sp2025/embedded/2024-01-15/index.mdx b/_global/content/meetings/sp2025/embedded/2024-01-15/index.mdx
@@ -1,5 +1,5 @@
 ---
-title: eCTF Kickoff
+title: eCTF 2025 Kickoff
 type: embedded
 time_start: 2025-01-15T11:00:00-06:00
 duration: PT2H

diff --git a/_global/utils/meetingMetadata.ts b/_global/utils/meetingMetadata.ts
@@ -1,32 +1,43 @@
 export const meetingMetatypes = [
-    'general',
-    'ctf',
-    'purple',
-    'embedded',
-  ];
-
+  'general',
+  'seminar',
+  'ctf',
+  'embedded',
+  'purple',
+];
+
 export type MeetingMetatype = typeof meetingMetatypes[number];
 
 export interface MeetingMetadata {
-name: string;
-shortName: string;
-}
+  name: string;
+  shortName: string;
+  description?: string;
+};
 
 export const meetingMetadata: Record<MeetingMetatype, MeetingMetadata> = {
-    'general': {
-        name: 'General',
-        shortName: 'General',
-    },
-    'ctf': {
-        name: 'CTF Team',
-        shortName: 'CTF',
-    },
-    'purple': {
-        name: 'Purple Team',
-        shortName: 'Purple',
-    },
-    'embedded': {
-        name: 'Embedded Team',
-        shortName: 'Embedded',
-    },
+  'general': {
+    name: 'General Meetings',
+    shortName: 'General',
+    description: 'Attend our weekly general meetings to learn the fundamental of cybersecurity.',
+  },
+  'seminar': {
+    name: 'Seminar Meetings',
+    shortName: 'Seminar',
+    description: 'Discuss interesting, novel, and advanced research topics in security.',
+  },
+  'ctf': {
+    name: 'CTF Team',
+    shortName: 'CTF',
+    description: 'Compete in Capture-the-Flag events to practice your cybersecurity skills.',
+  },
+  'embedded': {
+    name: 'Embedded Team',
+    shortName: 'Embedded',
+    description: 'Build secure embedded systems and learn about hardware hacking.',
+  },
+  'purple': {
+    name: 'Purple Team',
+    shortName: 'Purple',
+    description: 'Learn red-teaming and blue-teaming skills to secure systems and networks.',
+  },
 };
diff --git a/fallctf.com/src/pages/2024.astro b/fallctf.com/src/pages/2024.astro
@@ -82,7 +82,7 @@ const event = {
         {event.links.map((link) => (
           <Link
             href={link.url}
-            class="btn-primary font-bold border-2 border-surface-250"
+            class="button btn-primary font-bold border-2 border-surface-250"
           >
             {link.name}
           </Link>

diff --git a/fallctf.com/src/pages/[...slug].astro b/fallctf.com/src/pages/[...slug].astro
@@ -54,7 +54,7 @@ const flavor = 'Fall CTF is a beginner-friendly CTF competition for UIUC student
         {event.links.map((link) => (
           <Link
             href={link.url}
-            class="btn-primary font-bold border-2 border-surface-250"
+            class="button btn-primary font-bold border-2 border-surface-250"
           >
             {link.name}
           </Link>

diff --git a/fallctf.com/src/styles/fallctf.css b/fallctf.com/src/styles/fallctf.css
@@ -67,12 +67,11 @@ h3 {
 .panel-p-0 {
   @apply bg-surface-100 rounded-xl;
 }
-.btn-primary {
-  @apply bg-primary text-surface-000 px-3 py-1 rounded-full cursor-pointer;
+.button {
+  @apply border-0 rounded-md px-3 py-1 cursor-pointer select-none;
 }
-.btn-primary:hover {
-  background-color: rgb(var(--rgb-secondary));
-  color: rgb(var(--rgb-surface-000));
+.btn-primary {
+  @apply bg-primary hover:bg-secondary text-surface-000 hover:text-surface-000;
 }
 .button {
   @apply flex flex-row items-center gap-1 px-3 py-1 cursor-pointer rounded-md;

diff --git a/sigpwny.com/public/_redirects b/sigpwny.com/public/_redirects
@@ -1,20 +1,20 @@
 # Fix redirects for old meeting URLs
-/meetings/fa2017/* /meetings/general/:splat 302
-/meetings/fa2018/* /meetings/general/:splat 302
-/meetings/fa2019/* /meetings/general/:splat 302
-/meetings/fa2020/* /meetings/general/:splat 302
-/meetings/fa2021/* /meetings/general/:splat 302
-/meetings/fa2022/* /meetings/general/:splat 302
-/meetings/fa2023/* /meetings/general/:splat 302
-/meetings/fa2024/* /meetings/general/:splat 302
-/meetings/sp2017/* /meetings/general/:splat 302
-/meetings/sp2018/* /meetings/general/:splat 302
-/meetings/sp2019/* /meetings/general/:splat 302
-/meetings/sp2020/* /meetings/general/:splat 302
-/meetings/sp2021/* /meetings/general/:splat 302
-/meetings/sp2022/* /meetings/general/:splat 302
-/meetings/sp2023/* /meetings/general/:splat 302
-/meetings/sp2024/* /meetings/general/:splat 302
+/meetings/fa2017/2017* /meetings/general/2017:splat 302
+/meetings/fa2018/2018* /meetings/general/2018:splat 302
+/meetings/fa2019/2019* /meetings/general/2019:splat 302
+/meetings/fa2020/2020* /meetings/general/2020:splat 302
+/meetings/fa2021/2021* /meetings/general/2021:splat 302
+/meetings/fa2022/2022* /meetings/general/2022:splat 302
+/meetings/fa2023/2023* /meetings/general/2023:splat 302
+/meetings/fa2024/2024* /meetings/general/2024:splat 302
+/meetings/sp2017/2017* /meetings/general/2017:splat 302
+/meetings/sp2018/2018* /meetings/general/2018:splat 302
+/meetings/sp2019/2019* /meetings/general/2019:splat 302
+/meetings/sp2020/2020* /meetings/general/2020:splat 302
+/meetings/sp2021/2021* /meetings/general/2021:splat 302
+/meetings/sp2022/2022* /meetings/general/2022:splat 302
+/meetings/sp2023/2023* /meetings/general/2023:splat 302
+/meetings/sp2024/2024* /meetings/general/2024:splat 302
 # Fix redirects for old calendar URLs
 /calendar/full.ics /calendar/all/generic.ics 301
 /calendar/full/apple.ics /calendar/all/apple.ics 301
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,4 +23,4 @@ We are excited to have both our sponsor CrowdStrike and UIUC's Privacy and Cyber

		Pizza will be provided!

		<a href="https://falcon.events/landing#H5M4" class="btn-primary">Live Scavenger Hunt</a>
		<a href="https://falcon.events/landing#H5M4" class="button btn-primary">Live Scavenger Hunt</a>