From de7e334453497e8a3d9e396938be98f9a9e3b419 Mon Sep 17 00:00:00 2001
From: AlexSserb <aserbin190@gmail.com>
Date: Tue, 19 Aug 2025 18:11:17 +0400
Subject: [PATCH] feat: project select in the boards row

---
 .../deals/components/shared/Boards/Boards.tsx |  1 +
 .../deals/components/shared/Header/Header.tsx | 39 +++++++++++--------
 .../StatusColumnWrapper.module.css            |  1 +
 .../StatusColumnWrapper.tsx                   |  2 +-
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/app/deals/components/shared/Boards/Boards.tsx b/src/app/deals/components/shared/Boards/Boards.tsx
index f056317..fa9db64 100644
--- a/src/app/deals/components/shared/Boards/Boards.tsx
+++ b/src/app/deals/components/shared/Boards/Boards.tsx
@@ -32,6 +32,7 @@ const Boards = () => {
             mt={"xs"}
             mb={"sm"}>
             <Group
+                align={"end"}
                 wrap={"nowrap"}
                 gap={0}>
                 <SortableDnd
diff --git a/src/app/deals/components/shared/Header/Header.tsx b/src/app/deals/components/shared/Header/Header.tsx
index c6fa8c1..b16a05d 100644
--- a/src/app/deals/components/shared/Header/Header.tsx
+++ b/src/app/deals/components/shared/Header/Header.tsx
@@ -22,13 +22,18 @@ const Header = () => {
         return (
             <Group
                 w={"100%"}
+                gap={0}
                 justify={"end"}
-                wrap={"nowrap"}
-                pr={"md"}>
+                wrap={"nowrap"}>
+                <Boards />
                 <ProjectSelect
                     data={projects}
                     value={selectedProject}
                     onChange={value => value && setSelectedProject(value)}
+                    style={{
+                        borderBottom: "solid gray 2px",
+                        paddingBottom: 5,
+                    }}
                 />
             </Group>
         );
@@ -36,19 +41,22 @@ const Header = () => {
 
     const getMobileHeader = () => {
         return (
-            <Group justify={"space-between"}>
-                <Box
-                    p={"md"}
-                    onClick={() => setIsProjectsDrawerOpened(true)}>
-                    <IconChevronLeft />
-                </Box>
-                <Text>{selectedProject?.name}</Text>
-                <Box
-                    p={"md"}
-                    onClick={() => setIsEditorDrawerOpened(true)}>
-                    <IconSettings />
-                </Box>
-            </Group>
+            <>
+                <Group justify={"space-between"}>
+                    <Box
+                        p={"md"}
+                        onClick={() => setIsProjectsDrawerOpened(true)}>
+                        <IconChevronLeft />
+                    </Box>
+                    <Text>{selectedProject?.name}</Text>
+                    <Box
+                        p={"md"}
+                        onClick={() => setIsEditorDrawerOpened(true)}>
+                        <IconSettings />
+                    </Box>
+                </Group>
+                <Boards />
+            </>
         );
     };
 
@@ -60,7 +68,6 @@ const Header = () => {
                 gap={0}
                 w={"100%"}>
                 {isMobile ? getMobileHeader() : getDesktopHeader()}
-                <Boards />
             </Stack>
         </Group>
     );
diff --git a/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.module.css b/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.module.css
index 3a1a715..cb79ab1 100644
--- a/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.module.css
+++ b/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.module.css
@@ -1,5 +1,6 @@
 
 .container {
+    height: calc(100vh - 150px);
     @media (max-width: 48em) {
         width: 80vw;
         height: calc(100vh - 200px);
diff --git a/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.tsx b/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.tsx
index 0a8d9bf..2a76e42 100644
--- a/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.tsx
+++ b/src/app/deals/components/shared/StatusColumnWrapper/StatusColumnWrapper.tsx
@@ -22,7 +22,7 @@ const StatusColumnWrapper = ({ renderHeader, children }: Props) => {
                     scrollbarSize={10}
                     type={"always"}
                     scrollbars={"y"}>
-                    <Stack mah={"calc(100vh - 250px)"}>{children}</Stack>
+                    <Stack mah={"calc(100vh - 220px)"}>{children}</Stack>
                 </ScrollArea>
             </Stack>
         </Box>