-
-
-
- Get started by editing{" "}
-
- src/app/page.tsx -
- . -
- - Save and see your changes instantly. -
diff --git a/package-lock.json b/package-lock.json index 6c1284f..0d7a0a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,11 @@ "name": "portfolio", "version": "0.1.0", "dependencies": { + "clsx": "^2.1.1", "next": "14.2.9", "react": "^18", - "react-dom": "^18" + "react-dom": "^18", + "tailwind-merge": "^2.5.2" }, "devDependencies": { "@types/node": "^20", @@ -1271,6 +1273,15 @@ "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==", "license": "MIT" }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -4860,6 +4871,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/tailwind-merge": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.2.tgz", + "integrity": "sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, "node_modules/tailwindcss": { "version": "3.4.10", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.10.tgz", diff --git a/package.json b/package.json index 4bbecfa..46168fd 100644 --- a/package.json +++ b/package.json @@ -3,24 +3,26 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "next dev", + "dev": "next dev --hostname 0.0.0.0", "build": "next build", "start": "next start", "lint": "next lint" }, "dependencies": { + "clsx": "^2.1.1", + "next": "14.2.9", "react": "^18", "react-dom": "^18", - "next": "14.2.9" + "tailwind-merge": "^2.5.2" }, "devDependencies": { - "typescript": "^5", "@types/node": "^20", "@types/react": "^18", "@types/react-dom": "^18", + "eslint": "^8", + "eslint-config-next": "14.2.9", "postcss": "^8", "tailwindcss": "^3.4.1", - "eslint": "^8", - "eslint-config-next": "14.2.9" + "typescript": "^5" } } diff --git a/src/app/fonts/ralewayBold.woff b/src/app/fonts/ralewayBold.woff new file mode 100644 index 0000000..647c00a Binary files /dev/null and b/src/app/fonts/ralewayBold.woff differ diff --git a/src/app/globals.css b/src/app/globals.css index 13d40b8..0ce68f1 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -2,7 +2,7 @@ @tailwind components; @tailwind utilities; -:root { +/* :root { --background: #ffffff; --foreground: #171717; } @@ -16,7 +16,7 @@ body { color: var(--foreground); - background: var(--background); + background: var(--foreground); font-family: Arial, Helvetica, sans-serif; } @@ -24,4 +24,4 @@ body { .text-balance { text-wrap: balance; } -} +} */ diff --git a/src/app/layout.tsx b/src/app/layout.tsx index a36cde0..10b1fd5 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,21 +1,26 @@ -import type { Metadata } from "next"; -import localFont from "next/font/local"; -import "./globals.css"; +import type { Metadata } from 'next'; +import localFont from 'next/font/local'; +import './globals.css'; const geistSans = localFont({ - src: "./fonts/GeistVF.woff", - variable: "--font-geist-sans", - weight: "100 900", + src: './fonts/GeistVF.woff', + variable: '--font-geist-sans', + weight: '100 900', }); const geistMono = localFont({ - src: "./fonts/GeistMonoVF.woff", - variable: "--font-geist-mono", - weight: "100 900", + src: './fonts/GeistMonoVF.woff', + variable: '--font-geist-mono', + weight: '100 900', +}); +const railwayBold = localFont({ + src: './fonts/ralewayBold.woff', + variable: '--font-raleway-bold', + weight: '100 900', }); export const metadata: Metadata = { - title: "Create Next App", - description: "Generated by create next app", + title: 'Create Next App', + description: 'Generated by create next app', }; export default function RootLayout({ @@ -26,7 +31,7 @@ export default function RootLayout({ return (
{children} diff --git a/src/app/page.tsx b/src/app/page.tsx index 6fe62d1..9b5b978 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,101 +1,9 @@ -import Image from "next/image"; +import Header from '@/components/header'; export default function Home() { return ( -
- src/app/page.tsx
-
- .
-