diff --git a/public/assets/triangle.svg b/public/assets/triangle.svg new file mode 100644 index 0000000..af1e11a --- /dev/null +++ b/public/assets/triangle.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/public/icons/hamburger-black.svg b/public/icons/hamburger-black.svg new file mode 100644 index 0000000..250a2b7 --- /dev/null +++ b/public/icons/hamburger-black.svg @@ -0,0 +1,18 @@ + + Menu + + + + diff --git a/public/icons/hamburger.svg b/public/icons/hamburger-white.svg similarity index 100% rename from public/icons/hamburger.svg rename to public/icons/hamburger-white.svg diff --git a/public/logos/logo.svg b/public/logos/logo.svg new file mode 100644 index 0000000..10d4ec7 --- /dev/null +++ b/public/logos/logo.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/public/textures/moonless_golf_1k.hdr b/public/textures/moonless_golf_1k.hdr deleted file mode 100644 index cc60dc8..0000000 Binary files a/public/textures/moonless_golf_1k.hdr and /dev/null differ diff --git a/src/components/Container.astro b/src/components/Container.astro new file mode 100644 index 0000000..ab4b95e --- /dev/null +++ b/src/components/Container.astro @@ -0,0 +1,23 @@ +--- + +--- + +
+
+ MCC Logo +
+
+
+ + + +
+
+
+ +
+
+
+ + diff --git a/src/components/Navigation/Navigation.astro b/src/components/Navigation/Navigation.astro index 10dd767..5a2a6cc 100644 --- a/src/components/Navigation/Navigation.astro +++ b/src/components/Navigation/Navigation.astro @@ -1,6 +1,6 @@ --- +import { FaDiscord, FaGithub, FaXTwitter } from "react-icons/fa6"; import { NavigationContainer } from "./NavigationContainer.tsx"; -import { FaXTwitter, FaGithub, FaDiscord } from "react-icons/fa6"; const links = [ { href: "/", label: "Home" }, @@ -8,15 +8,23 @@ const links = [ { href: "/achievements", label: "Achievements" }, { href: "/blog", label: "Blog" }, ]; + +const socialLinks = [ + { href: "https://x.com/tuatmcc", icon: FaXTwitter }, + { href: "https://x.com/tuatmcc", icon: FaGithub }, + { href: "https://x.com/tuatmcc", icon: FaDiscord }, +]; --- -
+
    { links.map((link) => ( -
-
-
- -
- - - + + diff --git a/src/components/Navigation/NavigationContainer.tsx b/src/components/Navigation/NavigationContainer.tsx index 8bd7189..0cdedd1 100644 --- a/src/components/Navigation/NavigationContainer.tsx +++ b/src/components/Navigation/NavigationContainer.tsx @@ -3,6 +3,7 @@ import { type ReactNode, useState } from "react"; export const NavigationContainer = ({ children }: { children: ReactNode }) => { const [active, setActive] = useState(false); + return ( <> @@ -11,7 +12,7 @@ export const NavigationContainer = ({ children }: { children: ReactNode }) => { initial={{ opacity: 0 }} animate={{ opacity: 1 }} exit={{ opacity: 0 }} - className="fixed top-0 left-0 w-full h-dvh bg-black bg-opacity-30 backdrop-blur-sm" + className="fixed top-0 left-0 w-full h-dvh bg-black bg-opacity-40 backdrop-blur-sm z-10" onClick={() => setActive(false)} onKeyDown={(e) => e.key === "Escape" && setActive(false)} /> @@ -24,40 +25,13 @@ export const NavigationContainer = ({ children }: { children: ReactNode }) => { aria-label="Menu Button" onClick={() => setActive((prev) => !prev)} > - - Menu - - - - + Menu { aria-label="Menu Button" onClick={() => setActive((prev) => !prev)} > - Close + Close {children}
+

Recent News

  • diff --git a/src/pages/index.astro b/src/pages/index.astro index ffc59c1..4cdefc7 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,15 +1,37 @@ --- +import Container from "../components/Container.astro"; import Navigation from "../components/Navigation/Navigation.astro"; import RecentNews from "../components/home/RecentNews.astro"; import Layout from "../layouts/Layout.astro"; --- - -
    - MCC Logo -
    - +
    + +
    +
    + MCC Logo +
    + +

    Welcome to MCC

    +
    +
    + +