Update src/app/layout.tsx

Merge version_2 into main

src/app/about/page.tsx

@@ -1,57 +0,0 @@
-"use client";
-
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-import { Users } from 'lucide-react';
-
-export default function AboutPage() {
-  return (
-    <ThemeProvider
-      defaultButtonVariant="hover-bubble"
-      defaultTextAnimation="background-highlight"
-      borderRadius="soft"
-      contentWidth="medium"
-      sizing="mediumLarge"
-      background="none"
-      cardStyle="glass-depth"
-      primaryButtonStyle="shadow"
-      secondaryButtonStyle="solid"
-      headingFontWeight="bold"
-    >
-      <div id="nav" data-section="nav">
-        <NavbarStyleFullscreen
-          navItems={[{"name":"Home","id":"home"},{"name":"About","id":"/about"},{"name":"Events","id":"/events"},{"name":"Team","id":"/team"},{"name":"Contact","id":"/contact"}]}
-          brandName="TechClub"
-          bottomLeftText="Join Our Community"
-          bottomRightText="tech@club.com"
-        />
-      </div>
-
-      <div id="about" data-section="about">
-        <MetricSplitMediaAbout
-          tag="About Our Club"
-          tagIcon={Users}
-          title="Building Tech Leaders Together"
-          description="Our computer club is a vibrant community of developers, designers, and tech enthusiasts united by a passion for innovation. We provide hands-on learning, mentorship, and collaborative opportunities to help members master cutting-edge technologies."
-          metrics={[{"value":"500+","title":"Active Members"},{"value":"50+","title":"Projects Completed"}]}
-          imageSrc="http://img.b2bpic.net/free-photo/multiracial-group-people-discussing-business-office_1268-21455.jpg?_wi=2"
-          imageAlt="Community Meeting"
-          useInvertedBackground={false}
-          mediaAnimation="slide-up"
-          metricsAnimation="slide-up"
-          tagAnimation="slide-up"
-        />
-      </div>
-
-      <div id="footer" data-section="footer">
-        <FooterLogoReveal
-          logoText="TechClub"
-          leftLink={{"text":"Privacy Policy","href":"#"}}
-          rightLink={{"text":"Terms of Service","href":"#"}}
-        />
-      </div>
-    </ThemeProvider>
-  );
-}

src/app/contact/page.tsx

@@ -1,55 +0,0 @@
-"use client";
-
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-
-export default function ContactPage() {
-  return (
-    <ThemeProvider
-      defaultButtonVariant="hover-bubble"
-      defaultTextAnimation="background-highlight"
-      borderRadius="soft"
-      contentWidth="medium"
-      sizing="mediumLarge"
-      background="none"
-      cardStyle="glass-depth"
-      primaryButtonStyle="shadow"
-      secondaryButtonStyle="solid"
-      headingFontWeight="bold"
-    >
-      <div id="nav" data-section="nav">
-        <NavbarStyleFullscreen
-          navItems={[{"name":"Home","id":"home"},{"name":"About","id":"/about"},{"name":"Events","id":"/events"},{"name":"Team","id":"/team"},{"name":"Contact","id":"/contact"}]}
-          brandName="TechClub"
-          bottomLeftText="Join Our Community"
-          bottomRightText="tech@club.com"
-        />
-      </div>
-
-      <div id="contact" data-section="contact">
-        <ContactSplitForm
-          title="Get in Touch"
-          description="Ready to join our community? Reach out to us with any questions or to express your interest in becoming a member."
-          inputs={[{"name":"name","type":"text","placeholder":"Your Name","required":true},{"name":"email","type":"email","placeholder":"Your Email","required":true}]}
-          textarea={{"name":"message","placeholder":"Tell us about your interests in tech...","rows":5,"required":true}}
-          useInvertedBackground={false}
-          imageSrc="http://img.b2bpic.net/free-photo/technology-unicorn-venture-workspace-with-pc-used-conduct-code-reviews_482257-118729.jpg?_wi=2"
-          imageAlt="Contact Us"
-          mediaAnimation="slide-up"
-          mediaPosition="right"
-          buttonText="Send Message"
-        />
-      </div>
-
-      <div id="footer" data-section="footer">
-        <FooterLogoReveal
-          logoText="TechClub"
-          leftLink={{"text":"Privacy Policy","href":"#"}}
-          rightLink={{"text":"Terms of Service","href":"#"}}
-        />
-      </div>
-    </ThemeProvider>
-  );
-}

src/app/events/page.tsx

@@ -1,53 +0,0 @@
-"use client";
-
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import FeatureCardNineteen from '@/components/sections/feature/FeatureCardNineteen';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-
-export default function EventsPage() {
-  return (
-    <ThemeProvider
-      defaultButtonVariant="hover-bubble"
-      defaultTextAnimation="background-highlight"
-      borderRadius="soft"
-      contentWidth="medium"
-      sizing="mediumLarge"
-      background="none"
-      cardStyle="glass-depth"
-      primaryButtonStyle="shadow"
-      secondaryButtonStyle="solid"
-      headingFontWeight="bold"
-    >
-      <div id="nav" data-section="nav">
-        <NavbarStyleFullscreen
-          navItems={[{"name":"Home","id":"home"},{"name":"About","id":"/about"},{"name":"Events","id":"/events"},{"name":"Team","id":"/team"},{"name":"Contact","id":"/contact"}]}
-          brandName="TechClub"
-          bottomLeftText="Join Our Community"
-          bottomRightText="tech@club.com"
-        />
-      </div>
-
-      <div id="features" data-section="features">
-        <FeatureCardNineteen
-          title="What We Offer"
-          description="Explore the benefits and opportunities available to our club members"
-          tag="Our Services"
-          tagAnimation="slide-up"
-          features={[{"id":1,"tag":"Education","title":"Workshops & Training","subtitle":"Master new technologies","description":"Weekly workshops cover programming languages, web development, AI, cybersecurity, and more. Learn from experienced members and industry experts.","imageSrc":"http://img.b2bpic.net/free-photo/typing-keyboard-business-people-manager-working-their-new-project-classroom_146671-16320.jpg","imageAlt":"Workshop"},{"id":2,"tag":"Innovation","title":"Collaborative Projects","subtitle":"Build something amazing","description":"Work with team members on real-world projects. Develop portfolio pieces, contribute to open-source, and showcase your skills.","imageSrc":"http://img.b2bpic.net/free-vector/people-starting-business-project_23-2148866842.jpg","imageAlt":"Project Development"},{"id":3,"tag":"Community","title":"Networking Events","subtitle":"Connect and grow","description":"Attend monthly meetups, hackathons, and tech talks. Network with peers, industry professionals, and potential mentors.","imageSrc":"http://img.b2bpic.net/free-photo/diverse-business-people-dinner-party_53876-98341.jpg","imageAlt":"Networking Event"}]}
-          textboxLayout="default"
-          useInvertedBackground={true}
-          buttonAnimation="slide-up"
-        />
-      </div>
-
-      <div id="footer" data-section="footer">
-        <FooterLogoReveal
-          logoText="TechClub"
-          leftLink={{"text":"Privacy Policy","href":"#"}}
-          rightLink={{"text":"Terms of Service","href":"#"}}
-        />
-      </div>
-    </ThemeProvider>
-  );
-}

src/app/layout.tsx

@@ -1,15 +1,11 @@
 import type { Metadata } from "next";
-import localFont from "next/font/local";
+import { Inter } from "next/font/google";
 import "./globals.css";
 
-const geistSans = localFont({
+const inter = Inter({ subsets: ["latin"] });
-  src: "./fonts/GeistVF.woff2",  variable: "--font-geist-sans",  weight: "100 900"});
-
-const geistMono = localFont({
-  src: "./fonts/GeistMonoVF.woff2",  variable: "--font-geist-mono",  weight: "100 900"});
 
 export const metadata: Metadata = {
-  title: "Create Next App",  description: "Generated by create next app"};
+  title: "Computer Club",  description: "Connect with passionate technologists, build amazing projects, and grow together as a community of innovators."};
 
 export default function RootLayout({
   children,
@@ -18,9 +14,7 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en">
-      <body className={`${geistSans.variable} ${geistMono.variable}`}>
+      <body className={inter.className}>{children}
-        {children}
-      
         <script
           dangerouslySetInnerHTML={{
             __html: `

src/app/page.tsx

@@ -28,7 +28,7 @@ export default function LandingPage() {
     >
       <div id="nav" data-section="nav">
         <NavbarStyleFullscreen
-          navItems={[{"name":"Home","id":"home"},{"name":"About","id":"/about"},{"name":"Events","id":"/events"},{"name":"Team","id":"/team"},{"name":"Contact","id":"/contact"}]}
+          navItems={[{"name":"Home","id":"home"},{"name":"About","id":"about"},{"name":"Events","id":"features"},{"name":"Team","id":"team"},{"name":"Contact","id":"contact"}]}
           brandName="TechClub"
           bottomLeftText="Join Our Community"
           bottomRightText="tech@club.com"
@@ -45,7 +45,7 @@ export default function LandingPage() {
           background={{variant: "animated-grid"}}
           imageSrc="http://img.b2bpic.net/free-photo/technology-unicorn-venture-workspace-with-pc-used-conduct-code-reviews_482257-118729.jpg?_wi=1"
           imageAlt="Tech Club Dashboard"
-          buttons={[{"text":"Join Now","href":"/contact"},{"text":"Learn More","href":"/about"}]}
+          buttons={[{"text":"Join Now","href":"#contact"},{"text":"Learn More","href":"#about"}]}
           buttonAnimation="slide-up"
         />
       </div>
@@ -57,7 +57,7 @@ export default function LandingPage() {
           title="Building Tech Leaders Together"
           description="Our computer club is a vibrant community of developers, designers, and tech enthusiasts united by a passion for innovation. We provide hands-on learning, mentorship, and collaborative opportunities to help members master cutting-edge technologies."
           metrics={[{"value":"500+","title":"Active Members"},{"value":"50+","title":"Projects Completed"}]}
-          imageSrc="http://img.b2bpic.net/free-photo/multiracial-group-people-discussing-business-office_1268-21455.jpg?_wi=1"
+          imageSrc="http://img.b2bpic.net/free-photo/multiracial-group-people-discussing-business-office_1268-21455.jpg"
           imageAlt="Community Meeting"
           useInvertedBackground={false}
           mediaAnimation="slide-up"

src/app/team/page.tsx

@@ -1,56 +0,0 @@
-"use client";
-
-import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import TeamCardTwo from '@/components/sections/team/TeamCardTwo';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
-import { Github, Linkedin, Twitter, Globe } from 'lucide-react';
-
-export default function TeamPage() {
-  return (
-    <ThemeProvider
-      defaultButtonVariant="hover-bubble"
-      defaultTextAnimation="background-highlight"
-      borderRadius="soft"
-      contentWidth="medium"
-      sizing="mediumLarge"
-      background="none"
-      cardStyle="glass-depth"
-      primaryButtonStyle="shadow"
-      secondaryButtonStyle="solid"
-      headingFontWeight="bold"
-    >
-      <div id="nav" data-section="nav">
-        <NavbarStyleFullscreen
-          navItems={[{"name":"Home","id":"home"},{"name":"About","id":"/about"},{"name":"Events","id":"/events"},{"name":"Team","id":"/team"},{"name":"Contact","id":"/contact"}]}
-          brandName="TechClub"
-          bottomLeftText="Join Our Community"
-          bottomRightText="tech@club.com"
-        />
-      </div>
-
-      <div id="team" data-section="team">
-        <TeamCardTwo
-          title="Meet Our Leadership"
-          description="Meet the passionate leaders guiding our community"
-          tag="Our Team"
-          tagAnimation="slide-up"
-          members={[{"id":"1","name":"Alex Johnson","role":"Club President","description":"Full-stack developer with 5+ years of experience in web development and open-source contributions.","imageSrc":"http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg","imageAlt":"Alex Johnson","socialLinks":[{"icon":Github,"url":"https://github.com"},{"icon":Linkedin,"url":"https://linkedin.com"}]},{"id":"2","name":"Sarah Chen","role":"Vice President","description":"AI and machine learning enthusiast dedicated to making tech accessible to everyone.","imageSrc":"http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg","imageAlt":"Sarah Chen","socialLinks":[{"icon":Github,"url":"https://github.com"},{"icon":Linkedin,"url":"https://linkedin.com"}]},{"id":"3","name":"Marcus Rodriguez","role":"Events Coordinator","description":"Passionate about building community through organizing engaging tech events and workshops.","imageSrc":"http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg","imageAlt":"Marcus Rodriguez","socialLinks":[{"icon":Github,"url":"https://github.com"},{"icon":Twitter,"url":"https://twitter.com"}]},{"id":"4","name":"Emily Foster","role":"Mentor Coordinator","description":"Senior software engineer committed to mentoring the next generation of tech leaders.","imageSrc":"http://img.b2bpic.net/free-photo/smiling-young-businessman-suit-looking-camera-meeting_1163-4654.jpg","imageAlt":"Emily Foster","socialLinks":[{"icon":Linkedin,"url":"https://linkedin.com"},{"icon":Globe,"url":"https://example.com"}]}]}
-          gridVariant="two-columns-alternating-heights"
-          animationType="slide-up"
-          textboxLayout="default"
-          useInvertedBackground={false}
-          buttonAnimation="slide-up"
-        />
-      </div>
-
-      <div id="footer" data-section="footer">
-        <FooterLogoReveal
-          logoText="TechClub"
-          leftLink={{"text":"Privacy Policy","href":"#"}}
-          rightLink={{"text":"Terms of Service","href":"#"}}
-        />
-      </div>
-    </ThemeProvider>
-  );
-}