diff --git a/docker-compose.yml b/docker-compose.yml index a96cb7b8..aa80901c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,6 +17,7 @@ services: - postgres volumes: - kyoo:/var/lib/kyoo + - ./cache:/var/lib/kyoo/cached - ./video:/video front: build: ./front diff --git a/front/packages/ui/src/login/login.tsx b/front/packages/ui/src/login/login.tsx index 33876763..57ee7574 100644 --- a/front/packages/ui/src/login/login.tsx +++ b/front/packages/ui/src/login/login.tsx @@ -24,6 +24,7 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; import { Platform } from "react-native"; import { Trans } from "react-i18next"; +import { useRouter } from 'solito/router' import { percent, px, useYoshiki } from "yoshiki/native"; import { DefaultLayout } from "../layout"; import { FormPage } from "./form"; @@ -34,6 +35,7 @@ export const LoginPage: QueryPage = () => { const [password, setPassword] = useState(""); const [error, setError] = useState(null); + const router = useRouter(); const { t } = useTranslation(); const { css } = useYoshiki(); @@ -64,6 +66,7 @@ export const LoginPage: QueryPage = () => { onPress={async () => { const error = await loginFunc("login", {username, password}); setError(error); + if (!error) router.push("/"); }} {...css({ m: ts(1), diff --git a/front/packages/ui/src/login/register.tsx b/front/packages/ui/src/login/register.tsx index 70dc381c..6abe59e7 100644 --- a/front/packages/ui/src/login/register.tsx +++ b/front/packages/ui/src/login/register.tsx @@ -24,6 +24,7 @@ import { useState } from "react"; import { useTranslation } from "react-i18next"; import { Platform } from "react-native"; import { Trans } from "react-i18next"; +import { useRouter } from 'solito/router' import { percent, px, useYoshiki } from "yoshiki/native"; import { DefaultLayout } from "../layout"; import { FormPage } from "./form"; @@ -36,6 +37,7 @@ export const RegisterPage: QueryPage = () => { const [confirm, setConfirm] = useState(""); const [error, setError] = useState(null); + const router = useRouter(); const { t } = useTranslation(); const { css } = useYoshiki(); @@ -79,6 +81,7 @@ export const RegisterPage: QueryPage = () => { onPress={async () => { const error = await loginFunc("register", { email, username, password }); setError(error); + if (!error) router.push("/"); }} {...css({ m: ts(1), diff --git a/shell.nix b/shell.nix new file mode 100644 index 00000000..9a7efe6c --- /dev/null +++ b/shell.nix @@ -0,0 +1,12 @@ +{pkgs ? import {}}: +pkgs.mkShell { + packages = with pkgs; [ + nodejs-16_x + nodePackages.yarn + (with dotnetCorePackages; + combinePackages [ + sdk_6_0 + aspnetcore_6_0 + ]) + ]; +}