Skip to content

Commit ee397c0

Browse files
refactor: restructure dashboard and member components
- Deleted old Dashboard API and DashboardPage components. - Introduced new PagePlaceholder component for consistent page layout. - Created new Analytics, Billing, Dashboard, Messages, Notifications, Settings, Tasks, Teams, and Workspace pages using PagePlaceholder. - Implemented useDashboardData hook for fetching mock dashboard data. - Updated Sidebar and Header components to reflect new structure and data. - Added new OrganisationLayout with Sidebar and MobileSidebar for better navigation. - Refactored utility functions to align with new data structure.
1 parent 78f88ed commit ee397c0

49 files changed

Lines changed: 78 additions & 3452 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/App.tsx

Lines changed: 22 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import "./App.css";
66

77

88

9-
import DashboardPage from "./features/Dashboard/member/v1/Pages/DashboardPage";
9+
import DashboardPage from "./features/Member/v1/Pages/DashboardPage";
1010

1111
import MemberPage from "./features/Member/v1/Pages/MemberPage";
1212

@@ -23,29 +23,30 @@ import LoginPage from "./features/Auth/v1/Pages/LoginPage";
2323

2424
import SignUpPage from "./features/Auth/v1/Pages/SignUpPage";
2525

26-
import AnalyticsPage from "./features/Dashboard/member/v1/Pages/Analytics";
26+
import AnalyticsPage from "./features/Member/v1/Pages/Analytics";
2727

28-
import NotificationsPage from "./features/Dashboard/member/v1/Pages/Notifications";
28+
import NotificationsPage from "./features/Member/v1/Pages/Notifications";
2929

30-
import SettingsPage from "./features/Dashboard/member/v1/Pages/Settings";
30+
import SettingsPage from "./features/Member/v1/Pages/Settings";
3131

32-
import TasksPage from "./features/Dashboard/member/v1/Pages/Tasks";
32+
import TasksPage from "./features/Member/v1/Pages/Tasks";
3333

34-
import TeamsPage from "./features/Dashboard/member/v1/Pages/Teams";
34+
import TeamsPage from "./features/Member/v1/Pages/Teams";
3535

36-
import WorkspacePage from "./features/Dashboard/member/v1/Pages/WorkSpace";
36+
import WorkspacePage from "./features/Member/v1/Pages/WorkSpace";
3737

38-
import MessagesPage from "./features/Dashboard/member/v1/Pages/Messages";
38+
import MessagesPage from "./features/Member/v1/Pages/Messages";
3939

40-
import BillingPage from "./features/Dashboard/member/v1/Pages/Billing";
41-
import { dashboardData } from "./features/Dashboard/member/mock/dashboardData";
40+
import BillingPage from "./features/Member/v1/Pages/Billing";
41+
import { dashboardData } from "./features/member/mock/dashboardData";
4242
import { startAutoUpdater } from "./system/updater/autoUpdater";
4343

4444
import ProtectedRoute from "./routes/ProtectedRoute";
4545

4646
import { ThemeProvider } from "next-themes";
4747

4848
import Organisation_Template from "./features/template/LoginUserTemplate";
49+
import DashBoardPage from "./features/Dashboard/Organisation/v1/Pages/DashBoardPage";
4950

5051

5152

@@ -76,40 +77,26 @@ function App() {
7677
<Route
7778
index
7879
element={
79-
<ProtectedRoute user={user} allowedRoles={["Member"]}>
80-
<DashboardPage />
80+
<ProtectedRoute user={user} allowedRoles={["organization"]}>
81+
<DashBoardPage />
8182
</ProtectedRoute>
8283
}
8384
/>
8485

8586
<Route
8687
path="dashboard"
8788
element={
88-
<ProtectedRoute user={user} allowedRoles={["Member"]}>
89-
<DashboardPage />
89+
<ProtectedRoute user={user} allowedRoles={["organization"]}>
90+
<DashBoardPage />
9091
</ProtectedRoute>
9192
}
9293
/>
9394

94-
{/* Member Profile */}
95-
<Route path="profile" element={<MemberPage />} />
96-
97-
{/* Member Modules */}
98-
<Route path="analytics" element={<AnalyticsPage />} />
99-
100-
<Route path="notifications" element={<NotificationsPage />} />
101-
102-
<Route path="settings" element={<SettingsPage />} />
103-
104-
<Route path="tasks" element={<TasksPage />} />
105-
106-
<Route path="teams" element={<TeamsPage />} />
107-
108-
<Route path="workspace" element={<WorkspacePage />} />
109-
110-
<Route path="messages" element={<MessagesPage />} />
95+
96+
<Route path="teams" element={<MemberPage />} />
97+
11198

112-
<Route path="billing" element={<BillingPage />} />
99+
113100

114101
{/* Events */}
115102
<Route path="events" element={<ViewEvent />} />
@@ -122,26 +109,7 @@ function App() {
122109
{/* Add Member */}
123110
<Route path="add-member" element={<AddMemberPage />} />
124111

125-
{/* 404 */}
126-
<Route
127-
path="*"
128-
element={
129-
<div
130-
className="
131-
flex items-center justify-center
132-
133-
h-[60vh]
134-
135-
text-xl font-semibold
136-
137-
text-gray-500
138-
dark:text-zinc-400
139-
"
140-
>
141-
404 Not Found
142-
</div>
143-
}
144-
/>
112+
145113
</Route>
146114

147115

@@ -165,8 +133,7 @@ function App() {
165133
}
166134
/>
167135

168-
{/* Member Profile */}
169-
<Route path="profile" element={<MemberPage />} />
136+
170137

171138
{/* Member Modules */}
172139
<Route path="analytics" element={<AnalyticsPage />} />
@@ -177,7 +144,7 @@ function App() {
177144

178145
<Route path="tasks" element={<TasksPage />} />
179146

180-
<Route path="teams" element={<TeamsPage />} />
147+
181148

182149
<Route path="workspace" element={<WorkspacePage />} />
183150

@@ -193,8 +160,6 @@ function App() {
193160
{/* Contact */}
194161
<Route path="contact" element={<Contact />} />
195162

196-
{/* Add Member */}
197-
<Route path="add-member" element={<AddMemberPage />} />
198163

199164
{/* 404 */}
200165
<Route
File renamed without changes.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
3+
const DashBoardPage = () => {
4+
return (
5+
<div>
6+
7+
</div>
8+
)
9+
}
10+
11+
export default DashBoardPage

src/features/Dashboard/components/Achievements.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Trophy, Flame, Star, Award } from "lucide-react";
2-
import { AchievementsData } from "../member/types/dashboard";
2+
import { AchievementsData } from "../Member/dashboard";
33

44
interface Props {
55
data: AchievementsData;

src/features/Dashboard/components/IssuesPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AlertCircle, CheckCircle, AlertTriangle } from "lucide-react";
22
import { useTheme } from "@/theme";
3-
import { Issues } from "../member/types/dashboard";
3+
import { Issues } from "../Member/dashboard";
44

55
interface Props {
66
data: Issues;

src/features/Dashboard/components/PerformanceStats.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { LineChart, Line, XAxis, Tooltip, ResponsiveContainer } from "recharts";
22
import { useTheme } from "@/theme";
3-
import { Performance } from "../member/types/dashboard";
3+
import { Performance } from "../Member/dashboard";
44

55
interface Props {
66
data: Performance;

src/features/Dashboard/components/ProductivityScore.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { calculateProductivityScore } from "@/utils/productivity";
2-
import { Performance } from "../member/types/dashboard";
2+
import { Performance } from "../Member/dashboard";
33

44
interface Props {
55
data: Performance;

src/features/Dashboard/member/components/AISuggestions.tsx

Lines changed: 0 additions & 126 deletions
This file was deleted.

0 commit comments

Comments
 (0)