Merge pull request #9 from infinitedim/feat/2.0

feat: change navbar style
infinitedim · Jul 19, 2023 · 8061648 · 8061648 · vercel · Jul 19, 2023
2 parents 6b78ca4 + e65f653
commit 8061648
Show file tree

Hide file tree

Showing 40 changed files with 232 additions and 1,278 deletions.
diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "@vercel/analytics": "^1.0.1",
+    "class-variance-authority": "^0.6.1",
     "clsx": "^1.2.1",
     "framer-motion": "^10.12.10",
     "next": "13.2.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/(about)/about/layout.tsx b/src/app/(about)/about/layout.tsx
diff --git a/src/app/(about)/about/page.tsx b/src/app/(about)/about/page.tsx
diff --git a/src/app/(contact)/contact/layout.tsx b/src/app/(contact)/contact/layout.tsx
diff --git a/src/app/(contact)/contact/page.tsx b/src/app/(contact)/contact/page.tsx
diff --git a/src/app/(projects)/project/layout.tsx b/src/app/(projects)/project/layout.tsx
diff --git a/src/app/(projects)/project/page.tsx b/src/app/(projects)/project/page.tsx
diff --git a/src/app/[...notfound]/page.tsx b/src/app/[...notfound]/page.tsx
@@ -26,7 +26,7 @@ export const metadata: Metadata = {
     "404 not found",
     "404 page",
   ],
-  authors: [{ name: "infinitedim", url: "https://infinitedim.vercel.app" }],
+  authors: [{ name: "infinitedim", url: "https://infinitedim.site" }],
   creator: "infinitedim",
   viewport: { width: "device-width", initialScale: 1 },
 };

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,7 +1,7 @@
 import localFont from "next/font/local";
 import type { ReactNode } from "react";
 import { Analytics } from "@vercel/analytics/react";
-import { Navbar, ProgressBar } from "@/components";
+import { Header } from "@/components";
 import { cn } from "@/utils";
 import "@total-typescript/ts-reset";
 import "@/styles/globals.css";
@@ -72,7 +72,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {
     >
       <body
         className={cn(
-          "relative mx-auto max-w-7xl overflow-x-hidden bg-custom-white-900 text-mood-gray antialiased",
+          "bg-custom-white-900 relative mx-auto max-w-7xl overflow-x-hidden text-mood-gray antialiased",
         )}
       >
         <a
@@ -81,8 +81,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {
         >
           Skip To Content
         </a>
-        <ProgressBar />
-        <Navbar />
+        <Header />
         <main
           className="antialiased focus:outline-none mt-10"
           id="main-content"

diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
@@ -3,14 +3,18 @@ import "@total-typescript/ts-reset";
 
 export default function NotFound() {
   return (
-    <div className="container flex flex-col items-center justify-center h-[80vh]">
+    <div className="container flex flex-col items-center justify-center h-[60vh]">
       <Heading
+        as="h1"
         className="text-3xl md:text-4xl lg:text-5xl font-black"
         title="Not Found"
       >
         Error
       </Heading>
-      <Heading className="text-2xl md:text-3xl lg:text-4xl font-extrabold">
+      <Heading
+        as="h2"
+        className="text-2xl md:text-3xl lg:text-4xl font-extrabold"
+      >
         404 Page Not Found
       </Heading>
     </div>