k4rli/medreport_mrb2b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/MED-129

Browse Source
This commit is contained in:
Danel Kungla
2025-09-24 15:00:27 +03:00
parent 249611886b 4c003b3cb5
commit 7817ae0448
622 changed files with 19603 additions and 10824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/accounts/[id]/page.tsx
View File

@@ -2,6 +2,8 @@ import { cache } from 'react';
import { AdminAccountPage } from '@kit/admin/components/admin-account-page';
import { AdminGuard } from '@kit/admin/components/admin-guard';
import { withI18n } from '~/lib/i18n/with-i18n';
import { getAccount } from '~/lib/services/account.service';
interface Params {
@@ -26,6 +28,6 @@ async function AccountPage(props: Params) {
return <AdminAccountPage account={account} />;
}
export default AdminGuard(AccountPage);
export default withI18n(AdminGuard(AccountPage));
const loadAccount = cache(getAccount);

6
app/admin/accounts/page.tsx
View File

@@ -9,6 +9,8 @@ import { AppBreadcrumbs } from '@kit/ui/app-breadcrumbs';
import { Button } from '@kit/ui/button';
import { PageBody, PageHeader } from '@kit/ui/page';
import { withI18n } from '~/lib/i18n/with-i18n';
interface SearchParams {
page?: string;
account_type?: 'all' | 'team' | 'personal';
@@ -30,7 +32,7 @@ async function AccountsPage(props: AdminAccountsPageProps) {
return (
<>
<PageHeader description={<AppBreadcrumbs />}>
<PageHeader description={<AppBreadcrumbs />} title="Accounts">
<div className="flex justify-end gap-2">
<AdminCreateUserDialog>
<Button data-test="admin-create-user-button">
@@ -84,4 +86,4 @@ async function AccountsPage(props: AdminAccountsPageProps) {
);
}
export default AdminGuard(AccountsPage);
export default withI18n(AdminGuard(AccountsPage));