feat: add feature request navigation

.env.example

@@ -0,0 +1,14 @@
+# API Endpoint
+VITE_API_URL=
+
+# Payload CMS Secret Key (minimum 32 characters)
+CMS_SECRET=your-very-long-secret-key
+
+# PostgreSQL Connection String
+CMS_POSTGRES_URL=postgres://user:password@host:port/database
+
+# S3 Storage Configuration
+CMS_STORAGE_ENDPOINT=https://your-s3-endpoint.com
+CMS_STORAGE_ACCESS_KEY_ID=your-access-key-id
+CMS_STORAGE_SECRET_ACCESS_KEY=your-secret-access-key
+CMS_STORAGE_REGION=ap-southeast-1

.gitignore

@@ -62,3 +62,9 @@ storybook-static
 # Next.js
 .next
 out
+
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md
+
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md

README.md

@@ -6,10 +6,9 @@
 
 This repository is a **monorepo** for all frontend services of IMPHNEN. The monorepo includes three main applications:
 
-1. **Gacha** - Application for <a href="https://gacha.imphnen.dev/" target="_blank">Gacha Website</a>.
+1. **Gacha** - Application for <a href="https://gacha.imphnen.dev/" target="_blank">gacha website</a>.
-2. **Backoffice** - Application for <a href="https://gacha.imphnen.dev/" target="_blank">Internal Management Website</a>.
+2. **Backoffice** - Application for internal management.
-3. **Dimentorin** - Application for <a href="https://dimentorin.imphnen.dev/" target="_blank">Mentoring Service</a>.
+3. **Dimentorin** - Application for mentoring services.
-4. **Landing Page** - Application for <a href="https://imphnen.dev/" target="_blank">Landing Page</a>.
 
 ## How to install
 
@@ -25,15 +24,6 @@ This repository is a **monorepo** for all frontend services of IMPHNEN. The mono
 
 ## How to run
 
-### Setup Environment Variables
-
-Before running the applications, you need to set up the environment variables. You can do this by copying the `.env.example` file to `.env` and modifying the values according to your needs.
-
-```sh
-cd apps/{appname}
-cp .env.example .env
-```
-
 ### Development
 
 Use the following commands to run in development mode:
@@ -50,10 +40,6 @@ Use the following commands to run in development mode:
   ```sh
   npm run dimentorin:dev
   ```
-- **Landing Page**:
-  ```sh
-  npm run landing:dev
-  ```
 
 ### Build
 
@@ -71,10 +57,6 @@ Use the following commands to build the applications:
   ```sh
   npm run dimentorin:build
   ```
-- **Landing Page**:
-  ```sh
-  npm run landing:build
-  ```
 
 ### Production
 
@@ -92,22 +74,19 @@ Use the following commands to run the applications in production mode:
   ```sh
   npm run dimentorin:prod
   ```
-- **Landing Page**:
-  ```sh
-  npm run landing:prod
-  ```
 
 ### Storybook
 
 This repository uses Storybook to develop, test, and document UI components in an isolated and interactive environment. Below are the commands to work with Storybook:
 
 - **Run Storybook**
-
+  
   This command starts Storybook in development mode, allowing you to view and test UI components interactively.
 
   ```sh
   npm run ui:storybook
   ```
+  
 
 - **Run Unit Test**
 

apps/backoffice/.env.example

@@ -1 +0,0 @@
-VITE_API_URL=

apps/backoffice/src/app/_hooks/use-login.ts

@@ -2,19 +2,24 @@ import { useForm } from 'react-hook-form';
 import {
   authLoginSchema,
   TLoginRequest,
+  usePostLogin,
 } from '@imphnen-frontend-service/service';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useSession } from '@imphnen-frontend-service/utils';
+import { toast } from 'sonner';
 
 export const useLogin = () => {
+  const postLogin = usePostLogin();
   const form = useForm<TLoginRequest>({
     resolver: zodResolver(authLoginSchema),
     mode: 'all',
   });
 
-  const { signIn } = useSession();
+  const onSubmit = form.handleSubmit((data) => {
-
+    postLogin.mutate(data, {
-  const onSubmit = form.handleSubmit((data) => signIn(data));
+      onSuccess: () => toast.success("Login sukses"),
+      onError: (error) => toast.error(error.message),
+    });
+  });
 
   return {
     form,

apps/backoffice/src/app/accounts/page.tsx

@@ -18,7 +18,7 @@ import {
   RowSelectionState,
 } from '@tanstack/react-table';
 import ModalEditAccount from './_components/modal-edit-account';
-import { useQueryState } from '@imphnen-frontend-service/utils';
+import { useQueryState } from '../../hook/use-query-state';
 
 interface Account {
   id: number;
@@ -166,7 +166,7 @@ export const Components: FC = (): ReactElement => {
               </Button>
               {showFilter && (
                 <div className="absolute right-0 top-[calc(100%+12px)] z-10 shadow-lg">
-                  <Filter onClose={() => setShowFilter(false)} options={[]} />
+                  <Filter onClose={() => setShowFilter(false)} />
                 </div>
               )}
             </div>

apps/backoffice/src/app/dashboard/layout.tsx

@@ -0,0 +1,18 @@
+import { FC, ReactElement } from 'react';
+import { Outlet } from 'react-router-dom';
+import { BackofficeSidebar } from '@imphnen-frontend-service/ui/organisms';
+
+export const AppLayout: FC = (): ReactElement => {
+  return (
+    <div className="bg-primary-50 min-h-screen flex justify-center">
+      <div className="bg-primary-50 min-h-screen w-full flex">
+        <BackofficeSidebar />
+        <div className="flex-1 overflow-auto lg:max-w-[1000px] 2xl:max-w-[1280px] mx-auto">
+          <Outlet />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AppLayout;

apps/backoffice/src/app/dashboard/page.tsx

@@ -10,7 +10,7 @@ import { FC, Fragment, ReactElement, useState } from 'react';
 import ModalAddItem from './_components/modal-add-item';
 import ModalEditItem from './_components/modal-edit-item';
 import ModalDeleteItem from './_components/modal-delete-item';
-import { useQueryState } from '@imphnen-frontend-service/utils';
+import { useQueryState } from '../../hook/use-query-state';
 
 export const Components: FC = (): ReactElement => {
   const [showModalAddItem, setShowModalAddItem] = useState(false);

apps/backoffice/src/app/gacha-roll/layout.tsx

@@ -0,0 +1,18 @@
+import { FC, ReactElement } from 'react';
+import { Outlet } from 'react-router-dom';
+import { BackofficeSidebar } from '@imphnen-frontend-service/ui/organisms';
+
+export const AppLayout: FC = (): ReactElement => {
+  return (
+    <div className="bg-primary-50 min-h-screen flex justify-center">
+      <div className="bg-primary-50 min-h-screen w-full flex">
+        <BackofficeSidebar />
+        <div className="flex-1 overflow-auto lg:max-w-[1000px] 2xl:max-w-[1280px] mx-auto">
+          <Outlet />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AppLayout;

apps/backoffice/src/app/page.tsx

@@ -32,16 +32,7 @@ export const Components: FC = (): ReactElement => {
             size="lg"
             className="w-full"
           />
-          <Button
+          <Button type="submit" size="md" className="w-full">
-            disabled={
-              form.formState.isSubmitting ||
-              form.formState.isValidating ||
-              !form.formState.isValid
-            }
-            type="submit"
-            size="md"
-            className="w-full"
-          >
             Login
           </Button>
         </form>

apps/backoffice/src/app/permissions/layout.tsx

@@ -0,0 +1,18 @@
+import { FC, ReactElement } from 'react';
+import { Outlet } from 'react-router-dom';
+import { BackofficeSidebar } from '@imphnen-frontend-service/ui/organisms';
+
+export const AppLayout: FC = (): ReactElement => {
+  return (
+    <div className="bg-primary-50 min-h-screen flex justify-center">
+      <div className="bg-primary-50 min-h-screen w-full flex">
+        <BackofficeSidebar />
+        <div className="flex-1 overflow-auto lg:max-w-[1000px] 2xl:max-w-[1280px] mx-auto">
+          <Outlet />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AppLayout;

apps/backoffice/src/app/prizes/layout.tsx

@@ -0,0 +1,18 @@
+import { FC, ReactElement } from 'react';
+import { Outlet } from 'react-router-dom';
+import { BackofficeSidebar } from '@imphnen-frontend-service/ui/organisms';
+
+export const AppLayout: FC = (): ReactElement => {
+  return (
+    <div className="bg-primary-50 min-h-screen flex justify-center">
+      <div className="bg-primary-50 min-h-screen w-full flex">
+        <BackofficeSidebar />
+        <div className="flex-1 overflow-auto lg:max-w-[1000px] 2xl:max-w-[1280px] mx-auto">
+          <Outlet />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AppLayout;

apps/backoffice/src/app/roles/layout.tsx

@@ -0,0 +1,18 @@
+import { FC, ReactElement } from 'react';
+import { Outlet } from 'react-router-dom';
+import { BackofficeSidebar } from '@imphnen-frontend-service/ui/organisms';
+
+export const AppLayout: FC = (): ReactElement => {
+  return (
+    <div className="bg-primary-50 min-h-screen flex justify-center">
+      <div className="bg-primary-50 min-h-screen w-full flex">
+        <BackofficeSidebar />
+        <div className="flex-1 overflow-auto lg:max-w-[1000px] 2xl:max-w-[1280px] mx-auto">
+          <Outlet />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AppLayout;

apps/backoffice/src/app/transactions/layout.tsx

@@ -0,0 +1,18 @@
+import { FC, ReactElement } from 'react';
+import { Outlet } from 'react-router-dom';
+import { BackofficeSidebar } from '@imphnen-frontend-service/ui/organisms';
+
+export const AppLayout: FC = (): ReactElement => {
+  return (
+    <div className="bg-primary-50 min-h-screen flex justify-center">
+      <div className="bg-primary-50 min-h-screen w-full flex">
+        <BackofficeSidebar />
+        <div className="flex-1 overflow-auto lg:max-w-[1000px] 2xl:max-w-[1280px] mx-auto">
+          <Outlet />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AppLayout;

apps/backoffice/src/middleware.ts

@@ -1,108 +1,11 @@
-import {
+import { LoaderFunctionArgs } from 'react-router-dom';
-  PERMISSIONS,
-  SessionToken,
-  SessionUser,
-} from '@imphnen-frontend-service/utils';
-import { LoaderFunctionArgs, redirect } from 'react-router';
-
-const mappingPublicRoutes = [
-  '/auth/login',
-  '/auth/forgot',
-  '/auth/new-password',
-];
-
-const mappingRoutePermissions = [
-  {
-    path: '/dashboard',
-    permissions: [],
-  },
-  {
-    path: '/users',
-    permissions: [PERMISSIONS.USERS.READ_LIST],
-  },
-  {
-    path: '/users/create',
-    permissions: [PERMISSIONS.USERS.CREATE],
-  },
-  {
-    path: '/users/update',
-    permissions: [PERMISSIONS.USERS.UPDATE],
-  },
-  {
-    path: '/users/detail',
-    permissions: [PERMISSIONS.USERS.READ_DETAIL],
-  },
-  {
-    path: '/roles',
-    permissions: [PERMISSIONS.ROLES.READ_LIST],
-  },
-  {
-    path: '/roles/create',
-    permissions: [PERMISSIONS.ROLES.CREATE],
-  },
-  {
-    path: '/roles/update',
-    permissions: [PERMISSIONS.ROLES.UPDATE],
-  },
-  {
-    path: '/roles/detail',
-    permissions: [PERMISSIONS.ROLES.READ_DETAIL],
-  },
-  {
-    path: '/permissions',
-    permissions: [PERMISSIONS.PERMISSIONS.READ_LIST],
-  },
-  {
-    path: '/permissions/create',
-    permissions: [PERMISSIONS.PERMISSIONS.CREATE],
-  },
-  {
-    path: '/permissions/update',
-    permissions: [PERMISSIONS.PERMISSIONS.UPDATE],
-  },
-  {
-    path: '/permissions/detail',
-    permissions: [PERMISSIONS.PERMISSIONS.READ_DETAIL],
-  },
-];
-
-//TODO : Fix this later
-// const redirectToFirstAccessibleRoute = (userPermissions: string[]) => {
-//   const fallback = mappingRoutePermissions.find((route) =>
-//     route.permissions.some((perm) => userPermissions.includes(perm))
-//   );
-//   return redirect(fallback?.path ?? '/auth/login');
-// };
 
 export const middleware = async ({ request }: LoaderFunctionArgs) => {
   const url = new URL(request.url);
+
   const pathname = url.pathname;
-  const session = SessionUser.get();
-  const session_token = SessionToken.get();
-  const token = session_token?.token?.access_token;
-  const userPermissions =
-    session?.role?.permissions?.map?.((perm) => perm?.name) ?? [];
 
-  if (mappingPublicRoutes.includes(pathname)) {
+  if (pathname) return null;
-    if (token) return redirect('/dashboard');
-    return null;
-  }
-
-  if (!session) return redirect('/auth/login');
-
-  const matchedRoute = mappingRoutePermissions.find(
-    (route) => route.path === pathname
-  );
-
-  if (matchedRoute) {
-    const hasPermission =
-      !matchedRoute.permissions ||
-      matchedRoute.permissions.some((perm) => userPermissions.includes(perm));
-
-    if (!hasPermission) {
-      return '/dashboard';
-    }
-  }
 
   return null;
 };

apps/dimentorin/.env.example

@@ -1 +0,0 @@
-VITE_API_URL=

apps/dimentorin/src/app/_hooks/use-login.ts

@@ -2,23 +2,27 @@ import { useForm } from 'react-hook-form';
 import {
   authLoginSchema,
   TLoginRequest,
+  usePostLogin,
 } from '@imphnen-frontend-service/service';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useSession } from '@imphnen-frontend-service/utils';
+import { toast } from 'sonner';
 
 export const useLogin = () => {
+  const postLogin = usePostLogin();
   const form = useForm<TLoginRequest>({
     resolver: zodResolver(authLoginSchema),
     mode: 'all',
   });
 
-  const { signIn, isLoading } = useSession();
+  const onSubmit = form.handleSubmit((data) => {
-
+    postLogin.mutate(data, {
-  const onSubmit = form.handleSubmit((data) => signIn(data));
+      onSuccess: () => toast.success("Login sukses"),
+      onError: (error) => toast.error(error.message),
+    });
+  });
 
   return {
     form,
     onSubmit,
-    isLoading
   };
 };

apps/dimentorin/src/app/_hooks/use-otp.ts

@@ -1,24 +0,0 @@
-import { useForm } from 'react-hook-form';
-import {
-  TVerifyOtpRequest,
-  verifyEmailSchema,
-} from '@imphnen-frontend-service/service';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useOtp } from '@imphnen-frontend-service/utils';
-
-export const useOtpHook = () => {
-  const form = useForm<TVerifyOtpRequest>({
-    resolver: zodResolver(verifyEmailSchema),
-    mode: 'all',
-  });
-
-  const { otp, isLoading } = useOtp();
-
-  const onSubmit = form.handleSubmit((data) => otp(data));
-
-  return {
-    form,
-    onSubmit,
-    isLoading
-  };
-};

apps/dimentorin/src/app/_hooks/use-register.ts

@@ -1,24 +0,0 @@
-import { useForm } from 'react-hook-form';
-import {
-  authRegisterSchema,
-  TRegisterRequest,
-} from '@imphnen-frontend-service/service';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useRegister } from '@imphnen-frontend-service/utils';
-
-export const useRegisterHook = () => {
-  const form = useForm<TRegisterRequest>({
-    resolver: zodResolver(authRegisterSchema),
-    mode: 'all',
-  });
-
-  const { register, isLoading } = useRegister();
-
-  const onSubmit = form.handleSubmit((data) => register(data));
-
-  return {
-    form,
-    onSubmit,
-    isLoading
-  };
-};

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, isLoading } = useLogin();
+  const { form, onSubmit } = useLogin();
 
   return (
     <div className="flex flex-col justify-center items-center min-h-screen py-[60px] px-[80px]">
@@ -42,7 +42,7 @@ export const Components: FC = (): ReactElement => {
                   Lupa Password ?
                 </a>
               </div>
-              <Button className="w-full" type='submit' disabled={(!form.formState.isValid || isLoading)}>Enter Isekai</Button>
+              <Button className="w-full" type='submit'>Enter Isekai</Button>
             </form>
             
             <div className="flex my-3 gap-3 justify-center">
@@ -74,13 +74,6 @@ export const Components: FC = (): ReactElement => {
               <ArrowLeftOutlined />
               Kembali Ke Homepage
             </Button>
-            <Button
-              className='xl:hidden w-full gap-3'
-              variant='secondary'
-            >
-              <ArrowLeftOutlined />
-              Kembali Ke Homepage
-            </Button>
           </div>
         </div>
       </div>

apps/dimentorin/src/app/auth/register/otp/layout.tsx

@@ -1,12 +0,0 @@
-import { FC, ReactElement } from 'react';
-import { Outlet } from 'react-router-dom';
-
-export const AppLayout: FC = (): ReactElement => {
-  return (
-    <main className="bg-primary-50 min-h-screen">
-      <Outlet />
-    </main>
-  );
-};
-
-export default AppLayout;

apps/dimentorin/src/app/auth/register/otp/page.tsx

@@ -1,37 +0,0 @@
-import { FC, ReactElement } from 'react';
-import { ControlledInputField, RegisterResetBanner } from "@imphnen-frontend-service/ui/organisms";
-import { useOtpHook } from '../../../_hooks/use-otp';
-import { Button } from '@imphnen-frontend-service/ui/atoms';
-import { useSearchParams } from 'react-router-dom';
-
-export const Components: FC = (): ReactElement => {
-  const { form, onSubmit, isLoading } = useOtpHook()
-  const [ searchParams ] = useSearchParams()
-
-  return (
-    <div className='flex flex-col justify-center items-center min-h-screen py-[60px] px-[80px]'>
-      <div className='bg-white min-w-[1120px] min-h-[712px] p-10 rounded-2xl shadow-md flex gap-6'>
-        <RegisterResetBanner />
-        <div className='border-2 border-primary-500/50 w-[596px] rounded-lg py-[70px] px-[48px] flex flex-col justify-center'>
-          <h3 className='mt-5 text-3xl font-semibold text-primary-500'>Verifikasi Email</h3>
-          <h5 className='mt-2 text-xl font-medium text-primary-500'>Yeay~! Pesan dari dunia lain sudah dikirimkan ke {searchParams.get("email")}</h5>
-          <form onSubmit={onSubmit} className='mt-7'>
-            <ControlledInputField
-              label="OTP"
-              size="lg"
-              className="w-full"
-              placeholder="XXXXXX"
-              max={6}
-              name={'otp'}
-              maxLength={6}
-              control={form.control}
-            />
-            <Button className="xl:w-full mt-2" disabled={(!form.formState.isValid || isLoading)}>Linked Start !!!</Button>
-          </form>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default Components;

apps/dimentorin/src/app/auth/register/page.tsx

@@ -1,108 +1,96 @@
 import { FC, ReactElement } from 'react';
-import { ControlledInputField, RegisterResetBanner } from '@imphnen-frontend-service/ui/organisms';
+import { RegisterResetBanner } from '@imphnen-frontend-service/ui/organisms';
-import { Button } from '@imphnen-frontend-service/ui/atoms';
+import { Button, Input } from '@imphnen-frontend-service/ui/atoms';
-import { ArrowLeftOutlined } from '@ant-design/icons';
+import { InputField } from '@imphnen-frontend-service/ui/molecules';
-import { useRegisterHook } from '../../_hooks/use-register';
 
 export const Components: FC = (): ReactElement => {
-  const { form, onSubmit, isLoading } = useRegisterHook();
-
   return (
     <div className="flex flex-col justify-center items-center min-h-screen py-[60px] px-[80px]">
-      <div className="bg-white xl:min-w-[1130px] min-h-[712px] p-10 rounded-2xl shadow-md flex gap-6">
+      <div className="bg-white min-w-[1120px] min-h-[712px] p-10 rounded-2xl shadow-md flex gap-6">
         <RegisterResetBanner />
-        <div className="xl:border-2 xl:border-primary-500/50 xl:w-[726px] rounded-lg py-[32px] px-[48px] flex justify-center">
+        <div className="border-2 border-primary-500/50 w-[696px] rounded-lg py-[32px] px-[48px] flex justify-center">
-          <div className="xl:w-[714px]">
+          <div className="w-[704px]">
-            <Button
-              className='xl:hidden gap-3'
-              variant='secondary'
-            >
-              <ArrowLeftOutlined />
-              Login
-            </Button>
             <h3 className="mt-5 text-3xl font-semibold text-primary-500">
               Register
             </h3>
             <h5 className="text-primary-500 font-medium">
               Yosha~! Saatnya Bergabung dengan Dimentorin
             </h5>
-            <form onSubmit={onSubmit}>
+            <div className="grid grid-flow-row-dense my-7 grid-cols-2 gap-2">
-              <div className='my-7'>
+              <InputField
-                <ControlledInputField
+                label="First Name"
-                  label="Full name"
-                  size="lg"
-                  className="w-full"
-                  placeholder="Nama Lengkap"
-                  name={'fullname'}
-                  control={form.control}
-                />
-              </div>
-              <div className="grid grid-flow-row-dense my-7 lg:grid-cols-2 gap-2">
-                <ControlledInputField
-                  label="Email"
-                  size="lg"
-                  className="w-full"
-                  placeholder="Contoh : yourname@mail.com"
-                  type='email'
-                  control={form.control}
-                  name={'email'}
-                />
-                <ControlledInputField
-                  label="No Hp"
-                  size="lg"
-                  className="w-full"
-                  placeholder="Contoh : 088877665544"
-                  control={form.control}
-                  name={'phone_number'}
-                />  
-              </div>
-              <ControlledInputField
-                label="Password"
-                className="w-full"
                 size="lg"
-                type="password"
+                placeholder="Nama Depan"
-                placeholder="Buat password sekeren jurus ultimate-mu!"
-                control={form.control}
-                name={'password'}             
               />
-              <h6 className="text-sm text-gray-500 mt-1">
+              <InputField
-                "Senpai~! Pastikan password-mu sekuat pertahanan kastil!"
+                label="Last Name"
-              </h6>
-              <h6 className="text-sm text-gray-500 mt-2">
-                Tips membuat password yang OP:
-              </h6>
-              <h6 className="text-sm text-gray-500">
-                - Minimal 8 karakter (semakin panjang, semakin power-up!{' '}
-                <span role="img" aria-label="emoji">
-                  ⚡
-                </span>
-                )
-              </h6>
-              <h6 className="text-sm text-gray-500">
-                - Campur huruf besar, kecil, angka, dan simbol untuk kombinasi
-                ultimate!
-                <span role="img" aria-label="emoji">
-                  🔥
-                </span>
-              </h6>
-              <h6 className="text-sm text-gray-500 mb-2">
-                - Jangan pakai password yang gampang ditebak, nanti ketahuan
-                musuh!
-                <span role="img" aria-label="emoji">
-                  🚨
-                </span>
-              </h6>
-              <ControlledInputField
-                label="Repeat Password"
-                className="w-full"
                 size="lg"
-                type="password"
+                className="w-full"
-                placeholder="Ulangi password-mu, Senpai~!"
+                placeholder="Nama Belakang"
-                control={form.control}
-                name={"confirm_password"}
               />
-              <Button className="xl:w-full mt-2" disabled={(!form.formState.isValid || isLoading)}>Linked Start !!!</Button>
+              <InputField
-            </form>
+                label="Email"
+                size="lg"
+                placeholder="Contoh : yourname@mail.com"
+              />
+              <div className="flex gap-2">
+                <div className="flex flex-col gap-2">
+                  <h4 className="font-medium">OTP Code</h4>
+                  <Input
+                    className="w-full"
+                    size="lg"
+                    placeholder="Kode OTP"
+                  />
+                </div>
+                <div className="flex flex-col">
+                  <Button size="sm" className="mt-[30px]">
+                    Kirim OTP
+                  </Button>
+                </div>
+              </div>
+            </div>
+            <InputField
+              label="Password"
+              className="w-full"
+              size="lg"
+              type="password"
+              placeholder="Buat password sekeren jurus ultimate-mu!"
+            />
+            <h6 className="text-sm text-gray-500 mt-1">
+              "Senpai~! Pastikan password-mu sekuat pertahanan kastil!"
+            </h6>
+            <h6 className="text-sm text-gray-500 mt-2">
+              Tips membuat password yang OP:
+            </h6>
+            <h6 className="text-sm text-gray-500">
+              - Minimal 8 karakter (semakin panjang, semakin power-up!{' '}
+              <span role="img" aria-label="emoji">
+                ⚡
+              </span>
+              )
+            </h6>
+            <h6 className="text-sm text-gray-500">
+              - Campur huruf besar, kecil, angka, dan simbol untuk kombinasi
+              ultimate!
+              <span role="img" aria-label="emoji">
+                🔥
+              </span>
+            </h6>
+            <h6 className="text-sm text-gray-500 mb-2">
+              - Jangan pakai password yang gampang ditebak, nanti ketahuan
+              musuh!
+              <span role="img" aria-label="emoji">
+                🚨
+              </span>
+            </h6>
+            <InputField
+              label="Repeat Password"
+              className="w-full"
+              size="lg"
+              type="password"
+              placeholder="Ulangi password-mu, Senpai~!"
+            />
+            <Button className="w-full mt-2">Linked Start !!!</Button>
           </div>
         </div>
       </div>

apps/dimentorin/src/app/auth/register/success/page.tsx

@@ -1,21 +1,15 @@
-import { FC, ReactElement, useEffect } from 'react';
+import { FC, ReactElement } from 'react';
 import { RegisterResetBanner } from '@imphnen-frontend-service/ui/organisms';
 import { Button } from '@imphnen-frontend-service/ui/atoms';
 import { ArrowRightOutlined } from '@ant-design/icons';
 
 export const Components: FC = (): ReactElement => {
-  useEffect(() => {
-    setTimeout(() => {
-      document.location.href = "/auth/login"
-    }, 10000)
-  }, [])
-
   return (
     <div className="flex flex-col justify-center items-center min-h-screen py-[60px] px-[80px]">
-      <div className="bg-white xl:min-w-[1220px] min-h-[712px] p-10 rounded-2xl shadow-md flex gap-6">
+      <div className="bg-white min-w-[1220px] min-h-[712px] p-10 rounded-2xl shadow-md flex gap-6">
         <RegisterResetBanner />
-        <div className="border-2 border-primary-500/50 xl:w-[696px] rounded-lg py-[32px] px-[48px] flex justify-center bg-primary-50">
+        <div className="border-2 border-primary-500/50 w-[696px] rounded-lg py-[32px] px-[48px] flex justify-center bg-primary-50">
-          <div className="xl:w-[704px] flex flex-col justify-center items-center">
+          <div className="w-[704px] flex flex-col justify-center items-center">
             <h2 className="text-4xl text-primary-500 font-semibold">
               Register Successfull
             </h2>
@@ -47,12 +41,10 @@ export const Components: FC = (): ReactElement => {
             <h4 className="mt-10 text-primary-500 font-medium text-xl">
               Kamu akan memasuki isekai dalam 10 dtk
             </h4>
-            <a href="/auth/login">
+            <Button className="gap-3 mt-10" size="lg">
-              <Button className="gap-3 mt-10" size="lg">
+              Masuk Isekai
-                Masuk Isekai
+              <ArrowRightOutlined />
-                <ArrowRightOutlined />
+            </Button>
-              </Button>
-            </a>
           </div>
         </div>
       </div>

apps/dimentorin/src/middleware.ts

@@ -1,113 +1,11 @@
-import {
+import { LoaderFunctionArgs } from 'react-router-dom';
-  PERMISSIONS,
-  SessionToken,
-  SessionUser,
-} from '@imphnen-frontend-service/utils';
-import { LoaderFunctionArgs, redirect } from 'react-router';
-
-const mappingPublicRoutes = [
-  '/',
-  '/auth/login',
-  '/auth/forgot',
-  '/auth/forgot/otp',
-  '/auth/register',
-  '/auth/register/otp',
-  '/auth/register/success',
-  '/auth/new-password',
-];
-
-const mappingRoutePermissions = [
-  {
-    path: '/dashboard',
-    permissions: [],
-  },
-  {
-    path: '/users',
-    permissions: [PERMISSIONS.USERS.READ_LIST],
-  },
-  {
-    path: '/users/create',
-    permissions: [PERMISSIONS.USERS.CREATE],
-  },
-  {
-    path: '/users/update',
-    permissions: [PERMISSIONS.USERS.UPDATE],
-  },
-  {
-    path: '/users/detail',
-    permissions: [PERMISSIONS.USERS.READ_DETAIL],
-  },
-  {
-    path: '/roles',
-    permissions: [PERMISSIONS.ROLES.READ_LIST],
-  },
-  {
-    path: '/roles/create',
-    permissions: [PERMISSIONS.ROLES.CREATE],
-  },
-  {
-    path: '/roles/update',
-    permissions: [PERMISSIONS.ROLES.UPDATE],
-  },
-  {
-    path: '/roles/detail',
-    permissions: [PERMISSIONS.ROLES.READ_DETAIL],
-  },
-  {
-    path: '/permissions',
-    permissions: [PERMISSIONS.PERMISSIONS.READ_LIST],
-  },
-  {
-    path: '/permissions/create',
-    permissions: [PERMISSIONS.PERMISSIONS.CREATE],
-  },
-  {
-    path: '/permissions/update',
-    permissions: [PERMISSIONS.PERMISSIONS.UPDATE],
-  },
-  {
-    path: '/permissions/detail',
-    permissions: [PERMISSIONS.PERMISSIONS.READ_DETAIL],
-  },
-];
-
-//TODO : Fix this later
-// const redirectToFirstAccessibleRoute = (userPermissions: string[]) => {
-//   const fallback = mappingRoutePermissions.find((route) =>
-//     route.permissions.some((perm) => userPermissions.includes(perm))
-//   );
-//   return redirect(fallback?.path ?? '/auth/login');
-// };
 
 export const middleware = async ({ request }: LoaderFunctionArgs) => {
   const url = new URL(request.url);
+
   const pathname = url.pathname;
-  const session = SessionUser.get();
-  const session_token = SessionToken.get();
-  const token = session_token?.token?.access_token;
-  const userPermissions =
-    session?.role?.permissions?.map?.((perm) => perm?.name) ?? [];
 
-  if (mappingPublicRoutes.includes(pathname)) {
+  if (pathname) return null;
-    if (token) return redirect('/dashboard');
-    return null;
-  }
-
-  if (!session) return redirect('/auth/login');
-
-  const matchedRoute = mappingRoutePermissions.find(
-    (route) => route.path === pathname
-  );
-
-  if (matchedRoute) {
-    const hasPermission =
-      !matchedRoute.permissions ||
-      matchedRoute.permissions.some((perm) => userPermissions.includes(perm));
-
-    if (!hasPermission) {
-      return '/dashboard';
-    }
-  }
 
   return null;
 };

apps/gacha/.env.example

@@ -1 +0,0 @@
-VITE_API_URL=

apps/gacha/src/app/_components/form/modal-form-login.tsx

@@ -2,7 +2,6 @@ import { Button } from '@imphnen-frontend-service/ui/atoms';
 import { Modal } from '@imphnen-frontend-service/ui/molecules';
 import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
 import { useLogin } from '../../_hooks/use-login';
-import ModalFormVerifyEmail from './modal-form-verify-email';
 
 interface IModalFormLogin {
   isOpen: boolean;
@@ -17,87 +16,61 @@ const ModalFormLogin = ({
   onForgotPassword,
   setIsOpenRegisterModal,
 }: IModalFormLogin) => {
-  const {
+  const { form, onSubmit } = useLogin();
-    form,
-    onSubmit,
-    isLoading,
-    showVerifyModal,
-    verifyForm,
-    onVerifySubmit,
-    closeVerifyModal,
-    isVerifying,
-    emailToVerify,
-  } = useLogin();
 
   return (
-    <>
+    <Modal
-      <Modal
+      className="py-[45px] min-w-[400px] lg:min-w-[455px] px-7"
-        className="py-[45px] min-w-[400px] lg:min-w-[455px] px-7"
+      isOpen={isOpen}
-        isOpen={isOpen && !showVerifyModal}
+      onClose={onClose}
-        onClose={onClose}
+    >
-      >
+      <Modal.Header className="space-y-4">
-        <Modal.Header className="space-y-4">
+        <img src="/logos/logo.svg" alt="" className="h-[70px] w-auto" />
-          <img src="/logos/logo.svg" alt="" className="h-[70px] w-auto" />
+        <h1 className="text-primary-500 text-p1 text-center font-semibold">
-          <h1 className="text-primary-500 text-p1 text-center font-semibold">
+          Login
-            Login
+        </h1>
-          </h1>
+      </Modal.Header>
-        </Modal.Header>
+      <Modal.Content>
-        <Modal.Content>
+        <form className="space-y-4" onSubmit={onSubmit}>
-          <form className="space-y-4" onSubmit={onSubmit}>
+          <ControlledInputField
-            <ControlledInputField
+            control={form.control}
-              control={form.control}
+            label="Email"
-              label="Email"
+            placeholder="Masukkan Email"
-              placeholder="Masukkan Email"
+            type="email"
-              type="email"
+            name="email"
-              name="email"
+            size="lg"
-              size="lg"
+            className="w-full"
-              className="w-full"
+          />
-            />
+          <ControlledInputField
-            <ControlledInputField
+            control={form.control}
-              control={form.control}
+            label="Password"
-              label="Password"
+            placeholder="Masukkan Password"
-              placeholder="Masukkan Password"
+            type="password"
-              type="password"
+            name="password"
-              name="password"
+            size="lg"
-              size="lg"
+            className="w-full"
-              className="w-full"
+          />
-            />
+          <h1 className="text-end text-primary-500 text-xl font-medium">
-            <h1 className="text-end text-primary-500 text-xl font-medium">
+            <Button variant="text" onClick={onForgotPassword}>
-              <Button variant="text" type="button" onClick={onForgotPassword}>
+              Lupa Password?
-                Lupa Password?
-              </Button>
-            </h1>
-            <Button
-              type="submit"
-              size="md"
-              className="w-full"
-              disabled={isLoading}
-            >
-              {isLoading ? 'Loading...' : 'Login'}
             </Button>
-            <div className="flex justify-center gap-2 pt-2.5 font-medium">
+          </h1>
-              <p className="text-neutral-500">Belum punya akun?</p>
+          <Button type="submit" size="md" className="w-full">
-              <Button
+            Login
-                variant="text"
+          </Button>
-                className="text-primary-500 hover:text-primary-600 m-0 p-0"
+          <div className="flex justify-center gap-2 pt-2.5 font-medium">
-                onClick={() => setIsOpenRegisterModal(true)}
+            <p className="text-neutral-500">Belum punya akun?</p>
-              >
+            <Button
-                Daftar
+              variant="text"
-              </Button>
+              className="text-primary-500 hover:text-primary-600 m-0 p-0"
-            </div>
+              onClick={() => setIsOpenRegisterModal(true)}
-          </form>
+            >
-        </Modal.Content>
+              Daftar
-      </Modal>
+            </Button>
-
+          </div>
-      <ModalFormVerifyEmail
+        </form>
-        isOpen={showVerifyModal}
+      </Modal.Content>
-        onClose={closeVerifyModal}
+    </Modal>
-        verifyForm={verifyForm}
-        onVerifySubmit={onVerifySubmit}
-        isVerifying={isVerifying}
-        email={emailToVerify}
-      />
-    </>
   );
 };
 

apps/gacha/src/app/_components/form/modal-form-register.tsx

@@ -1,8 +1,11 @@
 import { Button } from '@imphnen-frontend-service/ui/atoms';
 import { Modal } from '@imphnen-frontend-service/ui/molecules';
+import { useQueryState } from '@imphnen-frontend-service/utils';
 import { useRegister } from '../../_hooks/use-register';
 import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
-import ModalFormVerifyEmail from './modal-form-verify-email';
+import { UseFormReturn } from 'react-hook-form';
+import { TRegisterRequest } from '@imphnen-frontend-service/service';
+import { useEffect } from 'react';
 
 interface IModalFormRegisterProps {
   isOpen: boolean;
@@ -10,100 +13,168 @@ interface IModalFormRegisterProps {
 }
 
 const ModalFormRegister = ({ isOpen, onClose }: IModalFormRegisterProps) => {
+  const { form, onSubmit, isStepOneValid } = useRegister();
+
   const {
-    form,
+    step: currentStep,
-    verifyForm,
+    nextStep,
-    onSubmit,
+    prevStep,
-    onVerifySubmit,
+    resetStep,
-    showVerifyModal,
+  } = useQueryState('registerStep', {
-    closeVerifyModal,
+    defaultValue: 1,
-    isVerifying,
+    maxValue: 2,
-    isRegistering,
+    minValue: 1,
-    registeredEmail,
+  });
-  } = useRegister();
+
+  useEffect(() => {
+    if (!isStepOneValid && currentStep === 2) {
+      prevStep();
+    }
+  }, [isStepOneValid, currentStep, prevStep]);
 
   return (
-    <>
+    <Modal
-      <Modal
+      className="py-[45px] min-w-[400px] lg:min-w-[455px] px-7"
-        className="py-[45px] min-w-[400px] lg:min-w-[455px] px-7"
+      isOpen={isOpen}
-        isOpen={isOpen && !showVerifyModal}
+      onClose={() => {
-        onClose={onClose}
+        onClose();
-      >
+        resetStep();
-        <Modal.Header className="space-y-4">
+      }}
-          <img src="/logos/logo.svg" alt="" className="h-[70px] w-auto" />
+    >
-          <h1 className="text-primary-500 text-p1 text-center font-semibold">
+      <Modal.Header className="space-y-4">
-            Register
+        <img src="/logos/logo.svg" alt="" className="h-[70px] w-auto" />
-          </h1>
+        <h1 className="text-primary-500 text-p1 text-center font-semibold">
-        </Modal.Header>
+          Register
-        <Modal.Content>
+        </h1>
-          <form onSubmit={onSubmit} className="space-y-6">
+        <h2 className="text-neutral-500 text-lg text-center">
-            <ControlledInputField
+          {currentStep === 1 ? 'Info Akun' : 'Informasi Pengiriman Hadiah'}
-              control={form.control}
+        </h2>
-              name="fullname"
+      </Modal.Header>
-              label="Nama Lengkap"
+      <Modal.Content>
-              placeholder="Masukkan Nama Lengkap"
+        <form onSubmit={onSubmit} className="space-y-6">
-              type="text"
+          {currentStep === 1 && (
-              size="lg"
+            <StepOne
-              className="w-full"
+              form={form}
+              nextStep={nextStep}
+              isStepOneValid={isStepOneValid}
             />
-            <ControlledInputField
+          )}
-              control={form.control}
+          {currentStep === 2 && <StepTwo form={form} prevStep={prevStep} />}
-              label="Email"
+        </form>
-              placeholder="Masukkan Email Anda"
+      </Modal.Content>
-              type="email"
+    </Modal>
-              name="email"
+  );
-              size="lg"
+};
-              className="w-full"
-            />
-            <ControlledInputField
-              control={form.control}
-              name="password"
-              label="Password"
-              placeholder="Masukkan Password"
-              type="password"
-              size="lg"
-              className="w-full"
-            />
-            <ControlledInputField
-              control={form.control}
-              name="confirm_password"
-              label="Ulangi Password"
-              placeholder="Masukkan Ulang Password"
-              type="password"
-              size="lg"
-              className="w-full"
-            />
-            <ControlledInputField
-              control={form.control}
-              name="phone_number"
-              label="Nomor Telepon"
-              placeholder="Masukkan Nomor Telepon Aktif"
-              type="text"
-              size="lg"
-              className="w-full"
-            />
-            <Button
-              size="md"
-              className="w-full"
-              type="submit"
-              disabled={isRegistering || !form.formState.isValid}
-            >
-              {isRegistering ? 'Mendaftar...' : 'Register'}
-            </Button>
-          </form>
-        </Modal.Content>
-      </Modal>
 
-      <ModalFormVerifyEmail
+interface IStepOneProps {
-        isOpen={showVerifyModal}
+  form: UseFormReturn<TRegisterRequest, any, TRegisterRequest>;
-        onClose={closeVerifyModal}
+  nextStep: () => void;
-        verifyForm={verifyForm}
+  isStepOneValid: boolean;
-        onVerifySubmit={onVerifySubmit}
+}
-        isVerifying={isVerifying}
+
-        email={registeredEmail}
+const StepOne = ({ form, nextStep, isStepOneValid }: IStepOneProps) => {
+  return (
+    <>
+      <ControlledInputField
+        control={form.control}
+        name="fullname"
+        label="Nama Lengkap"
+        placeholder="Masukkan Nama Lengkap"
+        type="text"
+        size="lg"
+        className="w-full"
       />
+      <ControlledInputField
+        control={form.control}
+        label="Email"
+        placeholder="Masukkan Email Anda"
+        type="email"
+        name="email"
+        size="lg"
+        className="w-full"
+      />
+      <ControlledInputField
+        control={form.control}
+        name="password"
+        label="Password"
+        placeholder="Masukkan Password"
+        type="password"
+        size="lg"
+        className="w-full"
+      />
+      <ControlledInputField
+        control={form.control}
+        name="confirm_password"
+        label="Ulangi Password"
+        placeholder="Masukkan Ulang Password"
+        type="password"
+        size="lg"
+        className="w-full"
+      />
+      <Button
+        size="md"
+        className="w-full"
+        onClick={nextStep}
+        disabled={!isStepOneValid}
+      >
+        Selanjutnya
+      </Button>
     </>
   );
 };
 
+interface IStepTwoProps {
+  form: UseFormReturn<TRegisterRequest, any, TRegisterRequest>;
+  prevStep: () => void;
+}
+
+const StepTwo = ({ form, prevStep }: IStepTwoProps) => (
+  <>
+    <ControlledInputField
+      control={form.control}
+      name="phone_number"
+      label="Nomor Telepon"
+      placeholder="Masukkan Nomor Telepon Aktif"
+      type="text"
+      size="lg"
+      className="w-full"
+    />
+    <ControlledInputField
+      control={form.control}
+      name="referral_code"
+      label="Kode Referral"
+      placeholder="Masukkan Kode Referral"
+      type="text"
+      size="lg"
+      className="w-full"
+    />
+    <ControlledInputField
+      control={form.control}
+      name="referred_by"
+      label="Referral By"
+      placeholder="Masukkan Referral By"
+      type="text"
+      size="lg"
+      className="w-full"
+    />
+    <ControlledInputField
+      control={form.control}
+      name="student_type"
+      label="Tipe Pelajar"
+      placeholder="Masukkan Tipe Pelajar"
+      type="text"
+      size="lg"
+      className="w-full"
+    />
+    <div className="flex gap-6">
+      <Button size="md" variant="text" className="w-[40%]" onClick={prevStep}>
+        Kembali
+      </Button>
+      <Button size="md" className="w-full" type="submit">
+        Gacha Sekarang
+      </Button>
+    </div>
+  </>
+);
+
 export default ModalFormRegister;

apps/gacha/src/app/_components/form/modal-form-verify-email.tsx

@@ -1,63 +0,0 @@
-import { Button } from '@imphnen-frontend-service/ui/atoms';
-import { Modal } from '@imphnen-frontend-service/ui/molecules';
-import { ControlledInputField } from '@imphnen-frontend-service/ui/organisms';
-import { UseFormReturn } from 'react-hook-form';
-
-interface IModalFormVerifyEmailProps {
-  isOpen: boolean;
-  onClose: () => void;
-  verifyForm: UseFormReturn<{ otp: string }, any>;
-  onVerifySubmit: (e: React.FormEvent<HTMLFormElement>) => void;
-  isVerifying: boolean;
-  email?: string;
-}
-
-const ModalFormVerifyEmail = ({
-  isOpen,
-  onClose,
-  verifyForm,
-  onVerifySubmit,
-  isVerifying,
-  email,
-}: IModalFormVerifyEmailProps) => {
-  return (
-    <Modal
-      className="py-[45px] min-w-[400px] lg:min-w-[455px] px-7"
-      isOpen={isOpen}
-      onClose={onClose}
-    >
-      <Modal.Header className="space-y-4">
-        <img src="/logos/logo.svg" alt="" className="h-[70px] w-auto" />
-        <h1 className="text-primary-500 text-p1 text-center font-semibold">
-          Verifikasi Email
-        </h1>
-        <h2 className="text-neutral-500 text-lg text-center">
-          Masukkan kode OTP yang telah dikirim ke {email ? email : 'email Anda'}
-        </h2>
-      </Modal.Header>
-      <Modal.Content>
-        <form onSubmit={onVerifySubmit} className="space-y-6">
-          <ControlledInputField
-            control={verifyForm.control}
-            name="otp"
-            label="Kode OTP"
-            placeholder="Masukkan Kode OTP"
-            type="text"
-            size="lg"
-            className="w-full"
-          />
-          <Button
-            size="md"
-            className="w-full"
-            type="submit"
-            disabled={isVerifying}
-          >
-            {isVerifying ? 'Memverifikasi...' : 'Verifikasi'}
-          </Button>
-        </form>
-      </Modal.Content>
-    </Modal>
-  );
-};
-
-export default ModalFormVerifyEmail;

apps/gacha/src/app/_hooks/use-login.ts

@@ -5,74 +5,22 @@ import {
   usePostLogin,
 } from '@imphnen-frontend-service/service';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useAuthStore } from '@imphnen-frontend-service/utils';
-import { toast } from 'sonner';
-import { useNavigate } from 'react-router';
-import { useVerifyEmail } from './use-verify-email';
 
 export const useLogin = () => {
+  const postLogin = usePostLogin();
   const form = useForm<TLoginRequest>({
     resolver: zodResolver(authLoginSchema),
     mode: 'all',
   });
 
-  const navigate = useNavigate();
-  const { mutate, isPending } = usePostLogin();
-  const { setLoading, setSession, clearSession } = useAuthStore();
-
-  const {
-    openVerifyModal,
-    showVerifyModal,
-    verifyForm,
-    onVerifySubmit,
-    closeVerifyModal,
-    isVerifying,
-    emailToVerify,
-  } = useVerifyEmail();
-
   const onSubmit = form.handleSubmit((data) => {
-    setLoading(true);
+    postLogin.mutate(data, {
-    mutate(data, {
+      onSuccess: () => console.log('Success Login'),
-      onSuccess: (response) => {
-        toast.success('Login sukses');
-
-        if (response.data.token && response.data.user) {
-          setSession(response.data);
-        } else {
-          const { token, ...userData } = response.data;
-
-          const loginData = {
-            token,
-            userData,
-          };
-          setSession(loginData);
-        }
-
-        navigate(0);
-      },
-      onError: (error) => {
-        const errorMessage = error?.response?.data?.message;
-
-        if (errorMessage === 'Account not active, please verify your email') {
-          toast.error('Akun belum aktif, silakan verifikasi email Anda');
-          openVerifyModal(data.email);
-        } else {
-          toast.error(errorMessage ?? 'Terjadi Kesalahan yang tidak diketahui');
-          clearSession();
-        }
-      },
     });
   });
 
   return {
     form,
     onSubmit,
-    isLoading: isPending,
-    showVerifyModal,
-    verifyForm,
-    onVerifySubmit,
-    closeVerifyModal,
-    isVerifying,
-    emailToVerify,
   };
 };

apps/gacha/src/app/_hooks/use-register.ts

@@ -1,25 +1,17 @@
 import { useForm } from 'react-hook-form';
 import {
   authRegisterSchema,
+  stepOneRegisterSchema,
   TRegisterRequest,
   usePostRegister,
 } from '@imphnen-frontend-service/service';
+import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { toast } from 'sonner';
-import { useVerifyEmail } from './use-verify-email';
+import { useEffect, useState } from 'react';
 
 export const useRegister = () => {
   const postRegister = usePostRegister();
-  const {
-    verifyForm,
-    onVerifySubmit,
-    showVerifyModal,
-    openVerifyModal,
-    closeVerifyModal,
-    isVerifying,
-    emailToVerify,
-  } = useVerifyEmail();
-
   const form = useForm<TRegisterRequest>({
     resolver: zodResolver(authRegisterSchema),
     mode: 'all',
@@ -29,28 +21,38 @@ export const useRegister = () => {
       password: '',
       confirm_password: '',
       phone_number: '',
+      referral_code: '',
+      referred_by: '',
+      student_type: '',
     },
   });
 
+  const [stepValid, setStepValid] = useState(false);
+
+  useEffect(() => {
+    const subscription = form.watch(() => {
+      const { fullname, email, password, confirm_password } = form.getValues();
+      const valid = stepOneRegisterSchema.safeParse({
+        fullname,
+        email,
+        password,
+        confirm_password,
+      }).success;
+      setStepValid(valid);
+    });
+    return () => subscription.unsubscribe();
+  }, [form]);
+
   const onSubmit = form.handleSubmit((data) => {
     postRegister.mutate(data, {
-      onSuccess: () => {
+      onSuccess: (data) => toast.success(data.message),
-        toast.success('Registrasi sukses. Silakan verifikasi email Anda.');
+      onError: (error) => toast.error(error.message),
-        openVerifyModal(data.email);
-      },
-      onError: (error) => toast.error(error.message || 'Registrasi gagal'),
     });
   });
 
   return {
     form,
-    verifyForm,
     onSubmit,
-    onVerifySubmit,
+    isStepOneValid: stepValid,
-    showVerifyModal,
-    closeVerifyModal,
-    isVerifying,
-    isRegistering: postRegister.isPending,
-    registeredEmail: emailToVerify,
   };
 };

apps/gacha/src/app/_hooks/use-verify-email.ts

@@ -1,62 +0,0 @@
-import { useForm } from 'react-hook-form';
-import {
-  TVerifyEmailRequest,
-  usePostVerifyEmail,
-} from '@imphnen-frontend-service/service';
-import { toast } from 'sonner';
-import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-
-export const useVerifyEmail = () => {
-  const [showVerifyModal, setShowVerifyModal] = useState(false);
-  const [emailToVerify, setEmailToVerify] = useState('');
-  const navigate = useNavigate();
-
-  const postVerifyEmail = usePostVerifyEmail();
-
-  const verifyForm = useForm<{ otp: string }>({
-    mode: 'all',
-    defaultValues: {
-      otp: '',
-    },
-  });
-
-  const onVerifySubmit = verifyForm.handleSubmit((data) => {
-    const otpNumber = data.otp;
-
-    const verifyData: TVerifyEmailRequest = {
-      email: emailToVerify,
-      otp: otpNumber,
-    };
-
-    postVerifyEmail.mutate(verifyData, {
-      onSuccess: () => {
-        toast.success('Verifikasi email sukses');
-
-        navigate(0);
-      },
-      onError: (error) =>
-        toast.error(error.message || 'Verifikasi email gagal'),
-    });
-  });
-
-  const openVerifyModal = (email: string) => {
-    setEmailToVerify(email);
-    setShowVerifyModal(true);
-  };
-
-  const closeVerifyModal = () => {
-    setShowVerifyModal(false);
-    verifyForm.reset();
-  };
-
-  return {
-    verifyForm,
-    onVerifySubmit,
-    showVerifyModal,
-    openVerifyModal,
-    closeVerifyModal,
-    isVerifying: postVerifyEmail.isPending,
-    emailToVerify,
-  };
-};

apps/gacha/src/app/page.tsx

@@ -66,15 +66,11 @@ export const Components: FC = (): ReactElement => {
         <div className="order-1 lg:order-none flex flex-col col-span-4 justify-center items-center mb-8 relative">
           <div className="relative h-[150px] md:h-[230px]">
             <img
-              width={400}
-              height={400}
               src="/merch/1.png"
               alt="Merch 1"
               className="relative top-[3px] md:top-[6px] left-[4px] md:left-[7px] z-10 w-[165px] md:w-[266px]"
             />
             <img
-              width={400}
-              height={400}
               className="absolute top-0 left-0 min-w-[174px] md:min-w-[280px] z-0"
               src="/merch/Vector-1.svg"
               alt=""
@@ -92,7 +88,7 @@ export const Components: FC = (): ReactElement => {
             ~ 175k ~
           </div>
         </div>
-        <div className="order-2 flex flex-col col-span-4 justify-center items-center mb-8 relative">
+        <div className="order-2 flex flex-col col-span-4 justify-center items-center mb-8 relative overflow-hidden">
           <div className="relative h-[130px] md:h-[230px]">
             <img
               width={400}
@@ -109,6 +105,8 @@ export const Components: FC = (): ReactElement => {
               alt="Merch 3"
             />
             <img
+              width={400}
+              height={400}
               className="absolute hidden lg:block -bottom-[100px] -left-[55px]"
               src="/landing-arrow-2.svg"
               alt="Merch 1"

apps/gacha/src/main.tsx

@@ -35,7 +35,7 @@ if (!rootElement) throw new Error('Failed to find the root element');
 createRoot(rootElement).render(
   <StrictMode>
     <QueryProvider>
-      <Toaster position="top-right"/>
+      <Toaster />
       <RouterProvider router={router} />
     </QueryProvider>
   </StrictMode>

apps/gacha/src/middleware.ts

@@ -1,15 +1,11 @@
-// import { SessionToken, SessionUser } from '@imphnen-frontend-service/utils';
+import { LoaderFunctionArgs } from 'react-router-dom';
-import { LoaderFunctionArgs } from 'react-router';
-
-// const mappingPublicRoutes = ['/'];
-
-// const mappingRoutePermissions = [
-//   {
-//     path: '/',
-//     permissions: [],
-//   },
-// ];
 
 export const middleware = async ({ request }: LoaderFunctionArgs) => {
+  const url = new URL(request.url);
+
+  const pathname = url.pathname;
+
+  if (pathname) return null;
+
   return null;
 };

apps/landing/.env.example

@@ -1,4 +0,0 @@
-NEXT_PUBLIC_API_URL=
-
-TURNSTILE_SECRET_KEY=
-NEXT_PUBLIC_TURNSTILE_SITEKEY=

apps/landing/next.config.js

@@ -1,8 +1,15 @@
 const { composePlugins, withNx } = require('@nx/next');
+const { withPayload } = require('@payloadcms/next/withPayload');
 
 /** @type {import('@nx/next/plugins/with-nx').WithNxOptions} */
 const nextConfig = {
   nx: { svgr: false },
+  sassOptions: {
+    quietDeps: true,
+    logger: {
+      warn: () => {},
+    },
+  },
 };
 
-module.exports = composePlugins(withNx)(nextConfig);
+module.exports = composePlugins(withNx, withPayload)(nextConfig);

apps/landing/src/app/(auth)/_http/fetch-post-verify-turnstile.ts

@@ -1,41 +0,0 @@
-export async function fetchPostverifyTurnstile(
-  token: string,
-  remoteIp?: string
-): Promise<boolean> {
-  const url = 'https://challenges.cloudflare.com/turnstile/v0/siteverify';
-  const params = new URLSearchParams({
-    secret: String(process.env.TURNSTILE_SECRET_KEY),
-    response: token,
-  });
-  if (remoteIp) {
-    params.append('remoteip', remoteIp);
-  }
-
-  const res = await fetch(url, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-    },
-    body: params.toString(),
-  });
-
-  if (!res.ok) {
-    console.error('Turnstile verify HTTP error', res.status);
-    return false;
-  }
-
-  const data = (await res.json()) as TurnstileVerifyResponse;
-  if (!data.success) {
-    console.warn('Turnstile failure', data['error-codes']);
-    return false;
-  }
-
-  return true;
-}
-
-interface TurnstileVerifyResponse {
-  success: boolean;
-  challenge_ts: string;
-  hostname: string;
-  'error-codes'?: string[];
-}

apps/landing/src/app/(auth)/forgot-password/_actions/forgot-password-action.ts

@@ -1,33 +0,0 @@
-'use server';
-
-import { fetcher } from '@/lib/fetcher';
-import { getRemoteIp } from '@/lib/headers';
-import { fetchPostverifyTurnstile } from '../../_http/fetch-post-verify-turnstile';
-import {
-  forgotPasswordValidationSchema,
-  ForgotPasswordValidationType,
-} from '../_validation/forgot-password-validation';
-
-export async function ForgotPasswordAction(
-  request: ForgotPasswordValidationType
-) {
-  const validRequest = forgotPasswordValidationSchema.parse(request);
-  const remoteIp = await getRemoteIp();
-
-  const isCapchaValid = await fetchPostverifyTurnstile(
-    validRequest.token,
-    remoteIp
-  );
-
-  if (!isCapchaValid) throw new Error('Failed to verify captcha');
-
-  const { data, error } = await fetcher.POST('/v1/auth/forgot', {
-    body: {
-      email: validRequest.email,
-    },
-  });
-
-  if (error) throw new Error(error.message);
-
-  return data;
-}

apps/landing/src/app/(auth)/forgot-password/_components/forgot-password-form.tsx

@@ -1,98 +0,0 @@
-'use client';
-
-import {
-  Button,
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-  Input,
-} from '@components';
-import { Turnstile, TurnstileInstance } from '@marsidev/react-turnstile';
-import { useRef, useState } from 'react';
-import { LuLoader } from 'react-icons/lu';
-import { useFormForgotPassword } from '../_hooks/use-form-forgot-password';
-import { usePostForgotPassowrd } from '../_hooks/use-post-forgot-password';
-import { ForgotPasswordValidationType } from '../_validation/forgot-password-validation';
-
-export function ForgotPasswordForm() {
-  const ref = useRef<TurnstileInstance | null>(null);
-
-  const [step, setStep] = useState<number>(1);
-  const [emailValue, setEmailValue] = useState<string>('');
-
-  const form = useFormForgotPassword();
-  const { mutate, isPending, error } = usePostForgotPassowrd(form);
-
-  const handleFirstStep = (values: ForgotPasswordValidationType) => {
-    setEmailValue(values.email);
-    setStep(2);
-  };
-
-  const handleSecondStep = () => {
-    mutate({ email: emailValue, token: form.getValues('token') });
-  };
-
-  return (
-    <Form {...form}>
-      <form
-        onSubmit={
-          step === 1
-            ? form.handleSubmit(handleFirstStep)
-            : (e) => {
-                e.preventDefault();
-                handleSecondStep();
-              }
-        }
-        className="w-full space-y-4"
-      >
-        {error && (
-          <div className="p-2 text-xs bg-red-50 border border-red-200 text-red-800 rounded-sm">
-            {(error as Error).message}
-          </div>
-        )}
-
-        {step === 1 && (
-          <FormField
-            control={form.control}
-            name="email"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>Email</FormLabel>
-                <FormControl>
-                  <Input placeholder="emailmu@mail.com" {...field} />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        )}
-
-        {step === 2 && (
-          <Turnstile
-            ref={ref}
-            siteKey={String(process.env.NEXT_PUBLIC_TURNSTILE_SITEKEY)}
-            onSuccess={(token) => form.setValue('token', token)}
-            options={{ theme: 'light', size: 'flexible', language: 'id' }}
-          />
-        )}
-
-        <Button
-          type="submit"
-          disabled={isPending || (step === 2 && !form.watch('token'))}
-          className="w-full hover:bg-[#5fbaef] bg-[#22a5f1] font-bold"
-        >
-          {isPending ? (
-            <LuLoader className="h-5 w-5 animate-spin" />
-          ) : step === 1 ? (
-            'Selanjutnya'
-          ) : (
-            'Reset password'
-          )}
-        </Button>
-      </form>
-    </Form>
-  );
-}

apps/landing/src/app/(auth)/forgot-password/_hooks/use-form-forgot-password.ts

@@ -1,16 +0,0 @@
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import {
-  forgotPasswordValidationSchema,
-  type ForgotPasswordValidationType,
-} from '../_validation/forgot-password-validation';
-
-export function useFormForgotPassword() {
-  return useForm<ForgotPasswordValidationType>({
-    resolver: zodResolver(forgotPasswordValidationSchema),
-    defaultValues: {
-      email: '',
-      token: '',
-    },
-  });
-}

apps/landing/src/app/(auth)/forgot-password/_hooks/use-post-forgot-password.ts

@@ -1,20 +0,0 @@
-import { useMutation } from '@tanstack/react-query';
-import { toast } from 'sonner';
-import { ForgotPasswordAction } from '../_actions/forgot-password-action';
-import { useFormForgotPassword } from './use-form-forgot-password';
-
-export function usePostForgotPassowrd(
-  form: ReturnType<typeof useFormForgotPassword>
-) {
-  return useMutation({
-    mutationFn: ForgotPasswordAction,
-    onSuccess: ({ message }) => {
-      form.reset();
-      toast.success(message);
-    },
-    onError: ({ message }) => {
-      form.reset();
-      toast.error(message);
-    },
-  });
-}

apps/landing/src/app/(auth)/forgot-password/_validation/forgot-password-validation.ts

@@ -1,9 +0,0 @@
-import { z } from 'zod';
-
-export const forgotPasswordValidationSchema = z.object({
-  email: z.string().email({ message: 'Format email tidak valid' }),
-  token: z.string(),
-});
-export type ForgotPasswordValidationType = z.infer<
-  typeof forgotPasswordValidationSchema
->;

apps/landing/src/app/(auth)/forgot-password/page.tsx

@@ -1,23 +0,0 @@
-import { LogoSimple } from '@/app/_components/logo';
-import { Metadata } from 'next';
-import { ForgotPasswordForm } from './_components/forgot-password-form';
-
-export const metadata: Metadata = {
-  title: 'IMPHNEN - Signin',
-};
-
-export default function Page() {
-  return (
-    <>
-      <div className="flex flex-col items-center gap-4">
-        <LogoSimple />
-
-        <p className="text-muted-foreground text-center text-sm sm:text-base">
-          Reset password akunmu
-        </p>
-
-        <ForgotPasswordForm />
-      </div>
-    </>
-  );
-}

apps/landing/src/app/(auth)/reset-password/_actions/reset-password-actions.ts

@@ -1,28 +0,0 @@
-'use server';
-
-import { fetcher } from '@/lib/fetcher';
-import {
-  resetPasswordValidationSchema,
-  ResetPasswordValidationSchema,
-} from '../_validation/reset-password-validation';
-
-export async function resetPasswordAction(
-  request: ResetPasswordValidationSchema
-) {
-  const validRequest = resetPasswordValidationSchema.parse(request);
-
-  if (validRequest.confirm_password !== validRequest.confirm_password) {
-    throw new Error('Password missmatch');
-  }
-
-  const { data, error } = await fetcher.POST('/v1/auth/new-password', {
-    body: {
-      password: validRequest.password,
-      token: validRequest.token,
-    },
-  });
-
-  if (error) throw new Error(error.message);
-
-  return data;
-}

apps/landing/src/app/(auth)/reset-password/_components/reset-password-form.tsx

@@ -1,73 +0,0 @@
-'use client';
-
-import {
-  Button,
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-  Input,
-} from '@components';
-import { LuLoaderCircle } from 'react-icons/lu';
-import { usePostResetPassword } from '../_hooks/use-post-reset-password';
-import { useResetPasswordForm } from '../_hooks/use-reset-password-form';
-import { ResetPasswordValidationSchema } from '../_validation/reset-password-validation';
-
-export function ResetPasswordForm() {
-  const form = useResetPasswordForm();
-  const { mutate, error, isPending } = usePostResetPassword(form);
-
-  const onSubmit = (values: ResetPasswordValidationSchema) => {
-    mutate(values);
-  };
-
-  return (
-    <Form {...form}>
-      {error && (
-        <div className="p-2 text-xs bg-red-50 border border-red-200 text-red-800 rounded-sm w-full">
-          {(error as Error).message}
-        </div>
-      )}
-
-      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4 w-full">
-        <FormField
-          control={form.control}
-          name="password"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>New Password</FormLabel>
-              <FormControl>
-                <Input type="password" placeholder="••••••••" {...field} />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-
-        <FormField
-          control={form.control}
-          name="confirm_password"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>Confirm New Password</FormLabel>
-              <FormControl>
-                <Input type="password" placeholder="••••••••" {...field} />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-
-        <Button type="submit" className="w-full" disabled={isPending}>
-          {isPending ? (
-            <LuLoaderCircle className="size-5 animate-spin" />
-          ) : (
-            'Ubah password'
-          )}
-        </Button>
-      </form>
-    </Form>
-  );
-}

apps/landing/src/app/(auth)/reset-password/_hooks/use-post-reset-password.ts

@@ -1,24 +0,0 @@
-import { useMutation } from '@tanstack/react-query';
-import { useRouter } from 'next/navigation';
-import { toast } from 'sonner';
-import { resetPasswordAction } from '../_actions/reset-password-actions';
-import { useResetPasswordForm } from './use-reset-password-form';
-
-export function usePostResetPassword(
-  form: ReturnType<typeof useResetPasswordForm>
-) {
-  const router = useRouter();
-
-  return useMutation({
-    mutationFn: resetPasswordAction,
-    onSuccess: ({ message }) => {
-      form.reset();
-      router.replace('/signin');
-      toast.success(message);
-    },
-    onError: ({ message }) => {
-      form.reset();
-      toast.error(message);
-    },
-  });
-}

apps/landing/src/app/(auth)/reset-password/_hooks/use-reset-password-form.ts

@@ -1,22 +0,0 @@
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useSearchParams } from 'next/navigation';
-import { useForm } from 'react-hook-form';
-
-import {
-  resetPasswordValidationSchema,
-  ResetPasswordValidationSchema,
-} from '../_validation/reset-password-validation';
-
-export function useResetPasswordForm() {
-  const searchParams = useSearchParams();
-  const tokenFromQuery = searchParams.get('token') ?? '';
-
-  return useForm<ResetPasswordValidationSchema>({
-    resolver: zodResolver(resetPasswordValidationSchema),
-    defaultValues: {
-      password: '',
-      confirm_password: '',
-      token: tokenFromQuery,
-    },
-  });
-}

apps/landing/src/app/(auth)/reset-password/_validation/reset-password-validation.ts

@@ -1,31 +0,0 @@
-import { z } from 'zod';
-
-export const resetPasswordValidationSchema = z
-  .object({
-    password: z
-      .string({
-        required_error: 'Password tidak boleh kosong',
-        invalid_type_error: 'Password harus berupa string',
-      })
-      .min(8, 'Password harus minimal 8 karakter')
-      .max(50, 'Password tidak boleh lebih dari 50 karakter')
-      .regex(
-        /^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*\W).+$/,
-        'Password harus mengandung setidaknya satu huruf kapital, satu huruf kecil, satu angka, dan satu karakter spesial'
-      ),
-    confirm_password: z
-      .string({
-        required_error: 'Konfirmasi password tidak boleh kosong',
-      })
-      .min(8, 'Konfirmasi password harus minimal 8 karakter')
-      .max(50, 'Konfirmasi password tidak boleh lebih dari 50 karakter'),
-    token: z.string(),
-  })
-  .refine((data) => data.password === data.confirm_password, {
-    message: 'Password dan Konfirmasi Password harus sama',
-    path: ['confirm_password'],
-  });
-
-export type ResetPasswordValidationSchema = z.infer<
-  typeof resetPasswordValidationSchema
->;

apps/landing/src/app/(auth)/reset-password/page.tsx

@@ -1,30 +0,0 @@
-import { LogoSimple } from '@/app/_components/logo';
-import { redirect } from 'next/navigation';
-import { use } from 'react';
-import { ResetPasswordForm } from './_components/reset-password-form';
-
-export const dynamic = 'force-dynamic';
-
-export default function Page({
-  searchParams,
-}: {
-  searchParams: Promise<{ token?: string }>;
-}) {
-  const { token } = use(searchParams);
-
-  if (!token) redirect('/signin');
-
-  return (
-    <>
-      <div className="flex flex-col items-center gap-4">
-        <LogoSimple />
-
-        <p className="text-muted-foreground text-center text-sm sm:text-base">
-          Ubah passwordmu
-        </p>
-
-        <ResetPasswordForm />
-      </div>
-    </>
-  );
-}

apps/landing/src/app/(auth)/signup/_actions/signup-action.ts

@@ -1,25 +0,0 @@
-'use server';
-
-import { getRemoteIp } from '@/lib/headers';
-import { z } from 'zod';
-import { fetchPostverifyTurnstile } from '../../_http/fetch-post-verify-turnstile';
-import { fetchPostSignin } from '../_http/fetch-post-signup';
-import { signupValidationSchema } from '../_validation/signup-validation';
-
-export async function SignupAction(
-  request: z.infer<typeof signupValidationSchema>
-) {
-  const validRequest = signupValidationSchema.parse(request);
-  const remoteIp = await getRemoteIp();
-
-  const isCapchaValid = await fetchPostverifyTurnstile(
-    validRequest.token,
-    remoteIp
-  );
-
-  if (!isCapchaValid) throw new Error('Failed to verify captcha');
-
-  const data = await fetchPostSignin(validRequest);
-
-  return data;
-}

apps/landing/src/app/(auth)/signup/page.tsx

@@ -1,36 +0,0 @@
-import { LogoSimple } from '@/app/_components/logo';
-import { Metadata } from 'next';
-import Link from 'next/link';
-import { SignupForm } from './_components/signup-form';
-
-export const metadata: Metadata = {
-  title: 'IMPHNEN - Signup',
-};
-
-export default function Page() {
-  return (
-    <>
-      <div className="flex flex-col items-center gap-4">
-        <LogoSimple />
-
-        <p className="text-muted-foreground text-center text-sm sm:text-base">
-          Buat akunmu sekarang
-        </p>
-      </div>
-
-      <SignupForm />
-
-      <div className="w-full space-y-4">
-        <p className="text-muted-foreground px-4 text-center text-xs leading-5 text-balance sm:text-sm">
-          Sudah punya akun?{' '}
-          <Link
-            href="/signin"
-            className="font-bold hover:underline hover:underline-offset-4 transition-colors text-primary-500"
-          >
-            Masuk
-          </Link>
-        </p>
-      </div>
-    </>
-  );
-}

apps/landing/src/app/(auth)/verification/_actions/resend-otp-action.ts

@@ -1,31 +0,0 @@
-'use server';
-
-import { fetcher } from '@/lib/fetcher';
-import { getRemoteIp } from '@/lib/headers';
-import { fetchPostverifyTurnstile } from '../../_http/fetch-post-verify-turnstile';
-import {
-  resendOTPValidationSchema,
-  type ResendOTPValidationType,
-} from '../_validation/resend-otp-validation';
-
-export async function resendOTPAction(request: ResendOTPValidationType) {
-  const validRequest = resendOTPValidationSchema.parse(request);
-  const remoteIp = await getRemoteIp();
-
-  const isCapchaValid = await fetchPostverifyTurnstile(
-    validRequest.token,
-    remoteIp
-  );
-
-  if (!isCapchaValid) throw new Error('Failed to verify captcha');
-
-  const { data, error } = await fetcher.POST('/v1/auth/send-otp', {
-    body: {
-      email: validRequest.email,
-    },
-  });
-
-  if (error) throw new Error(error.message);
-
-  return data;
-}

apps/landing/src/app/(auth)/verification/_components/resend-otp-form.tsx

@@ -1,74 +0,0 @@
-'use client';
-
-import {
-  Button,
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-  Input,
-} from '@components';
-import { Turnstile, TurnstileInstance } from '@marsidev/react-turnstile';
-import { useRef } from 'react';
-import { useFormResendOTP } from '../_hooks/use-form-resend-otp';
-import { usePostResendOTP } from '../_hooks/use-post-resend-otp';
-import { ResendOTPValidationType } from '../_validation/resend-otp-validation';
-
-export function ResendOTPForm() {
-  const ref = useRef<TurnstileInstance | null>(null);
-
-  const form = useFormResendOTP();
-
-  const { mutate, isPending, error } = usePostResendOTP(form);
-
-  const onSubmit = (values: ResendOTPValidationType) => {
-    mutate(values);
-  };
-
-  return (
-    <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-        {error && (
-          <div className="p-2 text-xs bg-red-50 border border-red-200 text-red-800 rounded-sm">
-            {(error as Error).message}
-          </div>
-        )}
-
-        <FormField
-          control={form.control}
-          name="email"
-          render={({ field }) => (
-            <FormItem>
-              <FormLabel>Email</FormLabel>
-              <FormControl>
-                <Input placeholder="emailmu@mail.com" {...field} />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-
-        <Turnstile
-          ref={ref}
-          siteKey={String(process.env.NEXT_PUBLIC_TURNSTILE_SITEKEY)}
-          onSuccess={(token) => form.setValue('token', token)}
-          options={{
-            theme: 'light',
-            size: 'flexible',
-            language: 'id',
-          }}
-        />
-
-        <Button
-          type="submit"
-          className="w-full"
-          disabled={isPending || !form.watch('token')}
-        >
-          Kirim Ulang Kode OTP
-        </Button>
-      </form>
-    </Form>
-  );
-}

apps/landing/src/app/(auth)/verification/_components/verification-tabs.tsx

@@ -1,41 +0,0 @@
-'use client';
-
-import { cn } from '@utils';
-import { useState } from 'react';
-import { ResendOTPForm } from './resend-otp-form';
-import { VerifyEmailForm } from './verify-email-form';
-
-export function VerificationTabs() {
-  const [activeTab, setActiveTab] = useState<'form' | 'resend'>('form');
-
-  return (
-    <>
-      <div className="flex space-x-2 border-b">
-        <button
-          className={cn(
-            'py-2 px-4 w-full',
-            activeTab === 'form'
-              ? 'border-b-2 border-primary-500 font-semibold'
-              : 'text-gray-500'
-          )}
-          onClick={() => setActiveTab('form')}
-        >
-          Verifikasi Email
-        </button>
-        <button
-          className={cn(
-            'py-2 px-4 w-full',
-            activeTab === 'resend'
-              ? 'border-b-2 border-primary-500 font-semibold'
-              : 'text-gray-500'
-          )}
-          onClick={() => setActiveTab('resend')}
-        >
-          Resend OTP
-        </button>
-      </div>
-
-      {activeTab === 'form' ? <VerifyEmailForm /> : <ResendOTPForm />}
-    </>
-  );
-}

apps/landing/src/app/(auth)/verification/_hooks/use-form-resend-otp.ts

@@ -1,20 +0,0 @@
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useSearchParams } from 'next/navigation';
-import { useForm } from 'react-hook-form';
-import {
-  resendOTPValidationSchema,
-  type ResendOTPValidationType,
-} from '../_validation/resend-otp-validation';
-
-export function useFormResendOTP() {
-  const searchParams = useSearchParams();
-  const email = searchParams.get('ref');
-
-  return useForm<ResendOTPValidationType>({
-    resolver: zodResolver(resendOTPValidationSchema),
-    defaultValues: {
-      email: email ?? '',
-      token: '',
-    },
-  });
-}

apps/landing/src/app/(auth)/verification/_hooks/use-post-resend-otp.ts

@@ -1,18 +0,0 @@
-import { useMutation } from '@tanstack/react-query';
-import { toast } from 'sonner';
-import { resendOTPAction } from '../_actions/resend-otp-action';
-import { useFormResendOTP } from './use-form-resend-otp';
-
-export function usePostResendOTP(form: ReturnType<typeof useFormResendOTP>) {
-  return useMutation({
-    mutationFn: resendOTPAction,
-    onSuccess: ({ message }) => {
-      form.reset();
-      toast.success(message);
-    },
-    onError: ({ message }) => {
-      form.reset();
-      toast.error(message);
-    },
-  });
-}

apps/landing/src/app/(auth)/verification/_validation/resend-otp-validation.ts

@@ -1,7 +0,0 @@
-import { z } from 'zod';
-
-export const resendOTPValidationSchema = z.object({
-  email: z.string().email({ message: 'Format email tidak valid' }),
-  token: z.string().min(1, { message: 'OTP harus terdiri dari 1 digit' }),
-});
-export type ResendOTPValidationType = z.infer<typeof resendOTPValidationSchema>;

apps/landing/src/app/(frontend)/(auth)/layout.tsx

@@ -1,18 +1,12 @@
-import { baiJamjureeFont } from '@/lib/fonts';
+import { Card } from '@components/atoms';
-import { Card } from '@components';
-import { cn } from '@utils';
 import { ReactNode } from 'react';
 import { AnimatedBackground } from './_components/animated-background';
 
 export default function Layout({ children }: { children: ReactNode }) {
   return (
-    <div
+    <div className="bg-background/20 relative flex min-h-[100dvh] items-center justify-center p-4">
-      className={cn(
-        baiJamjureeFont.className,
-        'bg-background/20 relative flex min-h-[100dvh] items-center justify-center p-4'
-      )}
-    >
       <AnimatedBackground />
+
       <div className="z-10 w-full">
         <Card className="bg-background/90 mx-auto w-full max-w-[360px] p-6 shadow-xl backdrop-blur-lg sm:max-w-md sm:p-8">
           <div className="flex flex-col items-center space-y-6">

apps/landing/src/app/(frontend)/(auth)/signin/_actions/signin-action.ts

@@ -8,6 +8,8 @@ import {
 } from '../_validation/signin-validation';
 
 export async function SigninAction(request: SignInValidationType) {
+  console.log(request);
+
   const validRequest = signInValidationSchema.parse(request);
 
   const { data } = await fetchPostSignin(validRequest);

apps/landing/src/app/(frontend)/(auth)/signin/_components/signin-form.tsx

@@ -9,8 +9,7 @@ import {
   FormLabel,
   FormMessage,
   Input,
-} from '@components';
+} from '@components/atoms';
-import Link from 'next/link';
 import { LuLoader } from 'react-icons/lu';
 import { useFormSignin } from '../_hooks/use-form-signin';
 import { usePostSignin } from '../_hooks/use-post-signin';
@@ -57,19 +56,15 @@ export function SigninForm() {
                 <Input type="password" placeholder="••••••••" {...field} />
               </FormControl>
               <FormMessage />
-              <div className="text-right mt-1">
-                <Link
-                  href="/forgot-password"
-                  className="text-sm text-primary-500 font-bold hover:underline"
-                >
-                  Lupa Password?
-                </Link>
-              </div>
             </FormItem>
           )}
         />
 
-        <Button type="submit" disabled={isPending} className="w-full font-bold">
+        <Button
+          type="submit"
+          disabled={isPending}
+          className="w-full hover:bg-[#5fbaef] bg-[#22a5f1] font-bold"
+        >
           {isPending ? <LuLoader className="h-5 w-5 animate-spin" /> : 'Masuk'}
         </Button>
       </form>

apps/landing/src/app/(frontend)/(auth)/signin/_hooks/use-post-signin.ts

@@ -1,6 +1,5 @@
 import { useMutation } from '@tanstack/react-query';
 import { useRouter } from 'next/navigation';
-import { toast } from 'sonner';
 import { SigninAction } from '../_actions/signin-action';
 import { useFormSignin } from './use-form-signin';
 
@@ -9,20 +8,11 @@ export function usePostSignin(form: ReturnType<typeof useFormSignin>) {
 
   return useMutation({
     mutationFn: SigninAction,
-
     onSuccess: () => {
       router.push('/');
     },
-    onError: (error, variables) => {
+    onError: () => {
       form.resetField('password');
-
-      if (error.message.includes('not active')) {
-        setTimeout(() => {
-          router.push(`/verification?ref=${variables.email}`);
-        }, 750);
-      }
-
-      toast.error(error.message);
     },
   });
 }

apps/landing/src/app/(frontend)/(auth)/signin/_http/fetch-post-signin.ts

@@ -1,4 +1,4 @@
-import { fetcher } from '@/lib/fetcher';
+import { fetcher } from '@/lib/openapi';
 import { SignInValidationType } from '../_validation/signin-validation';
 
 export async function fetchPostSignin({

apps/landing/src/app/(frontend)/(auth)/signin/page.tsx

@@ -1,10 +1,12 @@
-import { LogoSimple } from '@/app/_components/logo';
 import { Metadata } from 'next';
 import Link from 'next/link';
+import { LogoSimple } from '../../_components/logo';
 import { SigninForm } from './_components/signin-form';
 
 export const metadata: Metadata = {
   title: 'IMPHNEN - Signin',
+  description:
+    'Komunitas Ingin Menjadi Programmer Handal Namung Enggan Ngonding',
 };
 
 export default function Page() {
@@ -25,7 +27,7 @@ export default function Page() {
           Belum punya akun?{' '}
           <Link
             href="/signup"
-            className="font-bold hover:underline hover:underline-offset-4 transition-colors text-primary-500"
+            className="text-[#22a5f1] font-bold hover:underline hover:underline-offset-4 transition-colors"
           >
             Daftar
           </Link>

apps/landing/src/app/(frontend)/(auth)/signup/_actions/signup-action.ts

@@ -0,0 +1,15 @@
+'use server';
+
+import { z } from 'zod';
+import { fetchPostSignin } from '../_http/fetch-post-signup';
+import { signupValidationSchema } from '../_validation/signup-validation';
+
+export async function SignupAction(
+  request: z.infer<typeof signupValidationSchema>
+) {
+  const validRequest = signupValidationSchema.parse(request);
+
+  const data = await fetchPostSignin({ ...validRequest });
+
+  return data;
+}

apps/landing/src/app/(frontend)/(auth)/signup/_components/signup-form.tsx

@@ -9,12 +9,12 @@ import {
   FormLabel,
   FormMessage,
   Input,
-} from '@components';
+} from '@components/atoms';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Turnstile, TurnstileInstance } from '@marsidev/react-turnstile';
+import { Turnstile } from '@marsidev/react-turnstile';
 import { useMutation } from '@tanstack/react-query';
 import { useRouter } from 'next/navigation';
-import { useRef, useState } from 'react';
+import { useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { LuLoader } from 'react-icons/lu';
 import { z } from 'zod';
@@ -27,31 +27,11 @@ import {
 
 export function SignupForm() {
   const router = useRouter();
-  const ref = useRef<TurnstileInstance | null>(null);
-
   const [step, setStep] = useState(1);
   const [stepOneData, setStepOneData] = useState<z.infer<
     typeof stepOneSignupValidationSchema
   > | null>(null);
 
-  const firstForm = useForm<z.infer<typeof stepOneSignupValidationSchema>>({
-    resolver: zodResolver(stepOneSignupValidationSchema),
-    defaultValues: {
-      email: '',
-      phone_number: '',
-      fullname: '',
-      password: '',
-      confirm_password: '',
-    },
-  });
-
-  const secondForm = useForm<z.infer<typeof stepTwoSignupValidationSchema>>({
-    resolver: zodResolver(stepTwoSignupValidationSchema),
-    defaultValues: {
-      token: '',
-    },
-  });
-
   const { mutate, isPending, error } = useMutation({
     mutationFn: async (data: z.infer<typeof signupValidationSchema>) => {
       const result = await SignupAction(data);
@@ -65,8 +45,28 @@ export function SignupForm() {
       router.push(`/verification?ref=${email}`);
     },
     onError: () => {
-      ref.current?.reset();
+      secondForm.reset();
-      secondForm.resetField('token');
+    },
+  });
+
+  const firstForm = useForm<z.infer<typeof stepOneSignupValidationSchema>>({
+    resolver: zodResolver(stepOneSignupValidationSchema),
+    defaultValues: {
+      email: '',
+      fullname: '',
+      password: '',
+      confirm_password: '',
+    },
+  });
+
+  const secondForm = useForm<z.infer<typeof stepTwoSignupValidationSchema>>({
+    resolver: zodResolver(stepTwoSignupValidationSchema),
+    defaultValues: {
+      phone_number: '',
+      referral_code: '',
+      referred_by: '',
+      student_type: '',
+      token: '',
     },
   });
 
@@ -121,20 +121,6 @@ export function SignupForm() {
               )}
             />
 
-            <FormField
-              control={firstForm.control}
-              name="phone_number"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Nomor Telepon</FormLabel>
-                  <FormControl>
-                    <Input placeholder="08123456789" {...field} />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
             <FormField
               control={firstForm.control}
               name="password"
@@ -185,9 +171,66 @@ export function SignupForm() {
               </div>
             )}
 
+            <FormField
+              control={secondForm.control}
+              name="phone_number"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Nomor Telepon</FormLabel>
+                  <FormControl>
+                    <Input placeholder="081234567890" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <div className="flex gap-x-4">
+              <FormField
+                control={secondForm.control}
+                name="referral_code"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Kode Referral</FormLabel>
+                    <FormControl>
+                      <Input placeholder="ABCD" maxLength={4} {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={secondForm.control}
+                name="referred_by"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Referrer</FormLabel>
+                    <FormControl>
+                      <Input placeholder="Referral ID" {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+
+            <FormField
+              control={secondForm.control}
+              name="student_type"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Status</FormLabel>
+                  <FormControl>
+                    <Input placeholder="e.g., Undergraduate" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
             <Turnstile
-              ref={ref}
+              siteKey="1x00000000000000000000AA"
-              siteKey={String(process.env.NEXT_PUBLIC_TURNSTILE_SITEKEY)}
               onSuccess={(token) => secondForm.setValue('token', token)}
               options={{
                 theme: 'light',
@@ -207,6 +250,7 @@ export function SignupForm() {
               <Button
                 type="submit"
                 disabled={isPending || !secondForm.watch('token')}
+                className="flex items-center gap-2 hover:bg-[#5fbaef] bg-[#22a5f1]"
               >
                 {isPending ? (
                   <LuLoader className="h-5 w-5 animate-spin" />