From 7bf2912bbac821cd4b07f79edf1a0e1f7229a547 Mon Sep 17 00:00:00 2001 From: Matt Kirby <MattJKirby@outlook.com> Date: Tue, 14 Mar 2023 18:14:06 +0000 Subject: [PATCH] Basic index page with navbar --- .../src/pages/_document.tsx | 4 ++-- daily-thought-frontend/src/pages/index.tsx | 21 ++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/daily-thought-frontend/src/pages/_document.tsx b/daily-thought-frontend/src/pages/_document.tsx index 54e8bf3e..e331bc75 100644 --- a/daily-thought-frontend/src/pages/_document.tsx +++ b/daily-thought-frontend/src/pages/_document.tsx @@ -2,9 +2,9 @@ import { Html, Head, Main, NextScript } from 'next/document' export default function Document() { return ( - <Html lang="en"> + <Html lang="en" className="h-full bg-white"> <Head /> - <body> + <body className='h-full'> <Main /> <NextScript /> </body> diff --git a/daily-thought-frontend/src/pages/index.tsx b/daily-thought-frontend/src/pages/index.tsx index 9a80770a..6f4371a6 100644 --- a/daily-thought-frontend/src/pages/index.tsx +++ b/daily-thought-frontend/src/pages/index.tsx @@ -2,10 +2,20 @@ import Head from 'next/head' import Image from 'next/image' import { Inter } from 'next/font/google' import Test from './test' +import NavBar from '@/components/navigation/NavBar' +import Hero from '@/components/hero/Hero' const inter = Inter({ subsets: ['latin'] }) +const user = { + Name: 'Tom Cook', + email: 'tom@example.com', + Username: 'TomCook', + Avatar: + 'https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80', +} + export default function Home() { return ( <> @@ -16,7 +26,16 @@ export default function Home() { <link rel="icon" href="/favicon.ico" /> </Head> <main> - <Test /> + <NavBar user={user}> + {user && + <Hero /> + } + {!user && + <div> + logged in + </div> + } + </NavBar> </main> </> ) -- GitLab