Merge version_2 into main

Update src/app/page.tsx
2026-03-18 00:34:50 +00:00 · 2026-03-18 00:34:46 +00:00 · 2026-03-18 00:32:49 +00:00 · 2026-03-18 00:32:45 +00:00 · 2026-03-18 00:32:45 +00:00 · 2026-03-18 00:29:19 +00:00
2 changed files with 108 additions and 35 deletions
--- a/src/app/join/page.tsx
+++ b/src/app/join/page.tsx
@@ -0,0 +1,97 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
+import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
+import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
+
+export default function JoinPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="hover-bubble"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="soft"
+      contentWidth="mediumLarge"
+      sizing="largeSmallSizeLargeTitles"
+      background="fluid"
+      cardStyle="outline"
+      primaryButtonStyle="flat"
+      secondaryButtonStyle="layered"
+      headingFontWeight="normal"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleApple
+          brandName="Void Pact"
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Team", id: "#team" },
+            { name: "About", id: "#about" },
+            { name: "Join", id: "/join" },
+            { name: "Contact", id: "#contact" }
+          ]}
+        />
+      </div>
+
+      <div id="join" data-section="join">
+        <ContactSplitForm
+          title="Join the Void"
+          description="Think you have what it takes to compete at the highest level? Submit your application and prove yourself worthy of Void Pact."
+          inputs={[
+            { name: "playerName", type: "text", placeholder: "Your Gaming Name", required: true },
+            { name: "email", type: "email", placeholder: "Your Email", required: true },
+            { name: "role", type: "text", placeholder: "Your Role (e.g., IGL, Rifler, Awper)", required: true },
+            { name: "experience", type: "text", placeholder: "Years of Competitive Experience", required: false }
+          ]}
+          textarea={{
+            name: "message",            placeholder: "Tell us why you should join Void Pact. Share your achievements, mindset, and competitive drive.",            rows: 6,
+            required: true
+          }}
+          useInvertedBackground={false}
+          imageSrc="http://img.b2bpic.net/free-photo/group-multiracial-teens-playing-video-games-video-game-club-with-blue-red-illumination-excited-because-victory_1268-24592.jpg"
+          imageAlt="Gaming team recruitment tryout"
+          mediaAnimation="slide-up"
+          mediaPosition="right"
+          buttonText="Submit Application"
+          ariaLabel="Join Void Pact recruitment form"
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterLogoEmphasis
+          logoText="Void Pact"
+          columns={[
+            {
+              items: [
+                { label: "Home", href: "/" },
+                { label: "Team", href: "/#team" },
+                { label: "About", href: "/#about" }
+              ]
+            },
+            {
+              items: [
+                { label: "Join Us", href: "/join" },
+                { label: "Contact", href: "/#contact" },
+                { label: "Careers", href: "#" }
+              ]
+            },
+            {
+              items: [
+                { label: "Twitter", href: "https://twitter.com" },
+                { label: "Discord", href: "https://discord.com" },
+                { label: "YouTube", href: "https://youtube.com" }
+              ]
+            },
+            {
+              items: [
+                { label: "Privacy Policy", href: "#" },
+                { label: "Terms of Service", href: "#" },
+                { label: "Cookie Policy", href: "#" }
+              ]
+            }
+          ]}
+          ariaLabel="Void Pact footer navigation"
+        />
+      </div>
+    </ThemeProvider>
+  );
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -30,7 +30,7 @@ export default function VoidPactPage() {
            { name: "Home", id: "hero" },
            { name: "Team", id: "team" },
            { name: "About", id: "about" },
-            { name: "Join", id: "join" },
+            { name: "Join", id: "/join" },
            { name: "Contact", id: "contact" }
          ]}
        />
@@ -45,7 +45,7 @@ export default function VoidPactPage() {
          tagIcon={Zap}
          tagAnimation="slide-up"
          buttons={[
-            { text: "Join the Pact", href: "#join" },
+            { text: "Join the Pact", href: "/join" },
            { text: "Watch Our Story", href: "#about" }
          ]}
          buttonAnimation="slide-up"
@@ -89,16 +89,16 @@ export default function VoidPactPage() {
            {
              id: "main-roster",              groupTitle: "Core Team",              members: [
                {
-                  id: "player-1",                  title: "Shadow",                  subtitle: "IGL & Rifler",                  detail: "Strategic mastermind orchestrating every move with precision and vision.",                  imageSrc: "http://img.b2bpic.net/free-photo/man-holding-controller-medium-shot_23-2149005237.jpg",                  imageAlt: "Shadow player avatar"
+                  id: "player-1",                  title: "Tes ",                  subtitle: "IGL & Rifler",                  detail: "Strategic mastermind orchestrating every move with precision and vision.",                  imageSrc: "http://img.b2bpic.net/free-photo/man-holding-controller-medium-shot_23-2149005237.jpg",                  imageAlt: "Shadow player avatar"
                },
                {
-                  id: "player-2",                  title: "Nexus",                  subtitle: "AWper",                  detail: "Unparalleled sniper reflexes and clutch performances in high-pressure moments.",                  imageSrc: "http://img.b2bpic.net/free-photo/energetic-gamer-starting-live-broadcast-interacting-with-viewers-before-playing-videogame_482257-116267.jpg",                  imageAlt: "Nexus player avatar"
+                  id: "player-2",                  title: "Aemrys",                  subtitle: "AWper",                  detail: "Unparalleled sniper reflexes and clutch performances in high-pressure moments.",                  imageSrc: "http://img.b2bpic.net/free-photo/energetic-gamer-starting-live-broadcast-interacting-with-viewers-before-playing-videogame_482257-116267.jpg",                  imageAlt: "Nexus player avatar"
                },
                {
-                  id: "player-3",                  title: "Cipher",                  subtitle: "Support & Utility",                  detail: "Master of information control and map domination through utility mastery.",                  imageSrc: "http://img.b2bpic.net/free-photo/portrait-contemplated-young-male-wears-purple-polo-neck-sitting-armchair-looking-away_23-2148130294.jpg",                  imageAlt: "Cipher player avatar"
+                  id: "player-3",                  title: "Hero",                  subtitle: "Support & Utility",                  detail: "Master of information control and map domination through utility mastery.",                  imageSrc: "http://img.b2bpic.net/free-photo/portrait-contemplated-young-male-wears-purple-polo-neck-sitting-armchair-looking-away_23-2148130294.jpg",                  imageAlt: "Cipher player avatar"
                },
                {
-                  id: "player-4",                  title: "Vortex",                  subtitle: "Entry Fragger",                  detail: "Aggressive play style with explosive entry fragging and round-opening aggression.",                  imageSrc: "http://img.b2bpic.net/free-photo/young-woman-with-glasses-listening-music-headphones-white-background-high-quality-photo_114579-25989.jpg",                  imageAlt: "Vortex player avatar"
+                  id: "player-4",                  title: "JJ",                  subtitle: "Entry Fragger",                  detail: "Aggressive play style with explosive entry fragging and round-opening aggression.",                  imageSrc: "http://img.b2bpic.net/free-photo/young-woman-with-glasses-listening-music-headphones-white-background-high-quality-photo_114579-25989.jpg",                  imageAlt: "Vortex player avatar"
                }
              ]
            }
@@ -123,30 +123,6 @@ export default function VoidPactPage() {
        />
      </div>

-      <div id="join" data-section="join">
-        <ContactSplitForm
-          title="Join the Void"
-          description="Think you have what it takes to compete at the highest level? Submit your application and prove yourself worthy of Void Pact."
-          inputs={[
-            { name: "playerName", type: "text", placeholder: "Your Gaming Name", required: true },
-            { name: "email", type: "email", placeholder: "Your Email", required: true },
-            { name: "role", type: "text", placeholder: "Your Role (e.g., IGL, Rifler, Awper)", required: true },
-            { name: "experience", type: "text", placeholder: "Years of Competitive Experience", required: false }
-          ]}
-          textarea={{
-            name: "message",            placeholder: "Tell us why you should join Void Pact. Share your achievements, mindset, and competitive drive.",            rows: 6,
-            required: true
-          }}
-          useInvertedBackground={false}
-          imageSrc="http://img.b2bpic.net/free-photo/group-multiracial-teens-playing-video-games-video-game-club-with-blue-red-illumination-excited-because-victory_1268-24592.jpg"
-          imageAlt="Gaming team recruitment tryout"
-          mediaAnimation="slide-up"
-          mediaPosition="right"
-          buttonText="Submit Application"
-          ariaLabel="Join Void Pact recruitment form"
-        />
-      </div>
-
      <div id="contact" data-section="contact">
        <ContactSplitForm
          title="Get in Touch"
@@ -175,15 +151,15 @@ export default function VoidPactPage() {
          columns={[
            {
              items: [
-                { label: "Home", href: "#hero" },
-                { label: "Team", href: "#team" },
-                { label: "About", href: "#about" }
+                { label: "Home", href: "/" },
+                { label: "Team", href: "/#team" },
+                { label: "About", href: "/#about" }
              ]
            },
            {
              items: [
-                { label: "Join Us", href: "#join" },
-                { label: "Contact", href: "#contact" },
+                { label: "Join Us", href: "/join" },
+                { label: "Contact", href: "/#contact" },
                { label: "Careers", href: "#" }
              ]
            },
Author	SHA1	Message	Date
bender	263a306d30	Merge version_2 into main Merge version_2 into main	2026-03-18 00:34:50 +00:00
bender	5a98698663	Update src/app/page.tsx	2026-03-18 00:34:46 +00:00
bender	f2d53551a8	Merge version_2 into main Merge version_2 into main	2026-03-18 00:32:49 +00:00
bender	b281126dbe	Update src/app/page.tsx	2026-03-18 00:32:45 +00:00
bender	352c15e19d	Add src/app/join/page.tsx	2026-03-18 00:32:45 +00:00
bender	bf13bad057	Merge version_1 into main Merge version_1 into main	2026-03-18 00:29:19 +00:00