From 7b71da3825223b68136015af1d6e89ff96515088 Mon Sep 17 00:00:00 2001 From: k4rli Date: Thu, 10 Jul 2025 13:24:03 +0300 Subject: [PATCH] feat(MED-122): use instead of t() --- .../order-analysis-package/page.tsx | 39 ++++--------------- .../_components/compare-packages-modal.tsx | 6 +-- app/select-package/page.tsx | 11 +++--- components/select-analysis-packages.tsx | 32 ++++++++++++++- 4 files changed, 45 insertions(+), 43 deletions(-) diff --git a/app/home/(user)/(dashboard)/order-analysis-package/page.tsx b/app/home/(user)/(dashboard)/order-analysis-package/page.tsx index 5c3fc73..7ac0ed4 100644 --- a/app/home/(user)/(dashboard)/order-analysis-package/page.tsx +++ b/app/home/(user)/(dashboard)/order-analysis-package/page.tsx @@ -3,8 +3,9 @@ import { Scale } from 'lucide-react'; import { createI18nServerInstance } from '~/lib/i18n/i18n.server'; import { withI18n } from '~/lib/i18n/with-i18n'; import { Button } from '@kit/ui/button'; -import SelectAnalysisPackages, { IAnalysisPackage } from '@/components/select-analysis-packages'; +import SelectAnalysisPackages from '@/components/select-analysis-packages'; import { PageBody } from '@kit/ui/page'; +import { Trans } from '@kit/ui/trans'; import ComparePackagesModal from '../../_components/compare-packages-modal'; @@ -17,49 +18,23 @@ export const generateMetadata = async () => { }; }; -const dummyCards = [ - { - titleKey: 'product:standard.label', - price: 40, - nrOfAnalyses: 4, - tagColor: 'bg-cyan', - descriptionKey: 'marketing:standard.description', - }, - { - titleKey: 'product:standardPlus.label', - price: 85, - nrOfAnalyses: 10, - - tagColor: 'bg-warning', - descriptionKey: 'product:standardPlus.description', - }, - { - titleKey: 'product:premium.label', - price: 140, - nrOfAnalyses: '12+', - - tagColor: 'bg-purple', - descriptionKey: 'product:premium.description', - }, -] satisfies IAnalysisPackage[]; - async function OrderAnalysisPackagePage() { - const { t } = await createI18nServerInstance(); - return (
-

{t('marketing:selectPackage')}

+

+ +

- {t('marketing:comparePackages')} + } />
- +
); } diff --git a/app/home/(user)/_components/compare-packages-modal.tsx b/app/home/(user)/_components/compare-packages-modal.tsx index d830b45..5f581e7 100644 --- a/app/home/(user)/_components/compare-packages-modal.tsx +++ b/app/home/(user)/_components/compare-packages-modal.tsx @@ -18,12 +18,10 @@ import { TableHeader, TableRow, } from '@kit/ui/table'; - import { createI18nServerInstance } from '~/lib/i18n/i18n.server'; import { withI18n } from '~/lib/i18n/with-i18n'; - -import { PackageHeader } from '../../../../components/package-header'; -import { InfoTooltip } from '../../../../components/ui/info-tooltip'; +import { PackageHeader } from '@/components/package-header'; +import { InfoTooltip } from '@/components/ui/info-tooltip'; const dummyCards = [ { diff --git a/app/select-package/page.tsx b/app/select-package/page.tsx index 8692230..e4de4bb 100644 --- a/app/select-package/page.tsx +++ b/app/select-package/page.tsx @@ -2,6 +2,7 @@ import Link from 'next/link'; import { CaretRightIcon } from '@radix-ui/react-icons'; import { Scale } from 'lucide-react'; +import { Trans } from '@kit/ui/trans'; import { Button } from '@kit/ui/button'; @@ -22,17 +23,17 @@ export const generateMetadata = async () => { }; async function SelectPackagePage() { - const { t } = await createI18nServerInstance(); - return (
-

{t('marketing:selectPackage')}

+

+ +

- {t('marketing:comparePackages')} + } @@ -41,7 +42,7 @@ async function SelectPackagePage() { diff --git a/components/select-analysis-packages.tsx b/components/select-analysis-packages.tsx index c425f8e..b5149fe 100644 --- a/components/select-analysis-packages.tsx +++ b/components/select-analysis-packages.tsx @@ -24,7 +24,33 @@ export interface IAnalysisPackage { descriptionKey: string; } -export default function SelectAnalysisPackages({ analysisPackages }: { analysisPackages: IAnalysisPackage[] }) { +const analysisPackages = [ + { + titleKey: 'product:standard.label', + price: 40, + nrOfAnalyses: 4, + tagColor: 'bg-cyan', + descriptionKey: 'marketing:standard.description', + }, + { + titleKey: 'product:standardPlus.label', + price: 85, + nrOfAnalyses: 10, + + tagColor: 'bg-warning', + descriptionKey: 'product:standardPlus.description', + }, + { + titleKey: 'product:premium.label', + price: 140, + nrOfAnalyses: '12+', + + tagColor: 'bg-purple', + descriptionKey: 'product:premium.description', + }, +] satisfies IAnalysisPackage[]; + +export default function SelectAnalysisPackages() { const { t, i18n: { language }, @@ -60,7 +86,9 @@ export default function SelectAnalysisPackages({ analysisPackages }: { analysisP language={language} price={price} /> - {t(descriptionKey)} + + +