Refactor code structure for improved readability and maintainability

Author: batdimoiprint

src/components/apis/analytics.ts

@@ -32,11 +32,19 @@ export interface TaskProgress {
 export interface ProjectStats {
     projectId: string;
     projectName: string;
-    totalTasks: number;
-    completedTasks: number;
-    pendingTasks: number;
-    overdueTasks: number;
-    teamSize: number;
+    memberCount: number;
+    mainTaskCount: number;
+    subTaskCount: number;
+    completedSubTasks: number;
+    overdueSubTasks: number;
+    tasksByPriority: Record<string, number>;
+    tasksByStatus: Record<string, number>;
+    completionRate: number;
+    tasksByCategory: Array<{
+        categoryName: string;
+        totalTasks: number;
+        completedTasks: number;
+    }>;
 }
 
 export interface UserOverview {

src/components/headers/NavigationHeader.tsx

@@ -47,8 +47,19 @@ export default function NavigationHeader() {
                 return;
             }
             try {
-                const project = await projectsApi.getProjectById(projectName);
+                // Decode project name from URL and find matching project
+                const decodedName = decodeURIComponent(projectName).replace(/-/g, ' ');
+                const projects = await projectsApi.getProjectsAsMember();
+                const project = projects.find(p => p.projectName.toLowerCase() === decodedName.toLowerCase());
+
+                if (!project) {
+                    console.warn('NavigationHeader - Project not found:', decodedName);
+                    setUserProjectRole(null);
+                    return;
+                }
+
                 const role = project.permissions?.[user.id] || 'Member';
+                console.log('NavigationHeader - Project:', project.projectName, 'User ID:', user.id, 'Role:', role, 'Permissions:', project.permissions);
                 setUserProjectRole(role);
             } catch (err) {
                 console.error('Failed to fetch project role:', err);

src/components/sidebar/ProjectList.tsx

@@ -93,9 +93,14 @@ export default function ProjectList({ openCategories, onNavigateToProjects, refr
             .slice(0, RECENT_LIMIT);
     }, [projects]);
 
-    const handleProjectClick = (projectName: string) => {
-        const slug = buildSlug(projectName);
-        navigate(`/home/project/${slug}/kanban`);
+    const handleProjectClick = (project: Project) => {
+        const slug = buildSlug(project.projectName);
+        // Check if user is a client in this project
+        const userRole = project.permissions?.[currentUser?.id || ''];
+        const isClient = userRole === 'Client';
+        // Redirect clients to analytics, others to kanban
+        const targetPath = isClient ? 'analytics' : 'kanban';
+        navigate(`/home/project/${slug}/${targetPath}`);
     };
 
     return (
@@ -147,7 +152,7 @@ export default function ProjectList({ openCategories, onNavigateToProjects, refr
                             key={project.id}
                             value={project.id}
                             className={mergeClasses(s.navSubItem)}
-                            onClick={() => handleProjectClick(project.projectName)}
+                            onClick={() => handleProjectClick(project)}
                         >
                             {project.projectName}
                         </NavSubItem>