diff --git a/package-lock.json b/package-lock.json index c8a05e4..557bff4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,6 @@ "react": "^18", "react-dom": "^18", "react-icons": "^5.3.0", - "react-router-dom": "^6.27.0", "react-swipeable": "^7.0.1", "sharp": "^0.33.5" }, @@ -1421,15 +1420,6 @@ "url": "https://opencollective.com/popperjs" } }, - "node_modules/@remix-run/router": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz", - "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==", - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@rtsao/scc": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", @@ -5276,38 +5266,6 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "license": "MIT" }, - "node_modules/react-router": { - "version": "6.27.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.27.0.tgz", - "integrity": "sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==", - "license": "MIT", - "dependencies": { - "@remix-run/router": "1.20.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "react": ">=16.8" - } - }, - "node_modules/react-router-dom": { - "version": "6.27.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.27.0.tgz", - "integrity": "sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==", - "license": "MIT", - "dependencies": { - "@remix-run/router": "1.20.0", - "react-router": "6.27.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" - } - }, "node_modules/react-swipeable": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/react-swipeable/-/react-swipeable-7.0.1.tgz", diff --git a/package.json b/package.json index 9410381..6c1ce69 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "react": "^18", "react-dom": "^18", "react-icons": "^5.3.0", - "react-router-dom": "^6.27.0", "react-swipeable": "^7.0.1", "sharp": "^0.33.5" }, @@ -27,4 +26,4 @@ "prettier": "^3.3.3", "tailwindcss": "^3.4.1" } -} +} \ No newline at end of file diff --git a/src/app/layout.jsx b/src/app/layout.jsx index b96c9e0..a4d756a 100644 --- a/src/app/layout.jsx +++ b/src/app/layout.jsx @@ -21,7 +21,7 @@ export default function RootLayout({ children }) { const [isLoading, setIsLoading] = useState(true); useEffect(() => { - const timeout = setTimeout(() => setIsLoading(false), 2000); // Simulated loading delay + const timeout = setTimeout(() => setIsLoading(false), 3000); // Simulated loading delay return () => clearTimeout(timeout); }, []); @@ -74,4 +74,4 @@ const styles = { textDecoration: "none", fontSize: "1.8rem", }, -}; +}; \ No newline at end of file diff --git a/src/app/page.jsx b/src/app/page.jsx index e2fe26b..0aea290 100644 --- a/src/app/page.jsx +++ b/src/app/page.jsx @@ -4,6 +4,8 @@ import { useEffect, useState } from "react"; import Navbar from "@/components/Navbar"; import EventsSection from "@/components/EventsSection"; import Links from "@/components/Links"; +import About from "@/components/About"; +import Services from "@/components/Services"; export default function Home() { const publicPath = process.env.NEXT_PUBLIC_PUBLIC_PATH ; @@ -27,13 +29,40 @@ export default function Home() { top: -1, behavior: "smooth", }); - }, 600); + }, 800); } }; + //scroll for about + const scrollToABout = () => { + const section = document.getElementById("aboutsection"); + if (section) { + section.scrollIntoView({ behavior: "smooth" }); + setTimeout(() => { + window.scrollBy({ + top: -1, + behavior: "smooth", + }); + }, 800); + } + } + //scroll for services + const scrollToServices = () => { + const section = document.getElementById("servicessection"); + if (section) { + section.scrollIntoView({ behavior: "smooth" }); + setTimeout(() => { + window.scrollBy({ + top: -1, + behavior: "smooth", + }); + }, 800); + } +} + return ( <> - +
+ {/* About Section */} +
+ +
+ + {/* About Section */} +
+ +
+ {/* Links Section */}
diff --git a/src/app/services/page.js b/src/app/services/page.js deleted file mode 100644 index 060cd52..0000000 --- a/src/app/services/page.js +++ /dev/null @@ -1,57 +0,0 @@ -"use client"; - -import Navbar from "@/components/Navbar"; -import { useEffect } from "react"; - -export default function Home() { - const scrollToSection = () => { - const section = document.getElementById("more-section"); - if (section) { - section.scrollIntoView({ behavior: "smooth" }); - setTimeout(() => { - window.scrollBy({ - top: -1, - behavior: "smooth", - }); - }, 600); - } - }; - useEffect(()=>{ - setTimeout(()=>{ - scrollToSection(); - },1700) - },[]) - - return ( - <> - {/* Meta Tags for SEO */} - -
-
-

- Services GDG-BU -

-
-
-
-
-

- -

-
-
-
-
- - ); -} diff --git a/src/app/about/page.js b/src/components/About.jsx similarity index 74% rename from src/app/about/page.js rename to src/components/About.jsx index 72931ec..f19e352 100644 --- a/src/app/about/page.js +++ b/src/components/About.jsx @@ -1,26 +1,5 @@ -"use client"; - -import Navbar from "@/components/Navbar"; -import { useEffect } from "react"; - -export default function Home() { - const scrollToSection = () => { - const section = document.getElementById("more-section"); - if (section) { - section.scrollIntoView({ behavior: "smooth" }); - setTimeout(() => { - window.scrollBy({ - top: -65, - behavior: "smooth", - }); - }, 800); - } - }; - useEffect(()=>{ - setTimeout(()=>{ - scrollToSection(); - },1700) - },[]) +export default function About() { + const Section = ({ title, content }) => (
-
  • - Workshops & Hackathons: Hands-on coding workshops, - hackathons, and coding challenges. -
  • Guest Speaker Sessions: Talks from professionals in tech, including Google engineers and developers. @@ -108,21 +83,11 @@ export default function Home() { ]; return ( <> - -
    -
    +

    - +

    diff --git a/src/app/contact/page.js b/src/components/Contact.jsx similarity index 76% rename from src/app/contact/page.js rename to src/components/Contact.jsx index 893bc90..165b580 100644 --- a/src/app/contact/page.js +++ b/src/components/Contact.jsx @@ -1,6 +1,3 @@ -"use client"; - -import Navbar from "@/components/Navbar"; import { useEffect } from "react"; export default function Home() { @@ -24,17 +21,6 @@ export default function Home() { return ( <> - {/* Meta Tags for SEO */} - -

    Contact GDG-BU diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx index 3d9028d..8149452 100644 --- a/src/components/Navbar.jsx +++ b/src/components/Navbar.jsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; import Image from "next/image"; -export default function Navbar() { +export default function Navbar(props) { const public_path = process.env.NEXT_PUBLIC_PUBLIC_PATH const [visible, setVisible] = useState(false); const [scrollPosition, setScrollPosition] = useState(0); @@ -26,6 +26,11 @@ export default function Navbar() { window.removeEventListener("scroll", handleScroll); }; }, [scrollPosition]); + + const getButtonId = (event) => { + return event.target.id; + }; + return ( <>

  • - About - +
  • - Services - +
  • - Contact - +
    • diff --git a/src/components/Services.jsx b/src/components/Services.jsx new file mode 100644 index 0000000..253f06d --- /dev/null +++ b/src/components/Services.jsx @@ -0,0 +1,41 @@ +export default function Services() { + + return ( +
    +
    +

    + Services GDG-BU +

    +
    +
    +
    +
    +

    + Workshops and Hands-On Coding Labs + +

    +
    Dive deep into the latest Google technologies and industry tools through hands-on workshops.We cover topics like Android development, Firebase integration, cloud computing, AI/ML, and web development.
    +
    +
    +

    + Tech Talks and Guest Speakers +

    +
    Learn from the experts! We host industry leaders, Google Developer Experts (GDEs), and alumni working at top tech companies who share insights into tech trends, career growth, and real-world applications of emerging technologies.
    +
    +
    +

    + Mentorship and Networking Opportunities +

    +
    Connect with mentors in your field of interest, including faculty, alumni, and industry professionals. Our mentorship programs are designed to provide personalized guidance, career advice, and networking support.
    +
    +
    +
    +
    + ); +}