Skip to content

Commit 51dc8cb

Browse files
shebz2023Bananayosostene
authored andcommitted
fix irrelevant skeletons while fetching
1 parent caaaf79 commit 51dc8cb

File tree

2 files changed

+83
-31
lines changed

2 files changed

+83
-31
lines changed

src/Skeletons/Calender.skeleton.tsx

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,6 @@ function CalendarSkeleton() {
4343
</div>
4444
))}
4545
</div>
46-
47-
{/* Event List */}
48-
<div className="mt-4 space-y-2">
49-
{events.map((event) => (
50-
<div
51-
key={event.id}
52-
className="flex items-center justify-between p-2 bg-gray-800 rounded"
53-
>
54-
<div className="h-4 bg-gray-200 rounded w-3/4" />
55-
<div className="h-4 bg-gray-200 rounded w-6" />
56-
</div>
57-
))}
58-
</div>
5946
</div>
6047
</div>
6148
);

src/containers/Routes.tsx

Lines changed: 83 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,64 @@ import RemoveTokenPage from '../utils/RemoveTokenPage';
4343
function MainRoutes() {
4444
return (
4545
<div className="min-h-screen page-layout">
46-
<Suspense fallback={<Skeleton />}>
46+
<Suspense>
4747
<Routes>
4848
<Route path="/*" element={<DashRoutes />} />
4949
<Route
5050
path="/"
5151
element={
5252
<>
53-
<Header />
54-
<main className="page-main bg-light-bg dark:bg-dark-frame-bg">
55-
<Outlet />
56-
</main>
57-
<Footer />
53+
<Suspense fallback={<Skeleton />}>
54+
<Header />
55+
<main className="page-main bg-light-bg dark:bg-dark-frame-bg">
56+
<Outlet />
57+
</main>
58+
<Footer />
59+
</Suspense>
5860
</>
5961
}
6062
>
61-
<Route index element={<Home />} />
62-
<Route path="/register/:token" element={<UserRegister />} />
63+
<Route
64+
index
65+
element={
66+
<Suspense fallback={<Skeleton />}>
67+
<Home />
68+
</Suspense>
69+
}
70+
/>
71+
<Route
72+
path="/register/:token"
73+
element={
74+
<Suspense fallback={<Skeleton />}>
75+
<UserRegister />
76+
</Suspense>
77+
}
78+
/>
6379
<Route path="/register-successful" element={<Message />} />
64-
<Route path="/signup/org" element={<OrgRegister />} />
65-
<Route path="/signup/org/:token" element={<RemoveTokenPage />} />
66-
<Route path="/reset-password" element={<ResetPassword />} />
80+
<Route
81+
path="/signup/org"
82+
element={
83+
<Suspense fallback={<Skeleton />}>
84+
<OrgRegister />
85+
</Suspense>
86+
}
87+
/>
88+
<Route
89+
path="/signup/org/:token"
90+
element={
91+
<Suspense fallback={<Skeleton />}>
92+
<RemoveTokenPage />
93+
</Suspense>
94+
}
95+
/>
96+
<Route
97+
path="/reset-password"
98+
element={
99+
<Suspense fallback={<Skeleton />}>
100+
<ResetPassword />
101+
</Suspense>
102+
}
103+
/>
67104
<Route
68105
path="/forgot-password/:token"
69106
element={<ForgotPassword />}
@@ -72,28 +109,56 @@ function MainRoutes() {
72109
path="/login/org"
73110
element={
74111
<ProtectedRoutes>
75-
<Orglogin />
112+
<Suspense fallback={<Skeleton />}>
113+
<Orglogin />
114+
</Suspense>
76115
</ProtectedRoutes>
77116
}
78117
/>
79118
<Route
80119
path="/users/login"
81120
element={
82121
<ProtectedRoutes>
83-
<Adminlogin />
122+
<Suspense fallback={<Skeleton />}>
123+
<Adminlogin />
124+
</Suspense>
84125
</ProtectedRoutes>
85126
}
86127
/>
87-
<Route path="/pricing" element={<Pricing />} />
88-
<Route path="/about" element={<About title={'About Page'} />} />
128+
<Route
129+
path="/pricing"
130+
element={
131+
<Suspense fallback={<Skeleton />}>
132+
<Pricing />{' '}
133+
</Suspense>
134+
}
135+
/>
136+
<Route
137+
path="/about"
138+
element={
139+
<Suspense fallback={<Skeleton />}>
140+
<About title={'About Page'} />
141+
</Suspense>
142+
}
143+
/>
89144
<Route
90145
path="/product"
91-
element={<Product title={'Productpage'} />}
146+
element={
147+
<Suspense fallback={<Skeleton />}>
148+
<Product title={'Productpage'} />
149+
</Suspense>
150+
}
92151
/>
93152
<Route path="/docs/org-signup" element={<SignupOrgDocs />} />
94153
<Route path="/docs/org-signin" element={<SigninOrgDocs />} />
95-
<Route path="/docs/getting-started" element={<UsersDocs />} />
96-
<Route path="/redirect" element={<RedirectHandler />} />
154+
<Route
155+
path="/docs/getting-started"
156+
element={
157+
<Suspense fallback={<Skeleton />}>
158+
<UsersDocs />
159+
</Suspense>
160+
}
161+
/>
97162
<Route path="/noredirect" element={<Noredirect />} />
98163
</Route>
99164
<Route path="*" element={<Error />} />

0 commit comments

Comments
 (0)