Merge branch 'main' into MED-57

This commit is contained in:
Danel Kungla
2025-08-25 12:25:18 +03:00
156 changed files with 2823 additions and 363 deletions

View File

@@ -7,8 +7,8 @@ import { useRouter } from 'next/navigation';
import { AccountSelector } from '@kit/accounts/account-selector';
import { SidebarContext } from '@kit/ui/shadcn-sidebar';
import featureFlagsConfig from '~/config/feature-flags.config';
import pathsConfig from '~/config/paths.config';
import { pathsConfig, featureFlagsConfig } from '@kit/shared/config';
const features = {
enableTeamCreation: featureFlagsConfig.enableTeamCreation,

View File

@@ -12,8 +12,9 @@ import { cn } from '@kit/ui/lib/utils';
import { Button } from '@kit/ui/shadcn/button';
import { Trans } from '@kit/ui/trans';
import pathsConfig from '~/config/paths.config';
import { createPath } from '~/config/team-account-navigation.config';
import { pathsConfig } from '@kit/shared/config';
import { createPath } from '@kit/shared/config/team-account-navigation.config';
interface TeamAccountBenefitStatisticsProps {
employeeCount: number;

View File

@@ -6,6 +6,11 @@ import { useRouter } from 'next/navigation';
import { Home, LogOut, Menu } from 'lucide-react';
import { AccountSelector } from '@kit/accounts/account-selector';
import {
featureFlagsConfig,
getTeamAccountSidebarConfig,
pathsConfig,
} from '@kit/shared/config';
import { useSignOut } from '@kit/supabase/hooks/use-sign-out';
import {
Dialog,
@@ -23,10 +28,6 @@ import {
} from '@kit/ui/dropdown-menu';
import { Trans } from '@kit/ui/trans';
import featureFlagsConfig from '~/config/feature-flags.config';
import pathsConfig from '~/config/paths.config';
import { getTeamAccountSidebarConfig } from '~/config/team-account-navigation.config';
type Accounts = Array<{
label: string | null;
value: string | null;

View File

@@ -8,8 +8,8 @@ import {
SidebarHeader,
} from '@kit/ui/shadcn-sidebar';
import { ProfileAccountDropdownContainer } from '~/components//personal-account-dropdown-container';
import { getTeamAccountSidebarConfig } from '~/config/team-account-navigation.config';
import { ProfileAccountDropdownContainer } from '@kit/shared/components//personal-account-dropdown-container';
import { getTeamAccountSidebarConfig } from '@kit/shared/config/team-account-navigation.config';
import { TeamAccountNotifications } from '~/home/[account]/_components/team-account-notifications';
import { TeamAccountAccountsSelector } from '../_components/team-account-accounts-selector';

View File

@@ -1,8 +1,8 @@
import { useMemo } from 'react';
import { AppLogo } from '~/components/app-logo';
import { ProfileAccountDropdownContainer } from '~/components/personal-account-dropdown-container';
import { getTeamAccountSidebarConfig } from '~/config/team-account-navigation.config';
import { AppLogo } from '@kit/shared/components/app-logo';
import { ProfileAccountDropdownContainer } from '@kit/shared/components/personal-account-dropdown-container';
import { getTeamAccountSidebarConfig } from '@kit/shared/config/team-account-navigation.config';
// local imports
import { TeamAccountWorkspace } from '../_lib/server/team-account-workspace.loader';

View File

@@ -1,19 +1,20 @@
import { NotificationsPopover } from '@kit/notifications/components';
import featuresFlagConfig from '~/config/feature-flags.config';
import { featureFlagsConfig } from '@kit/shared/config';
export function TeamAccountNotifications(params: {
userId: string;
accountId: string;
}) {
if (!featuresFlagConfig.enableNotifications) {
if (!featureFlagsConfig.enableNotifications) {
return null;
}
return (
<NotificationsPopover
accountIds={[params.userId, params.accountId]}
realtime={featuresFlagConfig.realtimeNotifications}
realtime={featureFlagsConfig.realtimeNotifications}
/>
);
}

View File

@@ -20,8 +20,9 @@ import {
PopoverTrigger,
} from '@kit/ui/shadcn/popover';
import pathsConfig from '~/config/paths.config';
import { createPath } from '~/config/team-account-navigation.config';
import { pathsConfig } from '@kit/shared/config';
import { createPath } from '@kit/shared/config/team-account-navigation.config';
import TeamAccountBenefitStatistics from './team-account-benefit-statistics';
import TeamAccountHealthDetails from './team-account-health-details';