test

atch2203 · Jun 16, 2024 · 9626c1a · 9626c1a
1 parent 37febb5
commit 9626c1a
Show file tree

Hide file tree

Showing 12 changed files with 233 additions and 134 deletions.
diff --git a/app/about/page.tsx b/app/about/page.tsx
@@ -0,0 +1,41 @@
+'use client'
+
+import Nav from "../nav";
+import Image from "next/image";
+import {motion} from "framer-motion";
+
+export default function Home() {
+  return (
+    <main >
+      <Contents />
+    </main>
+  );
+}
+
+function Contents(){
+  return(
+    <div className="flex min-h-screen flex-col items-center justify-between p-24">
+      <h1>aboutme</h1>
+      <Image
+        src="/Happy_Negative_Galaxy.png"
+        alt="Alex Tong"
+        width={500}
+        height={4}
+      />
+      <h1>aboutme</h1>
+      <h1>aboutme</h1>
+      <Image
+        src="/Happy_Negative_Galaxy.png"
+        alt="Alex Tong"
+        width={500}
+        height={4}
+      />
+      <Image
+        src="/Happy_Negative_Galaxy.png"
+        alt="Alex Tong"
+        width={500}
+        height={4}
+      />
+    </div>
+  )
+}
diff --git a/app/favicon.ico b/app/favicon.ico
diff --git a/app/globals.css b/app/globals.css
@@ -2,19 +2,19 @@
 @tailwind components;
 @tailwind utilities;
 
-:root {
+:root{
   --foreground-rgb: 0, 0, 0;
   --background-start-rgb: 214, 219, 220;
   --background-end-rgb: 255, 255, 255;
 }
 
-@media (prefers-color-scheme: dark) {
-  :root {
-    --foreground-rgb: 255, 255, 255;
-    --background-start-rgb: 0, 0, 0;
-    --background-end-rgb: 0, 0, 0;
-  }
+/* @media (prefers-color-scheme: dark) {
+:root {
+  --foreground-rgb: 255, 255, 255;
+  --background-start-rgb: 0, 0, 0;
+  --background-end-rgb: 0, 0, 0;
 }
+ } */
 
 body {
   color: rgb(var(--foreground-rgb));

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,13 +1,17 @@
+'use client'
+
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import "./globals.css";
+import Nav from "./nav";
+import { AnimatePresence } from "framer-motion";
+import { Router, Routes, useLocation } from "react-router-dom";
 
 const inter = Inter({ subsets: ["latin"] });
 
-export const metadata: Metadata = {
-  title: "Create Next App",
-  description: "Generated by create next app",
-};
+// export const metadata: Metadata = {
+//   title: "Alex's Website"
+// };
 
 export default function RootLayout({
   children,
@@ -16,7 +20,13 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en">
-      <body className={inter.className}>{children}</body>
+      <body className={inter.className}>
+        <Nav />
+        <AnimatePresence>
+        {children}
+        </AnimatePresence>
+      </body>
     </html>
+
   );
 }
diff --git a/app/nav.tsx b/app/nav.tsx
@@ -1,20 +1,91 @@
-export default function Nav(){
+'use client'
+
+import React, { useEffect, useState } from "react";
+import Image from "next/image";
+
+const links = [
+    {
+      text: 'Home',
+      link: '/'
+    },
+    {
+      text: "Projects",
+      link: '/projects'
+    },
+    {
+      text: 'About Me',
+      link: '/about'
+    },
+    {
+      text: 'Blog',
+      link: '/blog'
+    }
+  ]
+
+export default function Nav() {
+  const [mobile, setMobile] = useState(false);
+  const hidden = !mobile ? " hidden" : "";
+
   return (
-    <a
-      href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
-      className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
-      target="_blank"
-      rel="noopener noreferrer"
-    >
-      <h2 className="mb-3 text-2xl font-semibold">
-        Templates{" "}
-        <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-          -&gt;
-        </span>
-      </h2>
-      <p className="m-0 max-w-[30ch] text-sm opacity-50">
-        testingfsdafdsa
-      </p>
-    </a>
+    <nav className="max-w-screen-x1 flex-wrap flex items-center justify-between mx-auto p-4 fixed w-full z-20 bg-blue-600">
+      <Image
+        src="/Happy_Negative_Galaxy.png"
+        alt="Alex Tong"
+        width={50}
+        height={50}
+        priority
+      />
+      <button className="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-500 rounded-lg md:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600"
+        onClick={() => setMobile(m => !m)} type="button" data-coll="navbar-default" aria-controls="navbar-default" aria-expanded="false">
+        <MenuSvg />
+      </button>
+      <div className={"w-full md:block md:w-auto" + hidden}>
+        <NavBar />
+      </div>
+    </nav>
   );
-}
+}
+
+function NavBar() {
+  const [curloc, setCurloc] = useState("");
+  useEffect(() => {
+    setCurloc(window.location.pathname);
+  }, []);
+
+  const liClass = `block py-5 px-3
+          text-gray-900 rounded md:border-0 md:p-0
+          dark:text-white`;
+  const unselectedClass = ` hover:bg-blue-400 md:hover:bg-transparent md:hover:text-blue-700`;//md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent
+  const selectedClass = ` `;
+
+  const parsed = [];
+  for (let i = 0; i < links.length; i++) {
+    const obj = links[i];
+    parsed.push(curloc !== obj.link ? (
+      <li key={i} className={liClass + unselectedClass}><a href={obj.link}>
+        {obj.text}
+      </a></li>
+    ) : (
+      <li key={i} className={liClass + unselectedClass + selectedClass}><a href={obj.link} onClick={(e) => { e.preventDefault() }}>
+        {obj.text}
+      </a></li>
+    )
+    )
+  }
+  return (
+    <ul className="flex flex-col md:flex-row md:space-x-8 rtl:space-x-reverse md:mt-0 top-20 md:pr-8 max-md:pt-4">
+      {parsed}
+    </ul>
+  );
+}
+
+function MenuSvg() {
+  return (
+    <>
+      <span className="sr-only">Open main menu</span>
+      <svg className="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 17 14">
+        <path stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M1 1h15M1 7h15M1 13h15" />
+      </svg>
+    </>
+  );
+}
diff --git a/app/page.tsx b/app/page.tsx
@@ -1,99 +1,21 @@
+'use client'
+
 import Image from "next/image";
 import Nav from "./nav";
+import { AnimatePresence, motion } from "framer-motion";
 
 export default function Home() {
   return (
-    <main className="flex min-h-screen flex-col items-center justify-between p-24">
-      <div className="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex">
-        <p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto  lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30">
-          Get started by editing&nbsp;
-          <code className="font-mono font-bold">app/page.tsx</code>
-        </p>
-        <div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:size-auto lg:bg-none">
-          <a
-            className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
-            href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            By{" "}
-            <Image
-              src="/vercel.svg"
-              alt="Vercel Logo"
-              className="dark:invert"
-              width={100}
-              height={24}
-              priority
-            />
-          </a>
-        </div>
-      </div>
-
-      <div className="relative z-[-1] flex place-items-center before:absolute before:h-[300px] before:w-full before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-full after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 sm:before:w-[480px] sm:after:w-[240px] before:lg:h-[360px]">
-        <Image
-          className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
-          src="/next.svg"
-          alt="Next.js Logo"
-          width={180}
-          height={37}
-          priority
-        />
-      </div>
-
-      <div className="mb-32 grid text-center lg:mb-0 lg:w-full lg:max-w-5xl lg:grid-cols-4 lg:text-left">
-        <a
-          href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
-          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <h2 className="mb-3 text-2xl font-semibold">
-            Docs{" "}
-            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-              -&gt;
-            </span>
-          </h2>
-          <p className="m-0 max-w-[30ch] text-sm opacity-50">
-            Find in-depth information about Next.js features and API.
-          </p>
-        </a>
-
-        <a
-          href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
-          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <h2 className="mb-3 text-2xl font-semibold">
-            Learn{" "}
-            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-              -&gt;
-            </span>
-          </h2>
-          <p className="m-0 max-w-[30ch] text-sm opacity-50">
-            Learn about Next.js in an interactive course with&nbsp;quizzes!
-          </p>
-        </a>
-
-        <Nav />
-
-        <a
-          href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
-          className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <h2 className="mb-3 text-2xl font-semibold">
-            Deploy{" "}
-            <span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-              -&gt;
-            </span>
-          </h2>
-          <p className="m-0 max-w-[30ch] text-balance text-sm opacity-50">
-            Instantly deploy your Next.js site to a shareable URL with Vercel.
-          </p>
-        </a>
-      </div>
+    <main >
+      <Contents />
     </main>
   );
 }
+
+function Contents() {
+  return (
+    <div className="flex min-h-screen flex-col items-center justify-between p-24">
+      <motion.div animate={{ x: 100 }} exit={{opacity: 100}}>test</motion.div>
+    </div>
+  )
+}