update medreport.accounts with keycloak data when supabase auth.user is created

update order xml for live, allow adding discounts in cart

.env

@@ -13,7 +13,7 @@ NEXT_PUBLIC_THEME_COLOR="#ffffff"
 NEXT_PUBLIC_THEME_COLOR_DARK="#0a0a0a"
 
 # AUTH
-NEXT_PUBLIC_AUTH_PASSWORD=true
+NEXT_PUBLIC_AUTH_PASSWORD=false
 NEXT_PUBLIC_AUTH_MAGIC_LINK=false
 NEXT_PUBLIC_CAPTCHA_SITE_KEY=
 
@@ -65,3 +65,6 @@ NEXT_PUBLIC_TEAM_NAVIGATION_STYLE=custom
 NEXT_PUBLIC_USER_NAVIGATION_STYLE=custom
 
 NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY=
+
+# Configure Medusa password secret for Keycloak users
+MEDUSA_PASSWORD_SECRET=ODEwMGNiMmUtOGMxYS0xMWYwLWJlZDYtYTM3YzYyMWY0NGEzCg==

.env.development

@@ -3,6 +3,7 @@
 
 # SITE
 NEXT_PUBLIC_SITE_URL=http://localhost:3000
+NEXT_PUBLIC_AUTH_PASSWORD=true
 
 # SUPABASE DEVELOPMENT
 

.env.production

@@ -6,10 +6,10 @@
 ## PUBLIC KEYS OR CONFIGURATION ARE OKAY TO BE PLACED HERE.
 
 # SUPABASE
-NEXT_PUBLIC_SUPABASE_URL=https://oqsdacktkhmbylmzstjq.supabase.co
+# NEXT_PUBLIC_SUPABASE_URL=https://oqsdacktkhmbylmzstjq.supabase.co
-NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Im9xc2RhY2t0a2htYnlsbXpzdGpxIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDY1MjgxMjMsImV4cCI6MjA2MjEwNDEyM30.LdHCTWxijFmhXdnT9KVuLRAVbtSwY7OO-oLtpd8GmO0
+# NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Im9xc2RhY2t0a2htYnlsbXpzdGpxIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDY1MjgxMjMsImV4cCI6MjA2MjEwNDEyM30.LdHCTWxijFmhXdnT9KVuLRAVbtSwY7OO-oLtpd8GmO0
 
-NEXT_PUBLIC_SITE_URL=https://test.medreport.ee
+# NEXT_PUBLIC_SITE_URL=https://test.medreport.ee
 
-# MONTONIO
+# # MONTONIO
-NEXT_PUBLIC_MONTONIO_ACCESS_KEY=7da5d7fa-3383-4997-9435-46aa818f4ead
+# NEXT_PUBLIC_MONTONIO_ACCESS_KEY=7da5d7fa-3383-4997-9435-46aa818f4ead

.env.staging

@@ -0,0 +1,15 @@
+# PRODUCTION ENVIRONMENT VARIABLES
+
+## DO NOT ADD VARS HERE UNLESS THEY ARE PUBLIC OR NOT SENSITIVE
+## THIS ENV IS USED FOR PRODUCTION AND IS COMMITED TO THE REPO
+## AVOID PLACING SENSITIVE DATA IN THIS FILE.
+## PUBLIC KEYS OR CONFIGURATION ARE OKAY TO BE PLACED HERE.
+
+# SUPABASE
+# NEXT_PUBLIC_SUPABASE_URL=https://klocrucggryikaxzvxgc.supabase.co
+# NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Imtsb2NydWNnZ3J5aWtheHp2eGdjIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTY5ODQ2MjgsImV4cCI6MjA3MjU2MDYyOH0.2XOQngowcymiSUZO_XEEWAWzco2uRIjwG7TAeRRLIdU
+
+# NEXT_PUBLIC_SITE_URL=https://test.medreport.ee
+
+# # MONTONIO
+# NEXT_PUBLIC_MONTONIO_ACCESS_KEY=7da5d7fa-3383-4997-9435-46aa818f4ead

.gitignore

@@ -43,3 +43,4 @@ yarn-error.log*
 next-env.d.ts
 
 dump.sql
+data.sql

Dockerfile

@@ -11,6 +11,7 @@ COPY packages packages
 COPY tooling tooling
 COPY .env .env
 COPY .env.production .env.production
+COPY .env.staging .env.staging
 
 # Load env file and echo a specific variable
 # RUN dotenv -e .env -- printenv | grep 'SUPABASE' || true
@@ -20,33 +21,33 @@ COPY . .
 
 ENV NODE_ENV=production
 
-# 🔍 Optional: Log key envs for debug
-RUN echo "📄 .env.production contents:" && cat .env.production \
- && echo "🔧 Current ENV available to Next.js build:" && printenv | grep -E 'SUPABASE|STRIPE|NEXT|NODE_ENV' || true
-
 RUN set -a \
- && . .env \
+    && . .env \
- && . .env.production \
+    && . .env.production \
- && set +a \
+    && . .env.staging \
- && node check-env.js \
+    && set +a \
- && pnpm build
+    && node check-env.js \
+    && pnpm build
 
 
 # --- Stage 2: Runtime ---
 FROM node:20-alpine
+ARG APP_ENV=production
 
 WORKDIR /app
 
 COPY --from=builder /app ./
 
+RUN cp ".env.${APP_ENV}" .env.local
+
 RUN npm install -g pnpm@9 \
- && pnpm install --prod --frozen-lockfile
+    && pnpm install --prod --frozen-lockfile
 
 ENV NODE_ENV=production
 
 # 🔍 Optional: Log key envs for debug
-RUN echo "📄 .env.production contents:" && cat .env.production \
+RUN echo "📄 .env contents:" && cat .env.local \
- && echo "🔧 Current ENV available to Next.js build:" && printenv | grep -E 'SUPABASE|STRIPE|NEXT|NODE_ENV' || true
+    && echo "🔧 Current ENV available to Next.js build:" && printenv | grep -E 'SUPABASE|STRIPE|NEXT|NODE_ENV' || true
 
 
 EXPOSE 3000

app/(marketing)/_components/site-header-account-section.tsx

@@ -13,10 +13,7 @@ import { Button } from '@kit/ui/button';
 import { If } from '@kit/ui/if';
 import { Trans } from '@kit/ui/trans';
 
-import { featureFlagsConfig } from '@kit/shared/config';
+import { authConfig, featureFlagsConfig, pathsConfig } from '@kit/shared/config';
-
-import { pathsConfig } from '@kit/shared/config';
-
 
 const ModeToggle = dynamic(() =>
   import('@kit/ui/mode-toggle').then((mod) => ({
@@ -69,17 +66,19 @@ function AuthButtons() {
       </div>
 
       <div className={'flex gap-x-2.5'}>
-        <Button className={'hidden md:block'} asChild variant={'ghost'}>
+        <Button className={'block'} asChild variant={'ghost'}>
           <Link href={pathsConfig.auth.signIn}>
             <Trans i18nKey={'auth:signIn'} />
           </Link>
         </Button>
 
-        <Button asChild className="text-xs md:text-sm" variant={'default'}>
+        {authConfig.providers.password && (
-          <Link href={pathsConfig.auth.signUp}>
+          <Button asChild className="text-xs md:text-sm" variant={'default'}>
-            <Trans i18nKey={'auth:signUp'} />
+            <Link href={pathsConfig.auth.signUp}>
-          </Link>
+              <Trans i18nKey={'auth:signUp'} />
-        </Button>
+            </Link>
+          </Button>
+        )}
       </div>
     </div>
   );

app/(marketing)/contact/_lib/server/server-actions.ts

@@ -9,18 +9,16 @@ import { ContactEmailSchema } from '../contact-email.schema';
 
 const contactEmail = z
   .string({
-    description: `The email where you want to receive the contact form submissions.`,
+    error:
-    required_error:
       'Contact email is required. Please use the environment variable CONTACT_EMAIL.',
-  })
+  }).describe(`The email where you want to receive the contact form submissions.`)
   .parse(process.env.CONTACT_EMAIL);
 
 const emailFrom = z
   .string({
-    description: `The email sending address.`,
+    error:
-    required_error:
       'Sender email is required. Please use the environment variable EMAIL_SENDER.',
-  })
+  }).describe(`The email sending address.`)
   .parse(process.env.EMAIL_SENDER);
 
 export const sendContactEmail = enhanceAction(

app/(marketing)/page.tsx

@@ -1,6 +1,7 @@
 import Link from 'next/link';
 
 import { MedReportLogo } from '@kit/shared/components/med-report-logo';
+import { pathsConfig } from '@kit/shared/config';
 import { ArrowRightIcon } from 'lucide-react';
 
 import { CtaButton, Hero } from '@kit/ui/marketing';
@@ -32,7 +33,7 @@ function MainCallToActionButton() {
   return (
     <div className={'flex space-x-4'}>
       <CtaButton>
-        <Link href={'/auth/sign-up'}>
+        <Link href={pathsConfig.auth.signUp}>
           <span className={'flex items-center space-x-0.5'}>
             <span>
               <Trans i18nKey={'common:getStarted'} />

app/(public)/company-offer/_components/company-offer-form.tsx

@@ -4,14 +4,15 @@ import { useState } from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import { SubmitButton } from '@kit/shared/components/ui/submit-button';
+import { sendEmailFromTemplate } from '@/lib/services/mailer.service';
-import { sendCompanyOfferEmail } from '@/lib/services/mailer.service';
 import { CompanySubmitData } from '@/lib/types/company';
 import { companyOfferSchema } from '@/lib/validations/company-offer.schema';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import { renderCompanyOfferEmail } from '@kit/email-templates';
+import { SubmitButton } from '@kit/shared/components/ui/submit-button';
 import { FormItem } from '@kit/ui/form';
 import { Input } from '@kit/ui/input';
 import { Label } from '@kit/ui/label';
@@ -39,7 +40,14 @@ const CompanyOfferForm = () => {
     });
 
     try {
-      sendCompanyOfferEmail(data, language)
+      sendEmailFromTemplate(
+        renderCompanyOfferEmail,
+        {
+          companyData: data,
+          language,
+        },
+        process.env.CONTACT_EMAIL!,
+      )
         .then(() => router.push('/company-offer/success'))
         .catch((error) => {
           setIsLoading(false);

app/api/job/handler/send-open-jobs-emails.ts

@@ -0,0 +1,23 @@
+import { renderNewJobsAvailableEmail } from '@kit/email-templates';
+
+import { getDoctorAccounts } from '~/lib/services/account.service';
+import { getOpenJobAnalysisResponseIds } from '~/lib/services/doctor-jobs.service';
+import { sendEmailFromTemplate } from '~/lib/services/mailer.service';
+
+export default async function sendOpenJobsEmails() {
+  const analysisResponseIds = await getOpenJobAnalysisResponseIds();
+
+  const doctorAccounts = await getDoctorAccounts();
+  const doctorEmails: string[] = doctorAccounts
+    .map(({ email }) => email)
+    .filter((email): email is string => !!email);
+
+  await sendEmailFromTemplate(
+    renderNewJobsAvailableEmail,
+    {
+      language: 'et',
+      analysisResponseIds,
+    },
+    doctorEmails,
+  );
+}

app/api/job/handler/sync-analysis-groups.ts

@@ -164,10 +164,15 @@ export default async function syncAnalysisGroups() {
     console.info('Inserting sync entry');
     await createSyncSuccessEntry();
   } catch (e) {
-    await createSyncFailEntry(JSON.stringify(e));
+    const errorMessage = e instanceof Error ? e.message : String(e);
-    console.error(e);
+    await createSyncFailEntry(JSON.stringify({
+      message: errorMessage,
+      stack: e instanceof Error ? e.stack : undefined,
+      name: e instanceof Error ? e.name : 'Unknown',
+    }, null, 2));
+    console.error('Sync failed:', e);
     throw new Error(
-      `Failed to sync public message data, error: ${JSON.stringify(e)}`,
+      `Failed to sync public message data, error: ${errorMessage}`,
     );
   }
 }

app/api/job/handler/sync-connected-online.ts

@@ -71,19 +71,19 @@ export default async function syncConnectedOnline() {
       return {
         id: service.ID,
         clinic_id: service.ClinicID,
-        code: service.Code,
+        sync_id: service.SyncID,
-        description: service.Description || null,
-        display: service.Display,
-        duration: service.Duration,
-        has_free_codes: !!service.HasFreeCodes,
         name: service.Name,
+        description: service.Description || null,
+        price: service.Price,
+        requires_payment: !!service.RequiresPayment,
+        duration: service.Duration,
         neto_duration: service.NetoDuration,
+        display: service.Display,
+        price_periods: service.PricePeriods || null,
         online_hide_duration: service.OnlineHideDuration,
         online_hide_price: service.OnlineHidePrice,
-        price: service.Price,
+        code: service.Code,
-        price_periods: service.PricePeriods || null,
+        has_free_codes: !!service.HasFreeCodes,
-        requires_payment: !!service.RequiresPayment,
-        sync_id: service.SyncID,
       };
     });
 

app/api/job/medipost-retry-dispatch/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import loadEnv from "../handler/load-env";
 import validateApiKey from "../handler/validate-api-key";
-import { getOrderedAnalysisElementsIds, sendOrderToMedipost } from "~/lib/services/medipost.service";
+import { getOrderedAnalysisIds, sendOrderToMedipost } from "~/lib/services/medipost.service";
 import { retrieveOrder } from "@lib/data/orders";
 import { getMedipostDispatchTries } from "~/lib/services/audit.service";
 
@@ -25,7 +25,7 @@ export const POST = async (request: NextRequest) => {
 
   try {
     const medusaOrder = await retrieveOrder(medusaOrderId);
-    const orderedAnalysisElements = await getOrderedAnalysisElementsIds({ medusaOrder });
+    const orderedAnalysisElements = await getOrderedAnalysisIds({ medusaOrder });
     await sendOrderToMedipost({ medusaOrderId, orderedAnalysisElements });
     console.info("Successfully sent order to medipost");
     return NextResponse.json({

app/api/job/send-open-jobs-emails/route.ts

@@ -0,0 +1,53 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+import {
+  NotificationAction,
+  createNotificationLog,
+} from '~/lib/services/audit/notificationEntries.service';
+import loadEnv from '../handler/load-env';
+import sendOpenJobsEmails from '../handler/send-open-jobs-emails';
+import validateApiKey from '../handler/validate-api-key';
+
+export const POST = async (request: NextRequest) => {
+  loadEnv();
+
+  try {
+    validateApiKey(request);
+  } catch (e) {
+    return NextResponse.json({}, { status: 401, statusText: 'Unauthorized' });
+  }
+
+  try {
+    await sendOpenJobsEmails();
+    console.info(
+      'Successfully sent out open job notification emails to doctors.',
+    );
+    await createNotificationLog({
+      action: NotificationAction.NEW_JOBS_ALERT,
+      status: 'SUCCESS',
+    });
+    return NextResponse.json(
+      {
+        message:
+          'Successfully sent out open job notification emails to doctors.',
+      },
+      { status: 200 },
+    );
+  } catch (e: any) {
+    console.error(
+      'Error sending out open job notification emails to doctors.',
+      e,
+    );
+    await createNotificationLog({
+      action: NotificationAction.NEW_JOBS_ALERT,
+      status: 'FAIL',
+      comment: e?.message,
+    });
+    return NextResponse.json(
+      {
+        message: 'Failed to send out open job notification emails to doctors.',
+      },
+      { status: 500 },
+    );
+  }
+};

app/api/job/test-medipost-responses/route.ts

@@ -3,7 +3,7 @@ import { getAnalysisOrdersAdmin } from "~/lib/services/order.service";
 import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipostTest.service";
 import { retrieveOrder } from "@lib/data";
 import { getAccountAdmin } from "~/lib/services/account.service";
-import { getOrderedAnalysisElementsIds } from "~/lib/services/medipost.service";
+import { getOrderedAnalysisIds } from "~/lib/services/medipost.service";
 import loadEnv from "../handler/load-env";
 import validateApiKey from "../handler/validate-api-key";
 
@@ -24,7 +24,7 @@ export async function POST(request: NextRequest) {
     const medusaOrder = await retrieveOrder(medusaOrderId)
 
     const account = await getAccountAdmin({ primaryOwnerUserId: medreportOrder.user_id });
-    const orderedAnalysisElementsIds = await getOrderedAnalysisElementsIds({ medusaOrder });
+    const orderedAnalysisElementsIds = await getOrderedAnalysisIds({ medusaOrder });
 
     console.info(`Sending test response for order=${medusaOrderId} with ${orderedAnalysisElementsIds.length} ordered analysis elements`);
     const idsToSend = orderedAnalysisElementsIds;
@@ -35,14 +35,12 @@ export async function POST(request: NextRequest) {
         lastName: account.last_name ?? '',
         phone: account.phone ?? '',
       },
-      orderedAnalysisElementsIds: idsToSend.map(({ analysisElementId }) => analysisElementId),
+      orderedAnalysisElementsIds: idsToSend.map(({ analysisElementId }) => analysisElementId).filter(Boolean) as number[],
-      orderedAnalysesIds: [],
+      orderedAnalysesIds: idsToSend.map(({ analysisId }) => analysisId).filter(Boolean) as number[],
       orderId: medusaOrderId,
       orderCreatedAt: new Date(medreportOrder.created_at),
     });
 
-    console.info("SEND XML", messageXml);
-
     try {
       await sendPrivateMessageTestResponse({ messageXml });
     } catch (error) {

app/api/order/medipost-test-response/route.ts

@@ -3,7 +3,7 @@ import { getOrder } from "~/lib/services/order.service";
 import { composeOrderTestResponseXML, sendPrivateMessageTestResponse } from "~/lib/services/medipostTest.service";
 import { retrieveOrder } from "@lib/data";
 import { getAccountAdmin } from "~/lib/services/account.service";
-import { getOrderedAnalysisElementsIds } from "~/lib/services/medipost.service";
+import { createMedipostActionLog, getOrderedAnalysisIds } from "~/lib/services/medipost.service";
 
 export async function POST(request: Request) {
   // const isDev = process.env.NODE_ENV === 'development';
@@ -11,16 +11,15 @@ export async function POST(request: Request) {
   //   return NextResponse.json({ error: 'This endpoint is only available in development mode' }, { status: 403 });
   // }
 
-  const { medusaOrderId, maxItems = null } = await request.json();
+  const { medusaOrderId } = await request.json();
 
   const medusaOrder = await retrieveOrder(medusaOrderId)
   const medreportOrder = await getOrder({ medusaOrderId });
 
   const account = await getAccountAdmin({ primaryOwnerUserId: medreportOrder.user_id });
-  const orderedAnalysisElementsIds = await getOrderedAnalysisElementsIds({ medusaOrder });
+  const orderedAnalysisElementsIds = await getOrderedAnalysisIds({ medusaOrder });
 
-  console.info(`Sending test response for order=${medusaOrderId} with ${orderedAnalysisElementsIds.length} (${maxItems ?? 'all'}) ordered analysis elements`);
+  console.info(`Sending test response for order=${medusaOrderId} with ${orderedAnalysisElementsIds.length} ordered analysis elements`);
-  const idsToSend = typeof maxItems === 'number' ? orderedAnalysisElementsIds.slice(0, maxItems) : orderedAnalysisElementsIds;
   const messageXml = await composeOrderTestResponseXML({
     person: {
       idCode: account.personal_code!,
@@ -28,13 +27,18 @@ export async function POST(request: Request) {
       lastName: account.last_name ?? '',
       phone: account.phone ?? '',
     },
-    orderedAnalysisElementsIds: idsToSend.map(({ analysisElementId }) => analysisElementId),
+    orderedAnalysisElementsIds: orderedAnalysisElementsIds.map(({ analysisElementId }) => analysisElementId).filter(Boolean) as number[],
-    orderedAnalysesIds: [],
+    orderedAnalysesIds: orderedAnalysisElementsIds.map(({ analysisId }) => analysisId).filter(Boolean) as number[],
     orderId: medusaOrderId,
     orderCreatedAt: new Date(medreportOrder.created_at),
   });
 
   try {
+    await createMedipostActionLog({
+      action: 'send_fake_analysis_results_to_medipost',
+      xml: messageXml,
+      medusaOrderId,
+    });
     await sendPrivateMessageTestResponse({ messageXml });
   } catch (error) {
     console.error("Error sending private message test response: ", error);

app/auth/callback/route.ts

@@ -1,19 +1,62 @@
 import { redirect } from 'next/navigation';
 import type { NextRequest } from 'next/server';
 
-import { createAuthCallbackService } from '@kit/supabase/auth';
+import { createAuthCallbackService, getErrorURLParameters } from '@kit/supabase/auth';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { pathsConfig } from '@kit/shared/config';
+import { createAccountsApi } from '@/packages/features/accounts/src/server/api';
 
+const ERROR_PATH = '/auth/callback/error';
+
+const redirectOnError = (searchParams?: string) => {
+  return redirect(`${ERROR_PATH}${searchParams ? `?${searchParams}` : ''}`);
+}
 
 export async function GET(request: NextRequest) {
+  const { searchParams } = new URL(request.url);
+
+  const error = searchParams.get('error');
+  if (error) {
+    const { searchParams } = getErrorURLParameters({ error });
+    return redirectOnError(searchParams);
+  }
+
+  const authCode = searchParams.get('code');
+  if (!authCode) {
+    return redirectOnError();
+  }
+
+  let redirectPath = searchParams.get('next') || pathsConfig.app.home;
+  // if we have an invite token, we redirect to the join team page
+  // instead of the default next url. This is because the user is trying
+  // to join a team and we want to make sure they are redirected to the
+  // correct page.
+  const inviteToken = searchParams.get('invite_token');
+  if (inviteToken) {
+    const urlParams = new URLSearchParams({
+      invite_token: inviteToken,
+      email: searchParams.get('email') ?? '',
+    });
+
+    redirectPath = `${pathsConfig.app.joinTeam}?${urlParams.toString()}`;
+  }
+
   const service = createAuthCallbackService(getSupabaseServerClient());
+  const oauthResult = await service.exchangeCodeForSession(authCode);
+  if (!("isSuccess" in oauthResult)) {
+    return redirectOnError(oauthResult.searchParams);
+  }
 
-  const { nextPath } = await service.exchangeCodeForSession(request, {
+  const api = createAccountsApi(getSupabaseServerClient());
-    joinTeamPath: pathsConfig.app.joinTeam,
-    redirectPath: pathsConfig.app.home,
-  });
 
-  return redirect(nextPath);
+  const account = await api.getPersonalAccountByUserId(
+    oauthResult.user.id,
+  );
+
+  if (!account.email || !account.name || !account.last_name) {
+    return redirect(pathsConfig.auth.updateAccount);
+  }
+  
+  return redirect(redirectPath);
 }

app/auth/confirm/route.ts

@@ -5,7 +5,6 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { pathsConfig } from '@kit/shared/config';
 
-
 export async function GET(request: NextRequest) {
   const service = createAuthCallbackService(getSupabaseServerClient());
 

app/auth/sign-in/components/PasswordOption.tsx

@@ -0,0 +1,54 @@
+import Link from 'next/link';
+
+import { SignInMethodsContainer } from '@kit/auth/sign-in';
+import { authConfig, pathsConfig } from '@kit/shared/config';
+import { Button } from '@kit/ui/button';
+import { Heading } from '@kit/ui/heading';
+import { Trans } from '@kit/ui/trans';
+
+export default function PasswordOption({
+  inviteToken,
+  returnPath,
+}: {
+  inviteToken?: string;
+  returnPath?: string;
+}) {
+  const signUpPath =
+    pathsConfig.auth.signUp +
+    (inviteToken ? `?invite_token=${inviteToken}` : '');
+
+  const paths = {
+    callback: pathsConfig.auth.callback,
+    returnPath: returnPath ?? pathsConfig.app.home,
+    joinTeam: pathsConfig.app.joinTeam,
+    updateAccount: pathsConfig.auth.updateAccount,
+  };
+
+  return (
+    <>
+      <div className={'flex flex-col items-center gap-1'}>
+        <Heading level={4} className={'tracking-tight'}>
+          <Trans i18nKey={'auth:signInHeading'} />
+        </Heading>
+
+        <p className={'text-muted-foreground text-sm'}>
+          <Trans i18nKey={'auth:signInSubheading'} />
+        </p>
+      </div>
+
+      <SignInMethodsContainer
+        inviteToken={inviteToken}
+        paths={paths}
+        providers={authConfig.providers}
+      />
+
+      <div className={'flex justify-center'}>
+        <Button asChild variant={'link'} size={'sm'}>
+          <Link href={signUpPath} prefetch={true}>
+            <Trans i18nKey={'auth:doNotHaveAccountYet'} />
+          </Link>
+        </Button>
+      </div>
+    </>
+  );
+}

app/auth/sign-in/components/SignInPageClientRedirect.tsx

@@ -0,0 +1,37 @@
+'use client';
+
+import Loading from '@/app/home/loading';
+import { useEffect } from 'react';
+import { getSupabaseBrowserClient } from '@/packages/supabase/src/clients/browser-client';
+import { useRouter } from 'next/navigation';
+
+export function SignInPageClientRedirect() {
+  const router = useRouter();
+
+  useEffect(() => {
+    async function signIn() {
+      const { data, error } = await getSupabaseBrowserClient()
+        .auth
+        .signInWithOAuth({
+          provider: 'keycloak',
+          options: {
+            redirectTo: `${window.location.origin}/auth/callback`,
+            queryParams: {
+              prompt: 'login',
+            },
+          }
+        });
+
+      if (error) {
+        console.error('OAuth error', error);
+        router.push('/');
+      } else if (data.url) {
+        router.push(data.url);
+      }
+    }
+
+    signIn();
+  }, [router]);
+
+  return <Loading />;
+}

app/auth/sign-in/page.tsx

@@ -1,14 +1,9 @@
-import Link from 'next/link';
+import { pathsConfig, authConfig } from '@kit/shared/config';
-
-
-import { SignInMethodsContainer } from '@kit/auth/sign-in';
-import { authConfig, pathsConfig } from '@kit/shared/config';
-import { Button } from '@kit/ui/button';
-import { Heading } from '@kit/ui/heading';
-import { Trans } from '@kit/ui/trans';
 
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
+import { SignInPageClientRedirect } from './components/SignInPageClientRedirect';
+import PasswordOption from './components/PasswordOption';
 
 interface SignInPageProps {
   searchParams: Promise<{
@@ -26,47 +21,14 @@ export const generateMetadata = async () => {
 };
 
 async function SignInPage({ searchParams }: SignInPageProps) {
-  const { invite_token: inviteToken, next = pathsConfig.app.home } =
+  const { invite_token: inviteToken, next: returnPath = pathsConfig.app.home } =
     await searchParams;
 
-  const signUpPath =
+  if (authConfig.providers.password) {
-    pathsConfig.auth.signUp +
+    return <PasswordOption inviteToken={inviteToken} returnPath={returnPath} />;
-    (inviteToken ? `?invite_token=${inviteToken}` : '');
+  }
 
-  const paths = {
+  return <SignInPageClientRedirect />;
-    callback: pathsConfig.auth.callback,
-    returnPath: next ?? pathsConfig.app.home,
-    joinTeam: pathsConfig.app.joinTeam,
-    updateAccount: pathsConfig.auth.updateAccount,
-  };
-
-  return (
-    <>
-      <div className={'flex flex-col items-center gap-1'}>
-        <Heading level={4} className={'tracking-tight'}>
-          <Trans i18nKey={'auth:signInHeading'} />
-        </Heading>
-
-        <p className={'text-muted-foreground text-sm'}>
-          <Trans i18nKey={'auth:signInSubheading'} />
-        </p>
-      </div>
-
-      <SignInMethodsContainer
-        inviteToken={inviteToken}
-        paths={paths}
-        providers={authConfig.providers}
-      />
-
-      <div className={'flex justify-center'}>
-        <Button asChild variant={'link'} size={'sm'}>
-          <Link href={signUpPath} prefetch={true}>
-            <Trans i18nKey={'auth:doNotHaveAccountYet'} />
-          </Link>
-        </Button>
-      </div>
-    </>
-  );
 }
 
 export default withI18n(SignInPage);

app/auth/sign-up/page.tsx

@@ -1,4 +1,5 @@
 import Link from 'next/link';
+import { redirect } from 'next/navigation';
 
 import { SignUpMethodsContainer } from '@kit/auth/sign-up';
 import { authConfig, pathsConfig } from '@kit/shared/config';
@@ -37,6 +38,10 @@ async function SignUpPage({ searchParams }: Props) {
     pathsConfig.auth.signIn +
     (inviteToken ? `?invite_token=${inviteToken}` : '');
 
+  if (!authConfig.providers.password) {
+    return redirect('/');
+  }
+
   return (
     <>
       <div className={'flex flex-col items-center gap-1'}>

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

@@ -2,8 +2,6 @@
 
 import Link from 'next/link';
 
-import { User } from '@supabase/supabase-js';
-
 import { ExternalLink } from '@/public/assets/external-link';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useForm } from 'react-hook-form';
@@ -23,31 +21,52 @@ import { Trans } from '@kit/ui/trans';
 
 import { UpdateAccountSchema } from '../_lib/schemas/update-account.schema';
 import { onUpdateAccount } from '../_lib/server/update-account';
+import { z } from 'zod';
 
-export function UpdateAccountForm({ user }: { user: User }) {
+type UpdateAccountFormValues = z.infer<typeof UpdateAccountSchema>;
+
+export function UpdateAccountForm({
+  defaultValues,
+}: {
+  defaultValues: UpdateAccountFormValues,
+}) {
   const form = useForm({
     resolver: zodResolver(UpdateAccountSchema),
     mode: 'onChange',
-    defaultValues: {
+    defaultValues,
-      firstName: '',
-      lastName: '',
-      personalCode: '',
-      email: user.email,
-      phone: '',
-      city: '',
-      weight: 0,
-      height: 0,
-      userConsent: false,
-    },
   });
+
+  const { firstName, lastName, personalCode, email, weight, height, userConsent } = defaultValues;
+
+  const hasFirstName = !!firstName;
+  const hasLastName = !!lastName;
+  const hasPersonalCode = !!personalCode;
+  const hasEmail = !!email;
+  const hasWeight = !!weight;
+  const hasHeight = !!height;
+  const hasUserConsent = !!userConsent;
+
+  const onUpdateAccountOptions = async (values: UpdateAccountFormValues) =>
+    onUpdateAccount({
+      ...values,
+      ...(hasFirstName && { firstName }),
+      ...(hasLastName && { lastName }),
+      ...(hasPersonalCode && { personalCode }),
+      ...(hasEmail && { email }),
+      ...(hasWeight && { weight: values.weight ?? weight }),
+      ...(hasHeight && { height: values.height ?? height }),
+      ...(hasUserConsent && { userConsent: values.userConsent ?? userConsent }),
+    });
+
   return (
     <Form {...form}>
       <form
         className="flex flex-col gap-6 px-6 pt-10 text-left"
-        onSubmit={form.handleSubmit(onUpdateAccount)}
+        onSubmit={form.handleSubmit(onUpdateAccountOptions)}
       >
         <FormField
           name="firstName"
+          disabled={hasFirstName}
           render={({ field }) => (
             <FormItem>
               <FormLabel>
@@ -63,6 +82,7 @@ export function UpdateAccountForm({ user }: { user: User }) {
 
         <FormField
           name="lastName"
+          disabled={hasLastName}
           render={({ field }) => (
             <FormItem>
               <FormLabel>
@@ -78,6 +98,7 @@ export function UpdateAccountForm({ user }: { user: User }) {
 
         <FormField
           name="personalCode"
+          disabled={hasPersonalCode}
           render={({ field }) => (
             <FormItem>
               <FormLabel>
@@ -93,13 +114,14 @@ export function UpdateAccountForm({ user }: { user: User }) {
 
         <FormField
           name="email"
+          disabled={hasEmail}
           render={({ field }) => (
             <FormItem>
               <FormLabel>
                 <Trans i18nKey={'common:formField:email'} />
               </FormLabel>
               <FormControl>
-                <Input {...field} disabled />
+                <Input {...field} />
               </FormControl>
               <FormMessage />
             </FormItem>

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

@@ -1,19 +1,20 @@
 import { z } from 'zod';
+import parsePhoneNumber from 'libphonenumber-js/min';
 
 export const UpdateAccountSchema = z.object({
   firstName: z
     .string({
-      required_error: 'First name is required',
+      error: 'First name is required',
     })
     .nonempty(),
   lastName: z
     .string({
-      required_error: 'Last name is required',
+      error: 'Last name is required',
     })
     .nonempty(),
   personalCode: z
     .string({
-      required_error: 'Personal code is required',
+      error: 'Personal code is required',
     })
     .nonempty(),
   email: z.string().email({
@@ -21,21 +22,38 @@ export const UpdateAccountSchema = z.object({
   }),
   phone: z
     .string({
-      required_error: 'Phone number is required',
+      error: 'Phone number is required',
     })
-    .nonempty(),
+    .nonempty()
+    .refine(
+      (phone) => {
+        try {
+          const phoneNumber = parsePhoneNumber(phone);
+          return !!phoneNumber && phoneNumber.isValid() && phoneNumber.country === 'EE';
+        } catch {
+          return false;
+        }
+      },
+      {
+        message: 'common:formFieldError.invalidPhoneNumber',
+      }
+    ),
   city: z.string().optional(),
   weight: z
     .number({
-      required_error: 'Weight is required',
+      error: (issue) =>
-      invalid_type_error: 'Weight must be a number',
+        issue.input === undefined
+          ? 'Weight is required'
+          : 'Weight must be a number',
     })
     .gt(0, { message: 'Weight must be greater than 0' }),
 
   height: z
     .number({
-      required_error: 'Height is required',
+      error: (issue) =>
-      invalid_type_error: 'Height must be a number',
+        issue.input === undefined
+          ? 'Height is required'
+          : 'Height must be a number',
     })
     .gt(0, { message: 'Height must be greater than 0' }),
   userConsent: z.boolean().refine((val) => val === true, {

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

@@ -28,11 +28,15 @@ export const onUpdateAccount = enhanceAction(
       console.warn('On update account error: ', err);
     }
 
-    await updateCustomer({
+    try {
-      first_name: params.firstName,
+      await updateCustomer({
-      last_name: params.lastName,
+        first_name: params.firstName,
-      phone: params.phone,
+        last_name: params.lastName,
-    });
+        phone: params.phone,
+      });
+    } catch (e) {
+      console.error("Failed to update Medusa customer", e);
+    }
 
     const hasUnseenMembershipConfirmation =
       await api.hasUnseenMembershipConfirmation();

app/auth/update-account/page.tsx

@@ -11,18 +11,39 @@ import { Trans } from '@kit/ui/trans';
 import { withI18n } from '~/lib/i18n/with-i18n';
 
 import { UpdateAccountForm } from './_components/update-account-form';
+import { loadCurrentUserAccount } from '@/app/home/(user)/_lib/server/load-user-account';
+import { toTitleCase } from '~/lib/utils';
 
 async function UpdateAccount() {
   const client = getSupabaseServerClient();
+  const account = await loadCurrentUserAccount();
 
   const {
     data: { user },
   } = await client.auth.getUser();
+  const isKeycloakUser = user?.app_metadata?.provider === 'keycloak';
 
   if (!user) {
     redirect(pathsConfig.auth.signIn);
   }
 
+  const defaultValues = {
+    firstName: account?.name ? toTitleCase(account.name) : '',
+    lastName: account?.last_name ? toTitleCase(account.last_name) : '',
+    personalCode: account?.personal_code ?? '',
+    email: (() => {
+      if (isKeycloakUser) {
+        return account?.email ?? '';
+      }
+      return account?.email ?? user?.email ?? '';
+    })(),
+    phone: account?.phone ?? '',
+    city: account?.city ?? '',
+    weight: account?.accountParams?.weight ?? 0,
+    height: account?.accountParams?.height ?? 0,
+    userConsent: account?.has_consent_personal_data ?? false,
+  };
+
   return (
     <div className="border-border flex max-w-5xl flex-row overflow-hidden rounded-3xl border">
       <div className="relative flex min-w-md flex-col px-12 pt-7 pb-22 text-center md:w-1/2">
@@ -34,7 +55,7 @@ async function UpdateAccount() {
         <p className="text-muted-foreground pt-1 text-sm">
           <Trans i18nKey={'account:updateAccount:description'} />
         </p>
-        <UpdateAccountForm user={user} />
+        <UpdateAccountForm defaultValues={defaultValues} />
       </div>
       <div className="hidden w-1/2 min-w-[460px] bg-[url(/assets/med-report-logo-big.png)] bg-cover bg-center bg-no-repeat md:block"></div>
     </div>

app/doctor/_components/analysis-view.tsx

@@ -4,6 +4,7 @@ import { useState } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useQueryClient } from '@tanstack/react-query';
+import { capitalize } from 'lodash';
 import { useForm } from 'react-hook-form';
 
 import { giveFeedbackAction } from '@kit/doctor/actions/doctor-server-actions';
@@ -22,6 +23,9 @@ import {
   doctorAnalysisFeedbackFormSchema,
 } from '@kit/doctor/schema/doctor-analysis.schema';
 import ConfirmationModal from '@kit/shared/components/confirmation-modal';
+import {
+  useCurrentLocaleLanguageNames
+} from '@kit/shared/hooks';
 import { getFullName } from '@kit/shared/utils';
 import { useUser } from '@kit/supabase/hooks/use-user';
 import { Button } from '@kit/ui/button';
@@ -57,6 +61,8 @@ export default function AnalysisView({
 
   const { data: user } = useUser();
 
+  const languageNames = useCurrentLocaleLanguageNames();
+
   const isInProgress = !!(
     !!feedback?.status &&
     feedback?.doctor_user_id &&
@@ -191,6 +197,12 @@ export default function AnalysisView({
           <Trans i18nKey="doctor:email" />
         </div>
         <div>{patient.email}</div>
+        <div className="font-bold">
+          <Trans i18nKey="common:language" />
+        </div>
+        <div>
+          {capitalize(languageNames.of(patient.preferred_locale ?? 'et'))}
+        </div>
       </div>
       <div className="xs:hidden block">
         <DoctorJobSelect

app/doctor/_components/results-table.tsx

@@ -10,6 +10,7 @@ import { Eye } from 'lucide-react';
 import { getResultSetName } from '@kit/doctor/lib/helpers';
 import { ResponseTable } from '@kit/doctor/schema/doctor-analysis.schema';
 import { pathsConfig } from '@kit/shared/config';
+import { useCurrentLocaleLanguageNames } from '@kit/shared/hooks';
 import { getFullName } from '@kit/shared/utils';
 import { useUser } from '@kit/supabase/hooks/use-user';
 import { Button } from '@kit/ui/button';
@@ -23,7 +24,9 @@ import {
   TableRow,
 } from '@kit/ui/table';
 import { Trans } from '@kit/ui/trans';
+
 import DoctorJobSelect from './doctor-job-select';
+import { capitalize } from 'lodash';
 
 export default function ResultsTable({
   results = [],
@@ -58,6 +61,8 @@ export default function ResultsTable({
   const [isPending, startTransition] = useTransition();
   const { data: currentUser } = useUser();
 
+  const languageNames = useCurrentLocaleLanguageNames();
+
   const fetchPage = async (page: number) => {
     startTransition(async () => {
       const result = await fetchAction({
@@ -116,6 +121,9 @@ export default function ResultsTable({
             <TableHead className="w-20">
               <Trans i18nKey="doctor:resultsTable.resultsStatus" />
             </TableHead>
+            <TableHead className="w-20">
+              <Trans i18nKey="doctor:resultsTable.language" />
+            </TableHead>
             <TableHead className="w-20">
               <Trans i18nKey="doctor:resultsTable.assignedTo" />
             </TableHead>
@@ -179,6 +187,11 @@ export default function ResultsTable({
                       }}
                     />
                   </TableCell>
+                  <TableCell>
+                    {capitalize(
+                      languageNames.of(result?.patient?.preferred_locale ?? 'et'),
+                    )}
+                  </TableCell>
                   <TableCell>
                     <DoctorJobSelect
                       doctorUserId={result.doctor?.primary_owner_user_id}

app/doctor/analysis/[id]/page.tsx

@@ -18,8 +18,8 @@ async function AnalysisPage({
     id: string;
   }>;
 }) {
-  const { id: analysisResponseId } = await params;
+  const { id: analysisOrderId } = await params;
-  const analysisResultDetails = await loadResult(Number(analysisResponseId));
+  const analysisResultDetails = await loadResult(Number(analysisOrderId));
 
   if (!analysisResultDetails) {
     return null;
@@ -28,7 +28,7 @@ async function AnalysisPage({
   if (analysisResultDetails) {
     await createDoctorPageViewLog({
       action: DoctorPageViewAction.VIEW_ANALYSIS_RESULTS,
-      recordKey: analysisResponseId,
+      recordKey: analysisOrderId,
       dataOwnerUserId: analysisResultDetails.patient.userId,
     });
   }
@@ -50,3 +50,5 @@ async function AnalysisPage({
 
 export default DoctorGuard(AnalysisPage);
 const loadResult = cache(getAnalysisResultsForDoctor);
+
+

app/home/(user)/(dashboard)/analysis-results/[id]/page.tsx

@@ -0,0 +1,107 @@
+import Link from 'next/link';
+
+import { ButtonTooltip } from '@kit/shared/components/ui/button-tooltip';
+import { pathsConfig } from '@kit/shared/config';
+import { Button } from '@kit/ui/button';
+import { PageBody, PageHeader } from '@kit/ui/page';
+import { Trans } from '@kit/ui/trans';
+
+import { loadCurrentUserAccount } from '~/home/(user)/_lib/server/load-user-account';
+import { loadUserAnalysis } from '~/home/(user)/_lib/server/load-user-analysis';
+import {
+  PageViewAction,
+  createPageViewLog,
+} from '~/lib/services/audit/pageView.service';
+
+import Analysis from '../_components/analysis';
+
+export default async function AnalysisResultsPage({
+  params,
+}: {
+  params: Promise<{
+    id: string;
+  }>;
+}) {
+  const account = await loadCurrentUserAccount();
+
+  const { id: analysisResponseId } = await params;
+
+  const analysisResponse = await loadUserAnalysis(Number(analysisResponseId));
+
+  if (!account?.id || !analysisResponse) {
+    return null;
+  }
+
+  await createPageViewLog({
+    accountId: account.id,
+    action: PageViewAction.VIEW_ANALYSIS_RESULTS,
+  });
+
+  return (
+    <>
+      <PageHeader />
+      <PageBody className="gap-4">
+        <div className="mt-8 flex flex-col justify-between gap-4 sm:flex-row sm:items-center sm:gap-0">
+          <div>
+            <h4>
+              <Trans i18nKey="analysis-results:pageTitle" />
+            </h4>
+            <p className="text-muted-foreground text-sm">
+              {analysisResponse?.elements &&
+              analysisResponse.elements?.length > 0 ? (
+                <Trans i18nKey="analysis-results:description" />
+              ) : (
+                <Trans i18nKey="analysis-results:descriptionEmpty" />
+              )}
+            </p>
+          </div>
+          <Button asChild>
+            <Link href={pathsConfig.app.orderAnalysisPackage}>
+              <Trans i18nKey="analysis-results:orderNewAnalysis" />
+            </Link>
+          </Button>
+        </div>
+        <div className="flex flex-col gap-4">
+          <h4>
+            <Trans
+              i18nKey="analysis-results:orderTitle"
+              values={{ orderNumber: analysisResponse.order.medusa_order_id }}
+            />
+          </h4>
+          <h5>
+            <Trans
+              i18nKey={`orders:status.${analysisResponse.order.status}`}
+            />
+            <ButtonTooltip
+              content={`${analysisResponse.order.created_at ? new Date(analysisResponse?.order?.created_at).toLocaleString() : ''}`}
+              className="ml-6"
+            />
+          </h5>
+        </div>
+        {analysisResponse?.summary?.value && (
+          <div>
+            <strong>
+              <Trans i18nKey="account:doctorAnalysisSummary" />
+            </strong>
+            <p>{analysisResponse.summary.value}</p>
+          </div>
+        )}
+        <div className="flex flex-col gap-2">
+          {analysisResponse.elements ? (
+            analysisResponse.elements.map((element, index) => (
+              <Analysis
+                key={index}
+                analysisElement={{ analysis_name_lab: element.analysis_name }}
+                results={element}
+              />
+            ))
+          ) : (
+            <div className="text-muted-foreground text-sm">
+              <Trans i18nKey="analysis-results:noAnalysisElements" />
+            </div>
+          )}
+        </div>
+      </PageBody>
+    </>
+  );
+}

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

@@ -1,131 +0,0 @@
-import Link from 'next/link';
-import { redirect } from 'next/navigation';
-
-import { loadCurrentUserAccount } from '@/app/home/(user)/_lib/server/load-user-account';
-import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
-import { withI18n } from '@/lib/i18n/with-i18n';
-
-import { Trans } from '@kit/ui/makerkit/trans';
-import { PageBody } from '@kit/ui/page';
-import { Button } from '@kit/ui/shadcn/button';
-
-import { pathsConfig } from '@kit/shared/config';
-
-import { getAnalysisElements } from '~/lib/services/analysis-element.service';
-import {
-  PageViewAction,
-  createPageViewLog,
-} from '~/lib/services/audit/pageView.service';
-import { AnalysisOrder, getAnalysisOrders } from '~/lib/services/order.service';
-import { ButtonTooltip } from '@kit/shared/components/ui/button-tooltip';
-
-import { loadUserAnalysis } from '../../_lib/server/load-user-analysis';
-import Analysis from './_components/analysis';
-
-export const generateMetadata = async () => {
-  const i18n = await createI18nServerInstance();
-  const title = i18n.t('analysis-results:pageTitle');
-
-  return {
-    title,
-  };
-};
-
-async function AnalysisResultsPage() {
-  const account = await loadCurrentUserAccount();
-  if (!account) {
-    throw new Error('Account not found');
-  }
-
-  const analysisResponses = await loadUserAnalysis();
-  const analysisResponseElements = analysisResponses?.flatMap(
-    ({ elements }) => elements,
-  );
-
-  const analysisOrders = await getAnalysisOrders().catch(() => null);
-
-  if (!analysisOrders) {
-    redirect(pathsConfig.auth.signIn);
-  }
-
-  await createPageViewLog({
-    accountId: account.id,
-    action: PageViewAction.VIEW_ANALYSIS_RESULTS,
-  });
-
-  const getAnalysisElementIds = (analysisOrders: AnalysisOrder[]) => [
-    ...new Set(analysisOrders?.flatMap((order) => order.analysis_element_ids).filter(Boolean) as number[]),
-  ];
-
-  const analysisElementIds = getAnalysisElementIds(analysisOrders);
-  const analysisElements = await getAnalysisElements({ ids: analysisElementIds });
-
-  return (
-    <PageBody className="gap-4">
-      <div className="mt-8 flex flex-col sm:flex-row sm:items-center justify-between gap-4 sm:gap-0">
-        <div>
-          <h4>
-            <Trans i18nKey="analysis-results:pageTitle" />
-          </h4>
-          <p className="text-muted-foreground text-sm">
-            {analysisResponses && analysisResponses.length > 0 ? (
-              <Trans i18nKey="analysis-results:description" />
-            ) : (
-              <Trans i18nKey="analysis-results:descriptionEmpty" />
-            )}
-          </p>
-        </div>
-        <Button asChild>
-          <Link href={pathsConfig.app.orderAnalysisPackage}>
-            <Trans i18nKey="analysis-results:orderNewAnalysis" />
-          </Link>
-        </Button>
-      </div>
-      <div className="flex flex-col gap-8">
-        {analysisOrders.length > 0 && analysisElements.length > 0 ? analysisOrders.map((analysisOrder) => {
-          const analysisResponse = analysisResponses?.find((response) => response.analysis_order_id === analysisOrder.id);
-          const analysisElementIds = getAnalysisElementIds([analysisOrder]);
-          const analysisElementsForOrder = analysisElements.filter((element) => analysisElementIds.includes(element.id));
-          return (
-            <div key={analysisOrder.id} className="flex flex-col gap-4">
-              <h4>
-                <Trans i18nKey="analysis-results:orderTitle" values={{ orderNumber: analysisOrder.medusa_order_id }} />
-              </h4>
-              <h5>
-                <Trans i18nKey={`orders:status.${analysisOrder.status}`} />
-                <ButtonTooltip
-                  content={`${new Date(analysisOrder.created_at).toLocaleString()}`}
-                  className="ml-6"
-                />
-              </h5>
-              <div className="flex flex-col gap-2">
-                {analysisElementsForOrder.length > 0 ? analysisElementsForOrder.map((analysisElement) => {
-                  const results = analysisResponse?.elements.some((element) => element.analysis_element_original_id === analysisElement.analysis_id_original)
-                    && analysisResponseElements?.find((element) => element.analysis_element_original_id === analysisElement.analysis_id_original);
-                  if (!results) {
-                    return (
-                      <Analysis key={`${analysisOrder.id}-${analysisElement.id}`} analysisElement={analysisElement} isCancelled={analysisOrder.status === 'CANCELLED'}/>
-                    );
-                  }
-                  return (
-                    <Analysis key={`${analysisOrder.id}-${analysisElement.id}`} analysisElement={analysisElement} results={results} />
-                  );
-                }) : (
-                  <div className="text-muted-foreground text-sm">
-                    <Trans i18nKey="analysis-results:noAnalysisElements" />
-                  </div>
-                )}
-              </div>
-            </div>
-          );
-        }) : (
-          <div className="text-muted-foreground text-sm">
-            <Trans i18nKey="analysis-results:noAnalysisOrders" />
-          </div>
-        )}
-      </div>
-    </PageBody>
-  );
-}
-
-export default withI18n(AnalysisResultsPage);

app/home/(user)/(dashboard)/booking/[handle]/page.tsx

@@ -0,0 +1,41 @@
+import { HomeLayoutPageHeader } from '@/app/home/(user)/_components/home-page-header';
+import { loadCategory } from '@/app/home/(user)/_lib/server/load-category';
+
+import { AppBreadcrumbs } from '@kit/ui/makerkit/app-breadcrumbs';
+import { PageBody } from '@kit/ui/page';
+import { Trans } from '@kit/ui/trans';
+
+import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
+import { withI18n } from '~/lib/i18n/with-i18n';
+
+export const generateMetadata = async () => {
+  const i18n = await createI18nServerInstance();
+  const title = i18n.t('booking:title');
+
+  return {
+    title,
+  };
+};
+
+async function BookingHandlePage({ params }: { params: { handle: string } }) {
+  const handle = await params.handle;
+  const { category } = await loadCategory({ handle });
+
+  return (
+    <>
+      <AppBreadcrumbs
+        values={{
+          [handle]: category?.name || handle,
+        }}
+      />
+      <HomeLayoutPageHeader
+        title={<Trans i18nKey={'booking:title'} />}
+        description={<Trans i18nKey={'booking:description'} />}
+      />
+
+      <PageBody></PageBody>
+    </>
+  );
+}
+
+export default withI18n(BookingHandlePage);

app/home/(user)/(dashboard)/booking/page.tsx

@@ -1,12 +1,16 @@
+import { use } from 'react';
+
+import { AppBreadcrumbs } from '@kit/ui/makerkit/app-breadcrumbs';
 import { PageBody } from '@kit/ui/page';
 import { Trans } from '@kit/ui/trans';
 
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
 
-
 import { HomeLayoutPageHeader } from '../../_components/home-page-header';
 import OrderCards from '../../_components/order-cards';
+import ServiceCategories from '../../_components/service-categories';
+import { loadTtoServices } from '../../_lib/server/load-tto-services';
 
 export const generateMetadata = async () => {
   const i18n = await createI18nServerInstance();
@@ -18,15 +22,30 @@ export const generateMetadata = async () => {
 };
 
 function BookingPage() {
+  const { heroCategories, ttoCategories } = use(loadTtoServices());
+
+  if (!heroCategories.length && !ttoCategories.length) {
+    return (
+      <>
+        <AppBreadcrumbs />
+        <h3 className="mt-8">
+          <Trans i18nKey="booking:noCategories" />
+        </h3>
+      </>
+    );
+  }
+
   return (
     <>
+      <AppBreadcrumbs />
       <HomeLayoutPageHeader
         title={<Trans i18nKey={'booking:title'} />}
         description={<Trans i18nKey={'booking:description'} />}
       />
 
-      <PageBody>
+      <PageBody className="space-y-2">
-        <OrderCards />
+        <OrderCards heroCategories={heroCategories} />
+        <ServiceCategories categories={ttoCategories} />
       </PageBody>
     </>
   );

app/home/(user)/(dashboard)/cart/montonio-callback/actions.ts

@@ -8,7 +8,7 @@ import { listProductTypes } from "@lib/data/products";
 import { placeOrder, retrieveCart } from "@lib/data/cart";
 import { createI18nServerInstance } from "~/lib/i18n/i18n.server";
 import { createOrder } from '~/lib/services/order.service';
-import { getOrderedAnalysisElementsIds, sendOrderToMedipost } from '~/lib/services/medipost.service';
+import { getOrderedAnalysisIds, sendOrderToMedipost } from '~/lib/services/medipost.service';
 import { createNotificationsApi } from '@kit/notifications/api';
 import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
 import { AccountWithParams } from '@kit/accounts/api';
@@ -20,12 +20,12 @@ const env = () => z
   .object({
     emailSender: z
       .string({
-        required_error: 'EMAIL_SENDER is required',
+        error: 'EMAIL_SENDER is required',
       })
       .min(1),
     siteUrl: z
       .string({
-        required_error: 'NEXT_PUBLIC_SITE_URL is required',
+        error: 'NEXT_PUBLIC_SITE_URL is required',
       })
       .min(1),
   })
@@ -114,7 +114,7 @@ export async function processMontonioCallback(orderToken: string) {
 
 
     const medusaOrder = await placeOrder(cartId, { revalidateCacheTags: false });
-    const orderedAnalysisElements = await getOrderedAnalysisElementsIds({ medusaOrder });
+    const orderedAnalysisElements = await getOrderedAnalysisIds({ medusaOrder });
     const orderId = await createOrder({ medusaOrder, orderedAnalysisElements });
 
     const { productTypes } = await listProductTypes();

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

@@ -1,17 +1,11 @@
 import { use } from 'react';
 
-import { cookies } from 'next/headers';
-
 import { retrieveCart } from '@lib/data/cart';
 import { StoreCart } from '@medusajs/types';
-import { z } from 'zod';
 
 import { UserWorkspaceContextProvider } from '@kit/accounts/components';
 import { AppLogo } from '@kit/shared/components/app-logo';
-import {
+import { pathsConfig } from '@kit/shared/config';
-  pathsConfig,
-  personalAccountNavigationConfig,
-} from '@kit/shared/config';
 import { Page, PageMobileNavigation, PageNavigation } from '@kit/ui/page';
 import { SidebarProvider } from '@kit/ui/shadcn-sidebar';
 
@@ -24,40 +18,11 @@ import { HomeSidebar } from '../_components/home-sidebar';
 import { loadUserWorkspace } from '../_lib/server/load-user-workspace';
 
 function UserHomeLayout({ children }: React.PropsWithChildren) {
-  const state = use(getLayoutState());
-
-  if (state.style === 'sidebar') {
-    return <SidebarLayout>{children}</SidebarLayout>;
-  }
-
   return <HeaderLayout>{children}</HeaderLayout>;
 }
 
 export default withI18n(UserHomeLayout);
 
-function SidebarLayout({ children }: React.PropsWithChildren) {
-  const workspace = use(loadUserWorkspace());
-  const state = use(getLayoutState());
-
-  return (
-    <UserWorkspaceContextProvider value={workspace}>
-      <SidebarProvider defaultOpen={state.open}>
-        <Page style={'sidebar'}>
-          <PageNavigation>
-            <HomeSidebar />
-          </PageNavigation>
-
-          <PageMobileNavigation className={'flex items-center justify-between'}>
-            <MobileNavigation workspace={workspace} cart={null} />
-          </PageMobileNavigation>
-
-          {children}
-        </Page>
-      </SidebarProvider>
-    </UserWorkspaceContextProvider>
-  );
-}
-
 function HeaderLayout({ children }: React.PropsWithChildren) {
   const workspace = use(loadUserWorkspace());
   const cart = use(retrieveCart());
@@ -101,27 +66,3 @@ function MobileNavigation({
     </>
   );
 }
-
-async function getLayoutState() {
-  const cookieStore = await cookies();
-
-  const LayoutStyleSchema = z.enum(['sidebar', 'header', 'custom']);
-
-  const layoutStyleCookie = cookieStore.get('layout-style');
-  const sidebarOpenCookie = cookieStore.get('sidebar:state');
-
-  const sidebarOpen = sidebarOpenCookie
-    ? sidebarOpenCookie.value === 'false'
-    : !personalAccountNavigationConfig.sidebarCollapsed;
-
-  const parsedStyle = LayoutStyleSchema.safeParse(layoutStyleCookie?.value);
-
-  const style = parsedStyle.success
-    ? parsedStyle.data
-    : personalAccountNavigationConfig.style;
-
-  return {
-    open: sidebarOpen,
-    style,
-  };
-}

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

@@ -27,7 +27,7 @@ async function UserHomePage() {
   const client = getSupabaseServerClient();
 
   const account = await loadCurrentUserAccount();
-  const api = await createAccountsApi(client);
+  const api = createAccountsApi(client);
   const bmiThresholds = await api.fetchBmiThresholds();
 
   if (!account) {

app/home/(user)/_components/cart/discount-code.tsx

@@ -1,6 +1,7 @@
 "use client"
 
-import { Badge, Heading, Text } from "@medusajs/ui"
+import { Badge, Text } from "@medusajs/ui"
+import { toast } from '@kit/ui/sonner';
 import React, { useActionState } from "react";
 
 import { applyPromotions, submitPromotionForm } from "@lib/data/cart"
@@ -31,11 +32,19 @@ export default function DiscountCode({ cart }: {
 
   const removePromotionCode = async (code: string) => {
     const validPromotions = promotions.filter(
-      (promotion) => promotion.code !== code
+      (promotion) => promotion.code !== code,
     )
 
     await applyPromotions(
-      validPromotions.filter((p) => p.code === undefined).map((p) => p.code!)
+      validPromotions.filter((p) => p.code === undefined).map((p) => p.code!),
+      {
+        onSuccess: () => {
+          toast.success(t('cart:discountCode.removeSuccess'));
+        },
+        onError: () => {
+          toast.error(t('cart:discountCode.removeError'));
+        },
+      }
     )
   }
 
@@ -45,7 +54,14 @@ export default function DiscountCode({ cart }: {
       .map((p) => p.code!)
     codes.push(code.toString())
 
-    await applyPromotions(codes)
+    await applyPromotions(codes, {
+      onSuccess: () => {
+        toast.success(t('cart:discountCode.addSuccess'));
+      },
+      onError: () => {
+        toast.error(t('cart:discountCode.addError'));
+      },
+    });
 
     form.reset()
   }
@@ -64,7 +80,7 @@ export default function DiscountCode({ cart }: {
       <Form {...form}>
         <form
           onSubmit={form.handleSubmit((data) => addPromotionCode(data.code))}
-          className="w-full mb-2 flex gap-x-2"
+          className="w-full mb-2 flex gap-x-2 sm:flex-row flex-col gap-y-2"
         >
           <FormField
             name={'code'}
@@ -87,16 +103,12 @@ export default function DiscountCode({ cart }: {
         </form>
       </Form>
 
-      <p className="text-sm text-muted-foreground">
+      {promotions.length > 0 ? (
-        <Trans i18nKey={'cart:discountCode.subtitle'} />
+        <div className="w-full flex items-center mt-4">
-      </p>
+          <div className="flex flex-col w-full gap-y-2">
-
+            <p>
-      {promotions.length > 0 && (
+              <Trans i18nKey={'cart:discountCode.appliedCodes'} />
-        <div className="w-full flex items-center">
+            </p>
-          <div className="flex flex-col w-full">
-            <Heading className="txt-medium mb-2">
-              Promotion(s) applied:
-            </Heading>
 
             {promotions.map((promotion) => {
               return (
@@ -110,6 +122,7 @@ export default function DiscountCode({ cart }: {
                       <Badge
                         color={promotion.is_automatic ? "green" : "grey"}
                         size="small"
+                        className="px-4"
                       >
                         {promotion.code}
                       </Badge>{" "}
@@ -151,7 +164,7 @@ export default function DiscountCode({ cart }: {
                     >
                       <Trash size={14} />
                       <span className="sr-only">
-                        Remove discount code from order
+                        <Trans i18nKey={'cart:discountCode.remove'} />
                       </span>
                     </button>
                   )}
@@ -160,6 +173,10 @@ export default function DiscountCode({ cart }: {
             })}
           </div>
         </div>
+      ) : (
+        <p className="text-sm text-muted-foreground">
+          <Trans i18nKey={'cart:discountCode.subtitle'} />
+        </p>
       )}
     </div>
   )

app/home/(user)/_components/cart/index.tsx

@@ -18,7 +18,7 @@ import { useTranslation } from "react-i18next";
 import { handleNavigateToPayment } from "@/lib/services/medusaCart.service";
 import AnalysisLocation from "./analysis-location";
 
-const IS_DISCOUNT_SHOWN = false as boolean;
+const IS_DISCOUNT_SHOWN = true as boolean;
 
 export default function Cart({
   cart,
@@ -77,28 +77,62 @@ export default function Cart({
         <CartItems cart={cart} items={ttoServiceItems} productColumnLabelKey="cart:items.ttoServices.productColumnLabel" />
       </div>
       {hasCartItems && (
-        <div className="flex justify-end gap-x-4 px-6 py-4">
+        <>
-          <div className="mr-[36px]">
+          <div className="flex justify-end gap-x-4 px-6 pt-4">
-            <p className="ml-0 font-bold text-sm">
+            <div className="mr-[36px]">
-              <Trans i18nKey="cart:total" />
+              <p className="ml-0 font-bold text-sm text-muted-foreground">
-            </p>
+                <Trans i18nKey="cart:subtotal" />
+              </p>
+            </div>
+            <div className="mr-[116px]">
+              <p className="text-sm">
+                {formatCurrency({
+                  value: cart.subtotal,
+                  currencyCode: cart.currency_code,
+                  locale: language,
+                })}
+              </p>
+            </div>
           </div>
-          <div className="mr-[116px]">
+          <div className="flex justify-end gap-x-4 px-6 py-2">
-            <p className="text-sm">
+            <div className="mr-[36px]">
-              {formatCurrency({
+              <p className="ml-0 font-bold text-sm text-muted-foreground">
-                value: cart.total,
+                <Trans i18nKey="cart:promotionsTotal" />
-                currencyCode: cart.currency_code,
+              </p>
-                locale: language,
+            </div>
-              })}
+            <div className="mr-[116px]">
-            </p>
+              <p className="text-sm">
+                {formatCurrency({
+                  value: cart.discount_total,
+                  currencyCode: cart.currency_code,
+                  locale: language,
+                })}
+              </p>
+            </div>
           </div>
-        </div>
+          <div className="flex justify-end gap-x-4 px-6">
+            <div className="mr-[36px]">
+              <p className="ml-0 font-bold text-sm">
+                <Trans i18nKey="cart:total" />
+              </p>
+            </div>
+            <div className="mr-[116px]">
+              <p className="text-sm">
+                {formatCurrency({
+                  value: cart.total,
+                  currencyCode: cart.currency_code,
+                  locale: language,
+                })}
+              </p>
+            </div>
+          </div>
+        </>
       )}
 
-      <div className="flex gap-y-6 py-8">
+      <div className="flex sm:flex-row flex-col gap-y-6 py-8 gap-x-4">
         {IS_DISCOUNT_SHOWN && (
           <Card
-            className="flex flex-col justify-between w-1/2"
+            className="flex flex-col justify-between w-full sm:w-1/2"
           >
             <CardHeader className="pb-4">
               <h5>
@@ -113,7 +147,7 @@ export default function Cart({
 
         {isLocationsShown && (
           <Card
-            className="flex flex-col justify-between w-1/2"
+            className="flex flex-col justify-between w-full sm:w-1/2"
           >
             <CardHeader className="pb-4">
               <h5>

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

@@ -1,30 +1,28 @@
-import { Trans } from '@kit/ui/trans';
-import {
-  Card,
-  CardHeader,
-  CardDescription,
-  CardFooter,
-} from '@kit/ui/card';
-
 import Link from 'next/link';
-import { Button } from '@kit/ui/button';
+
 import { ChevronRight, HeartPulse } from 'lucide-react';
 
+import { Button } from '@kit/ui/button';
+import { Card, CardDescription, CardFooter, CardHeader } from '@kit/ui/card';
+import { Trans } from '@kit/ui/trans';
+
 export default function DashboardCards() {
   return (
-    <div className='flex gap-4 lg:px-4'>
+    <div className="flex gap-4 lg:px-4">
       <Card
         variant="gradient-success"
-        className="flex flex-col justify-between"
+        className="xs:w-1/2 sm:w-auto flex w-full flex-col justify-between"
       >
         <CardHeader className="flex-row">
           <div
-            className={'flex size-8 items-center-safe justify-center-safe rounded-full text-white bg-primary\/10 mb-6'}
+            className={
+              'bg-primary/10 mb-6 flex size-8 items-center-safe justify-center-safe rounded-full text-white'
+            }
           >
             <HeartPulse className="size-4 fill-green-500" />
           </div>
-          <div className='ml-auto flex size-8 items-center-safe justify-center-safe rounded-full text-white bg-warning'>
+          <div className="bg-warning ml-auto flex size-8 items-center-safe justify-center-safe rounded-full text-white">
-            <Link href='/home/order-analysis'>
+            <Link href="/home/order-analysis">
               <Button size="icon" variant="outline" className="px-2 text-black">
                 <ChevronRight className="size-4 stroke-2" />
               </Button>
@@ -33,10 +31,10 @@ export default function DashboardCards() {
         </CardHeader>
         <CardFooter className="flex flex-col items-start gap-2">
           <h5>
-            <Trans i18nKey='dashboard:heroCard.orderAnalysis.title' />
+            <Trans i18nKey="dashboard:heroCard.orderAnalysis.title" />
           </h5>
           <CardDescription className="text-primary">
-            <Trans i18nKey='dashboard:heroCard.orderAnalysis.description' />
+            <Trans i18nKey="dashboard:heroCard.orderAnalysis.description" />
           </CardDescription>
         </CardFooter>
       </Card>

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

@@ -0,0 +1,128 @@
+'use client';
+
+import Link from 'next/link';
+
+import { BlendingModeIcon } from '@radix-ui/react-icons';
+import {
+  Droplets,
+} from 'lucide-react';
+
+import { InfoTooltip } from '@kit/shared/components/ui/info-tooltip';
+import { Button } from '@kit/ui/button';
+import {
+  Card,
+  CardContent,
+  CardHeader,
+} from '@kit/ui/card';
+import { Trans } from '@kit/ui/trans';
+import { cn } from '@kit/ui/utils';
+
+const dummyRecommendations = [
+  {
+    icon: <BlendingModeIcon className="size-4" />,
+    color: 'bg-cyan/10 text-cyan',
+    title: 'Kolesterooli kontroll',
+    description: 'HDL-kolestrool',
+    tooltipContent: 'Selgitus',
+    price: '20,00 €',
+    buttonText: 'Telli',
+    href: '/home/booking',
+  },
+  {
+    icon: <BlendingModeIcon className="size-4" />,
+    color: 'bg-primary/10 text-primary',
+    title: 'Kolesterooli kontroll',
+    tooltipContent: 'Selgitus',
+    description: 'LDL-Kolesterool',
+    buttonText: 'Broneeri',
+    href: '/home/booking',
+  },
+  {
+    icon: <Droplets />,
+    color: 'bg-destructive/10 text-destructive',
+    title: 'Vererõhu kontroll',
+    tooltipContent: 'Selgitus',
+    description: 'Score-Risk 2',
+    price: '20,00 €',
+    buttonText: 'Telli',
+    href: '/home/booking',
+  },
+];
+
+export default function DashboardRecommendations() {
+  return (
+    <Card>
+      <CardHeader className="items-start">
+        <h4>
+          <Trans i18nKey="dashboard:recommendedForYou" />
+        </h4>
+      </CardHeader>
+      <CardContent className="space-y-6">
+        {dummyRecommendations.map(
+          (
+            {
+              icon,
+              color,
+              title,
+              description,
+              tooltipContent,
+              price,
+              buttonText,
+              href,
+            },
+            index,
+          ) => {
+            return (
+              <div
+                className="flex w-full justify-between gap-3 overflow-scroll"
+                key={index}
+              >
+                <div className="mr-4 flex min-w-fit flex-row items-center gap-4">
+                  <div
+                    className={cn(
+                      'flex size-8 items-center-safe justify-center-safe rounded-full text-white',
+                      color,
+                    )}
+                  >
+                    {icon}
+                  </div>
+                  <div className="min-w-fit">
+                    <div className="inline-flex items-center gap-1 align-baseline text-sm font-medium">
+                      {title}
+                      <InfoTooltip content={tooltipContent} />
+                    </div>
+                    <p className="text-muted-foreground text-sm">
+                      {description}
+                    </p>
+                  </div>
+                </div>
+                <div className="grid w-36 min-w-fit auto-rows-fr grid-cols-2 items-center gap-4">
+                  <p className="text-sm font-medium"> {price}</p>
+                  {href ? (
+                    <Link href={href}>
+                      <Button
+                        size="sm"
+                        variant="secondary"
+                        className="w-full min-w-fit"
+                      >
+                        {buttonText}
+                      </Button>
+                    </Link>
+                  ) : (
+                    <Button
+                      size="sm"
+                      variant="secondary"
+                      className="w-full min-w-fit"
+                    >
+                      {buttonText}
+                    </Button>
+                  )}
+                </div>
+              </div>
+            );
+          },
+        )}
+      </CardContent>
+    </Card>
+  );
+}

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

@@ -7,33 +7,41 @@ import { Database } from '@/packages/supabase/src/database.types';
 import { BlendingModeIcon, RulerHorizontalIcon } from '@radix-ui/react-icons';
 import {
   Activity,
+  ChevronRight,
   Clock9,
-  Droplets,
   Pill,
   Scale,
   TrendingUp,
   User,
 } from 'lucide-react';
 
-import { InfoTooltip } from '@kit/shared/components/ui/info-tooltip';
+import { pathsConfig } from '@kit/shared/config';
 import { getPersonParameters } from '@kit/shared/utils';
 import { Button } from '@kit/ui/button';
 import {
   Card,
-  CardContent,
   CardDescription,
   CardFooter,
   CardHeader,
+  CardProps,
 } from '@kit/ui/card';
 import { Trans } from '@kit/ui/trans';
 import { cn } from '@kit/ui/utils';
 
+import { isNil } from 'lodash';
 import { BmiCategory } from '~/lib/types/bmi';
 import {
   bmiFromMetric,
   getBmiBackgroundColor,
   getBmiStatus,
 } from '~/lib/utils';
+import DashboardRecommendations from './dashboard-recommendations';
+
+const getCardVariant = (isSuccess: boolean | null): CardProps['variant'] => {
+  if (isSuccess === null) return 'default';
+  if (isSuccess) return 'gradient-success';
+  return 'gradient-destructive';
+};
 
 const cards = ({
   gender,
@@ -41,111 +49,91 @@ const cards = ({
   height,
   weight,
   bmiStatus,
+  smoking,
 }: {
   gender?: string;
   age?: number;
   height?: number | null;
   weight?: number | null;
   bmiStatus: BmiCategory | null;
+  smoking?: boolean | null;
 }) => [
-  {
+    {
-    title: 'dashboard:gender',
+      title: 'dashboard:gender',
-    description: gender ?? 'dashboard:male',
+      description: gender ?? 'dashboard:male',
-    icon: <User />,
+      icon: <User />,
-    iconBg: 'bg-success',
+      iconBg: 'bg-success',
-  },
+    },
-  {
+    {
-    title: 'dashboard:age',
+      title: 'dashboard:age',
-    description: age ? `${age}` : '-',
+      description: age ? `${age}` : '-',
-    icon: <Clock9 />,
+      icon: <Clock9 />,
-    iconBg: 'bg-success',
+      iconBg: 'bg-success',
-  },
+    },
-  {
+    {
-    title: 'dashboard:height',
+      title: 'dashboard:height',
-    description: height ? `${height}cm` : '-',
+      description: height ? `${height}cm` : '-',
-    icon: <RulerHorizontalIcon className="size-4" />,
+      icon: <RulerHorizontalIcon className="size-4" />,
-    iconBg: 'bg-success',
+      iconBg: 'bg-success',
-  },
+    },
-  {
+    {
-    title: 'dashboard:weight',
+      title: 'dashboard:weight',
-    description: weight ? `${weight}kg` : '-',
+      description: weight ? `${weight}kg` : '-',
-    icon: <Scale />,
+      icon: <Scale />,
-    iconBg: 'bg-success',
+      iconBg: 'bg-success',
-  },
+    },
-  {
+    {
-    title: 'dashboard:bmi',
+      title: 'dashboard:bmi',
-    description: bmiFromMetric(weight || 0, height || 0).toString(),
+      description: bmiFromMetric(weight || 0, height || 0)?.toString() ?? '-',
-    icon: <TrendingUp />,
+      icon: <TrendingUp />,
-    iconBg: getBmiBackgroundColor(bmiStatus),
+      iconBg: getBmiBackgroundColor(bmiStatus),
-  },
+    },
-  {
+    {
-    title: 'dashboard:bloodPressure',
+      title: 'dashboard:bloodPressure',
-    description: '-',
+      description: '-',
-    icon: <Activity />,
+      icon: <Activity />,
-    iconBg: 'bg-warning',
+      iconBg: 'bg-warning',
-  },
+    },
-  {
+    {
-    title: 'dashboard:cholesterol',
+      title: 'dashboard:cholesterol',
-    description: '-',
+      description: '-',
-    icon: <BlendingModeIcon className="size-4" />,
+      icon: <BlendingModeIcon className="size-4" />,
-    iconBg: 'bg-destructive',
+      iconBg: 'bg-destructive',
-  },
+    },
-  {
+    {
-    title: 'dashboard:ldlCholesterol',
+      title: 'dashboard:ldlCholesterol',
-    description: '-',
+      description: '-',
-    icon: <Pill />,
+      icon: <Pill />,
-    iconBg: 'bg-warning',
+      iconBg: 'bg-warning',
-  },
+    },
-  // {
+    // {
-  //   title: 'Score 2',
+    //   title: 'Score 2',
-  //   description: 'Normis',
+    //   description: 'Normis',
-  //   icon: <LineChart />,
+    //   icon: <LineChart />,
-  //   iconBg: 'bg-success',
+    //   iconBg: 'bg-success',
-  // },
+    // },
-  // {
+    {
-  //   title: 'dashboard:smoking',
+      title: 'dashboard:smoking',
-  //   description: 'dashboard:respondToQuestion',
+      description:
-  //   descriptionColor: 'text-primary',
+        isNil(smoking)
-  //   icon: (
+          ? 'dashboard:respondToQuestion'
-  //     <Button size="icon" variant="outline" className="px-2 text-black">
+          : !!smoking
-  //       <ChevronRight className="size-4 stroke-2" />
+            ? 'common:yes'
-  //     </Button>
+            : 'common:no',
-  //   ),
+      descriptionColor: 'text-primary',
-  //   cardVariant: 'gradient-success' as CardProps['variant'],
+      icon:
-  // },
+        isNil(smoking) ? (
-];
+          <Link href={pathsConfig.app.personalAccountSettings}>
+            <Button size="icon" variant="outline" className="px-2 text-black">
+              <ChevronRight className="size-4 stroke-2" />
+            </Button>
+          </Link>
+        ) : null,
+      cardVariant: getCardVariant(isNil(smoking) ? null : !smoking),
+    },
+  ];
 
-const dummyRecommendations = [
+const IS_SHOWN_RECOMMENDATIONS = false as boolean;
-  {
-    icon: <BlendingModeIcon className="size-4" />,
-    color: 'bg-cyan/10 text-cyan',
-    title: 'Kolesterooli kontroll',
-    description: 'HDL-kolestrool',
-    tooltipContent: 'Selgitus',
-    price: '20,00 €',
-    buttonText: 'Telli',
-    href: '/home/booking',
-  },
-  {
-    icon: <BlendingModeIcon className="size-4" />,
-    color: 'bg-primary/10 text-primary',
-    title: 'Kolesterooli kontroll',
-    tooltipContent: 'Selgitus',
-    description: 'LDL-Kolesterool',
-    buttonText: 'Broneeri',
-    href: '/home/booking',
-  },
-  {
-    icon: <Droplets />,
-    color: 'bg-destructive/10 text-destructive',
-    title: 'Vererõhu kontroll',
-    tooltipContent: 'Selgitus',
-    description: 'Score-Risk 2',
-    price: '20,00 €',
-    buttonText: 'Telli',
-    href: '/home/booking',
-  },
-];
 
 export default function Dashboard({
   account,
@@ -160,31 +148,32 @@ export default function Dashboard({
   const params = getPersonParameters(account.personal_code!);
   const bmiStatus = getBmiStatus(bmiThresholds, {
     age: params?.age || 0,
-    height: account.account_params?.[0]?.height || 0,
+    height: account.accountParams?.height || 0,
-    weight: account.account_params?.[0]?.weight || 0,
+    weight: account.accountParams?.weight || 0,
   });
 
   return (
     <>
-      <div className="grid auto-rows-fr grid-cols-2 gap-3 sm:grid-cols-4 lg:grid-cols-5">
+      <div className="xs:grid-cols-2 grid auto-rows-fr gap-3 sm:grid-cols-4 lg:grid-cols-5">
         {cards({
           gender: params?.gender,
           age: params?.age,
-          height: account.account_params?.[0]?.height,
+          height: account.accountParams?.height,
-          weight: account.account_params?.[0]?.weight,
+          weight: account.accountParams?.weight,
           bmiStatus,
+          smoking: account.accountParams?.isSmoker,
         }).map(
           ({
             title,
             description,
             icon,
             iconBg,
-            // cardVariant,
+            cardVariant,
             // descriptionColor,
           }) => (
             <Card
               key={title}
-              // variant={cardVariant}
+              variant={cardVariant}
               className="flex flex-col justify-between"
             >
               <CardHeader className="items-end-safe">
@@ -211,68 +200,7 @@ export default function Dashboard({
           ),
         )}
       </div>
-      <Card>
+      {IS_SHOWN_RECOMMENDATIONS && <DashboardRecommendations />}
-        <CardHeader className="items-start">
-          <h4>
-            <Trans i18nKey="dashboard:recommendedForYou" />
-          </h4>
-        </CardHeader>
-        <CardContent className="space-y-6">
-          {dummyRecommendations.map(
-            (
-              {
-                icon,
-                color,
-                title,
-                description,
-                tooltipContent,
-                price,
-                buttonText,
-                href,
-              },
-              index,
-            ) => {
-              return (
-                <div className="flex justify-between" key={index}>
-                  <div className="mr-4 flex flex-row items-center gap-4">
-                    <div
-                      className={cn(
-                        'flex size-8 items-center-safe justify-center-safe rounded-full text-white',
-                        color,
-                      )}
-                    >
-                      {icon}
-                    </div>
-                    <div>
-                      <div className="inline-flex items-center gap-1 align-baseline text-sm font-medium">
-                        {title}
-                        <InfoTooltip content={tooltipContent} />
-                      </div>
-                      <p className="text-muted-foreground text-sm">
-                        {description}
-                      </p>
-                    </div>
-                  </div>
-                  <div className="grid w-36 auto-rows-fr grid-cols-2 items-center gap-4">
-                    <p className="text-sm font-medium"> {price}</p>
-                    {href ? (
-                      <Link href={href}>
-                        <Button size="sm" variant="secondary">
-                          {buttonText}
-                        </Button>
-                      </Link>
-                    ) : (
-                      <Button size="sm" variant="secondary">
-                        {buttonText}
-                      </Button>
-                    )}
-                  </div>
-                </div>
-              );
-            },
-          )}
-        </CardContent>
-      </Card>
     </>
   );
 }

app/home/(user)/_components/home-menu-navigation.tsx

@@ -31,23 +31,27 @@ export async function HomeMenuNavigation(props: {
       })
     : 0;
 
-  const cartItemsCount = props.cart?.items?.length ?? 0;
+  const cartQuantityTotal =
-  const hasCartItems = cartItemsCount > 0;
+    props.cart?.items?.reduce((acc, item) => acc + item.quantity, 0) ?? 0;
+  const hasCartItems = cartQuantityTotal > 0;
 
   return (
     <div className={'flex w-full flex-1 items-center justify-between gap-3'}>
       <div className={`flex items-center ${SIDEBAR_WIDTH_PROPERTY}`}>
         <AppLogo href={pathsConfig.app.home} />
       </div>
-      <Search
+      {/* TODO: add search functionality */}
+      {/* <Search
         className="flex grow"
         startElement={<Trans i18nKey="common:search" values={{ end: '...' }} />}
-      />
+      /> */}
 
       <div className="flex items-center justify-end gap-3">
+        {/* TODO: add wallet functionality
         <Card className="px-6 py-2">
           <span>€ {Number(0).toFixed(2).replace('.', ',')}</span>
         </Card>
+        */}
         {hasCartItems && (
           <Button
             className="relative mr-0 h-10 cursor-pointer border-1 px-4 py-2"
@@ -56,7 +60,7 @@ export async function HomeMenuNavigation(props: {
             <span className="flex items-center text-nowrap">{totalValue}</span>
           </Button>
         )}
-        <Link href="/home/cart">
+        <Link href={pathsConfig.app.cart}>
           <Button
             variant="ghost"
             className="relative mr-0 h-10 cursor-pointer border-1 px-4 py-2"
@@ -64,7 +68,7 @@ export async function HomeMenuNavigation(props: {
             <ShoppingCart className="stroke-[1.5px]" />
             <Trans
               i18nKey="common:shoppingCartCount"
-              values={{ count: cartItemsCount }}
+              values={{ count: cartQuantityTotal }}
             />
           </Button>
         </Link>

app/home/(user)/_components/home-mobile-navigation.tsx

@@ -1,12 +1,18 @@
 'use client';
 
+import { useMemo } from 'react';
+
 import Link from 'next/link';
 
+import SignOutDropdownItem from '@kit/shared/components/sign-out-dropdown-item';
 import { StoreCart } from '@medusajs/types';
-import { LogOut, Menu, ShoppingCart } from 'lucide-react';
+import { Cross, Menu, Shield, ShoppingCart } from 'lucide-react';
 
+import { usePersonalAccountData } from '@kit/accounts/hooks/use-personal-account-data';
+import { ApplicationRoleEnum } from '@kit/accounts/types/accounts';
+import DropdownLink from '@kit/shared/components/ui/dropdown-link';
 import {
-  featureFlagsConfig,
+  pathsConfig,
   personalAccountNavigationConfig,
 } from '@kit/shared/config';
 import { useSignOut } from '@kit/supabase/hooks/use-sign-out';
@@ -15,7 +21,6 @@ import {
   DropdownMenuContent,
   DropdownMenuGroup,
   DropdownMenuItem,
-  DropdownMenuLabel,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from '@kit/ui/dropdown-menu';
@@ -23,14 +28,16 @@ import { If } from '@kit/ui/if';
 import { Trans } from '@kit/ui/trans';
 
 // home imports
-import { HomeAccountSelector } from '../_components/home-account-selector';
 import type { UserWorkspace } from '../_lib/server/load-user-workspace';
 
 export function HomeMobileNavigation(props: {
   workspace: UserWorkspace;
   cart: StoreCart | null;
 }) {
+  const user = props.workspace.user;
+
   const signOut = useSignOut();
+  const { data: personalAccountData } = usePersonalAccountData(user.id);
 
   const Links = personalAccountNavigationConfig.routes.map((item, index) => {
     if ('children' in item) {
@@ -51,8 +58,30 @@ export function HomeMobileNavigation(props: {
     }
   });
 
-  const cartItemsCount = props.cart?.items?.length ?? 0;
+  const hasTotpFactor = useMemo(() => {
-  const hasCartItems = cartItemsCount > 0;
+    const factors = user?.factors ?? [];
+    return factors.some(
+      (factor) => factor.factor_type === 'totp' && factor.status === 'verified',
+    );
+  }, [user?.factors]);
+
+  const isSuperAdmin = useMemo(() => {
+    const hasAdminRole =
+      personalAccountData?.application_role === ApplicationRoleEnum.SuperAdmin;
+
+    return hasAdminRole && hasTotpFactor;
+  }, [user, personalAccountData, hasTotpFactor]);
+
+  const isDoctor = useMemo(() => {
+    const hasDoctorRole =
+      personalAccountData?.application_role === ApplicationRoleEnum.Doctor;
+
+    return hasDoctorRole && hasTotpFactor;
+  }, [user, personalAccountData, hasTotpFactor]);
+
+  const cartQuantityTotal =
+    props.cart?.items?.reduce((acc, item) => acc + item.quantity, 0) ?? 0;
+  const hasCartItems = cartQuantityTotal > 0;
 
   return (
     <DropdownMenu>
@@ -61,29 +90,13 @@ export function HomeMobileNavigation(props: {
       </DropdownMenuTrigger>
 
       <DropdownMenuContent sideOffset={10} className={'w-screen rounded-none'}>
-        <If condition={featureFlagsConfig.enableTeamAccounts}>
-          <DropdownMenuGroup>
-            <DropdownMenuLabel>
-              <Trans i18nKey={'common:yourAccounts'} />
-            </DropdownMenuLabel>
-
-            <HomeAccountSelector
-              userId={props.workspace.user.id}
-              accounts={props.workspace.accounts}
-              collisionPadding={0}
-            />
-          </DropdownMenuGroup>
-
-          <DropdownMenuSeparator />
-        </If>
-
         <If condition={props.cart && hasCartItems}>
           <DropdownMenuGroup>
             <DropdownLink
-              path="/home/cart"
+              path={pathsConfig.app.cart}
               label="common:shoppingCartCount"
               Icon={<ShoppingCart className="stroke-[1.5px]" />}
-              labelOptions={{ count: cartItemsCount }}
+              labelOptions={{ count: cartQuantityTotal }}
             />
           </DropdownMenuGroup>
           <DropdownMenuSeparator />
@@ -91,6 +104,41 @@ export function HomeMobileNavigation(props: {
 
         <DropdownMenuGroup>{Links}</DropdownMenuGroup>
 
+        <If condition={isSuperAdmin}>
+          <DropdownMenuSeparator />
+
+          <DropdownMenuItem asChild>
+            <Link
+              className={
+                's-full flex cursor-pointer items-center space-x-2 text-yellow-700 dark:text-yellow-500'
+              }
+              href={pathsConfig.app.admin}
+            >
+              <Shield className={'h-5'} />
+
+              <span>Super Admin</span>
+            </Link>
+          </DropdownMenuItem>
+        </If>
+
+        <If condition={isDoctor}>
+          <DropdownMenuSeparator />
+
+          <DropdownMenuItem asChild>
+            <Link
+              className={
+                'flex h-full cursor-pointer items-center space-x-2 text-yellow-700 dark:text-yellow-500'
+              }
+              href={pathsConfig.app.doctor}
+            >
+              <Cross className={'h-5'} />
+
+              <span>
+                <Trans i18nKey="common:doctor" />
+              </span>
+            </Link>
+          </DropdownMenuItem>
+        </If>
         <DropdownMenuSeparator />
 
         <SignOutDropdownItem onSignOut={() => signOut.mutateAsync()} />
@@ -99,49 +147,4 @@ export function HomeMobileNavigation(props: {
   );
 }
 
-function DropdownLink(
-  props: React.PropsWithChildren<{
-    path: string;
-    label: string;
-    labelOptions?: Record<string, any>;
-    Icon: React.ReactNode;
-  }>,
-) {
-  return (
-    <DropdownMenuItem asChild key={props.path}>
-      <Link
-        href={props.path}
-        className={'flex h-12 w-full items-center space-x-4'}
-      >
-        {props.Icon}
 
-        <span>
-          <Trans
-            i18nKey={props.label}
-            defaults={props.label}
-            values={props.labelOptions}
-          />
-        </span>
-      </Link>
-    </DropdownMenuItem>
-  );
-}
-
-function SignOutDropdownItem(
-  props: React.PropsWithChildren<{
-    onSignOut: () => unknown;
-  }>,
-) {
-  return (
-    <DropdownMenuItem
-      className={'flex h-12 w-full items-center space-x-4'}
-      onClick={props.onSignOut}
-    >
-      <LogOut className={'h-6'} />
-
-      <span>
-        <Trans i18nKey={'common:signOut'} defaults={'Sign out'} />
-      </span>
-    </DropdownMenuItem>
-  );
-}

app/home/(user)/_components/order-analyses-cards.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { HeartPulse, Loader2, ShoppingCart } from 'lucide-react';
+import { useTranslation } from 'react-i18next';
 
 import { Button } from '@kit/ui/button';
 import {
@@ -12,15 +13,17 @@ import {
 import { StoreProduct } from '@medusajs/types';
 import { useState } from 'react';
 import { handleAddToCart } from '~/lib/services/medusaCart.service';
-import { useRouter } from 'next/navigation';
 import { InfoTooltip } from '@kit/shared/components/ui/info-tooltip';
 import { Trans } from '@kit/ui/trans';
+import { toast } from '@kit/ui/sonner';
+import { formatCurrency } from '@/packages/shared/src/utils';
 
 export type OrderAnalysisCard = Pick<
   StoreProduct, 'title' | 'description' | 'subtitle'
 > & {
   isAvailable: boolean;
   variant: { id: string };
+  price: number | null;
 };
 
 export default function OrderAnalysesCards({
@@ -30,37 +33,47 @@ export default function OrderAnalysesCards({
   analyses: OrderAnalysisCard[];
   countryCode: string;
 }) {
-  const router = useRouter();
 
-  const [isAddingToCart, setIsAddingToCart] = useState(false);
+  const { i18n: { language } } = useTranslation()
+
+  const [variantAddingToCart, setVariantAddingToCart] = useState<string | null>(null);
   const handleSelect = async (variantId: string) => {
-    if (isAddingToCart) {
+    if (variantAddingToCart) {
       return null;
     }
 
-    setIsAddingToCart(true);
+    setVariantAddingToCart(variantId);
     try {
       await handleAddToCart({
         selectedVariant: { id: variantId },
         countryCode,
       });
-      setIsAddingToCart(false);
+      toast.success(<Trans i18nKey={'order-analysis:analysisAddedToCart'} />);
-      router.push('/home/cart');
+      setVariantAddingToCart(null);
     } catch (e) {
-      setIsAddingToCart(false);
+      toast.error(<Trans i18nKey={'order-analysis:analysisAddToCartError'} />);
+      setVariantAddingToCart(null);
       console.error(e);
     }
   }
 
   return (
-    <div className="grid grid-cols-3 gap-6 mt-4">
+    <div className="grid 2xs:grid-cols-3 gap-6 mt-4">
       {analyses.map(({
         title,
         variant,
         description,
         subtitle,
         isAvailable,
+        price,
       }) => {
+        const formattedPrice = typeof price === 'number'
+          ? formatCurrency({
+            currencyCode: 'eur',
+            locale: language,
+            value: price,
+          })
+          : null;
         return (
           <Card
             key={title}
@@ -81,7 +94,7 @@ export default function OrderAnalysesCards({
                     className="px-2 text-black"
                     onClick={() => handleSelect(variant.id)}
                   >
-                    {isAddingToCart ? <Loader2 className="size-4 stroke-2 animate-spin" /> : <ShoppingCart className="size-4 stroke-2" />}
+                    {variantAddingToCart === variant.id ? <Loader2 className="size-4 stroke-2 animate-spin" /> : <ShoppingCart className="size-4 stroke-2" />}
                   </Button>
                 </div>
               )}
@@ -92,7 +105,14 @@ export default function OrderAnalysesCards({
                 {description && (
                   <>
                     {'  '}
-                    <InfoTooltip content={`${description}`} />
+                    <InfoTooltip
+                      content={
+                        <div className='flex flex-col gap-2'>
+                          <span>{formattedPrice}</span>
+                          <span>{description}</span>
+                        </div>
+                      }
+                    />
                   </>
                 )}
               </h5>

app/home/(user)/_components/order-cards.tsx

@@ -1,74 +1,68 @@
-"use client";
+'use client';
 
-import { ChevronRight, HeartPulse } from 'lucide-react';
 import Link from 'next/link';
 
+import { cn } from '@/lib/utils';
+import { pathsConfig } from '@/packages/shared/src/config';
+import { ComponentInstanceIcon } from '@radix-ui/react-icons';
+import { ChevronRight, HeartPulse } from 'lucide-react';
+
 import { Button } from '@kit/ui/button';
 import {
   Card,
-  CardHeader,
   CardDescription,
-  CardProps,
   CardFooter,
+  CardHeader,
+  CardProps,
 } from '@kit/ui/card';
-import { Trans } from '@kit/ui/trans';
-import { cn } from '@/lib/utils';
 
-const dummyCards = [
+import { ServiceCategory } from './service-categories';
-  {
-    title: 'booking:analysisPackages.title',
-    description: 'booking:analysisPackages.description',
-    descriptionColor: 'text-primary',
-    icon: (
-      <Link href={'/home/order-analysis-package'}>
-        <Button size="icon" variant="outline" className="px-2 text-black">
-          <ChevronRight className="size-4 stroke-2" />
-        </Button>
-      </Link>
-    ),
-    cardVariant: 'gradient-success' as CardProps['variant'],
-    iconBg: 'bg-warning',
-  },
-];
 
-export default function OrderCards() {
+export default function OrderCards({
+  heroCategories,
+}: {
+  heroCategories: ServiceCategory[];
+}) {
   return (
-    <div className="grid grid-cols-3 gap-6 mt-4">
+    <div className="xs:grid-cols-3 mt-4 grid grid-cols-1 gap-2">
-      {dummyCards.map(({
+      {heroCategories.map(({ name, description, color, handle }) => (
-        title,
-        description,
-        icon,
-        cardVariant,
-        descriptionColor,
-        iconBg,
-      }) => (
         <Card
-          key={title}
+          key={name}
-          variant={cardVariant}
+          variant={`gradient-${color}` as CardProps['variant']}
           className="flex flex-col justify-between"
         >
-          <CardHeader className="items-end-safe">
+          <CardHeader className="relative flex flex-row justify-between">
             <div
               className={cn(
-                'flex size-8 items-center-safe justify-center-safe rounded-full text-white',
+                'flex size-8 items-center-safe justify-center-safe rounded-full',
-                iconBg,
+                `text-${color}`,
+                `bg-${color}/10`,
+                {
+                  'bg-primary/10': color === 'success',
+                },
               )}
             >
-              {icon}
+              <ComponentInstanceIcon
+                className={cn('size-4', `fill-${color}`)}
+              />
+            </div>
+            <div className="absolute top-2 right-2 flex size-8 items-center-safe justify-center-safe rounded-xl text-white">
+              <Link
+                href={pathsConfig.app.bookingHandle.replace('[handle]', handle)}
+              >
+                <Button
+                  size="icon"
+                  variant="outline"
+                  className="px-2 text-black"
+                >
+                  <ChevronRight className="size-4 stroke-2" />
+                </Button>
+              </Link>
             </div>
           </CardHeader>
-          <CardFooter className="flex flex-col items-start gap-2">
+          <CardFooter className="mt-5 flex flex-col items-start gap-2">
-            <div
+            <h5>{name}</h5>
-              className={'flex size-8 items-center-safe justify-center-safe rounded-full text-white bg-primary\/10 mb-6'}
+            <CardDescription>{description}</CardDescription>
-            >
-              <HeartPulse className="size-4 fill-green-500" />
-            </div>
-            <h5>
-              <Trans i18nKey={title} />
-            </h5>
-            <CardDescription className={descriptionColor}>
-              <Trans i18nKey={description} />
-            </CardDescription>
           </CardFooter>
         </Card>
       ))}

app/home/(user)/_components/orders/actions.ts

@@ -0,0 +1,18 @@
+'use server';
+
+import { createPageViewLog, PageViewAction } from "~/lib/services/audit/pageView.service";
+import { loadCurrentUserAccount } from "../../_lib/server/load-user-account";
+
+export async function logAnalysisResultsNavigateAction(analysisOrderId: string) {
+  const account = await loadCurrentUserAccount();
+  if (!account) {
+    throw new Error('Account not found');
+  }
+  await createPageViewLog({
+    accountId: account.id,
+    action: PageViewAction.VIEW_ANALYSIS_RESULTS_FROM_ORDER,
+    extraData: {
+      analysisOrderId,
+    },
+  });
+}

app/home/(user)/_components/orders/order-items-table.tsx

@@ -1,29 +1,49 @@
-import { Trans } from '@kit/ui/trans';
+'use client';
+
+import { useRouter } from 'next/navigation';
+
+import { StoreOrderLineItem } from '@medusajs/types';
+import { formatDate } from 'date-fns';
+import { Eye } from 'lucide-react';
+
+import { pathsConfig } from '@kit/shared/config';
+import { Button } from '@kit/ui/button';
 import {
   Table,
   TableBody,
-  TableHead,
-  TableRow,
-  TableHeader,
   TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
 } from '@kit/ui/table';
-import { StoreOrderLineItem } from "@medusajs/types";
+import { Trans } from '@kit/ui/trans';
-import { AnalysisOrder } from '~/lib/services/order.service';
-import { formatDate } from 'date-fns';
-import Link from 'next/link';
-import { Eye } from 'lucide-react';
 
-export default function OrderItemsTable({ items, title, analysisOrder }: {
+import { AnalysisOrder } from '~/lib/services/order.service';
+
+import { logAnalysisResultsNavigateAction } from './actions';
+
+export default function OrderItemsTable({
+  items,
+  title,
+  analysisOrder,
+}: {
   items: StoreOrderLineItem[];
   title: string;
   analysisOrder: AnalysisOrder;
 }) {
+  const router = useRouter();
+
   if (!items || items.length === 0) {
     return null;
   }
 
+  const openAnalysisResults = async () => {
+    await logAnalysisResultsNavigateAction(analysisOrder.medusa_order_id);
+    router.push(`${pathsConfig.app.analysisResults}/${analysisOrder.id}`);
+  };
+
   return (
-    <Table className="rounded-lg border border-separate">
+    <Table className="border-separate rounded-lg border">
       <TableHeader className="text-ui-fg-subtle txt-medium-plus">
         <TableRow>
           <TableHead className="px-6">
@@ -35,13 +55,14 @@ export default function OrderItemsTable({ items, title, analysisOrder }: {
           <TableHead className="px-6">
             <Trans i18nKey="orders:table.status" />
           </TableHead>
-          <TableHead className="px-6">
+          <TableHead className="px-6"></TableHead>
-          </TableHead>
         </TableRow>
       </TableHeader>
       <TableBody>
         {items
-          .sort((a, b) => (a.created_at ?? "") > (b.created_at ?? "") ? -1 : 1)
+          .sort((a, b) =>
+            (a.created_at ?? '') > (b.created_at ?? '') ? -1 : 1,
+          )
           .map((orderItem) => (
             <TableRow className="w-full" key={orderItem.id}>
               <TableCell className="text-left w-[100%] px-6">
@@ -54,24 +75,18 @@ export default function OrderItemsTable({ items, title, analysisOrder }: {
                 {formatDate(orderItem.created_at, 'dd.MM.yyyy HH:mm')}
               </TableCell>
 
-              <TableCell className="px-6 min-w-[180px]">
+              <TableCell className="min-w-[180px] px-6">
                 <Trans i18nKey={`orders:status.${analysisOrder.status}`} />
               </TableCell>
 
-              <TableCell className="text-right px-6">
+              <TableCell className="px-6 text-right">
-                <span className="flex gap-x-1 justify-end w-[30px]">
+                <Button size="sm" onClick={openAnalysisResults}>
-                  <Link href={`/home/analysis-results`} className="flex items-center justify-between text-small-regular">
+                  <Trans i18nKey="analysis-results:view" />
-                    <button
+                </Button>
-                      className="flex gap-x-1 text-ui-fg-subtle hover:text-ui-fg-base cursor-pointer"
-                    >
-                      <Eye />
-                    </button>
-                  </Link>
-                </span>
               </TableCell>
             </TableRow>
           ))}
       </TableBody>
     </Table>
-  )
+  );
 }

app/home/(user)/_components/service-categories.tsx

@@ -0,0 +1,61 @@
+'use client';
+
+import React from 'react';
+
+import { redirect } from 'next/navigation';
+
+import { createPath, pathsConfig } from '@/packages/shared/src/config';
+import { ComponentInstanceIcon } from '@radix-ui/react-icons';
+
+import { cn } from '@kit/ui/shadcn';
+import { Card, CardDescription, CardTitle } from '@kit/ui/shadcn/card';
+
+export interface ServiceCategory {
+  name: string;
+  handle: string;
+  color: string;
+  description: string;
+}
+
+const ServiceCategories = ({
+  categories,
+}: {
+  categories: ServiceCategory[];
+}) => {
+  return (
+    <div className="grid grid-cols-1 gap-2 sm:grid-cols-2 md:grid-cols-3">
+      {categories.map((category, index) => (
+        <Card
+          key={index}
+          className="flex cursor-pointer gap-2 p-4 shadow hover:shadow-md"
+          onClick={() => {
+            redirect(
+              pathsConfig.app.bookingHandle.replace(
+                '[handle]',
+                category.handle,
+              ),
+            );
+          }}
+        >
+          <div
+            className={cn(
+              'flex size-8 items-center-safe justify-center-safe rounded-full',
+              `bg-${category.color}/10`,
+              `text-${category.color}`,
+            )}
+          >
+            <ComponentInstanceIcon />
+          </div>
+          <div>
+            <h5 className="mb-2 text-lg font-semibold">{category.name}</h5>
+            <CardDescription className="">
+              {category.description}
+            </CardDescription>
+          </div>
+        </Card>
+      ))}
+    </div>
+  );
+};
+
+export default ServiceCategories;

app/home/(user)/_lib/server/load-accounts.ts

@@ -1,6 +1,5 @@
 import { cache } from 'react';
 
-import { requireUserInServerComponent } from '@/lib/server/require-user-in-server-component';
 
 import { createAccountsApi } from '@kit/accounts/api';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';

app/home/(user)/_lib/server/load-analyses.ts

@@ -1,8 +1,9 @@
 import { cache } from 'react';
 
-import { listProductTypes } from "@lib/data/products";
-import { listRegions } from '@lib/data/regions';
 import { getProductCategories } from '@lib/data/categories';
+import { listProducts, listProductTypes } from '@lib/data/products';
+import { listRegions } from '@lib/data/regions';
+
 import { OrderAnalysisCard } from '../../_components/order-analyses-cards';
 
 async function countryCodesLoader() {
@@ -14,7 +15,9 @@ async function countryCodesLoader() {
 export const loadCountryCodes = cache(countryCodesLoader);
 
 async function productCategoriesLoader() {
-  const productCategories = await getProductCategories({ fields: "*products, *products.variants" });
+  const productCategories = await getProductCategories({
+    fields: '*products, *products.variants, is_active',
+  });
   return productCategories.product_categories ?? [];
 }
 export const loadProductCategories = cache(productCategoriesLoader);
@@ -32,22 +35,39 @@ async function analysesLoader() {
   ]);
   const countryCode = countryCodes[0]!;
 
-  const category = productCategories.find(({ metadata }) => metadata?.page === 'order-analysis');
+  const category = productCategories.find(
+    ({ metadata }) => metadata?.page === 'order-analysis',
+  );
+  const categoryProducts = category
+    ? await listProducts({
+      countryCode,
+      queryParams: { limit: 100, category_id: category.id },
+    })
+    : null;
+
+  const serviceCategories = productCategories.filter(
+    ({ parent_category }) => parent_category?.handle === 'tto-categories',
+  );
 
   return {
-    analyses: category?.products?.map<OrderAnalysisCard>(({ title, description, subtitle, variants, status, metadata }) => {
+    analyses:
-      const variant = variants![0]!;
+      categoryProducts?.response.products.map<OrderAnalysisCard>(
-      return {
+        ({ title, description, subtitle, variants, status, metadata }) => {
-        title,
+          const variant = variants![0]!;
-        description,
+          return {
-        subtitle,
+            title,
-        variant: {
+            description,
-          id: variant.id,
+            subtitle,
+            variant: {
+              id: variant.id,
+            },
+            isAvailable:
+              status === 'published' && !!metadata?.analysisIdOriginal,
+            price: variant.calculated_price?.calculated_amount ?? null,
+          };
         },
-        isAvailable: status === 'published' && !!metadata?.analysisIdOriginal,
+      ) ?? [],
-      };
-    }) ?? [],
     countryCode,
-  }
+  };
 }
 export const loadAnalyses = cache(analysesLoader);

app/home/(user)/_lib/server/load-analysis-packages.ts

@@ -6,8 +6,8 @@ import { listRegions } from '@lib/data/regions';
 import { getAnalysisElementMedusaProductIds } from '@/utils/medusa-product';
 import type { StoreProduct } from '@medusajs/types';
 import { loadCurrentUserAccount } from './load-user-account';
-import { AnalysisPackageWithVariant } from '~/components/select-analysis-package';
 import { AccountWithParams } from '@/packages/features/accounts/src/server/api';
+import { AnalysisPackageWithVariant } from '@kit/shared/components/select-analysis-package';
 
 async function countryCodesLoader() {
   const countryCodes = await listRegions().then((regions) =>
@@ -38,8 +38,11 @@ function userSpecificVariantLoader({
     if (age >= 18 && age <= 29) {
       return '18-29';
     }
-    if (age >= 30 && age <= 49) {
+    if (age >= 30 && age <= 39) {
-      return '30-49';
+      return '30-39';
+    }
+    if (age >= 40 && age <= 49) {
+      return '40-49';
     }
     if (age >= 50 && age <= 59) {
       return '50-59';

app/home/(user)/_lib/server/load-category.ts

@@ -0,0 +1,31 @@
+import { cache } from 'react';
+
+import { getProductCategories } from '@lib/data';
+
+import { ServiceCategory } from '../../_components/service-categories';
+
+async function categoryLoader({
+  handle,
+}: {
+  handle: string;
+}): Promise<{ category: ServiceCategory | null }> {
+  const response = await getProductCategories({
+    handle,
+    fields: '*products, is_active, metadata',
+  });
+
+  const category = response.product_categories[0];
+
+  return {
+    category: {
+      color:
+        typeof category?.metadata?.color === 'string'
+          ? category?.metadata?.color
+          : 'primary',
+      description: category?.description || '',
+      handle: category?.handle || '',
+      name: category?.name || '',
+    },
+  };
+}
+export const loadCategory = cache(categoryLoader);

app/home/(user)/_lib/server/load-tto-services.ts

@@ -0,0 +1,49 @@
+import { cache } from 'react';
+
+import { getProductCategories } from '@lib/data';
+
+import { ServiceCategory } from '../../_components/service-categories';
+
+async function ttoServicesLoader() {
+  const response = await getProductCategories({
+    fields: '*products, is_active, metadata',
+  });
+
+  const heroCategories = response.product_categories?.filter(
+    ({ parent_category, is_active, metadata }) =>
+      parent_category?.handle === 'tto-categories' &&
+      is_active &&
+      metadata?.isHero,
+  );
+
+  const ttoCategories = response.product_categories?.filter(
+    ({ parent_category, is_active, metadata }) =>
+      parent_category?.handle === 'tto-categories' &&
+      is_active &&
+      !metadata?.isHero,
+  );
+
+  return {
+    heroCategories:
+      heroCategories.map<ServiceCategory>(
+        ({ name, handle, metadata, description }) => ({
+          name,
+          handle,
+          color:
+            typeof metadata?.color === 'string' ? metadata.color : 'primary',
+          description,
+        }),
+      ) ?? [],
+    ttoCategories:
+      ttoCategories.map<ServiceCategory>(
+        ({ name, handle, metadata, description }) => ({
+          name,
+          handle,
+          color:
+            typeof metadata?.color === 'string' ? metadata.color : 'primary',
+          description,
+        }),
+      ) ?? [],
+  };
+}
+export const loadTtoServices = cache(ttoServicesLoader);

app/home/(user)/_lib/server/load-user-account.ts

@@ -16,14 +16,14 @@ export const loadUserAccount = cache(accountLoader);
 
 export async function loadCurrentUserAccount() {
   const user = await requireUserInServerComponent();
-  return user?.identities?.[0]?.id
+  return user?.id
-    ? await loadUserAccount(user?.identities?.[0]?.id)
+    ? await loadUserAccount(user.id)
     : null;
 }
 
-async function accountLoader(accountId: string) {
+async function accountLoader(userId: string) {
   const client = getSupabaseServerClient();
   const api = createAccountsApi(client);
 
-  return api.getAccount(accountId);
+  return api.getPersonalAccountByUserId(userId);
 }

app/home/(user)/_lib/server/load-user-analyses.ts

@@ -0,0 +1,22 @@
+import { cache } from 'react';
+
+import { createAccountsApi } from '@kit/accounts/api';
+import { UserAnalysis } from '@kit/accounts/types/accounts';
+import { getSupabaseServerClient } from '@kit/supabase/server-client';
+
+export type UserAnalyses = Awaited<ReturnType<typeof loadUserAnalyses>>;
+
+/**
+ * @name loadUserAnalyses
+ * @description
+ * Load the user's analyses. It's a cached per-request function that fetches the user workspace data.
+ * It can be used across the server components to load the user workspace data.
+ */
+export const loadUserAnalyses = cache(analysesLoader);
+
+async function analysesLoader(): Promise<UserAnalysis | null> {
+  const client = getSupabaseServerClient();
+  const api = createAccountsApi(client);
+
+  return api.getUserAnalyses();
+}

app/home/(user)/_lib/server/load-user-analysis.ts

@@ -1,7 +1,7 @@
 import { cache } from 'react';
 
 import { createAccountsApi } from '@kit/accounts/api';
-import { UserAnalysis } from '@kit/accounts/types/accounts';
+import { AnalysisResultDetails } from '@kit/accounts/types/accounts';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 export type UserAnalyses = Awaited<ReturnType<typeof loadUserAnalysis>>;
@@ -9,14 +9,15 @@ export type UserAnalyses = Awaited<ReturnType<typeof loadUserAnalysis>>;
 /**
  * @name loadUserAnalysis
  * @description
- * Load the user's analyses. It's a cached per-request function that fetches the user workspace data.
+ * Load the user's analysis based on id. It's a cached per-request function that fetches the user's analysis data.
- * It can be used across the server components to load the user workspace data.
  */
 export const loadUserAnalysis = cache(analysisLoader);
 
-async function analysisLoader(): Promise<UserAnalysis | null> {
+async function analysisLoader(
+  analysisOrderId: number,
+): Promise<AnalysisResultDetails | null> {
   const client = getSupabaseServerClient();
   const api = createAccountsApi(client);
 
-  return api.getUserAnalysis();
+  return api.getUserAnalysis(analysisOrderId);
 }

app/home/(user)/settings/_components/account-preferences-form.tsx

@@ -0,0 +1,111 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+import { Trans } from 'react-i18next';
+
+import { AccountWithParams } from '@kit/accounts/api';
+import { useRevalidatePersonalAccountDataQuery } from '@kit/accounts/hooks/use-personal-account-data';
+import { Button } from '@kit/ui/button';
+import { Card, CardDescription, CardTitle } from '@kit/ui/card';
+import { Form } from '@kit/ui/form';
+import { toast } from '@kit/ui/sonner';
+import { Switch } from '@kit/ui/switch';
+
+import {
+  AccountPreferences,
+  accountPreferencesSchema,
+} from '../_lib/account-preferences.schema';
+import { updatePersonalAccountPreferencesAction } from '../_lib/server/actions';
+import { LanguageSelector } from '@kit/ui/language-selector';
+
+export default function AccountPreferencesForm({
+  account,
+}: {
+  account: AccountWithParams | null;
+}) {
+  const revalidateUserDataQuery = useRevalidatePersonalAccountDataQuery();
+
+  const form = useForm({
+    resolver: zodResolver(accountPreferencesSchema),
+    defaultValues: {
+      preferredLanguage: account?.preferred_locale,
+      isConsentToAnonymizedCompanyStatistics:
+        !!account?.has_consent_anonymized_company_statistics,
+    },
+  });
+
+  const { register, handleSubmit, watch, setValue } = form;
+
+  const onSubmit = async (data: AccountPreferences) => {
+    if (!account?.id) {
+      return toast.error(<Trans i18nKey="account:updateAccountError" />);
+    }
+    const result = await updatePersonalAccountPreferencesAction({
+      accountId: account.id,
+      data,
+    });
+
+    if (result.success) {
+      revalidateUserDataQuery(account.primary_owner_user_id);
+      return toast.success(
+        <Trans i18nKey="account:updateAccountPreferencesSuccess" />,
+      );
+    }
+    return toast.error(
+      <Trans i18nKey="account:updateAccountPreferencesError" />,
+    );
+  };
+
+  const watchedConsent = watch('isConsentToAnonymizedCompanyStatistics');
+
+  if (!account) return null;
+
+  return (
+    <>
+      <div className="space-y-2">
+        <CardTitle className="text-base">
+          <Trans i18nKey={'account:language'} />
+        </CardTitle>
+        <LanguageSelector />
+      </div>
+      <Form {...form}>
+        <form
+          className="flex flex-col gap-6 text-left"
+          onSubmit={handleSubmit(onSubmit)}
+        >
+          <div className="space-y-4">
+            <h2 className="text-xl font-semibold text-gray-900">
+              <Trans i18nKey="account:consents" />
+            </h2>
+
+            <Card>
+              <div className="flex items-center justify-between p-3">
+                <div>
+                  <CardTitle className="text-base">
+                    <Trans i18nKey="account:consentToAnonymizedCompanyData.label" />
+                  </CardTitle>
+                  <CardDescription>
+                    <Trans i18nKey="account:consentToAnonymizedCompanyData.description" />
+                  </CardDescription>
+                </div>
+
+                <Switch
+                  checked={!!watchedConsent}
+                  onCheckedChange={(checked) =>
+                    setValue('isConsentToAnonymizedCompanyStatistics', checked)
+                  }
+                  {...register('isConsentToAnonymizedCompanyStatistics')}
+                />
+              </div>
+            </Card>
+          </div>
+
+          <Button type="submit" className="w-36">
+            <Trans i18nKey="account:updateProfileSubmitLabel" />
+          </Button>
+        </form>
+      </Form>
+    </>
+  );
+}

app/home/(user)/settings/_components/account-settings-form.tsx

@@ -0,0 +1,259 @@
+'use client';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+import { Trans } from 'react-i18next';
+
+import { AccountWithParams } from '@kit/accounts/api';
+import { useRevalidatePersonalAccountDataQuery } from '@kit/accounts/hooks/use-personal-account-data';
+import { Button } from '@kit/ui/button';
+import { Card, CardTitle } from '@kit/ui/card';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@kit/ui/form';
+import { Input } from '@kit/ui/input';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@kit/ui/select';
+import { toast } from '@kit/ui/sonner';
+import { Switch } from '@kit/ui/switch';
+
+import {
+  AccountSettings,
+  accountSettingsSchema,
+} from '../_lib/account-settings.schema';
+import { updatePersonalAccountAction } from '../_lib/server/actions';
+
+export default function AccountSettingsForm({
+  account,
+}: {
+  account: AccountWithParams | null;
+}) {
+  const revalidateUserDataQuery = useRevalidatePersonalAccountDataQuery();
+
+  const form = useForm({
+    resolver: zodResolver(accountSettingsSchema),
+    defaultValues: {
+      firstName: account?.name,
+      lastName: account?.last_name ?? '',
+      email: account?.email,
+      phone: account?.phone ?? '',
+      accountParams: {
+        height: account?.accountParams?.height,
+        weight: account?.accountParams?.weight,
+        isSmoker: account?.accountParams?.isSmoker,
+      },
+    },
+  });
+
+  const { handleSubmit } = form;
+
+  const onSubmit = async (data: AccountSettings) => {
+    if (!account?.id) {
+      return toast.error(<Trans i18nKey="account:updateAccountError" />);
+    }
+
+    const result = await updatePersonalAccountAction({
+      accountId: account.id,
+      data,
+    });
+
+    if (result.success) {
+      revalidateUserDataQuery(account.primary_owner_user_id);
+      return toast.success(<Trans i18nKey="account:updateAccountSuccess" />);
+    }
+    return toast.error(<Trans i18nKey="account:updateAccountError" />);
+  };
+
+  if (!account) return null;
+
+  return (
+    <Form {...form}>
+      <form
+        className="flex flex-col gap-6 text-left"
+        onSubmit={handleSubmit(onSubmit)}
+      >
+        <FormField
+          name={'firstName'}
+          render={({ field }) => {
+            return (
+              <FormItem>
+                <FormLabel>
+                  <Trans i18nKey={'common:formField.firstName'} />
+                </FormLabel>
+
+                <FormControl>
+                  <Input {...field} />
+                </FormControl>
+
+                <FormMessage />
+              </FormItem>
+            );
+          }}
+        />
+
+        <FormField
+          name={'lastName'}
+          render={({ field }) => {
+            return (
+              <FormItem>
+                <FormLabel>
+                  <Trans i18nKey={'common:formField.lastName'} />
+                </FormLabel>
+
+                <FormControl>
+                  <Input {...field} />
+                </FormControl>
+
+                <FormMessage />
+              </FormItem>
+            );
+          }}
+        />
+
+        <div className="grid grid-cols-2 gap-4">
+          <FormField
+            name={'accountParams.height'}
+            render={({ field }) => {
+              return (
+                <FormItem>
+                  <FormLabel>
+                    <Trans i18nKey={'common:formField.height'} />
+                  </FormLabel>
+
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+
+                  <FormMessage />
+                </FormItem>
+              );
+            }}
+          />
+
+          <FormField
+            name={'accountParams.weight'}
+            render={({ field }) => {
+              return (
+                <FormItem>
+                  <FormLabel>
+                    <Trans i18nKey={'common:formField.weight'} />
+                  </FormLabel>
+
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+
+                  <FormMessage />
+                </FormItem>
+              );
+            }}
+          />
+        </div>
+
+        <FormField
+          name={'phone'}
+          render={({ field }) => {
+            return (
+              <FormItem>
+                <FormLabel>
+                  <Trans i18nKey={'common:formField.phone'} />
+                </FormLabel>
+
+                <FormControl>
+                  <Input {...field} />
+                </FormControl>
+
+                <FormMessage />
+              </FormItem>
+            );
+          }}
+        />
+        <FormField
+          name={'email'}
+          render={({ field }) => {
+            return (
+              <FormItem>
+                <FormLabel>
+                  <Trans i18nKey={'common:formField.email'} />
+                </FormLabel>
+
+                <FormControl>
+                  <Input {...field} />
+                </FormControl>
+
+                <FormMessage />
+              </FormItem>
+            );
+          }}
+        />
+
+        <div className="space-y-4">
+          <h2 className="text-xl font-semibold text-gray-900">
+            <Trans i18nKey="account:myHabits" />
+          </h2>
+
+          <FormField
+            name="accountParams.isSmoker"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <Trans i18nKey={'common:formField.smoking'} />
+                </FormLabel>
+
+                <FormControl>
+                  <Select
+                    value={
+                      field.value === true
+                        ? 'yes'
+                        : field.value === false
+                          ? 'no'
+                          : 'preferNotToAnswer'
+                    }
+                    onValueChange={(value) => {
+                      if (value === 'yes') {
+                        field.onChange(true);
+                      } else if (value === 'no') {
+                        field.onChange(false);
+                      } else {
+                        field.onChange(null);
+                      }
+                    }}
+                  >
+                    <SelectTrigger>
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="yes">
+                        <Trans i18nKey="common:yes" />
+                      </SelectItem>
+                      <SelectItem value="no">
+                        <Trans i18nKey="common:no" />
+                      </SelectItem>
+                      <SelectItem value="preferNotToAnswer">
+                        <Trans i18nKey="common:preferNotToAnswer" />
+                      </SelectItem>
+                    </SelectContent>
+                  </Select>
+                </FormControl>
+              </FormItem>
+            )}
+          />
+        </div>
+
+        <Button type="submit" className="w-36">
+          <Trans i18nKey="account:updateProfileSubmitLabel" />
+        </Button>
+      </form>
+    </Form>
+  );
+}

app/home/(user)/settings/_components/settings-navigation.tsx

@@ -0,0 +1,152 @@
+'use client';
+
+import { useMemo } from 'react';
+
+import Link from 'next/link';
+
+import { StoreCart } from '@medusajs/types';
+import { Cross, Menu, Shield, ShoppingCart } from 'lucide-react';
+
+import { usePersonalAccountData } from '@kit/accounts/hooks/use-personal-account-data';
+import { ApplicationRoleEnum } from '@kit/accounts/types/accounts';
+import { pathsConfig } from '@kit/shared/config';
+import { useSignOut } from '@kit/supabase/hooks/use-sign-out';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@kit/ui/dropdown-menu';
+import { If } from '@kit/ui/if';
+import { Trans } from '@kit/ui/trans';
+
+import SignOutDropdownItem from '@kit/shared/components/sign-out-dropdown-item';
+import DropdownLink from '@kit/shared/components/ui/dropdown-link';
+import { UserWorkspace } from '../../_lib/server/load-user-workspace';
+import { routes } from './settings-sidebar';
+
+export function SettingsMobileNavigation(props: {
+  workspace: UserWorkspace;
+  cart: StoreCart | null;
+}) {
+  const user = props.workspace.user;
+
+  const signOut = useSignOut();
+  const { data: personalAccountData } = usePersonalAccountData(user.id);
+
+  const Links = [
+    {
+      children: [{ path: pathsConfig.app.home, label: 'common:routes.home' }],
+    },
+  ]
+    .concat(routes)
+    .map((item, index) => {
+      if ('children' in item) {
+        return item.children.map((child) => {
+          return (
+            <DropdownLink
+              key={child.path}
+              path={child.path}
+              label={child.label}
+            />
+          );
+        });
+      }
+
+      if ('divider' in item) {
+        return <DropdownMenuSeparator key={index} />;
+      }
+    });
+
+  const hasTotpFactor = useMemo(() => {
+    const factors = user?.factors ?? [];
+    return factors.some(
+      (factor) => factor.factor_type === 'totp' && factor.status === 'verified',
+    );
+  }, [user?.factors]);
+
+  const isSuperAdmin = useMemo(() => {
+    const hasAdminRole =
+      personalAccountData?.application_role === ApplicationRoleEnum.SuperAdmin;
+
+    return hasAdminRole && hasTotpFactor;
+  }, [user, personalAccountData, hasTotpFactor]);
+
+  const isDoctor = useMemo(() => {
+    const hasDoctorRole =
+      personalAccountData?.application_role === ApplicationRoleEnum.Doctor;
+
+    return hasDoctorRole && hasTotpFactor;
+  }, [user, personalAccountData, hasTotpFactor]);
+
+  const cartQuantityTotal =
+    props.cart?.items?.reduce((acc, item) => acc + item.quantity, 0) ?? 0;
+  const hasCartItems = cartQuantityTotal > 0;
+
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger>
+        <Menu className={'h-9'} />
+      </DropdownMenuTrigger>
+
+      <DropdownMenuContent sideOffset={10} className={'w-screen rounded-none'}>
+        <If condition={props.cart && hasCartItems}>
+          <DropdownMenuGroup>
+            <DropdownLink
+              path={pathsConfig.app.cart}
+              label="common:shoppingCartCount"
+              Icon={<ShoppingCart className="stroke-[1.5px]" />}
+              labelOptions={{ count: cartQuantityTotal }}
+            />
+          </DropdownMenuGroup>
+          <DropdownMenuSeparator />
+        </If>
+
+        <DropdownMenuGroup>{Links}</DropdownMenuGroup>
+
+        <If condition={isSuperAdmin}>
+          <DropdownMenuSeparator />
+
+          <DropdownMenuItem asChild>
+            <Link
+              className={
+                's-full flex cursor-pointer items-center space-x-2 text-yellow-700 dark:text-yellow-500'
+              }
+              href={pathsConfig.app.admin}
+            >
+              <Shield className={'h-5'} />
+
+              <span>Super Admin</span>
+            </Link>
+          </DropdownMenuItem>
+        </If>
+
+        <If condition={isDoctor}>
+          <DropdownMenuSeparator />
+
+          <DropdownMenuItem asChild>
+            <Link
+              className={
+                'flex h-full cursor-pointer items-center space-x-2 text-yellow-700 dark:text-yellow-500'
+              }
+              href={pathsConfig.app.doctor}
+            >
+              <Cross className={'h-5'} />
+
+              <span>
+                <Trans i18nKey="common:doctor" />
+              </span>
+            </Link>
+          </DropdownMenuItem>
+        </If>
+        <DropdownMenuSeparator />
+
+        <SignOutDropdownItem onSignOut={() => signOut.mutateAsync()} />
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
+
+

app/home/(user)/settings/_components/settings-section-header.tsx

@@ -0,0 +1,22 @@
+import { Separator } from "@kit/ui/separator";
+import { Trans } from "@kit/ui/trans";
+
+export default function SettingsSectionHeader({
+  titleKey,
+  descriptionKey,
+}: {
+  titleKey: string;
+  descriptionKey: string;
+}) {
+  return (
+    <div className="space-y-2">
+      <h1 className="text-2xl font-semibold text-gray-900">
+        <Trans i18nKey={titleKey} />
+      </h1>
+      <p className="text-gray-600">
+        <Trans i18nKey={descriptionKey} />
+      </p>
+      <Separator />
+    </div>
+  );
+}

app/home/(user)/settings/_components/settings-sidebar.tsx

@@ -0,0 +1,55 @@
+import z from 'zod';
+
+import { pathsConfig } from '@kit/shared/config';
+import { NavigationConfigSchema } from '@kit/ui/navigation-schema';
+import { PageHeader } from '@kit/ui/page';
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarHeader,
+  SidebarNavigation,
+} from '@kit/ui/shadcn-sidebar';
+import { Trans } from '@kit/ui/trans';
+
+export const routes = [
+  {
+    children: [
+      {
+        label: 'common:routes.profile',
+        path: pathsConfig.app.personalAccountSettings,
+        end: true,
+      },
+
+      {
+        label: 'common:routes.preferences',
+        path: pathsConfig.app.personalAccountPreferences,
+        end: true,
+      },
+
+      {
+        label: 'common:routes.security',
+        path: pathsConfig.app.personalAccountSecurity,
+        end: true,
+      },
+    ],
+  },
+] satisfies z.infer<typeof NavigationConfigSchema>['routes'];
+
+export function SettingsSidebar() {
+  return (
+    <Sidebar>
+      <SidebarHeader className="mt-16 h-24 w-[95vw] max-w-screen justify-center border-b bg-white pt-2">
+        <PageHeader
+          title={<Trans i18nKey="account:accountTabLabel" />}
+          description={<Trans i18nKey={'account:accountTabDescription'} />}
+        />
+      </SidebarHeader>
+
+      <SidebarContent className="w-auto">
+        <SidebarNavigation
+          config={{ style: 'custom', sidebarCollapsedStyle: 'none', routes }}
+        />
+      </SidebarContent>
+    </Sidebar>
+  );
+}

app/home/(user)/settings/_lib/account-preferences.schema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+
+export const accountPreferencesSchema = z.object({
+  preferredLanguage: z.enum(['et', 'en', 'ru']).optional().nullable(),
+  isConsentToAnonymizedCompanyStatistics: z.boolean().optional(),
+});
+
+export type AccountPreferences = z.infer<typeof accountPreferencesSchema>;

app/home/(user)/settings/_lib/account-settings.schema.ts

@@ -0,0 +1,21 @@
+import { z } from 'zod';
+
+export const accountSettingsSchema = z.object({
+  firstName: z
+    .string()
+    .min(1, { error: 'error:tooShort' })
+    .max(200, { error: 'error:tooLong' }),
+  lastName: z
+    .string()
+    .min(1, { error: 'error:tooShort' })
+    .max(200, { error: 'error:tooLong' }),
+  email: z.email({ error: 'error:invalidEmail' }).nullable(),
+  phone: z.e164({ error: 'error:invalidPhone' }),
+  accountParams: z.object({
+    height: z.coerce.number({ error: 'error:invalidNumber' }),
+    weight: z.coerce.number({ error: 'error:invalidNumber' }),
+    isSmoker: z.boolean().optional().nullable(),
+  }),
+});
+
+export type AccountSettings = z.infer<typeof accountSettingsSchema>;

app/home/(user)/settings/_lib/server/actions.ts

@@ -0,0 +1,66 @@
+'use server';
+
+import z from 'zod';
+
+import { enhanceAction } from '@kit/next/actions';
+import { getLogger } from '@kit/shared/logger';
+
+import {
+  updatePersonalAccount,
+  updatePersonalAccountPreferences,
+} from '~/lib/services/account.service';
+
+import {
+  AccountPreferences,
+  accountPreferencesSchema,
+} from '../account-preferences.schema';
+import {
+  AccountSettings,
+  accountSettingsSchema,
+} from '../account-settings.schema';
+
+export const updatePersonalAccountAction = enhanceAction(
+  async ({ accountId, data }: { accountId: string; data: AccountSettings }) => {
+    const logger = await getLogger();
+
+    try {
+      logger.info({ accountId }, 'Updating account');
+      await updatePersonalAccount(accountId, data);
+      logger.info({ accountId }, 'Successfully updated account');
+      return { success: true };
+    } catch (e) {
+      logger.error('Failed to update account', JSON.stringify(e));
+
+      return { success: false };
+    }
+  },
+  {
+    schema: z.object({ accountId: z.uuid(), data: accountSettingsSchema }),
+  },
+);
+
+export const updatePersonalAccountPreferencesAction = enhanceAction(
+  async ({
+    accountId,
+    data,
+  }: {
+    accountId: string;
+    data: AccountPreferences;
+  }) => {
+    const logger = await getLogger();
+
+    try {
+      logger.info({ accountId }, 'Updating account preferences');
+      await updatePersonalAccountPreferences(accountId, data);
+      logger.info({ accountId }, 'Successfully updated account preferences');
+      return { success: true };
+    } catch (e) {
+      logger.error('Failed to update account preferences', JSON.stringify(e));
+
+      return { success: false };
+    }
+  },
+  {
+    schema: z.object({ accountId: z.uuid(), data: accountPreferencesSchema }),
+  },
+);

app/home/(user)/settings/layout.tsx

@@ -1,23 +1,69 @@
-import { AppBreadcrumbs } from '@kit/ui/app-breadcrumbs';
+import { use } from 'react';
-import { Trans } from '@kit/ui/trans';
+
+import { retrieveCart } from '@lib/data/cart';
+import { StoreCart } from '@medusajs/types';
+
+import { UserWorkspaceContextProvider } from '@kit/accounts/components';
+import { AppLogo } from '@kit/shared/components/app-logo';
+import { pathsConfig } from '@kit/shared/config';
+import { Page, PageMobileNavigation, PageNavigation } from '@kit/ui/page';
+import { SidebarProvider } from '@kit/ui/shadcn-sidebar';
 
 import { withI18n } from '~/lib/i18n/with-i18n';
 
+import { SettingsSidebar } from './_components/settings-sidebar';
+// home imports
+import { HomeMenuNavigation } from '../_components/home-menu-navigation';
+import { loadUserWorkspace } from '../_lib/server/load-user-workspace';
+import { SettingsMobileNavigation } from './_components/settings-navigation';
 
-// local imports
+function UserSettingsLayout({ children }: React.PropsWithChildren) {
-import { HomeLayoutPageHeader } from '../_components/home-page-header';
+  return <HeaderLayout>{children}</HeaderLayout>;
-
-function UserSettingsLayout(props: React.PropsWithChildren) {
-  return (
-    <>
-      <HomeLayoutPageHeader
-        title={<Trans i18nKey={'account:routes.settings'} />}
-        description={<AppBreadcrumbs />}
-      />
-
-      {props.children}
-    </>
-  );
 }
 
 export default withI18n(UserSettingsLayout);
+
+function HeaderLayout({ children }: React.PropsWithChildren) {
+  const workspace = use(loadUserWorkspace());
+  const cart = use(retrieveCart());
+
+
+  return (
+    <UserWorkspaceContextProvider value={workspace}>
+      <Page style={'header'}>
+        <PageNavigation>
+          <HomeMenuNavigation workspace={workspace} cart={cart} />
+        </PageNavigation>
+
+        <PageMobileNavigation className={'flex items-center justify-between'}>
+          <MobileNavigation workspace={workspace} cart={cart} />
+        </PageMobileNavigation>
+
+        <SidebarProvider defaultOpen>
+          <Page style={'sidebar'}>
+            <PageNavigation>
+              <SettingsSidebar />
+            </PageNavigation>
+            <div className="md:mt-28 min-w-full min-h-full">{children}</div>
+          </Page>
+        </SidebarProvider>
+      </Page>
+    </UserWorkspaceContextProvider>
+  );
+}
+
+function MobileNavigation({
+  workspace,
+  cart,
+}: {
+  workspace: Awaited<ReturnType<typeof loadUserWorkspace>>;
+  cart: StoreCart | null;
+}) {
+  return (
+    <>
+      <AppLogo href={pathsConfig.app.home} />
+
+      <SettingsMobileNavigation workspace={workspace} cart={cart} />
+    </>
+  );
+}

app/home/(user)/settings/page.tsx

@@ -1,28 +1,11 @@
-import { use } from 'react';
-
-import { PersonalAccountSettingsContainer } from '@kit/accounts/personal-account-settings';
-import {
-  authConfig,
-  featureFlagsConfig,
-  pathsConfig,
-} from '@kit/shared/config';
 import { PageBody } from '@kit/ui/page';
 
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
-import { requireUserInServerComponent } from '~/lib/server/require-user-in-server-component';
 import { withI18n } from '~/lib/i18n/with-i18n';
 
-const features = {
+import { loadCurrentUserAccount } from '../_lib/server/load-user-account';
-  enableAccountDeletion: featureFlagsConfig.enableAccountDeletion,
+import AccountSettingsForm from './_components/account-settings-form';
-  enablePasswordUpdate: authConfig.providers.password,
+import SettingsSectionHeader from './_components/settings-section-header';
-};
-
-const callbackPath = pathsConfig.auth.callback;
-const accountHomePath = pathsConfig.app.accountHome;
-
-const paths = {
-  callback: callbackPath + `?next=${accountHomePath}`,
-};
 
 export const generateMetadata = async () => {
   const i18n = await createI18nServerInstance();
@@ -33,17 +16,18 @@ export const generateMetadata = async () => {
   };
 };
 
-function PersonalAccountSettingsPage() {
+async function PersonalAccountSettingsPage() {
-  const user = use(requireUserInServerComponent());
+  const account = await loadCurrentUserAccount();
-
   return (
     <PageBody>
-      <div className={'flex w-full flex-1 flex-col lg:max-w-2xl'}>
+      <div className="mx-auto w-full bg-white p-6">
-        <PersonalAccountSettingsContainer
+        <div className="space-y-6">
-          userId={user.id}
+          <SettingsSectionHeader
-          features={features}
+            titleKey="account:accountTabLabel"
-          paths={paths}
+            descriptionKey="account:accountTabDescription"
-        />
+          />
+          <AccountSettingsForm account={account} />
+        </div>
       </div>
     </PageBody>
   );

app/home/(user)/settings/preferences/page.tsx

@@ -0,0 +1,24 @@
+import { CardTitle } from '@kit/ui/card';
+import { LanguageSelector } from '@kit/ui/language-selector';
+import { Trans } from '@kit/ui/trans';
+
+import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';
+import AccountPreferencesForm from '../_components/account-preferences-form';
+import SettingsSectionHeader from '../_components/settings-section-header';
+
+export default async function PreferencesPage() {
+  const account = await loadCurrentUserAccount();
+
+  return (
+    <div className="mx-auto w-full bg-white p-6">
+      <div className="space-y-6">
+        <SettingsSectionHeader
+          titleKey="account:preferencesTabLabel"
+          descriptionKey="account:preferencesTabDescription"
+        />
+
+        <AccountPreferencesForm account={account} />
+      </div>
+    </div>
+  );
+}

app/home/(user)/settings/security/page.tsx

@@ -0,0 +1,17 @@
+import { MultiFactorAuthFactorsList } from '@kit/accounts/components';
+
+import SettingsSectionHeader from '../_components/settings-section-header';
+
+export default function SecuritySettingsPage() {
+  return (
+    <div className="mx-auto w-full bg-white p-6">
+      <div className="space-y-6">
+        <SettingsSectionHeader
+          titleKey="account:securityTabLabel"
+          descriptionKey="account:securityTabDescription"
+        />
+        <MultiFactorAuthFactorsList />
+      </div>
+    </div>
+  );
+}

app/home/[account]/_components/team-account-layout-mobile-navigation.tsx

@@ -1,9 +1,10 @@
 'use client';
 
-import Link from 'next/link';
+import DropdownLink from '@kit/shared/components/ui/dropdown-link';
 import { useRouter } from 'next/navigation';
 
-import { Home, LogOut, Menu } from 'lucide-react';
+import SignOutDropdownItem from '@kit/shared/components/sign-out-dropdown-item';
+import { Home, Menu } from 'lucide-react';
 
 import { AccountSelector } from '@kit/accounts/account-selector';
 import {
@@ -92,47 +93,7 @@ export const TeamAccountLayoutMobileNavigation = (
   );
 };
 
-function DropdownLink(
-  props: React.PropsWithChildren<{
-    path: string;
-    label: string;
-    Icon: React.ReactNode;
-  }>,
-) {
-  return (
-    <DropdownMenuItem asChild>
-      <Link
-        href={props.path}
-        className={'flex h-12 w-full items-center gap-x-3 px-3'}
-      >
-        {props.Icon}
 
-        <span>
-          <Trans i18nKey={props.label} defaults={props.label} />
-        </span>
-      </Link>
-    </DropdownMenuItem>
-  );
-}
-
-function SignOutDropdownItem(
-  props: React.PropsWithChildren<{
-    onSignOut: () => unknown;
-  }>,
-) {
-  return (
-    <DropdownMenuItem
-      className={'flex h-12 w-full items-center space-x-2'}
-      onClick={props.onSignOut}
-    >
-      <LogOut className={'h-4'} />
-
-      <span>
-        <Trans i18nKey={'common:signOut'} />
-      </span>
-    </DropdownMenuItem>
-  );
-}
 
 function TeamAccountsModal(props: {
   accounts: Accounts;

lib/actions/sign-out.tsx

@@ -3,9 +3,26 @@
 import { redirect } from 'next/navigation';
 
 import { createClient } from '@/utils/supabase/server';
+import { medusaLogout } from '@lib/data/customer';
 
 export const signOutAction = async () => {
-  const supabase = await createClient();
+  const client = await createClient();
-  await supabase.auth.signOut();
+
+  try {
+    try {
+      await medusaLogout();
+    } catch (medusaError) {
+      console.warn('Medusa logout failed or not available:', medusaError);
+    }
+
+    const { error } = await client.auth.signOut();
+    if (error) {
+      throw error;
+    }
+  } catch (error) {
+    console.error('Logout error:', error);
+    throw error;
+  }
+
   return redirect('/');
 };

lib/i18n/i18n.settings.ts

@@ -41,6 +41,7 @@ export const defaultI18nNamespaces = [
   'orders',
   'analysis-results',
   'doctor',
+  'error',
 ];
 
 /**

lib/services/account.service.ts

@@ -1,8 +1,14 @@
 import type { Tables } from '@/packages/supabase/src/database.types';
 
+import { AccountWithParams } from '@kit/accounts/api';
 import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
+import { AccountSettings } from '~/home/(user)/settings/_lib/account-settings.schema';
+
+import { AccountPreferences } from '../../app/home/(user)/settings/_lib/account-preferences.schema';
+import { updateCustomer } from '../../packages/features/medusa-storefront/src/lib/data';
+
 type Account = Tables<{ schema: 'medreport' }, 'accounts'>;
 type Membership = Tables<{ schema: 'medreport' }, 'accounts_memberships'>;
 
@@ -41,3 +47,100 @@ export async function getAccountAdmin({
 
   return data as unknown as AccountWithMemberships;
 }
+
+export async function getDoctorAccounts() {
+  const { data } = await getSupabaseServerAdminClient()
+    .schema('medreport')
+    .from('accounts')
+    .select('id, email, name, last_name, preferred_locale')
+    .eq('is_personal_account', true)
+    .eq('application_role', 'doctor')
+    .throwOnError();
+
+  return data?.map(({ id, email, name, last_name, preferred_locale }) => ({
+    id,
+    email,
+    name,
+    lastName: last_name,
+    preferredLocale: preferred_locale,
+  }));
+}
+
+export async function getAssignedDoctorAccount(analysisOrderId: number) {
+  const supabase = getSupabaseServerAdminClient();
+
+  const { data: doctorUser } = await supabase
+    .schema('medreport')
+    .from('doctor_analysis_feedback')
+    .select('doctor_user_id')
+    .eq('analysis_order_id', analysisOrderId)
+    .throwOnError();
+
+  const doctorData = doctorUser[0];
+  if (!doctorData || !doctorData.doctor_user_id) {
+    return null;
+  }
+
+  const { data } = await supabase
+    .schema('medreport')
+    .from('accounts')
+    .select('email')
+    .eq('primary_owner_user_id', doctorData.doctor_user_id);
+
+  return { email: data?.[0]?.email };
+}
+
+export async function updatePersonalAccount(
+  accountId: string,
+  account: AccountSettings,
+) {
+  const supabase = getSupabaseServerClient();
+
+  return Promise.all([
+    supabase
+      .schema('medreport')
+      .from('accounts')
+      .update({
+        name: account.firstName,
+        last_name: account.lastName,
+        email: account.email,
+        phone: account.phone,
+      })
+      .eq('id', accountId)
+      .throwOnError(),
+    supabase
+      .schema('medreport')
+      .from('account_params')
+      .upsert(
+        {
+          height: account.accountParams.height,
+          weight: account.accountParams.weight,
+          is_smoker: account.accountParams.isSmoker,
+        },
+        { onConflict: 'account_id' },
+      )
+      .throwOnError(),
+    updateCustomer({
+      first_name: account.firstName,
+      last_name: account.lastName,
+      phone: account.phone,
+    }),
+  ]);
+}
+export async function updatePersonalAccountPreferences(
+  accountId: string,
+  preferences: AccountPreferences,
+) {
+  const supabase = getSupabaseServerClient();
+
+  return supabase
+    .schema('medreport')
+    .from('accounts')
+    .update({
+      preferred_locale: preferences.preferredLanguage,
+      has_consent_anonymized_company_statistics:
+        preferences.isConsentToAnonymizedCompanyStatistics,
+    })
+    .eq('id', accountId)
+    .throwOnError();
+}

lib/services/analyses.service.ts

@@ -105,12 +105,18 @@ export const createMedusaSyncSuccessEntry = async () => {
   });
 }
 
-export async function getAnalyses({ ids }: { ids: number[] }): Promise<AnalysesWithGroupsAndElements> {
+export async function getAnalyses({ ids, originalIds }: { ids?: number[], originalIds?: string[] }): Promise<AnalysesWithGroupsAndElements> {
-  const { data } = await getSupabaseServerAdminClient()
+  const query = getSupabaseServerAdminClient()
     .schema('medreport')
     .from('analyses')
-    .select(`*, analysis_elements(*, analysis_groups(*))`)
+    .select(`*, analysis_elements(*, analysis_groups(*))`);
-    .in('id', ids);
+  if (Array.isArray(ids)) {
+    query.in('id', ids);
+  }
+  if (Array.isArray(originalIds)) {
+    query.in('analysis_id_original', originalIds);
+  }
+  const { data } = await query.throwOnError();
 
   return data as unknown as AnalysesWithGroupsAndElements;
 }

lib/services/audit/notificationEntries.service.ts

@@ -1,8 +1,10 @@
 import { Database } from '@kit/supabase/database';
-import { getSupabaseServerClient } from '@kit/supabase/server-client';
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
 
 export enum NotificationAction {
   DOCTOR_FEEDBACK_RECEIVED = 'DOCTOR_FEEDBACK_RECEIVED',
+  NEW_JOBS_ALERT = 'NEW_JOBS_ALERT',
+  PATIENT_RESULTS_RECEIVED_ALERT = 'PATIENT_RESULTS_RECEIVED_ALERT',
 }
 
 export const createNotificationLog = async ({
@@ -17,7 +19,7 @@ export const createNotificationLog = async ({
   relatedRecordId?: string | number;
 }) => {
   try {
-    const supabase = getSupabaseServerClient();
+    const supabase = getSupabaseServerAdminClient();
 
     await supabase
       .schema('audit')
@@ -30,6 +32,6 @@ export const createNotificationLog = async ({
       })
       .throwOnError();
   } catch (error) {
-    console.error('Failed to insert doctor page view log', error);
+    console.error('Failed to insert doctor notification log', error);
   }
 };

lib/services/audit/pageView.service.ts

@@ -2,6 +2,7 @@ import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 export enum PageViewAction {
   VIEW_ANALYSIS_RESULTS = 'VIEW_ANALYSIS_RESULTS',
+  VIEW_ANALYSIS_RESULTS_FROM_ORDER = 'VIEW_ANALYSIS_RESULTS_FROM_ORDER',
   REGISTRATION_SUCCESS = 'REGISTRATION_SUCCESS',
   VIEW_ORDER_ANALYSIS = 'VIEW_ORDER_ANALYSIS',
   VIEW_TEAM_ACCOUNT_DASHBOARD = 'VIEW_TEAM_ACCOUNT_DASHBOARD',
@@ -10,9 +11,11 @@ export enum PageViewAction {
 export const createPageViewLog = async ({
   accountId,
   action,
+  extraData,
 }: {
   accountId: string;
   action: PageViewAction;
+  extraData?: Record<string, any>;
 }) => {
   try {
     const supabase = getSupabaseServerClient();
@@ -34,6 +37,7 @@ export const createPageViewLog = async ({
         account_id: accountId,
         action,
         changed_by: user.id,
+        extra_data: extraData,
       })
       .throwOnError();
   } catch (error) {

lib/services/doctor-jobs.service.ts

@@ -0,0 +1,32 @@
+import { getSupabaseServerAdminClient } from '@kit/supabase/server-admin-client';
+
+async function getAssignedOrderIds() {
+  const supabase = getSupabaseServerAdminClient();
+
+  const { data: assignedOrderIds } = await supabase
+    .schema('medreport')
+    .from('doctor_analysis_feedback')
+    .select('analysis_order_id')
+    .not('doctor_user_id', 'is', null)
+    .throwOnError();
+
+  return assignedOrderIds?.map((f) => f.analysis_order_id) || [];
+}
+
+export async function getOpenJobAnalysisResponseIds() {
+  const supabase = getSupabaseServerAdminClient();
+  const assignedIds = await getAssignedOrderIds();
+
+  let query = supabase
+    .schema('medreport')
+    .from('analysis_responses')
+    .select('id, analysis_order_id')
+    .order('created_at', { ascending: false });
+
+  if (assignedIds.length > 0) {
+    query = query.not('analysis_order_id', 'in', `(${assignedIds.join(',')})`);
+  }
+
+  const { data: analysisResponses } = await query.throwOnError();
+  return analysisResponses?.map(({ id }) => id) || [];
+}

lib/services/mailer.service.ts

@@ -1,50 +1,41 @@
 'use server';
 
-import { CompanySubmitData } from '@/lib/types/company';
+import { toArray } from '@/lib/utils';
-import { emailSchema } from '@/lib/validations/email.schema';
 
-import { renderDoctorSummaryReceivedEmail } from '@kit/email-templates';
 import { getMailer } from '@kit/mailers';
 import { enhanceAction } from '@kit/next/actions';
 import { getLogger } from '@kit/shared/logger';
 
-export const sendDoctorSummaryCompletedEmail = async (
+import { emailSchema } from '~/lib/validations/email.schema';
-  language: string,
-  recipientName: string,
-  recipientEmail: string,
-  orderNr: string,
-  orderId: number,
-) => {
-  const { html, subject } = await renderDoctorSummaryReceivedEmail({
-    language,
-    recipientName,
-    recipientEmail,
-    orderNr,
-    orderId,
-  });
 
-  await sendEmail({
+type EmailTemplate = {
-    subject,
+  html: string;
-    html,
+  subject: string;
-    to: recipientEmail,
-  });
 };
 
-export const sendCompanyOfferEmail = async (
+type EmailRenderer<T = any> = (params: T) => Promise<EmailTemplate>;
-  data: CompanySubmitData,
-  language: string,
-) => {
-  const { renderCompanyOfferEmail } = await import('@kit/email-templates');
-  const { html, subject } = await renderCompanyOfferEmail({
-    language,
-    companyData: data,
-  });
 
-  await sendEmail({
+export const sendEmailFromTemplate = async <T>(
-    subject,
+  renderer: EmailRenderer<T>,
-    html,
+  templateParams: T,
-    to: process.env.CONTACT_EMAIL || '',
+  recipients: string | string[],
-  });
+) => {
+  const { html, subject } = await renderer(templateParams);
+
+  const recipientsArray = toArray(recipients);
+  if (!recipientsArray.length) {
+    throw new Error('No valid email recipients provided');
+  }
+
+  const emailPromises = recipientsArray.map((email) =>
+    sendEmail({
+      subject,
+      html,
+      to: email,
+    }),
+  );
+
+  await Promise.all(emailPromises);
 };
 
 export const sendEmail = enhanceAction(
@@ -53,7 +44,7 @@ export const sendEmail = enhanceAction(
     const log = await getLogger();
 
     if (!process.env.EMAIL_USER) {
-      log.error('Sending email failed, as no sender found in env.')
+      log.error('Sending email failed, as no sender was found in env.');
       throw new Error('No email user configured');
     }
 

lib/services/medipost.service.ts

@@ -10,6 +10,7 @@ import {
   getClientInstitution,
   getClientPerson,
   getConfidentiality,
+  getOrderEnteredPerson,
   getPais,
   getPatient,
   getProviderInstitution,
@@ -97,7 +98,7 @@ export async function getLatestPublicMessageListItem() {
       Action: MedipostAction.GetPublicMessageList,
       User: USER,
       Password: PASSWORD,
-      Sender: 'syndev',
+      Sender: RECIPIENT,
       // LastChecked (date+time) can be used here to get only messages since the last check - add when cron is created
       // MessageType check only for messages of certain type
     },
@@ -180,7 +181,10 @@ export async function getPrivateMessage(messageId: string) {
 
   await validateMedipostResponse(data, { canHaveEmptyCode: true });
 
-  return parseXML(data) as MedipostOrderResponse;
+  return {
+    message: parseXML(data) as MedipostOrderResponse,
+    xml: data as string,
+  };
 }
 
 export async function deletePrivateMessage(messageId: string) {
@@ -211,7 +215,9 @@ export async function readPrivateMessageResponse({
 
   try {
     const privateMessage = await getLatestPrivateMessageListItem({ excludedMessageIds });
-    if (!privateMessage) {
+    messageId = privateMessage?.messageId ?? null;
+
+    if (!privateMessage || !messageId) {
       return {
         messageId: null,
         hasAnalysisResponse: false,
@@ -221,40 +227,28 @@ export async function readPrivateMessageResponse({
       };
     }
 
-    messageId = privateMessage.messageId;
+    const { message: privateMessageContent, xml: privateMessageXml } = await getPrivateMessage(
-    if (!messageId) {
-      return {
-        messageId: null,
-        hasAnalysisResponse: false,
-        hasPartialAnalysisResponse: false,
-        hasFullAnalysisResponse: false,
-        medusaOrderId: undefined,
-      };
-    }
-
-    const privateMessageContent = await getPrivateMessage(
       privateMessage.messageId,
     );
+
     const messageResponse = privateMessageContent?.Saadetis?.Vastus;
     medusaOrderId = privateMessageContent?.Saadetis?.Tellimus?.ValisTellimuseId || messageResponse?.ValisTellimuseId;
 
-    if (!medusaOrderId || !medusaOrderId.toString().startsWith('order_')) {
+    const hasInvalidOrderId = !medusaOrderId || !medusaOrderId.toString().startsWith('order_');
-      return {
-        messageId,
-        hasAnalysisResponse: false,
-        hasPartialAnalysisResponse: false,
-        hasFullAnalysisResponse: false,
-        medusaOrderId: undefined,
-      };
-    }
 
-    if (!messageResponse) {
+    if (hasInvalidOrderId || !messageResponse) {
+      await createMedipostActionLog({
+        action: 'sync_analysis_results_from_medipost',
+        xml: privateMessageXml,
+        hasAnalysisResults: false,
+        medusaOrderId: hasInvalidOrderId ? undefined : medusaOrderId,
+      });
       return {
         messageId,
         hasAnalysisResponse: false,
         hasPartialAnalysisResponse: false,
         hasFullAnalysisResponse: false,
-        medusaOrderId,
+        medusaOrderId: hasInvalidOrderId ? undefined : medusaOrderId,
       };
     }
 
@@ -560,14 +554,12 @@ export async function composeOrderXML({
   ${getPais(USER, RECIPIENT, orderCreatedAt, orderId)}
   <Tellimus cito="EI">
 		<ValisTellimuseId>${orderId}</ValisTellimuseId>
-		<!--<TellijaAsutus>-->
 	  ${getClientInstitution()}
-		<!--<TeostajaAsutus>-->
 		${getProviderInstitution()}
-		<!--<TellijaIsik>-->
+    ${getClientPerson()}
-    ${getClientPerson(person)}
+    ${getOrderEnteredPerson()}
 		<TellijaMarkused>${comment ?? ''}</TellijaMarkused>
-		${getPatient(person)}
+    ${getPatient(person)}
 		${getConfidentiality()}
     ${specimenSection.join('')}
     ${analysisSection?.join('')}
@@ -673,7 +665,7 @@ async function syncPrivateMessage({
           unit: element.Mootyhik ?? null,
           original_response_element: element,
           analysis_name: element.UuringNimi || element.KNimetus,
-          comment: element.UuringuKommentaar
+          comment: element.UuringuKommentaar ?? '',
         })),
       );
     }
@@ -722,7 +714,7 @@ export async function sendOrderToMedipost({
   orderedAnalysisElements,
 }: {
   medusaOrderId: string;
-  orderedAnalysisElements: { analysisElementId: number }[];
+  orderedAnalysisElements: { analysisElementId?: number; analysisId?: number }[];
 }) {
   const medreportOrder = await getOrder({ medusaOrderId });
   const account = await getAccountAdmin({ primaryOwnerUserId: medreportOrder.user_id });
@@ -734,8 +726,8 @@ export async function sendOrderToMedipost({
       lastName: account.last_name ?? '',
       phone: account.phone ?? '',
     },
-    orderedAnalysisElementsIds: orderedAnalysisElements.map(({ analysisElementId }) => analysisElementId),
+    orderedAnalysisElementsIds: orderedAnalysisElements.map(({ analysisElementId }) => analysisElementId).filter(Boolean) as number[],
-    orderedAnalysesIds: [],
+    orderedAnalysesIds: orderedAnalysisElements.map(({ analysisId }) => analysisId).filter(Boolean) as number[],
     orderId: medusaOrderId,
     orderCreatedAt: new Date(medreportOrder.created_at),
     comment: '',
@@ -745,12 +737,36 @@ export async function sendOrderToMedipost({
     await sendPrivateMessage(orderXml);
   } catch (e) {
     const isMedipostError = e instanceof MedipostValidationError;
-    await logMedipostDispatch({
+    if (isMedipostError) {
-      medusaOrderId,
+      await logMedipostDispatch({
-      isSuccess: false,
+        medusaOrderId,
-      isMedipostError,
+        isSuccess: false,
-      errorMessage: isMedipostError ? e.response : undefined,
+        isMedipostError,
-    });
+        errorMessage: e.response,
+      });
+      await createMedipostActionLog({
+        action: 'send_order_to_medipost',
+        xml: orderXml,
+        hasAnalysisResults: false,
+        medusaOrderId,
+        responseXml: e.response,
+        hasError: true,
+      });
+    } else {
+      await logMedipostDispatch({
+        medusaOrderId,
+        isSuccess: false,
+        isMedipostError,
+      });
+      await createMedipostActionLog({
+        action: 'send_order_to_medipost',
+        xml: orderXml,
+        hasAnalysisResults: false,
+        medusaOrderId,
+        hasError: true,
+      });
+    }
+
     throw e;
   }
   await logMedipostDispatch({
@@ -758,15 +774,22 @@ export async function sendOrderToMedipost({
     isSuccess: true,
     isMedipostError: false,
   });
+  await createMedipostActionLog({
+    action: 'send_order_to_medipost',
+    xml: orderXml,
+    hasAnalysisResults: false,
+    medusaOrderId,
+  });
   await updateOrderStatus({ medusaOrderId, orderStatus: 'PROCESSING' });
 }
 
-export async function getOrderedAnalysisElementsIds({
+export async function getOrderedAnalysisIds({
   medusaOrder,
 }: {
   medusaOrder: StoreOrder;
 }): Promise<{
-  analysisElementId: number;
+  analysisElementId?: number;
+  analysisId?: number;
 }[]> {
   const countryCodes = await listRegions();
   const countryCode = countryCodes[0]!.countries![0]!.iso_2!;
@@ -779,6 +802,14 @@ export async function getOrderedAnalysisElementsIds({
     return analysisElements.map(({ id }) => ({ analysisElementId: id }));
   }
 
+  async function getOrderedAnalyses(medusaOrder: StoreOrder) {
+    const originalIds = (medusaOrder?.items ?? [])
+      .map((a) => a.product?.metadata?.analysisIdOriginal)
+      .filter((a) => typeof a === 'string') as string[];
+    const analyses = await getAnalyses({ originalIds });
+    return analyses.map(({ id }) => ({ analysisId: id }));
+  }
+
   async function getOrderedAnalysisPackages(medusaOrder: StoreOrder) {
     const orderedPackages = (medusaOrder?.items ?? []).filter(({ product }) => product?.handle.startsWith(ANALYSIS_PACKAGE_HANDLE_PREFIX));
     const orderedPackageIds = orderedPackages.map(({ product }) => product?.id).filter(Boolean) as string[];
@@ -818,10 +849,45 @@ export async function getOrderedAnalysisElementsIds({
     return analysisElements.map(({ id }) => ({ analysisElementId: id }));
   }
 
-  const [analysisPackageElements, orderedAnalysisElements] = await Promise.all([
+  const [analysisPackageElements, orderedAnalysisElements, orderedAnalyses] = await Promise.all([
     getOrderedAnalysisPackages(medusaOrder),
     getOrderedAnalysisElements(medusaOrder),
+    getOrderedAnalyses(medusaOrder),
   ]);
 
-  return [...analysisPackageElements, ...orderedAnalysisElements];
+  return [...analysisPackageElements, ...orderedAnalysisElements, ...orderedAnalyses];
+}
+
+export async function createMedipostActionLog({
+  action,
+  xml,
+  hasAnalysisResults = false,
+  medusaOrderId,
+  responseXml,
+  hasError = false,
+}: {
+  action:
+    | 'send_order_to_medipost'
+    | 'sync_analysis_results_from_medipost'
+    | 'send_fake_analysis_results_to_medipost'
+    | 'send_analysis_results_to_medipost';
+  xml: string;
+  hasAnalysisResults?: boolean;
+  medusaOrderId?: string | null;
+  responseXml?: string | null;
+  hasError?: boolean;
+}) {
+  await getSupabaseServerAdminClient()
+    .schema('medreport')
+    .from('medipost_actions')
+    .insert({
+      action,
+      xml,
+      has_analysis_results: hasAnalysisResults,
+      medusa_order_id: medusaOrderId,
+      response_xml: responseXml,
+      has_error: hasError,
+    })
+    .select('id')
+    .throwOnError();
 }

lib/services/medipostTest.service.ts

@@ -3,6 +3,7 @@
 import {
   getClientInstitution,
   getClientPerson,
+  getOrderEnteredPerson,
   getPais,
   getPatient,
   getProviderInstitution,
@@ -104,7 +105,8 @@ export async function composeOrderTestResponseXML({
 		<ValisTellimuseId>${orderId}</ValisTellimuseId>
 	    ${getClientInstitution({ index: 1 })}
 		  ${getProviderInstitution({ index: 1 })}
-      ${getClientPerson(person)}
+      ${getClientPerson()}
+      ${getOrderEnteredPerson()}
 		<TellijaMarkused>Siia tuleb tellija poolne märkus</TellijaMarkused>
 
 		${getPatient(person)}

lib/services/medusaCart.service.ts

@@ -16,12 +16,12 @@ const env = () =>
     .object({
       medusaBackendPublicUrl: z
         .string({
-          required_error: 'MEDUSA_BACKEND_PUBLIC_URL is required',
+          error: 'MEDUSA_BACKEND_PUBLIC_URL is required',
         })
         .min(1),
       siteUrl: z
         .string({
-          required_error: 'NEXT_PUBLIC_SITE_URL is required',
+          error: 'NEXT_PUBLIC_SITE_URL is required',
         })
         .min(1),
     })

lib/services/order.service.ts

@@ -10,7 +10,7 @@ export async function createOrder({
   orderedAnalysisElements,
 }: {
   medusaOrder: StoreOrder;
-  orderedAnalysisElements: { analysisElementId: number }[];
+  orderedAnalysisElements: { analysisElementId?: number; analysisId?: number }[];
 }) {
   const supabase = getSupabaseServerClient();
 
@@ -21,8 +21,8 @@ export async function createOrder({
   const orderResult = await supabase.schema('medreport')
     .from('analysis_orders')
     .insert({
-      analysis_element_ids: orderedAnalysisElements.map(({ analysisElementId }) => analysisElementId),
+      analysis_element_ids: orderedAnalysisElements.map(({ analysisElementId }) => analysisElementId).filter(Boolean) as number[],
-      analysis_ids: [],
+      analysis_ids: orderedAnalysisElements.map(({ analysisId }) => analysisId).filter(Boolean) as number[],
       status: 'QUEUED',
       user_id: user.id,
       medusa_order_id: medusaOrder.id,
@@ -134,8 +134,10 @@ export async function getAnalysisOrders({
 
 export async function getAnalysisOrdersAdmin({
   orderStatus,
+  medusaOrderId,
 }: {
   orderStatus?: Tables<{ schema: 'medreport' }, 'analysis_orders'>['status'];
+  medusaOrderId?: string | null;
 } = {}) {
   const query = getSupabaseServerAdminClient()
     .schema('medreport')
@@ -144,6 +146,9 @@ export async function getAnalysisOrdersAdmin({
   if (orderStatus) {
     query.eq('status', orderStatus);
   }
+  if (medusaOrderId) {
+    query.eq('medusa_order_id', medusaOrderId);
+  }
   const orders = await query.order('created_at', { ascending: false }).throwOnError();
   return orders.data;
 }

lib/templates/medipost-order.ts

@@ -21,70 +21,48 @@ export const getPais = (
     <Saaja>${recipient}</Saaja>
     <Aeg>${format(createdAt, DATE_TIME_FORMAT)}</Aeg>
     <SaadetisId>${orderId}</SaadetisId>
-    <Email>argo@medreport.ee</Email>
+    <Email>info@medreport.ee</Email>
   </Pais>`;
 };
 
 export const getClientInstitution = ({ index }: { index?: number } = {}) => {
-  if (isProd) {
-    // return correct data
-  }
   return `<Asutus tyyp="TELLIJA" ${index ? ` jarjenumber="${index}"` : ''}>
       <AsutuseId>16381793</AsutuseId>
       <AsutuseNimi>MedReport OÜ</AsutuseNimi>
-      <AsutuseKood>TSU</AsutuseKood>
+      <AsutuseKood>MRP</AsutuseKood>
       <Telefon>+37258871517</Telefon>
     </Asutus>`;
 };
 
 export const getProviderInstitution = ({ index }: { index?: number } = {}) => {
-  if (isProd) {
-    // return correct data
-  }
   return `<Asutus tyyp="TEOSTAJA" ${index ? ` jarjenumber="${index}"` : ''}>
       <AsutuseId>11107913</AsutuseId>
-      <AsutuseNimi>Synlab HTI Tallinn</AsutuseNimi>
+      <AsutuseNimi>Synlab Eesti OÜ</AsutuseNimi>
-      <AsutuseKood>SLA</AsutuseKood>
+      <AsutuseKood>HTI</AsutuseKood>
       <AllyksuseNimi>Synlab HTI Tallinn</AllyksuseNimi>
-      <Telefon>+3723417123</Telefon>
+      <Telefon>+37217123</Telefon>
     </Asutus>`;
 };
 
-export const getClientPerson = ({
+export const getClientPerson = () => {
-  idCode,
-  firstName,
-  lastName,
-  phone,
-}: {
-  idCode: string,
-  firstName: string,
-  lastName: string,
-  phone: string,
-}) => {
-  if (isProd) {
-    // return correct data
-  }
   return `<Personal tyyp="TELLIJA" jarjenumber="1">
       <PersonalOID>1.3.6.1.4.1.28284.6.2.4.9</PersonalOID>
-      <PersonalKood>${idCode}</PersonalKood>
+      <PersonalKood>D07907</PersonalKood>
-      <PersonalPerekonnaNimi>${lastName}</PersonalPerekonnaNimi>
+      <PersonalPerekonnaNimi>Eduard</PersonalPerekonnaNimi>
-      <PersonalEesNimi>${firstName}</PersonalEesNimi>
+      <PersonalEesNimi>Tsvetkov</PersonalEesNimi>
-      ${phone ? `<Telefon>${phone.startsWith('+372') ? phone : `+372${phone}`}</Telefon>` : ''}
+      <Telefon>+37258131202</Telefon>
     </Personal>`;
 };
 
-// export const getOrderEnteredPerson = () => {
+export const getOrderEnteredPerson = () => {
-//   if (isProd) {
+  return `<Personal tyyp="SISESTAJA" jarjenumber="2">
-//     // return correct data
+      <PersonalOID>1.3.6.1.4.1.28284.6.2.4.9</PersonalOID>
-//   }
+      <PersonalKood>D07907</PersonalKood>
-//   return `<Personal tyyp="SISESTAJA" jarjenumber="1">
+      <PersonalPerekonnaNimi>Eduard</PersonalPerekonnaNimi>
-//       <PersonalOID>1.3.6.1.4.1.28284.6.2.4.9</PersonalOID>
+      <PersonalEesNimi>Tsvetkov</PersonalEesNimi>
-//       <PersonalKood>D07907</PersonalKood>
+      <Telefon>+37258131202</Telefon>
-//       <PersonalPerekonnaNimi>Eduard</PersonalPerekonnaNimi>
+    </Personal>`;
-//       <PersonalEesNimi>Tsvetkov</PersonalEesNimi>
+};
-//       <Telefon>+37258131202</Telefon>
-//     </Personal>`;
-// };
 
 export const getPatient = ({
   idCode,

lib/utils.ts

@@ -15,11 +15,12 @@ export function toArray<T>(input?: T | T[] | null): T[] {
 }
 
 export function toTitleCase(str?: string) {
-  if (!str) return '';
+  return (
-  return str.replace(
+    str
-    /\w\S*/g,
+      ?.toLowerCase()
-    (text: string) =>
+      .replace(/[^-'’\s]+/g, (match) =>
-      text.charAt(0).toUpperCase() + text.substring(1).toLowerCase(),
+        match.replace(/^./, (first) => first.toUpperCase()),
+      ) ?? ""
   );
 }
 
@@ -40,8 +41,12 @@ export function sortByDate<T>(
 
 export const bmiFromMetric = (kg: number, cm: number) => {
   const m = cm / 100;
-  const bmi = kg / (m * m);
+  const m2 = m * m;
-  return bmi ? Math.round(bmi) : NaN;
+  if (m2 === 0) {
+    return null;
+  }
+  const bmi = kg / m2;
+  return !Number.isNaN(bmi) ? Math.round(bmi) : null;
 };
 
 export function getBmiStatus(
@@ -58,7 +63,9 @@ export function getBmiStatus(
     ) || null;
   const bmi = bmiFromMetric(params.weight, params.height);
 
-  if (!thresholdByAge || Number.isNaN(bmi)) return null;
+  if (!thresholdByAge || bmi === null) {
+    return null;
+  }
 
   if (bmi > thresholdByAge.obesity_min) return BmiCategory.OBESE;
   if (bmi > thresholdByAge.strong_min) return BmiCategory.VERY_OVERWEIGHT;

lib/validations/company-offer.schema.ts

@@ -2,15 +2,14 @@ import { z } from 'zod';
 
 export const companyOfferSchema = z.object({
   companyName: z.string({
-    required_error: 'Company name is required',
+    error: 'Company name is required',
   }),
   contactPerson: z.string({
-    required_error: 'Contact person is required',
+    error: 'Contact person is required',
   }),
   email: z
-    .string({
+    .email({
-      required_error: 'Email is required',
+      error: 'Invalid email',
-    })
+    }),
-    .email('Invalid email'),
   phone: z.string().optional(),
 });

middleware.ts

@@ -165,6 +165,20 @@ async function doctorMiddleware(request: NextRequest, response: NextResponse) {
  */
 function getPatterns() {
   return [
+    {
+      pattern: new URLPattern({ pathname: '/' }),
+      handler: async (req: NextRequest, res: NextResponse) => {
+        const {
+          data: { user },
+        } = await getUser(req, res);
+
+        if (user) {
+          return NextResponse.redirect(
+            new URL(pathsConfig.app.home, req.nextUrl.origin).href,
+          );
+        }
+      },
+    },
     {
       pattern: new URLPattern({ pathname: '/admin/*?' }),
       handler: adminMiddleware,

next.config.mjs

@@ -50,7 +50,7 @@ const config = {
   },
   experimental: {
     mdxRs: true,
-    reactCompiler: ENABLE_REACT_COMPILER,
+    reactCompiler: false,
     optimizePackageImports: [
       'recharts',
       'lucide-react',

package.json

@@ -33,13 +33,13 @@
     "@hookform/resolvers": "^5.1.1",
     "@kit/accounts": "workspace:*",
     "@kit/admin": "workspace:*",
-    "@kit/doctor": "workspace:*",
     "@kit/analytics": "workspace:*",
     "@kit/auth": "workspace:*",
     "@kit/billing": "workspace:*",
     "@kit/billing-gateway": "workspace:*",
     "@kit/cms": "workspace:*",
     "@kit/database-webhooks": "workspace:*",
+    "@kit/doctor": "workspace:*",
     "@kit/email-templates": "workspace:*",
     "@kit/i18n": "workspace:*",
     "@kit/mailers": "workspace:*",
@@ -69,6 +69,7 @@
     "fast-xml-parser": "^5.2.5",
     "isikukood": "3.1.7",
     "jsonwebtoken": "9.0.2",
+    "libphonenumber-js": "^1.12.15",
     "lodash": "^4.17.21",
     "lucide-react": "^0.510.0",
     "next": "15.3.2",
@@ -82,7 +83,7 @@
     "sonner": "^2.0.5",
     "tailwind-merge": "^3.3.1",
     "ts-node": "^10.9.2",
-    "zod": "^3.25.67"
+    "zod": "^4.1.5"
   },
   "devDependencies": {
     "@hookform/resolvers": "^5.0.1",

packages/billing/core/src/create-billing-schema.ts

@@ -21,39 +21,25 @@ export const PaymentTypeSchema = z.enum(['one-time', 'recurring']);
 export const LineItemSchema = z
   .object({
     id: z
-      .string({
+      .string()
-        description:
+      .describe('Unique identifier for the line item. Defined by the Provider.')
-          'Unique identifier for the line item. Defined by the Provider.',
-      })
       .min(1),
     name: z
-      .string({
+      .string().describe('Name of the line item. Displayed to the user.')
-        description: 'Name of the line item. Displayed to the user.',
-      })
       .min(1),
     description: z
-      .string({
+      .string().describe('Description of the line item. Displayed to the user and will replace the auto-generated description inferred' +
-        description:
+        ' from the line item. This is useful if you want to provide a more detailed description to the user.')
-          'Description of the line item. Displayed to the user and will replace the auto-generated description inferred' +
-          ' from the line item. This is useful if you want to provide a more detailed description to the user.',
-      })
       .optional(),
     cost: z
-      .number({
+      .number().describe('Cost of the line item. Displayed to the user.')
-        description: 'Cost of the line item. Displayed to the user.',
-      })
       .min(0),
     type: LineItemTypeSchema,
     unit: z
-      .string({
+      .string().describe('Unit of the line item. Displayed to the user. Example "seat" or "GB"')
-        description:
-          'Unit of the line item. Displayed to the user. Example "seat" or "GB"',
-      })
       .optional(),
     setupFee: z
-      .number({
+      .number().describe(`Lemon Squeezy only: If true, in addition to the cost, a setup fee will be charged.`)
-        description: `Lemon Squeezy only: If true, in addition to the cost, a setup fee will be charged.`,
-      })
       .positive()
       .optional(),
     tiers: z
@@ -92,14 +78,10 @@ export const LineItemSchema = z
 export const PlanSchema = z
   .object({
     id: z
-      .string({
+      .string().describe('Unique identifier for the plan. Defined by yourself.')
-        description: 'Unique identifier for the plan. Defined by yourself.',
-      })
       .min(1),
     name: z
-      .string({
+      .string().describe('Name of the plan. Displayed to the user.')
-        description: 'Name of the plan. Displayed to the user.',
-      })
       .min(1),
     interval: BillingIntervalSchema.optional(),
     custom: z.boolean().default(false).optional(),
@@ -124,10 +106,7 @@ export const PlanSchema = z
       },
     ),
     trialDays: z
-      .number({
+      .number().describe('Number of days for the trial period. Leave empty for no trial.')
-        description:
-          'Number of days for the trial period. Leave empty for no trial.',
-      })
       .positive()
       .optional(),
     paymentType: PaymentTypeSchema,
@@ -209,54 +188,34 @@ export const PlanSchema = z
 const ProductSchema = z
   .object({
     id: z
-      .string({
+      .string().describe('Unique identifier for the product. Defined by th Provider.')
-        description:
-          'Unique identifier for the product. Defined by th Provider.',
-      })
       .min(1),
     name: z
-      .string({
+      .string().describe('Name of the product. Displayed to the user.')
-        description: 'Name of the product. Displayed to the user.',
-      })
       .min(1),
     description: z
-      .string({
+      .string().describe('Description of the product. Displayed to the user.')
-        description: 'Description of the product. Displayed to the user.',
-      })
       .min(1),
     currency: z
-      .string({
+      .string().describe('Currency code for the product. Displayed to the user.')
-        description: 'Currency code for the product. Displayed to the user.',
-      })
       .min(3)
       .max(3),
     badge: z
-      .string({
+      .string().describe('Badge for the product. Displayed to the user. Example: "Popular"')
-        description:
-          'Badge for the product. Displayed to the user. Example: "Popular"',
-      })
       .optional(),
     features: z
       .array(
-        z.string({
+        z.string(),
-          description: 'Features of the product. Displayed to the user.',
+      ).describe('Features of the product. Displayed to the user.')
-        }),
-      )
       .nonempty(),
     enableDiscountField: z
-      .boolean({
+      .boolean().describe('Enable discount field for the product in the checkout.')
-        description: 'Enable discount field for the product in the checkout.',
-      })
       .optional(),
     highlighted: z
-      .boolean({
+      .boolean().describe('Highlight this product. Displayed to the user.')
-        description: 'Highlight this product. Displayed to the user.',
-      })
       .optional(),
     hidden: z
-      .boolean({
+      .boolean().describe('Hide this product from being displayed to users.')
-        description: 'Hide this product from being displayed to users.',
-      })
       .optional(),
     plans: z.array(PlanSchema),
   })

packages/billing/core/src/schema/report-billing-usage.schema.ts

@@ -1,14 +1,10 @@
 import { z } from 'zod';
 
 export const ReportBillingUsageSchema = z.object({
-  id: z.string({
+  id: z.string().describe('The id of the usage record. For Stripe a customer ID, for LS a subscription item ID.'),
-    description:
-      'The id of the usage record. For Stripe a customer ID, for LS a subscription item ID.',
-  }),
   eventName: z
-    .string({
+    .string()
-      description: 'The name of the event that triggered the usage',
+    .describe('The name of the event that triggered the usage')
-    })
     .optional(),
   usage: z.object({
     quantity: z.number(),

packages/billing/core/src/schema/update-health-benefit.schema.ts

@@ -3,8 +3,8 @@ import { z } from 'zod';
 export const UpdateHealthBenefitSchema = z.object({
   occurance: z
     .string({
-      required_error: 'Occurance is required',
+      error: 'Occurance is required',
     })
     .nonempty(),
-  amount: z.number({ required_error: 'Amount is required' }),
+  amount: z.number({ error: 'Amount is required' }),
 });

packages/billing/montonio/src/schema/montonio-server-env.schema.ts

@@ -4,12 +4,12 @@ export const MontonioServerEnvSchema = z
   .object({
     secretKey: z
       .string({
-        required_error: `Please provide the variable MONTONIO_SECRET_KEY`,
+        error: `Please provide the variable MONTONIO_SECRET_KEY`,
       })
       .min(1),
     apiUrl: z
       .string({
-        required_error: `Please provide the variable MONTONIO_API_URL`,
+        error: `Please provide the variable MONTONIO_API_URL`,
       })
       .min(1),
   });

packages/billing/stripe/src/schema/stripe-server-env.schema.ts

@@ -4,12 +4,12 @@ export const StripeServerEnvSchema = z
   .object({
     secretKey: z
       .string({
-        required_error: `Please provide the variable STRIPE_SECRET_KEY`,
+        error: `Please provide the variable STRIPE_SECRET_KEY`,
       })
       .min(1),
     webhooksSecret: z
       .string({
-        required_error: `Please provide the variable STRIPE_WEBHOOK_SECRET`,
+        error: `Please provide the variable STRIPE_WEBHOOK_SECRET`,
       })
       .min(1),
   })

packages/database-webhooks/src/server/services/database-webhook-router.service.ts

@@ -1,7 +1,20 @@
 import { SupabaseClient } from '@supabase/supabase-js';
 
+import {
+  renderAllResultsReceivedEmail,
+  renderFirstResultsReceivedEmail,
+} from '@kit/email-templates';
 import { Database } from '@kit/supabase/database';
 
+import {
+  getAssignedDoctorAccount,
+  getDoctorAccounts,
+} from '../../../../../lib/services/account.service';
+import {
+  NotificationAction,
+  createNotificationLog,
+} from '../../../../../lib/services/audit/notificationEntries.service';
+import { sendEmailFromTemplate } from '../../../../../lib/services/mailer.service';
 import { RecordChange, Tables } from '../record-change.type';
 
 export function createDatabaseWebhookRouterService(
@@ -42,6 +55,12 @@ class DatabaseWebhookRouterService {
         return this.handleAccountsWebhook(payload);
       }
 
+      case 'analysis_orders': {
+        const payload = body as RecordChange<typeof body.table>;
+
+        return this.handleAnalysisOrdersWebhook(payload);
+      }
+
       default: {
         return;
       }
@@ -83,4 +102,69 @@ class DatabaseWebhookRouterService {
       return service.handleAccountDeletedWebhook(body.old_record);
     }
   }
+
+  private async handleAnalysisOrdersWebhook(
+    body: RecordChange<'analysis_orders'>,
+  ) {
+    if (body.type === 'UPDATE' && body.record && body.old_record) {
+      const { record, old_record } = body;
+
+      if (record.status === old_record.status) {
+        return;
+      }
+
+      let action;
+      try {
+        const data = {
+          analysisOrderId: record.id,
+          language: 'et',
+        };
+
+        if (record.status === 'PARTIAL_ANALYSIS_RESPONSE') {
+          action = NotificationAction.NEW_JOBS_ALERT;
+
+          const doctorAccounts = await getDoctorAccounts();
+          const doctorEmails: string[] = doctorAccounts
+            .map(({ email }) => email)
+            .filter((email): email is string => !!email);
+
+          await sendEmailFromTemplate(
+            renderFirstResultsReceivedEmail,
+            data,
+            doctorEmails,
+          );
+        } else if (record.status === 'FULL_ANALYSIS_RESPONSE') {
+          action = NotificationAction.PATIENT_RESULTS_RECEIVED_ALERT;
+          const doctorAccount = await getAssignedDoctorAccount(record.id);
+          const assignedDoctorEmail = doctorAccount?.email;
+
+          if (!assignedDoctorEmail) {
+            return;
+          }
+
+          await sendEmailFromTemplate(
+            renderAllResultsReceivedEmail,
+            data,
+            assignedDoctorEmail,
+          );
+        }
+
+        if (action) {
+          await createNotificationLog({
+            action,
+            status: 'SUCCESS',
+            relatedRecordId: record.id,
+          });
+        }
+      } catch (e: any) {
+        if (action)
+          await createNotificationLog({
+            action,
+            status: 'FAIL',
+            comment: e?.message,
+            relatedRecordId: record.id,
+          });
+      }
+    }
+  }
 }

packages/database-webhooks/src/server/services/verifier/postgres-database-webhook-verifier.service.ts

@@ -4,9 +4,9 @@ import { DatabaseWebhookVerifierService } from './database-webhook-verifier.serv
 
 const webhooksSecret = z
   .string({
-    description: `The secret used to verify the webhook signature`,
+    error: `Provide the variable SUPABASE_DB_WEBHOOK_SECRET. This is used to authenticate the webhook event from Supabase.`,
-    required_error: `Provide the variable SUPABASE_DB_WEBHOOK_SECRET. This is used to authenticate the webhook event from Supabase.`,
   })
+  .describe(`The secret used to verify the webhook signature`,)
   .min(1)
   .parse(process.env.SUPABASE_DB_WEBHOOK_SECRET);
 

packages/email-templates/src/components/email-button.tsx

@@ -0,0 +1,16 @@
+import { Button } from '@react-email/components';
+
+export function EmailButton(
+  props: React.PropsWithChildren<{
+    href: string;
+  }>,
+) {
+  return (
+    <Button
+      className="hover:bg-primary/90 inline-flex w-full items-center justify-center gap-1 rounded bg-[#16a249] py-3 text-center text-[16px] font-semibold whitespace-nowrap text-white no-underline shadow-xs transition-colors focus-visible:outline-hidden disabled:pointer-events-none disabled:opacity-50"
+      href={props.href}
+    >
+      {props.children}
+    </Button>
+  );
+}

packages/email-templates/src/emails/all-results-received.email.tsx

@@ -0,0 +1,82 @@
+import {
+  Body,
+  Head,
+  Html,
+  Preview,
+  Tailwind,
+  Text,
+  render
+} from '@react-email/components';
+
+import { BodyStyle } from '../components/body-style';
+import CommonFooter from '../components/common-footer';
+import { EmailContent } from '../components/content';
+import { EmailButton } from '../components/email-button';
+import { EmailHeader } from '../components/header';
+import { EmailHeading } from '../components/heading';
+import { EmailWrapper } from '../components/wrapper';
+import { initializeEmailI18n } from '../lib/i18n';
+
+export async function renderAllResultsReceivedEmail({
+  language,
+  analysisOrderId,
+}: {
+  language: string;
+  analysisOrderId: number;
+}) {
+  const namespace = 'all-results-received-email';
+
+  const { t } = await initializeEmailI18n({
+    language,
+    namespace: [namespace, 'common'],
+  });
+
+  const previewText = t(`${namespace}:previewText`);
+
+  const subject = t(`${namespace}:subject`);
+
+  const html = await render(
+    <Html>
+      <Head>
+        <BodyStyle />
+      </Head>
+
+      <Preview>{previewText}</Preview>
+
+      <Tailwind>
+        <Body>
+          <EmailWrapper>
+            <EmailHeader>
+              <EmailHeading>{previewText}</EmailHeading>
+            </EmailHeader>
+
+            <EmailContent>
+              <Text className="text-[16px] leading-[24px] text-[#242424]">
+                {t(`${namespace}:hello`)}
+              </Text>
+              <Text className="text-[16px] leading-[24px] font-semibold text-[#242424]">
+                {t(`${namespace}:openOrdersHeading`)}
+              </Text>
+              <EmailButton
+                href={`${process.env.NEXT_PUBLIC_SITE_URL}/doctor/analysis/${analysisOrderId}`}
+              >
+                {t(`${namespace}:linkText`)}
+              </EmailButton>
+
+              <Text>
+                {t(`${namespace}:ifLinksDisabled`)}{' '}
+                {`${process.env.NEXT_PUBLIC_SITE_URL}/doctor/analysis/${analysisOrderId}`}
+              </Text>
+              <CommonFooter t={t} />
+            </EmailContent>
+          </EmailWrapper>
+        </Body>
+      </Tailwind>
+    </Html>,
+  );
+
+  return {
+    html,
+    subject,
+  };
+}

packages/email-templates/src/emails/doctor-summary-received.email.tsx

@@ -1,9 +1,7 @@
 import {
   Body,
-  Button,
   Head,
   Html,
-  Link,
   Preview,
   Tailwind,
   Text,
@@ -13,6 +11,7 @@ import {
 import { BodyStyle } from '../components/body-style';
 import CommonFooter from '../components/common-footer';
 import { EmailContent } from '../components/content';
+import { EmailButton } from '../components/email-button';
 import { EmailHeader } from '../components/header';
 import { EmailHeading } from '../components/heading';
 import { EmailWrapper } from '../components/wrapper';
@@ -20,16 +19,14 @@ import { initializeEmailI18n } from '../lib/i18n';
 
 export async function renderDoctorSummaryReceivedEmail({
   language,
-  recipientEmail,
   recipientName,
   orderNr,
-  orderId,
+  analysisOrderId,
 }: {
   language?: string;
   recipientName: string;
-  recipientEmail: string;
   orderNr: string;
-  orderId: number;
+  analysisOrderId: number;
 }) {
   const namespace = 'doctor-summary-received-email';
 
@@ -38,8 +35,6 @@ export async function renderDoctorSummaryReceivedEmail({
     namespace: [namespace, 'common'],
   });
 
-  const to = recipientEmail;
-
   const previewText = t(`${namespace}:previewText`, {
     orderNr,
   });
@@ -72,14 +67,15 @@ export async function renderDoctorSummaryReceivedEmail({
               <Text className="text-[16px] leading-[24px] text-[#242424]">
                 {t(`${namespace}:summaryReceivedForOrder`, { orderNr })}
               </Text>
-              <Link
+
-                href={`${process.env.NEXT_PUBLIC_SITE_URL}/home/order/${orderId}`}
+              <EmailButton
+                href={`${process.env.NEXT_PUBLIC_SITE_URL}/home/analysis-results/${analysisOrderId}`}
               >
-                <Button> {t(`${namespace}:linkText`, { orderNr })}</Button>
+                {t(`${namespace}:linkText`, { orderNr })}
-              </Link>
+              </EmailButton>
               <Text>
                 {t(`${namespace}:ifButtonDisabled`)}{' '}
-                {`${process.env.NEXT_PUBLIC_SITE_URL}/home/order/${orderId}`}
+                {`${process.env.NEXT_PUBLIC_SITE_URL}/home/analysis-results/${analysisOrderId}`}
               </Text>
               <CommonFooter t={t} />
             </EmailContent>
@@ -92,6 +88,5 @@ export async function renderDoctorSummaryReceivedEmail({
   return {
     html,
     subject,
-    to,
   };
 }

packages/email-templates/src/emails/first-results-received.email.tsx

@@ -0,0 +1,86 @@
+import {
+  Body,
+  Head,
+  Html,
+  Preview,
+  Tailwind,
+  Text,
+  render,
+} from '@react-email/components';
+
+import { BodyStyle } from '../components/body-style';
+import CommonFooter from '../components/common-footer';
+import { EmailContent } from '../components/content';
+import { EmailButton } from '../components/email-button';
+import { EmailHeader } from '../components/header';
+import { EmailHeading } from '../components/heading';
+import { EmailWrapper } from '../components/wrapper';
+import { initializeEmailI18n } from '../lib/i18n';
+
+export async function renderFirstResultsReceivedEmail({
+  language,
+  analysisOrderId,
+}: {
+  language: string;
+  analysisOrderId: number;
+}) {
+  const namespace = 'first-results-received-email';
+
+  const { t } = await initializeEmailI18n({
+    language,
+    namespace: [namespace, 'common'],
+  });
+
+  const previewText = t(`${namespace}:previewText`);
+
+  const subject = t(`${namespace}:subject`);
+
+  const html = await render(
+    <Html>
+      <Head>
+        <BodyStyle />
+      </Head>
+
+      <Preview>{previewText}</Preview>
+
+      <Tailwind>
+        <Body>
+          <EmailWrapper>
+            <EmailHeader>
+              <EmailHeading>{previewText}</EmailHeading>
+            </EmailHeader>
+
+            <EmailContent>
+              <Text className="text-[16px] leading-[24px] text-[#242424]">
+                {t(`${namespace}:hello`)}
+              </Text>
+              <Text className="text-[16px] leading-[24px] text-[#242424]">
+                {t(`${namespace}:resultsReceivedForOrders`)}
+              </Text>
+              <Text className="text-[16px] leading-[24px] font-semibold text-[#242424]">
+                {t(`${namespace}:openOrdersHeading`)}
+              </Text>
+
+              <EmailButton
+                href={`${process.env.NEXT_PUBLIC_SITE_URL}/doctor/analysis/${analysisOrderId}`}
+              >
+                {t(`${namespace}:linkText`)}
+              </EmailButton>
+
+              <Text>
+                {t(`${namespace}:ifLinksDisabled`)}{' '}
+                {`${process.env.NEXT_PUBLIC_SITE_URL}/doctor/analysis/${analysisOrderId}`}
+              </Text>
+              <CommonFooter t={t} />
+            </EmailContent>
+          </EmailWrapper>
+        </Body>
+      </Tailwind>
+    </Html>,
+  );
+
+  return {
+    html,
+    subject,
+  };
+}

packages/email-templates/src/emails/new-jobs-available.email.tsx

@@ -0,0 +1,99 @@
+import {
+  Body,
+  Head,
+  Html,
+  Link,
+  Preview,
+  Tailwind,
+  Text,
+  render
+} from '@react-email/components';
+
+import { BodyStyle } from '../components/body-style';
+import CommonFooter from '../components/common-footer';
+import { EmailContent } from '../components/content';
+import { EmailHeader } from '../components/header';
+import { EmailHeading } from '../components/heading';
+import { EmailWrapper } from '../components/wrapper';
+import { initializeEmailI18n } from '../lib/i18n';
+
+export async function renderNewJobsAvailableEmail({
+  language,
+  analysisResponseIds,
+}: {
+  language?: string;
+  analysisResponseIds: number[];
+}) {
+  const namespace = 'new-jobs-available-email';
+
+  const { t } = await initializeEmailI18n({
+    language,
+    namespace: [namespace, 'common'],
+  });
+
+  const previewText = t(`${namespace}:previewText`, {
+    nr: analysisResponseIds.length,
+  });
+
+  const subject = t(`${namespace}:subject`, {
+    nr: analysisResponseIds.length,
+  });
+
+  const html = await render(
+    <Html>
+      <Head>
+        <BodyStyle />
+      </Head>
+
+      <Preview>{previewText}</Preview>
+
+      <Tailwind>
+        <Body>
+          <EmailWrapper>
+            <EmailHeader>
+              <EmailHeading>{previewText}</EmailHeading>
+            </EmailHeader>
+
+            <EmailContent>
+              <Text className="text-[16px] leading-[24px] text-[#242424]">
+                {t(`${namespace}:hello`)}
+              </Text>
+              <Text className="text-[16px] leading-[24px] text-[#242424]">
+                {t(`${namespace}:resultsReceivedForOrders`, {
+                  nr: analysisResponseIds.length,
+                })}
+              </Text>
+              <Text className="text-[16px] leading-[24px] font-semibold text-[#242424]">
+                {t(`${namespace}:openOrdersHeading`, {
+                  nr: analysisResponseIds.length,
+                })}
+              </Text>
+              <ul className="list-none text-[16px] leading-[24px]">
+                {analysisResponseIds.map((analysisResponseId, index) => (
+                  <li>
+                    <Link
+                      key={analysisResponseId}
+                      href={`${process.env.NEXT_PUBLIC_SITE_URL}/doctor/analysis/${analysisResponseId}`}
+                    >
+                      {t(`${namespace}:linkText`, { nr: index + 1 })}
+                    </Link>
+                  </li>
+                ))}
+              </ul>
+              <Text>
+                {t(`${namespace}:ifLinksDisabled`)}{' '}
+                {`${process.env.NEXT_PUBLIC_SITE_URL}/doctor/open-jobs`}
+              </Text>
+              <CommonFooter t={t} />
+            </EmailContent>
+          </EmailWrapper>
+        </Body>
+      </Tailwind>
+    </Html>,
+  );
+
+  return {
+    html,
+    subject,
+  };
+}