diff --git a/back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs index a079abc3..5d64ed30 100644 --- a/back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs +++ b/back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs @@ -235,11 +235,11 @@ namespace Kyoo.Core.Controllers : typeof(T).Name.ToLowerInvariant(); if (thumbs.Poster != null) - thumbs.Poster.Path = $"{type}/{obj.Slug}/poster"; + thumbs.Poster.Path = $"/{type}/{obj.Slug}/poster"; if (thumbs.Thumbnail != null) - thumbs.Thumbnail.Path = $"{type}/{obj.Slug}/thumbnail"; + thumbs.Thumbnail.Path = $"/{type}/{obj.Slug}/thumbnail"; if (thumbs.Logo != null) - thumbs.Logo.Path = $"{type}/{obj.Slug}/logo"; + thumbs.Logo.Path = $"/{type}/{obj.Slug}/logo"; } protected T SetBackingImageSelf(T obj) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 31a6177e..4d6ab613 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -31,7 +31,7 @@ services: - /app/apps/mobile/.expo/ ports: - "3000:3000" - - "19000:19000" + - "8081:8081" restart: on-failure environment: - KYOO_URL=${KYOO_URL:-http://back:5000} diff --git a/front/apps/mobile/package.json b/front/apps/mobile/package.json index 0246f670..a0f2980e 100644 --- a/front/apps/mobile/package.json +++ b/front/apps/mobile/package.json @@ -50,7 +50,7 @@ "react-native-svg": "13.9.0", "react-native-uuid": "^2.0.1", "react-native-video": "^6.0.0-alpha.7", - "yoshiki": "1.2.3" + "yoshiki": "1.2.4" }, "devDependencies": { "@babel/core": "^7.22.10", diff --git a/front/apps/web/package.json b/front/apps/web/package.json index 4269ca12..35b4d043 100644 --- a/front/apps/web/package.json +++ b/front/apps/web/package.json @@ -31,7 +31,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-i18next": "^13.0.3", - "react-native-reanimated": "3.4.2", + "react-native-reanimated": "~3.3.0", "react-native-svg": "13.11.0", "react-native-video": "^6.0.0-alpha.7", "react-native-web": "0.19.7", @@ -39,7 +39,7 @@ "srt-webvtt": "^2.0.0", "superjson": "^1.13.1", "sweetalert2": "^11.7.20", - "yoshiki": "1.2.3", + "yoshiki": "1.2.4", "zod": "^3.21.4" }, "devDependencies": { diff --git a/front/packages/models/src/resources/show.ts b/front/packages/models/src/resources/show.ts index 44a085c2..30bbeba8 100644 --- a/front/packages/models/src/resources/show.ts +++ b/front/packages/models/src/resources/show.ts @@ -35,7 +35,7 @@ export enum Status { Planned = "Planned", } -export const ShowP = ResourceP.extend(ImagesP).extend({ +export const ShowP = ResourceP.merge(ImagesP).extend({ /** * The title of this show. */ diff --git a/front/packages/primitives/src/avatar.tsx b/front/packages/primitives/src/avatar.tsx index 502ae5c2..271fbf3d 100644 --- a/front/packages/primitives/src/avatar.tsx +++ b/front/packages/primitives/src/avatar.tsx @@ -24,9 +24,8 @@ import { useYoshiki, px, Stylable } from "yoshiki/native"; import { Icon } from "./icons"; import { P } from "./text"; import AccountCircle from "@material-symbols/svg-400/rounded/account_circle-fill.svg"; -import { YoshikiStyle } from "yoshiki/dist/type"; +import { YoshikiStyle } from "yoshiki/src/type"; import { ComponentType, forwardRef, RefAttributes } from "react"; -import { ts } from "./utils"; const stringToColor = (string: string) => { let hash = 0; diff --git a/front/packages/primitives/src/icons.tsx b/front/packages/primitives/src/icons.tsx index 53c33c2c..2698f1b9 100644 --- a/front/packages/primitives/src/icons.tsx +++ b/front/packages/primitives/src/icons.tsx @@ -21,7 +21,7 @@ import React, { ComponentProps, ComponentType, ForwardedRef, forwardRef } from "react"; import { Platform, PressableProps, ViewStyle } from "react-native"; import { SvgProps } from "react-native-svg"; -import { YoshikiStyle } from "yoshiki/dist/type"; +import { YoshikiStyle } from "yoshiki/src/type"; import { px, Theme, useYoshiki } from "yoshiki/native"; import { PressableFeedback } from "./links"; import { alpha } from "./themes"; diff --git a/front/packages/primitives/src/utils/breakpoints.ts b/front/packages/primitives/src/utils/breakpoints.ts index 80d4bae3..46b1c535 100644 --- a/front/packages/primitives/src/utils/breakpoints.ts +++ b/front/packages/primitives/src/utils/breakpoints.ts @@ -19,8 +19,8 @@ */ import { useWindowDimensions } from "react-native"; -import { Breakpoints as YoshikiBreakpoint } from "yoshiki/dist/type"; -import { isBreakpoints } from "yoshiki/dist/utils"; +import { Breakpoints as YoshikiBreakpoint } from "yoshiki/src/type"; +import { isBreakpoints } from "yoshiki/src/utils"; import { breakpoints } from "yoshiki/native"; type AtLeastOne }> = Partial & U[keyof U]; diff --git a/front/packages/ui/src/browse/grid.tsx b/front/packages/ui/src/browse/grid.tsx index f5783722..7136d801 100644 --- a/front/packages/ui/src/browse/grid.tsx +++ b/front/packages/ui/src/browse/grid.tsx @@ -51,7 +51,7 @@ export const ItemGrid = ({ m: { xs: ts(1), sm: ts(4) }, child: { poster: { - borderColor: "transparent", + borderColor: theme => theme.background, borderWidth: px(4), }, }, @@ -78,6 +78,7 @@ export const ItemGrid = ({ { text={t("login.register")} disabled={password !== confirm} onPress={async () => { - const { error } = await loginFunc("register", { email, username, password }, cleanApiUrl(apiUrl)); + const { error } = await loginFunc("register", { email, username, password }, cleanApiUrl(apiUrl), 5_000); setError(error); if (error) return; queryClient.invalidateQueries(["auth", "me"]); diff --git a/front/yarn.lock b/front/yarn.lock index 04a0eb4f..931875cd 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -10577,7 +10577,7 @@ __metadata: react-native-uuid: ^2.0.1 react-native-video: ^6.0.0-alpha.7 typescript: ^5.1.6 - yoshiki: 1.2.3 + yoshiki: 1.2.4 languageName: unknown linkType: soft @@ -11885,27 +11885,6 @@ __metadata: languageName: node linkType: hard -"react-native-reanimated@npm:3.4.2": - version: 3.4.2 - resolution: "react-native-reanimated@npm:3.4.2" - dependencies: - "@babel/plugin-transform-object-assign": ^7.16.7 - "@babel/preset-typescript": ^7.16.7 - convert-source-map: ^2.0.0 - invariant: ^2.2.4 - peerDependencies: - "@babel/core": ^7.0.0-0 - "@babel/plugin-proposal-nullish-coalescing-operator": ^7.0.0-0 - "@babel/plugin-proposal-optional-chaining": ^7.0.0-0 - "@babel/plugin-transform-arrow-functions": ^7.0.0-0 - "@babel/plugin-transform-shorthand-properties": ^7.0.0-0 - "@babel/plugin-transform-template-literals": ^7.0.0-0 - react: "*" - react-native: "*" - checksum: b0e295e07ea1c965656b96c49bec69107ca41b54b23a4781def8aaae96e26e5c2a35ff19746ff95bd93ce72362e8f1743ef300fd709a440a17a8d06e27577616 - languageName: node - linkType: hard - "react-native-reanimated@npm:~3.3.0": version: 3.3.0 resolution: "react-native-reanimated@npm:3.3.0" @@ -14274,7 +14253,7 @@ __metadata: react: 18.2.0 react-dom: 18.2.0 react-i18next: ^13.0.3 - react-native-reanimated: 3.4.2 + react-native-reanimated: ~3.3.0 react-native-svg: 13.11.0 react-native-video: ^6.0.0-alpha.7 react-native-web: 0.19.7 @@ -14284,7 +14263,7 @@ __metadata: sweetalert2: ^11.7.20 typescript: ^5.1.6 webpack: ^5.88.2 - yoshiki: 1.2.3 + yoshiki: 1.2.4 zod: ^3.21.4 languageName: unknown linkType: soft @@ -14666,9 +14645,9 @@ __metadata: languageName: node linkType: hard -"yoshiki@npm:1.2.3": - version: 1.2.3 - resolution: "yoshiki@npm:1.2.3" +"yoshiki@npm:1.2.4": + version: 1.2.4 + resolution: "yoshiki@npm:1.2.4" dependencies: "@types/node": 18.x.x "@types/react": 18.x.x @@ -14682,7 +14661,7 @@ __metadata: optional: true react-native-web: optional: true - checksum: 2ecfa044fcd43f94a5e663740075b87b5dee06116073dbd5673419ba32add90114a5cdce3841d92b7d6ae86e078926de09b310a6393bb50c7e37f14ae1d4cc65 + checksum: 03b8c1ef41621deb3ae65238516928f78cf58883e1610cd1ea2f19b6c1c9cf8d09f7bf1a5538d8e9e5c7d46c5e9bdd23db38276e4ccd29cd281762afde7513fa languageName: node linkType: hard