Skip to content

Feat/implement dark mode system for merchant dashbaord #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ekene001 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Feat/implement dark mode system for merchant dashbaord #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
461187b
fix: update theme handling and improve UI consistency
Ekene001 Apr 5, 2026
2e3d4b3
Merge branch 'main' of https://github.com/Ekene001/useroutr into feat…
Ekene001 Apr 5, 2026
23e089c
fix: remove unused dependency 'lightningcss-darwin-arm64' from packag…
Ekene001 Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/dashboard/src/app/(auth)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export default function AuthLayout({ children }: { children: React.ReactNode }) {
return (
<div className="relative min-h-screen overflow-hidden bg-background">
<div className="absolute inset-0 bg-[radial-gradient(circle_at_top_left,rgba(16,185,129,0.12),transparent_36%),radial-gradient(circle_at_bottom_right,rgba(59,130,246,0.12),transparent_30%)]" />
<div className="absolute inset-0 bg-[radial-gradient(circle_at_top_left,var(--status-success-bg),transparent_36%),radial-gradient(circle_at_bottom_right,var(--status-info-bg),transparent_30%)]" />
<div className="absolute inset-x-0 top-0 h-px bg-gradient-to-r from-transparent via-primary/40 to-transparent" />
<div className="relative">{children}</div>
</div>
Expand Down
108 changes: 100 additions & 8 deletions apps/dashboard/src/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,37 @@
--color-sidebar-primary: var(--sidebar-primary);
--color-sidebar-foreground: var(--sidebar-foreground);
--color-sidebar: var(--sidebar);

/* ── Dark mode page tokens ── */
--color-bg-page: var(--bg-page);
--color-bg-card: var(--bg-card);
--color-bg-sidebar: var(--bg-sidebar);
--color-text-primary: var(--text-primary);
--color-text-secondary: var(--text-secondary);
--color-border-color: var(--border-color);
--color-input-bg: var(--input-bg);
--color-input-border: var(--input-border);
--color-code-bg: var(--code-bg);

/* ── Chart theming tokens ── */
--color-chart-tick: var(--chart-tick);
--color-chart-grid: var(--chart-grid);
--color-chart-tooltip-bg: var(--chart-tooltip-bg);
--color-chart-tooltip-text: var(--chart-tooltip-text);

/* ── Status tokens ── */
--color-status-success-bg: var(--status-success-bg);
--color-status-success-text: var(--status-success-text);
--color-status-warning-bg: var(--status-warning-bg);
--color-status-warning-text: var(--status-warning-text);
--color-status-error-bg: var(--status-error-bg);
--color-status-error-text: var(--status-error-text);
--color-status-info-bg: var(--status-info-bg);
--color-status-info-text: var(--status-info-text);
--color-status-purple-bg: var(--status-purple-bg);
--color-status-purple-text: var(--status-purple-text);
--color-status-amber-bg: var(--status-amber-bg);
--color-status-amber-text: var(--status-amber-text);
}

@layer base {
Expand All @@ -90,6 +121,38 @@
:root {
--header-height: 3.5rem;

/* ── Dark mode specific tokens (dark-first) ── */
--bg-page: #0B1628;
--bg-card: #1A2332;
--bg-sidebar: #0F1D2E;
--text-primary: #F8F9FA;
--text-secondary: #6C757D;
--border-color: #2D3748;
--input-bg: #1A2332;
--input-border: #2D3748;
--code-bg: #0B1628;

/* ── Chart theming tokens ── */
--chart-tick: #F8F9FA;
--chart-grid: rgba(248, 249, 250, 0.08);
--chart-tooltip-bg: #1A2332;
--chart-tooltip-text: #F8F9FA;
--chart-tooltip-border: #2D3748;

/* ── Semantic status tokens ── */
--status-success-bg: rgba(34, 197, 94, 0.12);
--status-success-text: #4ade80;
--status-warning-bg: rgba(245, 158, 11, 0.12);
--status-warning-text: #fbbf24;
--status-error-bg: rgba(239, 68, 68, 0.12);
--status-error-text: #f87171;
--status-info-bg: rgba(59, 130, 246, 0.12);
--status-info-text: #60a5fa;
--status-purple-bg: rgba(168, 85, 247, 0.12);
--status-purple-text: #c084fc;
--status-amber-bg: rgba(245, 158, 11, 0.12);
--status-amber-text: #fbbf24;

/* Sidebar uses Useroutr ink tiers for dark-first design */
--sidebar: var(--ink2);
--sidebar-foreground: var(--lead);
Expand All @@ -102,6 +165,35 @@
}

.light {
--bg-page: #FFFFFF;
--bg-card: #F8F9FA;
--bg-sidebar: #F3F4F6;
--text-primary: #1A202C;
--text-secondary: #6B7280;
--border-color: #E2E8F0;
--input-bg: #FFFFFF;
--input-border: #D1D5DB;
--code-bg: #F1F5F9;

--chart-tick: #1A202C;
--chart-grid: rgba(0, 0, 0, 0.08);
--chart-tooltip-bg: #FFFFFF;
--chart-tooltip-text: #1A202C;
--chart-tooltip-border: #E2E8F0;

--status-success-bg: rgba(34, 197, 94, 0.1);
--status-success-text: #16a34a;
--status-warning-bg: rgba(245, 158, 11, 0.1);
--status-warning-text: #d97706;
--status-error-bg: rgba(239, 68, 68, 0.1);
--status-error-text: #dc2626;
--status-info-bg: rgba(59, 130, 246, 0.1);
--status-info-text: #2563eb;
--status-purple-bg: rgba(168, 85, 247, 0.1);
--status-purple-text: #7c3aed;
--status-amber-bg: rgba(245, 158, 11, 0.1);
--status-amber-text: #d97706;

--sidebar: oklch(0.975 0.003 265);
--sidebar-foreground: oklch(0.15 0.01 265);
--sidebar-primary: var(--blue);
Expand All @@ -113,14 +205,14 @@
}

.dark {
--sidebar: hsl(240 5.9% 10%);
--sidebar-foreground: hsl(240 4.8% 95.9%);
--sidebar-primary: hsl(224.3 76.3% 48%);
--sidebar-primary-foreground: hsl(0 0% 100%);
--sidebar-accent: hsl(240 3.7% 15.9%);
--sidebar-accent-foreground: hsl(240 4.8% 95.9%);
--sidebar-border: hsl(240 3.7% 15.9%);
--sidebar-ring: hsl(217.2 91.2% 59.8%);
--sidebar: var(--bg-sidebar);
--sidebar-foreground: var(--text-primary);
--sidebar-primary: var(--blue);
--sidebar-primary-foreground: #FFFFFF;
--sidebar-accent: #1E293B;
--sidebar-accent-foreground: var(--text-primary);
--sidebar-border: var(--border-color);
--sidebar-ring: var(--blue2);
}

/* ── Modern card surface ── */
Expand Down
12 changes: 11 additions & 1 deletion apps/dashboard/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { QueryProvider } from "@/providers/QueryProvider";
import { AuthProvider } from "@/providers/AuthProvider";
import "./globals.css";
import { ToastProvider } from "@useroutr/ui";
import { TooltipProvider } from "@/components/ui/tooltip";

const inter = Inter({
subsets: ["latin"],
Expand Down Expand Up @@ -34,12 +35,21 @@ export default function RootLayout({
}) {
return (
<html lang="en" suppressHydrationWarning>
<head>
<script
dangerouslySetInnerHTML={{
__html: `(function(){try{var p=localStorage.getItem("useroutr-theme");var t=p==="dark"?"dark":p==="light"?"light":window.matchMedia("(prefers-color-scheme:dark)").matches?"dark":"light";document.documentElement.classList.add(t)}catch(e){}})()`,
}}
/>
</head>
<body className={`${inter.variable} ${openSans.variable} antialiased`}>
<ThemeProvider>
<QueryProvider>
<Suspense>
<AuthProvider>
<ToastProvider>{children}</ToastProvider>
<TooltipProvider>
<ToastProvider>{children}</ToastProvider>
</TooltipProvider>
</AuthProvider>
</Suspense>
</QueryProvider>
Expand Down
26 changes: 13 additions & 13 deletions apps/dashboard/src/components/analytics/AnalyticsDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ const PERIOD_OPTIONS: Array<{ value: Period; label: string }> = [
];

const PAYMENT_COLORS: Record<PaymentMethod, string> = {
card: "#3b82f6",
crypto: "#14b8a6",
bank: "#f59e0b",
card: "var(--blue)",
crypto: "var(--teal)",
bank: "var(--amber)",
};

const WEEKDAY_LABELS = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
Expand Down Expand Up @@ -782,7 +782,7 @@ function RevenueChart({
x2={width}
y1={y}
y2={y}
stroke="rgba(148,163,184,0.22)"
stroke="var(--chart-grid)"
strokeDasharray="4 6"
/>
);
Expand All @@ -806,15 +806,15 @@ function RevenueChart({
width={barWidth}
height={barHeight}
rx={8}
fill={active ? "#1d4ed8" : "#3b82f6"}
fill={active ? "var(--blue)" : "var(--blue2)"}
opacity={active ? 1 : 0.82}
/>
<text
x={x + barWidth / 2}
y={height - 18}
textAnchor="middle"
fontSize="11"
fill="rgba(100,116,139,1)"
fill="var(--chart-tick)"
>
{point.label}
</text>
Expand All @@ -826,13 +826,13 @@ function RevenueChart({
width={106}
height={30}
rx={10}
fill="rgba(15,23,42,0.95)"
fill="var(--chart-tooltip-bg)"
/>
<text
x={Math.max(18, x - 18)}
y={Math.max(28, y - 18)}
fontSize="11"
fill="#ffffff"
fill="var(--chart-tooltip-text)"
>
{formatCompactMoney(point.amount)}
</text>
Expand Down Expand Up @@ -880,7 +880,7 @@ function PaymentMethodCard({
cy="70"
r={radius}
fill="none"
stroke="rgba(148,163,184,0.18)"
stroke="var(--chart-grid)"
strokeWidth="20"
/>
{segments.map((segment) => {
Expand Down Expand Up @@ -983,8 +983,8 @@ function ConversionCard({
>
<defs>
<linearGradient id="conversion-fill-dashboard" x1="0" x2="0" y1="0" y2="1">
<stop offset="0%" stopColor="rgba(20,184,166,0.35)" />
<stop offset="100%" stopColor="rgba(20,184,166,0.02)" />
<stop offset="0%" stopColor="var(--teal)" stopOpacity={0.35} />
<stop offset="100%" stopColor="var(--teal)" stopOpacity={0.02} />
</linearGradient>
</defs>
<path
Expand All @@ -994,7 +994,7 @@ function ConversionCard({
<path
d={path}
fill="none"
stroke="#14b8a6"
stroke="var(--teal)"
strokeWidth="3"
strokeLinecap="round"
strokeLinejoin="round"
Expand Down Expand Up @@ -1058,7 +1058,7 @@ function FailureHeatmap({
const maxCount = Math.max(...byHour.map((cell) => cell.count), 1);
const getColor = (count: number) => {
const alpha = count / maxCount;
return `rgba(239,68,68,${0.1 + alpha * 0.75})`;
return `color-mix(in srgb, var(--red) ${Math.round((0.1 + alpha * 0.75) * 100)}%, transparent)`;
};

return (
Expand Down
Loading
Loading