From 0f46244d2b04e54aaff6c0a40602db6c97705edb Mon Sep 17 00:00:00 2001 From: Naufal Azmi <109430358+BoboiAzumi@users.noreply.github.com> Date: Mon, 26 May 2025 17:07:51 +0700 Subject: [PATCH] Fix conflict and add disabled button when invalid input (#30) * feat: responsive * fix: success register * feat: auth login responsive && auth login implementation * fix: login page button disabled & register page * fix: conflict * fix: button disabled when loading --- apps/dimentorin/src/app/_hooks/use-login.ts | 3 ++- .../dimentorin/src/app/_hooks/use-register.ts | 0 apps/dimentorin/src/app/auth/login/page.tsx | 11 ++++++++-- .../dimentorin/src/app/auth/register/page.tsx | 20 ++++++++++++++----- .../src/app/auth/register/success/page.tsx | 6 +++--- apps/dimentorin/src/middleware.ts | 1 + package-lock.json | 8 ++++---- package.json | 2 +- 8 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 apps/dimentorin/src/app/_hooks/use-register.ts diff --git a/apps/dimentorin/src/app/_hooks/use-login.ts b/apps/dimentorin/src/app/_hooks/use-login.ts index e0323ce..67ae4f0 100644 --- a/apps/dimentorin/src/app/_hooks/use-login.ts +++ b/apps/dimentorin/src/app/_hooks/use-login.ts @@ -12,12 +12,13 @@ export const useLogin = () => { mode: 'all', }); - const { signIn } = useSession(); + const { signIn, isLoading } = useSession(); const onSubmit = form.handleSubmit((data) => signIn(data)); return { form, onSubmit, + isLoading }; }; diff --git a/apps/dimentorin/src/app/_hooks/use-register.ts b/apps/dimentorin/src/app/_hooks/use-register.ts new file mode 100644 index 0000000..e69de29 diff --git a/apps/dimentorin/src/app/auth/login/page.tsx b/apps/dimentorin/src/app/auth/login/page.tsx index 3859aba..152f955 100644 --- a/apps/dimentorin/src/app/auth/login/page.tsx +++ b/apps/dimentorin/src/app/auth/login/page.tsx @@ -5,7 +5,7 @@ import { useLogin } from '../../_hooks/use-login'; import { ArrowLeftOutlined } from '@ant-design/icons'; export const Components: FC = (): ReactElement => { - const { form, onSubmit } = useLogin(); + const { form, onSubmit, isLoading } = useLogin(); return (
@@ -42,7 +42,7 @@ export const Components: FC = (): ReactElement => { Lupa Password ?
- +
@@ -74,6 +74,13 @@ export const Components: FC = (): ReactElement => { Kembali Ke Homepage +
diff --git a/apps/dimentorin/src/app/auth/register/page.tsx b/apps/dimentorin/src/app/auth/register/page.tsx index 79bcadf..3de638d 100644 --- a/apps/dimentorin/src/app/auth/register/page.tsx +++ b/apps/dimentorin/src/app/auth/register/page.tsx @@ -2,24 +2,33 @@ import { FC, ReactElement } from 'react'; import { RegisterResetBanner } from '@imphnen-frontend-service/ui/organisms'; import { Button, Input } from '@imphnen-frontend-service/ui/atoms'; import { InputField } from '@imphnen-frontend-service/ui/molecules'; +import { ArrowLeftOutlined } from '@ant-design/icons'; export const Components: FC = (): ReactElement => { return (
-
+
-
-
+
+
+

Register

Yosha~! Saatnya Bergabung dengan Dimentorin
-
+
{
@@ -90,7 +100,7 @@ export const Components: FC = (): ReactElement => { type="password" placeholder="Ulangi password-mu, Senpai~!" /> - +
diff --git a/apps/dimentorin/src/app/auth/register/success/page.tsx b/apps/dimentorin/src/app/auth/register/success/page.tsx index b648e4b..4a59405 100644 --- a/apps/dimentorin/src/app/auth/register/success/page.tsx +++ b/apps/dimentorin/src/app/auth/register/success/page.tsx @@ -6,10 +6,10 @@ import { ArrowRightOutlined } from '@ant-design/icons'; export const Components: FC = (): ReactElement => { return (
-
+
-
-
+
+

Register Successfull

diff --git a/apps/dimentorin/src/middleware.ts b/apps/dimentorin/src/middleware.ts index 3d4d24a..e8c9cd2 100644 --- a/apps/dimentorin/src/middleware.ts +++ b/apps/dimentorin/src/middleware.ts @@ -9,6 +9,7 @@ const mappingPublicRoutes = [ '/', '/auth/login', '/auth/forgot', + '/auth/register', '/auth/new-password', ]; diff --git a/package-lock.json b/package-lock.json index eee255c..fdbd228 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "next-themes": "^0.4.6", "react": "^19.1.0", "react-dom": "^19.1.0", - "react-hook-form": "^7.55.0", + "react-hook-form": "^7.56.4", "react-icons": "^5.5.0", "react-router-dom": "^7.3.0", "sharp": "^0.34.1", @@ -28019,9 +28019,9 @@ } }, "node_modules/react-hook-form": { - "version": "7.56.1", - "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.56.1.tgz", - "integrity": "sha512-qWAVokhSpshhcEuQDSANHx3jiAEFzu2HAaaQIzi/r9FNPm1ioAvuJSD4EuZzWd7Al7nTRKcKPnBKO7sRn+zavQ==", + "version": "7.56.4", + "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.56.4.tgz", + "integrity": "sha512-Rob7Ftz2vyZ/ZGsQZPaRdIefkgOSrQSPXfqBdvOPwJfoGnjwRJUs7EM7Kc1mcoDv3NOtqBzPGbcMB8CGn9CKgw==", "license": "MIT", "engines": { "node": ">=18.0.0" diff --git a/package.json b/package.json index f30e297..7bf87ec 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "next-themes": "^0.4.6", "react": "^19.1.0", "react-dom": "^19.1.0", - "react-hook-form": "^7.55.0", + "react-hook-form": "^7.56.4", "react-icons": "^5.5.0", "react-router-dom": "^7.3.0", "sharp": "^0.34.1",