From b8a862357ff481f2693628c2ddff6393a479d5f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luc=C3=A0s?= Date: Thu, 23 Mar 2023 15:59:39 +0100 Subject: [PATCH] Use Grid to dashboard Took 22 minutes --- src/components/Navbar.tsx | 8 +++- .../layout/dashboard/left_panel/LeftPanel.jsx | 4 +- src/pages/dashboard.tsx | 46 ++++++++++++------- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index cb54529..8740cdd 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -9,7 +9,11 @@ import { import {useRouter} from 'next/router'; import {signOut, useSession} from 'next-auth/react'; -export default function Navbar() { +type Props = { + variant: "static" | "fixed" +} + +export default function Navbar({variant = "fixed"}: Props) { const router = useRouter(); const {data: session, status} = useSession(); @@ -40,7 +44,7 @@ export default function Navbar() { }; return ( - diff --git a/src/components/layout/dashboard/left_panel/LeftPanel.jsx b/src/components/layout/dashboard/left_panel/LeftPanel.jsx index aa97dcb..6699b75 100644 --- a/src/components/layout/dashboard/left_panel/LeftPanel.jsx +++ b/src/components/layout/dashboard/left_panel/LeftPanel.jsx @@ -4,8 +4,6 @@ import { Box, Image, Text, - Button, - VStack, Spacer, } from '@chakra-ui/react'; import {useRouter} from 'next/router'; @@ -19,7 +17,7 @@ export default function LeftPanel(props) { const {user} = props; return ( - + diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx index 7d800a6..85edd5e 100644 --- a/src/pages/dashboard.tsx +++ b/src/pages/dashboard.tsx @@ -1,40 +1,54 @@ -import {Text} from '@chakra-ui/react'; +import {Grid, GridItem, Text, Box} from '@chakra-ui/react'; import {useSession} from 'next-auth/react'; import {useRouter} from 'next/router'; -import {Flex} from '@chakra-ui/react'; import type {Session} from '@/models/data_models/Session'; -import CardUser from "../components/layout/dashboard/card_user/CardUser"; -import LeftPanel from "../components/layout/dashboard/left_panel/LeftPanel"; +import CardUser from '../components/layout/dashboard/card_user/CardUser'; +import LeftPanel from '../components/layout/dashboard/left_panel/LeftPanel'; import Head from 'next/head'; import {websiteName} from '@/lib/constants'; +import Navbar from '@/components/Navbar'; export default function Dashboard() { const router = useRouter(); const {data: session, status} = useSession(); - if (status === "loading") return Loading... - if (status === "unauthenticated") router.push("/login"); + if (status === 'loading') return Loading...; + if (status === 'unauthenticated') router.push('/login'); - - if (status === "authenticated") { + if (status === 'authenticated') { const {user} = session as unknown as Session; - const refinedUser = {...user, + const refinedUser = { + ...user, age: 21, - aPropos: "Je suis la personne fictive la plus fictive", - images: ["135538.webp"], - passions: ["Sport", "Voiture", "Cuisine"], + aPropos: 'Je suis la personne fictive la plus fictive', + images: ['135538.webp'], + passions: ['Sport', 'Voiture', 'Cuisine'], }; return ( <> {websiteName} | Dashboard - - - - + + + + + + + + + + + + {/*Right top*/} + + + {/*Right Bottom*/} + + ); }