diff --git a/front/app/_layout.tsx b/front/app/_layout.tsx index 2eab9e0e..d79bb4ef 100644 --- a/front/app/_layout.tsx +++ b/front/app/_layout.tsx @@ -1,3 +1,4 @@ +import { HydrationBoundary } from "@tanstack/react-query"; import { ReactQueryDevtools } from "@tanstack/react-query-devtools"; import { Slot } from "one"; import { useServerHeadInsertion } from "one"; @@ -79,10 +80,12 @@ export default function Layout() { - - - - + + + + + + diff --git a/front/bun.lock b/front/bun.lock index c87f00e7..996396dc 100644 --- a/front/bun.lock +++ b/front/bun.lock @@ -3,6 +3,7 @@ "workspaces": { "": { "dependencies": { + "@expo/html-elements": "^0.11.2", "@tanstack/react-query": "^5.66.0", "caniuse-api": "^3.0.0", "expo": "~52.0.28", @@ -406,6 +407,8 @@ "@expo/fingerprint": ["@expo/fingerprint@0.11.7", "", { "dependencies": { "@expo/spawn-async": "^1.7.2", "arg": "^5.0.2", "chalk": "^4.1.2", "debug": "^4.3.4", "find-up": "^5.0.0", "getenv": "^1.0.0", "minimatch": "^3.0.4", "p-limit": "^3.1.0", "resolve-from": "^5.0.0", "semver": "^7.6.0" }, "bin": { "fingerprint": "bin/cli.js" } }, "sha512-2rfYVS4nqWmOPQk+AL5GPfPSawbqqmI5mL++bxAhWADt+d+fjoQYfIrGtjZxQ30f9o/a1PrRPVSuh2j09+diVg=="], + "@expo/html-elements": ["@expo/html-elements@0.11.2", "", {}, "sha512-OC98eZ4mMzpFQq/KF9t+CGC4Vcg4RnoOxWAzSmNVd3VZ2dFFi64QCoHlT719wDmuccemn1VPXu1/rFvOGmJgOg=="], + "@expo/image-utils": ["@expo/image-utils@0.6.4", "", { "dependencies": { "@expo/spawn-async": "^1.7.2", "chalk": "^4.0.0", "fs-extra": "9.0.0", "getenv": "^1.0.0", "jimp-compact": "0.16.1", "parse-png": "^2.1.0", "resolve-from": "^5.0.0", "semver": "^7.6.0", "temp-dir": "~2.0.0", "unique-string": "~2.0.0" } }, "sha512-L++1PBzSvf5iYc6UHJ8Db8GcYNkfLDw+a+zqEFBQ3xqRXP/muxb/O7wuiMFlXrj/cfkx4e0U+z1a4ceV0A7S7Q=="], "@expo/json-file": ["@expo/json-file@9.0.1", "", { "dependencies": { "@babel/code-frame": "~7.10.4", "json5": "^2.2.3", "write-file-atomic": "^2.3.0" } }, "sha512-ZVPhbbEBEwafPCJ0+kI25O2Iivt3XKHEKAADCml1q2cmOIbQnKgLyn8DpOJXqWEyRQr/VWS+hflBh8DU2YFSqg=="], diff --git a/front/package.json b/front/package.json index d43f70eb..b1a05fb7 100644 --- a/front/package.json +++ b/front/package.json @@ -13,6 +13,7 @@ "format:fix": "biome format . --write" }, "dependencies": { + "@expo/html-elements": "^0.11.2", "@tanstack/react-query": "^5.66.0", "caniuse-api": "^3.0.0", "expo": "~52.0.28", diff --git a/front/packages/primitives/package.json b/front/packages/primitives/package.json deleted file mode 100644 index 96b33756..00000000 --- a/front/packages/primitives/package.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name": "@kyoo/primitives", - "main": "src/index.ts", - "types": "src/index.ts", - "sideEffects": false, - "packageManager": "yarn@3.2.4", - "devDependencies": { - "@gorhom/portal": "^1.0.14", - "typescript": "^5.5.4" - }, - "peerDependencies": { - "@gorhom/portal": "*", - "@material-symbols/svg-400": "*", - "@radix-ui/react-dropdown-menu": "*", - "@radix-ui/react-select": "*", - "blurhash": "*", - "expo-linear-gradient": "*", - "moti": "*", - "react": "*", - "react-native": "*", - "react-native-blurhash": "*", - "react-native-fast-image": "*", - "react-native-reanimated": "*", - "react-native-safe-area-context": "*", - "react-native-svg": "*", - "yoshiki": "*" - }, - "peerDependenciesMeta": { - "@gorhom/portal": { - "optional": true - }, - "@radix-ui/react-dropdown-menu": { - "optional": true - }, - "@radix-ui/react-select": { - "optional": true - }, - "blurhash": { - "optional": true - }, - "react-native-blurhash": { - "optional": true - }, - "react-native-fast-image": { - "optional": true - }, - "react-native-safe-area-context": { - "optional": true - }, - "react-native-web": { - "optional": true - } - }, - "dependencies": { - "@expo/html-elements": "^0.10.1", - "@tanstack/react-query": "^5.51.23", - "solito": "^4.2.2" - }, - "optionalDependencies": { - "@radix-ui/react-select": "^2.1.1", - "blurhash": "^2.0.5", - "react-native-blurhash": "^2.0.3", - "react-native-fast-image": "^8.6.3", - "react-native-safe-area-context": "4.10.8" - } -} diff --git a/front/packages/primitives/src/constants/index.ts b/front/packages/primitives/src/constants/index.ts deleted file mode 100644 index 33226ec3..00000000 --- a/front/packages/primitives/src/constants/index.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Kyoo - A portable and vast media library solution. - * Copyright (c) Kyoo. - * - * See AUTHORS.md and LICENSE file in the project root for full license information. - * - * Kyoo is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * Kyoo is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kyoo. If not, see . - */ - -export const imageBorderRadius = 10; diff --git a/front/packages/primitives/src/index.ts b/front/packages/primitives/src/index.ts deleted file mode 100644 index 96f4ffdc..00000000 --- a/front/packages/primitives/src/index.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Kyoo - A portable and vast media library solution. - * Copyright (c) Kyoo. - * - * See AUTHORS.md and LICENSE file in the project root for full license information. - * - * Kyoo is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * Kyoo is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kyoo. If not, see . - */ - -// export { Header, Main, Nav, Footer, UL } from "@expo/html-elements"; -// export * from "./text"; -export * from "./themes"; -// 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 "./button"; -// export * from "./chip"; -// -// export * from "./utils"; -// export * from "./constants"; diff --git a/front/packages/primitives/tsconfig.json b/front/packages/primitives/tsconfig.json deleted file mode 100755 index 8376e1ef..00000000 --- a/front/packages/primitives/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "compilerOptions": { - "target": "es6", - "lib": ["dom", "dom.iterable", "esnext"], - "declaration": true, - "sourceMap": true, - "noEmit": true, - "allowJs": true, - "skipLibCheck": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "esModuleInterop": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, - "jsx": "react-jsx", - "incremental": true, - "baseUrl": ".", - "paths": { - "~/*": ["src/*"] - } - }, - "include": ["**/*.ts", "**/*.tsx"], - "exclude": ["node_modules"] -} diff --git a/front/packages/ui/src/admin/scanner.tsx b/front/packages/ui/src/admin/scanner.tsx index 946b5e2c..dba682b2 100644 --- a/front/packages/ui/src/admin/scanner.tsx +++ b/front/packages/ui/src/admin/scanner.tsx @@ -24,7 +24,7 @@ import { useTranslation } from "react-i18next"; import { View } from "react-native"; import { useYoshiki } from "yoshiki/native"; import { z } from "zod"; -import { ErrorView } from "../errors"; +import { ErrorView } from "../../../../src/ui/errors"; import { SettingsContainer } from "../settings/base"; import Info from "@material-symbols/svg-400/outlined/info.svg"; diff --git a/front/packages/ui/src/details/collection.tsx b/front/packages/ui/src/details/collection.tsx index d7685922..83880623 100644 --- a/front/packages/ui/src/details/collection.tsx +++ b/front/packages/ui/src/details/collection.tsx @@ -37,7 +37,7 @@ import { } from "@kyoo/primitives"; import { useTranslation } from "react-i18next"; import { type Theme, useYoshiki } from "yoshiki/native"; -import { ErrorView } from "../errors"; +import { ErrorView } from "../../../../src/ui/errors"; export const PartOf = ({ name, diff --git a/front/packages/ui/src/errors/index.tsx b/front/packages/ui/src/errors/index.tsx deleted file mode 100644 index 19c9c722..00000000 --- a/front/packages/ui/src/errors/index.tsx +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Kyoo - A portable and vast media library solution. - * Copyright (c) Kyoo. - * - * See AUTHORS.md and LICENSE file in the project root for full license information. - * - * Kyoo is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * any later version. - * - * Kyoo is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Kyoo. If not, see . - */ - -export * from "./error"; -export * from "./unauthorized"; -export * from "./connection"; -export * from "./setup"; diff --git a/front/packages/ui/src/fetch-infinite.tsx b/front/packages/ui/src/fetch-infinite.tsx index e3d2b569..ba823573 100644 --- a/front/packages/ui/src/fetch-infinite.tsx +++ b/front/packages/ui/src/fetch-infinite.tsx @@ -29,7 +29,7 @@ import { useRef, } from "react"; import { FlatList, View, type ViewStyle } from "react-native"; -import { ErrorView } from "./errors"; +import { ErrorView } from "../../../src/ui/errors"; import { EmptyView, type Layout, OfflineView, addHeader } from "./fetch"; const emulateGap = ( diff --git a/front/packages/ui/src/fetch-infinite.web.tsx b/front/packages/ui/src/fetch-infinite.web.tsx index e2af8123..087c5d31 100644 --- a/front/packages/ui/src/fetch-infinite.web.tsx +++ b/front/packages/ui/src/fetch-infinite.web.tsx @@ -32,7 +32,7 @@ import { useRef, } from "react"; import { type Stylable, nativeStyleToCss, useYoshiki, ysMap } from "yoshiki"; -import { ErrorView } from "./errors"; +import { ErrorView } from "../../../src/ui/errors"; import { EmptyView, type Layout, addHeader } from "./fetch"; const InfiniteScroll = ({ diff --git a/front/packages/ui/src/index.ts b/front/packages/ui/src/index.ts index 17d088e7..a8d43d75 100644 --- a/front/packages/ui/src/index.ts +++ b/front/packages/ui/src/index.ts @@ -29,4 +29,4 @@ export { ServerUrlPage, LoginPage, RegisterPage, OidcCallbackPage } from "./logi export { DownloadPage, DownloadProvider } from "./downloads"; export { SettingsPage } from "./settings"; export { AdminPage } from "./admin"; -export * from "./errors"; +export * from "../../../src/ui/errors"; diff --git a/front/packages/ui/src/login/oidc.tsx b/front/packages/ui/src/login/oidc.tsx index 519a93b9..5ebafc21 100644 --- a/front/packages/ui/src/login/oidc.tsx +++ b/front/packages/ui/src/login/oidc.tsx @@ -32,7 +32,7 @@ import { useTranslation } from "react-i18next"; import { ImageBackground, View } from "react-native"; import { useRouter } from "solito/router"; import { percent, rem, useYoshiki } from "yoshiki/native"; -import { ErrorView } from "../errors"; +import { ErrorView } from "../../../../src/ui/errors"; export const OidcLogin = ({ apiUrl, hideOr }: { apiUrl?: string; hideOr?: boolean }) => { const { css } = useYoshiki(); diff --git a/front/packages/ui/src/player/components/scrubber.tsx b/front/packages/ui/src/player/components/scrubber.tsx index 0487cce1..6a85f022 100644 --- a/front/packages/ui/src/player/components/scrubber.tsx +++ b/front/packages/ui/src/player/components/scrubber.tsx @@ -24,7 +24,7 @@ import { useAtomValue } from "jotai"; import { useMemo } from "react"; import { Platform, View } from "react-native"; import { type Theme, percent, px, useForceRerender, useYoshiki } from "yoshiki/native"; -import { ErrorView } from "../../errors"; +import { ErrorView } from "../../../../../src/ui/errors"; import { durationAtom } from "../state"; import { seekProgressAtom } from "./hover"; import { toTimerString } from "./left-buttons"; diff --git a/front/packages/ui/src/player/index.tsx b/front/packages/ui/src/player/index.tsx index f5ad863a..534a8ebe 100644 --- a/front/packages/ui/src/player/index.tsx +++ b/front/packages/ui/src/player/index.tsx @@ -36,7 +36,7 @@ import { Platform, StyleSheet, View } from "react-native"; import { useRouter } from "solito/router"; import { useYoshiki } from "yoshiki/native"; import { episodeDisplayNumber } from "../details/episode"; -import { ErrorView } from "../errors"; +import { ErrorView } from "../../../../src/ui/errors"; import { Back, Hover, LoadingIndicator } from "./components/hover"; import { useVideoKeyboard } from "./keyboard"; import { Video, durationAtom, fullscreenAtom } from "./state"; diff --git a/front/packages/ui/src/settings/oidc.tsx b/front/packages/ui/src/settings/oidc.tsx index 6cd54c30..e4c383e5 100644 --- a/front/packages/ui/src/settings/oidc.tsx +++ b/front/packages/ui/src/settings/oidc.tsx @@ -30,7 +30,7 @@ import { Button, IconButton, Link, Skeleton, tooltip, ts } from "@kyoo/primitive import { useTranslation } from "react-i18next"; import { ImageBackground } from "react-native"; import { rem, useYoshiki } from "yoshiki/native"; -import { ErrorView } from "../errors"; +import { ErrorView } from "../../../../src/ui/errors"; import { Preference, SettingsContainer } from "./base"; import Badge from "@material-symbols/svg-400/outlined/badge.svg"; diff --git a/front/src/models/index.ts b/front/src/models/index.ts index 825e1633..61d55ba6 100644 --- a/front/src/models/index.ts +++ b/front/src/models/index.ts @@ -1,3 +1,4 @@ export * from "./page"; export * from "./kyoo-error"; export * from "./resources"; +export * from "./traits"; diff --git a/front/packages/primitives/src/alert.tsx b/front/src/primitives/alert.tsx similarity index 100% rename from front/packages/primitives/src/alert.tsx rename to front/src/primitives/alert.tsx diff --git a/front/packages/primitives/src/alert.web.tsx b/front/src/primitives/alert.web.tsx similarity index 100% rename from front/packages/primitives/src/alert.web.tsx rename to front/src/primitives/alert.web.tsx diff --git a/front/packages/primitives/src/avatar.tsx b/front/src/primitives/avatar.tsx similarity index 100% rename from front/packages/primitives/src/avatar.tsx rename to front/src/primitives/avatar.tsx diff --git a/front/packages/primitives/src/button.tsx b/front/src/primitives/button.tsx similarity index 100% rename from front/packages/primitives/src/button.tsx rename to front/src/primitives/button.tsx diff --git a/front/packages/primitives/src/chip.tsx b/front/src/primitives/chip.tsx similarity index 100% rename from front/packages/primitives/src/chip.tsx rename to front/src/primitives/chip.tsx diff --git a/front/src/primitives/constants/index.ts b/front/src/primitives/constants/index.ts new file mode 100644 index 00000000..8f70f471 --- /dev/null +++ b/front/src/primitives/constants/index.ts @@ -0,0 +1 @@ +export const imageBorderRadius = 10; diff --git a/front/packages/primitives/src/container.tsx b/front/src/primitives/container.tsx similarity index 100% rename from front/packages/primitives/src/container.tsx rename to front/src/primitives/container.tsx diff --git a/front/packages/primitives/src/divider.tsx b/front/src/primitives/divider.tsx similarity index 100% rename from front/packages/primitives/src/divider.tsx rename to front/src/primitives/divider.tsx diff --git a/front/packages/primitives/src/icons.tsx b/front/src/primitives/icons.tsx similarity index 100% rename from front/packages/primitives/src/icons.tsx rename to front/src/primitives/icons.tsx diff --git a/front/packages/primitives/src/image/base-image.tsx b/front/src/primitives/image/base-image.tsx similarity index 96% rename from front/packages/primitives/src/image/base-image.tsx rename to front/src/primitives/image/base-image.tsx index 33f4b251..28be5645 100644 --- a/front/packages/primitives/src/image/base-image.tsx +++ b/front/src/primitives/image/base-image.tsx @@ -18,10 +18,10 @@ * along with Kyoo. If not, see . */ -import type { KyooImage } from "@kyoo/models"; import type { ReactElement } from "react"; import type { ImageStyle } from "react-native"; import type { YoshikiStyle } from "yoshiki/src/type"; +import type { KyooImage } from "~/models"; export type YoshikiEnhanced