Skip to content

Commit aff1755

Browse files
shebz2023shebz2023
authored
fix layout crashing while scrolling in teams on dashboard (#552)
1 parent 213831b commit aff1755

File tree

1 file changed

+64
-70
lines changed

1 file changed

+64
-70
lines changed

‎src/containers/DashRoutes.tsx‎

Lines changed: 64 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -90,80 +90,74 @@ function DashRoutes() {
9090
<DashHeader />
9191
<Sidebar toggle={toggleNav} style="" />
9292
</MenuProvider>
93-
<main className=" px-4 md:px-8 py-4 md:py-8 w-[100%] bg-light-bg dark:bg-dark-frame-bg">
93+
<main className=" px-4 md:px-8 py-4 md:py-8 w-[100%] bg-light-bg overflow-hidden dark:bg-dark-frame-bg">
9494
{/* <Suspense fallback={<Square />}> */}
95-
<Routes>
96-
<Route path="/dashboard" element={<Dashboard />} />
97-
<Route path="/trainees" element={<AdminTraineeDashboard />} />
98-
<Route
99-
path="/invitation"
100-
element={
101-
<>
102-
<CheckRole roles={['admin']}>
103-
<Invitation />
104-
</CheckRole>
105-
</>
106-
}
107-
/>
108-
<Route path="/trainees/:userId" element={<ViewTraineeRatings />} />
109-
<Route
110-
path="/ratings"
111-
element={
112-
<>
113-
<CheckRole roles={['admin']}>
114-
<AdminRatings />
115-
</CheckRole>
116-
<CheckRole roles={['-admin']}>
117-
<TraineeRatingDashboard />
118-
</CheckRole>
119-
</>
120-
}
121-
/>
122-
<Route
123-
path="/updated-ratings"
124-
element={<UpdatedRatingDashboard />}
125-
/>
126-
<Route path="/settings" element={<Settings />} />
127-
<Route path="/performance" element={<TraineePerfomance />} />
128-
{/* <Route path="/attendance" element={<TraineeAttendance />} /> */}
129-
<Route path="/attendance" element={<Attendance/>} />
130-
<Route path="/attendance-details" element={<AttendanceDetails />} />
131-
<Route path="/teams" element={<AdminTeams />} />
132-
<Route path="/cohorts" element={<AdminCohorts />} />
133-
<Route path="/phases" element={<AdminPhases />} />
134-
<Route path="/programs" element={<AdminPrograms />} />
135-
<Route path="/sessions" element={<AdminSission />} />
136-
<Route path="/manage" element={<AdminManageRoles />} />
137-
<Route path="/grading" element={<GradingSystem />} />
138-
<Route
139-
path="/performance-details"
140-
element={<PerformanceDetails />}
141-
/>
142-
<Route path="/profile" element={<Profile />} />
143-
<Route path="/profile/edit" element={<EditProfile />} />
144-
{/* <Route path="*" element={<Error />} /> */}
145-
<Route path="/super-admin" element={<SupAdDashboard />} />
146-
<Route path="/calendar" element={<Calendar />} />
147-
<Route path="/organizations" element={<Organizations />} />
148-
<Route path="/coordinators" element={<CoordinatorsPage />} />
149-
<Route path="/docs/admin" element={<AdminDocs />} />
150-
<Route path="/ttls" element={<TtlsPage />} />
151-
<Route path="/coordinatorDocs" element={<CoordinatorDocs />} />
152-
<Route path="/docs/trainee" element={<TraineeDocs />} />
153-
<Route path="/docs" element={<OthersDocs />} />
154-
<Route path="/support" element={<HelpPage />} />
155-
<Route path="/tickets" element={<Tickets />}>
156-
<Route index element={<AllTickets />} />
157-
</Route>
95+
<Routes>
96+
<Route path="/dashboard" element={<Dashboard />} />
97+
<Route path="/trainees" element={<AdminTraineeDashboard />} />
98+
<Route
99+
path="/invitation"
100+
element={
101+
<>
102+
<CheckRole roles={['admin']}>
103+
<Invitation />
104+
</CheckRole>
105+
</>
106+
}
107+
/>
108+
<Route path="/trainees/:userId" element={<ViewTraineeRatings />} />
109+
<Route
110+
path="/ratings"
111+
element={
112+
<>
113+
<CheckRole roles={['admin']}>
114+
<AdminRatings />
115+
</CheckRole>
116+
<CheckRole roles={['-admin']}>
117+
<TraineeRatingDashboard />
118+
</CheckRole>
119+
</>
120+
}
121+
/>
122+
<Route path="/updated-ratings" element={<UpdatedRatingDashboard />} />
123+
<Route path="/settings" element={<Settings />} />
124+
<Route path="/performance" element={<TraineePerfomance />} />
125+
{/* <Route path="/attendance" element={<TraineeAttendance />} /> */}
126+
<Route path="/attendance" element={<Attendance />} />
127+
<Route path="/attendance-details" element={<AttendanceDetails />} />
128+
<Route path="/teams" element={<AdminTeams />} />
129+
<Route path="/cohorts" element={<AdminCohorts />} />
130+
<Route path="/phases" element={<AdminPhases />} />
131+
<Route path="/programs" element={<AdminPrograms />} />
132+
<Route path="/sessions" element={<AdminSission />} />
133+
<Route path="/manage" element={<AdminManageRoles />} />
134+
<Route path="/grading" element={<GradingSystem />} />
135+
<Route path="/performance-details" element={<PerformanceDetails />} />
136+
<Route path="/profile" element={<Profile />} />
137+
<Route path="/profile/edit" element={<EditProfile />} />
138+
{/* <Route path="*" element={<Error />} /> */}
139+
<Route path="/super-admin" element={<SupAdDashboard />} />
140+
<Route path="/calendar" element={<Calendar />} />
141+
<Route path="/organizations" element={<Organizations />} />
142+
<Route path="/coordinators" element={<CoordinatorsPage />} />
143+
<Route path="/docs/admin" element={<AdminDocs />} />
144+
<Route path="/ttls" element={<TtlsPage />} />
145+
<Route path="/coordinatorDocs" element={<CoordinatorDocs />} />
146+
<Route path="/docs/trainee" element={<TraineeDocs />} />
147+
<Route path="/docs" element={<OthersDocs />} />
148+
<Route path="/support" element={<HelpPage />} />
149+
<Route path="/tickets" element={<Tickets />}>
150+
<Route index element={<AllTickets />} />
151+
</Route>
158152

159-
<Route path="/loginActivities" element={<LoginActivitiesTable />} />
153+
<Route path="/loginActivities" element={<LoginActivitiesTable />} />
160154

161-
<Route path="/team/:teamname" element={<TeamDetails />} />
155+
<Route path="/team/:teamname" element={<TeamDetails />} />
162156

163-
<Route path="/team-cards" element={<ManagersCards />} />
164-
<Route path="/teams/cards" element={<CoordinatorCards />} />
165-
<Route path="/ttl-trainees" element={<TtlTraineeDashboard />} />
166-
</Routes>
157+
<Route path="/team-cards" element={<ManagersCards />} />
158+
<Route path="/teams/cards" element={<CoordinatorCards />} />
159+
<Route path="/ttl-trainees" element={<TtlTraineeDashboard />} />
160+
</Routes>
167161
{/* </Suspense> */}
168162
</main>
169163
</PrivateRoute>

0 commit comments

Comments
 (0)