chore: resolve merge conflicts

lugvitc · Feb 14, 2025 · 7371903 · 7371903
1 parent d2b124b
commit 7371903
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 82 deletions.
diff --git a/src/Home.jsx b/src/Home.jsx
@@ -9,6 +9,7 @@ import HeroSection from './components/HeroSection'
 import Content from './components/content.jsx'
 import Lenis from 'lenis'
 import Speakers from './components/Speakers.jsx'
+import Rules from './components/Rules.jsx'
 
 function Home() {
   useEffect(() => {
@@ -38,7 +39,7 @@ function Home() {
         <Hamburger className="fixed right-0" />
       </nav>
 
-      {/*<ErtdfgcvbBG className="top-0 z-0" />*/}
+      <ErtdfgcvbBG className="top-0 z-0" />
       <HeroSection />
       {/* <div className="h-screen">
         <Canvas className='w-screen h-screen'>

diff --git a/src/components/LeaderBox.jsx b/src/components/LeaderBox.jsx
@@ -1,29 +1,28 @@
-import AnimatedText from "./text";
+import AnimatedText from './text'
 
 const LeaderBox = ({ teamName, teamPoints, ctfsSolved, number }) => {
   return (
-      <div className="border-2 font-neuebit border-zinc-500 p-5 w-[calc(33vw-3vw-1vw)] flex flex-col justify-between h-[calc(25vw)]">
-        <h3 className="text-xl mb-auto">
-          <AnimatedText text={`NO.${number}`} className="text-xl mb-auto" />
-        </h3>
-        <h4 className="text-enigma-green text-left text-2xl">
-          <AnimatedText text={teamName} />
-        </h4>
-        <hr className="border-none h-0.5 bg-zinc-600 my-0" />
-        <div className="flex justify-between">
-          <AnimatedText text={"TEAM POINTS"} />
-          <AnimatedText
-            text={teamPoints.toString()}
-            className="text-enigma-green"
-          />
-        </div>
-        <div className="flex justify-between">
-          <AnimatedText text={"CTFS SOLVED"} />
-          <AnimatedText
-            text={ctfsSolved.toString()}
-            className="text-enigma-green"
-          />
-        </div>
+    <div className="flex h-[calc(25vw)] w-[calc(33vw-3vw-1vw)] flex-col justify-between border-2 border-zinc-500 p-5 font-neuebit">
+      <h3 className="mb-auto text-xl">
+        <AnimatedText text={`NO.${number}`} className="mb-auto text-xl" />
+      </h3>
+      <h4 className="text-left text-2xl text-enigma-green">
+        <AnimatedText text={teamName} />
+      </h4>
+      <hr className="my-0 h-0.5 border-none bg-zinc-600" />
+      <div className="flex justify-between">
+        <AnimatedText text={'TEAM POINTS'} />
+        <AnimatedText
+          text={teamPoints.toString()}
+          className="text-enigma-green"
+        />
+      </div>
+      <div className="flex justify-between">
+        <AnimatedText text={'CTFS SOLVED'} />
+        <AnimatedText
+          text={ctfsSolved.toString()}
+          className="text-enigma-green"
+        />
       </div>
     </div>
   )

diff --git a/src/components/content.jsx b/src/components/content.jsx
@@ -19,41 +19,50 @@ function Content() {
       ease: 'sine.inOut'
     })
 
-    return (
-      <div className="relative">
-        <Element name="content">
-          <div className="z-20 px-10 py-7 text-left">
-            <AnimatedText
-              text="CONTENT"
-              className="lg:9xl z-50 w-screen cursor-pointer text-left font-neuebit text-6xl uppercase md:text-8xl"
-              customText="@!#$%^&*"
-              time={2}
-              preStyle="font-neuebit uppercase text-6xl md:text-8xl lg:9xl text-yellow-500 z-50 cursor-pointer text-left"
-            />
-          </div>
-          <div ref={scrollRef} className="relative z-20 flex overflow-x-hidden">
-            <div
-              ref={wrapperRef}
-              className="z-30 flex h-screen flex-row items-center gap-x-20 bg-enigma-green px-10 font-neuebit text-black"
-            >
-              <h2 className="text-9xl">Placeholder</h2>
-              <h2 className="text-9xl">Placeholder</h2>
-              <h2 className="text-9xl">Placeholder</h2>
-              <h2 className="text-9xl">Placeholder</h2>
-              <h2 className="text-9xl">Placeholder</h2>
-              <h2 className="text-9xl">Placeholder</h2>
-              <h2 className="text-9xl">Placeholder</h2>
-            </div>
-            <img
-              src="/images/qr-better.png"
-              alt=""
-              className="absolute left-1/2 top-1/2 z-10 h-1/2 w-[50vh] -translate-x-1/2 -translate-y-1/2 transform object-cover"
-            />
-          </div>
-        </Element>
-      </div>
-    )
+    ScrollTrigger.create({
+      trigger: scrollRef.current,
+      start: 'top',
+      end: '+=' + scrollWidth,
+      pin: true,
+      animation: tween,
+      scrub: 2
+    })
   })
+
+  return (
+    <div className="relative">
+      <Element name="content">
+        <div className="z-20 px-10 py-7 text-left">
+          <AnimatedText
+            text="CONTENT"
+            className="lg:9xl z-50 w-screen cursor-pointer text-left font-neuebit text-6xl uppercase md:text-8xl"
+            customText="@!#$%^&*"
+            time={2}
+            preStyle="font-neuebit uppercase text-6xl md:text-8xl lg:9xl text-yellow-500 z-50 cursor-pointer text-left"
+          />
+        </div>
+        <div ref={scrollRef} className="relative z-20 flex overflow-x-hidden">
+          <div
+            ref={wrapperRef}
+            className="z-30 flex h-screen flex-row items-center gap-x-20 bg-enigma-green px-10 font-neuebit text-black"
+          >
+            <h2 className="text-9xl">Placeholder</h2>
+            <h2 className="text-9xl">Placeholder</h2>
+            <h2 className="text-9xl">Placeholder</h2>
+            <h2 className="text-9xl">Placeholder</h2>
+            <h2 className="text-9xl">Placeholder</h2>
+            <h2 className="text-9xl">Placeholder</h2>
+            <h2 className="text-9xl">Placeholder</h2>
+          </div>
+          <img
+            src="/images/qr-better.png"
+            alt=""
+            className="absolute left-1/2 top-1/2 z-10 h-1/2 w-[50vh] -translate-x-1/2 -translate-y-1/2 transform object-cover"
+          />
+        </div>
+      </Element>
+    </div>
+  )
 }
 
 export default Content
diff --git a/src/components/enigmatextbg.jsx b/src/components/enigmatextbg.jsx
@@ -55,26 +55,6 @@ const ErtdfgcvbBG = () => {
     }
   }, [program])
 
-  if (!program) {
-    return null
-  }
-  useEffect(() => {
-    if (program) {
-      const settings = {
-        element: document.querySelector('pre')
-      }
-
-      run(program, settings)
-        .then(function (e) {
-          console.log(e)
-        })
-        .catch(function (e) {
-          console.warn(e.message)
-          console.log(e.error)
-        })
-    }
-  }, [program])
-
   if (!program) {
     return null
   }

diff --git a/src/login/LoginPage.tsx b/src/login/LoginPage.tsx
@@ -1,13 +1,13 @@
 import React from 'react'
 import LoginForm from './LoginForm'
-import { Terminal } from 'lucide-react'
+// import { Terminal } from 'lucide-react'
 
 const LoginPage = () => {
   return (
     <div className="flex min-h-screen min-w-[320px] items-center justify-center bg-[#111111] font-['Orbitron'] text-white">
       <div className="relative flex w-[350px] animate-border flex-col items-center rounded-lg border-2 border-transparent bg-[#1a1a1a] p-8">
         <div className="mb-6 flex animate-float items-center gap-2">
-          <Terminal className="h-8 w-8 text-[#1cd41c]" />
+          {/*<Terminal className="h-8 w-8 text-[#1cd41c]" />*/}
           <h2 className="animate-glow text-3xl font-bold tracking-wider text-[#1cd41c]">
             Enigma25
           </h2>

diff --git a/src/signup/SignUpPage.tsx b/src/signup/SignUpPage.tsx
@@ -1,13 +1,13 @@
 import React from 'react'
 import SignUpForm from './SignUpForm'
-import { Terminal } from 'lucide-react'
+// import { Terminal } from 'lucide-react'
 
 const SignUpPage = () => {
   return (
     <div className="flex min-h-screen min-w-[320px] items-center justify-center bg-[#111111] font-['Orbitron'] text-white">
       <div className="relative flex w-[350px] animate-border flex-col items-center rounded-lg border-2 border-transparent bg-[#1a1a1a] p-8">
         <div className="mb-6 flex animate-float items-center gap-2">
-          <Terminal className="h-8 w-8 text-[#1cd41c]" />
+          {/*<Terminal className="h-8 w-8 text-[#1cd41c]" />*/}
           <h2 className="animate-glow text-3xl font-bold tracking-wider text-[#1cd41c]">
             Enigma25
           </h2>