From b88ad4e20764f993636ce33b103596e8d27addd1 Mon Sep 17 00:00:00 2001
From: TZGyn <ca538901d@mozmail.com>
Date: Thu, 19 Oct 2023 12:37:11 +0800
Subject: [PATCH] Frontend added layout for each page

---
 react-frontend/src/App.tsx             | 40 ++++++++++++++------------
 react-frontend/src/main.tsx            |  5 +++-
 react-frontend/src/pages/Layout.tsx    | 14 +++++++++
 react-frontend/src/pages/dashboard.tsx | 10 ++-----
 4 files changed, 42 insertions(+), 27 deletions(-)
 create mode 100644 react-frontend/src/pages/Layout.tsx

diff --git a/react-frontend/src/App.tsx b/react-frontend/src/App.tsx
index 10ffd73..f082ce1 100644
--- a/react-frontend/src/App.tsx
+++ b/react-frontend/src/App.tsx
@@ -1,5 +1,4 @@
 import { ModeToggle } from '@/components/mode-toggle'
-import { ThemeProvider } from '@/components/theme-provider'
 import {
 	Dialog,
 	DialogContent,
@@ -29,11 +28,12 @@ import {
 	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu'
+import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import { Toaster } from '@/components/ui/toaster'
 import { useToast } from '@/components/ui/use-toast'
 
-import { Copy, Loader2, MoreHorizontal, Settings } from 'lucide-react'
+import { Copy, Loader2, MoreHorizontal, Settings, User } from 'lucide-react'
 
 import { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
@@ -71,28 +71,22 @@ export default function App() {
 	}, [])
 
 	return (
-		<ThemeProvider
-			defaultTheme='dark'
-			storageKey='vite-ui-theme'>
-			<Navbar getShorteners={getShorteners} />
+		<>
 			<div className='flex justify-center px-2 pt-8'>
 				<div className='w-full max-w-6xl'>
 					<ShortenerTable
 						shorteners={shorteners}
 						isLoading={isLoading}
+						getShorteners={getShorteners}
 					/>
 				</div>
 			</div>
 			<Toaster />
-		</ThemeProvider>
+		</>
 	)
 }
 
-export const Navbar = ({
-	getShorteners,
-}: {
-	getShorteners?: () => Promise<void>
-}) => {
+export const Navbar = () => {
 	const navigate = useNavigate()
 	return (
 		<div className='flex justify-center border-b border-b-border px-2'>
@@ -103,10 +97,13 @@ export const Navbar = ({
 					Shortener
 				</div>
 				<div className='flex items-center gap-2'>
-					{getShorteners && (
-						<CreateShortener getShorteners={getShorteners} />
-					)}
 					<ModeToggle />
+					<Avatar>
+						<AvatarImage src='://github.com/shadcn.png' />
+						<AvatarFallback>
+							<User />
+						</AvatarFallback>
+					</Avatar>
 				</div>
 			</div>
 		</div>
@@ -188,9 +185,11 @@ const CreateShortener = ({
 const ShortenerTable = ({
 	shorteners,
 	isLoading,
+	getShorteners,
 }: {
 	shorteners: Shortener[]
 	isLoading: boolean
+	getShorteners: () => Promise<void>
 }) => {
 	const { toast } = useToast()
 	const copyLinkToClipboard = async (code: string) => {
@@ -204,9 +203,14 @@ const ShortenerTable = ({
 	return (
 		<Card>
 			<CardHeader>
-				<CardTitle className='flex gap-2'>
-					<div>Shorteners</div>
-					{isLoading && <Loader2 className='animate-spin'></Loader2>}
+				<CardTitle className='flex items-center justify-between gap-2'>
+					<div className='flex gap-4'>
+						<div>Shorteners</div>
+						{isLoading && (
+							<Loader2 className='animate-spin'></Loader2>
+						)}
+					</div>
+					<CreateShortener getShorteners={getShorteners} />
 				</CardTitle>
 			</CardHeader>
 			<CardContent>
diff --git a/react-frontend/src/main.tsx b/react-frontend/src/main.tsx
index dd9f1fd..2226c88 100644
--- a/react-frontend/src/main.tsx
+++ b/react-frontend/src/main.tsx
@@ -4,12 +4,15 @@ import App from './App.tsx'
 import './index.css'
 import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom'
 import Dashboard from './pages/dashboard.tsx'
+import { Layout } from './pages/Layout.tsx'
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
 	<React.StrictMode>
 		<BrowserRouter>
 			<Routes>
-				<Route path='/'>
+				<Route
+					path='/'
+					element={<Layout />}>
 					<Route
 						index
 						element={<App />}></Route>
diff --git a/react-frontend/src/pages/Layout.tsx b/react-frontend/src/pages/Layout.tsx
new file mode 100644
index 0000000..327d63a
--- /dev/null
+++ b/react-frontend/src/pages/Layout.tsx
@@ -0,0 +1,14 @@
+import { ThemeProvider } from '@/components/theme-provider'
+import { Navbar } from '@/App.tsx'
+import { Outlet } from 'react-router-dom'
+
+export function Layout() {
+	return (
+		<ThemeProvider
+			defaultTheme='dark'
+			storageKey='vite-ui-theme'>
+			<Navbar />
+			<Outlet />
+		</ThemeProvider>
+	)
+}
diff --git a/react-frontend/src/pages/dashboard.tsx b/react-frontend/src/pages/dashboard.tsx
index 31ce636..23be6c8 100644
--- a/react-frontend/src/pages/dashboard.tsx
+++ b/react-frontend/src/pages/dashboard.tsx
@@ -1,10 +1,7 @@
-import { Navbar } from '@/App'
-import { ThemeProvider } from '@/components/theme-provider'
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import {
 	Table,
 	TableBody,
-	TableCaption,
 	TableCell,
 	TableHead,
 	TableHeader,
@@ -131,10 +128,7 @@ export default function Dashboard() {
 	}
 
 	return (
-		<ThemeProvider
-			defaultTheme='dark'
-			storageKey='vite-ui-theme'>
-			<Navbar />
+		<>
 			<div className='flex justify-center px-2 pt-8'>
 				<div className='max-w-6xl flex-1 space-y-4'>
 					<div className='flex flex-wrap items-center gap-4 text-lg font-bold'>
@@ -241,7 +235,7 @@ export default function Dashboard() {
 				</div>
 			</div>
 			<Toaster />
-		</ThemeProvider>
+		</>
 	)
 }