Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-24 02:02:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make queries work on mobile

Browse Source
This commit is contained in:
Zoe Roux 2022-12-08 17:43:31 +09:00
parent 43ed65bc76
commit 26e40adb21
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.dev.yml
View File

@ -39,6 +39,7 @@ services:
restart: on-failure restart: on-failure
environment: environment:
- KYOO_URL=http://back:5000 - KYOO_URL=http://back:5000
- PUBLIC_BACK_URL=${PUBLIC_BACK_URL}
ingress: ingress:
image: nginx image: nginx
restart: on-failure restart: on-failure

1
front/apps/mobile/babel.config.js
View File

@ -25,6 +25,7 @@ module.exports = function (api) {
plugins: [ plugins: [
// NOTE: `expo-router/babel` is a temporary extension to `babel-preset-expo`. // NOTE: `expo-router/babel` is a temporary extension to `babel-preset-expo`.
require.resolve("expo-router/babel"), require.resolve("expo-router/babel"),
"transform-inline-environment-variables",
"react-native-reanimated/plugin", "react-native-reanimated/plugin",
], ],
}; };

1
front/apps/mobile/package.json
View File

@ -11,6 +11,7 @@
"dependencies": { "dependencies": {
"@kyoo/ui": "workspace:^", "@kyoo/ui": "workspace:^",
"@tanstack/react-query": "^4.19.1", "@tanstack/react-query": "^4.19.1",
"babel-plugin-transform-inline-environment-variables": "^0.4.4",
"expo": "^47.0.0", "expo": "^47.0.0",
"expo-constants": "~14.0.2", "expo-constants": "~14.0.2",
"expo-linear-gradient": "~12.0.1", "expo-linear-gradient": "~12.0.1",

11
front/packages/models/src/query.tsx
View File

@ -29,17 +29,24 @@ import {
import { z } from "zod"; import { z } from "zod";
import { KyooErrors } from "./kyoo-errors"; import { KyooErrors } from "./kyoo-errors";
import { Page, Paged } from "./page"; import { Page, Paged } from "./page";
import { Platform } from "react-native";
const queryFn = async <Data,>( const queryFn = async <Data,>(
type: z.ZodType<Data>, type: z.ZodType<Data>,
context: QueryFunctionContext, context: QueryFunctionContext,
): Promise<Data> => { ): Promise<Data> => {
const kyoo_url = process.env.KYOO_URL ?? "http://localhost:5000"; const kyooUrl =
Platform.OS !== "web"
? process.env.PUBLIC_BACK_URL
: typeof window === "undefined"
? process.env.KYOO_URL ?? "http://localhost:5000"
: "/api";
if (!kyooUrl) console.error("Kyoo's url is not defined.")
let resp; let resp;
try { try {
resp = await fetch( resp = await fetch(
[typeof window === "undefined" ? kyoo_url : "/api"] [kyooUrl]
.concat( .concat(
context.pageParam ? [context.pageParam] : (context.queryKey.filter((x) => x) as string[]), context.pageParam ? [context.pageParam] : (context.queryKey.filter((x) => x) as string[]),
) )

4
front/packages/models/src/traits/images.ts
View File

@ -18,9 +18,11 @@
* along with Kyoo. If not, see <https://www.gnu.org/licenses/>. * along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Platform } from "react-native";
import { z } from "zod"; import { z } from "zod";
export const imageFn = (url: string) => (url.startsWith("/api") ? url : `/api${url}`); export const imageFn = (url: string) =>
Platform.OS === "web" ? `/api/${url}` : process.env.PUBLIC_BACK_URL + url;
export const ImagesP = z.object({ export const ImagesP = z.object({
/** /**