Refactor code structure and remove redundant sections for improved readability and maintainability

app/auth/update-account/_components/update-account-form.tsx

@@ -8,8 +8,6 @@ import { ExternalLink } from '@/public/assets/external-link';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
 
-import { onUpdateAccount } from '@kit/auth/actions/update-account-actions';
-import { UpdateAccountSchema } from '@kit/auth/schemas/update-account.schema';
 import { Button } from '@kit/ui/button';
 import { Checkbox } from '@kit/ui/checkbox';
 import {
@@ -23,6 +21,9 @@ import {
 import { Input } from '@kit/ui/input';
 import { Trans } from '@kit/ui/trans';
 
+import { UpdateAccountSchema } from '../_lib/schemas/update-account.schema';
+import { onUpdateAccount } from '../_lib/server/update-account';
+
 export function UpdateAccountForm({ user }: { user: User }) {
   const form = useForm({
     resolver: zodResolver(UpdateAccountSchema),
@@ -30,16 +31,15 @@ export function UpdateAccountForm({ user }: { user: User }) {
     defaultValues: {
       firstName: '',
       lastName: '',
-      personalCode: user.user_metadata.personalCode ?? '',
+      personalCode: '',
       email: user.email,
       phone: '',
       city: '',
-      weight: user.user_metadata.weight ?? undefined,
-      height: user.user_metadata.height ?? undefined,
+      weight: 0,
+      height: 0,
       userConsent: false,
     },
   });
-
   return (
     <Form {...form}>
       <form

app/auth/update-account/_lib/schemas/update-account.schema.ts

@@ -0,0 +1,44 @@
+import { z } from 'zod';
+
+export const UpdateAccountSchema = z.object({
+  firstName: z
+    .string({
+      required_error: 'First name is required',
+    })
+    .nonempty(),
+  lastName: z
+    .string({
+      required_error: 'Last name is required',
+    })
+    .nonempty(),
+  personalCode: z
+    .string({
+      required_error: 'Personal code is required',
+    })
+    .nonempty(),
+  email: z.string().email({
+    message: 'Email is required',
+  }),
+  phone: z
+    .string({
+      required_error: 'Phone number is required',
+    })
+    .nonempty(),
+  city: z.string().optional(),
+  weight: z
+    .number({
+      required_error: 'Weight is required',
+      invalid_type_error: 'Weight must be a number',
+    })
+    .gt(0, { message: 'Weight must be greater than 0' }),
+
+  height: z
+    .number({
+      required_error: 'Height is required',
+      invalid_type_error: 'Height must be a number',
+    })
+    .gt(0, { message: 'Height must be greater than 0' }),
+  userConsent: z.boolean().refine((val) => val === true, {
+    message: 'Must be true',
+  }),
+});

app/auth/update-account/_lib/server/update-account.ts

@@ -0,0 +1,60 @@
+'use server';
+
+import { redirect } from 'next/navigation';
+
+import { updateCustomer } from '@lib/data/customer';
+
+import { createAuthApi } from '@kit/auth/api';
+import { enhanceAction } from '@kit/next/actions';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+
+import pathsConfig from '~/config/paths.config';
+
+import { UpdateAccountSchema } from '../../schemas/update-account.schema';
+
+export interface AccountSubmitData {
+  firstName: string;
+  lastName: string;
+  personalCode: string;
+  email: string;
+  phone?: string;
+  city?: string;
+  weight: number | null;
+  height: number | null;
+  userConsent: boolean;
+}
+
+export const onUpdateAccount = enhanceAction(
+  async (params: AccountSubmitData) => {
+    const client = getSupabaseServerClient();
+    const api = createAuthApi(client);
+
+    try {
+      await api.updateAccount(params);
+      console.log('SUCCESS', pathsConfig.auth.updateAccountSuccess);
+    } catch (err: unknown) {
+      if (err instanceof Error) {
+        console.warn('On update account error: ' + err.message);
+      }
+      console.warn('On update account error: ', err);
+    }
+
+    await updateCustomer({
+      first_name: params.firstName,
+      last_name: params.lastName,
+      phone: params.phone,
+    });
+
+    const hasUnseenMembershipConfirmation =
+      await api.hasUnseenMembershipConfirmation();
+
+    if (hasUnseenMembershipConfirmation) {
+      redirect(pathsConfig.auth.membershipConfirmation);
+    } else {
+      redirect(pathsConfig.app.selectPackage);
+    }
+  },
+  {
+    schema: UpdateAccountSchema,
+  },
+);

app/home/(user)/(dashboard)/analysis-results/_components/analysis-level-bar.tsx

@@ -42,7 +42,7 @@ const Level = ({
 
 export const AnalysisLevelBarSkeleton = () => {
   return (
-    <div className="mt-4 flex h-3 max-w-[360px] w-[35%] gap-1 sm:mt-0">
+    <div className="mt-4 flex h-3 w-[35%] max-w-[360px] gap-1 sm:mt-0">
       <Level color="gray-200" />
     </div>
   );
@@ -58,7 +58,7 @@ const AnalysisLevelBar = ({
   level: AnalysisResultLevel;
 }) => {
   return (
-    <div className="mt-4 flex h-3 max-w-[360px] w-[35%] gap-1 sm:mt-0">
+    <div className="mt-4 flex h-3 w-[35%] max-w-[360px] gap-1 sm:mt-0">
       {normLowerIncluded && (
         <>
           <Level

app/home/(user)/(dashboard)/analysis-results/_components/analysis.tsx

@@ -1,16 +1,20 @@
 'use client';
 
 import React, { useState } from 'react';
-import { format } from 'date-fns';
 
+import { UserAnalysisElement } from '@/packages/features/accounts/src/types/accounts';
+import { format } from 'date-fns';
 import { Info } from 'lucide-react';
 
+import { Trans } from '@kit/ui/trans';
 import { cn } from '@kit/ui/utils';
 
-import AnalysisLevelBar, { AnalysisLevelBarSkeleton, AnalysisResultLevel } from './analysis-level-bar';
-import { UserAnalysisElement } from '@/packages/features/accounts/src/types/accounts';
 import { AnalysisElement } from '~/lib/services/analysis-element.service';
-import { Trans } from '@kit/ui/trans';
+
+import AnalysisLevelBar, {
+  AnalysisLevelBarSkeleton,
+  AnalysisResultLevel,
+} from './analysis-level-bar';
 
 export enum AnalysisStatus {
   NORMAL = 0,
@@ -59,7 +63,7 @@ const Analysis = ({
   };
 
   return (
-    <div className="border-border items-center justify-between rounded-lg border px-5 py-3 sm:h-[65px] flex flex-col sm:flex-row px-12 gap-2 sm:gap-0">
+    <div className="border-border flex flex-col items-center justify-between gap-2 rounded-lg border px-5 px-12 py-3 sm:h-[65px] sm:flex-row sm:gap-0">
       <div className="flex items-center gap-2 font-semibold">
         {name}
         {results?.response_time && (
@@ -75,7 +79,9 @@ const Analysis = ({
                 { block: showTooltip },
               )}
             >
-              <Trans i18nKey="analysis-results:analysisDate" />{': '}{format(new Date(results.response_time), 'dd.MM.yyyy HH:mm')}
+              <Trans i18nKey="analysis-results:analysisDate" />
+              {': '}
+              {format(new Date(results.response_time), 'dd.MM.yyyy HH:mm')}
             </div>
           </div>
         )}
@@ -86,7 +92,7 @@ const Analysis = ({
             <div className="font-semibold">{value}</div>
             <div className="text-muted-foreground text-sm">{unit}</div>
           </div>
-          <div className="text-muted-foreground flex flex-col-reverse gap-2 text-center text-sm sm:block sm:gap-0 mx-8">
+          <div className="text-muted-foreground mx-8 flex flex-col-reverse gap-2 text-center text-sm sm:block sm:gap-0">
             {normLower} - {normUpper}
             <div>
               <Trans i18nKey="analysis-results:results.range.normal" />
@@ -105,7 +111,7 @@ const Analysis = ({
               <Trans i18nKey="analysis-results:waitingForResults" />
             </div>
           </div>
-          <div className="w-[60px] mx-8"></div>
+          <div className="mx-8 w-[60px]"></div>
           <AnalysisLevelBarSkeleton />
         </>
       )}

app/home/(user)/_components/dashboard.tsx

@@ -223,6 +223,7 @@ export default function Dashboard({ account }: { account: AccountWithParams }) {
             ) => {
               return (
                 <div className="flex justify-between" key={index}>
+                  <div className="mr-4 flex flex-row items-center gap-4">
                   <div className="mr-4 flex flex-row items-center gap-4">
                     <div
                       className={cn(

app/select-package/page.tsx

@@ -24,7 +24,8 @@ export const generateMetadata = async () => {
 };
 
 async function SelectPackagePage() {
-  const { analysisPackageElements, analysisPackages, countryCode } = await loadAnalysisPackages();
+  const { analysisPackageElements, analysisPackages, countryCode } =
+    await loadAnalysisPackages();
 
   return (
     <div className="container mx-auto my-24 flex flex-col items-center space-y-12">
@@ -44,7 +45,10 @@ async function SelectPackagePage() {
           }
         />
       </div>
-      <SelectAnalysisPackages analysisPackages={analysisPackages} countryCode={countryCode} />
+      <SelectAnalysisPackages
+        analysisPackages={analysisPackages}
+        countryCode={countryCode}
+      />
       <div className="flex justify-center">
         <Link href={pathsConfig.app.home}>
           <Button variant="secondary" className="align-center">