Merge branch 'main' into main

.github/workflows/vercel-merge.yml

@@ -0,0 +1,18 @@
+name: Deploy to vercel on merge
+on:
+  push:
+    branches:
+      - main
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: amondnet/vercel-action@v20
+        with:
+          vercel-token: ${{ secrets.VERCEL_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          vercel-args: '--prod'
+          vercel-org-id: ${{ secrets.ORG_ID}}
+          vercel-project-id: ${{ secrets.PROJECT_ID}}
+          github-comment: false

.github/workflows/vercel-pull-request.yml

@@ -0,0 +1,20 @@
+name: Create vercel preview URL on pull request
+on:
+  pull_request:
+    branches:
+      - main
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: amondnet/vercel-action@v20
+        id: vercel-deploy
+        with:
+          vercel-token: ${{ secrets.VERCEL_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          vercel-org-id: ${{ secrets.ORG_ID}}
+          vercel-project-id: ${{ secrets.PROJECT_ID}}
+      - name: preview-url
+        run: |
+          echo ${{ steps.vercel-deploy.outputs.preview-url }}

app/(home)/Header.tsx

@@ -1,4 +1,3 @@
-import Timer from '@/app/(home)/Timer';
 import { BsChevronCompactDown } from 'react-icons/bs';
 import { getConfig } from '@/util/config';
 
@@ -9,25 +8,17 @@ export default async function Header() {
     return (
         <header className="container flex flex-col items-center justify-center h-screen">
             <img
-                src="/assets/logo-uwu.png"
-                className="-mb-7 max-h-96"
-            />
-            <Timer
-                startTime={config.data.startTime}
-                endTime={config.data.endTime}
+                src="/assets/logo-internal.png"
+                className="max-h-96"
             />
             <p className="mb-2 max-w-3xl text-center text-pretty">
-                b01lers CTF is the public competitive CTF hosted by the b01lers CTF team at Purdue University.
-                Join our discord at <a href="https://discord.gg/tBMqujE" target="_blank" rel="noopener noreferrer" className="text-theme-bright hover:underline">discord.gg/tBMqujE</a>{' '}
-                and look out for further info soon!
+                Welcome to b01lers internal CTF! b01lers internal CTF is both a training camp to sharpen your CTF
+                skills, and a look at past b01lers CTF challenges. Check out the{' '}
+                <a href="https://discord.gg/tBMqujE" target="_blank" rel="noopener noreferrer" className="text-theme-bright hover:underline">Discord</a>{' '}
+                and enjoy!
             </p>
-            <div className="flex divide-x divide-primary text-sm">
-                <a href="#rules" className="px-4 py-2 uppercase hover:underline">Rules</a>
-                <a href="#prizes" className="px-4 py-2 uppercase hover:underline">Prizes</a>
-                <a href="#sponsors" className="px-4 py-2 uppercase hover:underline">Sponsors</a>
-            </div>
 
-            <a href="#rules" className="text-inherit text-4xl mt-6 sm:mt-12 sm:mb-8 text-primary">
+            <a href="#rules" className="text-inherit text-4xl mt-6 sm:mb-8 text-primary">
                 <BsChevronCompactDown className="animate-bounce" />
                 <span className="sr-only">Jump to Rules</span>
             </a>

app/(home)/Rules.tsx

@@ -7,23 +7,11 @@ export default function Rules() {
             <SectionHeader id="rules">
                 Rules
             </SectionHeader>
-            <ol className="list-decimal list-outside pl-6 space-y-2 mb-16">
+            <ol className="list-decimal list-outside pl-6 space-y-2">
                 <li>
                     During the competition, each person may only be a part of one team total, and only members of a
                     given team may assist in solving a challenge for that team.
                 </li>
-                <li>
-                    Each team must have a valid email address that should serve as the point of contact.
-                </li>
-                <li>
-                    For the <strong>Open</strong> division: there is no limit on team size, and teams can be from
-                    anywhere.
-                </li>
-                <li>
-                    For the <strong>Purdue</strong> division: teams must be composed of current Purdue students to be
-                    eligible for prizes, and there is a maximum team size of 4. Sign up with a @purdue.edu email to
-                    gain access to the Purdue division.
-                </li>
                 <li>
                     Flags are of the format{' '}
                     <code className="bg-black/40 px-2 py-1 text-primary rounded">{'bctf{[ -~]+}'}</code>{' '}

app/(home)/page.tsx

@@ -1,7 +1,5 @@
 import Header from '@/app/(home)/Header';
-import Sponsors from '@/app/(home)/Sponsors';
 import Rules from '@/app/(home)/Rules';
-import Prizes from '@/app/(home)/Prizes';
 
 
 export default async function Home() {
@@ -12,11 +10,8 @@ export default async function Home() {
             <div className="bg-black/40 py-16 mb-12 backdrop-blur-sm border-t border-tertiary">
                 <div className="px-6 sm:container">
                     <Rules />
-                    <Prizes />
                 </div>
             </div>
-
-            <Sponsors />
         </main>
     )
 }

app/layout.tsx

@@ -21,10 +21,10 @@ const inter = Inter({ subsets: ['latin'] })
 
 export const metadata: Metadata = {
     title: {
-        absolute: 'b01lers CTF 2024',
-        template: '%s - b01lers CTF 2024'
+        absolute: 'b01lers internal CTF',
+        template: '%s - b01lers internal CTF'
     },
-    description: 'b01lers CTF is jeopardy-style CTF hosted by the b01lers CTF team at Purdue University.',
+    description: 'b01lers internal CTF is a training camp to sharpen your CTF skills, hosted by the b01lers CTF team at Purdue University.',
 }
 
 export default function RootLayout(props: { children: ReactNode }) {

app/login/page.tsx

@@ -10,7 +10,7 @@ export default function Login() {
     return (
         <div className="container pt-32 pb-24">
             <h1 className="text-2xl font-bold mb-8 text-center">
-                Log in to b01lers CTF
+                Log in to b01lers internal CTF
             </h1>
 
             <LoginContent />

app/profile/TeamInvite.tsx

@@ -5,7 +5,7 @@ import { BsChevronUp } from 'react-icons/bs';
 
 
 export default function TeamInvite(props: { token: string }) {
-    const url = `https://b01lersc.tf/login?token=${encodeURIComponent(props.token)}`;
+    const url = `https://internal.b01lersc.tf/login?token=${encodeURIComponent(props.token)}`;
 
     function copy() {
         void navigator.clipboard.writeText(url);

app/recover/RecoverContent.tsx

@@ -29,7 +29,7 @@ export default function RecoverContent() {
     return !recovered ? (
         <>
             <h1 className="text-2xl font-bold mb-8 text-center">
-                Recover your b01lers CTF account
+                Recover your b01lers internal CTF account
             </h1>
 
             <form

app/register/RegisterContent.tsx

@@ -33,7 +33,7 @@ export default function RegisterContent() {
     return !registered ? (
         <>
             <h1 className="text-2xl font-bold mb-6 text-center">
-                Register for b01lers CTF
+                Register for b01lers internal CTF
             </h1>
             <p className="text-center text-primary mb-8">
                 Please register one account per team.

components/CTFNotStarted.tsx

@@ -7,7 +7,7 @@ export default function CTFNotStarted() {
             <FaRegClock className="text-5xl" />
             <div>
                 <h1 className="font-semibold text-2xl">
-                    b01lers CTF has not started yet.
+                    b01lers internal CTF has not started yet.
                 </h1>
             </div>
         </div>