From 4c94ddd1b2635143ef93c941962c2bd29dfdd828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EA=B0=95=EC=A4=80?= Date: Fri, 2 Dec 2022 21:14:28 +0900 Subject: [PATCH] feat(frontend): add change language button in login page --- frontend/pages/login.js | 112 +++++++++++++---------- frontend/pages/settings/personal/[id].js | 4 - 2 files changed, 64 insertions(+), 52 deletions(-) diff --git a/frontend/pages/login.js b/frontend/pages/login.js index 24f8d9e75..c626a0370 100644 --- a/frontend/pages/login.js +++ b/frontend/pages/login.js @@ -3,6 +3,7 @@ import Head from "next/head"; import Image from "next/image"; import Link from "next/link"; import { useRouter } from "next/router"; +import setLanguage from "next-translate/setLanguage"; import useTranslation from "next-translate/useTranslation"; import { faWarning } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; @@ -10,6 +11,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import Button from "~/components/basic/buttons/Button"; import Error from "~/components/basic/Error"; import InputField from "~/components/basic/InputField"; +import ListBox from "~/components/basic/Listbox"; import attemptLogin from "~/utilities/attemptLogin"; import getWorkspaces from "./api/workspace/getWorkspaces"; @@ -20,7 +22,7 @@ export default function Login() { const [errorLogin, setErrorLogin] = useState(false); const [isLoading, setIsLoading] = useState(false); const router = useRouter(); - const { t } = useTranslation(""); + const { t, lang } = useTranslation(""); useEffect(async () => { let userWorkspace; @@ -71,59 +73,73 @@ export default function Login() { /> -
-

- {t("login:login")} -

-
-

- {t("login:need-account")} +

+
+

+ {t("login:login")}

+
+

+ {t("login:need-account")} +

+
+
+ + + +
+
+ +
+
+ +
+ {errorLogin && } +
+
+
+
+ {/*
+

I may have forgotten my password.

+
*/}
-
- - - -
-
- -
-
- -
- {errorLogin && } -
-
-
- {/*
-

I may have forgotten my password.

-
*/}
+ {false && (
diff --git a/frontend/pages/settings/personal/[id].js b/frontend/pages/settings/personal/[id].js index 15604aed3..35c924803 100644 --- a/frontend/pages/settings/personal/[id].js +++ b/frontend/pages/settings/personal/[id].js @@ -31,10 +31,6 @@ export default function PersonalSettings() { const { t, lang } = useTranslation(); - const changeLanguage = useCallback((code) => { - setLanguage(code); - }, []); - useEffect(async () => { let user = await getUser(); setPersonalEmail(user.email);