From d9643ae872215a6b7bce67de244e3ffb86e20580 Mon Sep 17 00:00:00 2001 From: cartagorem Date: Fri, 5 Apr 2024 23:27:25 -0500 Subject: [PATCH] feat: Title with chat button added to main layout --- src/components/ui/Layout/index.tsx | 32 +++++++++++++++++++++++++++--- src/modules/tasks/index.tsx | 12 ++++------- src/pages/tasks/[id]/index.tsx | 2 +- src/pages/tasks/index.tsx | 2 +- 4 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/components/ui/Layout/index.tsx b/src/components/ui/Layout/index.tsx index e8eea1a..505c68b 100644 --- a/src/components/ui/Layout/index.tsx +++ b/src/components/ui/Layout/index.tsx @@ -1,12 +1,14 @@ -import { AppShell, createStyles, Drawer } from "@mantine/core"; +import { AppShell, createStyles, Drawer, Group, Text, ActionIcon } from "@mantine/core"; import { ReactNode, useEffect } from "react"; import { NavbarSearch } from "components/ui/NavBarWithSearch"; import NewTask from "components/ui/Task/newTask"; import { usePlexoContext } from "../../../context/PlexoContext"; +import { IconMessageCircle } from "@tabler/icons-react"; interface LayoutProps { children: ReactNode; + title?: String; } const useStyles = createStyles(theme => ({ @@ -17,8 +19,8 @@ const useStyles = createStyles(theme => ({ }, })); -const Layout = ({ children }: LayoutProps) => { - const { classes } = useStyles(); +const Layout = ({ children, title }: LayoutProps) => { + const { classes, theme } = useStyles(); const { navBarOpened, setNavBarOpened, @@ -86,6 +88,30 @@ const Layout = ({ children }: LayoutProps) => { }, })} > + + + {title} + + + + + + + + {children} diff --git a/src/modules/tasks/index.tsx b/src/modules/tasks/index.tsx index 2bc90f3..257d900 100644 --- a/src/modules/tasks/index.tsx +++ b/src/modules/tasks/index.tsx @@ -444,17 +444,13 @@ export const TasksPageContent = () => { h={73} position="apart" sx={{ - padding: theme.spacing.md, + paddingBottom: theme.spacing.md, + paddingLeft: theme.spacing.md, backgroundColor: theme.colorScheme === "dark" ? theme.colors.dark[8] : theme.colors.gray[0], - "&:not(:last-of-type)": { - borderBottom: `1px solid ${ - theme.colorScheme === "dark" ? theme.colors.dark[4] : theme.colors.gray[3] - }`, - }, }} > - + setNavBarOpened(true)}> @@ -479,7 +475,7 @@ export const TasksPageContent = () => { /> - + { }; TaskPage.getLayout = function getLayout(page: ReactElement) { - return {page}; + return {page}; }; export default TaskPage; diff --git a/src/pages/tasks/index.tsx b/src/pages/tasks/index.tsx index 9b401bb..31ec40c 100644 --- a/src/pages/tasks/index.tsx +++ b/src/pages/tasks/index.tsx @@ -20,7 +20,7 @@ const TasksPage: NextPageWithLayout = () => { }; TasksPage.getLayout = function getLayout(page: ReactElement) { - return {page}; + return {page}; }; export default TasksPage;