diff --git a/apps/docs/images/hero-dark.png b/apps/docs/images/hero-dark.png index 15da8cd2..8bcbfd19 100644 Binary files a/apps/docs/images/hero-dark.png and b/apps/docs/images/hero-dark.png differ diff --git a/apps/docs/images/hero-light.png b/apps/docs/images/hero-light.png index 0c406376..b5805b5e 100644 Binary files a/apps/docs/images/hero-light.png and b/apps/docs/images/hero-light.png differ diff --git a/apps/web/i18n.lock b/apps/web/i18n.lock index 804d1cce..9cdf685d 100644 --- a/apps/web/i18n.lock +++ b/apps/web/i18n.lock @@ -280,7 +280,7 @@ checksums: Self%20Host/singular: 43fbce2027548b712002e489a20a621a Self%20host%20with%20Github/singular: 972155419bcc9f8f9bad9f5ad3538774 self-assigned%20the%20card/singular: 24a8d97bcd747643772ebe883be69698 - Send/singular: 76a8497d7b546628b03bb81d5c1ce995 + Send%20feedback/singular: 9631cc08d49da04475b30a0d320ce97c Senior/singular: 3fff865dc00435f82896fc302ea45630 Settings/singular: 8df6777277469c1fd88cc18dde2f1cc3 Settings%20%7C%20%7B0%7D/singular: b8fc73080bc9c8f4f1403b2a69bd1ac5 @@ -295,6 +295,7 @@ checksums: Software%20Development/singular: 67659097ef6bcb194839858b2c4f3a3c Star%20on%20Github/singular: e5cb0428f1ac6485688f120d78742875 Success/singular: c43827becada6750f7a25890905f38b9 + Support/singular: 55aab5fd0f31a9cb055a2edeeedfaf63 Support%20the%20development%20of%20the%20project/singular: c63bab228ab2b1be4370c668a99cd278 System/singular: 803281c327a02a2feba182f4a2b38311 Teams/singular: b63448c05270497973ac4407047dae02 diff --git a/apps/web/public/hero-dark.png b/apps/web/public/hero-dark.png index 15da8cd2..8bcbfd19 100644 Binary files a/apps/web/public/hero-dark.png and b/apps/web/public/hero-dark.png differ diff --git a/apps/web/public/hero-light.png b/apps/web/public/hero-light.png index 0c406376..b5805b5e 100644 Binary files a/apps/web/public/hero-light.png and b/apps/web/public/hero-light.png differ diff --git a/apps/web/src/components/Dashboard.tsx b/apps/web/src/components/Dashboard.tsx index a2e15a5a..7d94eca8 100644 --- a/apps/web/src/components/Dashboard.tsx +++ b/apps/web/src/components/Dashboard.tsx @@ -1,4 +1,3 @@ -import Link from "next/link"; import { useRef, useState } from "react"; import { TbLayoutSidebarLeftCollapse, @@ -10,8 +9,11 @@ import { import { authClient } from "@kan/auth/client"; import { useClickOutside } from "~/hooks/useClickOutside"; +import { useModal } from "~/providers/modal"; import { useTheme } from "~/providers/theme"; -import FeedbackButton from "./FeedbackButton"; +import { WorkspaceProvider } from "~/providers/workspace"; +import FeedbackModal from "./FeedbackModal"; +import Modal from "./modal"; import SideNavigation from "./SideNavigation"; interface DashboardProps { @@ -20,14 +22,30 @@ interface DashboardProps { hasRightPanel?: boolean; } +export function getDashboardLayout( + page: React.ReactElement, + rightPanel?: React.ReactNode, + hasRightPanel = false, +) { + return ( + + + {page} + + + ); +} + export default function Dashboard({ children, rightPanel, hasRightPanel = false, }: DashboardProps) { const theme = useTheme(); + const { modalContentType } = useModal(); const { data: session, isPending: sessionLoading } = authClient.useSession(); + const [isSideNavOpen, setIsSideNavOpen] = useState(false); const [isRightPanelOpen, setIsRightPanelOpen] = useState(false); @@ -43,6 +61,10 @@ export default function Dashboard({ } }; + const closeSideNav = () => { + setIsSideNavOpen(false); + }; + const toggleRightPanel = () => { setIsRightPanelOpen(!isRightPanelOpen); if (!isRightPanelOpen) { @@ -77,93 +99,84 @@ export default function Dashboard({ height: 100vh; overflow: hidden; min-width: 320px; - background-color: ${!isDarkMode ? "hsl(0deg 0% 97.3%)" : "#161616"}; + background-color: ${!isDarkMode ? "hsl(0deg 0% 97.3%)" : "#1c1c1c"}; } `} -
-
-
+
+ {/* Mobile Header */} +
+ + + {hasRightPanel && ( - - -

- kan.bn -

- - -
- {hasRightPanel && ( - - )} -
- -
-
-
+ )}
-
+
-
-
{children}
+
+
+
{children}
- {/* Mobile Right Panel */} - {hasRightPanel && rightPanel && ( -
-
{rightPanel}
-
- )} + {/* Mobile Right Panel */} + {hasRightPanel && rightPanel && ( +
+
{rightPanel}
+
+ )} - {/* Desktop Right Panel */} - {hasRightPanel && rightPanel && ( -
{rightPanel}
- )} + {/* Desktop Right Panel */} + {hasRightPanel && rightPanel && ( +
{rightPanel}
+ )} +
diff --git a/apps/web/src/components/Editor.tsx b/apps/web/src/components/Editor.tsx index 82394dec..3f274bdc 100644 --- a/apps/web/src/components/Editor.tsx +++ b/apps/web/src/components/Editor.tsx @@ -350,7 +350,6 @@ export default function Editor({