From c2e61b808ea451b8831291e06117d2c1dda6bca7 Mon Sep 17 00:00:00 2001 From: robonau <30987265+Robonau@users.noreply.github.com> Date: Thu, 7 Mar 2024 08:12:51 +0000 Subject: [PATCH 1/3] version mapping --- versionToServerVersionMapping.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versionToServerVersionMapping.json b/versionToServerVersionMapping.json index 636bb297..d652a755 100644 --- a/versionToServerVersionMapping.json +++ b/versionToServerVersionMapping.json @@ -5,7 +5,7 @@ }, { "tag": "v1.0.0", - "uiVersion": "r585", + "uiVersion": "r588", "serverVersion": "r1498" } ] From d51a471cfed29b072d494558da49f9124b68ee9c Mon Sep 17 00:00:00 2001 From: robonau <30987265+Robonau@users.noreply.github.com> Date: Thu, 7 Mar 2024 08:18:00 +0000 Subject: [PATCH 2/3] remove a console log --- src/lib/gql/graphqlClient.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/gql/graphqlClient.ts b/src/lib/gql/graphqlClient.ts index 25710f71..34932167 100644 --- a/src/lib/gql/graphqlClient.ts +++ b/src/lib/gql/graphqlClient.ts @@ -476,7 +476,6 @@ function fetchMangaChaptersUpdater( }, (manga) => { if (!manga) { - console.log('getManga is null'); return manga; } manga.manga.chapters.nodes = data.fetchChapters.chapters; From 2e3be863a985f4f61acbca182911b4b89d5e122c Mon Sep 17 00:00:00 2001 From: robonau <30987265+Robonau@users.noreply.github.com> Date: Thu, 7 Mar 2024 21:19:33 +0000 Subject: [PATCH 3/3] update dependencies and prettier tailwind order --- .prettierrc | 3 +- bun.lockb | Bin 153351 -> 157590 bytes package.json | 47 ++++--- src/app.html | 2 +- src/lib/components/IconButton.svelte | 2 +- src/lib/components/Image.svelte | 6 +- src/lib/components/LangFilterModal.svelte | 10 +- src/lib/components/MainAppRail.svelte | 4 +- src/lib/components/MobileAppNavigation.svelte | 4 +- src/lib/components/Search.svelte | 6 +- src/lib/components/Slide.svelte | 4 +- src/lib/components/Tooltip.svelte | 4 +- src/lib/components/TooltipIconButton.svelte | 2 +- src/lib/components/TriStateSlide.svelte | 4 +- src/lib/gql/Fragments.ts | 103 ++++++++++++++ src/lib/gql/Queries.ts | 132 +----------------- src/routes/(app)/(library)/+page.svelte | 40 +++--- .../(app)/(library)/LibraryFilterModal.svelte | 22 +-- .../(library)/LibraryMassCategoryModal.svelte | 8 +- .../(app)/(library)/libraryActions.svelte | 8 +- src/routes/(app)/+layout.svelte | 2 +- .../browse/HorisontalmangaElement.svelte | 14 +- src/routes/(app)/browse/Nav.svelte | 8 +- .../(app)/browse/extensions/+page.svelte | 14 +- .../browse/extensions/ExtensionCard.svelte | 28 ++-- .../extensions/ExtensionsActions.svelte | 8 +- src/routes/(app)/browse/globalSearch.svelte | 31 ++-- .../globalsearch/GlobalSearchActions.svelte | 6 +- .../GlobalSearchLangFilterModal.svelte | 12 +- src/routes/(app)/browse/migrate/+page.svelte | 22 +-- .../manga/[MangaID]/migrateModal.svelte | 26 ++-- .../migrate/source/[SourceID]/+page.svelte | 16 +-- .../browse/source/[sourceID]/Grid.svelte | 22 +-- .../source/[sourceID]/NavActions.svelte | 2 +- .../source/[sourceID]/PreferencesModal.svelte | 6 +- .../source/[sourceID]/filter/+page.svelte | 4 +- .../[sourceID]/filter/FilterModal.svelte | 12 +- .../filter/filters/CheckBoxFilter.svelte | 4 +- .../filter/filters/GroupFilter.svelte | 6 +- .../filter/filters/HeaderFilter.svelte | 2 +- .../filter/filters/SelectFilter.svelte | 2 +- .../filter/filters/SortFilter.svelte | 4 +- .../filter/filters/TextFilter.svelte | 2 +- .../filter/filters/TriStateFilter.svelte | 4 +- .../preferences/CheckBoxPreference.svelte | 4 +- .../preferences/EditTextPreference.svelte | 4 +- .../preferences/ListPreference.svelte | 2 +- .../MultiSelectListPreference.svelte | 4 +- .../preferences/SwitchPreference.svelte | 4 +- src/routes/(app)/browse/sources/+page.svelte | 30 ++-- .../browse/sources/SourcesActions.svelte | 8 +- src/routes/(app)/downloads/+page.svelte | 24 ++-- .../downloads/DownloadsFilterModal.svelte | 2 +- .../manga/[MangaID]/(manga)/+page.svelte | 2 +- .../(manga)/ChaptersFilterModal.svelte | 20 +-- .../(manga)/DownloadProgressRadial.svelte | 2 +- .../manga/[MangaID]/(manga)/InfoSide.svelte | 78 +++++------ .../[MangaID]/(manga)/InfoSubTitles.svelte | 4 +- .../[MangaID]/(manga)/MangaActions.svelte | 2 +- .../(manga)/MangaCatagoryModal.svelte | 10 +- .../[MangaID]/(manga)/TrackingModal.svelte | 42 +++--- .../[MangaID]/(manga)/chaptersSide.svelte | 86 ++++++------ .../chapter/[ChapterID]/+layout@.svelte | 2 +- .../chapter/[ChapterID]/+page.svelte | 24 ++-- .../chapter/[ChapterID]/chapterDrawer.svelte | 8 +- src/routes/(app)/settings/+page.svelte | 32 ++--- src/routes/(app)/settings/BackupModal.svelte | 12 +- .../(app)/settings/CacheSettingsModal.svelte | 14 +- .../(app)/settings/LibrarySettings.svelte | 10 +- .../(app)/settings/MangaSettingsModal.svelte | 24 ++-- .../(app)/settings/ReaderDefaultsModal.svelte | 24 ++-- src/routes/(app)/settings/TrackLogin.svelte | 10 +- .../(app)/settings/TrackingModal.svelte | 24 ++-- src/routes/(app)/settings/about/+page.svelte | 20 +-- src/routes/(app)/settings/backup/+page.svelte | 4 +- .../(app)/settings/categories/+page.svelte | 32 ++--- .../categories/CategoriesEditModal.svelte | 16 +-- .../categories/CategoriesNewModal.svelte | 16 +-- src/routes/(app)/settings/server/+page.svelte | 4 +- .../settings/server/components/Select.svelte | 4 +- .../components/extensionReposModal.svelte | 14 +- .../settings/server/components/number.svelte | 8 +- .../settings/server/components/text.svelte | 4 +- .../settings/server/components/toggle.svelte | 4 +- src/routes/(app)/updates/+page.svelte | 40 +++--- .../(app)/updates/UpdatesActions.svelte | 16 +-- src/routes/QuickSearchModal.svelte | 10 +- 87 files changed, 679 insertions(+), 693 deletions(-) diff --git a/.prettierrc b/.prettierrc index 6c444679..3008edbc 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,8 +3,7 @@ "singleQuote": true, "trailingComma": "none", "printWidth": 80, - "plugins": ["prettier-plugin-svelte"], - "pluginSearchDirs": ["."], + "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }], "bracketSameLine": false } diff --git a/bun.lockb b/bun.lockb index f779a1c233e49d4c73478d9c03c29c7929240be9..ef42618e4ea2b29876ab15bdc752f68efb467eff 100755 GIT binary patch delta 32825 zcmeIb2UJzbwl=zJ0m?>6iUJah7(kF9BBBJdZV)hGR@5z`AV^Tb0Jb@6ms*B4=bS|_ z$2Mneb8K^J+t7;XeRBon*xl!zbN~C^9shV|4Zb~V&Wdx^tXj3!E_RJttDk;KKiR9w z=qHU1=G-yNIX|M|!gC`giWURij~(*g(_^FGjbdAV>RF~xoTQ^`I8WhcpK1esi~f6 zDMn-3l*^?9OF?J_VRvKS^w08fQJMkYtl)WS-odEiTcFJ-Rq1Gx{Yl(nviPUiwC z2XzMRr}7;^DR&*vGN7eFT|qyg=yISpKud$}R_OvzivL07dw^1T22g5xa#Cs*ge0N=z&Y0RYJwBnku0(O2t{5UDQ2b>-2V)0%4V2`ERelR7#V=CjlT>*I zXi3P8D&Gv0Y+X~8yMaT3zwqG-IkR zF_Ubq(}npf>C$={`^5Li&{a|RtnBItklmt@k(x{0K^YF!P}KRpf%5{CinWHM7*mrH z`WbZ@HI*qK36vTZ3rdRgj7?4I-$$q06sXj5&rgw`1uae^E+aM(^OR0E5dzZeFenvJ zD@e(Zr)IbVp5)2Yd|W5N(@51u*gB*mODs^+3$>g%b(C_uro?uGL3DQLNh+rusFf)K ztNDgP_Elm-6!9>%m`qS=PNEUr=Bv|b@@o7gQvVjJc+-Y3#d|)1k`t7MoSdM00(=-( zGWRKLulK8`=)99h7q$=Uf|4ms5W0>$PwPsj21*Zn1SR>$hDwW4lTx}FQ!;d^v3
UuI!3y3j@!dfw z{tGDSs}0{WXq`M&rx?@H;*BX5;Auj93$0-GtZZXyLVTYzoo;lLQt%L!T0|>+n#$*b zw?W1PV?VfoPPa~tAFtBspfu3B8;!}H@u@l^@{uXqf|3H&LES)mrFzP)5}Oj29GjAr zYOII|@-Qb*>iGD$K1nG?3_kFr33+mCLaOdUD~0b7->180da|xvYbAZ8N|QYklDc8A zfWm@ly2uzMUP3uGDCZV6ZOWY8V6*d99@+TN`)UmsSlH5(|UTMdEI)(CiF)9o{oxzFa|x*$ha-w zsi4uFl=Q!Vl4h~J`XRMWm!1;u*(()Zo8Bj*TT*vpkIqU%!a++R-CQ(;?xNX|(BBmS zBLw6mqhgi2UwiOWpaGOj7mulgH1!2fecZg6vM$hkN9(fh^W`EPSzujv#WJbJ#D3)Z zwV^e2ZANTXLIRv!Cy`fMX z3QF>GDhp7wCM`!0KNuj1<*cy zlnS-UL7Rrjsk>%i{G}$urjj#g^Au(QPl~ilR!n3}Qd<5wL0PiRM%pqcxIjni?r70ZjbPS$erZ8q~a^|Uo-=2{tx zl8Z6(d2ZQNJw_P2^5o(@`K{vKWwer~hu-zrwi|7#473F;$ zD)IFW=K44+yK5uHgzt3-V2gN$V+gy;a~(tUu1H*0iE#{IU3g%r5VnA4lnT+mMoeQR z#y^17=I?6;`XC40DDa0(fkWN>h@AMDSZ$_v(a!Y(KQaf zq3&|1sg+LGNe(Ul8Y*P1rR$2261xW>r49$US!>E++Xo@6L$aZPj*MUatKrunh78a6 zUKsH`e_t+y)#QQYL(D2+o~Y03ln*lNjZi~5v;m>Ua_Ifn*g9}(MK%Hjam=Dhc`*nnvUvz8Ii4V-_dro)2=~nb-0N zmWsIWOpp*4p63y4)*mxR1HRKE$ZQ8fjpUFCZV*l6P&h(L?3AyvD+np+%9hq*dmyCb zScg!AocH5bS%We+xk`Z1tBFzcsVTxN5~+TcLO1% z-b&@QbZH35GHGXdp6LUHEATv!kP1BCCs^ONf=*XUHWYITkXBXTnZCjL>kw9zZO>c- z^m;cXiH^zpX6yO;>LDzj2l|Id?v;3^f3Vc163_Dw)-SE3RH3;3H6B6So44SoL8g4K zbAY}oOxaS7gD>i{!QoyGuVo!;vZ}n6Yp_(vlV`dH>jOL$trV9};kmU!^y^d^S``(b zxAfBKLXcTUF0T&cKs}ctz+gIcHLBXs)53C)czgA6AMxK22?&u=w4NU3C z)(IT-nYlc{FXVxBLiA_V6iWI+K8mJhd~dA)eI&SsNH56-T?DQ^I3?u+aAZQc|E1Et zJTEv{9|OAt%SouZY2c{mEadFhz>)i)Xy{YUPe}>W7;Ey3&=A&-=Z1#pe@1Ina|Q=U zpQ`g(VZr)vf2~+jemXcxf~@Gg<6q;*{uYR+i#W^$E&(i@XVeYRPlt@OE-dSG5nN+% z(4tBJbLD~cLRcG~Q7=Tl0{)@+H@VL}a7v$3N$xzbeu#bs6z(DC-RoZyGjv}4U{;I2 zM@&{=0k1dP1FkOr(` zsu3(m8Yz7+23!Mh);uhwra2f&D32X|WdzmYV2C#0qLf15AYoa#vx`)A*;ndl?pPug-~^Qc6LP;s;02q>Ym^zmomta#}KNu01LwbXw-16c>zYH9;0QNxKJ#duUgoo7#(1(O7HiV1A_fo-8O5D;hk~V-t zVsif~0g_1=uN59_RwE1*$pbV2Au@|Z_kXjU;6nLetS^efa^%3UP+)+*IXEf=25%g| zrtsW|5dCh*sCh`?6Tm+3z-A%(Fg*E^Ys10(1I#kOVYPyeIf+nHIsZ_&p#!X-q}m%1 zppOEFK}lwTVne{85ybfiSe^oh_Gg>ubUMsbShFMt=!>GgRIwR^=xKE!GaFK>0)qsF z?m*k+jPmF$gok6LsqjxJq7l!J3dX7^Fgk=?;Th2(l4E0@7agpRfP1U{4y6Z!Q)~=7 zvb{W`d5HcEWYl!ontIPBnpa>vvEDqeMTmYiWUvhSiDta#;HXF8gXoJ2XrS6E=K!<8 z#L0`fod{7Ld1UF$4O+b@L8@!u`3}Lh{UGd&B+yw$iho;sMnq`VWbOg_5#VSVg=_i* zNURypYZWYgYR2J^yG~&_i!2x>P z=8AQ2bAgwIfl~?#s{>o995lcxBeyxP)h1XnX~8qw1e*o6kk>bLf~2e#Jikq_em4Xu zC{|H71kF{Q9tKMXM+Q~~?HX`!0n)}X!0aWsU_Q7_kXf}>G{kl~2bpz4s1~n-!soQ& z`R#(G8?AV)_Q86`)=H^x2Y8|pT(E5FMHE7b=pNYMHaMzHPNjE@QSzWRw4@z4N~zqm zXMiJ96yjmEYMO$n&Fi>eMchUm>r%TmJg;N0*)#~yM%>QNAyfl7Fc#p~`nJk=LfLT7 zNN^Mf!y;~k$}xEvcCanaa}JhRJD%A&SPE{(^EwCX$G1~_0=Hz0_gmmXksWh~Pk_Ek zdnHc3kD7G@7bUB@2_aGrRYKJ#;7A?hL6yxrD0gC*8Qk!%9Hra}PPumxr|+ovrd*1d z0bEVeTt5sUUzBGm&oU>$QAc5>gSm@!qEz&l(i9=8Rk_Dc14n+Ybnb0%*H#k=9526=EZtP>z* zcjI{wZh?^6hN-D;fb>Wax^~wJ!XzPe>dy0e2J5%0LTHWqp}A4X2g`R1&^G`_vx@A1 zX7pYM6EQ5c1tGe_DUNA^nYnUcu52J$PQPVEs8YPFY))#e+D;MYf)t z){2!g3N|GP)Y*#``CV-G0_H|ZYpPxRcF|r?6hWGqa?ohoAgw$yk$Y=@_ z`_C_WurBjjSpLD!BWM|iS>oBYgq9dR_r!*$vR=)3mPIxVbr zfV8I<&rA%~TlLoIaL+)ekubV9&rb}N7WL+}`UIOjMx5+}Qn>`4*C)7`F+u4qs*75< zO+phZ%2nkcikeZFRyF#JM4b+EkIEef*WfE>+Xr9CX`ERmILys>!pcL4ycAOe#@btO z)O)Zt#*KH9Vy`0dgpmx6Mualn7J{Rc@>%djB*uM|RFWlr|(PY<@3DWxI(d4B&| z@fDDbAORHtD*)q7M>qcffVvm6fqW4q9?M0U!qW0pkWx9QPQD6KGrnekeHMw~)^cum znp`WqLB5DmZg`GdJ8sYNMbsL=d@YZo?y?kbI6$ej=m+`w7pPqSzmwrl1(R7|e)%d$ zOF}YEmH$0e>i-uKDkc4WLI2Howf=u-fF5N{1x$e%KoMXOK$QiYN; zzfpOG^5D@W;JCv&Vpyn$`sl1P>oG7LHj6RS9)IF4dsZ;``o-!k$ zN-0BORZibbQB)Cp&|oYDN5@#(6ZD5axs#7UH? z$_r9zz+hEgkWx8W)Dd)LsRd-Kl(x`No*(GrJ4&Kqs+=eVhvS1fjJ~3$izo%h;)5z0 zuksT}h>Ix6CskJ?CaV$ujG7|@?FC@mGs`}Uvj3#!DoAN+TB6E{+JN6exj?t7a-w9n zJeATG1iFY)a5p}vqYtY5A(j42k+?t=!xa!{5nm}a@Q9j$C_<%^gxvp zrF@Un_&-4DhU`K@l~PhyN$ogSL{LjBs0oNtup&MvVI@`m?@-EDSI5Pn6=Tfs(8Gs=S{{tAo<@J? z3Z;fcs_7Mq{-*$WdmA;PASF>de30{GtMLUXZ%_hHsQp4}5a-ziF2c>*ZRXI_b-d?Klzf0=)M?k)aQt&lCXl1~l zHdUY}^}nN3kQL-qku@mscA#`)a#zz6rSht(d_hWbFB9lb8S1MEh*E(K)QpW(zOl+T zRcSaVT^glu1r<~SN&m;GR6o(d|s>?b+#|5^TH(Jedfzw(?wR{MV; zom&5YmjC~)#{hEqd%%B||NmM3|7ZFCpXEPI(em@apD5h~|Fiu6&+`92%m4o@{|i0_ z{Ld`^L;eq!|J-qMTIkl^)zbabtj+dx+>-Qk{O63i*FTwDO1LoAzsZ>~tDHURm)m}E zo^HQQ+Q?25+W1GXD#s@JkLuB=&+4gjh1szFQ(gFp$qu3YPp#kR+G5a0_m~>@@4npE z!RzDA-zT|r+Favfxy>_w54SS58{BDniR1n~V;ss23^BR#`+}D9%0-m-7~Syt(#Qtm z^ESCnc~>a({QIrb_q2(&t2!~|cjLN6`*(F}8C<5zpoWc1elPLdMC#JNWc3S;j-Bz3 zox9EVP>FrxNBx#QHh4rt(`&DL-B>$Xn#()Ra0oR!mww2_Dl6Y6{$0y=?H?{#c7EBC zS+S3fwRqKF{;t-CfBgI|p}YUPxgOrJetimGOHZg{aZj2*aP;)zE=ym<+t0bTY0HdI zv(W9+YOfd@X2H|1IhC_Inby9-&!Ht-#$;BDc~jx{ zW_h~n^Y>(ysm^xnOW$$mV!cs*Ve6YW$$P)@;)+)$Gfkh3I$q&S(q-H|nC`RnXDm4D z@tK=r_~>Pp{Mj-CYrr4PiQzSuTk?BL4XhFOSr)?|f}4i8COmL?44<*WlFwOgUpv$z1C(fmC=oAc;ZF{}k&fzOtlt&U->cw2n7 z<{R)C!}V)ou;VBepKWRz89Yzx#PMR)`|DUXJ>u{pIvy_^)c9^ zlY!5!{0u(3@hTf)Sa&`YpGJNepFOzG#uygI$83Zao1o!F1B>T@o1n#JXtBwFy&aFh zHQoX(HXB$Xe+gT>1J`PcfhF+;TVnX~t(M$utAX|9(OYA9n;c8N1zaj;IWgRPn_j(v(}S_uTN7`NwQf<)ZdQ%M)l1C3{M*N6Uovl8w>5^0y&ZOBQGH+Q zr4jW@$M##&Z}*QcLO;#v{CV-k?Wc3PRU3)MXwEl`58VOh+X;8uVTc%^ zwG-5|)~5q0QH$bJPc`$M5V6l>D$7|h>F)4t_dd=`ITq4jz!sY~o{NeVsV4kl#^hbP zn)7a~&AaTu`Q~TVPHJ^>+>H9R+;f)$pSIHwF{)sxdqYMH*lpr8K4a11&dyCvRzK6K z=!yJaR(c&bJsumnr11Qq`Q^N>B$PH?Ht?XEPnY{W_FaqXJ@2-qor`bB2Z@D@^Z4~$ z4&m>A9b9bV`dPj9j(>A2X7Q2bI-eP%yi!j-eR=Wt?i*VV9Y~#B=J4Z|`{Sl`c9IgV z&CIM???8Lk>X}&~b(2c%SrdRQkY5cjhELfAZ`^IkU1k{AI37Qv1+TxymcQ9$U=w)Q zZg}G!%kYND&qhAGfBb#a&6cY_+Wl6q!`O|Q&RpOT7Q6qD<(s)G(S8M<`^DxAb$qR{1g;o^G?*zvVs51e`*Tzs#AaUQ)F zPQ4#44sIG}`{2~zjQb2s@D1R49)OGQH?WyJc0Zi@AY2^WY;Jo1P7N;ofPu~7d%+Dj z1Q$POVDot2gE74F&z5||Ap>^EpE(r6FM;#_*?|4@Lw`o^A4czkTf%(~W9m7A$>y+u zE#tSrJp|X_h=Hx(Q;xt)M=kjqaI1LOQ4HE+mVC)k16#vif_n$9)iDEG#}^!fe#fEF zaRb}HqmM(s6VM3UCeBVkzmw4Dgn@108^CP?SK_3BKZ6AlU zvT}Pi_SZRM-99ww++$R!IDX=~L)M3+Tc=|Z&eu1FEKKNC-^Oyl<#b*&KW{~^*tQkw zF1Qn3yxibBR*fyT?AWZo+woV^6LG^+F04+!=jU@Kaaw-Qg(nKQ_T7Sw``M<#Y}-+h zcd|;2TVmm;icf7@vvLyH*iaC8Q2T{65R4T=(pPj_L9H9jefg}e!F8}ulR~P=(k_dZ+8vs z4R3oF{RZydWJAOs1(jN~tHNmSR>gNdbV*v#FRc0W+k30^cPN(s{N8BO<(HXv^gxTC z&->dSez4ZqEastGa0$;YH%_U(c;q^en{t!ueldr+cnkU>ga_QGrG*VSGq#&5gl)=>RzVOw)IJm8f8aq?>!>q z;H?4{*Sez04IEhpycU)C(V)_>P~Zh7Bo%amv6OX?K ze|!M%1owqI-iJRvgm>OINR08L_gnKzU_BogBooFnAGGG9A7T7GFfcP-br5JmYuFD6gR( zI5%G974&-p{azVZC4L#)LvVFo8(0-S<~8(t3;n=(@W40F?+@tr#=t!JBXIA)MZ7hz zYJBEf==To#f%D-_{(ye(q2C_{=EvWIGtY;9?+nbJuXqRjz*)XGumIlnJ@oqk{lEos zeLnR22>tR6EQsfVI}Fa{g8~2J6#oJGeS&`ALb&5c==T}=eKfEzegxblaGswGtRBz! z1pU51KX46rmCrHLYN9_Te5S?dWpEF{)%ik;(J^0Q#0&=Z8Cb)#Ko%n!OU!cG9ERoS zv`1jyffW%9e59DkAXsj~EVKOGmi%fP)u!H^i^0Vwv}l}Dqr|g|F>z0=A5NS(a(%C*dt<@_(aX?dMamF_bctU>5AS-4Za!Bcy?W@;^pW3V&dH@>Ql{6qbFTCw_M()*6Uz&gSu%YVAIy_t@xKqujVM<84zP+^X&BSfIUa3$`~bsqp9%2_x;^ zmU{Z@t|px)>>D;FHpcnE2=nZak#{2Z46G^&`}WfZId*>f_C#j=v3{RkhR%4}?|I_v zj7mMa?EECf3(LZ2?@m*+x4qDtp}mI-!(9{2Am}J^Nie`10+&J%bQbZ2AgHW|-~&b9wcU7VP_AKCS8+m*o;4cH4)63kH$43(R%YEV+uw|9_3PFvgU_uA z*fDGI#RnHwJoT$M_lJ(dZg2dsBU67X^=xYPtZGGmXtk=gzWuTRs~=4(V5x2eTX!U& zk!8^~&kiit@9`Y%eBqR1r;3h+3ZIMXTh7;K)Yf;mCkC`m2)TCBF{DUH@bbz_*5*!p zU#V7L_b*n@r@n9dV*edaG1vmlbGKiAGB?_Ho2z?b%QxHlotnP9+PEN(flYs{UDztC zsOu-+us0)4eR6EHs`u)lKlh%z+Wy4dk39>o3TS`a?a1|`FV7Tc9=%%EF4H%BS>KlP z);%fOu|wa!YbI8>du6C|@v|?^yH+WB**>${+oAb&zl0Xyj&qOY``mjr$$L!fZtIg< zuB>x!?lA1-HL>((;aLP7dEFe{6ep_a(M=DFpqnP>A&3{3Nid@*1a&MR=q<)rK+xC{ zf@dU16oEw`ct?UcMbNXfJ4d@rQ`|2vwsxv;p#AM0LsmcEH7j+@>ezbyvq~;V9$tR# zXMJ|BE$bXo4~;pRxbXSMl~s2pwHniHn5F&ItsAB^cy+V;$8a&n3Z^^hZgOf(PXGFi zYB;?-^I&!J*m>n@KjED#HMZGt@Tu$KC07f*%6fL9S2^QASL@>CTiHeyoAvYVR|h|K zyWTYRx5^#1qdD4?(zjsiwiXwDr}~;iywpXwwcomA_x ztgBzH#3{#Za~zs|8SvYoS2LDp4vezf6!<>bw&~pq6<3M~Ynbj+QP?3>G_iyo%x#!u z`2AhB9szkB`kIbx9ar&uf5%ZjjB4(c5q7=L_Qf$>f1JAIO0%FJ2j6S(dykeae}A~E zQr%o}wROPlaigjiJwNM{eV2lBOuBea#co5fqN5e+=`U7TLD16{0!wQMGDKTz2poz* zu#*G>h292&!z4(wfnc!6CBcB=5V+VvkR{@6Sxi=TL0fEE(eL#M>lV+-4m`DRNZg)B z^J}?&nDyX*$aOOjlZ**|+0;y_|K=TkPzxB4_63sTnU5$B!y!tm`}O$>o_7hgv&sPW5}` z^I@rF|G0)Z?MIKB!|zxBoVD`It+mGXWzL>1Q1B0;Z!s3bhKVCYhKsVrK}O_c6lbZ7 zRTt0f*ed-+Y%H+Au8vz`K?zoz^%JpNOMBE3(37bs~^WymV#N#N?{XT>7n9j#VXAl9~CmgvoNy8b2o1yD{^e?o}ApH#Ivb zMz0HML($b3S!}c1Kq|rPw`TZOSiH2u%Ph3QQu`r=58YMqBogayp}E+%k$qTf@MOi+ zOg?U`p2c~@6h+L?p2EwGHFVd0@1R>kychjc1bv?r-b=|{PdP4~gDRSYL!xEQ%_9Gy`H8BDvV%r9y9F%%K&h3DPTRVpjJ`TzINV$8x@-TL@& zn6MnkYG-}^qFiLUFia~nv(P30x`-!J5{i=mS3NZi?YFU$CD^P38S&Hw7b!8WMru0x zTHrOpbTw9Gg%F;j$g*@zR3UAgnyV&ks>*1qQ8R?8aDytN9bS=Yx^Pv7X+!6s$|69i zA+&+_rrH=VbAaM5B8f3iilk%{SQrwYlWH4vuFlkHVm350hbOkF^~ z1%*GI1MN)3HGYh69n30<(7|lHZFvZ2gA{F+YKpKyTp!FzXSG6b9Hj*&0h56#0Byda zjau{zZ?-@&fHrW^X0JEETi_4i9gq)v06qerfX~1MfV!K$2ip%E01g6&fS&={E;pNY zl>LOj9AGXm510=u02Ts^fF;0EU>UF+SOKgARspMlHNaY69k3qQ1Z)Pj09%0^U>iU` zNw)*o3G4zM!$wbOEAVp!egj?t3OkfkjuZx3MBl^wSdWR-!! zfH|NCJ|T`?bL0cG-Ho=>(@uMOFGD-=Ujwv5pZ3&w01`mI_($6v$?=Z@$AGNk_=o{$ z+u~RhJPv4#a1)>@P#35N&`!}{AOxUYrL}+>0BvQh0=NUTZ!Fo(0oqeX8=*Z?jolHdX`G}viyzeJ&vKpTS6Ug4@hHh9|7y&c#IBmlL6j({iP zhl0KUeg_r-G*vbOq5zuiXm# zXyOS3b^+VQ-~-pg=``t-%c6RzZKSw8|g6 zTMG?&@(mjH$v`4N?S+au2N6303#NqO?5Duq;ISI{nlBFFCII=coEDVQVDUx&r$+yx zs`CIEh&rQ~pYR^Z>{uh=GJ=&4q%40|oR*cQ=_mk;EL{ZP2pB})5zNUYTxBCcs{loS z9)J<(F3yZ#k*ufi9Lela--Kb9=MxZ-1oQ#0u##0Kf2ZLv1Q-lt1H*wIfMGzk3R(n= zLU<%VYEl{s6V>En5&kD8uK1TW*6cJ6nZMepQWkY7*?{gvbWb7_0)7PQ1M`6C0NI5D z(}1bKTwo6H6EG7Hzzkp(FuMSM3*no<72q;(2{;Ly0FIH<97P}xH~{Pi_5oz&y#W0O z*mhtWkONQyHUJBO62N+36|fRm0xSj=0n33Ez*1nD$`@?#8px=@tI28CB0w!(2W$p5 z0ULoWz*c}NCGDw^xd8PL@jC#bdw^X4HH`S(fIFbM${~ag0zU(Xfg`|i0NU$*LH)Wj zz-izVKvtlL^T1i)9PkTp0k{a<0H{Dpe+{6tWVNdRxhz$59UvKniveW%lfdr)H7Xsr z3)}%pkdM6tegg^v_kmwUi7~8FTZ*UXd%z3e8Snrw2c82@fk(hY;4x6p!cV{}7FG;Q zd0zvsfH$J=Fcu`zMlfg5WjHJP^}{sl9ijrI+msc#yC z(!IVR!XE(27YfjNfYt@{KvxSOGt&fG9qx+|1Jpe#@tpbA|8d%zYT zm$e490xW@|0NK9?s2(r}7*H4>{R@G90sRDg1U>^MkeLCdfCNx_9YAu4R!9`E0BnHb zKrz4$C;^lN8~|sa6yOMu;hjLs09FW>2PGva?54^oj+F5PJb)^IJ5Uwy0jdGsfG^!Y z`~cFrCJ+Gl19UH<`y82z#txZ~!elA32w8)?i>yGJhk#Ne>H=XvD9`|?5B#(4$f80E z^vA#49raM~zuO((D}gey{-gz*;%g(Cp>d7C_XMSI6NH-r6sF06)|T4jK#oXvT1|U$ z#+CrBIse`n(f|J)?f*N@*a8h9Yg2c%MVOXtG1UL90h%TD0F?oXhy}U;?SRez#kU9T z1kl>213+;}KzG0hbOWdYvI5D-ABbx5c!ZB3p4O5ygnIy4arl@8VIR;0pf^B$OH(5) zHfbvSe!5JATq~FyjT(^#^aZrav>{7FQmd>h!de&6qBe#4zn}(`kP?tKR2XSPtt44E z!UI7wfxy%3`AvZ4TUv+73XNeC7MQ9r@5sx*Kgr;ID3X(;%n&?hq6( z_-`sYiFmD|qX_?1MKpWV-3kSG`FQ#0MA&3z zr-j>3W{$o!@hhv!@6hJ9%pSPTX8Ai5SJTTsz{^`UYe`fzuj|vNu?^2)s_hi$QCei2fQ@zu!_rW0bc-;P9#x0k<{kFT(u!kn^b znktHD_bx8woBXo(cR6DXuNuk}Py{he-yKOXd$Fjc98(=C$%EShG4s^lsWfN)UVdJF zFqZZk;@S^fA`hyf2GY=RL7sl*PwJf9d(A^`hOd{YH+)L0o5D)gME)^IWQ{}{o-RIA z*Rb=9MEdzqV`d=63NgOc<#g#gqn!}r>*WoL>6VI5Q<$UEE+oLhAiGA$qho($_{1SW z4XB9(zX+cnnVpFbda3b`%(F1_L1WP|gMMVrj(3rbRGIOz?UU(0mNrc z$Y+SQNA$?J4owsI6?3^->Q?%h5PEHut^K5@4QmHavVlbVIb!WcJ8f7m#84OHiQ9|e zAE(5m>2Mo=-D5Fj4s(=DOvGcP+iwi?4I_u1P3HuK&j-!B}+qh?FadTJ4rjvzc9ZkF?aH5TuP-5YGXv1 zY0R0WiM|V2NmFR2G||*wO(wU^LCl-R%(Mo{HAmpP49n@LQAzJoU8nsx|LhVuk4uf% z(HjQyhPlxcS=o}VftXLQ+9?5Z-2QxGZRP5gGmr+ILq?U0ab!wTQzUg0`=_%wj3^I* z@g=M6C~3*Nz6*9o@dTrwlsy+IeU zzop}19;I6+a%Vx!C1USZaB>GZvLsP#Y$< zNZ_v>2;g0JR_B~T*3!2G+K~a4_VpjlUEA;HZ!u5APO9RI2wTML%E+Z@2M=5w)}x`% z^ecP6C3X`;m5Zw_;GXQ*BG()D048YPA36~&vTit>Uq*uM-e`c`P%Kl zOj8kxXukwZ(}J*?!5kDvEGzaMW%i=mQhd1~d*f?IR`wVA;0 zFIqOjNnD%D%1D2yN`1A#cHd9jHte*M_;o&8s16{U@gOV~q7{GPiFRV%LT2WqoiEWm z__T+!i|sPmnl-(Ay>&Ci?uF=n?LdmTPTqOv9(8N?Ex})UsGRkJuv~;r*3P)tr+eP0 z;v*^aTUOaa9VOdhqQfHQ;N%7uD~_I7xME1J=jLu_za^|GCZQyM?O2U73v65tRDKls zEx})Ur`(7Pah)2Woz&5_2~-D<#!)6I+)u z-{RUa7K5hjZC7|tnK=@BAwDc+tyqqTUWT!EK=fY5JS;|HflNyT3wJSp8LY3JSYchK z!Qc$j&M^{AMe>xICeAHm4Qigk?FV8cy_yb7sLHSJ5J+r;Rz37Mon0b7;mi7C`L?J0qZIE zbg^dzD^~uAm$Hud^8kE@7}7RIyjj5_SQl}711l-ou4FDwC#xx|p@n`Io6TGD9zT*O z-$Ak3n<%ENMB;)&?^Ap#uqX}I^^i{N|l(`6A2R25;tdsBP?7g0iCpyLWZq3o^lV2 z%vH-q2^rWl4s&WphRmLMv{c{3ZAH{7&@poN`6=eK6RVEnTjj8gEQr+-gEztuC&h-1 zQ1Fg8wh>!v&d!24|6!&TzMCMLBVKO7?UqAqc;9MQ5BvbD5jklx(Q{i z7PE=OiY=SaveKc7S;lprx?#taBUlN_3uv^gnmBa=U5n-SFyXQpZIS!hkNqY_Y)0Sw zIU_B+(F3{-;@M_Y@JSTjf^^zxBXdV?uebb@)l!KKp`|}6@DoW}Q0xM+2Xl;q9EWTD)s=R#h4v@nuCwjl2~^y=|f=In z-2q|DmHAD%Fy~jV?|cl?f+3H&IR7)(7sK3N zh}pSdpYMv6D_?($@j#3lVy-8)eL8Yj?bvTIQHY^ujJZ=wRgj zzUA4E7*h4{%yMN9yt>_p~hYG%f3BfPov@AV!nU&{}%K8`vMzBxreC<-$x0H8O+%NTi5Aj7*0JAdv;*J zDZVF$Z)eU@ax<}TJM)!>H4_&>{l9mA*?aI>1TVy!DT}bh13Vg4YkA!oF*Ovwl4n6j z(Rv3f<)xjNvhdZyrBxq)%9q$mQl(+=3R53~vJq=ntN`w+^8#R3oDxE1XSRI|U^MXp)Y}lSTsgLpiT%E>UT9jyp zgwl{GaqTqd=qNE6k0O#qwD^hS0ahr zLp#H0K<=9Wvsz77$rkaZS1H;lMw^ag{a80{wVRq3HxA@Y*sIhslFHDIA=+Ck=uPMF zAL-=?=0TbYwS$OSM;~hzYqR-h#Hc;ouC;i+7lw?C5w-WBtXnan^*)yEterfRSjDyL z%Bfu=B}P*XD#ckt;`e>fNjqC;#?;UQ=eM6Wl8tYNyPp+Nnda`^p|{ zG{cd!mzQ~RSrhl8R+LFp?Agz%OI13ExBFSRvv%f?#iJOPkon``aN2aYrK9L{0NM6* z6ax;RyGC~stHC>KrwyHHv+{J4*Yob-o`#n{h|LyU?QT@S)jW{PPC*=+SzMl8946yH^3A0jhFidl!4yM?ivGRoBf_+L3Vi~|RE zhC}~f?clTi#w^a-Ia9M|R@fE6m%WC0X_14G0)wqR2J^1#EPqFt!)%d zkK;L2Ubo5%tx?i<#*F%BvxRcEE@{@*rJ2jHBN9_z%<8n`m$XB6&=R;WyrFvb|BW+> zZk@prwMNa5USj=OgsNi)r?5MVVWq5+YiOH1lV+T<9x^&y*svUA)}tAJE|&E! zSZoP1e?NbvT!$=eUue{e19j+s`nbN@ec@7tK#3{u_wkKmqP&45 zd&<=&Y~z_OqrSyxCu6N}xqkS<#s+V{#b{?}N!LaWnlZ+&j~avb#IpHC>^WAV0(~if zS@oY(piGPoet+MDzo|&8=hHbBfT_s;JoBreo!@n`MB}in+0?4^9Euwv4fOwpZaVGow%enx zrfq0;)LbqNj|li~Izd@^eb&Du$GsXJP&S}R$wWTzQ6NMVReal1!>Orcd77=PG80E|74Y~ zZ%?7?)Jx1gSSzc!v+~@oPpW!-YH)K0~l{C3IwJQtH6pn$s4xzbOpzQMvPlijzA1BMu_h`7vyb#VeS^eVJ!l<5cdvL&jRpVJ2w!-$dd$Y)J4^qZJCE6` zLd-ws;!AeMT$KL6YB>0MrNw2^;iK|NugcSsXV1hG(f0#(W=nM>CralmhL}ms#OcS( zMqK#7%81f-lD*i_Kq@0#D@ujLntZ&*wX221NMf4v{sW8G=Nvba+MAlt_n+<-c*aTf zL-YX)$pJ02EQ0K9i%2bUt`(8|nEZumF-s{+L_cKZg>_NMOypWhRYmkiuw_0ly|A^C z8YrQLk6Cfi<|AIhqOOwSQF9bK*-FxjPFB)b=9lxxN_uRX6J#g7(o-{?#mMrM!d@zz z~)?;eVyQv1cmB^8X9qYD3boar=FC8qjtZKP+I3n1u9Wl#uTljUa2^(_4^Eou_?X(RD4oOTx_5COrs|b zjZKN~nvPSNzt8tIiE5AU<29Ag%(OpcPEE^5Fe(akjqmf-9A4c-Uq8u(`psOF@sx_1 z$(tR7Z4J2agsM_COXB6hfQiOe45}nKh*1@#N;y%UQj{YL6tT`yc>$)7IMz_IWC3Ez zZ>*dc87g^;S4~lfcc^47j)qE>!YWKEAxw)wmRJw9h1QdbAh}f|sfBAza)GWXN&Qoe zDcHD?nkFv^{k*-sef$G`L{=l|i4<5voVmwJi#|=H(snfIAxnW|H3M>XHI_z7YPvEa zGD<2YT<@?#Vu(SqFu_t%j5kO_#YShieX}U3xG;oE&MaX1BUV94JTF|b`i?gfkHe+1 zlsU&bLdw9Z%ctfTl4DV6(LwwyzxMoCZA3@@UjLOJ82rDPL%E6eAWQgh~; K6WvPM%KjgNX1C-3 delta 30995 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 buildZip/md5sum " }, "devDependencies": { - "@0no-co/graphqlsp": "^1.4.1", - "@skeletonlabs/skeleton": "^2.7.1", + "@0no-co/graphqlsp": "^1.4.2", + "@skeletonlabs/skeleton": "^2.9.0", "@skeletonlabs/tw-plugin": "^0.3.1", - "@sveltejs/kit": "^2.5.0", - "@sveltejs/vite-plugin-svelte": "^3.0.1", + "@sveltejs/kit": "^2.5.2", + "@sveltejs/vite-plugin-svelte": "^3.0.2", "@tailwindcss/forms": "^0.5.7", "@tailwindcss/typography": "0.5.10", "@types/node": "^20.10.7", - "@typescript-eslint/eslint-plugin": "^6.19.1", - "@typescript-eslint/parser": "^6.19.1", - "autoprefixer": "10.4.17", - "eslint": "^8.56.0", - "eslint-config-prettier": "^8.5.0", + "@typescript-eslint/eslint-plugin": "^7.1.1", + "@typescript-eslint/parser": "^7.1.1", + "autoprefixer": "10.4.18", + "eslint": "^8.57.0", + "eslint-config-prettier": "^9.1.0", "eslint-plugin-svelte": "^2.35.1", - "postcss": "8.4.33", - "prettier": "^2.8.0", - "prettier-plugin-svelte": "^2.10.1", + "postcss": "8.4.35", + "prettier": "^3.2.5", + "prettier-plugin-svelte": "^3.2.2", + "prettier-plugin-tailwindcss": "^0.5.12", "svelte": "4.2.9", - "svelte-check": "^3.6.3", + "svelte-check": "^3.6.6", "tailwindcss": "^3.4.1", - "typescript": "^5.3.3", - "vite": "^5.0.12", + "typescript": "5.3.3", + "vite": "^5.1.5", "vite-plugin-tailwind-purgecss": "^0.2.0" }, "type": "module", "dependencies": { - "@floating-ui/dom": "^1.6.0", + "@floating-ui/dom": "^1.6.3", "@iconify/svelte": "^3.1.6", "@iconify/types": "^2.0.0", "@sveltejs/adapter-static": "^3.0.1", - "@urql/exchange-graphcache": "^6.4.1", - "@urql/svelte": "^4.0.4", + "@urql/exchange-graphcache": "^6.5.0", + "@urql/svelte": "^4.1.0", "devalue": "^4.3.2", - "gql.tada": "canary", + "gql.tada": "1.3.1", "graphql": "^16.8.1", - "graphql-ws": "^5.14.3", + "graphql-ws": "^5.15.0", "p-queue": "^8.0.1", - "sveltekit-search-params": "^2.1.0" + "sveltekit-search-params": "^2.1.1" } } diff --git a/src/app.html b/src/app.html index a5ccd543..6d2a3278 100644 --- a/src/app.html +++ b/src/app.html @@ -6,7 +6,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + diff --git a/src/lib/components/IconButton.svelte b/src/lib/components/IconButton.svelte index eb4c560c..14e6176a 100644 --- a/src/lib/components/IconButton.svelte +++ b/src/lib/components/IconButton.svelte @@ -27,5 +27,5 @@ class="{height} aspect-square {hover} {$$props.class ?? ''}" on:click > - + diff --git a/src/lib/components/Image.svelte b/src/lib/components/Image.svelte index b3136e63..44a133ab 100644 --- a/src/lib/components/Image.svelte +++ b/src/lib/components/Image.svelte @@ -72,7 +72,7 @@ > {#if State === state.error}
Failed.
{#if reload_button} Submit {/if} diff --git a/src/routes/(app)/(library)/libraryActions.svelte b/src/routes/(app)/(library)/libraryActions.svelte index 3da74877..cda11b5f 100644 --- a/src/routes/(app)/(library)/libraryActions.svelte +++ b/src/routes/(app)/(library)/libraryActions.svelte @@ -121,7 +121,7 @@ } -
+
{#if matches} {#if $selectMode} @@ -149,7 +149,7 @@ /> {:else if $selectMode}
-
+
-
+
{/if} {#if !all} -
+
{#each new Array(30) as _}
{#if $Meta.Display === display.Comfortable}
{/if}
{/each}
{:else if all.mangas} -
+
{#each all.mangas.filter((e, i, s) => i === s.findIndex((ee) => e.id === ee.id)) as manga (manga.id)} {#if $Meta.Display === display.Compact}
{manga.title} @@ -162,7 +162,7 @@ {/if} {#if manga.inLibrary}
In Library
@@ -171,7 +171,7 @@ {#if $Meta.Display === display.Comfortable}
{manga.title} diff --git a/src/routes/(app)/browse/source/[sourceID]/NavActions.svelte b/src/routes/(app)/browse/source/[sourceID]/NavActions.svelte index f796e44c..4298efc9 100644 --- a/src/routes/(app)/browse/source/[sourceID]/NavActions.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/NavActions.svelte @@ -12,7 +12,7 @@ export let supportsLatest: boolean = false; -
+
-

Preferences

-
+

Preferences

+
{#each $sause.data.source.preferences as pref, index}
{#if pref.__typename === 'CheckBoxPreference'} diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/+page.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/+page.svelte index 61308753..60c62e3b 100644 --- a/src/routes/(app)/browse/source/[sourceID]/filter/+page.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/filter/+page.svelte @@ -73,9 +73,9 @@ component: { ref: FilterModal, props: { data, submit } } }); }} - class="btn variant-filled-primary hover:bg-primary-500/70 fixed bottom-4 right-4 h-12" + class="variant-filled-primary btn fixed bottom-4 right-4 h-12 hover:bg-primary-500/70" > - + Filter {/if} diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/FilterModal.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/FilterModal.svelte index ab7c6396..a5f4bfa3 100644 --- a/src/routes/(app)/browse/source/[sourceID]/filter/FilterModal.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/filter/FilterModal.svelte @@ -58,8 +58,8 @@ {#if $modalStore[0]} -
-
+
+
{#if $sause.data?.source?.filters} {#each $sause.data.source.filters as filter, index} -
+
{#if filter.__typename === 'CheckBoxFilter'} @@ -95,9 +95,9 @@ {/each} {/if}
-
- - +
diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/CheckBoxFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/CheckBoxFilter.svelte index 6b8e3c94..54eb7cc2 100644 --- a/src/routes/(app)/browse/source/[sourceID]/filter/filters/CheckBoxFilter.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/filter/filters/CheckBoxFilter.svelte @@ -14,7 +14,7 @@ export let filter: Extract< ResultOf['source']['filters'][0], - { __typename?: 'CheckBoxFilter' | undefined } + { __typename: 'CheckBoxFilter' | undefined } >; export let filters: VariablesOf['filters']; export let index: number; @@ -36,7 +36,7 @@ {filter.name} diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/GroupFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/GroupFilter.svelte index e0a1de73..52689db9 100644 --- a/src/routes/(app)/browse/source/[sourceID]/filter/filters/GroupFilter.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/filter/filters/GroupFilter.svelte @@ -20,8 +20,8 @@ import type { fetchSourceManga } from '$lib/gql/Mutations'; export let filter: Extract< - ResultOf['source']['filters'][0], - { __typename?: 'GroupFilter' | undefined } + ResultOf['source']['filters'][number], + { __typename: 'GroupFilter' } >; export let filters: VariablesOf['filters']; export let index: number; @@ -57,7 +57,7 @@ {filter.name} -
+
{#each filter.filters as filte, index} {#if '__typename' in filte} {#if filte.__typename === 'CheckBoxFilter'} diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/HeaderFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/HeaderFilter.svelte index 5b02f50c..63a3ec8c 100644 --- a/src/routes/(app)/browse/source/[sourceID]/filter/filters/HeaderFilter.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/filter/filters/HeaderFilter.svelte @@ -11,7 +11,7 @@ import type { ResultOf } from '$lib/gql/graphql'; export let filter: Extract< ResultOf['source']['filters'][0], - { __typename?: 'HeaderFilter' | undefined } + { __typename: 'HeaderFilter' | undefined } >; diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/SelectFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/SelectFilter.svelte index 60767a2e..e376eff2 100644 --- a/src/routes/(app)/browse/source/[sourceID]/filter/filters/SelectFilter.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/filter/filters/SelectFilter.svelte @@ -12,7 +12,7 @@ import type { ResultOf, VariablesOf } from '$lib/gql/graphql'; export let filter: Extract< ResultOf['source']['filters'][0], - { __typename?: 'SelectFilter' | undefined } + { __typename: 'SelectFilter' | undefined } >; export let filters: VariablesOf['filters']; //FilterChangeInput[]; export let index: number; diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/SortFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/SortFilter.svelte index 96f0c4a1..a579e840 100644 --- a/src/routes/(app)/browse/source/[sourceID]/filter/filters/SortFilter.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/filter/filters/SortFilter.svelte @@ -15,7 +15,7 @@ import type { fetchSourceManga } from '$lib/gql/Mutations'; export let filter: Extract< ResultOf['source']['filters'][0], - { __typename?: 'SortFilter' | undefined } + { __typename: 'SortFilter' | undefined } >; export let filters: VariablesOf['filters']; export let index: number; @@ -52,7 +52,7 @@ Ascending diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/TextFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/TextFilter.svelte index e6775e9f..b9586fd7 100644 --- a/src/routes/(app)/browse/source/[sourceID]/filter/filters/TextFilter.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/filter/filters/TextFilter.svelte @@ -12,7 +12,7 @@ import type { ResultOf, VariablesOf } from '$lib/gql/graphql'; export let filter: Extract< ResultOf['source']['filters'][0], - { __typename?: 'TextFilter' | undefined } + { __typename: 'TextFilter' | undefined } >; export let filters: VariablesOf['filters']; export let index: number; diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/TriStateFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/TriStateFilter.svelte index ffe0bb60..8eb4352c 100644 --- a/src/routes/(app)/browse/source/[sourceID]/filter/filters/TriStateFilter.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/filter/filters/TriStateFilter.svelte @@ -14,7 +14,7 @@ import type { fetchSourceManga } from '$lib/gql/Mutations'; export let filter: Extract< ResultOf['source']['filters'][0], - { __typename?: 'TriStateFilter' | undefined } + { __typename: 'TriStateFilter' | undefined } >; export let filters: VariablesOf['filters']; @@ -67,7 +67,7 @@ {filter.name} diff --git a/src/routes/(app)/browse/source/[sourceID]/preferences/CheckBoxPreference.svelte b/src/routes/(app)/browse/source/[sourceID]/preferences/CheckBoxPreference.svelte index 4e7d3a00..18a01aff 100644 --- a/src/routes/(app)/browse/source/[sourceID]/preferences/CheckBoxPreference.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/preferences/CheckBoxPreference.svelte @@ -15,7 +15,7 @@ export let pref: Extract< ResultOf['source']['preferences'][0], - { __typename?: 'CheckBoxPreference' | undefined } + { __typename: 'CheckBoxPreference' | undefined } >; export let index: number; @@ -39,7 +39,7 @@
diff --git a/src/routes/(app)/browse/source/[sourceID]/preferences/EditTextPreference.svelte b/src/routes/(app)/browse/source/[sourceID]/preferences/EditTextPreference.svelte index be5ec739..4dfeae39 100644 --- a/src/routes/(app)/browse/source/[sourceID]/preferences/EditTextPreference.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/preferences/EditTextPreference.svelte @@ -15,7 +15,7 @@ export let pref: Extract< ResultOf['source']['preferences'][0], - { __typename?: 'EditTextPreference' | undefined } + { __typename: 'EditTextPreference' | undefined } >; export let index: number; @@ -51,7 +51,7 @@ placeholder="input text" /> -
+

{pref.summary}

diff --git a/src/routes/(app)/browse/source/[sourceID]/preferences/ListPreference.svelte b/src/routes/(app)/browse/source/[sourceID]/preferences/ListPreference.svelte index e9408236..dc7382d0 100644 --- a/src/routes/(app)/browse/source/[sourceID]/preferences/ListPreference.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/preferences/ListPreference.svelte @@ -14,7 +14,7 @@ export let pref: Extract< ResultOf['source']['preferences'][0], - { __typename?: 'ListPreference' | undefined } + { __typename: 'ListPreference' | undefined } >; export let index: number; diff --git a/src/routes/(app)/browse/source/[sourceID]/preferences/MultiSelectListPreference.svelte b/src/routes/(app)/browse/source/[sourceID]/preferences/MultiSelectListPreference.svelte index 2a80cd2c..6e5e6a35 100644 --- a/src/routes/(app)/browse/source/[sourceID]/preferences/MultiSelectListPreference.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/preferences/MultiSelectListPreference.svelte @@ -15,7 +15,7 @@ export let pref: Extract< ResultOf['source']['preferences'][0], - { __typename?: 'MultiSelectListPreference' | undefined } + { __typename: 'MultiSelectListPreference' | undefined } >; export let index: number; @@ -55,7 +55,7 @@ {/each} -
+

{pref.summary}

diff --git a/src/routes/(app)/browse/source/[sourceID]/preferences/SwitchPreference.svelte b/src/routes/(app)/browse/source/[sourceID]/preferences/SwitchPreference.svelte index 7de0b3ca..3a2e241b 100644 --- a/src/routes/(app)/browse/source/[sourceID]/preferences/SwitchPreference.svelte +++ b/src/routes/(app)/browse/source/[sourceID]/preferences/SwitchPreference.svelte @@ -15,7 +15,7 @@ export let pref: Extract< ResultOf['source']['preferences'][0], - { __typename?: 'SwitchPreference' | undefined } + { __typename: 'SwitchPreference' | undefined } >; export let index: number; @@ -39,7 +39,7 @@
diff --git a/src/routes/(app)/browse/sources/+page.svelte b/src/routes/(app)/browse/sources/+page.svelte index 09b43993..0e3988c6 100644 --- a/src/routes/(app)/browse/sources/+page.svelte +++ b/src/routes/(app)/browse/sources/+page.svelte @@ -102,24 +102,24 @@
{:else if $sources.fetching} {#each new Array(5) as _} -
-
+
+
{#each new Array(5) as _} -
-
+
+
-
-
+
+
@@ -130,11 +130,11 @@ {:else if groupSources} {#each groupSources.sort( (a, b) => (a[0] === 'Pinned' ? -1 : b[0] === 'Pinned' ? 1 : 0) ) as [lang, sous]} {@const sou = sous} -
+
{FindLangName(lang)}
{#each sou as source (source.id)} {#if intersecting}
{source.displayName} @@ -179,7 +179,7 @@ {/each}
{/each} -
+

You have reached the end of the list.

If you are not seeing a source you expected to see, try changing the diff --git a/src/routes/(app)/browse/sources/SourcesActions.svelte b/src/routes/(app)/browse/sources/SourcesActions.svelte index a1660e4d..644d3b42 100644 --- a/src/routes/(app)/browse/sources/SourcesActions.svelte +++ b/src/routes/(app)/browse/sources/SourcesActions.svelte @@ -51,13 +51,13 @@ } -

+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -88,9 +88,9 @@ {#if intersecting} -
+
-
+
{Math.round(dls.progress * 1000) / 10}% diff --git a/src/routes/(app)/downloads/DownloadsFilterModal.svelte b/src/routes/(app)/downloads/DownloadsFilterModal.svelte index e40a761c..013807dd 100644 --- a/src/routes/(app)/downloads/DownloadsFilterModal.svelte +++ b/src/routes/(app)/downloads/DownloadsFilterModal.svelte @@ -24,7 +24,7 @@ {#if $modalStore[0]} -
+
{#each FilterT as value} -
+
diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/ChaptersFilterModal.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/ChaptersFilterModal.svelte index b7b6fb8c..fe54af67 100644 --- a/src/routes/(app)/manga/[MangaID]/(manga)/ChaptersFilterModal.svelte +++ b/src/routes/(app)/manga/[MangaID]/(manga)/ChaptersFilterModal.svelte @@ -27,11 +27,11 @@ {#if $modalStore[0]} -
+
Filter @@ -58,7 +58,7 @@ name="tab2" value={1} > -
+
Sort
@@ -70,7 +70,7 @@ name="tab3" value={2} > -
+
Display
@@ -82,7 +82,7 @@ Unread @@ -90,7 +90,7 @@ Downloaded @@ -98,7 +98,7 @@ Bookmarked @@ -108,7 +108,7 @@ triState={false} bind:checked={$mangaMeta.ChapterAsc} label={'Ascending'} - class="w-full focus:outline-0 p-1 pl-2 hover:variant-glass-surface" + class="w-full p-1 pl-2 hover:variant-glass-surface focus:outline-0" labelClass="w-full" > Ascending @@ -134,7 +134,7 @@ {:else} {/if} @@ -217,7 +217,7 @@
{#each mangaFrag?.genre as genre} {#if genre} -
{genre}
+
{genre}
{/if} {:else}
diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/InfoSubTitles.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/InfoSubTitles.svelte index 9a63cd85..ca91b7a7 100644 --- a/src/routes/(app)/manga/[MangaID]/(manga)/InfoSubTitles.svelte +++ b/src/routes/(app)/manga/[MangaID]/(manga)/InfoSubTitles.svelte @@ -12,8 +12,8 @@ {#if text} -

+

{name}: - {text} + {text}

{/if} diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/MangaActions.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/MangaActions.svelte index 2df0f88b..42508c50 100644 --- a/src/routes/(app)/manga/[MangaID]/(manga)/MangaActions.svelte +++ b/src/routes/(app)/manga/[MangaID]/(manga)/MangaActions.svelte @@ -27,7 +27,7 @@ } -
+

Set categories

-
-
+
+
{#each categories as Category} { handelClicked(Category, e.detail); }} - class="outline-0 p-1 pl-2 hover:variant-glass-surface" + class="p-1 pl-2 outline-0 hover:variant-glass-surface" labelClass="w-full" > {Category.name} @@ -228,7 +228,7 @@ {/each}
-
diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/TrackingModal.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/TrackingModal.svelte index 27578e37..8a0b33b9 100644 --- a/src/routes/(app)/manga/[MangaID]/(manga)/TrackingModal.svelte +++ b/src/routes/(app)/manga/[MangaID]/(manga)/TrackingModal.svelte @@ -79,7 +79,7 @@ {#if $modalStore[0]} -
+

Tracking

@@ -110,33 +110,33 @@ {@const ThisTrack = $manga.data?.manga?.trackRecords.nodes?.find( (e) => e.trackerId === tabSet )} -
+
{#if $items.error} -
+
{JSON.stringify($items.error, null, 4)}
{:else if $items.fetching} {#each new Array(3).fill(0) as _} -
+
-
+
-
-
-
-
-
+
+
+
+
+
{#each new Array(3).fill(0) as _}
{/each}
@@ -151,9 +151,9 @@ e.preventDefault(); trackThis(item); }} - class="flex pl-4 p-1 w-full text-left hover:variant-ghost-surface" + class="flex w-full p-1 pl-4 text-left hover:variant-ghost-surface" > -
+
{item.title}
- + {item.title}
-
+
Status: {item.publishingStatus}
@@ -192,20 +192,20 @@
-
+
Tracking: {ThisTrack ? ThisTrack.title : 'None'}
{#if ThisTrack} -
+
Open tracked manga diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte index 8cc70b85..86481428 100644 --- a/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte +++ b/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte @@ -194,22 +194,22 @@ {#if !$manga || $manga.fetching}
-
-
-
-
-
+
+
+
+
+
{#each new Array(10) as _} -
-
-
-
+
+
+
+
-
+
{/each}
@@ -217,7 +217,7 @@
Error loading chapters: {JSON.stringify($manga.error, null, 4)}
@@ -226,11 +226,11 @@
-
- +
+ {sortedChapters.length} Chapters -
+
-
+
{#if chapter.isDownloaded} @@ -457,7 +457,7 @@ ids: [chapter.id] }) .toPromise()} - class="variant-glass hover:variant-soft p-2 cursor-pointer select-none w-full" + class="variant-glass w-full cursor-pointer select-none p-2 hover:variant-soft" > download @@ -471,7 +471,7 @@ ids: [chapter.id] }) .toPromise()} - class="variant-glass hover:variant-soft p-2 cursor-pointer select-none w-full" + class="variant-glass w-full cursor-pointer select-none p-2 hover:variant-soft" > unbookmark @@ -484,7 +484,7 @@ ids: [chapter.id] }) .toPromise()} - class="variant-glass hover:variant-soft p-2 cursor-pointer select-none w-full" + class="variant-glass w-full cursor-pointer select-none p-2 hover:variant-soft" > bookmark @@ -492,26 +492,26 @@ {#if chapter.isRead} {:else} {/if}
-
+
{/if} @@ -524,7 +524,7 @@ href="/manga/{mangaFrag?.id}/chapter/{sortedChapters .filter((e) => !e.isRead) .toSorted((a, b) => (a.sourceOrder > b.sourceOrder ? 1 : -1))[0].id}" - class="btn variant-filled-primary hover:variant-glass-primary fixed {matches + class="variant-filled-primary btn fixed hover:variant-glass-primary {matches ? 'bottom-2' : 'bottom-[4.5rem]'} right-16 z-10" > diff --git a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+layout@.svelte b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+layout@.svelte index a6d88170..39a6863d 100644 --- a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+layout@.svelte +++ b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+layout@.svelte @@ -33,7 +33,7 @@ tabindex={-1} on:click={draw} name="mdi:menu" - class="fixed top-4 left-4 z-50 transition-opacity {!$drawerStore.open && + class="fixed left-4 top-4 z-50 transition-opacity {!$drawerStore.open && 'opacity-20'}" height="h-16" /> diff --git a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+page.svelte b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+page.svelte index 29e7e8e1..c63ded8a 100644 --- a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+page.svelte +++ b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+page.svelte @@ -487,10 +487,10 @@ > {#if $ViewNav}
-
-
+
+
{#if currpath.menu} -
+
{/if}
{/if} @@ -502,10 +502,10 @@ {$mangaMeta.ReaderMode === Mode.single && 'flex flex-col items-center'} {$mangaMeta.ReaderMode === Mode.RTL && `grid grid-cols-2 place-content-center - [&>div:nth-child(odd)]:justify-self-end [&>div:nth-child(even)]:justify-self-start`} + [&>div:nth-child(even)]:justify-self-start [&>div:nth-child(odd)]:justify-self-end`} {$mangaMeta.ReaderMode === Mode.LTR && `grid grid-cols-2 place-content-center - [&>div:nth-child(odd)]:justify-self-end [&>div:nth-child(even)]:justify-self-start`}" + [&>div:nth-child(even)]:justify-self-start [&>div:nth-child(odd)]:justify-self-end`}" dir={$mangaMeta.ReaderMode === Mode.RTL ? 'rtl' : 'ltr'} > {#if ($mangaMeta.ReaderMode === Mode.RTL || $mangaMeta.ReaderMode === Mode.LTR) && $mangaMeta.Offset} @@ -513,17 +513,17 @@ {/if} {#each chapter.pages as page, pageindex (page)}
{getChapterOfID(chapter.chapterID)?.name ?? @@ -615,7 +615,7 @@ {/each} {#if $mangaMeta.doPageIndicator}
{pageIndicator}
diff --git a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/chapterDrawer.svelte b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/chapterDrawer.svelte index 65f12953..70893342 100644 --- a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/chapterDrawer.svelte +++ b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/chapterDrawer.svelte @@ -40,7 +40,7 @@ {#if mangaMeta}
-
+
-

{$mangaTitle}

-

{$chapterTitle}

-
+

{$mangaTitle}

+

{$chapterTitle}

+
Categories
@@ -38,7 +38,7 @@ type: 'component', component: { ref: BackupModal } })} - class=" text-left flex items-center w-full h-16 hover:variant-glass-surface cursor-pointer" + class="flex h-16 w-full cursor-pointer items-center text-left hover:variant-glass-surface" >
Backup
@@ -49,7 +49,7 @@ type: 'component', component: { ref: ReaderDefaultsModal } })} - class=" text-left flex items-center w-full h-16 hover:variant-glass-surface cursor-pointer" + class="flex h-16 w-full cursor-pointer items-center text-left hover:variant-glass-surface" >
Library Settings
@@ -74,17 +74,17 @@ type: 'component', component: { ref: MangaSettingsModal } })} - class=" text-left flex items-center w-full h-16 hover:variant-glass-surface cursor-pointer" + class="flex h-16 w-full cursor-pointer items-center text-left hover:variant-glass-surface" >
Manga Settings