* refactor(ui): app-wide UI/UX consistency pass
Net: +1,159 / −1,373 LOC across 77 files. No new features, no behavior
changes. Locks in a uniform design system across every dashboard surface.
What changed:
- **Foundation**: sidebar width 232→256px (md:w-64), spacing scale locked
(Tailwind 1/2/3/4/6/8/10/12; 2.5/5 forbidden), card padding p-6 default
(p-4 for compact metric cards), space-y-8 between page sections.
- **Tables unified**: all 33 thead blocks now share the Resultatrapport
pattern via shadcn Table primitive (text-[11px] font-medium uppercase
tracking-wider text-muted-foreground). Hand-rolled <table> instances
converted where they were data tables; form/edit grids kept distinct.
- **Status badges unified**: every status indicator routes through
shadcn <Badge variant>. Eliminated raw Tailwind colors
(bg-amber-100, bg-emerald-500/10, bg-blue-100, bg-purple-100, etc.)
in favor of the gnubok semantic palette (success=sage, warning=ochre,
destructive=terracotta).
- **Empty states unified**: list pages migrated from hand-rolled
"flex flex-col items-center py-12" divs to the EmptyState primitive.
- **Loading skeletons unified**: hand-rolled bg-muted rounded animate-pulse
divs replaced with shadcn <Skeleton> across 15 files.
- **Touch targets**: 6 back-buttons + edit-pencil + inbox delete bumped
from 24/32/36px to shadcn's 40px icon default. Added aria-labels on
9 icon-only navigation buttons.
- **Date formatting**: formatDate() for accounting data (ISO yyyy-MM-dd,
table-friendly) vs formatDateLong() for metadata (Swedish long form).
Raw {x.invoice_date} renderings routed through formatDate() in 18 sites.
- **Toast titles**: eliminated 33 generic "Fel" titles. Each toast title
now carries the action ("Kunde inte skapa lönekörning" etc.) with
description carrying the error detail.
- **Page-level cleanups**:
- Dashboard: dropped greeting hero + Snabbåtgärder/Att hantera nav
duplicates + Visa detaljer collapsible.
- Reports: 5-col mega-menu replaced with left-rail layout
(new ReportsNav component).
- Bookkeeping: fixed layout jump between Verifikationer/Ny verifikation
tabs (moved FiscalYearSelector inside journal tab).
- Bookkeeping: added voucher sort (A1 first / latest first) alongside
existing date sort. Required matching API param sort_by.
- KPI page: FiscalYearSelector instead of raw <select>; InfoTooltip
instead of inline info-button toggle; bigger numbers.
- Salary section: enum values translated to Swedish labels, mobile
table collapses to Anställd+Netto on <md, KPI typography aligned
with dashboard.
- Invoice forms: styled RequiredMark + aria-required, tabular-nums
on amount inputs.
- **CLAUDE.md**: new "Design System Tokens" subsection documents the
locked spacing scale, primitives table, typography rules, date helpers,
and forbidden patterns so future contributors don't drift.
Tests: 2,906 passing (unchanged). Lint: unchanged from main baseline.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix: address PR review feedback (Greptile + compliance bot)
- **formatDate / formatDateLong timezone fix**: switch from new Date() to
parseISO. Bare yyyy-MM-dd strings are now parsed as local midnight rather
than UTC midnight, eliminating the off-by-one display in west-of-UTC
timezones flagged by Greptile.
- **DashboardContentProps cleanup**: removed unused firstName and settings
fields from the interface, and the corresponding fetch (profiles table)
+ computation in app/(dashboard)/page.tsx. The greeting was dropped in
the dashboard cleanup; these props were dead weight.
- **Voucher sort behavior documented**: extended the comment in the journal
entries API route to explain why voucher sort intentionally uses strict
fiscal_period_id filtering (BFL 5 kap 6–7 §§ — voucher numbers are
series-scoped within a fiscal year). The row-count delta between date
sort and voucher sort is now a documented design choice.
- **delete_last_voucher migration + draft-delete test included**: the UI
already shipped the "Radera utkast" path in the previous commit; this
pulls in the backing RPC migration that allows draft deletes (with the
full safety logic — drafts skip series/period checks since they have
voucher_number=0, posted entries go through the existing unchanged
path). This was originally meant for a separate PR but the UI shipped
half the feature without it.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(migration): rename to match applied version
The function delete_last_voucher is already applied to the production DB
under version 20260509103736 (verified via pg_get_functiondef — exact
byte-for-byte match to file content). The previous file timestamp
20260509120000 would cause a fresh `supabase db push` to attempt re-applying
under a different version row. Renaming the file aligns local tracking
with what the database actually has.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix: address compliance bot findings (payroll label + VAT visibility)
- sick_karens label: drop "(första sjukdagen)" qualifier. Per sjuklönelagen
6 §, karensavdrag is a single calculated amount (20% of one week's
sjuklön) deducted from the first sick day's pay — not bounded to the
first day. The qualifier could mislead users when the first sick day
and return-to-work span a weekend. Swedish-payroll bot recommendation.
- Omvänd skattskyldighet badge: variant outline → warning. The reverse-
charge indicator is compliance-critical (ML 16 kap) — missing it leads
to incorrect input VAT deduction. Outline was too subtle; warning's
ochre fill matches its semantic weight.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
378 lines
15 KiB
TypeScript
378 lines
15 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect } from 'react'
|
|
import Link from 'next/link'
|
|
import { Card, CardContent } from '@/components/ui/card'
|
|
import { cn, formatCurrency } from '@/lib/utils'
|
|
import { UpcomingDeadlinesWidget } from '@/components/deadlines/UpcomingDeadlinesWidget'
|
|
import { TaxTodoWidget } from '@/components/deadlines/TaxTodoWidget'
|
|
import NewUserChecklist from '@/components/onboarding/NewUserChecklist'
|
|
import {
|
|
Receipt,
|
|
ArrowLeftRight,
|
|
ChevronDown,
|
|
ChevronRight,
|
|
Landmark,
|
|
CheckCircle2,
|
|
FileWarning,
|
|
Clock,
|
|
} from 'lucide-react'
|
|
import type { Deadline, ReceiptQueueSummary, OnboardingProgress } from '@/types'
|
|
|
|
const setupFreshStartKey = (companyId: string) => `erp_setup_fresh_start:${companyId}`
|
|
|
|
interface DashboardContentProps {
|
|
companyId: string
|
|
summary: {
|
|
ytd: { income: number; expenses: number; net: number }
|
|
mtd: { income: number; expenses: number; net: number }
|
|
uncategorizedCount: number
|
|
uncategorizedIncome: number
|
|
uncategorizedExpenses: number
|
|
unpaidInvoicesCount: number
|
|
unpaidInvoicesTotal: number
|
|
unpaidVatTotal: number
|
|
overdueInvoicesCount: number
|
|
bankBalance: number | null
|
|
expiringBankConnections?: { id: string; bank_name: string; days_left: number }[]
|
|
deadlines: Deadline[]
|
|
receiptQueue: ReceiptQueueSummary | null
|
|
missingUnderlagCount: number
|
|
staleUncategorizedCount: number
|
|
}
|
|
onboardingProgress?: OnboardingProgress
|
|
}
|
|
|
|
export default function DashboardContent({ companyId, summary, onboardingProgress }: DashboardContentProps) {
|
|
const [showAllAlerts, setShowAllAlerts] = useState(false)
|
|
|
|
const needsSetup = onboardingProgress && !onboardingProgress.hasBankConnected && !onboardingProgress.hasSIEImport
|
|
const [setupGateActive, setSetupGateActive] = useState(!!needsSetup)
|
|
|
|
useEffect(() => {
|
|
if (!needsSetup) {
|
|
setSetupGateActive(false)
|
|
return
|
|
}
|
|
const scopedKey = setupFreshStartKey(companyId)
|
|
const freshStart = localStorage.getItem(scopedKey) === 'true'
|
|
const legacyFreshStart = localStorage.getItem('erp_setup_fresh_start') === 'true'
|
|
const legacyDismissed = localStorage.getItem('erp_checklist_dismissed') === 'true'
|
|
if (freshStart || legacyFreshStart || legacyDismissed) {
|
|
if (!freshStart) {
|
|
localStorage.setItem(scopedKey, 'true')
|
|
}
|
|
setSetupGateActive(false)
|
|
}
|
|
}, [needsSetup, companyId])
|
|
|
|
if (setupGateActive) {
|
|
return (
|
|
<NewUserChecklist
|
|
hasSkatteverketConnected={!!onboardingProgress?.hasSkatteverketConnected}
|
|
onFreshStart={() => {
|
|
localStorage.setItem(setupFreshStartKey(companyId), 'true')
|
|
setSetupGateActive(false)
|
|
}}
|
|
/>
|
|
)
|
|
}
|
|
|
|
const formatLargeNumber = (amount: number) => {
|
|
return new Intl.NumberFormat('sv-SE', {
|
|
style: 'decimal',
|
|
minimumFractionDigits: 0,
|
|
maximumFractionDigits: 0,
|
|
}).format(amount)
|
|
}
|
|
|
|
const alertItems: React.ReactNode[] = []
|
|
|
|
if (summary.overdueInvoicesCount > 0) {
|
|
alertItems.push(
|
|
<Link key="overdue" href="/invoices?status=unpaid" className="group">
|
|
<Card className="h-full border-destructive/30 hover:bg-destructive/[0.03] transition-colors">
|
|
<CardContent className="p-4">
|
|
<div className="flex items-center gap-3">
|
|
<Receipt className="h-4 w-4 text-destructive flex-shrink-0" />
|
|
<div>
|
|
<p className="font-medium text-sm">Förfallna fakturor</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5">
|
|
{summary.overdueInvoicesCount} st
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</Link>
|
|
)
|
|
}
|
|
|
|
if (summary.unpaidInvoicesCount > 0 && summary.overdueInvoicesCount < summary.unpaidInvoicesCount) {
|
|
alertItems.push(
|
|
<Link key="unpaid" href="/invoices?status=unpaid" className="group">
|
|
<Card className="h-full border-warning/30 hover:bg-warning/[0.03] transition-colors">
|
|
<CardContent className="p-4">
|
|
<div className="flex items-center gap-3">
|
|
<Receipt className="h-4 w-4 text-warning-foreground flex-shrink-0" />
|
|
<div>
|
|
<p className="font-medium text-sm">Obetalda fakturor</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5">
|
|
{summary.unpaidInvoicesCount - summary.overdueInvoicesCount} st · {formatCurrency(summary.unpaidInvoicesTotal)}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</Link>
|
|
)
|
|
}
|
|
|
|
if (summary.uncategorizedCount > 0) {
|
|
alertItems.push(
|
|
<Link key="transactions" href="/transactions" className="group">
|
|
<Card className="h-full border-warning/30 hover:bg-warning/[0.03] transition-colors">
|
|
<CardContent className="p-4">
|
|
<div className="flex items-center gap-3">
|
|
<ArrowLeftRight className="h-4 w-4 text-warning-foreground flex-shrink-0" />
|
|
<div>
|
|
<p className="font-medium text-sm">Transaktioner</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5">
|
|
{summary.uncategorizedCount} obokförda
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</Link>
|
|
)
|
|
}
|
|
|
|
if (summary.missingUnderlagCount > 0) {
|
|
alertItems.push(
|
|
<Link key="missing-underlag" href="/bookkeeping?missingUnderlag=true" className="group">
|
|
<Card className="h-full border-warning/30 hover:bg-warning/[0.03] transition-colors">
|
|
<CardContent className="p-4">
|
|
<div className="flex items-center gap-3">
|
|
<FileWarning className="h-4 w-4 text-warning-foreground flex-shrink-0" />
|
|
<div>
|
|
<p className="font-medium text-sm">Saknade underlag</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5">
|
|
{summary.missingUnderlagCount} verifikationer utan underlag
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</Link>
|
|
)
|
|
}
|
|
|
|
if (summary.staleUncategorizedCount > 0) {
|
|
alertItems.push(
|
|
<Link key="stale-transactions" href="/transactions" className="group">
|
|
<Card className="h-full border-destructive/30 hover:bg-destructive/[0.03] transition-colors">
|
|
<CardContent className="p-4">
|
|
<div className="flex items-center gap-3">
|
|
<Clock className="h-4 w-4 text-destructive flex-shrink-0" />
|
|
<div>
|
|
<p className="font-medium text-sm">Gamla transaktioner</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5">
|
|
{summary.staleUncategorizedCount} transaktioner äldre än 14 dagar saknar bokföring
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</Link>
|
|
)
|
|
}
|
|
|
|
if (summary.expiringBankConnections && summary.expiringBankConnections.length > 0) {
|
|
const conn = summary.expiringBankConnections[0]
|
|
alertItems.push(
|
|
<Link key="bank-expiry" href="/settings/banking" className="group">
|
|
<Card className="h-full border-warning/30 hover:bg-warning/[0.03] transition-colors">
|
|
<CardContent className="p-4">
|
|
<div className="flex items-center gap-3">
|
|
<Landmark className="h-4 w-4 text-warning-foreground flex-shrink-0" />
|
|
<div>
|
|
<p className="font-medium text-sm">Banksamtycke löper ut</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5">
|
|
{conn.bank_name} — {conn.days_left} {conn.days_left === 1 ? 'dag' : 'dagar'} kvar
|
|
</p>
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</Link>
|
|
)
|
|
}
|
|
|
|
const MAX_VISIBLE_ALERTS = 3
|
|
const visibleAlerts = showAllAlerts ? alertItems : alertItems.slice(0, MAX_VISIBLE_ALERTS)
|
|
const hasMoreAlerts = alertItems.length > MAX_VISIBLE_ALERTS
|
|
|
|
const passedDeadlinesCount = summary.deadlines.filter(d => !d.is_completed && new Date(d.due_date) <= new Date()).length
|
|
const pendingReceiptsCount = summary.receiptQueue
|
|
? summary.receiptQueue.pending_review_count + summary.receiptQueue.unmatched_receipts_count
|
|
: 0
|
|
const todoCount = summary.uncategorizedCount + summary.overdueInvoicesCount + pendingReceiptsCount + passedDeadlinesCount
|
|
|
|
return (
|
|
<div className="stagger-enter space-y-8">
|
|
{/* Key metrics — 4 compact cards */}
|
|
<section>
|
|
<div className="grid grid-cols-2 md:grid-cols-4 gap-4">
|
|
<Card>
|
|
<CardContent className="p-4">
|
|
<p className="text-xs text-muted-foreground mb-2">Resultat</p>
|
|
<p className={cn(
|
|
'font-display text-xl font-medium tabular-nums leading-tight',
|
|
summary.mtd.net >= 0 ? 'text-success' : 'text-destructive'
|
|
)}>
|
|
{formatLargeNumber(summary.mtd.net)}
|
|
<span className="text-sm ml-0.5 text-muted-foreground font-normal">kr</span>
|
|
</p>
|
|
<p className="text-xs text-muted-foreground mt-1">
|
|
{formatCurrency(summary.ytd.net)} i år
|
|
</p>
|
|
</CardContent>
|
|
</Card>
|
|
|
|
<Link href="/invoices?status=unpaid">
|
|
<Card className="h-full hover:border-primary/50 transition-colors cursor-pointer">
|
|
<CardContent className="p-4">
|
|
<div className="flex items-start justify-between">
|
|
<p className="text-xs text-muted-foreground mb-2">Att få betalt</p>
|
|
<ChevronRight className="h-3.5 w-3.5 text-muted-foreground/50" />
|
|
</div>
|
|
<p className="font-display text-xl font-medium tabular-nums leading-tight">
|
|
{summary.unpaidInvoicesCount}
|
|
<span className="text-sm ml-0.5 text-muted-foreground font-normal">st</span>
|
|
</p>
|
|
<p className="text-xs text-muted-foreground mt-1">
|
|
{formatCurrency(summary.unpaidInvoicesTotal)}
|
|
</p>
|
|
</CardContent>
|
|
</Card>
|
|
</Link>
|
|
|
|
{summary.bankBalance !== null ? (
|
|
<Card>
|
|
<CardContent className="p-4">
|
|
<p className="text-xs text-muted-foreground mb-2">Banksaldo</p>
|
|
<p className="font-display text-xl font-medium tabular-nums leading-tight">
|
|
{formatLargeNumber(summary.bankBalance)}
|
|
<span className="text-sm ml-0.5 text-muted-foreground font-normal">kr</span>
|
|
</p>
|
|
</CardContent>
|
|
</Card>
|
|
) : (
|
|
<Link href="/import">
|
|
<Card className="h-full hover:border-primary/50 transition-colors cursor-pointer">
|
|
<CardContent className="p-4">
|
|
<div className="flex items-start justify-between">
|
|
<p className="text-xs text-muted-foreground mb-2">Banksaldo</p>
|
|
<ChevronRight className="h-3.5 w-3.5 text-muted-foreground/50" />
|
|
</div>
|
|
<p className="text-sm font-medium text-primary">Koppla bank</p>
|
|
</CardContent>
|
|
</Card>
|
|
</Link>
|
|
)}
|
|
|
|
<Card>
|
|
<CardContent className="p-4">
|
|
<p className="text-xs text-muted-foreground mb-2">Att göra</p>
|
|
<div role="status" aria-live="polite">
|
|
{todoCount > 0 ? (
|
|
<p className="font-display text-xl font-medium tabular-nums leading-tight text-warning-foreground">
|
|
{todoCount}
|
|
<span className="text-sm ml-0.5 text-muted-foreground font-normal">st</span>
|
|
</p>
|
|
) : (
|
|
<div className="flex items-center gap-1.5">
|
|
<CheckCircle2 className="h-4 w-4 text-success" />
|
|
<p className="text-sm font-medium text-success">Allt klart!</p>
|
|
</div>
|
|
)}
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
</section>
|
|
|
|
{/* Resultat — intäkter / kostnader (always visible) */}
|
|
<section>
|
|
<div className="grid md:grid-cols-2 gap-4">
|
|
<Card>
|
|
<CardContent className="p-6">
|
|
<p className="text-sm text-muted-foreground mb-3">Intäkter</p>
|
|
<p className="font-display text-2xl font-medium tabular-nums leading-tight">
|
|
{formatLargeNumber(summary.mtd.income)}
|
|
<span className="text-base ml-1 text-muted-foreground font-normal">kr</span>
|
|
</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5">denna månad</p>
|
|
<div className="mt-4 pt-3 border-t border-border/30 flex items-baseline justify-between">
|
|
<p className="text-xs text-muted-foreground">I år</p>
|
|
<p className="text-sm font-medium tabular-nums">{formatCurrency(summary.ytd.income)}</p>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
|
|
<Card>
|
|
<CardContent className="p-6">
|
|
<p className="text-sm text-muted-foreground mb-3">Kostnader</p>
|
|
<p className="font-display text-2xl font-medium tabular-nums leading-tight">
|
|
{formatLargeNumber(summary.mtd.expenses)}
|
|
<span className="text-base ml-1 text-muted-foreground font-normal">kr</span>
|
|
</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5">denna månad</p>
|
|
<div className="mt-4 pt-3 border-t border-border/30 flex items-baseline justify-between">
|
|
<p className="text-xs text-muted-foreground">I år</p>
|
|
<p className="text-sm font-medium tabular-nums">{formatCurrency(summary.ytd.expenses)}</p>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
</section>
|
|
|
|
{/* Att hantera */}
|
|
{alertItems.length > 0 && (
|
|
<section id="alerts-section">
|
|
<h2 className="font-display text-lg font-medium mb-4">Att hantera</h2>
|
|
<div id="alerts-list" className="grid gap-4 md:grid-cols-2">
|
|
{visibleAlerts}
|
|
</div>
|
|
{hasMoreAlerts && (
|
|
<button
|
|
onClick={() => setShowAllAlerts(!showAllAlerts)}
|
|
aria-expanded={showAllAlerts}
|
|
aria-controls="alerts-list"
|
|
className="mt-3 py-1.5 text-sm text-muted-foreground hover:text-foreground transition-colors flex items-center gap-1"
|
|
>
|
|
{showAllAlerts ? 'Visa färre' : `Visa alla (${alertItems.length})`}
|
|
<ChevronDown className={cn('h-3 w-3 transition-transform', showAllAlerts && 'rotate-180')} />
|
|
</button>
|
|
)}
|
|
</section>
|
|
)}
|
|
|
|
{/* Upcoming deadlines */}
|
|
{summary.deadlines && summary.deadlines.length > 0 && (
|
|
<section>
|
|
<UpcomingDeadlinesWidget deadlines={summary.deadlines} maxItems={8} />
|
|
</section>
|
|
)}
|
|
|
|
{/* Tax todo */}
|
|
{summary.deadlines?.some(d => d.deadline_type === 'tax' && !d.is_completed) && (
|
|
<section>
|
|
<TaxTodoWidget deadlines={summary.deadlines} />
|
|
</section>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|