lifestyle development

This commit is contained in:
Danel Kungla
2025-10-21 16:04:01 +03:00
parent 6dcc91a206
commit 76c2382e11
14 changed files with 374 additions and 129 deletions

View File

@@ -18,14 +18,14 @@ const AIBlocks = async ({ account }: { account: AccountWithParams }) => {
return <OrderAnalysesPackageCard />;
}
const { analyses, countryCode } = await loadAnalyses();
const { analyses } = await loadAnalyses();
if (analyses.length === 0) {
return (
<>
<OrderAnalysesPackageCard />
<Suspense fallback={<RecommendationsSkeleton />}>
<LifeStyleCard />
<Suspense fallback={<RecommendationsSkeleton amount={1} />}>
<LifeStyleCard account={account} />
</Suspense>
</>
);
@@ -33,7 +33,7 @@ const AIBlocks = async ({ account }: { account: AccountWithParams }) => {
return (
<Suspense fallback={<RecommendationsSkeleton />}>
<LifeStyleCard />
<LifeStyleCard account={account} />
<Recommendations account={account} />
</Suspense>
);

View File

@@ -2,16 +2,34 @@
import React from 'react';
import { Card } from '@kit/ui/shadcn/card';
import Link from 'next/link';
import { AccountWithParams } from '@/packages/features/accounts/src/types/accounts';
import { pathsConfig } from '@/packages/shared/src/config';
import { ChevronRight } from 'lucide-react';
import { Trans } from '@kit/ui/makerkit/trans';
import { Button } from '@kit/ui/shadcn/button';
import { Card, CardHeader } from '@kit/ui/shadcn/card';
import { loadLifeStyle } from '../../_lib/server/load-life-style';
const LifeStyleCard = async () => {
const data = await loadLifeStyle();
const LifeStyleCard = async ({ account }: { account: AccountWithParams }) => {
const data = await loadLifeStyle(account);
return (
<Card variant="gradient-success" className="flex flex-col justify-between">
Test
<CardHeader className="flex-row justify-between">
<h5>
<Trans i18nKey="dashboard:heroCard.lifeStyle.title" />
</h5>
<Link href={pathsConfig.app.lifeStyle}>
<Button size="icon" variant="outline" className="px-2 text-black">
<ChevronRight className="size-4 stroke-2" />
</Button>
</Link>
</CardHeader>
<span className="text-primary p-4 text-sm">{data.summary}</span>
</Card>
);
};

View File

@@ -11,7 +11,7 @@ import {
} from '@kit/ui/shadcn/card';
import { Skeleton } from '@kit/ui/skeleton';
const RecommendationsSkeleton = () => {
const RecommendationsSkeleton = ({ amount = 2 }: { amount?: number }) => {
const emptyData = [
{
title: '1',
@@ -20,55 +20,48 @@ const RecommendationsSkeleton = () => {
variant: { id: '' },
price: 1,
},
{
title: '2',
description: '',
subtitle: '',
variant: { id: '' },
price: 1,
},
];
return (
<div className="xs:grid-cols-3 mt-4 grid gap-6">
{emptyData.map(({ title, description, subtitle }) => (
<Skeleton key={title}>
<Card>
<CardHeader className="flex-row">
<div
className={
'mb-6 flex size-8 items-center-safe justify-center-safe'
}
/>
<div className="ml-auto flex size-8 items-center-safe justify-center-safe">
<Button size="icon" className="px-2" />
</div>
</CardHeader>
<CardFooter className="flex">
<div className="flex flex-1 flex-col items-start">
<h5>
{title}
{description && (
<>
{' '}
<InfoTooltip
content={
<div className="flex flex-col gap-2">
<span>{description}</span>
</div>
}
/>
</>
)}
</h5>
{subtitle && <CardDescription>{subtitle}</CardDescription>}
</div>
<div className="flex flex-col items-end gap-2 self-end text-sm"></div>
</CardFooter>
</Card>
</Skeleton>
))}
</div>
);
return Array.from({ length: amount }, (_, index) => {
const { title, description, subtitle } = emptyData[0]!;
return (
<Skeleton key={title + index}>
<Card>
<CardHeader className="flex-row">
<div
className={
'mb-6 flex size-8 items-center-safe justify-center-safe'
}
/>
<div className="ml-auto flex size-8 items-center-safe justify-center-safe">
<Button size="icon" className="px-2" />
</div>
</CardHeader>
<CardFooter className="flex">
<div className="flex flex-1 flex-col items-start">
<h5>
{title}
{description && (
<>
{' '}
<InfoTooltip
content={
<div className="flex flex-col gap-2">
<span>{description}</span>
</div>
}
/>
</>
)}
</h5>
{subtitle && <CardDescription>{subtitle}</CardDescription>}
</div>
<div className="flex flex-col items-end gap-2 self-end text-sm"></div>
</CardFooter>
</Card>
</Skeleton>
);
});
};
export default RecommendationsSkeleton;

View File

@@ -0,0 +1,18 @@
import { Database } from '@/packages/supabase/src/database.types';
export interface ILifeStyleResponse {
lifestyle: {
title: string;
description: string;
score: 0 | 1 | 2;
}[];
summary: string | null;
}
export enum PROMPT_NAME {
LIFE_STYLE = 'Life Style',
ANALYSIS_RECOMMENDATIONS = 'Analysis Recommendations',
}
export type AnalysisResponses =
Database['medreport']['Functions']['get_latest_analysis_response_elements_for_current_user']['Returns'];

View File

@@ -63,55 +63,53 @@ export default function OrderItemsTable({
return (
<>
<Table className="border-separate rounded-lg border p-2 sm:hidden">
<TableBody>
{items
.sort((a, b) =>
(a.created_at ?? '') > (b.created_at ?? '') ? -1 : 1,
)
.map((orderItem) => (
<div key={`${orderItem.id}-mobile`}>
{items
.sort((a, b) =>
(a.created_at ?? '') > (b.created_at ?? '') ? -1 : 1,
)
.map((orderItem) => (
<TableBody key={`${orderItem.id}-mobile`}>
<MobileTableRow
titleKey={title}
value={orderItem.product_title || ''}
/>
<MobileTableRow
titleKey="orders:table.createdAt"
value={formatDate(orderItem.created_at, 'dd.MM.yyyy HH:mm')}
/>
{order.location && (
<MobileTableRow
titleKey={title}
value={orderItem.product_title || ''}
titleKey="orders:table.location"
value={order.location}
/>
<MobileTableRow
titleKey="orders:table.createdAt"
value={formatDate(orderItem.created_at, 'dd.MM.yyyy HH:mm')}
/>
{order.location && (
<MobileTableRow
titleKey="orders:table.location"
value={order.location}
/>
)}
<MobileTableRow
titleKey="orders:table.status"
value={
isPackage
? `orders:status.analysisPackageOrder.${order?.status ?? 'CONFIRMED'}`
: `orders:status.${type}.${order?.status ?? 'CONFIRMED'}`
}
/>
<TableRow>
<TableCell />
<TableCell className="flex w-full items-center justify-end p-0 pt-2">
<Button size="sm" onClick={openDetailedView}>
<Trans i18nKey="analysis-results:view" />
)}
<MobileTableRow
titleKey="orders:table.status"
value={
isPackage
? `orders:status.analysisPackageOrder.${order?.status ?? 'CONFIRMED'}`
: `orders:status.${type}.${order?.status ?? 'CONFIRMED'}`
}
/>
<TableRow>
<TableCell />
<TableCell className="flex w-full items-center justify-end p-0 pt-2">
<Button size="sm" onClick={openDetailedView}>
<Trans i18nKey="analysis-results:view" />
</Button>
{isTtoservice && order.bookingCode && (
<Button
size="sm"
className="bg-warning/90 hover:bg-warning"
onClick={() => setIsConfirmOpen(true)}
>
<Trans i18nKey="analysis-results:cancel" />
</Button>
{isTtoservice && order.bookingCode && (
<Button
size="sm"
className="bg-warning/90 hover:bg-warning"
onClick={() => setIsConfirmOpen(true)}
>
<Trans i18nKey="analysis-results:cancel" />
</Button>
)}
</TableCell>
</TableRow>
</div>
))}
</TableBody>
)}
</TableCell>
</TableRow>
</TableBody>
))}
</Table>
<Table className="hidden border-separate rounded-lg border sm:block">