diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 0c04d00..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file diff --git a/app/layout.tsx b/app/layout.tsx index 132f9fb..f82b1ed 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,153 +1,25 @@ -import { useState, useEffect } from "react" -import Link from "next/link" -import JavaText from "./java_tutorial.json" -import { JSX, SVGProps } from "react" +import { Work_Sans } from 'next/font/google' +import './globals.css' +import Navigation from '@/components/navigation'; +import Footer from '@/components/footer'; +const work_sans = Work_Sans({ + subsets: ['latin'], + display: 'swap', + variable: '--font-work_sans', +}) + +// @ts-ignore export default function Layout({ children }) { - const JavaContent = JavaText - const [showButton, setShowButton] = useState(false) + return ( + - useEffect(() => { - const handleScroll = () => { - if (window.scrollY > 300) { - setShowButton(true) - } else { - setShowButton(false) - } - } + + + {children} +