Merge pull request #242 from Suwayomi/main

update mangas categories change + fix lightswitch warping
Suwayomi · Nov 16, 2024 · 30b251d · 30b251d
2 parents 8d7ca49 + 99a6dea
commit 30b251d
Show file tree

Hide file tree

Showing 13 changed files with 142 additions and 352 deletions.
diff --git a/src/lib/components/lightswitch.svelte b/src/lib/components/lightswitch.svelte
@@ -21,19 +21,19 @@
 		height?: CssClasses;
 		ring?: CssClasses;
 		rounded?: CssClasses;
-		class?: CssClasses;
+		[key: string]: unknown;
 	}
 
 	let {
 		bgLight = 'bg-surface-50',
 		bgDark = 'bg-surface-900',
 		fillLight = 'fill-surface-50',
 		fillDark = 'fill-surface-900',
-		width = 'w-12',
-		height = 'h-6',
+		width = 'w-16',
+		height = 'h-8',
 		ring = 'ring-[1px] ring-surface-500/30',
 		rounded = 'rounded-token',
-		class: className
+		...rest
 	}: Props = $props();
 
 	const cTransition = `transition-all duration-[200ms]`;
@@ -49,7 +49,7 @@
 	let thumbPosition = $derived(!gmState.value.dark ? 'translate-x-[100%]' : '');
 	// Reactive
 	let classesTrack = $derived(
-		`cursor-pointer ${cTransition} ${width} ${height} ${ring} ${rounded} ${trackBg} ${className ?? ''}`
+		`cursor-pointer ${cTransition} ${width} ${height} ${ring} ${rounded} ${trackBg} ${rest.class ?? ''}`
 	);
 	let classesThumb = $derived(
 		`aspect-square scale-[0.8] flex justify-center items-center ${cTransition} ${height} ${rounded} ${thumbBg} ${thumbPosition}`

diff --git a/src/lib/gql/Fragments.ts b/src/lib/gql/Fragments.ts
@@ -61,6 +61,9 @@ export const MangaTypeFragment = graphql(
 				fetchedAt
 				id
 			}
+			chapters {
+				totalCount
+			}
 			latestUploadedChapter {
 				uploadDate
 				id

diff --git a/src/lib/gql/Mutations.ts b/src/lib/gql/Mutations.ts
@@ -485,41 +485,19 @@ export const updateMangasCategories = graphql(
 			$addTo: [Int!] = null
 			$clear: Boolean = null
 			$id: [Int!]!
+			$removeFrom: [Int!] = null
 		) {
 			updateMangasCategories(
 				input: {
 					ids: $id
-					patch: { addToCategories: $addTo, clearCategories: $clear }
-				}
-			) {
-				mangas {
-					id
-					categories {
-						nodes {
-							id
-						}
+					patch: {
+						addToCategories: $addTo
+						clearCategories: $clear
+						removeFromCategories: $removeFrom
 					}
 				}
-			}
-		}
-	`,
-	[]
-);
-
-export const updateMangaCategories = graphql(
-	`
-		mutation updateMangaCategories(
-			$addTo: [Int!] = null
-			$clear: Boolean = null
-			$id: Int!
-		) {
-			updateMangaCategories(
-				input: {
-					id: $id
-					patch: { addToCategories: $addTo, clearCategories: $clear }
-				}
 			) {
-				manga {
+				mangas {
 					id
 					categories {
 						nodes {

diff --git a/src/lib/gql/Queries.ts b/src/lib/gql/Queries.ts
@@ -11,8 +11,7 @@ import {
 	MangaTypeFragment,
 	PreferenceFragment,
 	SourceTypeFragment,
-	TrackerTypeFragment,
-	TrackRecordTypeFragment
+	TrackerTypeFragment
 } from './Fragments';
 import { graphql } from './graphql';
 
@@ -36,47 +35,13 @@ export const getCategory = graphql(
 				id
 				mangas {
 					nodes {
-						id
-						title
-						inLibrary
-						thumbnailUrl
-						unreadCount
-						downloadCount
-						latestFetchedChapter {
-							fetchedAt
-							id
-						}
-						latestUploadedChapter {
-							uploadDate
-							id
-						}
-						lastReadChapter {
-							lastReadAt
-							id
-						}
-						chapters {
-							totalCount
-						}
-						artist
-						author
-						description
-						genre
-						status
-						source {
-							displayName
-							id
-						}
-						trackRecords {
-							nodes {
-								...TrackRecordTypeFragment
-							}
-						}
+						...MangaTypeFragment
 					}
 				}
 			}
 		}
 	`,
-	[TrackRecordTypeFragment]
+	[MangaTypeFragment]
 );
 
 export const getManga = graphql(