chore: remove pnpm, accidentally added out of habit

.env.example

@@ -0,0 +1 @@
+VITE_API_URL=https://api.example.com

.github/workflows/test-build.yml

@@ -24,14 +24,5 @@ jobs:
       - name: Install dependencies
         run: npm install
 
-      - name: Set env vars
-        run: |
-          echo "CMS_SECRET=${{ secrets.CMS_SECRET }}" >> $GITHUB_ENV
-          echo "CMS_STORAGE_REGION=${{ secrets.CMS_STORAGE_REGION }}" >> $GITHUB_ENV
-          echo "CMS_STORAGE_ENDPOINT=${{ secrets.CMS_STORAGE_ENDPOINT }}" >> $GITHUB_ENV
-          echo "CMS_STORAGE_ACCESS_KEY_ID=${{ secrets.CMS_STORAGE_ACCESS_KEY_ID }}" >> $GITHUB_ENV
-          echo "CMS_STORAGE_SECRET_ACCESS_KEY=${{ secrets.CMS_STORAGE_SECRET_ACCESS_KEY }}" >> $GITHUB_ENV
-          echo "CMS_POSTGRES_URL=${{ secrets.CMS_POSTGRES_URL }}" >> $GITHUB_ENV
-
       - name: Nx Build
         run: npx nx run-many --target=build --all

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,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/dimentorin/src/middleware.ts

@@ -1,109 +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/gacha/.env.example

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

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

@@ -2,19 +2,22 @@ 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';
 
 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: () => console.log('Success Login'),
+    });
+  });
 
   return {
     form,

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

@@ -1,11 +1,14 @@
 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 { useEffect, useState } from 'react';
 
 export const useRegister = () => {
   const postRegister = usePostRegister();
@@ -18,12 +21,31 @@ 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: () => toast.success('Registrasi sukses'),
+      onSuccess: (data) => toast.success(data.message),
       onError: (error) => toast.error(error.message),
     });
   });
@@ -31,5 +53,6 @@ export const useRegister = () => {
   return {
     form,
     onSubmit,
+    isStepOneValid: stepValid,
   };
 };

apps/gacha/src/middleware.ts

@@ -1,109 +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/landing/.env.example

@@ -1 +0,0 @@
-NEXT_PUBLIC_API_URL=

apps/landing/next.config.js

@@ -1,8 +1,22 @@
+//@ts-check
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const { composePlugins, withNx } = require('@nx/next');
 
-/** @type {import('@nx/next/plugins/with-nx').WithNxOptions} */
+/**
+ * @type {import('@nx/next/plugins/with-nx').WithNxOptions}
+ **/
 const nextConfig = {
-  nx: { svgr: false },
+  nx: {
+    // Set this to true if you would like to to use SVGR
+    // See: https://github.com/gregberge/svgr
+    svgr: false,
+  },
 };
 
-module.exports = composePlugins(withNx)(nextConfig);
+const plugins = [
+  // Add more Next.js plugins to this list if needed.
+  withNx,
+];
+
+module.exports = composePlugins(...plugins)(nextConfig);

apps/landing/src/app/(home)/_components/community.tsx

@@ -1,110 +0,0 @@
-'use client';
-
-import COMMUNITIES_STATS from '@/data/communities-stats.json';
-import COMMUNITIES from '@/data/communities.json';
-import { Button } from '@components';
-import { Icon } from '@iconify/react';
-import { motion, useInView } from 'framer-motion';
-import { useRef } from 'react';
-
-export function Community() {
-  const ref = useRef(null);
-  const isInView = useInView(ref, { once: true, amount: 0.2 });
-
-  const containerVariants = {
-    hidden: { opacity: 0 },
-    visible: {
-      opacity: 1,
-      transition: {
-        staggerChildren: 0.1,
-      },
-    },
-  };
-
-  const itemVariants = {
-    hidden: { y: 20, opacity: 0 },
-    visible: {
-      y: 0,
-      opacity: 1,
-      transition: { duration: 0.5 },
-    },
-  };
-
-  return (
-    <section
-      id="komunitas"
-      className="w-full py-20 md:py-32 bg-muted relative overflow-hidden"
-    >
-      <div className="absolute inset-0 -z-10">
-        <div className="absolute inset-0 bg-[radial-gradient(circle_at_center,rgba(59,130,246,0.1),transparent_70%)]" />
-        <div className="absolute inset-0 bg-[linear-gradient(to_right,rgba(59,130,246,0.01)_1px,transparent_1px),linear-gradient(to_bottom,rgba(59,130,246,0.01)_1px,transparent_1px)] bg-[size:14px_14px]" />
-      </div>
-      <div className="container px-4 md:px-6" ref={ref}>
-        <motion.div
-          initial={{ opacity: 0, y: 20 }}
-          animate={isInView ? { opacity: 1, y: 0 } : {}}
-        >
-          <h2 className="text-3xl font-bold tracking-tighter md:text-4xl/tight lg:text-5xl text-center mb-4">
-            Komunitas{' '}
-            <span className="bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
-              Kami
-            </span>
-          </h2>
-          <p className="max-w-[800px] mx-auto text-muted-foreground text-center md:text-lg">
-            Bergabunglah dengan ribuan programmer Indonesia yang saling membantu
-            dan berbagi pengalaman.
-          </p>
-        </motion.div>
-        <motion.div
-          className="grid gap-8 md:grid-cols-3 mt-12"
-          variants={containerVariants}
-          initial="hidden"
-          animate={isInView ? 'visible' : 'hidden'}
-        >
-          {COMMUNITIES.map((c, i) => (
-            <motion.div
-              key={i}
-              className="group relative overflow-hidden rounded-xl border bg-background p-6 transition-all hover:shadow-xl"
-              variants={itemVariants}
-            >
-              <div className="absolute inset-0 bg-gradient-to-br from-primary/5 via-transparent to-blue-400/5 opacity-0 group-hover:opacity-100 transition-opacity duration-500" />
-              <div className="relative z-10">
-                <div className="mb-4 inline-flex h-12 w-12 items-center justify-center rounded-full bg-blue-100 dark:bg-blue-900">
-                  <Icon
-                    icon={c.iconName}
-                    className="h-6 w-6 text-blue-600 dark:text-blue-400"
-                  />
-                </div>
-                <h3 className="mb-2 text-xl font-bold">{c.title}</h3>
-                <p className="mb-6 text-muted-foreground">{c.description}</p>
-                <Button
-                  variant="outline"
-                  className="w-full group-hover:bg-primary group-hover:text-primary-foreground transition-colors duration-300"
-                  onClick={() => window.open(c.buttonLink, '_blank')}
-                >
-                  {c.buttonText}
-                </Button>
-              </div>
-              <div className="absolute -bottom-1 -right-1 w-20 h-20 bg-gradient-to-tl from-primary/20 to-transparent rounded-tl-full opacity-0 group-hover:opacity-100 transition-opacity duration-500" />
-            </motion.div>
-          ))}
-        </motion.div>
-        <motion.div
-          className="mt-20 grid grid-cols-2 md:grid-cols-4 gap-8 text-center"
-          initial={{ opacity: 0, y: 20 }}
-          animate={isInView ? { opacity: 1, y: 0 } : {}}
-          transition={{ duration: 0.5, delay: 0.3 }}
-        >
-          {COMMUNITIES_STATS.map((s, i) => (
-            <div key={i} className="space-y-2">
-              <div className="text-4xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
-                {s.value}
-              </div>
-              <div className="text-sm text-muted-foreground">{s.label}</div>
-            </div>
-          ))}
-        </motion.div>
-      </div>
-    </section>
-  );
-}

apps/landing/src/app/(home)/_components/testimonials.tsx

@@ -1,126 +0,0 @@
-'use client';
-
-import TESTIMONIAL_STATS from '@/data/testimonial-stats.json';
-import TESTIMONIALS from '@/data/testimonials.json';
-import { QuoteIcon } from '@components';
-import { motion, useInView } from 'framer-motion';
-import Image from 'next/image';
-import { useRef } from 'react';
-
-export function Testimonials() {
-  const ref = useRef<HTMLDivElement>(null);
-  const isInView = useInView(ref, { once: true, amount: 0.2 });
-
-  const containerVariants = {
-    hidden: { opacity: 0 },
-    visible: { opacity: 1, transition: { staggerChildren: 0.1 } },
-  };
-
-  const itemVariants = {
-    hidden: { y: 20, opacity: 0 },
-    visible: { y: 0, opacity: 1, transition: { duration: 0.5 } },
-  };
-
-  return (
-    <section
-      id="testimoni"
-      className="w-full py-20 md:py-32 bg-muted relative overflow-hidden"
-      ref={ref}
-    >
-      <div className="absolute inset-0 -z-10">
-        <div className="absolute inset-0 bg-[radial-gradient(ellipse_at_top,rgba(59,130,246,0.1),transparent_50%)]" />
-        <div className="absolute inset-0 bg-[radial-gradient(ellipse_at_bottom,rgba(96,165,250,0.1),transparent_50%)]" />
-      </div>
-
-      <div className="container px-4 md:px-6">
-        <motion.div
-          className="flex flex-col items-center justify-center space-y-4 text-center mb-16"
-          initial={{ opacity: 0, y: 20 }}
-          animate={isInView ? { opacity: 1, y: 0 } : {}}
-          transition={{ duration: 0.5 }}
-        >
-          <h2 className="text-3xl font-bold tracking-tighter md:text-4xl lg:text-5xl">
-            <span className="bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
-              Testimoni
-            </span>
-            <span> Member</span>
-          </h2>
-          <p className="max-w-[800px] mx-auto text-muted-foreground md:text-lg">
-            Apa kata mereka yang telah bergabung dengan komunitas IMPHNEN?
-          </p>
-        </motion.div>
-
-        <motion.div
-          className="grid gap-8 md:grid-cols-3"
-          variants={containerVariants}
-          initial="hidden"
-          animate={isInView ? 'visible' : 'hidden'}
-        >
-          {TESTIMONIALS.map((t, idx) => (
-            <motion.div
-              key={idx}
-              className="group relative overflow-hidden rounded-xl border bg-background p-6 transition-all hover:shadow-lg"
-              variants={itemVariants}
-            >
-              <div className="absolute top-6 right-6 text-primary/20 group-hover:text-primary/40 transition-colors">
-                <QuoteIcon className="h-8 w-8" />
-              </div>
-              <div className="relative z-10">
-                <p className="mb-6 text-muted-foreground italic">
-                  &ldquo;{t.quote}&rdquo;
-                </p>
-                <div className="flex items-center gap-4">
-                  <div className="relative h-12 w-12 overflow-hidden rounded-full border-2 border-primary/20">
-                    <Image
-                      src={t.avatar}
-                      alt={t.name}
-                      width={600}
-                      height={500}
-                      className="object-cover"
-                      unoptimized
-                    />
-                  </div>
-                  <div>
-                    <h4 className="font-bold">{t.name}</h4>
-                    <p className="text-sm text-muted-foreground">{t.role}</p>
-                  </div>
-                </div>
-              </div>
-              <div className="absolute -bottom-1 -left-1 w-20 h-20 bg-gradient-to-tr from-primary/10 to-transparent rounded-tr-full opacity-0 group-hover:opacity-100 transition-opacity duration-500" />
-            </motion.div>
-          ))}
-        </motion.div>
-
-        <motion.div
-          className="mt-20 rounded-xl overflow-hidden border bg-background/50 backdrop-blur-sm p-8 md:p-12"
-          initial={{ opacity: 0, y: 20 }}
-          animate={isInView ? { opacity: 1, y: 0 } : {}}
-          transition={{ duration: 0.5, delay: 0.3 }}
-        >
-          <div className="grid md:grid-cols-2 gap-8 items-center">
-            <div>
-              <h3 className="text-2xl md:text-3xl font-bold mb-4">
-                Bergabunglah dengan 10,000+ programmer Indonesia lainnya
-              </h3>
-              <p className="text-muted-foreground">
-                Komunitas kami terus berkembang dengan programmer dari berbagai
-                latar belakang dan tingkat keahlian. Bersama-sama, kita belajar,
-                berbagi, dan tumbuh sebagai profesional.
-              </p>
-            </div>
-            <div className="grid grid-cols-2 gap-4">
-              {TESTIMONIAL_STATS.map((s, idx) => (
-                <div key={idx} className="rounded-lg border p-4 text-center">
-                  <div className="text-3xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
-                    {s.value}
-                  </div>
-                  <div className="text-sm text-muted-foreground">{s.label}</div>
-                </div>
-              ))}
-            </div>
-          </div>
-        </motion.div>
-      </div>
-    </section>
-  );
-}

apps/landing/src/app/_components/call-to-action.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { Button } from '@components';
+import { Button } from '@imphnen-frontend-service/shadcn-ui/atoms';
 import { motion, useInView } from 'framer-motion';
 import { useRef } from 'react';
 
@@ -41,10 +41,7 @@ export function CallToAction() {
               <div className="flex flex-col sm:flex-row gap-4 justify-center">
                 <Button
                   size="lg"
-                  className="group relative w-full sm:w-auto bg-gradient-to-r from-primary to-blue-600 hover:from-primary/90 hover:to-blue-600/90 transition-all duration-300 font-bold text-white hover:text-white/90 shadow-lg cursor-pointer"
+                  className="bg-gradient-to-r from-primary to-blue-400 hover:from-primary/90 hover:to-blue-400/90"
-                  onClick={() =>
-                    window.open('https://discord.gg/imphnen', '_blank')
-                  }
                 >
                   Gabung Discord
                 </Button>
@@ -52,12 +49,6 @@ export function CallToAction() {
                   size="lg"
                   variant="outline"
                   className="border-primary hover:bg-primary/10"
-                  onClick={() =>
-                    window.open(
-                      'https://facebook.com/groups/programmerhandal',
-                      '_blank'
-                    )
-                  }
                 >
                   Join Facebook Group
                 </Button>

apps/landing/src/app/_components/community.tsx

@@ -0,0 +1,179 @@
+'use client';
+
+import {
+  Button,
+  FacebookIcon,
+  InstagramIcon,
+  MessageCircleIcon,
+} from '@imphnen-frontend-service/shadcn-ui/atoms';
+import { motion, useInView } from 'framer-motion';
+import { useRef } from 'react';
+
+export function Community() {
+  const ref = useRef(null);
+  const isInView = useInView(ref, { once: true, amount: 0.2 });
+
+  const communities = [
+    {
+      icon: (
+        <FacebookIcon className="h-6 w-6 text-blue-600 dark:text-blue-400" />
+      ),
+      iconBg: 'bg-blue-100 dark:bg-blue-900',
+      title: 'Facebook Group',
+      description:
+        'Bergabunglah dengan grup Facebook kami untuk diskusi santai dan berbagi artikel menarik.',
+      buttonText: 'Gabung Sekarang',
+      buttonLink: '#',
+    },
+    {
+      icon: (
+        <InstagramIcon className="h-6 w-6 text-blue-600 dark:text-blue-400" />
+      ),
+      iconBg: 'bg-blue-100 dark:bg-blue-900',
+      title: 'Instagram',
+      description:
+        'Ikuti kami di Instagram untuk tips programming, konten inspiratif, dan info event terbaru.',
+      buttonText: 'Follow Kami',
+      buttonLink: '#',
+    },
+    {
+      icon: (
+        <MessageCircleIcon className="h-6 w-6 text-blue-600 dark:text-blue-400" />
+      ),
+      iconBg: 'bg-blue-100 dark:bg-blue-900',
+      title: 'Discord Server',
+      description:
+        'Diskusikan langsung dengan sesama programmer dan dapatkan bantuan langsung dari para ahli.',
+      buttonText: 'Join Server',
+      buttonLink: '#',
+    },
+  ];
+
+  const containerVariants = {
+    hidden: { opacity: 0 },
+    visible: {
+      opacity: 1,
+      transition: {
+        staggerChildren: 0.1,
+      },
+    },
+  };
+
+  const itemVariants = {
+    hidden: { y: 20, opacity: 0 },
+    visible: {
+      y: 0,
+      opacity: 1,
+      transition: { duration: 0.5 },
+    },
+  };
+
+  return (
+    <section
+      id="komunitas"
+      className="w-full py-20 md:py-32 bg-muted relative overflow-hidden"
+    >
+      {/* Background Elements */}
+      <div className="absolute inset-0 -z-10">
+        <div className="absolute inset-0 bg-[radial-gradient(circle_at_center,rgba(59,130,246,0.1),transparent_70%)]" />
+        <div className="absolute inset-0 bg-[linear-gradient(to_right,rgba(59,130,246,0.01)_1px,transparent_1px),linear-gradient(to_bottom,rgba(59,130,246,0.01)_1px,transparent_1px)] bg-[size:14px_14px]" />
+      </div>
+
+      <div className="container px-4 md:px-6" ref={ref}>
+        <div className="flex flex-col items-center justify-center space-y-4 text-center mb-16">
+          <motion.div
+            className="space-y-2"
+            initial={{ opacity: 0, y: 20 }}
+            animate={isInView ? { opacity: 1, y: 0 } : { opacity: 0, y: 20 }}
+            transition={{ duration: 0.5 }}
+          >
+            <h2 className="text-3xl font-bold tracking-tighter md:text-4xl/tight lg:text-5xl">
+              Komunitas{' '}
+              <span className="bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                Kami
+              </span>
+            </h2>
+            <p className="max-w-[800px] mx-auto text-muted-foreground md:text-lg">
+              Bergabunglah dengan ribuan programmer Indonesia yang saling
+              membantu dan berbagi pengalaman.
+            </p>
+          </motion.div>
+        </div>
+
+        <motion.div
+          className="grid gap-8 md:grid-cols-3"
+          variants={containerVariants}
+          initial="hidden"
+          animate={isInView ? 'visible' : 'hidden'}
+        >
+          {communities.map((community, index) => (
+            <motion.div
+              key={index}
+              className="group relative overflow-hidden rounded-xl border bg-background p-6 transition-all hover:shadow-xl"
+              variants={itemVariants}
+            >
+              <div className="absolute inset-0 bg-gradient-to-br from-primary/5 via-transparent to-blue-400/5 opacity-0 group-hover:opacity-100 transition-opacity duration-500" />
+
+              <div className="relative z-10">
+                <div
+                  className={`mb-4 inline-flex h-12 w-12 items-center justify-center rounded-full ${community.iconBg}`}
+                >
+                  {community.icon}
+                </div>
+                <h3 className="mb-2 text-xl font-bold">{community.title}</h3>
+                <p className="mb-6 text-muted-foreground">
+                  {community.description}
+                </p>
+                <Button
+                  variant="outline"
+                  className="w-full group-hover:bg-primary group-hover:text-primary-foreground transition-colors duration-300"
+                >
+                  {community.buttonText}
+                </Button>
+              </div>
+
+              <div className="absolute -bottom-1 -right-1 w-20 h-20 bg-gradient-to-tl from-primary/20 to-transparent rounded-tl-full opacity-0 group-hover:opacity-100 transition-opacity duration-500" />
+            </motion.div>
+          ))}
+        </motion.div>
+
+        {/* Community Stats */}
+        <motion.div
+          className="mt-20 grid grid-cols-2 md:grid-cols-4 gap-8 text-center"
+          initial={{ opacity: 0, y: 20 }}
+          animate={isInView ? { opacity: 1, y: 0 } : { opacity: 0, y: 20 }}
+          transition={{ duration: 0.5, delay: 0.3 }}
+        >
+          <div className="space-y-2">
+            <div className="text-4xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+              10K+
+            </div>
+            <div className="text-sm text-muted-foreground">Member Aktif</div>
+          </div>
+          <div className="space-y-2">
+            <div className="text-4xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+              50+
+            </div>
+            <div className="text-sm text-muted-foreground">Event Bulanan</div>
+          </div>
+          <div className="space-y-2">
+            <div className="text-4xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+              100+
+            </div>
+            <div className="text-sm text-muted-foreground">
+              Mentor Profesional
+            </div>
+          </div>
+          <div className="space-y-2">
+            <div className="text-4xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+              5K+
+            </div>
+            <div className="text-sm text-muted-foreground">
+              Diskusi Mingguan
+            </div>
+          </div>
+        </motion.div>
+      </div>
+    </section>
+  );
+}

apps/landing/src/app/_components/features.tsx

@@ -1,7 +1,11 @@
 'use client';
 
-import FEATURES from '@/data/features.json';
+import {
-import { Icon } from '@iconify/react';
+  BookOpenIcon,
+  CodeIcon,
+  LaptopIcon,
+  UsersIcon,
+} from '@imphnen-frontend-service/shadcn-ui/atoms';
 import { motion, useInView } from 'framer-motion';
 import { useRef } from 'react';
 
@@ -9,6 +13,33 @@ export function Features() {
   const ref = useRef(null);
   const isInView = useInView(ref, { once: true, amount: 0.2 });
 
+  const features = [
+    {
+      icon: <LaptopIcon className="h-6 w-6 text-primary" />,
+      title: 'Belajar Tanpa Koding',
+      description:
+        'Pelajari konsep programming dengan cara yang mudah dipahami tanpa harus menulis kode yang rumit.',
+    },
+    {
+      icon: <UsersIcon className="h-6 w-6 text-primary" />,
+      title: 'Komunitas Supportif',
+      description:
+        'Bergabunglah dengan komunitas programmer Indonesia yang siap membantu dan berbagi pengalaman.',
+    },
+    {
+      icon: <BookOpenIcon className="h-6 w-6 text-primary" />,
+      title: 'Tutorial Interaktif',
+      description:
+        'Akses tutorial interaktif yang membuat konsep programming lebih mudah untuk dipahami.',
+    },
+    {
+      icon: <CodeIcon className="h-6 w-6 text-primary" />,
+      title: 'Proyek Praktis',
+      description:
+        'Terapkan pengetahuan Anda dalam proyek nyata dengan panduan langkah demi langkah.',
+    },
+  ];
+
   const containerVariants = {
     hidden: { opacity: 0 },
     visible: {
@@ -33,6 +64,7 @@ export function Features() {
       id="fitur"
       className="w-full py-20 md:py-32 relative overflow-hidden"
     >
+      {/* Background Elements */}
       <div className="absolute inset-0 -z-10">
         <div className="absolute inset-0 bg-gradient-to-b from-background via-background to-muted/50" />
         <div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[800px] h-[800px] rounded-full bg-gradient-to-tr from-primary/5 to-blue-400/5 blur-3xl" />
@@ -50,7 +82,10 @@ export function Features() {
               Fitur Unggulan
             </div>
             <h2 className="text-3xl font-bold tracking-tighter md:text-4xl/tight lg:text-5xl">
-              Belajar programming dengan cara yang lebih baik
+              Belajar programming dengan{' '}
+              <span className="bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                cara yang lebih baik
+              </span>
             </h2>
             <p className="max-w-[800px] mx-auto text-muted-foreground md:text-lg">
               IMPHNEN hadir dengan berbagai fitur untuk membantu kamu menjadi
@@ -65,7 +100,7 @@ export function Features() {
           initial="hidden"
           animate={isInView ? 'visible' : 'hidden'}
         >
-          {FEATURES.map((feature, index) => (
+          {features.map((feature, index) => (
             <motion.div
               key={index}
               className="group relative overflow-hidden rounded-xl border bg-background/50 backdrop-blur-sm p-6 transition-all hover:shadow-md hover:shadow-primary/5 hover:border-primary/50"
@@ -75,10 +110,7 @@ export function Features() {
 
               <div className="relative z-10">
                 <div className="mb-4 inline-flex h-12 w-12 items-center justify-center rounded-full bg-primary/10 group-hover:bg-primary/20 transition-colors">
-                  <Icon
+                  {feature.icon}
-                    icon={feature.iconName}
-                    className="h-6 w-6 text-primary"
-                  />
                 </div>
                 <h3 className="mb-2 text-xl font-bold">{feature.title}</h3>
                 <p className="text-muted-foreground">{feature.description}</p>

apps/landing/src/app/_components/footer.tsx

@@ -188,10 +188,7 @@ export default function Footer() {
                   placeholder="Email Anda"
                   className="flex h-9 w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50"
                 />
-                <button
+                <button className="inline-flex items-center justify-center rounded-md bg-primary px-3 py-1 text-sm font-medium text-primary-foreground shadow hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50">
-                  className="inline-flex items-center justify-center rounded-md bg-primary px-3 py-1 text-sm shadow hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 
-font-bold text-black hover:text-white cursor-pointer"
-                >
                   Daftar
                 </button>
               </div>

apps/landing/src/app/_components/header.tsx

@@ -1,16 +1,17 @@
 'use client';
 
-import { Button, MenuIcon, XIcon } from '@components';
+import {
-import { cn } from '@utils';
+  Button,
+  MenuIcon,
+  XIcon,
+} from '@imphnen-frontend-service/shadcn-ui/atoms';
+import { cn } from '@imphnen-frontend-service/utils';
 import Image from 'next/image';
 import Link from 'next/link';
-import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import { SimpleThemeToggle } from './simple-theme-toggle';
 
 export function Header() {
-  const router = useRouter();
-
   const [isScrolled, setIsScrolled] = useState(false);
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
 
@@ -34,15 +35,13 @@ export function Header() {
       <div className="container flex h-16 items-center justify-between">
         <div className="flex items-center gap-2">
           <div className="relative overflow-hidden rounded">
-            <Link href="/">
+            <Image
-              <Image
+              src="/logo.png"
-                src="/logo.webp"
+              alt="IMPHNEN Logo"
-                alt="IMPHNEN"
+              width={64}
-                width={64}
+              height={64}
-                height={64}
+              className="object-cover"
-                className="object-cover"
+            />
-              />
-            </Link>
           </div>
         </div>
 
@@ -81,14 +80,10 @@ export function Header() {
           </Link>
         </nav>
 
-        <div className="flex items-center gap-x-2">
+        <div className="flex items-center gap-4">
           <SimpleThemeToggle />
-
+          <Button className="hidden md:flex bg-gradient-to-r from-primary to-blue-400 hover:from-primary/90 hover:to-blue-400/90 transition-all duration-300">
-          <Button
+            Gabung Discord
-            className="group relative w-full sm:w-auto bg-gradient-to-r from-primary to-blue-600 hover:from-primary/90 hover:to-blue-600/90 transition-all duration-300 font-bold text-white hover:text-white/90 shadow-lg cursor-pointer"
-            onClick={() => router.push('/signin')}
-          >
-            Login
           </Button>
 
           {/* Mobile Menu Button */}
@@ -139,12 +134,8 @@ export function Header() {
             >
               Testimoni
             </Link>
-
+            <Button className="mt-4 bg-gradient-to-r from-primary to-blue-400 hover:from-primary/90 hover:to-blue-400/90">
-            <Button
+              Gabung Discord
-              onClick={() => router.push('/signin')}
-              className="group relative w-full sm:w-auto bg-gradient-to-r from-primary to-blue-600 hover:from-primary/90 hover:to-blue-600/90 transition-all duration-300 font-bold text-white hover:text-white/90 shadow-lg cursor-pointer"
-            >
-              Login
             </Button>
           </nav>
         </div>

apps/landing/src/app/_components/hero.tsx

@@ -1,10 +1,14 @@
 'use client';
 
-import HERO_STATS from '@/data/hero-stats.json';
+import {
-import { Button, SparklesIcon } from '@components';
+  Button,
+  CodeIcon,
+  SparklesIcon,
+  UsersIcon,
+} from '@imphnen-frontend-service/shadcn-ui/atoms';
 import { motion } from 'framer-motion';
 import Image from 'next/image';
-import { Fragment, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 
 export function Hero() {
   const [scrollY, setScrollY] = useState(0);
@@ -20,8 +24,11 @@ export function Hero() {
 
   return (
     <section className="relative w-full py-20 md:py-32 lg:py-40 overflow-hidden">
+      {/* Background Elements */}
       <div className="absolute inset-0 -z-10 overflow-hidden">
         <div className="absolute top-0 left-0 w-full h-full bg-gradient-to-b from-background to-background/50" />
+
+        {/* Animated Gradient Orbs */}
         <div
           className="absolute top-1/4 -left-20 w-80 h-80 rounded-full bg-gradient-to-r from-primary/20 to-blue-400/20 blur-3xl"
           style={{
@@ -36,6 +43,8 @@ export function Hero() {
             opacity: Math.max(0.2, 1 - scrollY * 0.001),
           }}
         />
+
+        {/* Grid Pattern */}
         <div className="absolute inset-0 bg-[linear-gradient(rgba(59,130,246,0.05)_1px,transparent_1px),linear-gradient(to_right,rgba(59,130,246,0.05)_1px,transparent_1px)] bg-[size:40px_40px]" />
       </div>
 
@@ -47,13 +56,13 @@ export function Hero() {
             animate={{ opacity: 1, y: 0 }}
             transition={{ duration: 0.5 }}
           >
-            <div className="inline-flex items-center rounded-full border px-3 py-1 text-sm w-fit">
+            <div className="inline-flex items-center rounded-full border px-3 py-1 text-sm">
               <SparklesIcon className="mr-1 h-3.5 w-3.5 text-primary" />
               <span>Komunitas Programmer Indonesia</span>
             </div>
 
             <div className="space-y-4">
-              <h1 className="text-4xl md:text-5xl lg:text-6xl xl:text-7xl font-bold tracking-tighter bg-clip-text text-transparent bg-gradient-to-r from-foreground via-foreground to-foreground/70">
+              <h1 className="text-4xl font-bold tracking-tighter sm:text-5xl md:text-6xl lg:text-7xl bg-clip-text text-transparent bg-gradient-to-r from-foreground via-foreground to-foreground/70">
                 Programmer Handal, <br />
                 <span className="bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
                   Tanpa Ribet
@@ -66,62 +75,76 @@ export function Hero() {
               </p>
             </div>
 
-            <div className="flex flex-col sm:flex-row gap-4 w-full sm:w-auto">
+            <div className="flex flex-col sm:flex-row gap-4">
-              <Button
+              <a href="https://facebook.com">
-                size="lg"
+                <Button
-                className="group relative w-full sm:w-auto bg-gradient-to-r from-primary to-blue-600 hover:from-primary/90 hover:to-blue-600/90 transition-all duration-300 font-bold text-white hover:text-white/90 shadow-lg cursor-pointer"
+                  size="lg"
-                onClick={() =>
+                  className="bg-gradient-to-r from-primary to-blue-400 hover:from-primary/90 hover:to-blue-400/90 transition-all duration-300"
-                  window.open(
+                >
-                    'https://facebook.com/groups/programmerhandal',
+                  Mulai Belajar
-                    '_blank'
+                </Button>
-                  )
+              </a>
-                }
-              >
-                Mulai Belajar
-              </Button>
               <Button
                 size="lg"
                 variant="outline"
-                className="w-full sm:w-auto group relative overflow-hidden border-primary"
+                className="group relative overflow-hidden border-primary"
-                onClick={() =>
-                  window.open('https://discord.com/invite/imphnen', '_blank')
-                }
               >
-                <span className="absolute inset-0 bg-gradient-to-r from-primary/10 to-blue-400/10 translate-y-full group-hover:translate-y-0 transition-transform duration-300" />
+                <span className="absolute inset-0 bg-gradient-to-r from-primary/10 to-blue-400/10 translate-y-full group-hover:translate-y-0 transition-transform duration-300"></span>
                 <span className="relative">Gabung Discord</span>
               </Button>
             </div>
 
-            <div className="flex flex-wrap justify-center md:justify-start gap-6 sm:gap-8">
+            <div className="flex items-center gap-8">
-              {HERO_STATS.map(({ value, label }, i) => (
+              <div className="flex flex-col items-center">
-                <Fragment key={i}>
+                <div className="text-2xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
-                  <div className="flex flex-col items-center">
+                  100K+
-                    <div className="text-2xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                </div>
-                      {value}
+                <div className="text-xs text-muted-foreground">Member</div>
-                    </div>
+              </div>
-                    <div className="text-xs text-muted-foreground">{label}</div>
+              <div className="h-10 border-r border-border"></div>
-                  </div>
+              <div className="flex flex-col items-center">
-                  {i < HERO_STATS.length - 1 && (
+                <div className="text-2xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
-                    <div className="hidden sm:block h-10 border-r border-border mx-4" />
+                  500+
-                  )}
+                </div>
-                </Fragment>
+                <div className="text-xs text-muted-foreground">Tutorial</div>
-              ))}
+              </div>
+              <div className="h-10 border-r border-border"></div>
+              <div className="flex flex-col items-center">
+                <div className="text-2xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                  24/7
+                </div>
+                <div className="text-xs text-muted-foreground">Yapping</div>
+              </div>
             </div>
           </motion.div>
 
           <motion.div
-            className="relative w-full lg:w-auto mx-auto lg:ml-auto"
+            className="relative mx-auto lg:ml-auto"
             initial={{ opacity: 0, scale: 0.9 }}
             animate={{ opacity: 1, scale: 1 }}
             transition={{ duration: 0.5, delay: 0.2 }}
           >
-            <Image
+            <div className="relative">
-              src="/logo.webp"
+              {/* Decorative Elements */}
-              alt="logo"
+              <div className="absolute -top-6 -left-6 w-12 h-12 rounded-lg border border-primary/30 bg-background/50 backdrop-blur-sm flex items-center justify-center">
-              width={600}
+                <CodeIcon className="h-6 w-6 text-primary" />
-              height={500}
+              </div>
-              className="w-full h-auto object-cover"
+              <div className="absolute -bottom-6 -right-6 w-12 h-12 rounded-lg border border-blue-400/30 bg-background/50 backdrop-blur-sm flex items-center justify-center">
-            />
+                <UsersIcon className="h-6 w-6 text-blue-400" />
+              </div>
+
+              {/* Main Image */}
+              <div className="relative z-10 rounded-2xl overflow-hidden border shadow-2xl">
+                <div className="absolute inset-0 bg-gradient-to-tr from-primary/10 to-blue-400/10" />
+                <Image
+                  src="/hero.jpeg"
+                  width={600}
+                  height={500}
+                  alt="IMPHNEN Programming Community"
+                  className="w-full h-auto object-cover"
+                />
+              </div>
+            </div>
           </motion.div>
         </div>
       </div>

apps/landing/src/app/_components/learning-resources.tsx

@@ -1,15 +1,65 @@
 'use client';
 
-import LEARNING_RESOURCES from '@/data/learning-resources.json';
+import {
-import { Button } from '@components';
+  BookOpenIcon,
-import { Icon } from '@iconify/react';
+  Button,
+  CodeIcon,
+  Share2Icon,
+  VideoIcon,
+} from '@imphnen-frontend-service/shadcn-ui/atoms';
 import { motion, useInView } from 'framer-motion';
+
 import { useRef } from 'react';
 
 export function LearningResources() {
   const ref = useRef(null);
   const isInView = useInView(ref, { once: true, amount: 0.2 });
 
+  const resources = [
+    {
+      icon: <VideoIcon className="h-6 w-6 text-blue-600 dark:text-blue-400" />,
+      iconBg: 'bg-blue-100 dark:bg-blue-900',
+      title: 'Video Tutorial',
+      description:
+        'Belajar melalui tutorial video dari langkah awal hingga mahir.',
+      buttonText: 'Lihat Semua Video',
+      buttonLink: '#',
+      color: 'from-blue-500 to-blue-700',
+    },
+    {
+      icon: (
+        <BookOpenIcon className="h-6 w-6 text-blue-600 dark:text-blue-400" />
+      ),
+      iconBg: 'bg-blue-100 dark:bg-blue-900',
+      title: 'Artikel & Tutorial',
+      description:
+        'Pelajari konsep programming melalui artikel yang disusun secara terstruktur.',
+      buttonText: 'Baca Artikel',
+      buttonLink: '#',
+      color: 'from-blue-500 to-blue-700',
+    },
+    {
+      icon: <CodeIcon className="h-6 w-6 text-blue-600 dark:text-blue-400" />,
+      iconBg: 'bg-blue-100 dark:bg-blue-900',
+      title: 'Tantangan Koding',
+      description:
+        'Uji kemampuan koding kamu dengan tantangan yang menyenangkan dan menantang.',
+      buttonText: 'Mulai Tantangan',
+      buttonLink: '#',
+      color: 'from-blue-500 to-blue-700',
+    },
+    {
+      icon: <Share2Icon className="h-6 w-6 text-blue-600 dark:text-blue-400" />,
+      iconBg: 'bg-blue-100 dark:bg-blue-900',
+      title: 'Sharing Session',
+      description:
+        'Ikuti sesi berbagi pengalaman dari programmer berpengalaman dan belajar dari pengalaman mereka.',
+      buttonText: 'Jadwal Session',
+      buttonLink: '#',
+      color: 'from-blue-500 to-blue-700',
+    },
+  ];
+
   const containerVariants = {
     hidden: { opacity: 0 },
     visible: {
@@ -34,20 +84,26 @@ export function LearningResources() {
       id="sumber-belajar"
       className="w-full py-20 md:py-32 relative overflow-hidden"
     >
+      {/* Background Elements */}
       <div className="absolute inset-0 -z-10">
         <div className="absolute inset-0 bg-gradient-to-b from-background via-background to-background" />
         <div className="absolute top-0 right-0 w-1/2 h-1/2 bg-gradient-to-bl from-primary/5 to-transparent blur-3xl" />
         <div className="absolute bottom-0 left-0 w-1/2 h-1/2 bg-gradient-to-tr from-blue-400/5 to-transparent blur-3xl" />
       </div>
+
       <div className="container px-4 md:px-6" ref={ref}>
         <div className="flex flex-col items-center justify-center space-y-4 text-center mb-16">
           <motion.div
+            className="space-y-2"
             initial={{ opacity: 0, y: 20 }}
-            animate={isInView ? { opacity: 1, y: 0 } : {}}
+            animate={isInView ? { opacity: 1, y: 0 } : { opacity: 0, y: 20 }}
             transition={{ duration: 0.5 }}
           >
             <h2 className="text-3xl font-bold tracking-tighter md:text-4xl/tight lg:text-5xl">
-              Sumber Belajar
+              Sumber{' '}
+              <span className="bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                Belajar
+              </span>
             </h2>
             <p className="max-w-[800px] mx-auto text-muted-foreground md:text-lg">
               Akses berbagai materi belajar yang akan membantu kamu menguasai
@@ -55,51 +111,54 @@ export function LearningResources() {
             </p>
           </motion.div>
         </div>
+
         <motion.div
           className="grid gap-8 md:grid-cols-2 lg:grid-cols-4"
           variants={containerVariants}
           initial="hidden"
           animate={isInView ? 'visible' : 'hidden'}
         >
-          {LEARNING_RESOURCES.map((r, i) => (
+          {resources.map((resource, index) => (
             <motion.div
-              key={i}
+              key={index}
-              className="group relative overflow-hidden rounded-xl border bg-background p-6 hover:shadow-lg"
+              className="group relative overflow-hidden rounded-xl border bg-background p-6 transition-all hover:shadow-lg"
               variants={itemVariants}
             >
               <div className="absolute top-0 left-0 h-1 w-full bg-gradient-to-r from-primary/50 to-blue-400/50 opacity-0 group-hover:opacity-100 transition-opacity duration-300" />
-              <div className="relative z-10">
-                <div className="mb-4 inline-flex h-12 w-12 items-center justify-center rounded-full bg-blue-100 dark:bg-blue-900">
-                  <Icon
-                    icon={r.icon}
-                    className="h-6 w-6 text-blue-600 dark:text-blue-400"
-                  />
-                </div>
-                <h3 className="mb-2 text-xl font-bold">{r.title}</h3>
-                <p className="mb-6 text-muted-foreground">{r.description}</p>
 
+              <div className="relative z-10">
+                <div
+                  className={`mb-4 inline-flex h-12 w-12 items-center justify-center rounded-full ${resource.iconBg}`}
+                >
+                  {resource.icon}
+                </div>
+                <h3 className="mb-2 text-xl font-bold">{resource.title}</h3>
+                <p className="mb-6 text-muted-foreground">
+                  {resource.description}
+                </p>
                 <Button
                   variant="link"
                   className="p-0 h-auto font-medium text-primary hover:text-primary/80"
-                  onClick={() => window.open(r.buttonLink, '_blank')}
                 >
-                  {r.buttonText}
+                  {resource.buttonText} →
-                  <Icon icon="tabler:arrow-right" className="h-6 w-6" />
                 </Button>
               </div>
+
               <div className="absolute -bottom-32 -right-32 w-64 h-64 bg-gradient-to-tl from-primary/10 to-transparent rounded-full opacity-0 group-hover:opacity-100 transition-all duration-500 group-hover:-translate-y-10 group-hover:-translate-x-10" />
             </motion.div>
           ))}
         </motion.div>
+
+        {/* Featured Resource */}
         <motion.div
           className="mt-20 rounded-xl overflow-hidden border bg-background/50 backdrop-blur-sm"
           initial={{ opacity: 0, y: 20 }}
-          animate={isInView ? { opacity: 1, y: 0 } : {}}
+          animate={isInView ? { opacity: 1, y: 0 } : { opacity: 0, y: 20 }}
           transition={{ duration: 0.5, delay: 0.3 }}
         >
           <div className="grid md:grid-cols-2 gap-0">
             <div className="p-8 md:p-12 flex flex-col justify-center">
-              <div className="inline-block rounded-full bg-primary/10 px-4 py-1.5 text-sm font-medium text-primary mb-4 w-fit">
+              <div className="inline-block rounded-full bg-primary/10 px-4 py-1.5 text-sm font-medium text-primary mb-4">
                 Rekomendasi Terbaik
               </div>
               <h3 className="text-2xl md:text-3xl font-bold mb-4">
@@ -111,18 +170,10 @@ export function LearningResources() {
                 menengah.
               </p>
               <div className="flex flex-wrap gap-4">
-                <Button
+                <Button className="bg-gradient-to-r from-primary to-blue-400 hover:from-primary/90 hover:to-blue-400/90">
-                  className="group relative w-full sm:w-auto bg-gradient-to-r from-primary to-blue-600 hover:from-primary/90 hover:to-blue-600/90 transition-all duration-300 font-bold text-white hover:text-white/90 shadow-lg cursor-pointer"
-                  onClick={() => window.open('/', '_blank')}
-                >
                   Mulai Kursus
                 </Button>
-                <Button
+                <Button variant="outline">Lihat Silabus</Button>
-                  variant="outline"
-                  onClick={() => window.open('/', '_blank')}
-                >
-                  Lihat Silabus
-                </Button>
               </div>
             </div>
             <div className="relative h-64 md:h-auto">

apps/landing/src/app/_components/simple-theme-toggle.tsx

@@ -1,6 +1,10 @@
 'use client';
 
-import { Button, MoonIcon, SunIcon } from '@components';
+import {
+  Button,
+  MoonIcon,
+  SunIcon,
+} from '@imphnen-frontend-service/shadcn-ui/atoms';
 import { useTheme } from 'next-themes';
 import { useEffect, useState } from 'react';
 
@@ -25,7 +29,7 @@ export function SimpleThemeToggle() {
       variant="outline"
       size="icon"
       onClick={toggleTheme}
-      className="focus-visible:ring-0 cursor-pointer"
+      className="focus-visible:ring-0"
     >
       {theme === 'dark' ? (
         <SunIcon className="h-[1.2rem] w-[1.2rem]" />

apps/landing/src/app/_components/testimonials.tsx

@@ -0,0 +1,190 @@
+'use client';
+
+import { QuoteIcon } from '@imphnen-frontend-service/shadcn-ui/atoms';
+import { motion, useInView } from 'framer-motion';
+import Image from 'next/image';
+import { useRef } from 'react';
+
+export function Testimonials() {
+  const ref = useRef(null);
+  const isInView = useInView(ref, { once: true, amount: 0.2 });
+
+  const testimonials = [
+    {
+      quote:
+        'Saya yang tadinya tidak mengerti apa-apa tentang programming, sekarang bisa membuat website sendiri dengan mudah. Terima kasih IMPHNEN!',
+      name: 'Budi Santoso',
+      role: 'Web Developer Pemula',
+      avatar: '/placeholder.svg?height=64&width=64',
+    },
+    {
+      quote:
+        'Komunitas yang sangat supportif! Setiap pertanyaan selalu dijawab dengan cepat dan jelas. Diskusi programnya mudah dipahami.',
+      name: 'Anita Ratna',
+      role: 'Mobile App Developer',
+      avatar: '/placeholder.svg?height=64&width=64',
+    },
+    {
+      quote:
+        'Server Discord IMPHNEN adalah tempat belajar terbaik untuk programmer pemula seperti saya. Materinya lengkap dan komunitasnya sangat membantu!',
+      name: 'Dedi Permana',
+      role: 'Data Scientist',
+      avatar: '/placeholder.svg?height=64&width=64',
+    },
+  ];
+
+  const containerVariants = {
+    hidden: { opacity: 0 },
+    visible: {
+      opacity: 1,
+      transition: {
+        staggerChildren: 0.1,
+      },
+    },
+  };
+
+  const itemVariants = {
+    hidden: { y: 20, opacity: 0 },
+    visible: {
+      y: 0,
+      opacity: 1,
+      transition: { duration: 0.5 },
+    },
+  };
+
+  return (
+    <section
+      id="testimoni"
+      className="w-full py-20 md:py-32 bg-muted relative overflow-hidden"
+    >
+      {/* Background Elements */}
+      <div className="absolute inset-0 -z-10">
+        <div className="absolute inset-0 bg-[radial-gradient(ellipse_at_top,rgba(59,130,246,0.1),transparent_50%)]" />
+        <div className="absolute inset-0 bg-[radial-gradient(ellipse_at_bottom,rgba(96,165,250,0.1),transparent_50%)]" />
+      </div>
+
+      <div className="container px-4 md:px-6" ref={ref}>
+        <div className="flex flex-col items-center justify-center space-y-4 text-center mb-16">
+          <motion.div
+            className="space-y-2"
+            initial={{ opacity: 0, y: 20 }}
+            animate={isInView ? { opacity: 1, y: 0 } : { opacity: 0, y: 20 }}
+            transition={{ duration: 0.5 }}
+          >
+            <h2 className="text-3xl font-bold tracking-tighter md:text-4xl/tight lg:text-5xl">
+              Testimoni{' '}
+              <span className="bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                Member
+              </span>
+            </h2>
+            <p className="max-w-[800px] mx-auto text-muted-foreground md:text-lg">
+              Apa kata mereka yang telah bergabung dengan komunitas IMPHNEN?
+            </p>
+          </motion.div>
+        </div>
+
+        <motion.div
+          className="grid gap-8 md:grid-cols-3"
+          variants={containerVariants}
+          initial="hidden"
+          animate={isInView ? 'visible' : 'hidden'}
+        >
+          {testimonials.map((testimonial, index) => (
+            <motion.div
+              key={index}
+              className="group relative overflow-hidden rounded-xl border bg-background p-6 transition-all hover:shadow-lg"
+              variants={itemVariants}
+            >
+              <div className="absolute top-6 right-6 text-primary/20 group-hover:text-primary/40 transition-colors">
+                <QuoteIcon className="h-8 w-8" />
+              </div>
+
+              <div className="relative z-10">
+                <p className="mb-6 text-muted-foreground italic">
+                  "{testimonial.quote}"
+                </p>
+
+                <div className="flex items-center gap-4">
+                  <div className="relative h-12 w-12 overflow-hidden rounded-full border-2 border-primary/20">
+                    <Image
+                      src={testimonial.avatar || '/placeholder.svg'}
+                      alt={testimonial.name}
+                      width={48}
+                      height={48}
+                      className="object-cover"
+                    />
+                  </div>
+                  <div>
+                    <h4 className="font-bold">{testimonial.name}</h4>
+                    <p className="text-sm text-muted-foreground">
+                      {testimonial.role}
+                    </p>
+                  </div>
+                </div>
+              </div>
+
+              <div className="absolute -bottom-1 -left-1 w-20 h-20 bg-gradient-to-tr from-primary/10 to-transparent rounded-tr-full opacity-0 group-hover:opacity-100 transition-opacity duration-500" />
+            </motion.div>
+          ))}
+        </motion.div>
+
+        {/* Testimonial Stats */}
+        <motion.div
+          className="mt-20 rounded-xl overflow-hidden border bg-background/50 backdrop-blur-sm p-8 md:p-12"
+          initial={{ opacity: 0, y: 20 }}
+          animate={isInView ? { opacity: 1, y: 0 } : { opacity: 0, y: 20 }}
+          transition={{ duration: 0.5, delay: 0.3 }}
+        >
+          <div className="grid md:grid-cols-2 gap-8 items-center">
+            <div>
+              <h3 className="text-2xl md:text-3xl font-bold mb-4">
+                Bergabunglah dengan{' '}
+                <span className="bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                  10,000+
+                </span>{' '}
+                programmer Indonesia lainnya
+              </h3>
+              <p className="text-muted-foreground">
+                Komunitas kami terus berkembang dengan programmer dari berbagai
+                latar belakang dan tingkat keahlian. Bersama-sama, kita belajar,
+                berbagi, dan tumbuh sebagai profesional.
+              </p>
+            </div>
+            <div className="grid grid-cols-2 gap-4">
+              <div className="rounded-lg border p-4 text-center">
+                <div className="text-3xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                  98%
+                </div>
+                <div className="text-sm text-muted-foreground">
+                  Tingkat Kemalasan
+                </div>
+              </div>
+              <div className="rounded-lg border p-4 text-center">
+                <div className="text-3xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                  4.9/5
+                </div>
+                <div className="text-sm text-muted-foreground">
+                  Rating Drama
+                </div>
+              </div>
+              <div className="rounded-lg border p-4 text-center">
+                <div className="text-3xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                  85%
+                </div>
+                <div className="text-sm text-muted-foreground">
+                  Mendapat Pekerjaan
+                </div>
+              </div>
+              <div className="rounded-lg border p-4 text-center">
+                <div className="text-3xl font-bold bg-clip-text text-transparent bg-gradient-to-r from-primary to-blue-400">
+                  24/7
+                </div>
+                <div className="text-sm text-muted-foreground">Yapping</div>
+              </div>
+            </div>
+          </div>
+        </motion.div>
+      </div>
+    </section>
+  );
+}

apps/landing/src/app/layout.tsx

@@ -1,8 +1,6 @@
-import '@/styles/globals.css';
 import { type Metadata } from 'next';
 import { Inter } from 'next/font/google';
-import Footer from './_components/footer';
+import '../styles/globals.css';
-import { Header } from './_components/header';
 import { ThemeProvider } from './_components/theme-provider';
 
 const inter = Inter({ subsets: ['latin'] });
@@ -26,11 +24,7 @@ export default function RootLayout({
           enableSystem
           disableTransitionOnChange
         >
-          <div className="flex min-h-screen flex-col">
+          {children}
-            <Header />
-            <main className="flex-1">{children}</main>
-            <Footer />
-          </div>
         </ThemeProvider>
       </body>
     </html>

apps/landing/src/app/page.tsx

@@ -1,19 +1,25 @@
 import { CallToAction } from './_components/call-to-action';
 import { Community } from './_components/community';
 import { Features } from './_components/features';
+import Footer from './_components/footer';
+import { Header } from './_components/header';
 import { Hero } from './_components/hero';
 import { LearningResources } from './_components/learning-resources';
 import { Testimonials } from './_components/testimonials';
 
 export default function Page() {
   return (
-    <>
+    <div className="flex min-h-screen flex-col">
-      <Hero />
+      <Header />
-      <Features />
+      <main className="flex-1">
-      <Community />
+        <Hero />
-      <LearningResources />
+        <Features />
-      <Testimonials />
+        <Community />
-      <CallToAction />
+        <LearningResources />
-    </>
+        <Testimonials />
+        <CallToAction />
+      </main>
+      <Footer />
+    </div>
   );
 }

apps/landing/src/app/signin/page.tsx

@@ -1,3 +0,0 @@
-export default function Page() {
-  return <></>;
-}

apps/landing/src/data/communities-stats.json

@@ -1,6 +0,0 @@
-[
-  { "value": "100K+", "label": "Member Aktif" },
-  { "value": "50+", "label": "Event Bulanan" },
-  { "value": "100+", "label": "Mentor Profesional" },
-  { "value": "5K+", "label": "Diskusi Mingguan" }
-]

apps/landing/src/data/communities.json

@@ -1,23 +0,0 @@
-[
-  {
-    "iconName": "tabler:brand-facebook",
-    "title": "Facebook Group",
-    "description": "Bergabunglah dengan grup Facebook kami untuk diskusi santai dan berbagi artikel menarik.",
-    "buttonText": "Gabung Sekarang",
-    "buttonLink": "https://facebook.com/groups/programmerhandal"
-  },
-  {
-    "iconName": "tabler:brand-instagram",
-    "title": "Instagram",
-    "description": "Ikuti kami di Instagram untuk tips programming, konten inspiratif, dan info event terbaru.",
-    "buttonText": "Follow Kami",
-    "buttonLink": "https://www.instagram.com/imphnen.dev"
-  },
-  {
-    "iconName": "tabler:brand-discord-filled",
-    "title": "Discord Server",
-    "description": "Diskusikan langsung dengan sesama programmer dan dapatkan bantuan langsung dari para ahli.",
-    "buttonText": "Join Server",
-    "buttonLink": "https://discord.com/invite/imphnen"
-  }
-]

apps/landing/src/data/features.json

@@ -1,22 +0,0 @@
-[
-  {
-    "iconName": "tabler:device-laptop",
-    "title": "Belajar Tanpa Koding",
-    "description": "Pelajari konsep programming dengan cara yang mudah dipahami tanpa harus menulis kode yang rumit."
-  },
-  {
-    "iconName": "tabler:users",
-    "title": "Komunitas Supportif",
-    "description": "Bergabunglah dengan komunitas programmer Indonesia yang siap membantu dan berbagi pengalaman."
-  },
-  {
-    "iconName": "tabler:book",
-    "title": "Tutorial Interaktif",
-    "description": "Akses tutorial interaktif yang membuat konsep programming lebih mudah untuk dipahami."
-  },
-  {
-    "iconName": "tabler:code",
-    "title": "Proyek Praktis",
-    "description": "Terapkan pengetahuan Anda dalam proyek nyata dengan panduan langkah demi langkah."
-  }
-]

apps/landing/src/data/hero-stats.json

@@ -1,5 +0,0 @@
-[
-  { "value": "180K+", "label": "Member" },
-  { "value": "500+", "label": "Tutorial" },
-  { "value": "24/7", "label": "Yapping" }
-]

apps/landing/src/data/learning-resources.json

@@ -1,30 +0,0 @@
-[
-  {
-    "icon": "tabler:video",
-    "title": "Video Tutorial",
-    "description": "Belajar melalui tutorial video dari langkah awal hingga mahir.",
-    "buttonText": "Lihat Semua Video",
-    "buttonLink": "#"
-  },
-  {
-    "icon": "tabler:article",
-    "title": "Artikel & Tutorial",
-    "description": "Pelajari konsep programming melalui artikel yang disusun secara terstruktur.",
-    "buttonText": "Baca Artikel",
-    "buttonLink": "#"
-  },
-  {
-    "icon": "tabler:brand-vscode",
-    "title": "Tantangan Koding",
-    "description": "Uji kemampuan koding kamu dengan tantangan yang menyenangkan dan menantang.",
-    "buttonText": "Mulai Tantangan",
-    "buttonLink": "#"
-  },
-  {
-    "icon": "tabler:device-desktop-share",
-    "title": "Sharing Session",
-    "description": "Ikuti sesi berbagi pengalaman dari programmer berpengalaman dan belajar dari pengalaman mereka.",
-    "buttonText": "Jadwal Session",
-    "buttonLink": "#"
-  }
-]

apps/landing/src/data/testimonial-stats.json

@@ -1,6 +0,0 @@
-[
-  { "value": "98%", "label": "Tingkat Kemalasan" },
-  { "value": "4.9/5", "label": "Rating Drama" },
-  { "value": "85%", "label": "Mendapat Pekerjaan" },
-  { "value": "24/7", "label": "Yapping" }
-]

apps/landing/src/data/testimonials.json

@@ -1,20 +0,0 @@
-[
-  {
-    "quote": "Sebagai seseorang yang awalnya buta sama sekali tentang programming, kini saya bisa membuat website sendiri dengan percaya diri. IMPHNEN benar-benar jadi pintu gerbang saya ke dunia web development!",
-    "name": "Ega",
-    "role": "Web Developer",
-    "avatar": "https://avatars.githubusercontent.com/u/97678571?v=4"
-  },
-  {
-    "quote": "IMPHNEN bukan cuma komunitas, tapi juga jadi tempat saya berkembang sebagai backend engineer. Diskusi teknisnya berbobot, dan respon dari komunitas selalu cepat dan tepat sasaran.",
-    "name": "Maulana",
-    "role": "Backend Engineer",
-    "avatar": "https://avatars.githubusercontent.com/u/53475078?v=4"
-  },
-  {
-    "quote": "Sebagai fullstack engineer pemula, saya merasa sangat terbantu dengan komunitas Discord IMPHNEN. Materinya praktikal, pembahasannya jelas, dan member-nya selalu siap membantu.",
-    "name": "Rasyid",
-    "role": "Fullstack Engineer",
-    "avatar": "https://avatars.githubusercontent.com/u/49753444?v=4"
-  }
-]

apps/landing/tsconfig.json

@@ -6,12 +6,15 @@
     "noEmit": true,
     "emitDeclarationOnly": false,
     "esModuleInterop": true,
-    "target": "ES2022",
     "module": "esnext",
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
@@ -20,14 +23,7 @@
       {
         "name": "next"
       }
-    ],
+    ]
-    "baseUrl": ".",
-    "paths": {
-      "@components": ["../../libs/shadcn-ui/src/atoms/index.ts"],
-      "@utils": ["../../libs/shadcn-ui/src/lib/index.ts"],
-      "@schemas": ["../../libs/service/src/schemas/index.ts"],
-      "@/*": ["src/*"]
-    }
   },
   "include": [
     "**/*.js",
@@ -39,5 +35,10 @@
     "next-env.d.ts",
     ".next/types/**/*.ts"
   ],
-  "exclude": ["node_modules", "jest.config.ts", "**/*.spec.ts", "**/*.test.ts"]
+  "exclude": [
+    "node_modules",
+    "jest.config.ts",
+    "**/*.spec.ts",
+    "**/*.test.ts"
+  ]
 }

libs/service/src/hooks/auth/index.ts

@@ -6,6 +6,7 @@ import {
   TRegisterRequest,
   TVerifyEmailRequest,
 } from '../../types/auth';
+import { SessionToken, SessionUser } from '@imphnen-frontend-service/utils';
 
 import { TResponseError, TResponseMessage } from '../../types/common';
 
@@ -18,6 +19,11 @@ export const usePostLogin = (): UseMutationResult<
   return useMutation({
     mutationKey: ['post-login'],
     mutationFn: async (payload) => await postLogin(payload),
+    onSuccess: (res) => {
+      SessionUser.set(res.data.user);
+      SessionToken.set(res.data.token);
+      window.location.reload();
+    },
   });
 };
 

libs/service/src/schemas/auth/index.ts

@@ -16,7 +16,7 @@ export const authLoginSchema = z.object({
     .min(1, 'Password tidak boleh kosong'),
 });
 
-export const authRegisterSchema = z
+export const stepOneRegisterSchema = z
   .object({
     email: z
       .string({
@@ -25,12 +25,6 @@ export const authRegisterSchema = z
       })
       .min(1, 'Email tidak boleh kosong')
       .email('Email harus valid'),
-    phone_number: z
-      .string({
-        required_error: 'Nomor telepon tidak boleh kosong',
-      })
-      .min(1, 'Nomor telepon tidak boleh kosong')
-      .max(15, 'Nomor telepon tidak boleh lebih dari 15 digit'),
     fullname: z
       .string({
         required_error: 'Nama tidak boleh kosong',
@@ -57,3 +51,28 @@ export const authRegisterSchema = z
     message: 'Password dan Konfirmasi Password harus sama',
     path: ['confirm_password'],
   });
+
+const stepTwoRegisterSchema = z.object({
+  phone_number: z
+    .string({
+      required_error: 'Nomor telepon tidak boleh kosong',
+      invalid_type_error: 'Nomor telepon harus berupa string',
+    })
+    .min(1, 'Nomor telepon tidak boleh kosong')
+    .max(15, 'Nomor telepon tidak boleh lebih dari 15 karakter'),
+  referral_code: z
+    .string()
+    .min(1, 'Kode referral tidak boleh kosong')
+    .max(4, 'Kode referral tidak boleh lebih dari 4 karakter')
+    .optional(),
+  referred_by: z
+    .string()
+    .min(1, 'Kode referral tidak boleh kosong')
+    .max(50, 'Kode referral tidak boleh lebih dari 50 karakter')
+    .optional(),
+  student_type: z.string(),
+});
+
+export const authRegisterSchema = stepOneRegisterSchema.and(
+  stepTwoRegisterSchema
+);

libs/service/src/types/auth/index.ts

@@ -1,26 +1,29 @@
-import { z } from 'zod';
-import { authLoginSchema, authRegisterSchema } from '../../schemas';
-import { TResponseDetail, TResponseMessage } from '../common';
 import { TUserItem } from '../users';
 
-export type TTokenItem = {
+export type TLoginRequest = {
-  access_token: string;
+  email: string;
-  refresh_token: string;
+  password: string;
 };
 
-export type TLoginItem = {
+export type TLoginResponse = {
-  token?: TTokenItem;
+  data: {
-  user?: TUserItem;
+    token: {
+      access_token: string;
+      refresh_token: string;
+    };
+    user: TUserItem;
+  };
 };
 
-export type TLoginRequest = z.infer<typeof authLoginSchema>;
+export type TRegisterRequest = {
-export type TLoginResponse = TResponseDetail<TLoginItem>;
+  email: string;
-
+  fullname: string;
-export type TRegisterRequest = z.infer<typeof authRegisterSchema>;
+  password: string;
-export type TRegisterResponse = TResponseDetail<TResponseMessage>;
+  phone_number: string;
-
+  referral_code?: string;
-export type TVerifyOtpRequest = {
+  referred_by?: string;
-  otp: number;
+  student_type: string;
+  confirm_password: string;
 };
 
 export type TVerifyEmailRequest = {

libs/service/src/types/common/index.ts

@@ -1,19 +1,7 @@
 import { AxiosError } from 'axios';
 
-export type TMetaResponse = {
+export type TResponse<T = unknown> = {
-  page: number;
-  per_page: number;
-  total: number;
-};
-
-export type TResponseDetail<T = unknown> = {
   data: T;
-  message: string;
-};
-
-export type TResponseList<T = unknown> = {
-  data: T[];
-  meta: TMetaResponse;
 };
 
 export type TResponseMessage = {

libs/service/src/types/roles/index.ts

@@ -1,17 +1,9 @@
 import { TPermissionItem } from '../permissions';
 
-export type TRoleDetailItem = {
+export type TRoleItem = {
   id: string;
   name: string;
+  created_at: string;
+  updated_at: string;
   permissions: TPermissionItem[];
-  created_at: string;
-  updated_at: string;
-};
-
-export type TRolesListItem = {
-  id: string;
-  name: string;
-  permissions_count: number;
-  created_at: string;
-  updated_at: string;
 };

libs/service/src/types/users/index.ts

@@ -1,4 +1,4 @@
-import { TRoleDetailItem } from '../roles';
+import { TRoleItem } from '../roles';
 
 export type TUserItem = {
   id: string;
@@ -7,7 +7,13 @@ export type TUserItem = {
   email: string;
   fullname: string;
   gender: string;
+  identity_number: string;
   is_active: boolean;
+  is_profile_completed: boolean;
   phone_number: string;
-  role: TRoleDetailItem;
+  referral_code: string;
+  referred_by: string;
+  religion: string;
+  student_type: string;
+  role: TRoleItem;
 };

libs/shadcn-ui/src/atoms/button.tsx

@@ -1,9 +1,9 @@
 'use client';
 
+import { cn } from '@imphnen-frontend-service/utils';
 import { Slot } from '@radix-ui/react-slot';
 import { cva, type VariantProps } from 'class-variance-authority';
 import * as React from 'react';
-import { cn } from '../lib/cn';
 
 const buttonVariants = cva(
   'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',

libs/shadcn-ui/src/lib/cn.ts

@@ -1,6 +0,0 @@
-import { ClassValue, clsx } from 'clsx';
-import { twMerge } from 'tailwind-merge';
-
-export const cn = (...inputs: ClassValue[]) => {
-  return twMerge(clsx(inputs));
-};

libs/shadcn-ui/src/lib/index.ts

@@ -1 +0,0 @@
-export * from './cn';

libs/utils/src/constants/index.ts

@@ -1 +0,0 @@
-export * from './permissions';

libs/utils/src/constants/permissions.ts

@@ -1,40 +0,0 @@
-export const PERMISSIONS = {
-  USERS: {
-    READ_LIST: 'Read List Users',
-    READ_DETAIL: 'Read Detail Users',
-    CREATE: 'Create Users',
-    UPDATE: 'Update Users',
-    DELETE: 'Delete Users',
-    ACTIVATE: 'Activate Users',
-  },
-  ROLES: {
-    READ_LIST: 'Read List Roles',
-    READ_DETAIL: 'Read Detail Roles',
-    CREATE: 'Create Roles',
-    UPDATE: 'Update Roles',
-    DELETE: 'Delete Roles',
-  },
-  PERMISSIONS: {
-    READ_LIST: 'Read List Permissions',
-    READ_DETAIL: 'Read Detail Permissions',
-    CREATE: 'Create Permissions',
-    UPDATE: 'Update Permissions',
-    DELETE: 'Delete Permissions',
-  },
-  GACHA_CLAIMS: {
-    CREATE: 'Create Gacha Claims',
-    READ_DETAIL: 'Read Detail Gacha Claims',
-  },
-  GACHA_ITEMS: {
-    READ_LIST: 'Read List Gacha Items',
-    READ_DETAIL: 'Read Detail Gacha Items',
-    CREATE: 'Create Gacha Items',
-    UPDATE: 'Update Gacha Items',
-    DELETE: 'Delete Gacha Items',
-  },
-  GACHA_ROLLS: {
-    READ_DETAIL: 'Read Detail Gacha Rolls',
-    CREATE: 'Create Gacha Rolls',
-    EXECUTE: 'Execute Gacha Rolls',
-  },
-};

libs/utils/src/cookies/index.ts

@@ -1,36 +0,0 @@
-import Cookies from 'js-cookie';
-
-type TTokenItem = {
-  access_token: string;
-  refresh_token: string;
-};
-
-const TOKEN_KEY = 'token';
-
-type TStoredToken =
-  | {
-      token?: TTokenItem;
-    }
-  | undefined;
-
-export const SessionToken = {
-  set: (val: TStoredToken) => {
-    Cookies.set(TOKEN_KEY, JSON.stringify(val), {
-      secure: true,
-      sameSite: 'Strict',
-      expires: 7,
-    });
-  },
-  get: (): TStoredToken => {
-    const token = Cookies.get(TOKEN_KEY);
-    if (!token) return undefined;
-    try {
-      return JSON.parse(token);
-    } catch {
-      return undefined;
-    }
-  },
-  remove: () => {
-    Cookies.remove(TOKEN_KEY);
-  },
-};

libs/utils/src/hooks/index.ts

@@ -1,4 +1,3 @@
 export * from './use-query-state';
-export * from './use-auth-store';
-export * from './use-modal-login';
 export * from './use-session';
+export * from './use-modal-login';

libs/utils/src/hooks/use-auth-store.ts

@@ -1,47 +0,0 @@
-import { create } from 'zustand';
-import { TLoginItem } from '@imphnen-frontend-service/service';
-import { SessionToken } from '../cookies';
-import { SessionUser } from '../local-storage';
-
-export enum ESessionStatus {
-  Authenticated = 'authenticated',
-  Authenticating = 'authenticating',
-  Unauthenticated = 'unauthenticated',
-}
-
-type SessionState = {
-  isLoading: boolean;
-  session?: TLoginItem;
-  status?: ESessionStatus;
-  setLoading: (val: boolean) => void;
-  setSession: (payload: TLoginItem) => void;
-  clearSession: () => void;
-};
-
-export const useAuthStore = create<SessionState>((set) => {
-  const session = SessionToken.get();
-  const user = SessionUser.get();
-  const isAuthenticated = !!session;
-
-  return {
-    isLoading: false,
-    session: isAuthenticated ? { ...session, ...user } : undefined,
-    status: isAuthenticated
-      ? ESessionStatus.Authenticated
-      : ESessionStatus.Unauthenticated,
-    setLoading: (val) => set({ isLoading: val }),
-    setSession: (data) => {
-      SessionToken.set({ token: data.token });
-      SessionUser.set(data.user);
-      set({
-        session: data,
-        status: ESessionStatus.Authenticated,
-      });
-    },
-    clearSession: () => {
-      SessionToken.remove();
-      SessionUser.remove();
-      set({ session: undefined, status: ESessionStatus.Unauthenticated });
-    },
-  };
-});

libs/utils/src/hooks/use-session.ts

@@ -1,37 +1,22 @@
-import { TLoginRequest, usePostLogin } from '@imphnen-frontend-service/service';
+import { SessionToken, SessionUser } from '../local-storage';
-import { useAuthStore } from './';
-import { toast } from 'sonner';
-import { useNavigate } from 'react-router';
 
 export const useSession = () => {
-  const navigate = useNavigate();
+  const session = {
-  const { mutate, isPending } = usePostLogin();
+    user: SessionUser.get(),
-  const { setLoading, setSession, clearSession, session } = useAuthStore();
+    token: SessionToken.get(),
-  const signIn = (payload: TLoginRequest) => {
-    setLoading(true);
-    mutate(payload, {
-      onSuccess: (data) => {
-        toast.success('Login sukses');
-        setSession(data.data);
-        navigate(0);
-      },
-      onError: (err) => {
-        toast.error(
-          err?.response?.data?.message ??
-            'Terjadi Kesalahan yang tidak diketahui'
-        );
-        clearSession();
-      },
-    });
   };
+
+  const isAuthenticated = !!session.token?.access_token;
+
   const signOut = () => {
-    clearSession();
+    SessionUser.remove();
-    navigate(0);
+    SessionToken.remove();
+    window.location.reload();
   };
+
   return {
+    isAuthenticated,
     session,
-    signIn,
     signOut,
-    isLoading: isPending,
   };
 };

libs/utils/src/index.ts

@@ -3,6 +3,3 @@ export * from './react-router';
 export * from './tailwind-merge';
 export * from './hooks';
 export * from './local-storage';
-export * from './cookies';
-export * from './session';
-export * from './constants';

libs/utils/src/local-storage/index.ts

@@ -20,16 +20,41 @@ type TUserItem = {
   email: string;
   fullname: string;
   gender: string;
+  identity_number: string;
   is_active: boolean;
+  is_profile_completed: boolean;
   phone_number: string;
+  referral_code: string;
+  referred_by: string;
+  religion: string;
+  student_type: string;
   role: TRoleItem;
 };
 
 export const SessionUser = {
-  set: (val?: TUserItem) => localStorage.setItem('users', JSON.stringify(val)),
+  set: (val: TUserItem) => localStorage.setItem('users', JSON.stringify(val)),
   get: (): TUserItem | undefined => {
     const users = localStorage.getItem('users');
     return users ? JSON.parse(users) : undefined;
   },
   remove: () => localStorage.removeItem('users'),
 };
+
+export const SessionToken = {
+  set: (val: { access_token: string; refresh_token: string }) => {
+    localStorage.setItem('access_token', val.access_token);
+    localStorage.setItem('refresh_token', val.refresh_token);
+  },
+  get: ():
+    | { access_token?: string | null; refresh_token?: string | null }
+    | undefined => {
+    return {
+      access_token: localStorage.getItem('access_token'),
+      refresh_token: localStorage.getItem('refresh_token'),
+    };
+  },
+  remove: () => {
+    localStorage.removeItem('access_token');
+    localStorage.removeItem('refresh_token');
+  },
+};

libs/utils/src/react-router/file-based-routing.tsx

@@ -1,22 +1,15 @@
-import { lazy, LazyExoticComponent, ReactNode } from 'react';
+import { lazy, LazyExoticComponent, ReactElement } from 'react';
 import { ActionFunction, LoaderFunction, RouteObject } from 'react-router';
 
-type TPermissionItem = {
-  id: string;
-  name: string;
-  created_at: string;
-  updated_at: string;
-};
-
 interface PageModuleExports {
-  default: () => ReactNode;
+  default: () => ReactElement;
   loader?: LoaderFunction;
   action?: ActionFunction;
   permissions?: Array<string>;
 }
 
 interface LoadingModuleExports {
-  default: () => ReactNode;
+  default: () => ReactElement;
 }
 
 interface RouteHandle {
@@ -45,6 +38,7 @@ export function convertPagesToRoute(
       filePath,
       loadingFiles
     );
+
     const route = createRoute({
       PageComponent: page,
       LoadingComponent: loadingComponent,
@@ -57,20 +51,6 @@ export function convertPagesToRoute(
         const result = (await importer()) as PageModuleExports;
         return 'loader' in result ? result.loader?.(args) : null;
       },
-      async guard() {
-        const result = (await importer()) as PageModuleExports;
-        const localStoragePermission = localStorage.getItem('permissions');
-        const permissions: TPermissionItem[] | undefined =
-          localStoragePermission
-            ? JSON.parse(localStoragePermission)
-            : undefined;
-        return 'permissions' in result
-          ? result.permissions?.every(
-              (permission) =>
-                permissions?.some((item) => permission === item.name) || false
-            ) || false
-          : true;
-      },
     });
     routes = mergeRoutes(routes, route);
   });
@@ -82,14 +62,19 @@ function findMatchingLoadingComponent(
   loadingFiles: Record<string, () => Promise<unknown>>
 ) {
   const loadingPath = filePath.replace(/(page|layout)\.tsx$/, 'loading.tsx');
+
   const groupMatch = filePath.match(/\([^/]+\//);
   const groupLoadingPath = groupMatch ? `/${groupMatch[0]}loading.tsx` : null;
+
   const globalLoadingPath = './app/loading.tsx';
+
   const loader =
     loadingFiles[loadingPath] ||
     (groupLoadingPath && loadingFiles[groupLoadingPath]) ||
     loadingFiles[globalLoadingPath];
+
   if (!loader) return undefined;
+
   return lazy(loader as () => Promise<LoadingModuleExports>);
 }
 
@@ -101,110 +86,68 @@ function mergeRoutes(
     throw new Error(
       `Paths do not match: "${target.path}" and "${source.path}"`
     );
-  target.children = target.children || [];
-  if (source.handle?.pageType === 'layout') {
-    return handleLayoutMerge(target, source);
-  }
-  if (source.handle?.pageType === 'page') {
-    return handlePageMerge(target, source);
-  }
-  if (source.children && source.children.length > 0) {
-    if (target.handle?.pageType === 'page') {
-      if (!target.children?.some((child) => child.index)) {
-        target.children = target.children || [];
-        target.children.unshift({
-          index: true,
-          element: target.element,
-          HydrateFallback: target.HydrateFallback,
-          action: target.action,
-          loader: target.loader,
-          handle: target.handle,
-          errorElement: target.errorElement,
-        });
-      }
-      delete target.element;
-      delete target.action;
-      delete target.loader;
-      delete target.handle;
-    }
-    mergeChildRoutes(target, source);
-  }
-  return target;
-}
 
-export function mergeChildRoutes(
-  target: ExtendedRouteObject,
-  source: ExtendedRouteObject
-): void {
-  if (!source.children) return;
   if (!target.children) {
     target.children = [];
   }
-  source.children.forEach((sourceChild) => {
-    const matchingChild = target.children!.find(
-      (targetChild) => targetChild.path === sourceChild.path
-    );
 
-    if (matchingChild) {
+  if (source.handle?.pageType === 'layout') {
-      mergeRoutes(matchingChild, sourceChild);
+    if (!target.element) {
-    } else {
+      target.element = source.element;
-      target.children!.push(sourceChild);
+      target.HydrateFallback = source.HydrateFallback;
+      target.action = source.action;
+      target.loader = source.loader;
+      target.handle = source.handle;
+      target.errorElement = source.errorElement;
+      target.children = target.children ?? [];
+    } else if (target.handle?.pageType === 'page') {
+      target = swapTargetRouteAsIndexRouteAndUpdateWithRoute(target, source);
     }
-  });
+    return target;
-}
+  }
 
-export function handleLayoutMerge(
+  if (
-  target: ExtendedRouteObject,
+    source.handle?.pageType === 'page' &&
-  source: ExtendedRouteObject
+    !target.children.some((child) => child.index)
-): ExtendedRouteObject {
+  ) {
-  if (!target.element) {
+    target.children.unshift({
-    Object.assign(target, {
+      index: true,
       element: source.element,
       HydrateFallback: source.HydrateFallback,
       action: source.action,
       loader: source.loader,
       handle: source.handle,
-      errorElement: source.errorElement,
     });
-  } else if (target.handle?.pageType === 'page') {
+    return target;
-    target = swapTargetRouteAsIndexRouteAndUpdateWithRoute(target, source);
   }
-  return target;
-}
 
-export function handlePageMerge(
-  target: ExtendedRouteObject,
-  source: ExtendedRouteObject
-): ExtendedRouteObject {
-  if (!target.children) {
-    target.children = [];
-  }
   if (
-    !target.children.some((child) => child.index) ||
+    target.handle?.pageType === 'layout' &&
-    target.handle?.pageType === 'layout'
+    source.handle?.pageType === 'page'
   ) {
-    if (target.handle?.pageType === 'layout') {
+    target = addRouteAsIndexRouteForTargetRoute(target, source);
-      addRouteAsIndexRouteForTargetRoute(target, source);
+    return target;
-    } else {
-      target.children.unshift({
-        index: true,
-        element: source.element,
-        HydrateFallback: source.HydrateFallback,
-        action: source.action,
-        loader: source.loader,
-        handle: source.handle,
-        errorElement: source.errorElement,
-      });
-    }
   }
+
+  if (source.children) {
+    target.children = target.children ?? [];
+    source.children.forEach((sourceChild) => {
+      const matchingChild = target.children?.find(
+        (targetChild) => targetChild.path === sourceChild.path
+      );
+      if (matchingChild) mergeRoutes(matchingChild, sourceChild);
+      else target.children?.push(sourceChild);
+    });
+  }
+
   return target;
 }
 
-export function swapTargetRouteAsIndexRouteAndUpdateWithRoute(
+function swapTargetRouteAsIndexRouteAndUpdateWithRoute(
   target: ExtendedRouteObject,
-  layout: ExtendedRouteObject
+  route: ExtendedRouteObject
 ): ExtendedRouteObject {
-  target.children = target.children || [];
+  target.children = target.children ?? [];
   target.children.push({
     index: true,
     element: target.element,
@@ -214,38 +157,38 @@ export function swapTargetRouteAsIndexRouteAndUpdateWithRoute(
     handle: target.handle,
     errorElement: target.errorElement,
   });
-  Object.assign(target, {
+
-    element: layout.element,
+  target.element = route.element;
-    HydrateFallback: layout.HydrateFallback,
+  target.HydrateFallback = route.HydrateFallback;
-    action: layout.action,
+  target.action = route.action;
-    loader: layout.loader,
+  target.loader = route.loader;
-    handle: layout.handle,
+  target.handle = route.handle;
-    errorElement: layout.errorElement,
+  target.errorElement = route.errorElement;
-  });
+
   return target;
 }
 
-export function addRouteAsIndexRouteForTargetRoute(
+function addRouteAsIndexRouteForTargetRoute(
   target: ExtendedRouteObject,
-  page: ExtendedRouteObject
+  route: ExtendedRouteObject
 ): ExtendedRouteObject {
-  target.children = target.children || [];
+  target.children = target.children ?? [];
   target.children.push({
     index: true,
-    element: page.element,
+    element: route.element,
-    HydrateFallback: page.HydrateFallback,
+    HydrateFallback: route.HydrateFallback,
-    action: page.action,
+    action: route.action,
-    loader: page.loader,
+    loader: route.loader,
-    handle: page.handle,
+    handle: route.handle,
-    errorElement: page.errorElement,
+    errorElement: route.errorElement,
   });
   return target;
 }
 
 function createRoute(args: {
   segments: string[];
-  PageComponent: LazyExoticComponent<() => ReactNode>;
+  PageComponent: LazyExoticComponent<() => ReactElement>;
-  LoadingComponent?: LazyExoticComponent<() => ReactNode>;
+  LoadingComponent?: LazyExoticComponent<() => ReactElement>;
   loader?: LoaderFunction;
   action?: ActionFunction;
   guard?: () => Promise<boolean>;
@@ -253,24 +196,21 @@ function createRoute(args: {
   const [current, ...rest] = args.segments;
   const [cleanPath, pageType] = current.split(separator);
   const route: ExtendedRouteObject = { path: cleanPath };
+
   if (pageType === 'page' || pageType === 'layout') {
     route.element = <args.PageComponent />;
     route.HydrateFallback =
       args.LoadingComponent ?? (() => <div>Loading...</div>);
     route.action = args.action;
     route.loader = async (...props) => {
-      if (!(await args.guard?.())) {
-        throw new Response('Forbidden', {
-          status: 403,
-          statusText: 'Forbidden',
-        });
-      }
       return args.loader?.(...props);
     };
     route.handle = { pageType: pageType as 'layout' | 'page' };
   }
+
   if (rest.length > 0) {
     const nextSegment = rest[0].split(separator)[0];
+
     if (nextSegment === 'update' || nextSegment === 'edit') {
       return {
         path: `${cleanPath}/${nextSegment}`,
@@ -281,16 +221,20 @@ function createRoute(args: {
         handle: { pageType: pageType as 'layout' | 'page' },
       };
     }
+
     const childRoute = createRoute({ ...args, segments: rest });
+
     if (!route.children) {
       route.children = [];
     }
+
     if (cleanPath.startsWith(':')) {
       route.children.unshift(childRoute);
     } else {
       route.children.push(childRoute);
     }
   }
+
   return route;
 }
 
@@ -314,6 +258,7 @@ export function getRouteSegmentsFromFilePath(
       if (segment.startsWith('[')) return getParamFromSegment(segment);
       return segment;
     });
+
   return getRouteSegments(segments[0], segments, transformer);
 }
 
@@ -361,7 +306,7 @@ export function addErrorElementToRoutes(
       (_, prevSegment) => prevSegment
     );
     const ErrorBoundary = lazy(
-      importer as () => Promise<{ default: () => ReactNode }>
+      importer as () => Promise<{ default: () => ReactElement }>
     );
     setRoute(segments, routes, (route) => {
       route.errorElement = <ErrorBoundary />;
@@ -380,7 +325,7 @@ export function add404PageToRoutesChildren(
       (_, prevSegment) => prevSegment
     );
     const NotFound = lazy(
-      importer as () => Promise<{ default: () => ReactNode }>
+      importer as () => Promise<{ default: () => ReactElement }>
     );
     setRoute(segments, routes, (route) => {
       if (route.children) {
@@ -395,7 +340,9 @@ export function add404PageToRoutesChildren(
           action: tempRoute.action,
           loader: tempRoute.loader,
         });
+
         route.children.push({ path: '*', element: <NotFound /> });
+
         delete route.element;
         delete route.action;
         delete route.loader;
@@ -405,7 +352,7 @@ export function add404PageToRoutesChildren(
   });
 }
 
-function set404NonPage(routes: RouteObject, notFoundElement: ReactNode) {
+function set404NonPage(routes: RouteObject, notFoundElement: ReactElement) {
   if (
     routes.path &&
     routes.children?.length &&
@@ -430,6 +377,7 @@ function setRoute(
   segments.forEach((_segment, i) => {
     const isLastSegment = i === segments.length - 1;
     if (isLastSegment) return (temp = updater(temp));
+
     if (!isLastSegment) {
       const nextSegment = segments[i + 1];
       const index = temp.children?.findIndex(

libs/utils/src/session/guard/index.tsx

@@ -1,27 +0,0 @@
-import { FC, PropsWithChildren, ReactNode, useMemo } from 'react';
-import { useSession } from '../../hooks/use-session';
-
-type TProps = PropsWithChildren<{
-  permissions: Array<string>;
-  fallback?: ReactNode;
-}>;
-
-export const Guard: FC<TProps> = (props): ReactNode => {
-  const { session } = useSession();
-
-  const permissionKeys = useMemo(() => {
-    return session?.user?.role?.permissions.map((perm) => perm.name) ?? [];
-  }, [session?.user?.role]);
-
-  const allowed = useMemo(() => {
-    return props.permissions.every((permission) =>
-      permissionKeys.includes(permission)
-    );
-  }, [permissionKeys, props.permissions]);
-
-  if (allowed) {
-    return props.children;
-  }
-
-  return props.fallback ?? null;
-};

libs/utils/src/session/index.ts

@@ -1 +0,0 @@
-export * from './guard';

package.json

@@ -3,15 +3,15 @@
   "version": "0.0.0",
   "license": "MIT",
   "scripts": {
-    "gacha:dev": "nx dev gacha",
+    "gacha:dev": "nx serve gacha",
     "gacha:build": "nx build gacha",
     "gacha:test": "nx test gacha",
     "gacha:prod": "serve ./dist/apps/gacha",
-    "backoffice:dev": "nx dev backoffice",
+    "backoffice:dev": "nx serve backoffice",
     "backoffice:build": "nx build backoffice",
     "backoffice:test": "nx test backoffice",
     "backoffice:prod": "serve ./dist/apps/backoffice",
-    "dimentorin:dev": "nx dev dimentorin",
+    "dimentorin:dev": "nx serve dimentorin",
     "dimentorin:test": "nx test dimentorin",
     "dimentorin:build": "nx build dimentorin",
     "dimentorin:prod": "serve ./dist/apps/dimentorin",
@@ -26,7 +26,6 @@
   "dependencies": {
     "@ant-design/icons": "^6.0.0",
     "@hookform/resolvers": "^5.0.1",
-    "@iconify/react": "^6.0.0",
     "@radix-ui/react-slot": "^1.2.0",
     "@tanstack/react-query": "^5.74.4",
     "@tanstack/react-store": "^0.7.0",
@@ -35,7 +34,6 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "framer-motion": "^12.9.2",
-    "graphql": "^16.11.0",
     "js-cookie": "^3.0.5",
     "next": "~15.2.4",
     "next-themes": "^0.4.6",
@@ -44,11 +42,9 @@
     "react-hook-form": "^7.55.0",
     "react-icons": "^5.5.0",
     "react-router-dom": "^7.3.0",
-    "sharp": "^0.34.1",
     "sonner": "^2.0.3",
     "tailwind-merge": "^3.0.2",
-    "zod": "^3.24.2",
+    "zod": "^3.24.2"
-    "zustand": "^5.0.5"
   },
   "devDependencies": {
     "@babel/core": "^7.14.5",

tsconfig.base.json

@@ -16,6 +16,7 @@
     "baseUrl": ".",
     "paths": {
       "@imphnen-frontend-service/service": ["libs/service/src/index.ts"],
+      "@imphnen-frontend-service/shadcn-ui/atoms": ["libs/shadcn-ui/src/atoms/index.ts"],
       "@imphnen-frontend-service/ui/atoms": ["libs/ui/src/atoms/index.ts"],
       "@imphnen-frontend-service/ui/molecules": [
         "libs/ui/src/molecules/index.ts"

vercel.json

@@ -1,8 +0,0 @@
-{
-  "routes": [
-    {
-      "src": "/[^.]+",
-      "dest": "/"
-    }
-  ]
-}