From 8e61cef81dd3f7b9664c2f003d60c558d290843b Mon Sep 17 00:00:00 2001 From: jojopirker Date: Wed, 4 Jan 2023 20:22:06 +0100 Subject: [PATCH] added getDashboardLayout --- website/src/components/Layout.tsx | 7 +++++++ website/src/pages/dashboard.tsx | 10 +++------- website/src/pages/messages/index.tsx | 13 ++++--------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/website/src/components/Layout.tsx b/website/src/components/Layout.tsx index 3564d765..bf662113 100644 --- a/website/src/components/Layout.tsx +++ b/website/src/components/Layout.tsx @@ -25,4 +25,11 @@ export const getTransparentHeaderLayout = (page: React.ReactElement) => ( ); +export const getDashboardLayout = (page: React.ReactElement) => ( +
+
+ {page} +
+); + export const noLayout = (page: React.ReactElement) => page; diff --git a/website/src/pages/dashboard.tsx b/website/src/pages/dashboard.tsx index dfc5cb03..8b1f6861 100644 --- a/website/src/pages/dashboard.tsx +++ b/website/src/pages/dashboard.tsx @@ -1,6 +1,7 @@ import { Box, useColorMode } from "@chakra-ui/react"; import Head from "next/head"; -import { Header } from "src/components/Header"; + +import { getDashboardLayout } from "src/components/Layout"; import { LeaderboardTable, SideMenu, TaskOption } from "src/components/Dashboard"; import { colors } from "styles/Theme/colors"; @@ -27,11 +28,6 @@ const Dashboard = () => { ); }; -Dashboard.getLayout = (page) => ( -
-
- {page} -
-); +Dashboard.getLayout = (page) => getDashboardLayout(page); export default Dashboard; diff --git a/website/src/pages/messages/index.tsx b/website/src/pages/messages/index.tsx index ff13d8a4..a466b710 100644 --- a/website/src/pages/messages/index.tsx +++ b/website/src/pages/messages/index.tsx @@ -5,9 +5,9 @@ import useSWRImmutable from "swr/immutable"; import fetcher from "src/lib/fetcher"; import { SideMenu } from "src/components/Dashboard"; -import { Header } from "src/components/Header"; -import { colors } from "styles/Theme/colors"; import { MessageTable } from "src/components/Messages/MessageTable"; +import { getDashboardLayout } from "src/components/Layout"; +import { colors } from "styles/Theme/colors"; const MessagesDashboard = () => { const bgColor = useColorModeValue(colors.light.bg, colors.dark.bg); @@ -39,7 +39,7 @@ const MessagesDashboard = () => { - + Most recent messages @@ -56,11 +56,6 @@ const MessagesDashboard = () => { ); }; -MessagesDashboard.getLayout = (page) => ( -
-
- {page} -
-); +MessagesDashboard.getLayout = (page) => getDashboardLayout(page); export default MessagesDashboard;