diff --git a/client-di2/index.html b/client-di2/index.html index 77b6691..713c2d9 100644 --- a/client-di2/index.html +++ b/client-di2/index.html @@ -1,15 +1,15 @@ - + - + - - - + +
- \ No newline at end of file + diff --git a/client-di2/src/components/category-override-dialog.tsx b/client-di2/src/components/category-override-dialog.tsx index cb690e1..b939237 100644 --- a/client-di2/src/components/category-override-dialog.tsx +++ b/client-di2/src/components/category-override-dialog.tsx @@ -162,7 +162,7 @@ function TreeNode({ cat, depth, expanded, onToggle, onSelect, currentOverrideCat return (
{hasChildren ? ( @@ -241,7 +241,7 @@ function RootGroupRow({ group, expanded, onToggle, onSelect, currentOverrideCate return (
onToggle(group.id)} data-testid={`root-group-${group.id}`} > @@ -251,11 +251,11 @@ function RootGroupRow({ group, expanded, onToggle, onSelect, currentOverrideCate : } {isExpanded - ? - : } + ? + : } {group.name} {isContext && ( - текущий + текущий )}
{(isExpanded || searchActive) && ( diff --git a/client-di2/src/components/database-error.tsx b/client-di2/src/components/database-error.tsx index 883c11a..fda117b 100644 --- a/client-di2/src/components/database-error.tsx +++ b/client-di2/src/components/database-error.tsx @@ -9,7 +9,7 @@ export function DatabaseError({ error }: { error?: Error | null }) { return (
{message} diff --git a/client-di2/src/components/draggable-column-list.tsx b/client-di2/src/components/draggable-column-list.tsx index 4437acb..9e0b999 100644 --- a/client-di2/src/components/draggable-column-list.tsx +++ b/client-di2/src/components/draggable-column-list.tsx @@ -86,10 +86,10 @@ export function DraggableColumnList({ onDragEnd={handleDragEnd} className={`flex items-center gap-1.5 cursor-grab active:cursor-grabbing text-sm rounded px-1 py-1 select-none transition-colors ${ dragIdx === idx ? "opacity-40 bg-muted" : "" - } ${overIdx === idx && dragIdx !== idx ? "border-t-2 border-primary" : ""} hover:bg-muted/50`} + } ${overIdx === idx && dragIdx !== idx ? "border-t-2 border-primary" : ""} hover:bg-[color-mix(in_oklab,var(--muted)_50%,transparent)]`} data-testid={`draggable-col-${col.key}`} > - + onToggle(col.key)} diff --git a/client-di2/src/components/ui/alert.tsx b/client-di2/src/components/ui/alert.tsx index 41fa7e0..083d39d 100644 --- a/client-di2/src/components/ui/alert.tsx +++ b/client-di2/src/components/ui/alert.tsx @@ -10,7 +10,7 @@ const alertVariants = cva( variant: { default: "bg-background text-foreground", destructive: - "border-destructive/50 text-destructive dark:border-destructive [&>svg]:text-destructive", + "border-[color-mix(in_oklab,var(--destructive)_50%,transparent)] text-destructive dark:border-destructive [&>svg]:text-destructive", }, }, defaultVariants: { diff --git a/client-di2/src/components/ui/calendar.tsx b/client-di2/src/components/ui/calendar.tsx index 2174f71..d711607 100644 --- a/client-di2/src/components/ui/calendar.tsx +++ b/client-di2/src/components/ui/calendar.tsx @@ -34,7 +34,7 @@ function Calendar({ head_cell: "text-muted-foreground rounded-md w-9 font-normal text-[0.8rem]", row: "flex w-full mt-2", - cell: "h-9 w-9 text-center text-sm p-0 relative [&:has([aria-selected].day-range-end)]:rounded-r-md [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected])]:bg-accent first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20", + cell: "h-9 w-9 text-center text-sm p-0 relative [&:has([aria-selected].day-range-end)]:rounded-r-md [&:has([aria-selected].day-outside)]:bg-[color-mix(in_oklab,var(--accent)_50%,transparent)] [&:has([aria-selected])]:bg-accent first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20", day: cn( buttonVariants({ variant: "ghost" }), "h-9 w-9 p-0 font-normal aria-selected:opacity-100" @@ -44,7 +44,7 @@ function Calendar({ "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground", day_today: "bg-accent text-accent-foreground", day_outside: - "day-outside text-muted-foreground aria-selected:bg-accent/50 aria-selected:text-muted-foreground", + "day-outside text-muted-foreground aria-selected:bg-[color-mix(in_oklab,var(--accent)_50%,transparent)] aria-selected:text-muted-foreground", day_disabled: "text-muted-foreground opacity-50", day_range_middle: "aria-selected:bg-accent aria-selected:text-accent-foreground", diff --git a/client-di2/src/components/ui/chart.tsx b/client-di2/src/components/ui/chart.tsx index 39fba6d..8502e04 100644 --- a/client-di2/src/components/ui/chart.tsx +++ b/client-di2/src/components/ui/chart.tsx @@ -52,7 +52,7 @@ const ChartContainer = React.forwardRef< data-chart={chartId} ref={ref} className={cn( - "flex aspect-video justify-center text-xs [&_.recharts-cartesian-axis-tick_text]:fill-muted-foreground [&_.recharts-cartesian-grid_line[stroke='#ccc']]:stroke-border/50 [&_.recharts-curve.recharts-tooltip-cursor]:stroke-border [&_.recharts-dot[stroke='#fff']]:stroke-transparent [&_.recharts-layer]:outline-none [&_.recharts-polar-grid_[stroke='#ccc']]:stroke-border [&_.recharts-radial-bar-background-sector]:fill-muted [&_.recharts-rectangle.recharts-tooltip-cursor]:fill-muted [&_.recharts-reference-line_[stroke='#ccc']]:stroke-border [&_.recharts-sector[stroke='#fff']]:stroke-transparent [&_.recharts-sector]:outline-none [&_.recharts-surface]:outline-none", + "flex aspect-video justify-center text-xs [&_.recharts-cartesian-axis-tick_text]:fill-muted-foreground [&_.recharts-cartesian-grid_line[stroke='#ccc']]:stroke-[color-mix(in_oklab,var(--border)_50%,transparent)] [&_.recharts-curve.recharts-tooltip-cursor]:stroke-border [&_.recharts-dot[stroke='#fff']]:stroke-transparent [&_.recharts-layer]:outline-none [&_.recharts-polar-grid_[stroke='#ccc']]:stroke-border [&_.recharts-radial-bar-background-sector]:fill-muted [&_.recharts-rectangle.recharts-tooltip-cursor]:fill-muted [&_.recharts-reference-line_[stroke='#ccc']]:stroke-border [&_.recharts-sector[stroke='#fff']]:stroke-transparent [&_.recharts-sector]:outline-none [&_.recharts-surface]:outline-none", className )} {...props} @@ -179,7 +179,7 @@ const ChartTooltipContent = React.forwardRef<
diff --git a/client-di2/src/components/ui/navigation-menu.tsx b/client-di2/src/components/ui/navigation-menu.tsx index 411f519..89fbf02 100644 --- a/client-di2/src/components/ui/navigation-menu.tsx +++ b/client-di2/src/components/ui/navigation-menu.tsx @@ -41,7 +41,7 @@ NavigationMenuList.displayName = NavigationMenuPrimitive.List.displayName const NavigationMenuItem = NavigationMenuPrimitive.Item const navigationMenuTriggerStyle = cva( - "group inline-flex h-10 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus:outline-none disabled:pointer-events-none disabled:opacity-50 data-[state=open]:text-accent-foreground data-[state=open]:bg-accent/50 data-[state=open]:hover:bg-accent data-[state=open]:focus:bg-accent" + "group inline-flex h-10 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus:outline-none disabled:pointer-events-none disabled:opacity-50 data-[state=open]:text-accent-foreground data-[state=open]:bg-[color-mix(in_oklab,var(--accent)_50%,transparent)] data-[state=open]:hover:bg-accent data-[state=open]:focus:bg-accent" ) const NavigationMenuTrigger = React.forwardRef< diff --git a/client-di2/src/components/ui/sidebar.tsx b/client-di2/src/components/ui/sidebar.tsx index 41362f6..c1e57f7 100644 --- a/client-di2/src/components/ui/sidebar.tsx +++ b/client-di2/src/components/ui/sidebar.tsx @@ -406,7 +406,7 @@ function SidebarGroupLabel({ data-slot="sidebar-group-label" data-sidebar="group-label" className={cn( - "text-sidebar-foreground/70 ring-sidebar-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:h-4 [&>svg]:w-4 [&>svg]:shrink-0", + "text-[color-mix(in_oklab,var(--sidebar-foreground)_70%,transparent)] ring-sidebar-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:h-4 [&>svg]:w-4 [&>svg]:shrink-0", "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0", className )} diff --git a/client-di2/src/components/ui/table.tsx b/client-di2/src/components/ui/table.tsx index 7f3502f..95cb988 100644 --- a/client-di2/src/components/ui/table.tsx +++ b/client-di2/src/components/ui/table.tsx @@ -43,7 +43,7 @@ const TableFooter = React.forwardRef< tr]:last:border-b-0", + "border-t bg-[color-mix(in_oklab,var(--muted)_50%,transparent)] font-medium [&>tr]:last:border-b-0", className )} {...props} @@ -58,7 +58,7 @@ const TableRow = React.forwardRef< - + + + ); diff --git a/client-di2/src/pages/audit.tsx b/client-di2/src/pages/audit.tsx index be6611f..926c092 100644 --- a/client-di2/src/pages/audit.tsx +++ b/client-di2/src/pages/audit.tsx @@ -81,7 +81,7 @@ function DirectionCard({ title, data }: { title: string; data: DirectionAudit }) - + Всего в БД {data.dbCount} 100% @@ -232,7 +232,7 @@ export default function AuditPage() { {latestAudit && ( <> - +
diff --git a/client-di2/src/pages/calculations.tsx b/client-di2/src/pages/calculations.tsx index 1299ad0..36ac3cc 100644 --- a/client-di2/src/pages/calculations.tsx +++ b/client-di2/src/pages/calculations.tsx @@ -180,7 +180,7 @@ function CategoryTree({ cats, selected, onChange, label, treeConfigs }: { return (
@@ -198,7 +198,7 @@ function CategoryTree({ cats, selected, onChange, label, treeConfigs }: { data-testid={`checkbox-cat-${node.id}`} /> { if (hasChildren) toggleExpand(node.id); }} > {node.name} @@ -233,7 +233,7 @@ function CategoryTree({ cats, selected, onChange, label, treeConfigs }: { return (
-
+
{([["month", "Месяц"], ["quarter", "Квартал"], ["year", "Год"]] as const).map(([key, label]) => (
@@ -1316,8 +1316,8 @@ function ProfitTab({ data, taxRate, onTaxRateChange, incCats, expCats, onIncCats
{data.excludedExpenseCategories.map((cat: { name: string; total: number }, i: number) => (
- {cat.name} - {formatCurrency(cat.total)} + {cat.name} + {formatCurrency(cat.total)}
))}
diff --git a/client-di2/src/pages/dashboard.tsx b/client-di2/src/pages/dashboard.tsx index c7c75d6..70a6dc5 100644 --- a/client-di2/src/pages/dashboard.tsx +++ b/client-di2/src/pages/dashboard.tsx @@ -228,7 +228,7 @@ export default function Dashboard() {

Общая сводка по финансам

-
+
@@ -590,7 +590,7 @@ export default function Dashboard() { {flatIncome.map(({ cat, depth }) => (