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

Format front

Browse Source
This commit is contained in:
Zoe Roux 2023-12-02 00:59:57 +01:00
parent 49d225532c
commit 7dab3fd094
6 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
front/apps/web/src/pages/_app.tsx
View File

@ -170,7 +170,6 @@ App.getInitialProps = async (ctx: AppContext) => {
if (typeof window !== "undefined") return { pageProps: superjson.serialize(appProps.pageProps) }; if (typeof window !== "undefined") return { pageProps: superjson.serialize(appProps.pageProps) };
const getUrl = Component.getFetchUrls; const getUrl = Component.getFetchUrls;
const getLayoutUrl = const getLayoutUrl =
Component.getLayout && "Layout" in Component.getLayout Component.getLayout && "Layout" in Component.getLayout

2
front/packages/models/src/accounts.tsx
View File

@ -63,7 +63,7 @@ export const AccountProvider = ({
}) => { }) => {
if (Platform.OS === "web" && typeof window === "undefined") { if (Platform.OS === "web" && typeof window === "undefined") {
const accs = ssrAccount const accs = ssrAccount
? [{ ...ssrAccount, selected: true, select: () => { }, remove: () => { } }] ? [{ ...ssrAccount, selected: true, select: () => {}, remove: () => {} }]
: []; : [];
return ( return (
<AccountContext.Provider value={accs}> <AccountContext.Provider value={accs}>

10
front/packages/models/src/login.ts
View File

@ -59,9 +59,10 @@ export const login = async (
} }
}; };
export const getTokenWJ = async (account?: Account | null): Promise<[string, Token] | [null, null]> => { export const getTokenWJ = async (
if (account === undefined) account?: Account | null,
account = getCurrentAccount(); ): Promise<[string, Token] | [null, null]> => {
if (account === undefined) account = getCurrentAccount();
if (!account) return [null, null]; if (!account) return [null, null];
if (account.token.expire_at <= new Date(new Date().getTime() + 10 * 1000)) { 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]; return [`${account.token.token_type} ${account.token.access_token}`, account.token];
}; };
export const getToken = async (): Promise<string | null> => export const getToken = async (): Promise<string | null> => (await getTokenWJ())[0];
(await getTokenWJ())[0];
export const logout = () => { export const logout = () => {
removeAccounts((x) => x.selected); removeAccounts((x) => x.selected);

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

@ -109,7 +109,8 @@ export const queryFn = async <Data,>(
data = { errors: [error] } as KyooErrors; data = { errors: [error] } as KyooErrors;
} }
console.log( console.log(
`Invalid response (${"method" in context && context.method ? context.method : "GET" `Invalid response (${
"method" in context && context.method ? context.method : "GET"
} ${path}):`, } ${path}):`,
data, data,
resp.status, resp.status,

6
front/packages/ui/src/login/login.tsx
View File

@ -74,7 +74,11 @@ export const LoginPage: QueryPage = () => {
<Button <Button
text={t("login.login")} text={t("login.login")}
onPress={async () => { onPress={async () => {
const { error } = await login("login", { username, password, apiUrl: cleanApiUrl(apiUrl) }); const { error } = await login("login", {
username,
password,
apiUrl: cleanApiUrl(apiUrl),
});
setError(error); setError(error);
if (error) return; if (error) return;
router.replace("/", undefined, { router.replace("/", undefined, {