Fix prefetch

zoriya · Feb 6, 2025 · 6a1addc · 6a1addc
1 parent 35adfdd
commit 6a1addc
Show file tree

Hide file tree

Showing 17 changed files with 142 additions and 209 deletions.
diff --git a/front/app/_layout.tsx b/front/app/_layout.tsx
@@ -1,6 +1,6 @@
 import { HydrationBoundary } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-import { Slot } from "one";
+import { Slot, getServerData } from "one";
 import { useServerHeadInsertion } from "one";
 import { StyleRegistryProvider, createStyleRegistry, useTheme } from "yoshiki/web";
 import { Providers } from "~/providers";
@@ -63,6 +63,8 @@ export default function Layout() {
 	const registry = createStyleRegistry();
 	useServerHeadInsertion(() => registry.flushToComponent());
 
+	const queryState = getServerData("queryState");
+
 	// TODO: change this lang attr
 	return (
 		<html lang="en-US">

diff --git a/front/app/index.tsx b/front/app/index.tsx
@@ -1,10 +1,10 @@
 import { useYoshiki } from "yoshiki/native";
 import { type LibraryItem, LibraryItemP } from "~/models";
 import { P } from "~/primitives";
-import { Fetch, type QueryIdentifier } from "~/query";
+import { Fetch, type QueryIdentifier, prefetch } from "~/query";
 
 export async function loader() {
-	await prefetchQuery(Header.query());
+	await prefetch(Header.query());
 }
 
 export default function Header() {

diff --git a/front/bun.lock b/front/bun.lock
@@ -4,6 +4,7 @@
     "": {
       "dependencies": {
         "@expo/html-elements": "^0.11.2",
+        "@material-symbols/svg-400": "^0.28.1",
         "@tanstack/react-query": "^5.66.0",
         "caniuse-api": "^3.0.0",
         "expo": "~52.0.28",
@@ -18,6 +19,7 @@
         "react-native-reanimated": "~3.16.7",
         "react-native-safe-area-context": "5.1.0",
         "react-native-screens": "4.6.0",
+        "react-native-svg": "^15.11.1",
         "react-native-web": "^0.19.13",
         "yoshiki": "1.2.14",
         "zod": "^3.24.1",
@@ -470,6 +472,8 @@
 
     "@jridgewell/trace-mapping": ["@jridgewell/[email protected]", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ=="],
 
+    "@material-symbols/svg-400": ["@material-symbols/[email protected]", "", {}, "sha512-lup10XPj7rzxJ4pCQICSG5iILEymcamtv+uveOm9bhgVBZq1KrZOse7VERYfIv5FYqwrP8GheUGkRAURPNc6KQ=="],
+
     "@napi-rs/wasm-runtime": ["@napi-rs/[email protected]", "", { "dependencies": { "@emnapi/core": "^1.3.1", "@emnapi/runtime": "^1.3.1", "@tybys/wasm-util": "^0.9.0" } }, "sha512-z8YVS3XszxFTO73iwvFDNpQIzdMmSDTP/mB3E/ucR37V3Sx57hSExcXyMoNwaucWxnsWf4xfbZv0iZ30jr0M4Q=="],
 
     "@nodelib/fs.scandir": ["@nodelib/[email protected]", "", { "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="],
@@ -830,6 +834,8 @@
 
     "bippy": ["[email protected]", "", {}, "sha512-+rvlmS7vbv704MjmpMLaSNKezGkc7xux7/DbhTp61RFQZAYwH8V0pbxGYiDWxA9a+7RxNFhHtsSIu9uoB+eK0Q=="],
 
+    "boolbase": ["[email protected]", "", {}, "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="],
+
     "bplist-creator": ["[email protected]", "", { "dependencies": { "stream-buffers": "~2.2.0" } }, "sha512-xp/tcaV3T5PCiaY04mXga7o/TE+t95gqeLmADeBI1CvZtdWTbgBt3uLpvh4UWtenKeBhCV6oVxGk38yZr2uYEA=="],
 
     "bplist-parser": ["[email protected]", "", { "dependencies": { "big-integer": "1.6.x" } }, "sha512-apC2+fspHGI3mMKj+dGevkGo/tCqVB8jMb6i+OX+E29p0Iposz07fABkRIfVUPNd5A5VbuOz1bZbnmkKLYF+wQ=="],
@@ -956,6 +962,12 @@
 
     "css-in-js-utils": ["[email protected]", "", { "dependencies": { "hyphenate-style-name": "^1.0.3" } }, "sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A=="],
 
+    "css-select": ["[email protected]", "", { "dependencies": { "boolbase": "^1.0.0", "css-what": "^6.1.0", "domhandler": "^5.0.2", "domutils": "^3.0.1", "nth-check": "^2.0.1" } }, "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg=="],
+
+    "css-tree": ["[email protected]", "", { "dependencies": { "mdn-data": "2.0.14", "source-map": "^0.6.1" } }, "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="],
+
+    "css-what": ["[email protected]", "", {}, "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="],
+
     "cssesc": ["[email protected]", "", { "bin": { "cssesc": "bin/cssesc" } }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="],
 
     "csstype": ["[email protected]", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
@@ -996,6 +1008,14 @@
 
     "dlv": ["[email protected]", "", {}, "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="],
 
+    "dom-serializer": ["[email protected]", "", { "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", "entities": "^4.2.0" } }, "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="],
+
+    "domelementtype": ["[email protected]", "", {}, "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="],
+
+    "domhandler": ["[email protected]", "", { "dependencies": { "domelementtype": "^2.3.0" } }, "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w=="],
+
+    "domutils": ["[email protected]", "", { "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", "domhandler": "^5.0.3" } }, "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw=="],
+
     "dotenv": ["[email protected]", "", {}, "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ=="],
 
     "dotenv-expand": ["[email protected]", "", { "dependencies": { "dotenv": "^16.4.5" } }, "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA=="],
@@ -1012,6 +1032,8 @@
 
     "end-of-stream": ["[email protected]", "", { "dependencies": { "once": "^1.4.0" } }, "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="],
 
+    "entities": ["[email protected]", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="],
+
     "env-editor": ["[email protected]", "", {}, "sha512-ObFo8v4rQJAE59M69QzwloxPZtd33TpYEIjtKD1rrFDcM1Gd7IkDxEBU+HriziN6HSHQnBJi8Dmy+JWkav5HKA=="],
 
     "eol": ["[email protected]", "", {}, "sha512-Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg=="],
@@ -1382,6 +1404,8 @@
 
     "md5-file": ["[email protected]", "", { "dependencies": { "buffer-alloc": "^1.1.0" }, "bin": { "md5-file": "cli.js" } }, "sha512-3Tkp1piAHaworfcCgH0jKbTvj1jWWFgbvh2cXaNCgHwyTCBxxvD1Y04rmfpvdPm1P4oXMOpm6+2H7sr7v9v8Fw=="],
 
+    "mdn-data": ["[email protected]", "", {}, "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="],
+
     "memoize-one": ["[email protected]", "", {}, "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="],
 
     "merge": ["[email protected]", "", {}, "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="],
@@ -1484,6 +1508,8 @@
 
     "npm-run-path": ["[email protected]", "", { "dependencies": { "path-key": "^3.0.0" } }, "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="],
 
+    "nth-check": ["[email protected]", "", { "dependencies": { "boolbase": "^1.0.0" } }, "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="],
+
     "nullthrows": ["[email protected]", "", {}, "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="],
 
     "ob1": ["[email protected]", "", { "dependencies": { "flow-enums-runtime": "^0.0.6" } }, "sha512-6Cvrkxt1tqaRdWqTAMcVYEiO5i1xcF9y7t06nFdjFqkfPsEloCf8WwhXdwBpNUkVYSQlSGS7cDgVQR86miBfBQ=="],
@@ -1656,6 +1682,8 @@
 
     "react-native-screens": ["[email protected]", "", { "dependencies": { "react-freeze": "^1.0.0", "warn-once": "^0.1.0" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-PqGtR/moJLiTMSavhfo5spKXNHZrlxffq3g5UUVPmyuu7MmazFlPvYqiAYnR2iB9tkJYgvZO6sbjYAE7619M0A=="],
 
+    "react-native-svg": ["[email protected]", "", { "dependencies": { "css-select": "^5.1.0", "css-tree": "^1.1.3", "warn-once": "0.1.1" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-Qmwx/yJKt+AHUr4zjxx/Q69qwKtRfr1+uIfFMQoq3WFRhqU76aL9db1DyvPiY632DAsVGba1pHf92OZPkpjrdQ=="],
+
     "react-native-web": ["[email protected]", "", { "dependencies": { "@babel/runtime": "^7.18.6", "@react-native/normalize-colors": "^0.74.1", "fbjs": "^3.0.4", "inline-style-prefixer": "^6.0.1", "memoize-one": "^6.0.0", "nullthrows": "^1.1.1", "postcss-value-parser": "^4.2.0", "styleq": "^0.1.3" }, "peerDependencies": { "react": "^18.0.0", "react-dom": "^18.0.0" } }, "sha512-etv3bN8rJglrRCp/uL4p7l8QvUNUC++QwDbdZ8CB7BvZiMvsxfFIRM1j04vxNldG3uo2puRd6OSWR3ibtmc29A=="],
 
     "react-refresh": ["[email protected]", "", {}, "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA=="],
@@ -2134,6 +2162,8 @@
 
     "cpy/p-map": ["[email protected]", "", {}, "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA=="],
 
+    "css-tree/source-map": ["[email protected]", "", {}, "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="],
+
     "default-gateway/execa": ["[email protected]", "", { "dependencies": { "cross-spawn": "^6.0.0", "get-stream": "^4.0.0", "is-stream": "^1.1.0", "npm-run-path": "^2.0.0", "p-finally": "^1.0.0", "signal-exit": "^3.0.0", "strip-eof": "^1.0.0" } }, "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="],
 
     "del/globby": ["[email protected]", "", { "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", "fast-glob": "^3.2.9", "ignore": "^5.2.0", "merge2": "^1.4.1", "slash": "^3.0.0" } }, "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="],

diff --git a/front/package.json b/front/package.json
@@ -14,6 +14,7 @@
 	},
 	"dependencies": {
 		"@expo/html-elements": "^0.11.2",
+		"@material-symbols/svg-400": "^0.28.1",
 		"@tanstack/react-query": "^5.66.0",
 		"caniuse-api": "^3.0.0",
 		"expo": "~52.0.28",
@@ -28,6 +29,7 @@
 		"react-native-reanimated": "~3.16.7",
 		"react-native-safe-area-context": "5.1.0",
 		"react-native-screens": "4.6.0",
+		"react-native-svg": "^15.11.1",
 		"react-native-web": "^0.19.13",
 		"yoshiki": "1.2.14",
 		"zod": "^3.24.1"

diff --git a/front/src/primitives/index.ts b/front/src/primitives/index.ts
@@ -20,25 +20,25 @@
 
 export { Header, Main, Nav, Footer, UL } from "@expo/html-elements";
 export * from "./text";
-export * from "./themes";
+export * from "./theme";
 export * from "./icons";
 export * from "./links";
-export * from "./avatar";
-export * from "./image";
-export * from "./skeleton";
-export * from "./tooltip";
-export * from "./container";
-export * from "./divider";
-export * from "./progress";
-export * from "./slider";
-export * from "./snackbar";
-export * from "./alert";
-export * from "./menu";
-export * from "./popup";
-export * from "./select";
-export * from "./input";
+// export * from "./avatar";
+// export * from "./image";
+// export * from "./skeleton";
+// export * from "./tooltip";
+// export * from "./container";
+// export * from "./divider";
+// export * from "./progress";
+// export * from "./slider";
+// export * from "./snackbar";
+// export * from "./alert";
+// export * from "./menu";
+// export * from "./popup";
+// export * from "./select";
+// export * from "./input";
 export * from "./button";
-export * from "./chip";
+// export * from "./chip";
 
 export * from "./utils";
 export * from "./constants";
diff --git a/front/src/primitives/links.tsx b/front/src/primitives/links.tsx
@@ -28,10 +28,10 @@ import {
 	type TextProps,
 	type View,
 } from "react-native";
-import { TextLink, useLink } from "solito/link";
-import { parseNextPath } from "solito/router";
+// import { TextLink, useLink } from "solito/link";
+// import { parseNextPath } from "solito/router";
 import { useTheme, useYoshiki } from "yoshiki/native";
-import { alpha } from "./themes";
+import { alpha } from "./theme";
 
 export const A = ({
 	href,

diff --git a/front/src/primitives/theme/index.ts b/front/src/primitives/theme/index.ts
@@ -1 +1,2 @@
 export * from "./theme";
+export * from "./catppuccin";
diff --git a/front/src/primitives/themes/catppuccin.ts b/front/src/primitives/themes/catppuccin.ts
diff --git a/front/src/primitives/themes/index.ts b/front/src/primitives/themes/index.ts
diff --git a/front/src/primitives/themes/theme.tsx b/front/src/primitives/themes/theme.tsx
diff --git a/front/src/primitives/utils/breakpoints.ts b/front/src/primitives/utils/breakpoints.ts
diff --git a/front/src/primitives/utils/head.web.tsx b/front/src/primitives/utils/head.web.tsx
@@ -18,7 +18,7 @@
  * along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import NextHead from "next/head";
+// import NextHead from "next/head";
 
 export const Head = ({
 	title,

diff --git a/front/src/primitives/utils/index.tsx b/front/src/primitives/utils/index.tsx
@@ -18,7 +18,6 @@
  * along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
  */
 
-export * from "./breakpoints";
 export * from "./nojs";
 export * from "./head";
 export * from "./spacing";

diff --git a/front/src/providers/account-provider.tsx b/front/src/providers/account-provider.tsx
@@ -8,9 +8,9 @@ import { removeAccounts, updateAccount } from "./account-store";
 import { useSetError } from "./error-provider";
 import { useStoreValue } from "./settings";
 
-const AccountContext = createContext<{
+export const AccountContext = createContext<{
 	apiUrl: string;
-	authToken: Token | undefined;
+	authToken: Token | null;
 	selectedAccount?: Account;
 	accounts: (Account & { select: () => void; remove: () => void })[];
 }>(undefined!);
@@ -23,7 +23,7 @@ export const AccountProvider = ({ children }: { children: ReactNode }) => {
 		const acc = accounts.find((x) => x.selected);
 		return {
 			apiUrl: Platform.OS === "web" ? "/api" : acc?.apiUrl!,
-			authToken: acc?.token,
+			authToken: acc?.token ?? null,
 			selectedAccount: acc,
 			accounts: accounts.map((account) => ({
 				...account,

diff --git a/front/src/providers/index.tsx b/front/src/providers/index.tsx
@@ -3,8 +3,8 @@ import { type ReactNode, useState } from "react";
 // import { useUserTheme } from "@kyoo/models";
 import { ThemeSelector } from "~/primitives/theme";
 import { createQueryClient } from "~/query";
-import { ErrorConsumer, ErrorProvider } from "./error-provider";
 import { AccountProvider } from "./account-provider";
+import { ErrorConsumer, ErrorProvider } from "./error-provider";
 
 const QueryProvider = ({ children }: { children: ReactNode }) => {
 	const [queryClient] = useState(() => createQueryClient());
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from "./theme";
		export * from "./catppuccin";