Merge pull request #20 from Open-Earth-Foundation/fix/next-build

Fix NextJS build errors
Open-Earth-Foundation · Aug 14, 2023 · 68f15a2 · 68f15a2
2 parents a59a004 + 51d4b80
commit 68f15a2
Show file tree

Hide file tree

Showing 3 changed files with 124 additions and 18 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/src/app/[lng]/(auth)/login/page.tsx b/app/src/app/[lng]/(auth)/login/page.tsx
@@ -30,19 +30,20 @@ function VerifiedNotification({ t }: { t: TFunction }) {
         position: 'bottom-right',
       });
     }
-  }, [t, toast, isVerified]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isVerified]);
+
   return null;
 }
 
 export default function Login({ params: { lng } }: { params: { lng: string } }) {
   const { t } = useTranslation(lng, 'auth');
   const router = useRouter();
   const { handleSubmit, register, formState: { errors, isSubmitting } } = useForm<Inputs>();
-  const onSubmit: SubmitHandler<Inputs> = (data) => {
+  const onSubmit: SubmitHandler<Inputs> = async (data) => {
     console.log(data);
-    setTimeout(() => {
-      router.push(`/`);
-    }, 2000);
+    await new Promise(resolve => setTimeout(resolve, 500));
+    router.push(`/`);
   };
 
   return (

diff --git a/app/src/i18n/client.ts b/app/src/i18n/client.ts
@@ -26,23 +26,23 @@ i18next
 export function useTranslation(lng: string, ns: string, options: UseTranslationOptions<undefined> = {}) {
   const ret = useTranslationOrg(ns, options);
   const { i18n } = ret;
+  const isChangedOnServer = runsOnServerSide && lng && i18n.resolvedLanguage !== lng;
+  const [activeLng, setActiveLng] = useState(i18n.resolvedLanguage);
 
-  if (runsOnServerSide && lng && i18n.resolvedLanguage !== lng) {
+  if (isChangedOnServer) {
     i18n.changeLanguage(lng);
-  } else {
-    const [activeLng, setActiveLng] = useState(i18n.resolvedLanguage);
-
-    useEffect(() => {
-      if (activeLng === i18n.resolvedLanguage) return;
-      setActiveLng(i18n.resolvedLanguage);
-    }, [activeLng, i18n.resolvedLanguage]);
-
-    useEffect(() => {
-      if (!lng || i18n.resolvedLanguage === lng) return;
-      i18n.changeLanguage(lng);
-    }, [lng, i18n]);
   }
 
+  useEffect(() => {
+    if (isChangedOnServer || activeLng === i18n.resolvedLanguage) return;
+    setActiveLng(i18n.resolvedLanguage);
+  }, [activeLng, i18n.resolvedLanguage]);
+
+  useEffect(() => {
+    if (isChangedOnServer || !lng || i18n.resolvedLanguage === lng) return;
+    i18n.changeLanguage(lng);
+  }, [lng, i18n]);
+
   return ret;
 }