diff --git a/src/app/deals/components/shared/Boards/Boards.tsx b/src/app/deals/components/shared/Boards/Boards.tsx index fa9db64..c62dec6 100644 --- a/src/app/deals/components/shared/Boards/Boards.tsx +++ b/src/app/deals/components/shared/Boards/Boards.tsx @@ -1,7 +1,7 @@ "use client"; import React from "react"; -import { Group, ScrollArea } from "@mantine/core"; +import { Group, ScrollArea, Space } from "@mantine/core"; import Board from "@/app/deals/components/shared/Board/Board"; import CreateBoardButton from "@/app/deals/components/shared/CreateBoardButton/CreateBoardButton"; import { useBoardsContext } from "@/app/deals/contexts/BoardsContext"; @@ -24,29 +24,31 @@ const Boards = () => { }; return ( - - - - - - + <> + + + + + + + + + + ); }; diff --git a/src/app/deals/components/shared/CreateBoardButton/CreateBoardButton.module.css b/src/app/deals/components/shared/CreateBoardButton/CreateBoardButton.module.css index 8c612de..6dc2462 100644 --- a/src/app/deals/components/shared/CreateBoardButton/CreateBoardButton.module.css +++ b/src/app/deals/components/shared/CreateBoardButton/CreateBoardButton.module.css @@ -1,12 +1,10 @@ .create-button { padding: 10px 10px 9px; - border-bottom: 2px solid gray; cursor: pointer; } .spacer { height: 45px; - border-bottom: 2px solid gray; width: 100%; } diff --git a/src/app/deals/components/shared/CreateBoardButton/CreateBoardButton.tsx b/src/app/deals/components/shared/CreateBoardButton/CreateBoardButton.tsx index 7d39267..edf6d37 100644 --- a/src/app/deals/components/shared/CreateBoardButton/CreateBoardButton.tsx +++ b/src/app/deals/components/shared/CreateBoardButton/CreateBoardButton.tsx @@ -1,5 +1,5 @@ import { IconPlus } from "@tabler/icons-react"; -import { Box, Space } from "@mantine/core"; +import { Box, Flex } from "@mantine/core"; import { useBoardsContext } from "@/app/deals/contexts/BoardsContext"; import InPlaceInput from "@/components/ui/InPlaceInput/InPlaceInput"; import styles from "./CreateBoardButton.module.css"; @@ -8,7 +8,7 @@ const CreateBoardButton = () => { const { onCreateBoard } = useBoardsContext(); return ( - <> + { )} modalTitle={"Создание доски"} - inputStyles={{ - wrapper: { - paddingTop: 3, - paddingBottom: 4, - paddingInline: 15, - borderBottom: "2px solid gray", - }, - }} /> - - + ); }; diff --git a/src/app/deals/components/shared/Header/Header.tsx b/src/app/deals/components/shared/Header/Header.tsx index b16a05d..83d12d8 100644 --- a/src/app/deals/components/shared/Header/Header.tsx +++ b/src/app/deals/components/shared/Header/Header.tsx @@ -1,7 +1,7 @@ "use client"; import { IconChevronLeft, IconSettings } from "@tabler/icons-react"; -import { Box, Group, Stack, Text } from "@mantine/core"; +import { Box, Flex, Group, Stack, Text } from "@mantine/core"; import Boards from "@/app/deals/components/shared/Boards/Boards"; import { useBoardsContext } from "@/app/deals/contexts/BoardsContext"; import { useProjectsContext } from "@/app/deals/contexts/ProjectsContext"; @@ -17,25 +17,28 @@ const Header = () => { } = useProjectsContext(); const { setIsEditorDrawerOpened } = useBoardsContext(); const isMobile = useIsMobile(); - const getDesktopHeader = () => { return ( - + - value && setSelectedProject(value)} - style={{ - borderBottom: "solid gray 2px", - paddingBottom: 5, - }} + - + + value && setSelectedProject(value)} + /> + + ); }; diff --git a/src/app/deals/page.tsx b/src/app/deals/page.tsx index 8c129f9..94b900a 100644 --- a/src/app/deals/page.tsx +++ b/src/app/deals/page.tsx @@ -9,6 +9,7 @@ import ProjectsEditorDrawer from "@/app/deals/drawers/ProjectsEditorDrawer"; import PageBlock from "@/components/layout/PageBlock/PageBlock"; import PageContainer from "@/components/layout/PageContainer/PageContainer"; import { DealsContextProvider } from "./contexts/DealsContext"; +import { Space } from "@mantine/core"; export default function DealsPage() { return ( @@ -17,6 +18,7 @@ export default function DealsPage() {
+ diff --git a/src/components/layout/Footer/Footer.tsx b/src/components/layout/Footer/Footer.tsx index 1e77081..0b35482 100644 --- a/src/components/layout/Footer/Footer.tsx +++ b/src/components/layout/Footer/Footer.tsx @@ -1,7 +1,9 @@ import { IconCircleDotted, IconLayoutKanban } from "@tabler/icons-react"; -import FooterButtons from "@/components/layout/Footer/FooterButtons"; +import FooterButtons, { + LinkData, +} from "@/components/layout/Footer/FooterButtons"; -const buttonsData = [ +const buttonsData: LinkData[] = [ { icon: IconLayoutKanban, label: "Сделки", diff --git a/src/components/layout/Footer/FooterButtons.tsx b/src/components/layout/Footer/FooterButtons.tsx index fad5d30..9f671f8 100644 --- a/src/components/layout/Footer/FooterButtons.tsx +++ b/src/components/layout/Footer/FooterButtons.tsx @@ -3,7 +3,7 @@ import { Group, Stack, Text } from "@mantine/core"; import FooterClickable from "@/components/layout/Footer/FooterClickable"; import styles from "./Footer.module.css"; -type LinkData = { +export type LinkData = { icon: typeof IconPlus; label: string; href: string;