From 7dab3fd094dd94449adb3130e4485a0733ddd72f Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sat, 2 Dec 2023 00:59:57 +0100 Subject: [PATCH] Format front --- front/apps/web/src/pages/_app.tsx | 1 - front/packages/models/src/accounts.tsx | 2 +- front/packages/models/src/login.ts | 10 ++--- front/packages/models/src/query.tsx | 37 ++++++++++--------- front/packages/ui/src/login/login.tsx | 6 ++- .../ui/src/player/components/left-buttons.tsx | 8 ++-- 6 files changed, 34 insertions(+), 30 deletions(-) diff --git a/front/apps/web/src/pages/_app.tsx b/front/apps/web/src/pages/_app.tsx index 0e666252..035a4d88 100755 --- a/front/apps/web/src/pages/_app.tsx +++ b/front/apps/web/src/pages/_app.tsx @@ -170,7 +170,6 @@ App.getInitialProps = async (ctx: AppContext) => { if (typeof window !== "undefined") return { pageProps: superjson.serialize(appProps.pageProps) }; - const getUrl = Component.getFetchUrls; const getLayoutUrl = Component.getLayout && "Layout" in Component.getLayout diff --git a/front/packages/models/src/accounts.tsx b/front/packages/models/src/accounts.tsx index 44e7f99d..0dceb4ed 100644 --- a/front/packages/models/src/accounts.tsx +++ b/front/packages/models/src/accounts.tsx @@ -63,7 +63,7 @@ export const AccountProvider = ({ }) => { if (Platform.OS === "web" && typeof window === "undefined") { const accs = ssrAccount - ? [{ ...ssrAccount, selected: true, select: () => { }, remove: () => { } }] + ? [{ ...ssrAccount, selected: true, select: () => {}, remove: () => {} }] : []; return ( diff --git a/front/packages/models/src/login.ts b/front/packages/models/src/login.ts index 0f421632..3b2e237e 100644 --- a/front/packages/models/src/login.ts +++ b/front/packages/models/src/login.ts @@ -59,9 +59,10 @@ export const login = async ( } }; -export const getTokenWJ = async (account?: Account | null): Promise<[string, Token] | [null, null]> => { - if (account === undefined) - account = getCurrentAccount(); +export const getTokenWJ = async ( + account?: Account | null, +): Promise<[string, Token] | [null, null]> => { + if (account === undefined) account = getCurrentAccount(); if (!account) return [null, null]; if (account.token.expire_at <= new Date(new Date().getTime() + 10 * 1000)) { @@ -81,8 +82,7 @@ export const getTokenWJ = async (account?: Account | null): Promise<[string, Tok return [`${account.token.token_type} ${account.token.access_token}`, account.token]; }; -export const getToken = async (): Promise => - (await getTokenWJ())[0]; +export const getToken = async (): Promise => (await getTokenWJ())[0]; export const logout = () => { removeAccounts((x) => x.selected); diff --git a/front/packages/models/src/query.tsx b/front/packages/models/src/query.tsx index 32413708..db34f53e 100644 --- a/front/packages/models/src/query.tsx +++ b/front/packages/models/src/query.tsx @@ -37,8 +37,8 @@ const kyooUrl = Platform.OS !== "web" ? process.env.PUBLIC_BACK_URL : typeof window === "undefined" - ? process.env.KYOO_URL ?? "http://localhost:5000" - : "/api"; + ? process.env.KYOO_URL ?? "http://localhost:5000" + : "/api"; export let kyooApiUrl: string | null = kyooUrl || null; @@ -50,13 +50,13 @@ export const queryFn = async ( context: | (QueryFunctionContext & { timeout?: number }) | { - path: (string | false | undefined | null)[]; - body?: object; - method: "GET" | "POST" | "DELETE"; - authenticated?: boolean; - apiUrl?: string; - timeout?: number; - }, + path: (string | false | undefined | null)[]; + body?: object; + method: "GET" | "POST" | "DELETE"; + authenticated?: boolean; + apiUrl?: string; + timeout?: number; + }, type?: z.ZodType, token?: string | null, ): Promise => { @@ -72,8 +72,8 @@ export const queryFn = async ( "path" in context ? (context.path.filter((x) => x) as string[]) : "pageParam" in context && context.pageParam - ? [context.pageParam as string] - : (context.queryKey.filter((x, i) => x && i) as string[]), + ? [context.pageParam as string] + : (context.queryKey.filter((x, i) => x && i) as string[]), ) .join("/") .replace("/?", "?"); @@ -109,7 +109,8 @@ export const queryFn = async ( data = { errors: [error] } as KyooErrors; } console.log( - `Invalid response (${"method" in context && context.method ? context.method : "GET" + `Invalid response (${ + "method" in context && context.method ? context.method : "GET" } ${path}):`, data, resp.status, @@ -173,8 +174,8 @@ export type QueryPage = ComponentType< > & { getFetchUrls?: (route: { [key: string]: string }, randomItems: Items[]) => QueryIdentifier[]; getLayout?: - | QueryPage<{ page: ReactElement }> - | { Layout: QueryPage<{ page: ReactElement }>; props: object }; + | QueryPage<{ page: ReactElement }> + | { Layout: QueryPage<{ page: ReactElement }>; props: object }; randomItems?: Items[]; }; @@ -186,10 +187,10 @@ const toQueryKey = (query: QueryIdentifier) => { ...prefix, ...query.path, "?" + - Object.entries(query.params) - .filter(([_, v]) => v !== undefined) - .map(([k, v]) => `${k}=${Array.isArray(v) ? v.join(",") : v}`) - .join("&"), + Object.entries(query.params) + .filter(([_, v]) => v !== undefined) + .map(([k, v]) => `${k}=${Array.isArray(v) ? v.join(",") : v}`) + .join("&"), ]; } else { return [...prefix, ...query.path]; diff --git a/front/packages/ui/src/login/login.tsx b/front/packages/ui/src/login/login.tsx index ebac322a..640538d7 100644 --- a/front/packages/ui/src/login/login.tsx +++ b/front/packages/ui/src/login/login.tsx @@ -74,7 +74,11 @@ export const LoginPage: QueryPage = () => {