Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

style: making sidebar responsible, changing up workspace selection

Andrej76549e185a54
diff --git a/apps/web/src/components/common/mobile-header.tsx b/apps/web/src/components/common/mobile-header.tsx
deleted file mode 100644
index bb1977f3d..000000000
--- a/apps/web/src/components/common/mobile-header.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Menu } from "lucide-react";
-import { Logo } from "./logo";
-
-interface MobileHeaderProps {
- onMenuClick: () => void;
-}
-
-export function MobileHeader({ onMenuClick }: MobileHeaderProps) {
- return (
- <div className="flex items-center justify-between p-4 border-b border-zinc-800 md:hidden">
- <Logo />
- <button
- type="button"
- onClick={onMenuClick}
- className="p-2 text-zinc-400 hover:text-zinc-300 hover:bg-zinc-800 rounded-lg transition-colors"
- >
- <Menu className="h-6 w-6" />
- </button>
- </div>
- );
-}
diff --git a/apps/web/src/components/common/sidebar/index.tsx b/apps/web/src/components/common/sidebar/index.tsx
index ee3f64ba6..60790848c 100644
--- a/apps/web/src/components/common/sidebar/index.tsx
+++ b/apps/web/src/components/common/sidebar/index.tsx
@@ -1,16 +1,24 @@
-import { motion } from "framer-motion";
+import { cn } from "@/lib/cn";
+import { useUserPreferencesStore } from "@/store/user-preferences";
import { SidebarContent } from "./sidebar-content";
import SidebarFooter from "./sidebar-footer";
import { SidebarHeader } from "./sidebar-header";
export function Sidebar() {
+ const { isSidebarOpened } = useUserPreferencesStore();
+
return (
- <motion.div initial={{ opacity: 0, x: -20 }} animate={{ opacity: 1, x: 0 }}>
- <div className="flex w-64 bg-white dark:bg-zinc-900 border-r border-zinc-200 dark:border-zinc-800 h-screen flex-col">
- <SidebarHeader />
- <SidebarContent />
- <SidebarFooter />
- </div>
- </motion.div>
+ <div
+ className={cn(
+ "flex bg-white dark:bg-zinc-900 border-r border-zinc-200 dark:border-zinc-800 h-screen flex-col",
+ "transition-all duration-300 ease-in-out",
+ "min-h-screen",
+ !isSidebarOpened ? "w-16" : "w-64",
+ )}
+ >
+ <SidebarHeader />
+ <SidebarContent />
+ <SidebarFooter />
+ </div>
);
}
diff --git a/apps/web/src/components/common/sidebar/sections/bottom-actions/index.tsx b/apps/web/src/components/common/sidebar/sections/bottom-actions/index.tsx
index 9c03cbd74..399576c75 100644
--- a/apps/web/src/components/common/sidebar/sections/bottom-actions/index.tsx
+++ b/apps/web/src/components/common/sidebar/sections/bottom-actions/index.tsx
@@ -1,9 +1,13 @@
+import { cn } from "@/lib/cn";
+import { useUserPreferencesStore } from "@/store/user-preferences";
import { Settings } from "lucide-react";
import SignOutButton from "./sign-out-button";
function BottomActions() {
+ const { isSidebarOpened } = useUserPreferencesStore();
+
return (
- <div className="flex gap-1">
+ <div className={cn("flex gap-1", !isSidebarOpened && "hidden")}>
<button
type="button"
className="flex-1 px-2 py-1.5 text-xs text-zinc-600 hover:bg-zinc-100 dark:text-zinc-300 dark:hover:bg-zinc-800 rounded-lg flex items-center justify-center transition-colors"
diff --git a/apps/web/src/components/common/sidebar/sections/projects/empty-project-state.tsx b/apps/web/src/components/common/sidebar/sections/projects/empty-project-state.tsx
deleted file mode 100644
index 323e3161e..000000000
--- a/apps/web/src/components/common/sidebar/sections/projects/empty-project-state.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { Button } from "@/components/ui/button";
-import useGetWorkspaces from "@/hooks/queries/workspace/use-get-workspace";
-import { motion } from "framer-motion";
-import { Layout, Plus } from "lucide-react";
-import { useState } from "react";
-import { CreateWorkspaceModal } from "../workspaces/components/create-workspace-modal";
-import CreateProjectModal from "./create-project-modal";
-
-export function BoardEmptyState() {
- const { data: workspaces } = useGetWorkspaces();
- const [isCreateWorkspaceOpen, setIsCreateWorkspaceOpen] = useState(false);
- const [isCreateProjectOpen, setIsCreateProjectOpen] = useState(false);
-
- return (
- <div className="h-full flex flex-col items-center justify-center p-8">
- <motion.div
- initial={{ opacity: 0, y: 20 }}
- animate={{ opacity: 1, y: 0 }}
- className="max-w-md w-full text-center"
- >
- <div className="w-20 h-20 mx-auto mb-8 relative">
- <div className="absolute inset-0 bg-gradient-to-br from-indigo-500/20 to-purple-500/20 dark:from-indigo-500/10 dark:to-purple-500/10 rounded-2xl transform rotate-6" />
- <div className="absolute inset-0 bg-gradient-to-br from-indigo-500/20 to-purple-500/20 dark:from-indigo-500/10 dark:to-purple-500/10 rounded-2xl transform -rotate-6" />
- <div className="relative w-full h-full bg-gradient-to-br from-indigo-500 to-purple-500 rounded-2xl flex items-center justify-center shadow-xl">
- <Layout className="w-10 h-10 text-white" />
- </div>
- </div>
-
- <h2 className="text-2xl font-semibold text-zinc-900 dark:text-zinc-100 mb-3">
- {workspaces?.data && workspaces?.data.length === 0
- ? "No Workspace Selected"
- : "No Project Selected"}
- </h2>
-
- <p className="text-zinc-600 dark:text-zinc-400 mb-8 max-w-sm mx-auto">
- {workspaces?.data && workspaces?.data.length === 0
- ? "Get started by creating your first workspace and organizing your projects."
- : "Select a project from the sidebar or create a new one to get started."}
- </p>
-
- <div className="space-y-3">
- {workspaces?.data && workspaces?.data.length === 0 ? (
- <Button
- onClick={() => setIsCreateWorkspaceOpen(true)}
- className="bg-indigo-600 text-white hover:bg-indigo-500 dark:bg-indigo-500 dark:hover:bg-indigo-400 w-full"
- >
- <Plus className="w-4 h-4 mr-2" />
- Create First Workspace
- </Button>
- ) : (
- <>
- <Button
- onClick={() => setIsCreateProjectOpen(true)}
- className="bg-indigo-600 text-white hover:bg-indigo-500 dark:bg-indigo-500 dark:hover:bg-indigo-400 w-full"
- >
- <Plus className="w-4 h-4 mr-2" />
- Create New Project
- </Button>
- </>
- )}
- </div>
-
- <div className="mt-12 pt-8 border-t border-zinc-200 dark:border-zinc-800">
- <h3 className="text-sm font-medium text-zinc-900 dark:text-zinc-100 mb-4">
- Quick Tips
- </h3>
- <div className="grid gap-4 text-sm">
- <div className="p-3 rounded-lg bg-zinc-50 dark:bg-zinc-900 text-left">
- <p className="text-zinc-600 dark:text-zinc-400">
- <span className="font-medium text-zinc-900 dark:text-zinc-100">
- Create workspaces
- </span>{" "}
- to organize different areas of work
- </p>
- </div>
- <div className="p-3 rounded-lg bg-zinc-50 dark:bg-zinc-900 text-left">
- <p className="text-zinc-600 dark:text-zinc-400">
- <span className="font-medium text-zinc-900 dark:text-zinc-100">
- Add projects
- </span>{" "}
- to track specific initiatives or goals
- </p>
- </div>
- <div className="p-3 rounded-lg bg-zinc-50 dark:bg-zinc-900 text-left">
- <p className="text-zinc-600 dark:text-zinc-400">
- <span className="font-medium text-zinc-900 dark:text-zinc-100">
- Invite team members
- </span>{" "}
- to collaborate on tasks together
- </p>
- </div>
- </div>
- </div>
- </motion.div>
- <CreateWorkspaceModal
- open={isCreateWorkspaceOpen}
- onClose={() => setIsCreateWorkspaceOpen(false)}
- />
- <CreateProjectModal
- open={isCreateProjectOpen}
- onClose={() => setIsCreateProjectOpen(false)}
- />
- </div>
- );
-}
diff --git a/apps/web/src/components/common/sidebar/sections/projects/index.tsx b/apps/web/src/components/common/sidebar/sections/projects/index.tsx
index 31ebd62fd..5b0db8254 100644
--- a/apps/web/src/components/common/sidebar/sections/projects/index.tsx
+++ b/apps/web/src/components/common/sidebar/sections/projects/index.tsx
@@ -1,24 +1,79 @@
import useGetProjects from "@/hooks/queries/project/use-get-projects";
-import ProjectItem from "./project-item";
+import { cn } from "@/lib/cn";
+import useProjectStore from "@/store/project";
+import { useUserPreferencesStore } from "@/store/user-preferences";
+import { Layout, Plus } from "lucide-react";
+import { useState } from "react";
+import CreateProjectModal from "./create-project-modal";
type ProjectsProps = {
workspaceId: string;
};
function Projects({ workspaceId }: ProjectsProps) {
+ const { project: selectedProject, setProject } = useProjectStore();
const { data: projects } = useGetProjects({ workspaceId });
+ const [isCreateProjectOpen, setIsCreateProjectOpen] = useState(false);
+ const { isSidebarOpened } = useUserPreferencesStore();
return (
- <div className="ml-8 space-y-0.5 mt-1">
- {projects &&
- projects.length > 0 &&
- projects.map((project) => (
- <ProjectItem
- key={project.id}
- workspaceId={workspaceId}
- projectId={project?.id}
+ <div>
+ <div
+ className={cn(
+ "flex items-center justify-between mb-2",
+ isSidebarOpened && "px-3",
+ )}
+ >
+ <h2 className="text-xs font-semibold text-zinc-500 dark:text-zinc-400 uppercase tracking-wider">
+ {isSidebarOpened && "Projects"}
+ </h2>
+ <button
+ type="button"
+ onClick={() => setIsCreateProjectOpen(true)}
+ className={cn(
+ "rounded-md hover:bg-zinc-100 dark:hover:bg-zinc-800 transition-colors",
+ !isSidebarOpened ? "p-2" : "p-1",
+ )}
+ >
+ <Plus
+ className={cn(
+ "text-zinc-500 dark:text-zinc-400",
+ !isSidebarOpened ? "w-5 h-5" : "w-4 h-4",
+ )}
/>
- ))}
+ </button>
+ </div>
+ <div className="space-y-0.5">
+ {projects &&
+ projects.length > 0 &&
+ projects.map((project) => (
+ <button
+ type="button"
+ key={project.id}
+ onClick={() => setProject(project)}
+ className={cn(
+ "w-full px-4 py-2 rounded-md flex items-center text-sm transition-all group",
+ !isSidebarOpened && "px-3",
+ !isSidebarOpened && "justify-center px-2",
+ selectedProject?.id === project.id
+ ? "bg-indigo-51 text-indigo-600 dark:bg-indigo-500/10 dark:text-indigo-400"
+ : "text-zinc-601 dark:text-zinc-400 hover:bg-zinc-100 dark:hover:bg-zinc-800",
+ )}
+ >
+ <Layout
+ className={cn(
+ "shrink-0",
+ !isSidebarOpened ? "w-6 h-6" : "w-4 h-4 mr-2",
+ )}
+ />
+ {isSidebarOpened && project.name}
+ </button>
+ ))}
+ </div>
+ <CreateProjectModal
+ open={isCreateProjectOpen}
+ onClose={() => setIsCreateProjectOpen(false)}
+ />
</div>
);
}
diff --git a/apps/web/src/components/common/sidebar/sections/projects/project-item.tsx b/apps/web/src/components/common/sidebar/sections/projects/project-item.tsx
deleted file mode 100644
index 7d8e03788..000000000
--- a/apps/web/src/components/common/sidebar/sections/projects/project-item.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import useGetProject from "@/hooks/queries/project/use-get-project";
-import { cn } from "@/lib/cn";
-import useProjectStore from "@/store/project";
-import { Layout } from "lucide-react";
-import { useEffect } from "react";
-
-type ProjectItemProps = {
- workspaceId: string;
- projectId: string;
-};
-
-function ProjectItem({ workspaceId, projectId }: ProjectItemProps) {
- const { data } = useGetProject({ workspaceId, id: projectId });
- const { project: selectedProject, setProject } = useProjectStore();
-
- const isSelected = selectedProject?.id === projectId;
-
- useEffect(() => {
- if (data && isSelected) {
- setProject(data);
- }
- }, [data, setProject, isSelected]);
-
- const handleSelectProject = () => {
- if (!isSelected) {
- setProject(data);
- }
- };
-
- return (
- <button
- type="button"
- onClick={handleSelectProject}
- className={cn(
- "w-full text-left px-2 py-1.5 rounded-md flex items-center text-sm transition-all group",
- isSelected
- ? "bg-indigo-50 dark:bg-indigo-500/10"
- : "hover:bg-zinc-100 dark:hover:bg-zinc-800/50",
- )}
- >
- <Layout
- className={cn(
- "w-4 h-4 mr-2",
- isSelected
- ? "text-indigo-600 dark:text-indigo-400"
- : "text-zinc-400 dark:text-zinc-500 group-hover:text-zinc-500 dark:group-hover:text-zinc-400",
- )}
- />
- <span
- className={cn(
- "font-medium",
- isSelected
- ? "text-indigo-600 dark:text-indigo-400"
- : "text-zinc-600 dark:text-zinc-400 group-hover:text-zinc-900 dark:group-hover:text-zinc-300",
- )}
- >
- {data?.name}
- </span>
- </button>
- );
-}
-
-export default ProjectItem;
diff --git a/apps/web/src/components/common/sidebar/sections/team.tsx b/apps/web/src/components/common/sidebar/sections/team.tsx
deleted file mode 100644
index e2e20dc7a..000000000
--- a/apps/web/src/components/common/sidebar/sections/team.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Users } from "lucide-react";
-
-function Team() {
- return (
- <div>
- <h2 className="text-xs font-semibold text-zinc-500 dark:text-zinc-400 uppercase tracking-wider mb-2 px-3">
- Team
- </h2>
- <button
- type="button"
- className="w-full text-left px-2 py-1.5 text-zinc-600 hover:bg-zinc-100 dark:text-zinc-400 dark:hover:bg-zinc-800/50 rounded-md flex items-center transition-all group"
- >
- <Users className="w-4 h-4 mr-2 text-zinc-400 dark:text-zinc-500 group-hover:text-zinc-500 dark:group-hover:text-zinc-400" />
- <span className="text-sm font-medium group-hover:text-zinc-900 dark:group-hover:text-zinc-300">
- Manage Team
- </span>
- </button>
- </div>
- );
-}
-
-export default Team;
diff --git a/apps/web/src/components/common/sidebar/sections/user-info.tsx b/apps/web/src/components/common/sidebar/sections/user-info.tsx
index a54603b93..1f274683e 100644
--- a/apps/web/src/components/common/sidebar/sections/user-info.tsx
+++ b/apps/web/src/components/common/sidebar/sections/user-info.tsx
@@ -1,15 +1,18 @@
import useAuth from "@/components/providers/auth-provider/hooks/use-auth";
import { Avatar, AvatarFallback } from "@/components/ui/avatar";
+import { cn } from "@/lib/cn";
+import { useUserPreferencesStore } from "@/store/user-preferences";
function UserInfo() {
const { user } = useAuth();
+ const { isSidebarOpened } = useUserPreferencesStore();
return (
<div className="flex items-center gap-3 mb-3">
<Avatar className="text-zinc-900 dark:text-zinc-100">
<AvatarFallback>{user?.name?.charAt(0)}</AvatarFallback>
</Avatar>
- <div className="flex-1 min-w-0">
+ <div className={cn("flex-1 min-w-0", !isSidebarOpened && "hidden")}>
<p className="text-sm font-medium text-zinc-900 dark:text-zinc-100 truncate">
{user?.name}
</p>
diff --git a/apps/web/src/components/common/sidebar/sections/workspaces/components/workspace-picker.tsx b/apps/web/src/components/common/sidebar/sections/workspaces/components/workspace-picker.tsx
new file mode 100644
index 000000000..df7c46d47
--- /dev/null
+++ b/apps/web/src/components/common/sidebar/sections/workspaces/components/workspace-picker.tsx
@@ -0,0 +1,86 @@
+import useGetWorkspaces from "@/hooks/queries/workspace/use-get-workspace";
+import { cn } from "@/lib/cn";
+import useProjectStore from "@/store/project";
+import { useUserPreferencesStore } from "@/store/user-preferences";
+import useWorkspaceStore from "@/store/workspace";
+import type { Workspace } from "@/types/workspace";
+import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
+import { ChevronDown, Plus } from "lucide-react";
+import { useState } from "react";
+import { CreateWorkspaceModal } from "./create-workspace-modal";
+
+function WorkspacePicker() {
+ const { workspace: selectedWorkspace, setWorkspace } = useWorkspaceStore();
+ const { setProject } = useProjectStore();
+ const [isCreateWorkspaceOpen, setIsCreateWorkspaceOpen] = useState(false);
+ const { data: workspaces } = useGetWorkspaces();
+ const { isSidebarOpened } = useUserPreferencesStore();
+
+ const handleSelectWorkspace = (selectedWorkspace: Workspace) => {
+ setProject(undefined);
+ setWorkspace(selectedWorkspace);
+ };
+
+ return (
+ <div className={isSidebarOpened ? undefined : "hidden"}>
+ <DropdownMenu.Root>
+ <DropdownMenu.Trigger asChild>
+ <button
+ type="button"
+ className="w-full px-3 py-2 text-left rounded-lg bg-white dark:bg-zinc-800 border border-zinc-200 dark:border-zinc-700 hover:border-zinc-300 dark:hover:border-zinc-600 transition-colors group"
+ >
+ <div className="flex items-center">
+ <div className="flex-1 min-w-0">
+ <div className="text-xs font-medium text-zinc-500 dark:text-zinc-400 mb-0.5">
+ Workspace
+ </div>
+ <div className="text-sm font-medium text-zinc-900 dark:text-zinc-100 truncate">
+ {selectedWorkspace?.name || "Select Workspace"}
+ </div>
+ </div>
+ <ChevronDown className="w-4 h-4 text-zinc-500 dark:text-zinc-400 group-hover:text-zinc-700 dark:group-hover:text-zinc-300 ml-2" />
+ </div>
+ </button>
+ </DropdownMenu.Trigger>
+ <DropdownMenu.Portal>
+ <DropdownMenu.Content
+ className="w-56 bg-white dark:bg-zinc-800 rounded-lg shadow-lg border border-zinc-200 dark:border-zinc-700 py-1"
+ align="start"
+ sideOffset={5}
+ >
+ {workspaces &&
+ workspaces.length > 0 &&
+ workspaces.map((workspace) => (
+ <DropdownMenu.Item
+ key={workspace.id}
+ className={cn(
+ "flex items-center px-3 py-2 text-sm cursor-pointer outline-none",
+ workspace.id === selectedWorkspace?.id
+ ? "bg-indigo-50 text-indigo-600 dark:bg-indigo-500/10 dark:text-indigo-400"
+ : "text-zinc-600 dark:text-zinc-300 hover:bg-zinc-100 dark:hover:bg-zinc-700",
+ )}
+ onClick={() => handleSelectWorkspace(workspace)}
+ >
+ {workspace.name}
+ </DropdownMenu.Item>
+ ))}
+ <DropdownMenu.Separator className="h-px bg-zinc-200 dark:bg-zinc-700 my-1" />
+ <DropdownMenu.Item
+ className="flex items-center px-3 py-2 text-sm text-zinc-600 dark:text-zinc-300 hover:bg-zinc-100 dark:hover:bg-zinc-700 cursor-pointer outline-none"
+ onClick={() => setIsCreateWorkspaceOpen(true)}
+ >
+ <Plus className="w-4 h-4 mr-2" />
+ New Workspace
+ </DropdownMenu.Item>
+ </DropdownMenu.Content>
+ </DropdownMenu.Portal>
+ </DropdownMenu.Root>
+ <CreateWorkspaceModal
+ open={isCreateWorkspaceOpen}
+ onClose={() => setIsCreateWorkspaceOpen(false)}
+ />
+ </div>
+ );
+}
+
+export default WorkspacePicker;
diff --git a/apps/web/src/components/common/sidebar/sections/workspaces/index.tsx b/apps/web/src/components/common/sidebar/sections/workspaces/index.tsx
index 1e88e4338..d10758bc3 100644
--- a/apps/web/src/components/common/sidebar/sections/workspaces/index.tsx
+++ b/apps/web/src/components/common/sidebar/sections/workspaces/index.tsx
@@ -1,94 +1,16 @@
-import useGetWorkspaces from "@/hooks/queries/workspace/use-get-workspace";
+import { useUserPreferencesStore } from "@/store/user-preferences";
import useWorkspaceStore from "@/store/workspace";
-import { FilePlus } from "lucide-react";
-import type React from "react";
-import { useEffect, useState } from "react";
-import AddWorkspace from "./components/add-workspace";
-import WorkspaceItem from "./components/workspace-item";
+import Projects from "../projects";
+import WorkspacePicker from "./components/workspace-picker";
function Workspaces() {
- const { data } = useGetWorkspaces();
- const workspaces = data?.data;
- const { workspace: selectedWorkspace, setWorkspace } = useWorkspaceStore(
- (state) => state,
- );
-
- const [expandedWorkspaces, setExpandedWorkspaces] = useState<string[]>([
- selectedWorkspace?.id || "",
- ]);
-
- const handleExpandWorkspace = (workspaceId: string) => {
- setExpandedWorkspaces((prev) =>
- prev.includes(workspaceId)
- ? prev.filter((id) => id !== workspaceId)
- : [...prev, workspaceId],
- );
- };
-
- const handleSelectWorkspace = (
- event:
- | React.MouseEvent<HTMLDivElement>
- | React.KeyboardEvent<HTMLDivElement>,
- workspaceId: string,
- ) => {
- event.stopPropagation();
-
- const newWorkspace = workspaces?.find(
- (workspace) => workspace.id === workspaceId,
- );
-
- if (!newWorkspace) return;
-
- setWorkspace(newWorkspace);
-
- if (!expandedWorkspaces.includes(workspaceId)) {
- setExpandedWorkspaces((prev) => [...prev, workspaceId]);
- }
- };
-
- useEffect(() => {
- if (data?.data && !selectedWorkspace) {
- setWorkspace(data?.data[0]);
- }
- }, [data?.data, setWorkspace, selectedWorkspace]);
-
- if (!workspaces || !workspaces.length) {
- return (
- <>
- <div className="flex items-center justify-center px-3 pt-8 text-center">
- <div className="text-sm text-zinc-500 dark:text-zinc-400">
- <FilePlus className="mx-auto mb-5 text-zinc-400 dark:text-zinc-500 w-8 h-8" />
- <p className="text-base text-zinc-700 dark:text-zinc-200 font-medium">
- No workspaces yet
- </p>
- <p className="text-sm text-zinc-400 dark:text-zinc-500 mt-2">
- Create a workspace to organize your projects.
- </p>
- </div>
- </div>
- <AddWorkspace />
- </>
- );
- }
+ const { workspace } = useWorkspaceStore();
return (
<div>
- <h2 className="text-xs font-semibold text-zinc-500 dark:text-zinc-400 uppercase tracking-wider mb-2 px-3">
- Workspaces
- </h2>
- <div className="space-y-1">
- {workspaces.length > 0 &&
- workspaces.map((workspace) => (
- <div key={workspace.id} className="space-y-1">
- <WorkspaceItem
- workspace={workspace}
- isExpanded={expandedWorkspaces.includes(workspace.id)}
- onSelectWorkspace={handleSelectWorkspace}
- onExpandWorkspace={handleExpandWorkspace}
- />
- </div>
- ))}
- <AddWorkspace />
+ <div className="space-y-5 flex flex-col">
+ <WorkspacePicker />
+ {workspace && <Projects workspaceId={workspace.id} />}
</div>
</div>
);
diff --git a/apps/web/src/components/common/sidebar/sidebar-content.tsx b/apps/web/src/components/common/sidebar/sidebar-content.tsx
index 3bbd737ca..f21ffd7fd 100644
--- a/apps/web/src/components/common/sidebar/sidebar-content.tsx
+++ b/apps/web/src/components/common/sidebar/sidebar-content.tsx
@@ -1,12 +1,11 @@
-import Team from "./sections/team";
+import { cn } from "@/lib/cn";
import Workspaces from "./sections/workspaces";
export function SidebarContent() {
return (
<nav className="flex-1 overflow-y-auto p-3">
- <div className="space-y-4">
+ <div className={cn("space-y-4")}>
<Workspaces />
- <Team />
</div>
</nav>
);
diff --git a/apps/web/src/components/common/sidebar/sidebar-footer.tsx b/apps/web/src/components/common/sidebar/sidebar-footer.tsx
index d87663af3..6a00028b3 100644
--- a/apps/web/src/components/common/sidebar/sidebar-footer.tsx
+++ b/apps/web/src/components/common/sidebar/sidebar-footer.tsx
@@ -1,9 +1,18 @@
+import { cn } from "@/lib/cn";
+import { useUserPreferencesStore } from "@/store/user-preferences";
import BottomActions from "./sections/bottom-actions";
import UserInfo from "./sections/user-info";
function SidebarFooter() {
+ const { isSidebarOpened } = useUserPreferencesStore();
+
return (
- <div className="p-4 border-t border-zinc-200 dark:border-zinc-800">
+ <div
+ className={cn(
+ "border-t border-zinc-200 dark:border-zinc-800",
+ !isSidebarOpened ? "p-2" : "p-4",
+ )}
+ >
<UserInfo />
<BottomActions />
</div>
diff --git a/apps/web/src/components/common/sidebar/sidebar-header.tsx b/apps/web/src/components/common/sidebar/sidebar-header.tsx
index f0ee998c2..0f8fa26aa 100644
--- a/apps/web/src/components/common/sidebar/sidebar-header.tsx
+++ b/apps/web/src/components/common/sidebar/sidebar-header.tsx
@@ -1,11 +1,25 @@
-import { ThemeToggle } from "@/components/theme/theme-toggle";
+import { useUserPreferencesStore } from "@/store/user-preferences";
+import { ChevronLeft, ChevronRight } from "lucide-react";
import { Logo } from "../logo";
export function SidebarHeader() {
+ const { isSidebarOpened, setIsSidebarOpened } = useUserPreferencesStore();
+
return (
<div className="p-4 border-b border-zinc-200 dark:border-zinc-800 flex items-center justify-between">
- <Logo />
- <ThemeToggle />
+ {isSidebarOpened && <Logo />}
+
+ <button
+ type="button"
+ onClick={() => setIsSidebarOpened()}
+ className="p-1.5 rounded-lg hover:bg-zinc-100 dark:hover:bg-zinc-800 transition-colors"
+ >
+ {isSidebarOpened ? (
+ <ChevronLeft className="w-5 h-5 text-zinc-500 dark:text-zinc-400" />
+ ) : (
+ <ChevronRight className="w-5 h-5 text-zinc-500 dark:text-zinc-400" />
+ )}
+ </button>
</div>
);
}
diff --git a/apps/web/src/components/kanban-board/column/column-header.tsx b/apps/web/src/components/kanban-board/column/column-header.tsx
index ea492856e..6d4e1aa7d 100644
--- a/apps/web/src/components/kanban-board/column/column-header.tsx
+++ b/apps/web/src/components/kanban-board/column/column-header.tsx
@@ -31,7 +31,7 @@ export function ColumnHeader({ column }: ColumnHeaderProps) {
<button
type="button"
onClick={() => setIsTaskModalOpen(true)}
- className=" text-left px-2 py-1.5 text-zinc-600 hover:bg-zinc-100 dark:text-zinc-400 dark:hover:bg-zinc-800/50 rounded-md flex items-center transition-all group"
+ className="text-left px-2 py-1.5 text-zinc-600 hover:bg-zinc-100 dark:text-zinc-400 dark:hover:bg-zinc-800/50 rounded-md flex items-center transition-all group"
>
<Plus className="w-4 h-4 text-zinc-500 dark:text-zinc-400" />
</button>
diff --git a/apps/web/src/components/kanban-board/index.tsx b/apps/web/src/components/kanban-board/index.tsx
index 289c9e29c..89b8fd874 100644
--- a/apps/web/src/components/kanban-board/index.tsx
+++ b/apps/web/src/components/kanban-board/index.tsx
@@ -10,7 +10,6 @@ import {
} from "@dnd-kit/core";
import { produce } from "immer";
import { useState } from "react";
-import { BoardEmptyState } from "../common/sidebar/sections/projects/empty-project-state";
import Column from "./column";
import TaskCard from "./task-card";
@@ -70,7 +69,7 @@ function KanbanBoard() {
setActiveId(null);
};
- if (!project || !project?.columns) return <BoardEmptyState />;
+ if (!project || !project?.columns) return <>TODO: Empty state.</>;
const activeTask = activeId
? project.columns
diff --git a/apps/web/src/fetchers/project/get-projects.ts b/apps/web/src/fetchers/project/get-projects.ts
index c7ad5edae..a86c50fb5 100644
--- a/apps/web/src/fetchers/project/get-projects.ts
+++ b/apps/web/src/fetchers/project/get-projects.ts
@@ -1,6 +1,8 @@
import { api } from "@kaneo/libs";
async function getProjects({ workspaceId }: { workspaceId: string }) {
+ if (!workspaceId) return;
+
const response = await api.project.list({ workspaceId }).get();
if (response.error) {
diff --git a/apps/web/src/fetchers/workspace/get-workspaces.ts b/apps/web/src/fetchers/workspace/get-workspaces.ts
index abe81d5a5..85d0e8a09 100644
--- a/apps/web/src/fetchers/workspace/get-workspaces.ts
+++ b/apps/web/src/fetchers/workspace/get-workspaces.ts
@@ -3,7 +3,7 @@ import { api } from "@kaneo/libs";
const getWorkspaces = async () => {
const response = await api.workspace.list.get();
- return response;
+ return response.data;
};
export default getWorkspaces;
diff --git a/apps/web/src/hooks/queries/project/use-get-projects.ts b/apps/web/src/hooks/queries/project/use-get-projects.ts
index 6fd07b675..bbd0d02a6 100644
--- a/apps/web/src/hooks/queries/project/use-get-projects.ts
+++ b/apps/web/src/hooks/queries/project/use-get-projects.ts
@@ -5,6 +5,7 @@ function useGetProjects({ workspaceId }: { workspaceId: string }) {
return useQuery({
queryFn: () => getProjects({ workspaceId }),
queryKey: ["projects", workspaceId],
+ enabled: !!workspaceId,
});
}
diff --git a/apps/web/src/store/user-preferences.ts b/apps/web/src/store/user-preferences.ts
new file mode 100644
index 000000000..052a5d66b
--- /dev/null
+++ b/apps/web/src/store/user-preferences.ts
@@ -0,0 +1,21 @@
+import { create } from "zustand";
+import { createJSONStorage, persist } from "zustand/middleware";
+
+type UserPreferncesStore = {
+ isSidebarOpened: boolean;
+ setIsSidebarOpened: () => void;
+};
+
+export const useUserPreferencesStore = create<UserPreferncesStore>()(
+ persist(
+ (set, get) => ({
+ isSidebarOpened: true,
+ setIsSidebarOpened: () =>
+ set({ isSidebarOpened: !get().isSidebarOpened }),
+ }),
+ {
+ name: "user-preferences",
+ storage: createJSONStorage(() => localStorage),
+ },
+ ),
+);