diff --git a/next.config.ts b/next.config.ts index e9ffa30..8ff99fb 100644 --- a/next.config.ts +++ b/next.config.ts @@ -2,6 +2,9 @@ import type { NextConfig } from "next"; const nextConfig: NextConfig = { /* config options here */ + experimental: { + optimizePackageImports: ["@chakra-ui/react"], + }, }; export default nextConfig; diff --git a/package.json b/package.json index 30a434f..82f67f9 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": "true", "scripts": { - "dev": "next dev --turbo", + "dev": "next dev", "build": "next build", "start": "next start", "lint": "next lint" diff --git a/src/app/layout.tsx b/src/app/layout.tsx index c8749a1..bb7df44 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,15 +1,18 @@ +import { Provider } from "../components/ui/provider" import "../styles/globals.css"; export const metadata = { title: 'Next.js', description: 'Generated by Next.js', } -export default function RootLayout({ children,}: { - children: React.ReactNode -}) { +export default function RootLayout(props: { children: React.ReactNode }) { + const { children } = props; + return ( - - {children} + + + {children} + ) } \ No newline at end of file diff --git a/src/app/page.tsx b/src/app/page.tsx index 14e3886..fa2a9cd 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -9,12 +9,13 @@ import { ChakraProvider } from "@chakra-ui/react"; export default function Home() { return (
-
+
); } \ No newline at end of file diff --git a/src/components/Contact/index.tsx b/src/components/Contact/index.tsx index 80c56f5..2508867 100644 --- a/src/components/Contact/index.tsx +++ b/src/components/Contact/index.tsx @@ -10,13 +10,15 @@ export default function Contact() {

Have questions or feedback? We’d love to hear from you!

+ Email Us + ) diff --git a/src/components/Footer /index.tsx b/src/components/Footer /index.tsx index 80e8a06..7187511 100644 --- a/src/components/Footer /index.tsx +++ b/src/components/Footer /index.tsx @@ -6,7 +6,8 @@ export default function Footer() { ( ) diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx deleted file mode 100644 index 015a718..0000000 --- a/src/components/Header/Header.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import { Box, Flex, Link, Heading } from "@chakra-ui/react"; -import NextLink from "next/link"; - -const Header: React.FC = () => { - return ( - <> - - - - - - Ballistic Builder - - - - - - - Builder - - - - - Products - - - - - Sign In - - - - - - - ); -}; - -export default Header; \ No newline at end of file diff --git a/src/components/Header/index-no-chakura.tsx b/src/components/Header/index-no-chakura.tsx new file mode 100644 index 0000000..737b26d --- /dev/null +++ b/src/components/Header/index-no-chakura.tsx @@ -0,0 +1,23 @@ +import Link from "next/link"; + +export default function Header() { + {/* Header Section */ } + return ( + ( +
+
+

Ballistic Builder

+ +
+ +
+ + ) +)} \ No newline at end of file diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx index 737b26d..6219d1e 100644 --- a/src/components/Header/index.tsx +++ b/src/components/Header/index.tsx @@ -1,23 +1,41 @@ -import Link from "next/link"; +import { Box, Flex, Link, Heading } from "@chakra-ui/react"; +import NextLink from "next/link"; -export default function Header() { - {/* Header Section */ } +const Header: React.FC = () => { return ( - ( -
-
-

Ballistic Builder

- -
+ <> + + + -
+ {/* */} + + Ballistic Builder + + {/* */} - ) -)} \ No newline at end of file + + + {/* */} + + Builder + + {/* */} + {/* */} + + Products + + {/* */} + {/* */} + + Sign In + + {/* */} + + + + + ); +}; + +export default Header; \ No newline at end of file diff --git a/src/components/Hero/index.tsx b/src/components/Hero/index.tsx index 425361f..b0e2c11 100644 --- a/src/components/Hero/index.tsx +++ b/src/components/Hero/index.tsx @@ -10,6 +10,7 @@ export default function Hero() {

Customize every component of your firearm with ease and precision.

+ @@ -17,6 +18,7 @@ export default function Hero() { Get Started + diff --git a/src/pages/page-orig.tsx b/src/pages/page-orig.tsx index fc9d5a8..372e4da 100644 --- a/src/pages/page-orig.tsx +++ b/src/pages/page-orig.tsx @@ -78,7 +78,7 @@ export default function Home() { Have questions or feedback? We’d love to hear from you!

Email Us @@ -89,7 +89,7 @@ export default function Home() { {/* Footer Section */} ) diff --git a/tsconfig.json b/tsconfig.json index 8d33018..3868325 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,7 +20,8 @@ } ], "paths": { - "@/*": ["./*"], + "@/*": ["./src/*"], + "components/*": [ "/src/app/components/*" ],