Merge branch 'lugvitc:main' into main

Author: MarvelMathesh

.github/workflows/deploy.yml

@@ -0,0 +1,50 @@
+name: Deploy to GitHub Pages
+
+on:
+  push:
+    branches:
+      - deployment
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '18'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build project
+        run: npm run build
+
+      - name: Upload artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: ./dist
+
+  deploy:
+    name: Deploy
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

package.json

@@ -2,11 +2,11 @@
   "name": "enigma",
   "private": true,
   "version": "0.0.0",
-  "homepage": "https://ppmpreetham.github.io/enigma25",
+  "homepage": ".",
   "type": "module",
   "scripts": {
     "predeploy": "npm run build",
-    "deploy": "gh-pages -d build",
+    "deploy": "gh-pages -d dist",
     "dev": "vite",
     "format": "prettier --write .",
     "build": "vite build",

src/App.css

@@ -12,11 +12,17 @@
 
 #root {
   max-width: 100%;
+  overflow-x: hidden;
   margin: 0 auto;
   padding: 0rem;
   text-align: center;
 }
 
+body {
+  position: relative
+}
+
+
 @font-face {
   font-family: 'Calcio';
   font-style: normal;

src/App.jsx

@@ -14,6 +14,7 @@ import Rules from './components/Rules'
 import CTFs from './questions/page'
 import PowerPage from './powerups/Page'
 import TeamPage from './components/team/TeamPage'
+import TeamCreation from './components/team/TeamCreation'
 
 // import ErtdfgcvbBGprivacy from "./components/ertdfgcvbprivacy";
 
@@ -62,6 +63,7 @@ function App() {
             <Route path="/challenges" element={<CTFs />} />
             <Route path="/powerups" element={<PowerPage />} />
             <Route path="/team" element={<TeamPage />} />
+            <Route path="/team-login" element={<TeamCreation />} />
 
             {/* <Route path="/privacy" element={<ErtdfgcvbBGprivacy />} /> */}
             <Route path="*" element={<PageNotFound />} />

src/Home.jsx

@@ -10,7 +10,8 @@ import Content from './components/content.jsx'
 import Lenis from 'lenis'
 import Speakers from './components/Speakers.jsx'
 import Rules from './components/Rules.jsx'
-
+import { Canvas } from '@react-three/fiber'
+import Prize from './components/Prize.jsx'
 function Home() {
   useEffect(() => {
     const lenis = new Lenis({
@@ -39,26 +40,26 @@ function Home() {
         <Hamburger className="fixed right-0" />
       </nav>
 
-      <video
-        src="/videos/0001-0301.mkv"
-        className="absolute left-0 top-0 h-full w-full object-cover mix-blend-screen"
-        loop
-        autoPlay
-        muted
-      ></video>
-      {/* <ErtdfgcvbBG className="top-0 z-0" /> */}
+        <div className="relative h-screen w-screen">
+        <video
+          src="/videos/0001-0301.mkv"
+          className="absolute left-0 top-0 h-full w-full object-cover mix-blend-screen"
+          loop
+          autoPlay
+          muted
+        ></video>
       <HeroSection className="mix-blend-difference" />
-      {/* <div className="h-screen">
+      </div>
+      {/*<div className="h-screen">
         <Canvas className='w-screen h-screen'>
           <Prize className='w-screen h-screen'/>
         </Canvas>
-      </div> */}
+      </div>*/}
       {/* <Content /> */}
 
       <Scene className="fixed top-0" />
       <Rules />
       {/* <Speakers /> */}
-
       <Footer />
     </div>
   )

src/components/HeroSection.jsx

@@ -103,71 +103,71 @@ const HeroSection = () => {
               preStyle="text-black md:text-[3em] mix mix-blend-difference bg-enigma-green pt-2 cursor-cell w-full"
             />
           </div>
-          <div className="flex w-full max-w-full flex-col flex-wrap align-middle">
+          <div className="flex w-full max-w-full flex-col flex-wrap py-0 align-middle">
             <div className="flex w-full flex-wrap justify-end gap-x-8">
               <AnimatedText
                 text="FIGHT"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
               <AnimatedText
                 text="TO"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
               <AnimatedText
                 text="SURVIVE"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
             </div>
             <div className="flex w-full flex-wrap justify-end gap-x-8">
               <AnimatedText
                 text="ALL'S"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
               <AnimatedText
                 text="FAIR"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
               <AnimatedText
                 text="IN"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
               <AnimatedText
                 text="LOVE"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
               <AnimatedText
                 text="AND"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
               <AnimatedText
                 text="WAR"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
             </div>
             <div className="flex w-full flex-wrap justify-end gap-x-8">
               <AnimatedText
                 text="THIS"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
               <AnimatedText
                 text="IS"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
               <AnimatedText
                 text="WAR"
                 className="text-[0.6em] md:text-[1em]"
-                preStyle="text-black mix mix-blend-difference bg-enigma-green pt-2  px-3 cursor-cell"
+                preStyle="text-black mix mix-blend-difference bg-enigma-green px-3 cursor-cell"
               />
             </div>
           </div>

src/components/Rules.jsx

@@ -44,6 +44,36 @@ function Rules() {
               preStyle="font-neuebit uppercase text-6xl md:text-8xl lg:9xl text-yellow-500 z-50 cursor-pointer text-left"
             />
           </div>
+          <div className="mb-5 flex w-full flex-row flex-wrap gap-5 uppercase">
+            <AnimatedText
+              text="Web"
+              className="border border-white px-4 py-2 text-2xl text-enigma-green md:text-4xl"
+            />
+            <AnimatedText
+              text="Crypto"
+              className="border border-white px-4 py-2 text-2xl text-enigma-green md:text-4xl"
+            />
+            <AnimatedText
+              text="OSINT"
+              className="border border-white px-4 py-2 text-2xl text-enigma-green md:text-4xl"
+            />
+            <AnimatedText
+              text="Binary"
+              className="border border-white px-4 py-2 text-2xl text-enigma-green md:text-4xl"
+            />
+            <AnimatedText
+              text="Reverse Engineering"
+              className="border border-white px-4 py-2 text-2xl text-enigma-green md:text-4xl"
+            />
+            <AnimatedText
+              text="Forensics"
+              className="border border-white px-4 py-2 text-2xl text-enigma-green md:text-4xl"
+            />
+            <AnimatedText
+              text="Misc"
+              className="border border-white px-4 py-2 text-2xl text-enigma-green md:text-4xl"
+            />
+          </div>
           <div className="space-y-12">
             <div className="grid gap-6 md:grid-cols-2" ref={container}>
               <div className="border-enigmtext-enigma-green flex flex-col border p-6 transition-colors hover:border-opacity-75">

src/components/footer.jsx

@@ -40,16 +40,6 @@ export default function Footer() {
             <AnimatedText text="Socials" />
           </h3>
           <ul>
-            <li>
-              <a
-                className="text-gray-300 no-underline hover:text-green-500 hover:underline"
-                href="https://x.com/lugvitc"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                <AnimatedText text="Twitter" />
-              </a>
-            </li>
             <li>
               <a
                 className="text-gray-300 no-underline hover:text-green-500 hover:underline"

src/components/join.jsx

@@ -17,18 +17,18 @@ export default function Join({ className }) {
       <img
         src={JoinImg}
         alt="JoinImg"
-        className="fixed bottom-4 right-0 m-6 flex h-32 items-center justify-center rounded-none px-6 py-4 text-right"
+        className="fixed bottom-4 right-2 m-6 flex h-32 items-center justify-center rounded-none px-6 py-4 text-right md:bottom-4 md:right-0"
       />
       <div>
         <AnimatedText
           text="CHECK-IN"
-          className="x-6 fixed bottom-14 right-10 m-6 flex h-24 items-center justify-center rounded-none py-4 pt-2 text-right font-neuebit text-xl text-black"
+          className="x-6 fixed bottom-16 right-[3.25rem] m-6 flex h-24 items-center justify-center rounded-none py-4 pt-2 text-right font-neuebit text-xl text-black md:bottom-14 md:right-10"
         />
         <AnimatedText
           text="JOIN NOW"
-          className="x-6 h-22 fixed bottom-8 right-10 m-6 flex items-center justify-center rounded-none py-4 text-right font-neuebit text-6xl text-black"
+          className="x-6 h-22 fixed bottom-8 right-14 m-6 flex items-center justify-center rounded-none py-4 text-right font-neuebit text-6xl text-black md:bottom-8 md:right-10"
         />
-        <p className="x-6 fixed bottom-0 right-16 m-6 flex h-24 items-center justify-center rounded-none py-4 text-right font-neuebit text-3xl text-black">
+        <p className="z-50 x-6 fixed bottom-0 right-16 m-6 flex h-24 items-center justify-center rounded-none py-4 text-right font-neuebit text-3xl text-black md:bottom-0">
           04 Mar 25
         </p>
       </div>