From 36112fe04e554f07efc95e772800b430ce32eba8 Mon Sep 17 00:00:00 2001 From: Timothy Pidashev Date: Mon, 18 Mar 2024 12:19:11 -0700 Subject: [PATCH] begin work on header --- src/web/package-lock.json | 25 +++++++++++++++++++++++++ src/web/package.json | 1 + src/web/src/app/layout.js | 5 ++++- src/web/src/app/page.jsx | 2 -- src/web/src/components/footer.jsx | 2 +- src/web/src/components/header.jsx | 10 ++++++++-- src/web/tailwind.config.js | 2 ++ 7 files changed, 41 insertions(+), 6 deletions(-) diff --git a/src/web/package-lock.json b/src/web/package-lock.json index 5cd9ccc..1d09c3e 100644 --- a/src/web/package-lock.json +++ b/src/web/package-lock.json @@ -8,6 +8,7 @@ "name": "web", "version": "0.1.0", "dependencies": { + "framer-motion": "^11.0.14", "next": "14.1.3", "next-themes": "^0.3.0", "react": "^18", @@ -2139,6 +2140,30 @@ "url": "https://github.com/sponsors/rawify" } }, + "node_modules/framer-motion": { + "version": "11.0.14", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.0.14.tgz", + "integrity": "sha512-RFjo2hB1MTW0EWsHQaXgVn0AEUDGxAs0ZL2vVjTTJJu3N7wFiLkmqTn5ysLjL+qKZ9jvfpKXDb9waN9AyLqk8g==", + "dependencies": { + "tslib": "^2.4.0" + }, + "peerDependencies": { + "@emotion/is-prop-valid": "*", + "react": "^18.0.0", + "react-dom": "^18.0.0" + }, + "peerDependenciesMeta": { + "@emotion/is-prop-valid": { + "optional": true + }, + "react": { + "optional": true + }, + "react-dom": { + "optional": true + } + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", diff --git a/src/web/package.json b/src/web/package.json index a9e4f8e..31c74e4 100644 --- a/src/web/package.json +++ b/src/web/package.json @@ -9,6 +9,7 @@ "lint": "next lint" }, "dependencies": { + "framer-motion": "^11.0.14", "next": "14.1.3", "next-themes": "^0.3.0", "react": "^18", diff --git a/src/web/src/app/layout.js b/src/web/src/app/layout.js index 0356117..168319c 100644 --- a/src/web/src/app/layout.js +++ b/src/web/src/app/layout.js @@ -14,7 +14,10 @@ export const metadata = { export default function Layout({children}) { return ( - +
diff --git a/src/web/src/app/page.jsx b/src/web/src/app/page.jsx index a424963..38f7071 100644 --- a/src/web/src/app/page.jsx +++ b/src/web/src/app/page.jsx @@ -1,5 +1,4 @@ // Imports -import ThemeToggle from "@/components/theme-toggle"; // Metadata @@ -7,7 +6,6 @@ import ThemeToggle from "@/components/theme-toggle"; export default function Index() { return (
-
); } diff --git a/src/web/src/components/footer.jsx b/src/web/src/components/footer.jsx index 0f10ca8..ca679cd 100644 --- a/src/web/src/components/footer.jsx +++ b/src/web/src/components/footer.jsx @@ -1,6 +1,6 @@ const Footer = () => { return ( -
Footer
+
); } diff --git a/src/web/src/components/header.jsx b/src/web/src/components/header.jsx index 4192e4d..899fab4 100644 --- a/src/web/src/components/header.jsx +++ b/src/web/src/components/header.jsx @@ -1,5 +1,6 @@ "use client"; +import ThemeToggle from "@/components/theme-toggle" import Link from "next/link"; import { usePathname } from "next/navigation"; @@ -29,8 +30,13 @@ const navItems= [ const Header = () => { return ( -
- Navbar +
+ Home + Projects + Resume + Blog + Shop +
); } diff --git a/src/web/tailwind.config.js b/src/web/tailwind.config.js index bd1f2c0..b0bcc16 100644 --- a/src/web/tailwind.config.js +++ b/src/web/tailwind.config.js @@ -9,6 +9,7 @@ module.exports = { colors: { light:{ background: "#fbf1c7", + foreground: "#3c3836", red: { 1: "#cc241d", 2: "#9d0006" @@ -40,6 +41,7 @@ module.exports = { }, dark: { background: "#282828", + foreground: "#ebdbb2", red: { 1: "#cc241d", 2: "#fb4934"