QOL and remove skeletons for pagination component

WhyAsh5114 · May 1, 2024 · 7006c38 · 7006c38
1 parent 5362578
commit 7006c38
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 28 deletions.
diff --git a/src/app.pcss b/src/app.pcss
@@ -101,10 +101,6 @@ body {
 	@apply h-[22px] w-16 rounded-full;
 }
 
-.pagination-skeleton {
-	@apply h-10 w-full;
-}
-
 .muted-text-box {
 	@apply rounded-md border p-2 text-muted-foreground;
 }
diff --git a/src/lib/components/Pagination.svelte b/src/lib/components/Pagination.svelte
@@ -13,8 +13,8 @@
 
 	$: pageNumber = $page.url.searchParams.get('pageNumber')
 		? parseInt($page.url.searchParams.get('pageNumber') as string)
-		: undefined;
-	$countStore = count ?? $countStore;
+		: 1;
+	$: $countStore = count ?? $countStore;
 </script>
 
 <Pagination.Root

diff --git a/src/routes/exercise-splits/(components)/ExerciseSplitsLoading.svelte b/src/routes/exercise-splits/(components)/ExerciseSplitsLoading.svelte
@@ -18,4 +18,3 @@
 		</div>
 	{/each}
 </div>
-<Skeleton class="pagination-skeleton" />
diff --git a/src/routes/mesocycles/+page.svelte b/src/routes/mesocycles/+page.svelte
@@ -5,7 +5,6 @@
 	import { Separator } from '$lib/components/ui/separator';
 	import H2 from '$lib/components/ui/typography/H2.svelte';
 	import Button from '$lib/components/ui/button/button.svelte';
-	import MesocyclesPagination from './(components)/MesocyclesPagination.svelte';
 	import AddIcon from 'virtual:icons/lucide/plus';
 	import SearchIcon from 'virtual:icons/lucide/search';
 
@@ -108,14 +107,10 @@
 		{/if}
 	</div>
 
-	{#if mesocycles === 'loading'}
-		<Skeleton class="pagination-skeleton" />
-	{:else if mesocycles !== 'error'}
-		<Pagination
-			count={mesocyclesCount}
-			countStore={mesocyclesCountStore}
-			itemsPerPage={MESOCYCLES_PER_PAGE}
-			{updateParams}
-		/>
-	{/if}
+	<Pagination
+		count={mesocyclesCount}
+		countStore={mesocyclesCountStore}
+		itemsPerPage={MESOCYCLES_PER_PAGE}
+		{updateParams}
+	/>
 </div>
diff --git a/src/routes/workouts/+page.svelte b/src/routes/workouts/+page.svelte
@@ -92,14 +92,11 @@
 		{/if}
 	</div>
 
-	{#if workouts === 'loading'}
-		<Skeleton class="pagination-skeleton" />
-	{:else}
-		<Pagination
-			count={workoutsCount}
-			countStore={workoutsCountStore}
-			itemsPerPage={WORKOUTS_PER_PAGE}
-			{updateParams}
-		/>
-	{/if}
+	<Pagination
+		count={workoutsCount}
+		countStore={workoutsCountStore}
+		itemsPerPage={WORKOUTS_PER_PAGE}
+		{updateParams}
+	/>
 </div>
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,3 @@ @@
     		</div>
     	{/each}
     </div>
-    <Skeleton class="pagination-skeleton" />