Fix Konsisten Warna Bg 4

Fix Konsisten Warna Bg 2
2026-03-25 17:15:07 +08:00 · 2026-03-25 17:08:39 +08:00 · 2026-03-25 17:02:18 +08:00 · 2026-03-25 16:46:59 +08:00 · 2026-03-25 15:35:20 +08:00 · 2026-03-25 15:07:10 +08:00
70 changed files with 4509 additions and 3485 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,9 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
 # Dashboard-MD
 Dashboard-MD

+# md
+*.md
+
 # Playwright artifacts
 test-results/
 playwright-report/
--- a/Pengaduan-New.md
+++ b/Pengaduan-New.md
@@ -0,0 +1,168 @@
+Create a modern analytics dashboard UI for a village complaint system (Pengaduan Dashboard).
+
+Tech stack:
+- React 19 + Vite (Bun runtime)
+- Mantine UI (core components)
+- TailwindCSS (layout & spacing only)
+- Recharts (charts)
+- TanStack Router
+- Icons: lucide-react
+- State: Valtio
+- Date: dayjs
+
+---
+
+## 🎨 DESIGN STYLE
+
+- Clean, minimal, and soft dashboard
+- Background: light gray (#f3f4f6)
+- Card: white with subtle shadow
+- Border radius: 16px–24px (rounded-2xl)
+- Typography: medium contrast (not too bold)
+- Primary color: navy blue (#1E3A5F)
+- Accent: soft blue + neutral gray
+- Icons inside circular solid background
+
+Spacing:
+- Use gap-6 consistently
+- Internal padding: p-5 or p-6
+- Layout must feel breathable (no clutter)
+
+---
+
+## 🧱 LAYOUT STRUCTURE
+
+### 🔹 TOP SECTION (4 STAT CARDS - GRID)
+Grid: 4 columns (responsive → 2 / 1)
+
+Each card contains:
+- Title (small, muted)
+- Big number (bold, large)
+- Subtitle (small gray text)
+- Right side: circular icon container
+
+Example:
+- Total Pengaduan → 42 → "Bulan ini"
+- Baru → 14 → "Belum diproses"
+- Diproses → 14 → "Sedang ditangani"
+- Selesai → 14 → "Terselesaikan"
+
+Use:
+- Mantine Card
+- Group justify="space-between"
+- Icon inside circle (bg navy, icon white)
+
+---
+
+## 📈 MAIN CHART (FULL WIDTH)
+Title: "Tren Pengaduan"
+
+- Use Recharts LineChart
+- Smooth line (monotone)
+- Show dots on each point
+- Data: Apr → Okt
+- Value range: 30–60
+
+Style:
+- Minimal grid (light dashed)
+- No heavy colors (use gray/blue line)
+- Rounded container card
+- Add small top-right icon (expand)
+
+---
+
+## 📊 BOTTOM SECTION (3 COLUMN GRID)
+
+### 🔹 LEFT: "Surat Terbanyak"
+- Horizontal bar chart (Recharts)
+- Categories:
+  - KTP
+  - KK
+  - Domisili
+  - Usaha
+  - Lainnya
+
+Style:
+- Dark blue bars
+- Rounded edges
+- Clean axis
+
+---
+
+### 🔹 CENTER: "Pengajuan Terbaru"
+List of activity cards:
+
+Each item:
+- Name (bold)
+- Subtitle (jenis surat)
+- Time (small text)
+- Status badge (kanan)
+
+Status:
+- baru → red
+- proses → blue
+- selesai → green
+
+Style:
+- Card per item
+- Soft border
+- Rounded
+- Compact spacing
+
+---
+
+### 🔹 RIGHT: "Ajuan Ide Inovatif"
+List mirip dengan pengajuan terbaru:
+
+Each item:
+- Nama
+- Judul ide
+- Waktu
+- Button kecil "Detail"
+
+Style:
+- Right-aligned action button
+- Light border
+- Clean spacing
+
+---
+
+## ⚙️ COMPONENT STRUCTURE
+
+components/
+- StatCard.tsx
+- LineChartCard.tsx
+- BarChartCard.tsx
+- ActivityList.tsx
+- IdeaList.tsx
+
+routes/
+- dashboard.tsx
+
+---
+
+## ✨ INTERACTIONS (IMPORTANT)
+
+- Hover card → scale(1.02)
+- Transition: 150ms ease
+- Icon circle slightly pop on hover
+- List item hover → subtle bg change
+
+---
+
+## 🎯 UX DETAILS
+
+- Numbers must be visually dominant
+- Icons must balance layout (not too big)
+- Avoid heavy borders
+- Keep everything aligned perfectly
+- No clutter
+
+---
+
+## 🚀 OUTPUT
+
+- Modular React components (NOT one file)
+- Clean code (production-ready)
+- Use Mantine properly (no hacky inline styles unless needed)
+- Use Tailwind only for layout/grid/spacing
--- a/public/light-mode.png
+++ b/public/light-mode.png
--- a/public/white.png
+++ b/public/white.png
--- a/src/components/bumdes-page.tsx
+++ b/src/components/bumdes-page.tsx
@@ -1,389 +1,42 @@
-import {
-	Badge,
-	Button,
-	Card,
-	Grid,
-	GridCol,
-	Group,
-	Select,
-	Stack,
-	Table,
-	Text,
-	Title,
-	useMantineColorScheme,
-} from "@mantine/core";
-import {
-	IconBuildingStore,
-	IconCategory,
-	IconCurrency,
-	IconUsers,
-} from "@tabler/icons-react";
-import { useState } from "react";
+import { Grid, GridCol, Stack } from "@mantine/core";
+import { HeaderToggle } from "./umkm/header-toggle";
+import { ProdukUnggulan } from "./umkm/produk-unggulan";
+import type { SalesData } from "./umkm/sales-table";
+import { SalesTable } from "./umkm/sales-table";
+import { SummaryCards } from "./umkm/summary-cards";
+import { TopProducts } from "./umkm/top-products";

 const BumdesPage = () => {
-	const { colorScheme } = useMantineColorScheme();
-	const dark = colorScheme === "dark";
-
-	const [timeFilter, setTimeFilter] = useState<string>("bulan");
-
-	// Sample data for KPI cards
-	const kpiData = [
-		{
-			title: "UMKM Aktif",
-			value: 45,
-			icon: <IconUsers size={24} />,
-			color: "darmasaba-blue",
-		},
-		{
-			title: "UMKM Terdaftar",
-			value: 68,
-			icon: <IconBuildingStore size={24} />,
-			color: "darmasaba-success",
-		},
-		{
-			title: "Omzet",
-			value: "Rp 48.000.000",
-			icon: <IconCurrency size={24} />,
-			color: "darmasaba-warning",
-		},
-		{
-			title: "Kategori UMKM",
-			value: 34,
-			icon: <IconCategory size={24} />,
-			color: "darmasaba-danger",
-		},
-	];
-
-	// Sample data for top products
-	const topProducts = [
-		{
-			rank: 1,
-			name: "Beras Premium Organik",
-			umkmOwner: "Warung Pak Joko",
-			growth: "+12%",
-		},
-		{
-			rank: 2,
-			name: "Keripik Singkong",
-			umkmOwner: "Ibu Sari Snack",
-			growth: "+8%",
-		},
-		{
-			rank: 3,
-			name: "Madu Alami",
-			umkmOwner: "Peternakan Lebah",
-			growth: "+5%",
-		},
-	];
-
-	// Sample data for product sales
-	const productSales = [
-		{
-			produk: "Beras Premium Organik",
-			penjualanBulanIni: "Rp 8.500.000",
-			bulanLalu: "Rp 8.500.000",
-			trend: 10,
-			volume: "650 Kg",
-			stok: "850 Kg",
-		},
-		{
-			produk: "Keripik Singkong",
-			penjualanBulanIni: "Rp 4.200.000",
-			bulanLalu: "Rp 3.800.000",
-			trend: 10,
-			volume: "320 Kg",
-			stok: "120 Kg",
-		},
-		{
-			produk: "Madu Alami",
-			penjualanBulanIni: "Rp 3.750.000",
-			bulanLalu: "Rp 4.100.000",
-			trend: -8,
-			volume: "150 Liter",
-			stok: "45 Liter",
-		},
-		{
-			produk: "Kecap Tradisional",
-			penjualanBulanIni: "Rp 2.800.000",
-			bulanLalu: "Rp 2.500.000",
-			trend: 12,
-			volume: "280 Botol",
-			stok: "95 Botol",
-		},
-	];
+	const handleDetailClick = (product: SalesData) => {
+		console.log("Detail clicked for:", product);
+		// TODO: Open modal or navigate to detail page
+	};

 	return (
 		<Stack gap="lg">
-			{/* KPI Cards */}
-			<Grid gutter="md">
-				{kpiData.map((kpi, index) => (
-					<GridCol key={index} span={{ base: 12, sm: 6, md: 3 }}>
-						<Card
-							p="md"
-							radius="md"
-							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
-						>
-							<Group justify="space-between" align="center">
-								<Stack gap={0}>
-									<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-										{kpi.title}
-									</Text>
-									<Text size="xl" fw={700} c={dark ? "dark.0" : "black"}>
-										{typeof kpi.value === "number"
-											? kpi.value.toLocaleString()
-											: kpi.value}
-									</Text>
-								</Stack>
-								<Badge variant="light" color={kpi.color} p={8} radius="md">
-									{kpi.icon}
-								</Badge>
-							</Group>
-						</Card>
-					</GridCol>
-				))}
-			</Grid>
+			{/* KPI Summary Cards */}
+			<SummaryCards />

-			{/* Update Penjualan Produk Header */}
-			<Card
-				p="md"
-				radius="md"
-				withBorder
-				bg={dark ? "#141D34" : "white"}
-				style={{ borderColor: dark ? "#141D34" : "white" }}
-			>
-				<Group justify="space-between" align="center" px="md" py="xs">
-					<Title order={3} c={dark ? "dark.0" : "black"}>
-						Update Penjualan Produk
-					</Title>
-					<Group>
-						<Button
-							variant={timeFilter === "minggu" ? "filled" : "light"}
-							onClick={() => setTimeFilter("minggu")}
-							color="darmasaba-blue"
-						>
-							Minggu ini
-						</Button>
-						<Button
-							variant={timeFilter === "bulan" ? "filled" : "light"}
-							onClick={() => setTimeFilter("bulan")}
-							color="darmasaba-blue"
-						>
-							Bulan ini
-						</Button>
-					</Group>
-				</Group>
-			</Card>
+			{/* Header with Time Range Toggle */}
+			<HeaderToggle />

+			{/* Main Content - 2 Column Layout */}
 			<Grid gutter="md">
-				{/* Produk Unggulan (Left Column) */}
+				{/* Left Panel - Produk Unggulan */}
 				<GridCol span={{ base: 12, lg: 4 }}>
 					<Stack gap="md">
-						{/* Total Penjualan, Produk Aktif, Total Transaksi */}
-						<Card
-							p="md"
-							radius="md"
-							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
-						>
-							<Stack gap="md">
-								<Group justify="space-between">
-									<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-										Total Penjualan
-									</Text>
-									<Text size="lg" fw={700} c={dark ? "dark.0" : "black"}>
-										Rp 28.500.000
-									</Text>
-								</Group>
-								<Group justify="space-between">
-									<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-										Produk Aktif
-									</Text>
-									<Text size="lg" fw={700} c={dark ? "dark.0" : "black"}>
-										124 Produk
-									</Text>
-								</Group>
-								<Group justify="space-between">
-									<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-										Total Transaksi
-									</Text>
-									<Text size="lg" fw={700} c={dark ? "dark.0" : "black"}>
-										1.240 Transaksi
-									</Text>
-								</Group>
-							</Stack>
-						</Card>
-
-						{/* Top 3 Produk Terlaris */}
-						<Card
-							p="md"
-							radius="md"
-							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
-						>
-							<Title order={4} mb="md" c={dark ? "dark.0" : "black"}>
-								Top 3 Produk Terlaris
-							</Title>
-							<Stack gap="sm">
-								{topProducts.map((product) => (
-									<Group
-										key={product.rank}
-										justify="space-between"
-										align="center"
-									>
-										<Group gap="sm">
-											<Badge
-												variant="filled"
-												color={
-													product.rank === 1
-														? "gold"
-														: product.rank === 2
-															? "gray"
-															: "bronze"
-												}
-												radius="xl"
-												size="lg"
-											>
-												{product.rank}
-											</Badge>
-											<Stack gap={0}>
-												<Text fw={500} c={dark ? "dark.0" : "black"}>
-													{product.name}
-												</Text>
-												<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-													{product.umkmOwner}
-												</Text>
-											</Stack>
-										</Group>
-										<Badge
-											variant="light"
-											color={product.growth.startsWith("+") ? "green" : "red"}
-										>
-											{product.growth}
-										</Badge>
-									</Group>
-								))}
-							</Stack>
-						</Card>
+						<ProdukUnggulan />
+						<TopProducts />
 					</Stack>
 				</GridCol>

-				{/* Detail Penjualan Produk (Right Column) */}
+				{/* Right Panel - Detail Penjualan Produk */}
 				<GridCol span={{ base: 12, lg: 8 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-					>
-						<Group justify="space-between" mb="md">
-							<Title order={4} c={dark ? "dark.0" : "black"}>
-								Detail Penjualan Produk
-							</Title>
-							<Select
-								placeholder="Filter kategori"
-								data={[
-									{ value: "semua", label: "Semua Kategori" },
-									{ value: "makanan", label: "Makanan" },
-									{ value: "minuman", label: "Minuman" },
-									{ value: "kerajinan", label: "Kerajinan" },
-								]}
-								defaultValue="semua"
-								w={200}
-							/>
-						</Group>
-
-						<Table striped highlightOnHover withColumnBorders>
-							<Table.Thead>
-								<Table.Tr>
-									<Table.Th>
-										<Text c={dark ? "white" : "dimmed"}>Produk</Text>
-									</Table.Th>
-									<Table.Th>
-										<Text c={dark ? "white" : "dimmed"}>
-											Penjualan Bulan Ini
-										</Text>
-									</Table.Th>
-									<Table.Th>
-										<Text c={dark ? "white" : "dimmed"}>Bulan Lalu</Text>
-									</Table.Th>
-									<Table.Th>
-										<Text c={dark ? "white" : "dimmed"}>Trend</Text>
-									</Table.Th>
-									<Table.Th>
-										<Text c={dark ? "white" : "dimmed"}>Volume</Text>
-									</Table.Th>
-									<Table.Th>
-										<Text c={dark ? "white" : "dimmed"}>Stok</Text>
-									</Table.Th>
-									<Table.Th>
-										<Text c={dark ? "white" : "dimmed"}>Aksi</Text>
-									</Table.Th>
-								</Table.Tr>
-							</Table.Thead>
-							<Table.Tbody>
-								{productSales.map((product, index) => (
-									<Table.Tr key={index}>
-										<Table.Td>
-											<Text fw={500} c={dark ? "dark.0" : "black"}>
-												{product.produk}
-											</Text>
-										</Table.Td>
-										<Table.Td>
-											<Text fz={"sm"} c={dark ? "dark.0" : "black"}>
-												{product.penjualanBulanIni}
-											</Text>
-										</Table.Td>
-										<Table.Td>
-											<Text fz={"sm"} c={dark ? "white" : "dimmed"}>
-												{product.bulanLalu}
-											</Text>
-										</Table.Td>
-										<Table.Td>
-											<Group gap="xs">
-												<Text c={product.trend >= 0 ? "green" : "red"}>
-													{product.trend >= 0 ? "↑" : "↓"}{" "}
-													{Math.abs(product.trend)}%
-												</Text>
-											</Group>
-										</Table.Td>
-										<Table.Td>
-											<Text fz={"sm"} c={dark ? "dark.0" : "black"}>
-												{product.volume}
-											</Text>
-										</Table.Td>
-										<Table.Td>
-											<Badge
-												variant="light"
-												color={
-													parseInt(product.stok) > 200 ? "green" : "yellow"
-												}
-											>
-												{product.stok}
-											</Badge>
-										</Table.Td>
-										<Table.Td>
-											<Button
-												variant="subtle"
-												size="compact-sm"
-												color="darmasaba-blue"
-											>
-												Detail
-											</Button>
-										</Table.Td>
-									</Table.Tr>
-								))}
-							</Table.Tbody>
-						</Table>
-					</Card>
+					<SalesTable onDetailClick={handleDetailClick} />
 				</GridCol>
 			</Grid>
 		</Stack>
 	);
 };

-export default BumdesPage;
+export default BumdesPage;
--- a/src/components/dashboard-content.tsx
+++ b/src/components/dashboard-content.tsx
@@ -1,4 +1,4 @@
-import { Grid, Stack, useMantineColorScheme } from "@mantine/core";
+import { Grid, Image, Stack, useMantineColorScheme } from "@mantine/core";
 import { CheckCircle, FileText, MessageCircle, Users } from "lucide-react";
 import { ActivityList } from "./dashboard/activity-list";
 import { ChartAPBDes } from "./dashboard/chart-apbdes";
@@ -8,149 +8,26 @@ import { SatisfactionChart } from "./dashboard/satisfaction-chart";
 import { SDGSCard } from "./dashboard/sdgs-card";
 import { StatCard } from "./dashboard/stat-card";

-// SDGs Icons
-function EnergyIcon() {
-	return (
-		<svg
-			width="48"
-			height="48"
-			viewBox="0 0 48 48"
-			fill="none"
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<path
-				d="M24 4L14 24H22L20 44L34 20H26L24 4Z"
-				fill="currentColor"
-				stroke="currentColor"
-				strokeWidth="2"
-				strokeLinecap="round"
-				strokeLinejoin="round"
-			/>
-		</svg>
-	);
-}
-
-function PeaceIcon() {
-	return (
-		<svg
-			width="48"
-			height="48"
-			viewBox="0 0 48 48"
-			fill="none"
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<circle cx="24" cy="24" r="20" stroke="currentColor" strokeWidth="2" />
-			<path
-				d="M24 4V44M24 24L10 38M24 24L38 38"
-				stroke="currentColor"
-				strokeWidth="2"
-				strokeLinecap="round"
-			/>
-		</svg>
-	);
-}
-
-function HealthIcon() {
-	return (
-		<svg
-			width="48"
-			height="48"
-			viewBox="0 0 48 48"
-			fill="none"
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<path
-				d="M24 44C24 44 6 28 6 18C6 11.373 11.373 6 18 6C21.5 6 24.5 7.5 24 12C23.5 7.5 26.5 6 30 6C36.627 6 42 11.373 42 18C42 28 24 44 24 44Z"
-				fill="currentColor"
-				stroke="currentColor"
-				strokeWidth="2"
-				strokeLinejoin="round"
-			/>
-		</svg>
-	);
-}
-
-function PovertyIcon() {
-	return (
-		<svg
-			width="48"
-			height="48"
-			viewBox="0 0 48 48"
-			fill="none"
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<rect x="6" y="18" width="36" height="26" rx="2" fill="currentColor" />
-			<path
-				d="M14 18V12C14 8.686 16.686 6 20 6H28C31.314 6 34 8.686 34 12V18"
-				stroke="currentColor"
-				strokeWidth="2"
-				strokeLinecap="round"
-			/>
-		</svg>
-	);
-}
-
-function OceanIcon() {
-	return (
-		<svg
-			width="48"
-			height="48"
-			viewBox="0 0 48 48"
-			fill="none"
-			xmlns="http://www.w3.org/2000/svg"
-		>
-			<path
-				d="M6 30C6 30 10 26 14 30C18 34 22 30 26 30C30 30 34 34 38 30C42 26 46 30 46 30"
-				stroke="currentColor"
-				strokeWidth="2"
-				strokeLinecap="round"
-			/>
-			<path
-				d="M6 38C6 38 10 34 14 38C18 42 22 38 26 38C30 38 34 42 38 38C42 34 46 38 46 38"
-				stroke="currentColor"
-				strokeWidth="2"
-				strokeLinecap="round"
-			/>
-			<circle cx="24" cy="16" r="6" fill="currentColor" />
-		</svg>
-	);
-}
-
 const sdgsData = [
 	{
 		title: "Desa Berenergi Bersih dan Terbarukan",
 		score: 99.64,
-		icon: <EnergyIcon />,
-		color: "#FACC15",
-		bgColor: "#FEF9C3",
+		image: "SDGS-7.png",
 	},
 	{
 		title: "Desa Damai Berkeadilan",
 		score: 78.65,
-		icon: <PeaceIcon />,
-		color: "#3B82F6",
-		bgColor: "#DBEAFE",
+		image: "SDGS-16.png",
 	},
 	{
 		title: "Desa Sehat dan Sejahtera",
 		score: 77.37,
-		icon: <HealthIcon />,
-		color: "#22C55E",
-		bgColor: "#DCFCE7",
+		image: "SDGS-3.png",
 	},
 	{
 		title: "Desa Tanpa Kemiskinan",
 		score: 52.62,
-		icon: <PovertyIcon />,
-		color: "#EF4444",
-		bgColor: "#FEE2E2",
-	},
-	{
-		title: "Desa Peduli Lingkungan Laut",
-		score: 50.0,
-		icon: <OceanIcon />,
-		color: "#06B6D4",
-		bgColor: "#CFFAFE",
+		image: "SDGS-1.png",
 	},
 ];

@@ -202,37 +79,35 @@ export function DashboardContent() {

 			{/* Section 2: Chart & Division Progress */}
 			<Grid gutter="lg">
-				<Grid.Col span={{ base: 12, lg: 8 }}>
+				<Grid.Col span={{ base: 12, lg: 7 }}>
 					<ChartSurat />
 				</Grid.Col>
-				<Grid.Col span={{ base: 12, lg: 4 }}>
-					<DivisionProgress />
-				</Grid.Col>
-			</Grid>
-
-			{/* Section 3: APBDes Chart */}
-			<ChartAPBDes />
-
-			{/* Section 4 & 5: Activity List & Satisfaction Chart */}
-			<Grid gutter="lg">
-				<Grid.Col span={{ base: 12, lg: 6 }}>
-					<ActivityList />
-				</Grid.Col>
-				<Grid.Col span={{ base: 12, lg: 6 }}>
+				<Grid.Col span={{ base: 12, lg: 5 }}>
 					<SatisfactionChart />
 				</Grid.Col>
 			</Grid>

+			{/* Section 3: APBDes Chart */}
+			<Grid gutter="lg">
+				<Grid.Col span={{ base: 12, lg: 7 }}>
+					<DivisionProgress />
+				</Grid.Col>
+				<Grid.Col span={{ base: 12, lg: 5 }}>
+					<ActivityList />
+					{/* <SatisfactionChart /> */}
+				</Grid.Col>
+			</Grid>
+
+			<ChartAPBDes />
+
 			{/* Section 6: SDGs Desa Cards */}
 			<Grid gutter="md">
 				{sdgsData.map((sdg, index) => (
-					<Grid.Col key={index} span={{ base: 12, sm: 6, md: 4, lg: 2.4 }}>
+					<Grid.Col key={index} span={{ base: 9, md: 3 }}>
 						<SDGSCard
+							image={<Image src={sdg.image} alt={sdg.title} />}
 							title={sdg.title}
 							score={sdg.score}
-							icon={sdg.icon}
-							color={sdg.color}
-							bgColor={sdg.bgColor}
 						/>
 					</Grid.Col>
 				))}
--- a/src/components/dashboard/activity-list.tsx
+++ b/src/components/dashboard/activity-list.tsx
@@ -36,6 +36,7 @@ export function ActivityList() {
 					? "0 1px 3px 0 rgb(0 0 0 / 0.1)"
 					: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
 			}}
+			h="100%"
 		>
 			<Group gap="xs" mb="lg">
 				<Calendar
--- a/src/components/dashboard/chart-apbdes.tsx
+++ b/src/components/dashboard/chart-apbdes.tsx
@@ -39,6 +39,7 @@ export function ChartAPBDes() {
 					? "0 1px 3px 0 rgb(0 0 0 / 0.1)"
 					: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
 			}}
+			h="100%"
 		>
 			<Title order={4} c={dark ? "white" : "gray.9"} mb="lg">
 				Grafik APBDes
--- a/src/components/dashboard/chart-surat.tsx
+++ b/src/components/dashboard/chart-surat.tsx
@@ -42,6 +42,7 @@ export function ChartSurat() {
 					? "0 1px 3px 0 rgb(0 0 0 / 0.1)"
 					: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
 			}}
+			h="100%"
 		>
 			<Group justify="space-between" mb="md">
 				<Box>
--- a/src/components/dashboard/division-progress.tsx
+++ b/src/components/dashboard/division-progress.tsx
@@ -39,6 +39,7 @@ export function DivisionProgress() {
 					? "0 1px 3px 0 rgb(0 0 0 / 0.1)"
 					: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
 			}}
+			h="100%"
 		>
 			<Title order={4} c={dark ? "white" : "gray.9"} mb="lg">
 				Divisi Teraktif
--- a/src/components/dashboard/satisfaction-chart.tsx
+++ b/src/components/dashboard/satisfaction-chart.tsx
@@ -32,6 +32,7 @@ export function SatisfactionChart() {
 					? "0 1px 3px 0 rgb(0 0 0 / 0.1)"
 					: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
 			}}
+			h="100%"
 		>
 			<Title order={4} c={dark ? "white" : "gray.9"} mb={5}>
 				Tingkat Kepuasan
--- a/src/components/dashboard/sdgs-card.tsx
+++ b/src/components/dashboard/sdgs-card.tsx
@@ -4,18 +4,10 @@ import type { ReactNode } from "react";
 interface SDGSCardProps {
 	title: string;
 	score: number;
-	icon: ReactNode;
-	color: string;
-	bgColor: string;
+	image: ReactNode;
 }

-export function SDGSCard({
-	title,
-	score,
-	icon,
-	color,
-	bgColor,
-}: SDGSCardProps) {
+export function SDGSCard({ title, score, image }: SDGSCardProps) {
 	const { colorScheme } = useMantineColorScheme();
 	const dark = colorScheme === "dark";

@@ -24,29 +16,29 @@ export function SDGSCard({
 			p="md"
 			radius="xl"
 			withBorder
-			bg={bgColor}
+			bg={dark ? "#1E293B" : "white"}
 			style={{
-				borderColor: dark ? "#334155" : bgColor,
+				borderColor: dark ? "#334155" : "white",
 				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
 			}}
+			h="100%"
 		>
 			<Group justify="space-between" align="flex-start" w="100%">
+				<Box>{image}</Box>
 				<Box style={{ flex: 1 }}>
-					<Text size="sm" c={dark ? "white" : "gray.8"} fw={500} mb="xs">
+					<Text
+						ta={"center"}
+						size="sm"
+						c={dark ? "white" : "gray.8"}
+						fw={500}
+						mb="xs"
+					>
 						{title}
 					</Text>
-					<Text size="xl" fw={700} c={color}>
+					<Text ta={"center"} size="xl" c={dark ? "white" : "gray.8"} fw={700}>
 						{score.toFixed(2)}
 					</Text>
 				</Box>
-				<Box
-					style={{
-						color,
-						opacity: 0.8,
-					}}
-				>
-					{icon}
-				</Box>
 			</Group>
 		</Card>
 	);
--- a/src/components/dashboard/stat-card.tsx
+++ b/src/components/dashboard/stat-card.tsx
@@ -25,7 +25,7 @@ export function StatCard({
 	trend,
 	trendValue,
 	icon,
-	iconColor = "darmasaba-blue",
+	iconColor = "#1E3A5F",
 }: StatCardProps) {
 	const { colorScheme } = useMantineColorScheme();
 	const dark = colorScheme === "dark";
@@ -77,6 +77,7 @@ export function StatCard({
 					size="xl"
 					radius="xl"
 					color={dark ? "gray" : iconColor}
+					bg={dark ? "gray" : iconColor}
 				>
 					{icon}
 				</ThemeIcon>
--- a/src/components/demografi-pekerjaan.tsx
+++ b/src/components/demografi-pekerjaan.tsx
@@ -1,116 +1,73 @@
-import { BarChart, PieChart } from "@mantine/charts";
 import {
+	Badge,
 	Box,
 	Card,
 	Grid,
+	GridCol,
 	Group,
+	Progress,
 	Stack,
-	Table,
 	Text,
+	ThemeIcon,
 	Title,
 	useMantineColorScheme,
 } from "@mantine/core";
 import {
-	IconArrowDown,
-	IconArrowUp,
-	IconBabyCarriage,
-	IconSkull,
-} from "@tabler/icons-react";
-import React from "react";
+	Baby,
+	BarChart3,
+	Building2,
+	Home,
+	PieChart as PieChartIcon,
+	TrendingDown,
+	Users,
+} from "lucide-react";
+import {
+	Bar,
+	BarChart,
+	CartesianGrid,
+	Cell,
+	Pie,
+	PieChart,
+	ResponsiveContainer,
+	Tooltip,
+	XAxis,
+	YAxis,
+} from "recharts";

-// Sample Data
+// KPI Data
 const kpiData = [
 	{
 		id: 1,
 		title: "Total Penduduk",
 		value: "5.634",
-		sub: "Aktif terdaftar",
-		icon: (
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				strokeWidth={1.5}
-				stroke="currentColor"
-				className="h-6 w-6 text-muted-foreground"
-				role="img"
-				aria-label="Icon penduduk"
-			>
-				<title>Total Penduduk</title>
-				<path
-					strokeLinecap="round"
-					strokeLinejoin="round"
-					d="M15 19.128a9.38 9.38 0 0 0 2.625.372 9.337 9.337 0 0 0 4.121-.952 4.125 4.125 0 0 0-7.533-2.493M15 19.128v-.003c0-1.113-.285-2.16-.786-3.07M15 19.128v.106A12.318 12.318 0 0 1 8.624 21c-2.331 0-4.512-.645-6.374-1.766l-.001-.109a6.375 6.375 0 0 1 11.964-3.07M12 6.375a3.375 3.375 0 1 1-6.75 0 3.375 3.375 0 0 1 6.75 0Zm8.25 2.25a2.625 2.625 0 1 1-5.25 0 2.625 2.625 0 0 1 5.25 0Z"
-				/>
-			</svg>
-		),
+		subtitle: "Aktif terdaftar",
+		icon: Users,
 	},
 	{
 		id: 2,
 		title: "Kepala Keluarga",
 		value: "1.354",
-		sub: "Total KK",
-		icon: (
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				strokeWidth={1.5}
-				stroke="currentColor"
-				className="h-6 w-6 text-muted-foreground"
-				role="img"
-				aria-label="Icon kepala keluarga"
-			>
-				<title>Kepala Keluarga</title>
-				<path
-					strokeLinecap="round"
-					strokeLinejoin="round"
-					d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"
-				/>
-			</svg>
-		),
+		subtitle: "Total KK",
+		icon: Home,
 	},
 	{
 		id: 3,
 		title: "Kelahiran",
 		value: "23",
-		sub: "Tahun ini",
-		icon: (
-			<IconBabyCarriage
-				className="h-6 w-6 text-muted-foreground"
-				role="img"
-				aria-label="Icon kelahiran"
-			/>
-		),
+		subtitle: "Tahun ini",
+		icon: Baby,
 	},
 	{
 		id: 4,
 		title: "Kemiskinan",
 		value: "324",
-		delta: "-10% dari tahun lalu",
-		deltaType: "positive",
-		icon: (
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				strokeWidth={1.5}
-				stroke="currentColor"
-				className="h-6 w-6 text-muted-foreground"
-				role="img"
-				aria-label="Icon kemiskinan"
-			>
-				<title>Kemiskinan</title>
-				<path
-					strokeLinecap="round"
-					strokeLinejoin="round"
-					d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126ZM12 15.75h.007v.008H12v-.008Z"
-				/>
-			</svg>
-		),
+		subtitle: "-10% dari tahun lalu",
+		trend: "positive",
+		icon: TrendingDown,
 	},
 ];

+// Age Distribution Data
 const ageDistributionData = [
 	{ ageRange: "17-25", total: 850 },
 	{ ageRange: "26-35", total: 1200 },
@@ -120,6 +77,7 @@ const ageDistributionData = [
 	{ ageRange: "65+", total: 484 },
 ];

+// Job Distribution Data
 const jobDistributionData = [
 	{ job: "Sipil", total: 1200 },
 	{ job: "Guru", total: 850 },
@@ -128,284 +86,598 @@ const jobDistributionData = [
 	{ job: "Wiraswasta", total: 984 },
 ];

+// Religion Data
 const religionData = [
-	{ religion: "Hindu", total: 4234, color: "red" },
-	{ religion: "Islam", total: 856, color: "blue" },
-	{ religion: "Kristen", total: 412, color: "green" },
-	{ religion: "Buddha", total: 202, color: "yellow" },
+	{ name: "Hindu", value: 4234, color: "#EF4444" },
+	{ name: "Islam", value: 856, color: "#3B82F6" },
+	{ name: "Kristen", value: 412, color: "#22C55E" },
+	{ name: "Buddha", value: 202, color: "#FACC15" },
 ];

+// Banjar Data
 const banjarData = [
-	{ banjar: "Banjar Darmasaba", population: 1200, kk: 300, poor: 45 },
-	{ banjar: "Banjar Manesa", population: 950, kk: 240, poor: 32 },
-	{ banjar: "Banjar Cabe", population: 800, kk: 200, poor: 28 },
-	{ banjar: "Banjar Penenjoan", population: 1100, kk: 280, poor: 38 },
-	{ banjar: "Banjar Baler Pasar", population: 984, kk: 250, poor: 42 },
-	{ banjar: "Banjar Bucu", population: 600, kk: 184, poor: 25 },
+	{ banjar: "Darmasaba", population: 1200, kk: 300, poor: 45 },
+	{ banjar: "Manesa", population: 950, kk: 240, poor: 32 },
+	{ banjar: "Cabe", population: 800, kk: 200, poor: 28 },
+	{ banjar: "Penenjoan", population: 1100, kk: 280, poor: 38 },
+	{ banjar: "Baler Pasar", population: 984, kk: 250, poor: 42 },
+	{ banjar: "Bucu", population: 600, kk: 184, poor: 25 },
 ];

+// Dynamic Stats Data
 const dynamicStats = [
 	{
 		title: "Kelahiran",
 		value: "23",
-		icon: <IconBabyCarriage size={16} />,
-		color: "green",
+		icon: Baby,
+		color: "#22C55E",
 	},
 	{
 		title: "Kematian",
 		value: "12",
-		icon: <IconSkull size={16} />,
-		color: "red",
+		icon: TrendingDown,
+		color: "#EF4444",
 	},
 	{
 		title: "Pindah Masuk",
 		value: "45",
-		icon: <IconArrowDown size={16} />,
-		color: "blue",
+		icon: Users,
+		color: "#3B82F6",
 	},
 	{
 		title: "Pindah Keluar",
 		value: "32",
-		icon: <IconArrowUp size={16} />,
-		color: "orange",
+		icon: Users,
+		color: "#3B82F6",
 	},
 ];

+// Sektor Unggulan Data
+const sektorUnggulanData = [
+	{ sektor: "Pertanian", value: 65 },
+	{ sektor: "Perdagangan", value: 45 },
+	{ sektor: "Industri", value: 38 },
+	{ sektor: "Jasa", value: 52 },
+];
+
 const DemografiPekerjaan = () => {
 	const { colorScheme } = useMantineColorScheme();
 	const dark = colorScheme === "dark";
-	return (
-		<Box className="space-y-6">
-			<Stack gap="xl">
-				{/* KPI Cards */}
-				<Grid gutter="lg">
-					{kpiData.map((kpi) => (
-						<Grid.Col key={kpi.id} span={{ base: 12, md: 6, lg: 3 }}>
-							<Card
-								p="md"
-								radius="md"
-								withBorder
-								bg={dark ? "#141D34" : "white"}
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-							>
-								<Group justify="space-between" align="flex-start" mb="xs">
-									<Text size="sm" fw={500} c={dark ? "dark.3" : "dimmed"}>
-										{kpi.title}
-									</Text>
-									{React.cloneElement(kpi.icon, {
-										className: "h-6 w-6",
-										color: dark
-											? "var(--mantine-color-dark-3)"
-											: "var(--mantine-color-dimmed)",
-									})}
-								</Group>
-								<Title order={3} fw={700} c={dark ? "dark.0" : "black"} mt="xs">
-									{kpi.value}
-								</Title>
-								{kpi.delta && (
-									<Text
-										size="xs"
-										c={
-											kpi.deltaType === "positive"
-												? "green"
-												: kpi.deltaType === "negative"
-													? "red"
-													: dark
-														? "dark.3"
-														: "dimmed"
-										}
-										mt={4}
-									>
-										{kpi.delta}
-									</Text>
-								)}
-								{kpi.sub && (
-									<Text size="xs" c={dark ? "dark.3" : "dimmed"} mt={2}>
-										{kpi.sub}
-									</Text>
-								)}
-							</Card>
-						</Grid.Col>
-					))}
-				</Grid>

-				{/* Charts Section */}
-				<Grid gutter="lg">
-					{/* Grafik Pengelompokan Umur */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
+	return (
+		<Stack gap="lg">
+			{/* TOP SECTION - 4 STAT CARDS */}
+			<Grid gutter="md">
+				{kpiData.map((item) => (
+					<Grid.Col key={item.id} span={{ base: 12, sm: 6, lg: 3 }}>
 						<Card
 							p="md"
-							radius="md"
+							radius="xl"
 							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
+							bg={dark ? "#1E293B" : "white"}
+							style={{
+								borderColor: dark ? "#334155" : "white",
+								boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+								transition: "transform 0.15s ease, box-shadow 0.15s ease",
+							}}
+							h="100%"
 						>
-							<Title order={3} fw={500} mb="md">
-								Grafik Pengelompokan Umur
-							</Title>
-							<BarChart
-								h={300}
-								data={ageDistributionData}
-								dataKey="ageRange"
-								series={[{ name: "total", color: "darmasaba-navy" }]}
-								withLegend
-							/>
+							<Group justify="space-between" align="flex-start" w="100%">
+								<Stack gap={2}>
+									<Text size="sm" c="dimmed">
+										{item.title}
+									</Text>
+									<Text size="xl" fw={700} c={dark ? "white" : "gray.9"}>
+										{item.value}
+									</Text>
+									<Group gap={4} align="flex-start">
+										{item.trend === "positive" && (
+											<TrendingDown size={14} color="#22C55E" />
+										)}
+										<Text
+											size="xs"
+											c={
+												item.trend === "positive"
+													? "green"
+													: dark
+														? "gray.4"
+														: "gray.5"
+											}
+										>
+											{item.subtitle}
+										</Text>
+									</Group>
+								</Stack>
+								<ThemeIcon
+									color="#1E3A5F"
+									variant="filled"
+									size="lg"
+									radius="xl"
+								>
+									<item.icon style={{ width: "60%", height: "60%" }} />
+								</ThemeIcon>
+							</Group>
 						</Card>
 					</Grid.Col>
+				))}
+			</Grid>

-					{/* Demografi Pekerjaan */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
-						<Card
-							p="md"
-							radius="md"
-							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
-						>
-							<Title order={3} fw={500} mb="md">
+			{/* ROW 2 - 3 COLUMNS */}
+			<Grid gutter="lg">
+				{/* LEFT: PENGELOMPOKAN UMUR */}
+				<Grid.Col span={{ base: 12, lg: 4 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<BarChart3 size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
+								Pengelompokan Umur
+							</Title>
+						</Group>
+						<ResponsiveContainer width="100%" height={250}>
+							<BarChart data={ageDistributionData}>
+								<CartesianGrid
+									strokeDasharray="3 3"
+									vertical={false}
+									stroke={dark ? "#334155" : "#e5e7eb"}
+								/>
+								<XAxis
+									dataKey="ageRange"
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 12,
+									}}
+								/>
+								<YAxis
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 12,
+									}}
+								/>
+								<Tooltip
+									contentStyle={{
+										backgroundColor: dark ? "#1E293B" : "white",
+										borderColor: dark ? "#334155" : "#e5e7eb",
+										borderRadius: "8px",
+									}}
+									labelStyle={{ color: dark ? "#E2E8F0" : "#374151" }}
+								/>
+								<Bar
+									dataKey="total"
+									fill="#396aaaff"
+									radius={[8, 8, 0, 0]}
+									maxBarSize={40}
+								/>
+							</BarChart>
+						</ResponsiveContainer>
+					</Card>
+				</Grid.Col>
+
+				{/* CENTER: DEMOGRAFI PEKERJAAN */}
+				<Grid.Col span={{ base: 12, lg: 4 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<Building2 size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
 								Demografi Pekerjaan
 							</Title>
-							<BarChart
-								h={300}
-								data={jobDistributionData}
-								dataKey="job"
-								series={[{ name: "total", color: "darmasaba-navy" }]}
-								withLegend
-							/>
-						</Card>
-					</Grid.Col>
-				</Grid>
+						</Group>
+						<ResponsiveContainer width="100%" height={250}>
+							<BarChart data={jobDistributionData} layout="vertical">
+								<CartesianGrid
+									strokeDasharray="3 3"
+									horizontal={false}
+									stroke={dark ? "#334155" : "#e5e7eb"}
+								/>
+								<XAxis
+									type="number"
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 12,
+									}}
+								/>
+								<YAxis
+									type="category"
+									dataKey="job"
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 12,
+									}}
+									width={90}
+								/>
+								<Tooltip
+									contentStyle={{
+										backgroundColor: dark ? "#1E293B" : "white",
+										borderColor: dark ? "#334155" : "#e5e7eb",
+										borderRadius: "8px",
+									}}
+								/>
+								<Bar
+									dataKey="total"
+									fill="#396aaaff"
+									radius={[0, 8, 8, 0]}
+									maxBarSize={30}
+								/>
+							</BarChart>
+						</ResponsiveContainer>
+					</Card>
+				</Grid.Col>

-				{/* Agama & Data per Banjar */}
-				<Grid gutter="lg">
-					{/* Distribusi Agama */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
-						<Card
-							p="md"
-							radius="md"
-							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
-						>
-							<Title order={3} fw={500} mb="md">
-								Distribusi Agama
+				{/* RIGHT: STATISTIK DINAMIKA PENDUDUK */}
+				<Grid.Col span={{ base: 12, lg: 4 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<BarChart3 size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
+								Dinamika Penduduk
 							</Title>
-							<PieChart
-								h={300}
-								data={religionData.map((item) => ({
-									name: item.religion,
-									value: item.total,
-									color: item.color,
-								}))}
-								withLabels
-								withLabelsLine
-								labelsPosition="outside"
-								labelsType="percent"
-							/>
-						</Card>
-					</Grid.Col>
-
-					{/* Data per Banjar */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
-						<Card
-							p="md"
-							radius="md"
-							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
-						>
-							<Title order={3} fw={500} c={dark ? "dark.0" : "black"} mb="md">
-								Data per Banjar
-							</Title>
-							<Table striped highlightOnHover>
-								<Table.Thead>
-									<Table.Tr>
-										<Table.Th>
-											<Text c={dark ? "dark.0" : "black"}>Banjar</Text>
-										</Table.Th>
-										<Table.Th>
-											<Text c={dark ? "dark.0" : "black"}>Penduduk</Text>
-										</Table.Th>
-										<Table.Th>
-											<Text c={dark ? "dark.0" : "black"}>KK</Text>
-										</Table.Th>
-										<Table.Th>
-											<Text c={dark ? "dark.0" : "black"}>Miskin</Text>
-										</Table.Th>
-									</Table.Tr>
-								</Table.Thead>
-								<Table.Tbody>
-									{banjarData.map((item, index) => (
-										<Table.Tr key={`${item.banjar}-${index}`}>
-											<Table.Td>
-												<Text c={dark ? "dark.0" : "black"}>{item.banjar}</Text>
-											</Table.Td>
-											<Table.Td>
-												<Text c={dark ? "dark.0" : "black"}>
-													{item.population.toLocaleString()}
-												</Text>
-											</Table.Td>
-											<Table.Td>
-												<Text c={dark ? "dark.0" : "black"}>
-													{item.kk.toLocaleString()}
-												</Text>
-											</Table.Td>
-											<Table.Td>
-												<Text c={dark ? "red.4" : "red"}>
-													{item.poor.toLocaleString()}
-												</Text>
-											</Table.Td>
-										</Table.Tr>
-									))}
-								</Table.Tbody>
-							</Table>
-						</Card>
-					</Grid.Col>
-				</Grid>
-
-				{/* Statistik Dinamika Penduduk */}
-				<Card
-					p="md"
-					radius="md"
-					withBorder
-					bg={dark ? "#141D34" : "white"}
-					style={{ borderColor: dark ? "#141D34" : "white" }}
-				>
-					<Title order={3} fw={500} c={dark ? "dark.0" : "black"} mb="md">
-						Statistik Dinamika Penduduk
-					</Title>
-					<Grid gutter="md">
-						{dynamicStats.map((stat, index) => (
-							<Grid.Col
-								key={`${stat.title}-${index}`}
-								span={{ base: 12, md: 3 }}
-							>
-								<Card
-									p="md"
-									radius="md"
-									withBorder
-									bg={dark ? "#141D34" : "white"}
-									style={{ borderColor: dark ? "#141D34" : "white" }}
-								>
-									<Group justify="space-between" align="center">
-										<Box>
-											<Text size="sm" fw={500} c={dark ? "dark.3" : "dimmed"}>
+						</Group>
+						<Grid gutter="sm">
+							{dynamicStats.map((stat, index) => (
+								<Grid.Col key={index} span={6}>
+									<Card
+										p="sm"
+										radius="lg"
+										bg={dark ? "#334155" : "#F1F5F9"}
+										style={{
+											transition: "transform 0.15s ease",
+											cursor: "pointer",
+										}}
+									>
+										<Stack gap={2} align="center">
+											<ThemeIcon
+												color={stat.color}
+												variant="filled"
+												size="md"
+												radius="lg"
+											>
+												<stat.icon size={14} />
+											</ThemeIcon>
+											<Text size="xs" c="dimmed" ta="center">
 												{stat.title}
 											</Text>
-											<Title order={4} fw={700} c={stat.color}>
+											<Text
+												size="lg"
+												fw={700}
+												c={stat.color}
+												style={{ lineHeight: 1 }}
+											>
 												{stat.value}
-											</Title>
-										</Box>
-										<Box c={stat.color}>{stat.icon}</Box>
+											</Text>
+										</Stack>
+									</Card>
+								</Grid.Col>
+							))}
+						</Grid>
+					</Card>
+				</Grid.Col>
+			</Grid>
+
+			{/* ROW 3 - 3 COLUMNS */}
+			<Grid gutter="lg">
+				{/* LEFT: DISTRIBUSI AGAMA */}
+				<Grid.Col span={{ base: 12, lg: 4 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<PieChartIcon size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
+								Distribusi Agama
+							</Title>
+						</Group>
+						<ResponsiveContainer width="100%" height={250}>
+							<PieChart>
+								<Pie
+									data={religionData}
+									cx="50%"
+									cy="50%"
+									innerRadius={60}
+									outerRadius={90}
+									paddingAngle={2}
+									dataKey="value"
+								>
+									{religionData.map((entry, index) => (
+										<Cell key={`cell-${index}`} fill={entry.color} />
+									))}
+								</Pie>
+								<Tooltip
+									contentStyle={{
+										backgroundColor: dark ? "#1E293B" : "white",
+										borderColor: dark ? "#334155" : "#e5e7eb",
+										borderRadius: "8px",
+									}}
+								/>
+							</PieChart>
+						</ResponsiveContainer>
+						<Stack gap="xs" mt="md">
+							{religionData.map((item, index) => (
+								<Group key={index} justify="space-between">
+									<Group gap="xs">
+										<Box
+											w={10}
+											h={10}
+											style={{
+												backgroundColor: item.color,
+												borderRadius: 2,
+											}}
+										/>
+										<Text size="sm" c={dark ? "white" : "gray.7"}>
+											{item.name}
+										</Text>
 									</Group>
-								</Card>
-							</Grid.Col>
-						))}
-					</Grid>
-				</Card>
-			</Stack>
-		</Box>
+									<Text size="sm" fw={600} c={dark ? "white" : "gray.9"}>
+										{item.value.toLocaleString()}
+									</Text>
+								</Group>
+							))}
+						</Stack>
+					</Card>
+				</Grid.Col>
+
+				{/* CENTER: DATA PER BANJAR */}
+				<Grid.Col span={{ base: 12, lg: 4 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<Users size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
+								Data per Banjar
+							</Title>
+						</Group>
+						<Box style={{ overflowX: "auto" }}>
+							<table style={{ width: "100%", borderCollapse: "collapse" }}>
+								<thead>
+									<tr>
+										<th
+											style={{
+												textAlign: "left",
+												padding: "8px",
+												fontSize: "12px",
+												fontWeight: 600,
+												color: dark ? "#94A3B8" : "#64748B",
+												borderBottom: `1px solid ${dark ? "#334155" : "#e5e7eb"}`,
+											}}
+										>
+											Banjar
+										</th>
+										<th
+											style={{
+												textAlign: "right",
+												padding: "8px",
+												fontSize: "12px",
+												fontWeight: 600,
+												color: dark ? "#94A3B8" : "#64748B",
+												borderBottom: `1px solid ${dark ? "#334155" : "#e5e7eb"}`,
+											}}
+										>
+											Penduduk
+										</th>
+										<th
+											style={{
+												textAlign: "right",
+												padding: "8px",
+												fontSize: "12px",
+												fontWeight: 600,
+												color: dark ? "#94A3B8" : "#64748B",
+												borderBottom: `1px solid ${dark ? "#334155" : "#e5e7eb"}`,
+											}}
+										>
+											KK
+										</th>
+										<th
+											style={{
+												textAlign: "right",
+												padding: "8px",
+												fontSize: "12px",
+												fontWeight: 600,
+												color: dark ? "#94A3B8" : "#64748B",
+												borderBottom: `1px solid ${dark ? "#334155" : "#e5e7eb"}`,
+											}}
+										>
+											Miskin
+										</th>
+									</tr>
+								</thead>
+								<tbody>
+									{banjarData.map((item, index) => (
+										<tr
+											key={index}
+											style={{
+												backgroundColor:
+													index % 2 === 0
+														? dark
+															? "#334155"
+															: "#F8FAFC"
+														: "transparent",
+												transition: "background-color 0.15s ease",
+											}}
+										>
+											<td
+												style={{
+													padding: "10px 8px",
+													fontSize: "13px",
+													fontWeight: 500,
+													color: dark ? "#E2E8F0" : "#1E293B",
+												}}
+											>
+												{item.banjar}
+											</td>
+											<td
+												style={{
+													padding: "10px 8px",
+													textAlign: "right",
+													fontSize: "13px",
+													color: dark ? "#E2E8F0" : "#1E293B",
+												}}
+											>
+												{item.population.toLocaleString()}
+											</td>
+											<td
+												style={{
+													padding: "10px 8px",
+													textAlign: "right",
+													fontSize: "13px",
+													color: dark ? "#E2E8F0" : "#1E293B",
+												}}
+											>
+												{item.kk.toLocaleString()}
+											</td>
+											<td
+												style={{
+													padding: "10px 8px",
+													textAlign: "right",
+													fontSize: "13px",
+													color: "#EF4444",
+													fontWeight: 600,
+												}}
+											>
+												{item.poor.toLocaleString()}
+											</td>
+										</tr>
+									))}
+								</tbody>
+							</table>
+						</Box>
+					</Card>
+				</Grid.Col>
+
+				{/* RIGHT: STATISTIK SEKTOR UNGGULAN */}
+				<Grid.Col span={{ base: 12, lg: 4 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<BarChart3 size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
+								Sektor Unggulan
+							</Title>
+						</Group>
+						<ResponsiveContainer width="100%" height={250}>
+							<BarChart data={sektorUnggulanData} layout="vertical">
+								<CartesianGrid
+									strokeDasharray="3 3"
+									horizontal={false}
+									stroke={dark ? "#334155" : "#e5e7eb"}
+								/>
+								<XAxis
+									type="number"
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 12,
+									}}
+								/>
+								<YAxis
+									type="category"
+									dataKey="sektor"
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 12,
+									}}
+									width={90}
+								/>
+								<Tooltip
+									contentStyle={{
+										backgroundColor: dark ? "#1E293B" : "white",
+										borderColor: dark ? "#334155" : "#e5e7eb",
+										borderRadius: "8px",
+									}}
+								/>
+								<Bar
+									dataKey="value"
+									fill="#396aaaff"
+									radius={[0, 8, 8, 0]}
+									maxBarSize={40}
+								>
+									{sektorUnggulanData.map((entry, index) => (
+										<Cell key={`cell-${index}`} fill="#396aaaff" />
+									))}
+								</Bar>
+							</BarChart>
+						</ResponsiveContainer>
+					</Card>
+				</Grid.Col>
+			</Grid>
+		</Stack>
 	);
 };

-export default DemografiPekerjaan;
+export default DemografiPekerjaan;
--- a/src/components/header.tsx
+++ b/src/components/header.tsx
@@ -9,11 +9,18 @@ import {
 	Title,
 	useMantineColorScheme,
 } from "@mantine/core";
-import { IconUserShield } from "@tabler/icons-react";
+import {
+	IconLayoutSidebarLeftCollapse,
+	IconUserShield,
+} from "@tabler/icons-react";
 import { useLocation, useNavigate } from "@tanstack/react-router";
-import { Bell, Moon, Sun, User as UserIcon } from "lucide-react"; // Renamed User to UserIcon to avoid conflict with Mantine's User component if it exists
+import { Bell, Moon, Sun, User as UserIcon } from "lucide-react";

-export function Header() {
+interface HeaderProps {
+	onSidebarToggle?: () => void;
+}
+
+export function Header({ onSidebarToggle }: HeaderProps) {
 	const location = useLocation();
 	const { colorScheme, toggleColorScheme } = useMantineColorScheme();
 	const dark = colorScheme === "dark";
@@ -56,9 +63,24 @@ export function Header() {
 	return (
 		<Group justify="space-between" w="100%">
 			{/* Title */}
-			<Title order={3} c={"white"}>
-				{getPageTitle()}
-			</Title>
+			<Group gap="md">
+				<ActionIcon
+					onClick={onSidebarToggle}
+					variant="subtle"
+					size="lg"
+					radius="xl"
+					visibleFrom="sm"
+					aria-label="Toggle sidebar"
+				>
+					<IconLayoutSidebarLeftCollapse
+						color="white"
+						style={{ width: "70%", height: "70%" }}
+					/>
+				</ActionIcon>
+				{/* <Title order={3} c={"white"}>
+					{getPageTitle()}
+				</Title> */}
+			</Group>

 			{/* Right Section */}
 			<Group gap="md">
@@ -118,4 +140,4 @@ export function Header() {
 			</Group>
 		</Group>
 	);
-}
+}
--- a/src/components/help-page.tsx
+++ b/src/components/help-page.tsx
@@ -155,11 +155,13 @@ const HelpPage = () => {
 				{stats.map((stat, index) => (
 					<HelpCard
 						key={index}
-						bg={dark ? "#141D34" : "white"}
+						bg={dark ? "#1E293B" : "white"}
 						p="lg"
 						style={{
 							textAlign: "center",
-							borderColor: dark ? "#141D34" : "white",
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+							transition: "transform 0.15s ease, box-shadow 0.15s ease",
 						}}
 						h="100%"
 					>
@@ -179,9 +181,13 @@ const HelpPage = () => {
 						{/* Panduan Memulai */}
 						<Grid.Col span={{ base: 12, sm: 6, md: 4 }}>
 							<HelpCard
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-								bg={dark ? "#141D34" : "white"}
-								icon={<IconBook size={24} />}
+								style={{
+									borderColor: dark ? "#334155" : "white",
+									boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+									transition: "transform 0.15s ease, box-shadow 0.15s ease",
+								}}
+								bg={dark ? "#1E293B" : "white"}
+								icon={<IconBook size={24} color="white" />}
 								title="Panduan Memulai"
 								h="100%"
 							>
@@ -209,9 +215,13 @@ const HelpPage = () => {
 						{/* Video Tutorial */}
 						<Grid.Col span={{ base: 12, sm: 6, md: 4 }}>
 							<HelpCard
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-								bg={dark ? "#141D34" : "white"}
-								icon={<IconVideo size={24} />}
+								style={{
+									borderColor: dark ? "#334155" : "white",
+									boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+									transition: "transform 0.15s ease, box-shadow 0.15s ease",
+								}}
+								bg={dark ? "#1E293B" : "white"}
+								icon={<IconVideo size={24} color="white" />}
 								title="Video Tutorial"
 								h="100%"
 							>
@@ -239,9 +249,13 @@ const HelpPage = () => {
 						{/* FAQ */}
 						<Grid.Col span={{ base: 12, sm: 6, md: 4 }}>
 							<HelpCard
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-								bg={dark ? "#141D34" : "white"}
-								icon={<IconHelpCircle size={24} />}
+								style={{
+									borderColor: dark ? "#334155" : "white",
+									boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+									transition: "transform 0.15s ease, box-shadow 0.15s ease",
+								}}
+								bg={dark ? "#1E293B" : "white"}
+								icon={<IconHelpCircle size={24} color="white" />}
 								title="FAQ"
 								h="100%"
 							>
@@ -271,9 +285,13 @@ const HelpPage = () => {
 						{/* Hubungi Support */}
 						<Grid.Col span={{ base: 12, sm: 6, md: 4 }}>
 							<HelpCard
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-								bg={dark ? "#141D34" : "white"}
-								icon={<IconHeadphones size={24} />}
+								style={{
+									borderColor: dark ? "#334155" : "white",
+									boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+									transition: "transform 0.15s ease, box-shadow 0.15s ease",
+								}}
+								bg={dark ? "#1E293B" : "white"}
+								icon={<IconHeadphones size={24} color="white" />}
 								title="Hubungi Support"
 								h="100%"
 							>
@@ -306,9 +324,13 @@ const HelpPage = () => {
 						{/* Dokumentasi */}
 						<Grid.Col span={{ base: 12, sm: 6, md: 4 }}>
 							<HelpCard
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-								bg={dark ? "#141D34" : "white"}
-								icon={<IconFileText size={24} />}
+								style={{
+									borderColor: dark ? "#334155" : "white",
+									boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+									transition: "transform 0.15s ease, box-shadow 0.15s ease",
+								}}
+								bg={dark ? "#1E293B" : "white"}
+								icon={<IconFileText size={24} color="white" />}
 								title="Dokumentasi"
 								h="100%"
 							>
@@ -338,9 +360,13 @@ const HelpPage = () => {
 						{/* Jenna - Virtual Assistant */}
 						<Grid.Col span={{ base: 12, sm: 6, md: 4 }}>
 							<HelpCard
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-								bg={dark ? "#141D34" : "white"}
-								icon={<IconMessage size={24} />}
+								style={{
+									borderColor: dark ? "#334155" : "white",
+									boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+									transition: "transform 0.15s ease, box-shadow 0.15s ease",
+								}}
+								bg={dark ? "#1E293B" : "white"}
+								icon={<IconMessage size={24} color="white" />}
 								title="Jenna - Virtual Assistant"
 								h="100%"
 							>
@@ -432,4 +458,4 @@ const HelpPage = () => {
 	);
 };

-export default HelpPage;
+export default HelpPage;
--- a/src/components/jenna-analytic.tsx
+++ b/src/components/jenna-analytic.tsx
@@ -1,123 +1,79 @@
-import { BarChart } from "@mantine/charts";
 import {
 	Badge,
 	Box,
-	Button,
 	Card,
 	Grid,
+	GridCol,
 	Group,
 	Progress,
 	Stack,
 	Text,
+	ThemeIcon,
 	Title,
 	useMantineColorScheme,
 } from "@mantine/core";
-import React from "react";
+import {
+	AlertTriangle,
+	CheckCircle,
+	Clock,
+	MessageCircle,
+	TrendingUp,
+} from "lucide-react";
+import {
+	Bar,
+	BarChart,
+	CartesianGrid,
+	ResponsiveContainer,
+	Tooltip,
+	XAxis,
+	YAxis,
+} from "recharts";

-// Sample Data
+// KPI Data
 const kpiData = [
 	{
 		id: 1,
 		title: "Interaksi Hari Ini",
 		value: "61",
-		delta: "+15% dari kemarin",
-		deltaType: "positive",
-		icon: (
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				strokeWidth={1.5}
-				stroke="currentColor"
-				className="h-6 w-6 text-muted-foreground"
-			>
-				<path
-					strokeLinecap="round"
-					strokeLinejoin="round"
-					d="M8.625 12a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H8.25m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H12m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H16.5m-13.5 3h15a2.25 2.25 0 0 0 2.25-2.25V6.75A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25v10.5A2.25 2.25 0 0 0 4.5 19.5Z"
-				/>
-			</svg>
-		),
+		subtitle: "+15% dari kemarin",
+		trend: "positive",
+		icon: MessageCircle,
 	},
 	{
 		id: 2,
 		title: "Jawaban Otomatis",
 		value: "87%",
-		sub: "53 dari 61 interaksi",
-		icon: (
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				strokeWidth={1.5}
-				stroke="currentColor"
-				className="h-6 w-6 text-muted-foreground"
-			>
-				<path
-					strokeLinecap="round"
-					strokeLinejoin="round"
-					d="M9 12.75 11.25 15 15 9.75M21 12c0 1.268-.63 2.473-1.688 3.342-.48.485-.926.97-1.378 1.44c-1.472 1.58-2.306 2.787-2.91 3.514-.15.18-.207.33-.207.33A.75.75 0 0 1 15 21h-3c-1.104 0-2.08-.542-2.657-1.455-.139-.201-.264-.406-.38-.614l-.014-.025C8.85 18.067 8.156 17.2 7.5 16.325.728 12.56.728 7.44 7.5 3.675c3.04-.482 5.584.47 7.042 1.956.674.672 1.228 1.462 1.696 2.307.426.786.793 1.582 1.113 2.392h.001Z"
-				/>
-			</svg>
-		),
+		subtitle: "53 dari 61 interaksi",
+		icon: CheckCircle,
 	},
 	{
 		id: 3,
 		title: "Belum Ditindak",
 		value: "8",
-		sub: "Perlu respon manual",
-		deltaType: "negative",
-		icon: (
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				strokeWidth={1.5}
-				stroke="currentColor"
-				className="h-6 w-6 text-muted-foreground"
-			>
-				<path
-					strokeLinecap="round"
-					strokeLinejoin="round"
-					d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126ZM12 15.75h.007v.008H12v-.008Z"
-				/>
-			</svg>
-		),
+		subtitle: "Perlu respon manual",
+		icon: AlertTriangle,
 	},
 	{
 		id: 4,
 		title: "Waktu Respon",
 		value: "2.3 sec",
-		sub: "Rata-rata",
-		icon: (
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				strokeWidth={1.5}
-				stroke="currentColor"
-				className="h-6 w-6 text-muted-foreground"
-			>
-				<path
-					strokeLinecap="round"
-					strokeLinejoin="round"
-					d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"
-				/>
-			</svg>
-		),
+		subtitle: "Rata-rata",
+		icon: Clock,
 	},
 ];

+// Chart Data
 const chartData = [
-	{ day: "Sen", total: 100 },
-	{ day: "Sel", total: 120 },
-	{ day: "Rab", total: 90 },
-	{ day: "Kam", total: 150 },
-	{ day: "Jum", total: 110 },
-	{ day: "Sab", total: 80 },
-	{ day: "Min", total: 130 },
+	{ day: "Sen", total: 45 },
+	{ day: "Sel", total: 62 },
+	{ day: "Rab", total: 38 },
+	{ day: "Kam", total: 75 },
+	{ day: "Jum", total: 58 },
+	{ day: "Sab", total: 32 },
+	{ day: "Min", total: 51 },
 ];

+// Top Topics Data
 const topTopics = [
 	{ topic: "Cara mengurus KTP", count: 89 },
 	{ topic: "Syarat Kartu Keluarga", count: 76 },
@@ -126,6 +82,7 @@ const topTopics = [
 	{ topic: "Info program bansos", count: 48 },
 ];

+// Busy Hours Data
 const busyHours = [
 	{ period: "Pagi (08–12)", percentage: 30 },
 	{ period: "Siang (12–16)", percentage: 40 },
@@ -138,146 +95,206 @@ const JennaAnalytic = () => {
 	const dark = colorScheme === "dark";

 	return (
-		<Box className="space-y-6">
-			<Stack gap="xl">
-				{/* KPI Cards */}
-				<Grid gutter="lg">
-					{kpiData.map((kpi) => (
-						<Grid.Col key={kpi.id} span={{ base: 12, md: 6, lg: 3 }}>
-							<Card
-								p="md"
-								radius="md"
-								withBorder
-								bg={dark ? "#141D34" : "white"}
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-							>
-								<Group justify="space-between" align="flex-start" mb="xs">
-									<Text size="sm" fw={500} c="dimmed">
-										{kpi.title}
-									</Text>
-									{React.cloneElement(kpi.icon, {
-										className: "h-6 w-6", // Keeping classes for now, can be replaced by Mantine Icon component if available or styled with sx prop
-										color: "var(--mantine-color-dimmed)", // Set color via prop
-									})}
-								</Group>
-								<Title order={3} fw={700} mt="xs">
-									{kpi.value}
-								</Title>
-								{kpi.delta && (
-									<Text
-										size="xs"
-										c={
-											kpi.deltaType === "positive"
-												? "green"
-												: kpi.deltaType === "negative"
-													? "red"
-													: "dimmed"
-										}
-										mt={4}
-									>
-										{kpi.delta}
-									</Text>
-								)}
-								{kpi.sub && (
-									<Text size="xs" c="dimmed" mt={2}>
-										{kpi.sub}
-									</Text>
-								)}
-							</Card>
-						</Grid.Col>
-					))}
-				</Grid>
-
-				<Card
-					p="md"
-					radius="md"
-					withBorder
-					bg={dark ? "#141D34" : "white"}
-					style={{ borderColor: dark ? "#141D34" : "white" }}
-				>
-					<Title order={3} fw={500} mb="md">
-						Interaksi Chatbot
-					</Title>
-					<BarChart
-						h={300}
-						data={chartData}
-						dataKey="day"
-						series={[{ name: "total", color: "blue" }]}
-						withLegend
-					/>
-				</Card>
-
-				{/* Charts and Lists Section */}
-				<Grid gutter="lg">
-					{/* Grafik Interaksi Chatbot (now Bar Chart) */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
+		<Stack gap="lg">
+			{/* TOP SECTION - 4 STAT CARDS */}
+			<Grid gutter="md">
+				{kpiData.map((item) => (
+					<Grid.Col key={item.id} span={{ base: 12, sm: 6, lg: 3 }}>
 						<Card
 							p="md"
-							radius="md"
+							radius="xl"
 							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
+							bg={dark ? "#1E293B" : "white"}
+							style={{
+								borderColor: dark ? "#334155" : "white",
+								boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+								transition: "transform 0.15s ease, box-shadow 0.15s ease",
+							}}
 							h="100%"
 						>
-							<Title order={3} fw={500} mb="md">
-								Jam Tersibuk
-							</Title>
-							<Stack gap="sm">
-								{busyHours.map((item, index) => (
-									<Box key={index}>
-										<Text size="sm">{item.period}</Text>
-										<Group align="center">
-											<Progress value={item.percentage} flex={1} />
-											<Text size="sm" fw={500}>
-												{item.percentage}%
-											</Text>
-										</Group>
-									</Box>
-								))}
-							</Stack>
+							<Group justify="space-between" align="flex-start" w="100%">
+								<Stack gap={2}>
+									<Text size="sm" c="dimmed">
+										{item.title}
+									</Text>
+									<Text size="xl" fw={700} c={dark ? "white" : "gray.9"}>
+										{item.value}
+									</Text>
+									<Group gap={4} align="flex-start">
+										{item.trend === "positive" && (
+											<TrendingUp size={14} color="#22C55E" />
+										)}
+										<Text
+											size="xs"
+											c={
+												item.trend === "positive"
+													? "green"
+													: dark
+														? "gray.4"
+														: "gray.5"
+											}
+										>
+											{item.subtitle}
+										</Text>
+									</Group>
+								</Stack>
+								<ThemeIcon
+									color="#1E3A5F"
+									variant="filled"
+									size="lg"
+									radius="xl"
+								>
+									<item.icon style={{ width: "60%", height: "60%" }} />
+								</ThemeIcon>
+							</Group>
 						</Card>
 					</Grid.Col>
+				))}
+			</Grid>

-					{/* Topik Pertanyaan Terbanyak & Jam Tersibuk */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
-						<Stack gap="lg">
-							{/* Topik Pertanyaan Terbanyak */}
-							<Card
-								p="md"
-								radius="md"
-								withBorder
-								bg={dark ? "#141D34" : "white"}
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-								h="100%"
-							>
-								<Title order={3} fw={500} mb="md">
-									Topik Pertanyaan Terbanyak
-								</Title>
-								<Stack gap="xs">
-									{topTopics.map((item, index) => (
-										<Group
-											key={index}
-											justify="space-between"
-											align="center"
-											p="xs"
+			{/* MAIN CHART - INTERAKSI CHATBOT */}
+			<Card
+				p="md"
+				radius="xl"
+				withBorder
+				bg={dark ? "#1E293B" : "white"}
+				style={{
+					borderColor: dark ? "#334155" : "white",
+					boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				}}
+			>
+				<Group justify="space-between" mb="md">
+					<Title order={4} c={dark ? "white" : "gray.9"}>
+						Interaksi Chatbot
+					</Title>
+				</Group>
+				<ResponsiveContainer width="100%" height={300}>
+					<BarChart data={chartData}>
+						<CartesianGrid
+							strokeDasharray="3 3"
+							vertical={false}
+							stroke={dark ? "#334155" : "#e5e7eb"}
+						/>
+						<XAxis
+							dataKey="day"
+							axisLine={false}
+							tickLine={false}
+							tick={{ fill: dark ? "#E2E8F0" : "#374151" }}
+						/>
+						<YAxis
+							axisLine={false}
+							tickLine={false}
+							tick={{ fill: dark ? "#E2E8F0" : "#374151" }}
+						/>
+						<Tooltip
+							contentStyle={{
+								backgroundColor: dark ? "#1E293B" : "white",
+								borderColor: dark ? "#334155" : "#e5e7eb",
+								borderRadius: "8px",
+							}}
+							labelStyle={{ color: dark ? "#E2E8F0" : "#374151" }}
+							cursor={{ fill: dark ? "#334155" : "#f3f4f6" }}
+						/>
+						<Bar
+							dataKey="total"
+							fill="#396aaaff"
+							radius={[8, 8, 0, 0]}
+							maxBarSize={60}
+						/>
+					</BarChart>
+				</ResponsiveContainer>
+			</Card>
+
+			{/* BOTTOM SECTION - 2 COLUMNS */}
+			<Grid gutter="lg">
+				{/* LEFT: TOPIK PERTANYAAN TERBANYAK */}
+				<Grid.Col span={{ base: 12, lg: 6 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Title order={4} c={dark ? "white" : "gray.9"} mb="md">
+							Topik Pertanyaan Terbanyak
+						</Title>
+						<Stack gap="xs">
+							{topTopics.map((item, index) => (
+								<Box
+									key={index}
+									p="sm"
+									bg={dark ? "#334155" : "#F1F5F9"}
+									style={{
+										transition: "background-color 0.15s ease",
+										cursor: "pointer",
+									}}
+								>
+									<Group justify="space-between">
+										<Text size="sm" fw={500} c={dark ? "white" : "gray.9"}>
+											{item.topic}
+										</Text>
+										<Badge
+											variant="light"
+											color="darmasaba-blue"
+											radius="sm"
+											fw={600}
 										>
-											<Text size="sm" fw={500}>
-												{item.topic}
-											</Text>
-											<Badge variant="light" color="gray">
-												{item.count}x
-											</Badge>
-										</Group>
-									))}
-								</Stack>
-							</Card>
-
-							{/* Jam Tersibuk */}
+											{item.count}x
+										</Badge>
+									</Group>
+								</Box>
+							))}
 						</Stack>
-					</Grid.Col>
-				</Grid>
-			</Stack>
-		</Box>
+					</Card>
+				</Grid.Col>
+
+				{/* RIGHT: JAM TERSIBUK */}
+				<Grid.Col span={{ base: 12, lg: 6 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Title order={4} c={dark ? "white" : "gray.9"} mb="md">
+							Jam Tersibuk
+						</Title>
+						<Stack gap="md">
+							{busyHours.map((item, index) => (
+								<Box key={index}>
+									<Group justify="space-between" mb={5}>
+										<Text size="sm" fw={500} c={dark ? "white" : "gray.9"}>
+											{item.period}
+										</Text>
+										<Text size="sm" fw={600} c={dark ? "white" : "gray.9"}>
+											{item.percentage}%
+										</Text>
+									</Group>
+									<Progress
+										value={item.percentage}
+										size="lg"
+										radius="xl"
+										color="#1E3A5F"
+										animated
+									/>
+								</Box>
+							))}
+						</Stack>
+					</Card>
+				</Grid.Col>
+			</Grid>
+		</Stack>
 	);
 };
-export default JennaAnalytic;
+
+export default JennaAnalytic;
--- a/src/components/keamanan-page.tsx
+++ b/src/components/keamanan-page.tsx
@@ -5,22 +5,18 @@ import {
 	Grid,
 	GridCol,
 	Group,
-	List,
 	Stack,
 	Text,
 	ThemeIcon,
 	Title,
-	useMantineColorScheme,
+	useMantineColorScheme
 } from "@mantine/core";
 import {
 	IconAlertTriangle,
 	IconCamera,
 	IconClock,
-	IconEye,
-	IconMapPin,
-	IconShieldLock,
+	IconMapPin
 } from "@tabler/icons-react";
-import { useState } from "react";

 const KeamananPage = () => {
 	const { colorScheme } = useMantineColorScheme();
@@ -118,138 +114,144 @@ const KeamananPage = () => {

 	return (
 		<Stack gap="lg">
-			{/* Page Header */}
-			<Group justify="space-between" align="center">
-				<Title order={2} c={dark ? "dark.0" : "black"}>
-					Keamanan Lingkungan Desa
-				</Title>
-			</Group>
-
-			{/* KPI Cards */}
 			<Grid gutter="md">
-				{kpiData.map((kpi, index) => (
-					<GridCol key={index} span={{ base: 12, sm: 6, md: 6 }}>
+				{/* Peta Keamanan CCTV */}
+				<GridCol span={{ base: 12, lg: 6 }}>
+					<Stack gap={"xs"}>
+						{/* KPI Cards */}
+						<Grid gutter="md">
+							{kpiData.map((kpi, index) => (
+								<GridCol key={index} span={{ base: 12, sm: 6, md: 6 }}>
+									<Card
+										p="md"
+										radius="md"
+										withBorder
+										bg={dark ? "#1E293B" : "white"}
+										style={{
+											borderColor: dark ? "#334155" : "white",
+											boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+											transition: "transform 0.15s ease, box-shadow 0.15s ease",
+										}}
+										h="100%"
+									>
+										<Group justify="space-between" align="center">
+											<Stack gap={0}>
+												<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
+													{kpi.subtitle}
+												</Text>
+												<Group gap="xs" align="center">
+													<Text
+														size="xl"
+														fw={700}
+														c={dark ? "dark.0" : "black"}
+													>
+														{kpi.value}
+													</Text>
+													<Text size="sm" c={dark ? "white" : "dimmed"}>
+														{kpi.title}
+													</Text>
+												</Group>
+											</Stack>
+											<ThemeIcon
+												variant="light"
+												color={kpi.color}
+												size="xl"
+												radius="xl"
+											>
+												{kpi.icon}
+											</ThemeIcon>
+										</Group>
+									</Card>
+								</GridCol>
+							))}
+						</Grid>
 						<Card
 							p="md"
 							radius="md"
 							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
+							bg={dark ? "#1E293B" : "white"}
+							style={{
+								borderColor: dark ? "#334155" : "white",
+								boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+								transition: "transform 0.15s ease, box-shadow 0.15s ease",
+							}}
 							h="100%"
 						>
-							<Group justify="space-between" align="center">
-								<Stack gap={0}>
-									<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-										{kpi.subtitle}
-									</Text>
-									<Group gap="xs" align="center">
-										<Text size="xl" fw={700} c={dark ? "dark.0" : "black"}>
-											{kpi.value}
-										</Text>
-										<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-											{kpi.title}
-										</Text>
-									</Group>
-								</Stack>
-								<ThemeIcon
-									variant="light"
-									color={kpi.color}
-									size="xl"
-									radius="xl"
-								>
-									{kpi.icon}
-								</ThemeIcon>
-							</Group>
-						</Card>
-					</GridCol>
-				))}
-			</Grid>
-
-			<Grid gutter="md">
-				{/* Peta Keamanan CCTV */}
-				<GridCol span={{ base: 12, lg: 6 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-						h="100%"
-					>
-						<Title order={3} mb="md" c={dark ? "dark.0" : "black"}>
-							Peta Keamanan CCTV
-						</Title>
-						<Text size="sm" c={dark ? "dark.3" : "dimmed"} mb="md">
-							Titik Lokasi CCTV
-						</Text>
-
-						{/* Placeholder for map */}
-						<Box
-							style={{
-								backgroundColor: dark ? "#2d3748" : "#e2e8f0",
-								borderRadius: "8px",
-								height: "400px",
-								display: "flex",
-								alignItems: "center",
-								justifyContent: "center",
-							}}
-						>
-							<Stack align="center">
-								<IconMapPin
-									size={48}
-									stroke={1.5}
-									color={dark ? "#94a3b8" : "#64748b"}
-								/>
-								<Text c={dark ? "dark.3" : "dimmed"}>Peta Lokasi CCTV</Text>
-								<Text size="sm" c={dark ? "dark.3" : "dimmed"} ta="center">
-									Integrasi dengan Google Maps atau Mapbox akan ditampilkan di
-									sini
-								</Text>
-							</Stack>
-						</Box>
-
-						{/* CCTV Locations List */}
-						<Stack mt="md" gap="sm">
-							<Title order={4} c={dark ? "dark.0" : "black"}>
-								Daftar CCTV
+							<Title order={3} mb="md" c={dark ? "dark.0" : "black"}>
+								Peta Keamanan CCTV
 							</Title>
-							{cctvLocations.map((cctv, index) => (
-								<Card
-									key={index}
-									p="md"
-									radius="md"
-									withBorder
-									bg={dark ? "#263852ff" : "#F1F5F9"}
-									style={{ borderColor: dark ? "#263852ff" : "#F1F5F9" }}
-								>
-									<Group justify="space-between">
-										<Stack gap={0}>
-											<Group gap="xs">
-												<Text fw={500} c={dark ? "dark.0" : "black"}>
-													{cctv.id}
+							<Text size="sm" c={dark ? "white" : "dimmed"} mb="md">
+								Titik Lokasi CCTV
+							</Text>
+
+							{/* Placeholder for map */}
+							<Box
+								style={{
+									backgroundColor: dark ? "#2d3748" : "#e2e8f0",
+									borderRadius: "8px",
+									height: "400px",
+									display: "flex",
+									alignItems: "center",
+									justifyContent: "center",
+								}}
+							>
+								<Stack align="center">
+									<IconMapPin
+										size={48}
+										stroke={1.5}
+										color={dark ? "#94a3b8" : "#64748b"}
+									/>
+									<Text c={dark ? "dark.3" : "dimmed"}>Peta Lokasi CCTV</Text>
+									<Text size="sm" c={dark ? "dark.3" : "dimmed"} ta="center">
+										Integrasi dengan Google Maps atau Mapbox akan ditampilkan di
+										sini
+									</Text>
+								</Stack>
+							</Box>
+
+							{/* CCTV Locations List */}
+							<Stack mt="md" gap="sm">
+								<Title order={4} c={dark ? "dark.0" : "black"}>
+									Daftar CCTV
+								</Title>
+								{cctvLocations.map((cctv, index) => (
+									<Card
+										key={index}
+										p="md"
+										radius="md"
+										withBorder
+										bg={dark ? "#263852ff" : "#F1F5F9"}
+										style={{ borderColor: dark ? "#263852ff" : "#F1F5F9" }}
+									>
+										<Group justify="space-between">
+											<Stack gap={0}>
+												<Group gap="xs">
+													<Text fw={500} c={dark ? "dark.0" : "black"}>
+														{cctv.id}
+													</Text>
+													<Badge
+														variant="dot"
+														color={cctv.status === "active" ? "green" : "gray"}
+													>
+														{cctv.status === "active" ? "Online" : "Offline"}
+													</Badge>
+												</Group>
+												<Text size="sm" c={dark ? "white" : "dimmed"}>
+													{cctv.location}
+												</Text>
+											</Stack>
+											<Group gap="xs">
+												<IconClock size={16} stroke={1.5} />
+												<Text size="sm" c={dark ? "white" : "dimmed"}>
+													{cctv.lastSeen}
 												</Text>
-												<Badge
-													variant="dot"
-													color={cctv.status === "active" ? "green" : "gray"}
-												>
-													{cctv.status === "active" ? "Online" : "Offline"}
-												</Badge>
 											</Group>
-											<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-												{cctv.location}
-											</Text>
-										</Stack>
-										<Group gap="xs">
-											<IconClock size={16} stroke={1.5} />
-											<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-												{cctv.lastSeen}
-											</Text>
 										</Group>
-									</Group>
-								</Card>
-							))}
-						</Stack>
-					</Card>
+									</Card>
+								))}
+							</Stack>
+						</Card>
+					</Stack>
 				</GridCol>

 				{/* Daftar Laporan Keamanan */}
@@ -258,14 +260,14 @@ const KeamananPage = () => {
 						p="md"
 						radius="md"
 						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+							transition: "transform 0.15s ease, box-shadow 0.15s ease",
+						}}
 						h="100%"
 					>
-						<Title order={3} mb="md" c={dark ? "dark.0" : "black"}>
-							Laporan Keamanan Lingkungan
-						</Title>
-
 						<Stack gap="sm">
 							{securityReports.map((report, index) => (
 								<Card
@@ -297,19 +299,19 @@ const KeamananPage = () => {
 									<Group justify="space-between">
 										<Group gap="xs">
 											<IconMapPin size={16} stroke={1.5} />
-											<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
+											<Text size="sm" c={dark ? "white" : "dimmed"}>
 												{report.location}
 											</Text>
 										</Group>
 										<Group gap="xs">
 											<IconClock size={16} stroke={1.5} />
-											<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
+											<Text size="sm" c={dark ? "white" : "dimmed"}>
 												{report.reportedAt}
 											</Text>
 										</Group>
 									</Group>

-									<Text size="sm" c={dark ? "dark.3" : "dimmed"} mt="sm">
+									<Text size="sm" c={dark ? "white" : "dimmed"} mt="sm">
 										{report.date}
 									</Text>
 								</Card>
@@ -322,4 +324,4 @@ const KeamananPage = () => {
 	);
 };

-export default KeamananPage;
+export default KeamananPage;
--- a/src/components/keuangan-anggaran.tsx
+++ b/src/components/keuangan-anggaran.tsx
@@ -1,73 +1,70 @@
-import { BarChart } from "@mantine/charts";
 import {
 	Badge,
 	Box,
-	Button,
 	Card,
 	Grid,
+	GridCol,
 	Group,
-	Progress,
 	Stack,
 	Text,
+	ThemeIcon,
 	Title,
 	useMantineColorScheme,
 } from "@mantine/core";
 import {
-	IconCurrency,
-	IconTrendingDown,
-	IconTrendingUp,
-} from "@tabler/icons-react";
-import React from "react";
+	CheckCircle,
+	Coins,
+	PieChart as PieChartIcon,
+	Receipt,
+	TrendingDown,
+	TrendingUp,
+} from "lucide-react";
+import {
+	Bar,
+	BarChart,
+	CartesianGrid,
+	Line,
+	LineChart,
+	ResponsiveContainer,
+	Tooltip,
+	XAxis,
+	YAxis,
+} from "recharts";

-// Sample Data
+// KPI Data
 const kpiData = [
 	{
 		id: 1,
 		title: "Total APBDes",
 		value: "Rp 5.2M",
-		sub: "Tahun 2025",
-		icon: <IconCurrency className="h-6 w-6 text-muted-foreground" />,
+		subtitle: "Tahun 2025",
+		icon: Coins,
 	},
 	{
 		id: 2,
 		title: "Realisasi",
 		value: "68%",
-		sub: "Rp 3.5M dari 5.2M",
-		icon: (
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				strokeWidth={1.5}
-				stroke="currentColor"
-				className="h-6 w-6 text-muted-foreground"
-			>
-				<path
-					strokeLinecap="round"
-					strokeLinejoin="round"
-					d="M9 12.75 11.25 15 15 9.75M21 12c0 1.268-.63 2.473-1.688 3.342-.48.485-.926.97-1.378 1.44c-1.472 1.58-2.306 2.787-2.91 3.514-.15.18-.207.33-.207.33A.75.75 0 0 1 15 21h-3c-1.104 0-2.08-.542-2.657-1.455-.139-.201-.264-.406-.38-.614l-.014-.025C8.85 18.067 8.156 17.2 7.5 16.325.728 12.56.728 7.44 7.5 3.675c3.04-.482 5.584.47 7.042 1.956.674.672 1.228 1.462 1.696 2.307.426.786.793 1.582 1.113 2.392h.001Z"
-				/>
-			</svg>
-		),
+		subtitle: "Rp 3.5M dari 5.2M",
+		icon: CheckCircle,
 	},
 	{
 		id: 3,
 		title: "Pemasukan",
 		value: "Rp 580jt",
-		sub: "Bulan ini",
-		delta: "+8%",
-		deltaType: "positive",
-		icon: <IconTrendingUp className="h-6 w-6 text-muted-foreground" />,
+		subtitle: "Bulan ini",
+		trend: "+8%",
+		icon: TrendingUp,
 	},
 	{
 		id: 4,
 		title: "Pengeluaran",
 		value: "Rp 520jt",
-		sub: "Bulan ini",
-		icon: <IconTrendingDown className="h-6 w-6 text-muted-foreground" />,
+		subtitle: "Bulan ini",
+		icon: TrendingDown,
 	},
 ];

+// Income & Expense Data
 const incomeExpenseData = [
 	{ month: "Apr", income: 450, expense: 380 },
 	{ month: "Mei", income: 520, expense: 420 },
@@ -78,6 +75,7 @@ const incomeExpenseData = [
 	{ month: "Okt", income: 580, expense: 520 },
 ];

+// Sector Allocation Data
 const allocationData = [
 	{ sector: "Pembangunan", amount: 1200 },
 	{ sector: "Kesehatan", amount: 800 },
@@ -87,13 +85,7 @@ const allocationData = [
 	{ sector: "Teknologi", amount: 300 },
 ];

-const assistanceFundData = [
-	{ source: "Dana Desa (DD)", amount: 1800, status: "cair" },
-	{ source: "Alokasi Dana Desa (ADD)", amount: 950, status: "cair" },
-	{ source: "Bagi Hasil Pajak", amount: 450, status: "cair" },
-	{ source: "Hibah Provinsi", amount: 300, status: "proses" },
-];
-
+// APBDes Report Data
 const apbdReport = {
 	income: [
 		{ category: "Dana Desa", amount: 1800 },
@@ -113,245 +105,411 @@ const apbdReport = {
 	totalExpenses: 2155,
 };

+// Aid & Grants Data
+const assistanceFundData = [
+	{ source: "Dana Desa (DD)", amount: 1800, status: "cair" },
+	{ source: "Alokasi Dana Desa (ADD)", amount: 950, status: "cair" },
+	{ source: "Bagi Hasil Pajak", amount: 450, status: "cair" },
+	{ source: "Hibah Provinsi", amount: 300, status: "proses" },
+];
+
 const KeuanganAnggaran = () => {
 	const { colorScheme } = useMantineColorScheme();
 	const dark = colorScheme === "dark";
-	return (
-		<Box>
-			<Stack gap="xl">
-				{/* KPI Cards */}
-				<Grid gutter="lg">
-					{kpiData.map((kpi) => (
-						<Grid.Col key={kpi.id} span={{ base: 12, md: 6, lg: 3 }}>
-							<Card
-								p="md"
-								radius="md"
-								withBorder
-								bg={dark ? "#141D34" : "white"}
-								style={{ borderColor: dark ? "#141D34" : "white" }}
-								h="100%"
-							>
-								<Group justify="space-between" align="flex-start" mb="xs">
-									<Text size="sm" fw={500} c="dimmed">
-										{kpi.title}
-									</Text>
-									{React.cloneElement(kpi.icon, {
-										className: "h-6 w-6",
-										color: "var(--mantine-color-dimmed)",
-									})}
-								</Group>
-								<Title order={3} fw={700} mt="xs">
-									{kpi.value}
-								</Title>
-								{kpi.delta && (
-									<Text
-										size="xs"
-										c={
-											kpi.deltaType === "positive"
-												? "green"
-												: kpi.deltaType === "negative"
-													? "red"
-													: "dimmed"
-										}
-										mt={4}
-									>
-										{kpi.delta}
-									</Text>
-								)}
-								{kpi.sub && (
-									<Text size="xs" c="dimmed" mt="auto">
-										{kpi.sub}
-									</Text>
-								)}
-							</Card>
-						</Grid.Col>
-					))}
-				</Grid>

-				{/* Charts Section */}
-				<Grid gutter="lg">
-					{/* Grafik Pemasukan vs Pengeluaran */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
+	return (
+		<Stack gap="lg">
+			{/* TOP SECTION - 4 STAT CARDS */}
+			<Grid gutter="md">
+				{kpiData.map((item) => (
+					<Grid.Col key={item.id} span={{ base: 12, sm: 6, lg: 3 }}>
 						<Card
 							p="md"
-							radius="md"
+							radius="xl"
 							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
+							bg={dark ? "#1E293B" : "white"}
+							style={{
+								borderColor: dark ? "#334155" : "white",
+								boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+								transition: "transform 0.15s ease, box-shadow 0.15s ease",
+							}}
+							h="100%"
 						>
-							<Title order={3} fw={500} mb="md">
-								Pemasukan vs Pengeluaran
-							</Title>
-							<BarChart
-								h={300}
-								data={incomeExpenseData}
-								dataKey="month"
-								series={[
-									{ name: "income", color: "green", label: "Pemasukan" },
-									{ name: "expense", color: "red", label: "Pengeluaran" },
-								]}
-								withLegend
-							/>
+							<Group justify="space-between" align="flex-start" w="100%">
+								<Stack gap={2}>
+									<Text size="sm" c="dimmed">
+										{item.title}
+									</Text>
+									<Text size="xl" fw={700} c={dark ? "white" : "gray.9"}>
+										{item.value}
+									</Text>
+									<Group gap={4} align="flex-start">
+										{item.trend && <TrendingUp size={14} color="#22C55E" />}
+										<Text
+											size="xs"
+											c={item.trend ? "green" : dark ? "gray.4" : "gray.5"}
+										>
+											{item.subtitle}
+										</Text>
+									</Group>
+								</Stack>
+								<ThemeIcon
+									color="#1E3A5F"
+									variant="filled"
+									size="lg"
+									radius="xl"
+								>
+									<item.icon style={{ width: "60%", height: "60%" }} />
+								</ThemeIcon>
+							</Group>
 						</Card>
 					</Grid.Col>
+				))}
+			</Grid>

-					{/* Alokasi Anggaran Per Sektor */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
-						<Card
-							p="md"
-							radius="md"
-							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
-						>
-							<Title order={3} fw={500} mb="md">
+			{/* MAIN CHART SECTION */}
+			<Grid gutter="lg">
+				{/* LEFT: PEMASUKAN DAN PENGELUARAN (70%) */}
+				<Grid.Col span={{ base: 12, lg: 8 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<PieChartIcon size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
+								Pemasukan dan Pengeluaran
+							</Title>
+						</Group>
+						<ResponsiveContainer width="100%" height={300}>
+							<LineChart data={incomeExpenseData}>
+								<CartesianGrid
+									strokeDasharray="3 3"
+									vertical={false}
+									stroke={dark ? "#334155" : "#e5e7eb"}
+								/>
+								<XAxis
+									dataKey="month"
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 12,
+									}}
+								/>
+								<YAxis
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 12,
+									}}
+									tickFormatter={(value) => `Rp ${value}jt`}
+								/>
+								<Tooltip
+									contentStyle={{
+										backgroundColor: dark ? "#1E293B" : "white",
+										borderColor: dark ? "#334155" : "#e5e7eb",
+										borderRadius: "8px",
+									}}
+									labelStyle={{ color: dark ? "#E2E8F0" : "#374151" }}
+									formatter={(value: number | undefined) => [
+										`Rp ${value}jt`,
+										"",
+									]}
+								/>
+								<Line
+									type="monotone"
+									dataKey="income"
+									stroke="#22C55E"
+									strokeWidth={2}
+									dot={{ fill: "#22C55E", strokeWidth: 2, r: 4 }}
+									activeDot={{ r: 6 }}
+									name="Pemasukan"
+								/>
+								<Line
+									type="monotone"
+									dataKey="expense"
+									stroke="#EF4444"
+									strokeWidth={2}
+									dot={{ fill: "#EF4444", strokeWidth: 2, r: 4 }}
+									activeDot={{ r: 6 }}
+									name="Pengeluaran"
+								/>
+							</LineChart>
+						</ResponsiveContainer>
+					</Card>
+				</Grid.Col>
+
+				{/* RIGHT: ALOKASI ANGGARAN PER SEKTOR (30%) */}
+				<Grid.Col span={{ base: 12, lg: 4 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<PieChartIcon size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
 								Alokasi Anggaran Per Sektor
 							</Title>
-							<BarChart
-								h={300}
-								data={allocationData}
-								dataKey="sector"
-								series={[
-									{ name: "amount", color: "darmasaba-navy", label: "Jumlah" },
-								]}
-								withLegend
-								orientation="horizontal"
-							/>
-						</Card>
-					</Grid.Col>
-				</Grid>
+						</Group>
+						<ResponsiveContainer width="100%" height={300}>
+							<BarChart data={allocationData} layout="vertical">
+								<CartesianGrid
+									strokeDasharray="3 3"
+									horizontal={false}
+									stroke={dark ? "#334155" : "#e5e7eb"}
+								/>
+								<XAxis
+									type="number"
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 12,
+									}}
+									tickFormatter={(value) => `${value}`}
+								/>
+								<YAxis
+									type="category"
+									dataKey="sector"
+									axisLine={false}
+									tickLine={false}
+									tick={{
+										fill: dark ? "#E2E8F0" : "#374151",
+										fontSize: 11,
+									}}
+									width={100}
+								/>
+								<Tooltip
+									contentStyle={{
+										backgroundColor: dark ? "#1E293B" : "white",
+										borderColor: dark ? "#334155" : "#e5e7eb",
+										borderRadius: "8px",
+									}}
+									formatter={(value: number | undefined) => [
+										`Rp ${value}jt`,
+										"Jumlah",
+									]}
+								/>
+								<Bar
+									dataKey="amount"
+									fill="#396aaaff"
+									radius={[0, 8, 8, 0]}
+									maxBarSize={30}
+								/>
+							</BarChart>
+						</ResponsiveContainer>
+					</Card>
+				</Grid.Col>
+			</Grid>

-				<Grid gutter="lg">
-					{/* Dana Bantuan & Hibah */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
-						<Card
-							p="md"
-							radius="md"
-							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
-						>
-							<Title order={3} fw={500} mb="md">
-								Dana Bantuan & Hibah
+			{/* BOTTOM SECTION */}
+			<Grid gutter="lg">
+				{/* LEFT: LAPORAN APBDES */}
+				<Grid.Col span={{ base: 12, lg: 6 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<Receipt size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
+								Laporan APBDes
 							</Title>
-							<Stack gap="sm">
-								{assistanceFundData.map((fund, index) => (
-									<Group
-										key={index}
-										justify="space-between"
-										align="center"
-										p="sm"
-										style={{
-											border: "1px solid var(--mantine-color-gray-3)",
-											borderRadius: "var(--mantine-radius-sm)",
-										}}
-									>
+						</Group>
+
+						<Grid gutter="md">
+							{/* Pendapatan */}
+							<Grid.Col span={6}>
+								<Card p="sm" radius="lg" bg={dark ? "#064E3B" : "#DCFCE7"}>
+									<Title order={5} c="#22C55E" mb="sm">
+										Pendapatan
+									</Title>
+									<Stack gap="xs">
+										{apbdReport.income.map((item, index) => (
+											<Group key={index} justify="space-between">
+												<Text size="sm" c={dark ? "gray.3" : "gray.7"}>
+													{item.category}
+												</Text>
+												<Text size="sm" fw={600} c="#22C55E">
+													Rp {item.amount.toLocaleString()}jt
+												</Text>
+											</Group>
+										))}
+										<Group
+											justify="space-between"
+											mt="sm"
+											pt="sm"
+											style={{
+												borderTop: `1px solid ${dark ? "#065F46" : "#86EFAC"}`,
+											}}
+										>
+											<Text fw={700} c="#22C55E">
+												Total:
+											</Text>
+											<Text fw={700} c="#22C55E">
+												Rp {apbdReport.totalIncome.toLocaleString()}jt
+											</Text>
+										</Group>
+									</Stack>
+								</Card>
+							</Grid.Col>
+
+							{/* Belanja */}
+							<Grid.Col span={6}>
+								<Card p="sm" radius="lg" bg={dark ? "#7F1D1D" : "#FEE2E2"}>
+									<Title order={5} c="#EF4444" mb="sm">
+										Belanja
+									</Title>
+									<Stack gap="xs">
+										{apbdReport.expenses.map((item, index) => (
+											<Group key={index} justify="space-between">
+												<Text size="sm" c={dark ? "gray.3" : "gray.7"}>
+													{item.category}
+												</Text>
+												<Text size="sm" fw={600} c="#EF4444">
+													Rp {item.amount.toLocaleString()}jt
+												</Text>
+											</Group>
+										))}
+										<Group
+											justify="space-between"
+											mt="sm"
+											pt="sm"
+											style={{
+												borderTop: `1px solid ${dark ? "#991B1B" : "#FCA5A5"}`,
+											}}
+										>
+											<Text fw={700} c="#EF4444">
+												Total:
+											</Text>
+											<Text fw={700} c="#EF4444">
+												Rp {apbdReport.totalExpenses.toLocaleString()}jt
+											</Text>
+										</Group>
+									</Stack>
+								</Card>
+							</Grid.Col>
+						</Grid>
+
+						{/* Saldo */}
+						<Group
+							justify="space-between"
+							mt="md"
+							pt="md"
+							style={{
+								borderTop: `1px solid ${dark ? "#334155" : "#e5e7eb"}`,
+							}}
+						>
+							<Text fw={700} c={dark ? "white" : "gray.9"}>
+								Saldo:
+							</Text>
+							<Text
+								fw={700}
+								size="lg"
+								c={
+									apbdReport.totalIncome > apbdReport.totalExpenses
+										? "#22C55E"
+										: "#EF4444"
+								}
+							>
+								Rp{" "}
+								{(
+									apbdReport.totalIncome - apbdReport.totalExpenses
+								).toLocaleString()}
+								jt
+							</Text>
+						</Group>
+					</Card>
+				</Grid.Col>
+
+				{/* RIGHT: DANA BANTUAN DAN HIBAH */}
+				<Grid.Col span={{ base: 12, lg: 6 }}>
+					<Card
+						p="md"
+						radius="xl"
+						withBorder
+						bg={dark ? "#1E293B" : "white"}
+						style={{
+							borderColor: dark ? "#334155" : "white",
+							boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+						}}
+						h="100%"
+					>
+						<Group gap="xs" mb="md">
+							<ThemeIcon color="#1E3A5F" variant="filled" size="sm" radius="sm">
+								<Coins size={14} />
+							</ThemeIcon>
+							<Title order={4} c={dark ? "white" : "gray.9"}>
+								Dana Bantuan dan Hibah
+							</Title>
+						</Group>
+						<Stack gap="sm">
+							{assistanceFundData.map((fund, index) => (
+								<Card
+									key={index}
+									p="sm"
+									radius="lg"
+									bg={dark ? "#334155" : "#F1F5F9"}
+									style={{
+										borderColor: "transparent",
+										transition: "background-color 0.15s ease",
+									}}
+								>
+									<Group justify="space-between" align="center">
 										<Box>
-											<Text size="sm" fw={500}>
+											<Text size="sm" fw={600} c={dark ? "white" : "gray.9"}>
 												{fund.source}
 											</Text>
-											<Text size="sm" c="dimmed">
+											<Text size="xs" c="dimmed">
 												Rp {fund.amount.toLocaleString()}jt
 											</Text>
 										</Box>
 										<Badge
 											variant="light"
 											color={fund.status === "cair" ? "green" : "yellow"}
+											radius="sm"
+											fw={600}
 										>
-											{fund.status}
+											{fund.status === "cair" ? "Cair" : "Proses"}
 										</Badge>
 									</Group>
-								))}
-							</Stack>
-						</Card>
-					</Grid.Col>
-
-					{/* Laporan APBDes */}
-					<Grid.Col span={{ base: 12, lg: 6 }}>
-						<Card
-							p="md"
-							radius="md"
-							withBorder
-							bg={dark ? "#141D34" : "white"}
-							style={{ borderColor: dark ? "#141D34" : "white" }}
-						>
-							<Title order={3} fw={500} mb="md">
-								Laporan APBDes
-							</Title>
-
-							<Box mb="md">
-								<Title order={4} mb="sm">
-									Pendapatan
-								</Title>
-								<Stack gap="xs">
-									{apbdReport.income.map((item, index) => (
-										<Group key={index} justify="space-between">
-											<Text size="sm">{item.category}</Text>
-											<Text size="sm" c="green">
-												Rp {item.amount.toLocaleString()}jt
-											</Text>
-										</Group>
-									))}
-									<Group justify="space-between" mt="sm">
-										<Text fw={700}>Total Pendapatan:</Text>
-										<Text fw={700} c="green">
-											Rp {apbdReport.totalIncome.toLocaleString()}jt
-										</Text>
-									</Group>
-								</Stack>
-							</Box>
-
-							<Box>
-								<Title order={4} mb="sm">
-									Belanja
-								</Title>
-								<Stack gap="xs">
-									{apbdReport.expenses.map((item, index) => (
-										<Group key={index} justify="space-between">
-											<Text size="sm">{item.category}</Text>
-											<Text size="sm" c="red">
-												Rp {item.amount.toLocaleString()}jt
-											</Text>
-										</Group>
-									))}
-									<Group justify="space-between" mt="sm">
-										<Text fw={700}>Total Belanja:</Text>
-										<Text fw={700} c="red">
-											Rp {apbdReport.totalExpenses.toLocaleString()}jt
-										</Text>
-									</Group>
-								</Stack>
-							</Box>
-
-							<Box
-								mt="md"
-								pt="md"
-								style={{ borderTop: "1px solid var(--mantine-color-gray-3)" }}
-							>
-								<Group justify="space-between">
-									<Text fw={700}>Saldo:</Text>
-									<Text
-										fw={700}
-										c={
-											apbdReport.totalIncome > apbdReport.totalExpenses
-												? "green"
-												: "red"
-										}
-									>
-										Rp{" "}
-										{(
-											apbdReport.totalIncome - apbdReport.totalExpenses
-										).toLocaleString()}
-										jt
-									</Text>
-								</Group>
-							</Box>
-						</Card>
-					</Grid.Col>
-				</Grid>
-			</Stack>
-		</Box>
+								</Card>
+							))}
+						</Stack>
+					</Card>
+				</Grid.Col>
+			</Grid>
+		</Stack>
 	);
 };

-export default KeuanganAnggaran;
+export default KeuanganAnggaran;
--- a/src/components/kinerja-divisi.tsx
+++ b/src/components/kinerja-divisi.tsx
@@ -1,13 +1,11 @@
 import { Grid, Stack } from "@mantine/core";
-import {
-	ActivityCard,
-	ArchiveCard,
-	DiscussionPanel,
-	DivisionList,
-	DocumentChart,
-	EventCard,
-	ProgressChart,
-} from ".";
+import { ActivityCard } from "./kinerja-divisi/activity-card";
+import { ArchiveCard } from "./kinerja-divisi/archive-card";
+import { DiscussionPanel } from "./kinerja-divisi/discussion-panel";
+import { DivisionList } from "./kinerja-divisi/division-list";
+import { DocumentChart } from "./kinerja-divisi/document-chart";
+import { EventCard } from "./kinerja-divisi/event-card";
+import { ProgressChart } from "./kinerja-divisi/progress-chart";

 // Data for program kegiatan (Section 1)
 const programKegiatanData = [
@@ -15,25 +13,25 @@ const programKegiatanData = [
 		title: "Rakor 2025",
 		date: "3 Juli 2025",
 		progress: 90,
-		status: "selesai" as const,
+		status: "Selesai" as const,
 	},
 	{
 		title: "Pemutakhiran Indeks Desa",
 		date: "3 Juli 2025",
 		progress: 85,
-		status: "selesai" as const,
+		status: "Selesai" as const,
 	},
 	{
 		title: "Mengurus Akta Cerai Warga",
 		date: "3 Juli 2025",
 		progress: 80,
-		status: "selesai" as const,
+		status: "Selesai" as const,
 	},
 	{
 		title: "Pasek 7 Desa Adat",
 		date: "3 Juli 2025",
 		progress: 92,
-		status: "selesai" as const,
+		status: "Selesai" as const,
 	},
 ];

--- a/src/components/kinerja-divisi/activity-card.tsx
+++ b/src/components/kinerja-divisi/activity-card.tsx
@@ -1,17 +1,10 @@
-import {
-	Box,
-	Card,
-	Group,
-	Progress,
-	Text,
-	useMantineColorScheme,
-} from "@mantine/core";
+import { Box, Card, Group, Progress, Text, useMantineColorScheme } from "@mantine/core";

 interface ActivityCardProps {
 	title: string;
 	date: string;
 	progress: number;
-	status: "selesai" | "berjalan" | "tertunda";
+	status: "Selesai" | "Berjalan" | "Tertunda";
 }

 export function ActivityCard({
@@ -20,76 +13,80 @@ export function ActivityCard({
 	progress,
 	status,
 }: ActivityCardProps) {
-	const { colorScheme } = useMantineColorScheme();
-	const dark = colorScheme === "dark";
-
-	const getStatusColor = (s: string) => {
-		switch (s) {
-			case "selesai":
+	const getStatusColor = () => {
+		switch (status) {
+			case "Selesai":
 				return "#22C55E";
-			case "berjalan":
+			case "Berjalan":
 				return "#3B82F6";
-			case "tertunda":
+			case "Tertunda":
 				return "#EF4444";
 			default:
 				return "#9CA3AF";
 		}
 	};

+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
 	return (
 		<Card
-			p="md"
 			radius="xl"
-			withBorder
-			bg={dark ? "#1E293B" : "white"}
+			p={0}
+			withBorder={false}
 			style={{
-				borderColor: dark ? "#334155" : "white",
-				boxShadow: dark
-					? "0 1px 3px 0 rgb(0 0 0 / 0.1)"
-					: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				backgroundColor: dark ? "#334155" : "white",
+				overflow: "hidden",
 			}}
 		>
+			{/* 🔵 HEADER */}
 			<Box
 				style={{
-					borderLeft: `4px solid #3B82F6`,
-					paddingLeft: 12,
-					marginBottom: 12,
+					backgroundColor: "#1E3A5F",
+					padding: "16px",
+					textAlign: "center",
 				}}
 			>
-				<Text size="sm" fw={600} c={dark ? "white" : "#1E3A5F"}>
+				<Text c="white" fw={700} size="md">
 					{title}
 				</Text>
 			</Box>

-			<Group justify="space-between" mb="xs">
-				<Text size="xs" c="dimmed">
-					{date}
-				</Text>
-				<Box
-					style={{
-						backgroundColor: getStatusColor(status),
-						color: "white",
-						padding: "2px 8px",
-						borderRadius: 4,
-						fontSize: 11,
-						fontWeight: 600,
+			{/* CONTENT */}
+			<Box p="md">
+				{/* PROGRESS */}
+				<Progress
+					value={progress}
+					radius="xl"
+					size="lg"
+					color="orange"
+					styles={{
+						root: {
+							height: 16,
+						},
 					}}
-				>
-					{status.toUpperCase()}
-				</Box>
-			</Group>
+				/>

-			<Progress
-				value={progress}
-				size="sm"
-				radius="xl"
-				color={progress === 100 ? "green" : "yellow"}
-				animated={progress < 100}
-			/>
+				{/* FOOTER */}
+				<Group justify="space-between" mt="md">
+					<Text size="sm" fw={500}>
+						{date}
+					</Text>

-			<Text size="xs" c="dimmed" mt="xs" ta="right">
-				{progress}%
-			</Text>
+					<Box
+						style={{
+							backgroundColor: getStatusColor(),
+							color: "white",
+							padding: "4px 12px",
+							borderRadius: 999,
+							fontSize: 12,
+							fontWeight: 600,
+						}}
+					>
+						{status}
+					</Box>
+				</Group>
+			</Box>
 		</Card>
 	);
 }
--- a/src/components/kinerja-divisi/archive-card.tsx
+++ b/src/components/kinerja-divisi/archive-card.tsx
@@ -28,6 +28,7 @@ export function ArchiveCard({ item, onClick }: ArchiveCardProps) {
 				cursor: "pointer",
 				transition: "transform 0.2s, box-shadow 0.2s",
 			}}
+			h="100%"
 			onClick={onClick}
 		>
 			<Group gap="md">
--- a/src/components/kinerja-divisi/discussion-panel.tsx
+++ b/src/components/kinerja-divisi/discussion-panel.tsx
@@ -48,6 +48,7 @@ export function DiscussionPanel() {
 					? "0 1px 3px 0 rgb(0 0 0 / 0.1)"
 					: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
 			}}
+			h="100%"
 		>
 			<Group gap="xs" mb="md">
 				<MessageCircle size={20} color={dark ? "#E2E8F0" : "#1E3A5F"} />
--- a/src/components/kinerja-divisi/document-chart.tsx
+++ b/src/components/kinerja-divisi/document-chart.tsx
@@ -3,6 +3,7 @@ import {
 	Bar,
 	BarChart,
 	CartesianGrid,
+	Cell,
 	ResponsiveContainer,
 	Tooltip,
 	XAxis,
@@ -10,8 +11,8 @@ import {
 } from "recharts";

 const documentData = [
-	{ name: "Gambar", value: 300 },
-	{ name: "Dokumen", value: 310 },
+	{ name: "Gambar", jumlah: 300, color: "#FACC15" },
+	{ name: "Dokumen", jumlah: 310, color: "#22C55E" },
 ];

 export function DocumentChart() {
@@ -61,7 +62,11 @@ export function DocumentChart() {
 						}}
 						labelStyle={{ color: dark ? "#E2E8F0" : "#374151" }}
 					/>
-					<Bar dataKey="value" fill="#3B82F6" radius={[4, 4, 0, 0]} />
+					<Bar dataKey="jumlah" radius={[4, 4, 0, 0]}>
+						{documentData.map((entry, index) => (
+							<Cell key={`cell-${index}`} fill={entry.color} />
+						))}
+					</Bar>
 				</BarChart>
 			</ResponsiveContainer>
 		</Card>
--- a/src/components/kinerja-divisi/event-card.tsx
+++ b/src/components/kinerja-divisi/event-card.tsx
@@ -33,6 +33,7 @@ export function EventCard({ agendas = [] }: EventCardProps) {
 					? "0 1px 3px 0 rgb(0 0 0 / 0.1)"
 					: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
 			}}
+			h="100%"
 		>
 			<Group gap="xs" mb="md">
 				<Calendar size={20} color={dark ? "#E2E8F0" : "#1E3A5F"} />
--- a/src/components/kinerja-divisi/progress-chart.tsx
+++ b/src/components/kinerja-divisi/progress-chart.tsx
@@ -10,7 +10,7 @@ import { Cell, Pie, PieChart, ResponsiveContainer, Tooltip } from "recharts";

 const progressData = [
 	{ name: "Selesai", value: 83.33, color: "#22C55E" },
-	{ name: "Dikerjakan", value: 16.67, color: "#FACC15" },
+	{ name: "Dikerjakan", value: 16.67, color: "#F59E0B" },
 	{ name: "Segera Dikerjakan", value: 0, color: "#3B82F6" },
 	{ name: "Dibatalkan", value: 0, color: "#EF4444" },
 ];
--- a/src/components/pengaduan-layanan-publik.tsx
+++ b/src/components/pengaduan-layanan-publik.tsx
--- a/src/components/pengaturan/akses-dan-tim.tsx
+++ b/src/components/pengaturan/akses-dan-tim.tsx
@@ -1,189 +1,78 @@
-import {
-	ActionIcon,
-	Alert,
-	Button,
-	Card,
-	Group,
-	Modal,
-	Select,
-	Space,
-	Table,
-	Text,
-	TextInput,
-	Title,
-	useMantineColorScheme,
-} from "@mantine/core";
-import {
-	IconEdit,
-	IconInfoCircle,
-	IconTrash,
-	IconUser,
-	IconUserPlus,
-} from "@tabler/icons-react";
-import { useState } from "react";
+import { Box, Button, Group, Stack, Switch, Text, Title } from "@mantine/core";

 const AksesDanTimSettings = () => {
-	const [opened, setOpened] = useState(false);
-	const { colorScheme } = useMantineColorScheme();
-	const dark = colorScheme === "dark";
-
-	// Sample team members data
-	const teamMembers = [
-		{
-			id: 1,
-			name: "Admin Utama",
-			email: "admin@desa.go.id",
-			role: "Administrator",
-			status: "Aktif",
-		},
-		{
-			id: 2,
-			name: "Operator Desa",
-			email: "operator@desa.go.id",
-			role: "Operator",
-			status: "Aktif",
-		},
-		{
-			id: 3,
-			name: "Staff Keuangan",
-			email: "keuangan@desa.go.id",
-			role: "Keuangan",
-			status: "Aktif",
-		},
-		{
-			id: 4,
-			name: "Staff Umum",
-			email: "umum@desa.go.id",
-			role: "Umum",
-			status: "Nonaktif",
-		},
-	];
-
-	const roles = [
-		{ value: "administrator", label: "Administrator" },
-		{ value: "operator", label: "Operator" },
-		{ value: "keuangan", label: "Keuangan" },
-		{ value: "umum", label: "Umum" },
-		{ value: "keamanan", label: "Keamanan" },
-	];
-
 	return (
-		<Card
-			withBorder
-			radius="md"
-			p="xl"
-			bg={dark ? "#141D34" : "white"}
-			style={{ borderColor: dark ? "#141D34" : "white" }}
-		>
-			<Modal
-				opened={opened}
-				onClose={() => setOpened(false)}
-				title="Tambah Anggota Tim"
-				size="lg"
-			>
-				<TextInput
-					label="Nama Lengkap"
-					placeholder="Masukkan nama lengkap anggota tim"
-					mb="md"
-				/>
-				<TextInput
-					label="Alamat Email"
-					placeholder="Masukkan alamat email"
-					mb="md"
-				/>
-				<Select
-					label="Peran"
-					placeholder="Pilih peran anggota tim"
-					data={roles}
-					mb="md"
-				/>
-				<Group justify="flex-end" mt="xl">
-					<Button variant="outline" onClick={() => setOpened(false)}>
-						Batal
+		<Stack pr={"50%"} gap={"xl"}>
+			<Box>
+				<Stack gap={"xs"}>
+					<Title order={2}>Manajemen Tim</Title>
+					<Button bg={"#1E3A5F"} radius={"md"} c={"white"} fullWidth>
+						Undangan Anggota Baru
 					</Button>
-					<Button>Undang Anggota</Button>
-				</Group>
-			</Modal>
-
-			<Title order={2} mb="lg">
-				Akses & Tim
-			</Title>
-			<Text color="dimmed" mb="xl">
-				Kelola akses dan anggota tim Anda
-			</Text>
-
-			<Space h="lg" />
-
-			<Group justify="space-between" mb="md">
-				<Title order={4}>Anggota Tim</Title>
-				<Button
-					leftSection={<IconUserPlus size={16} />}
-					onClick={() => setOpened(true)}
-				>
-					Tambah Anggota
-				</Button>
-			</Group>
-
-			<Table highlightOnHover>
-				<Table.Thead>
-					<Table.Tr>
-						<Table.Th>Nama</Table.Th>
-						<Table.Th>Email</Table.Th>
-						<Table.Th>Peran</Table.Th>
-						<Table.Th>Status</Table.Th>
-						<Table.Th>Aksi</Table.Th>
-					</Table.Tr>
-				</Table.Thead>
-				<Table.Tbody>
-					{teamMembers.map((member) => (
-						<Table.Tr key={member.id}>
-							<Table.Td>
-								<Group gap="sm">
-									<IconUser size={20} />
-									<Text>{member.name}</Text>
-								</Group>
-							</Table.Td>
-							<Table.Td>{member.email}</Table.Td>
-							<Table.Td>
-								<Text fw={500}>{member.role}</Text>
-							</Table.Td>
-							<Table.Td>
-								<Text c={member.status === "Aktif" ? "green" : "red"} fw={500}>
-									{member.status}
-								</Text>
-							</Table.Td>
-							<Table.Td>
-								<Group>
-									<ActionIcon variant="subtle" color="blue">
-										<IconEdit size={16} />
-									</ActionIcon>
-									<ActionIcon variant="subtle" color="red">
-										<IconTrash size={16} />
-									</ActionIcon>
-								</Group>
-							</Table.Td>
-						</Table.Tr>
-					))}
-				</Table.Tbody>
-			</Table>
-
-			<Space h="xl" />
-
-			<Alert
-				icon={<IconInfoCircle size={16} />}
-				title="Informasi"
-				color="blue"
-				mb="md"
-			>
-				Administrator memiliki akses penuh ke semua fitur. Peran lainnya
-				memiliki akses terbatas sesuai kebutuhan.
-			</Alert>
-
-			<Group justify="flex-end" mt="xl">
+					<Button bg={"#1E3A5F"} radius={"md"} c={"white"} fullWidth>
+						Kelola Role & Permission
+					</Button>
+					<Group justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							Daftar Anggota Teraktif
+						</Text>
+						<Text fw={"bold"} fz={"sm"}>
+							12 Anggota
+						</Text>
+					</Group>
+				</Stack>
+			</Box>
+			<Box>
+				<Stack gap={"xs"}>
+					<Title order={2}>Hak Akses</Title>
+					<Group justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							Administrator
+						</Text>
+						<Text fw={"bold"} fz={"sm"}>
+							2 Orang
+						</Text>
+					</Group>
+					<Group justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							Editor
+						</Text>
+						<Text fw={"bold"} fz={"sm"}>
+							5 Orang
+						</Text>
+					</Group>
+					<Group justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							Viewer
+						</Text>
+						<Text fw={"bold"} fz={"sm"}>
+							5 Orang
+						</Text>
+					</Group>
+				</Stack>
+			</Box>
+			<Box>
+				<Stack gap={"xs"}>
+					<Title order={2}>Kolaborasi</Title>
+					<Group mb="md" justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							Izin Export Data
+						</Text>
+						<Switch defaultChecked />
+					</Group>
+					<Group mb="md" justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							Require Approval Untuk Perubahan
+						</Text>
+						<Switch defaultChecked />
+					</Group>
+				</Stack>
+			</Box>
+			<Group justify="flex-start" mt="xl">
 				<Button variant="outline">Batal</Button>
 				<Button>Simpan Perubahan</Button>
 			</Group>
-		</Card>
+		</Stack>
 	);
 };

--- a/src/components/pengaturan/keamanan.tsx
+++ b/src/components/pengaturan/keamanan.tsx
@@ -1,89 +1,64 @@
-import {
-	Alert,
-	Button,
-	Card,
-	Group,
-	PasswordInput,
-	Space,
-	Switch,
-	Text,
-	Title,
-	useMantineColorScheme,
-} from "@mantine/core";
-import { IconInfoCircle, IconLock } from "@tabler/icons-react";
+import { Box, Button, Group, Stack, Switch, Text, Title } from "@mantine/core";

 const KeamananSettings = () => {
-	const { colorScheme } = useMantineColorScheme();
-	const dark = colorScheme === "dark";
 	return (
-		<Card
-			withBorder
-			radius="md"
-			p="xl"
-			bg={dark ? "#141D34" : "white"}
-			style={{ borderColor: dark ? "#141D34" : "white" }}
-		>
-			<Title order={2} mb="lg">
-				Pengaturan Keamanan
-			</Title>
-			<Text color="dimmed" mb="xl">
-				Kelola keamanan akun Anda
-			</Text>
-
-			<Space h="lg" />
-
-			<PasswordInput
-				label="Kata Sandi Saat Ini"
-				placeholder="Masukkan kata sandi saat ini"
-				mb="md"
-			/>
-
-			<PasswordInput
-				label="Kata Sandi Baru"
-				placeholder="Masukkan kata sandi baru"
-				mb="md"
-			/>
-
-			<PasswordInput
-				label="Konfirmasi Kata Sandi Baru"
-				placeholder="Konfirmasi kata sandi baru"
-				mb="md"
-			/>
-
-			<Space h="md" />
-
-			<Group mb="md">
-				<Switch label="Verifikasi Dua Langkah" />
-				<Switch label="Login Otentikasi Aplikasi" />
-			</Group>
-
-			<Space h="md" />
-
-			<Alert
-				icon={<IconLock size={16} />}
-				title="Keamanan"
-				color="orange"
-				mb="md"
-			>
-				Gunakan kata sandi yang kuat dan unik. Hindari menggunakan kata sandi
-				yang sama di banyak layanan.
-			</Alert>
-
-			<Alert
-				icon={<IconInfoCircle size={16} />}
-				title="Informasi"
-				color="blue"
-				mb="md"
-			>
-				Setelah mengganti kata sandi, Anda akan diminta logout dari semua
-				perangkat.
-			</Alert>
-
-			<Group justify="flex-end" mt="xl">
+		<Stack pr={"50%"} gap={"xl"}>
+			<Box>
+				<Stack gap={"xs"}>
+					<Title order={2}>Autentikasi</Title>
+					<Group mb="md" justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							Two-Factor Authentication
+						</Text>
+						<Switch defaultChecked />
+					</Group>
+					<Group mb="md" justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							Biometrik Login
+						</Text>
+						<Switch defaultChecked />
+					</Group>
+					<Group mb="md" justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							IP Whitelist
+						</Text>
+						<Switch defaultChecked />
+					</Group>
+				</Stack>
+			</Box>
+			<Box>
+				<Stack gap={"xs"}>
+					<Title order={2}>Password</Title>
+					<Button bg={"#1E3A5F"} radius={"md"} c={"white"} fullWidth>
+						Ubah Password
+					</Button>
+					<Button bg={"#1E3A5F"} radius={"md"} c={"white"} fullWidth>
+						Riwayat Login
+					</Button>
+					<Button bg={"#1E3A5F"} radius={"md"} c={"white"} fullWidth>
+						Perangkat Terdaftar
+					</Button>
+				</Stack>
+			</Box>
+			<Box>
+				<Stack gap={"xs"}>
+					<Title order={2}>Audit & Log</Title>
+					<Group mb="md" justify="space-between">
+						<Text fw={"bold"} fz={"sm"}>
+							Log Aktivitas
+						</Text>
+						<Switch defaultChecked />
+					</Group>
+					<Button bg={"#1E3A5F"} radius={"md"} c={"white"} fullWidth>
+						Download Log
+					</Button>
+				</Stack>
+			</Box>
+			<Group justify="flex-start" mt="xl">
 				<Button variant="outline">Batal</Button>
-				<Button>Perbarui Kata Sandi</Button>
+				<Button>Simpan Perubahan</Button>
 			</Group>
-		</Card>
+		</Stack>
 	);
 };

--- a/src/components/pengaturan/notifikasi.tsx
+++ b/src/components/pengaturan/notifikasi.tsx
@@ -1,10 +1,14 @@
 import {
 	Alert,
+	Box,
 	Button,
 	Card,
 	Checkbox,
+	Grid,
+	GridCol,
 	Group,
 	Space,
+	Stack,
 	Switch,
 	Text,
 	Title,
@@ -16,70 +20,101 @@ const NotifikasiSettings = () => {
 	const { colorScheme } = useMantineColorScheme();
 	const dark = colorScheme === "dark";
 	return (
-		<Card
-			withBorder
-			radius="md"
-			p="xl"
-			bg={dark ? "#141D34" : "white"}
-			style={{ borderColor: dark ? "#141D34" : "white" }}
-		>
-			<Title order={2} mb="lg">
-				Pengaturan Notifikasi
-			</Title>
-			<Text color="dimmed" mb="xl">
-				Kelola preferensi notifikasi Anda
-			</Text>
-
-			<Space h="lg" />
-
-			<Checkbox.Group defaultValue={["email", "push"]} mb="md">
-				<Title order={4} mb="sm">
-					Metode Notifikasi
-				</Title>
-				<Group>
-					<Checkbox value="email" label="Email" />
-					<Checkbox value="push" label="Notifikasi Push" />
-					<Checkbox value="sms" label="SMS" />
-				</Group>
-			</Checkbox.Group>
-
-			<Space h="md" />
-
-			<Group mb="md">
-				<Switch label="Notifikasi Email" defaultChecked />
-				<Switch label="Notifikasi Push" defaultChecked />
-			</Group>
-
-			<Space h="md" />
-
-			<Title order={4} mb="sm">
-				Jenis Notifikasi
-			</Title>
-			<Group align="start">
-				<Switch label="Pengaduan Baru" defaultChecked />
-				<Switch label="Update Status Pengaduan" defaultChecked />
-				<Switch label="Laporan Mingguan" />
-				<Switch label="Pemberitahuan Keamanan" defaultChecked />
-				<Switch label="Aktivitas Akun" defaultChecked />
-			</Group>
-
-			<Space h="md" />
-
-			<Alert
-				icon={<IconInfoCircle size={16} />}
-				title="Tip"
-				color="blue"
-				mb="md"
-			>
-				Anda dapat menyesuaikan frekuensi notifikasi mingguan sesuai kebutuhan
-				Anda.
-			</Alert>
-
-			<Group justify="flex-end" mt="xl">
+		<Stack pr={"20%"} gap={"xs"}>
+			<Grid gutter={{ base: 5, xs: "md", md: "xl", xl: 50 }}>
+				<GridCol span={6}>
+					<Stack gap={"xs"}>
+						<Title order={3} mb="sm">
+							Metode Notifikasi
+						</Title>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Laporan Harian
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Alert Sistem
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Update Keamanan
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Newsletter Bulanan
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+					</Stack>
+				</GridCol>
+				<GridCol span={6}>
+					<Stack gap={"xs"}>
+						<Title order={3} mb="sm">
+							Preferensi Alert
+						</Title>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Treshold Memori
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Treshold CPU
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Treshold Disk
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+					</Stack>
+				</GridCol>
+				<GridCol span={6}>
+					<Stack gap={"xs"}>
+						<Title order={3} mb="sm">
+							Notifikasi Push
+						</Title>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Alert Kritis
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Aktivitas Tim
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Komentar & Mention
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+						<Group mb="md" justify="space-between">
+							<Text fw={"bold"} fz={"sm"}>
+								Bunyi Notifikasi
+							</Text>
+							<Switch defaultChecked />
+						</Group>
+					</Stack>
+				</GridCol>
+			</Grid>
+			<Group justify="flex-start" mt="xl">
 				<Button variant="outline">Batal</Button>
 				<Button>Simpan Preferensi</Button>
 			</Group>
-		</Card>
+		</Stack>
 	);
 };

--- a/src/components/pengaturan/umum.tsx
+++ b/src/components/pengaturan/umum.tsx
@@ -1,44 +1,12 @@
-import {
-	Alert,
-	Button,
-	Card,
-	Group,
-	Select,
-	Space,
-	Switch,
-	Text,
-	TextInput,
-	Title,
-	useMantineColorScheme,
-} from "@mantine/core";
-import { IconInfoCircle } from "@tabler/icons-react";
+import { Box, Button, Group, Select, Switch, Text, Title } from "@mantine/core";
+import { DateInput } from "@mantine/dates";

 const UmumSettings = () => {
-	const { colorScheme } = useMantineColorScheme();
-	const dark = colorScheme === "dark";
 	return (
-		<Card
-			withBorder
-			radius="md"
-			p="xl"
-			bg={dark ? "#141D34" : "white"}
-			style={{ borderColor: dark ? "#141D34" : "white" }}
-		>
+		<Box pr={"50%"}>
 			<Title order={2} mb="lg">
-				Pengaturan Umum
+				Preferensi Tampilan
 			</Title>
-			<Text color="dimmed" mb="xl">
-				Kelola pengaturan umum aplikasi Anda
-			</Text>
-
-			<Space h="lg" />
-
-			<TextInput
-				label="Nama Aplikasi"
-				placeholder="Masukkan nama aplikasi"
-				defaultValue="Dashboard Desa Plus"
-				mb="md"
-			/>

 			<Select
 				label="Bahasa Aplikasi"
@@ -61,25 +29,53 @@ const UmumSettings = () => {
 				mb="md"
 			/>

-			<Group mb="md">
-				<Switch label="Notifikasi Email" defaultChecked />
+			<DateInput label="Format Tanggal" mb={"xl"} />
+
+			<Title order={2} mb="lg">
+				Dashboard
+			</Title>
+
+			<Group mb="md" justify="space-between">
+				<Text fw={"bold"} fz={"sm"}>
+					Refresh Otomatis
+				</Text>
+				<Switch defaultChecked />
 			</Group>

-			<Alert
-				icon={<IconInfoCircle size={16} />}
-				title="Informasi"
-				color="blue"
-				mb="md"
-			>
-				Beberapa pengaturan mungkin memerlukan restart aplikasi untuk diterapkan
-				sepenuhnya.
-			</Alert>
+			<Group mb="md" justify="space-between">
+				<Text fw={"bold"} fz={"sm"}>
+					Interval Refresh
+				</Text>
+				<Select
+					data={[
+						{ value: "1", label: "30d" },
+						{ value: "2", label: "60d" },
+						{ value: "3", label: "90d" },
+					]}
+					defaultValue="1"
+					w={90}
+				/>
+			</Group>
+
+			<Group mb="md" justify="space-between">
+				<Text fw={"bold"} fz={"sm"}>
+					Tampilkan Grid
+				</Text>
+				<Switch defaultChecked />
+			</Group>
+
+			<Group mb="md" justify="space-between">
+				<Text fw={"bold"} fz={"sm"}>
+					Animasi Transisi
+				</Text>
+				<Switch defaultChecked />
+			</Group>

 			<Group justify="flex-end" mt="xl">
 				<Button variant="outline">Batal</Button>
 				<Button>Simpan Perubahan</Button>
 			</Group>
-		</Card>
+		</Box>
 	);
 };

--- a/src/components/sidebar.tsx
+++ b/src/components/sidebar.tsx
@@ -3,6 +3,7 @@ import {
 	Box,
 	Collapse,
 	Group,
+	Image,
 	Input,
 	NavLink as MantineNavLink,
 	Stack,
@@ -60,30 +61,7 @@ export function Sidebar({ className }: SidebarProps) {
 	return (
 		<Box className={className}>
 			{/* Logo */}
-			<Box
-				p="md"
-				style={{ borderBottom: "1px solid var(--mantine-color-gray-3)" }}
-			>
-				<Group gap="xs">
-					<Badge
-						color="dark"
-						variant="filled"
-						size="xl"
-						radius="md"
-						py="xs"
-						px="md"
-						style={{ fontSize: "1.5rem", fontWeight: "bold" }}
-					>
-						DESA
-					</Badge>
-					<Badge color="green" variant="filled" size="md" radius="md">
-						+
-					</Badge>
-				</Group>
-				<Text size="xs" c="dimmed" mt="xs">
-					Digitalisasi Desa Transparansi Kerja
-				</Text>
-			</Box>
+			<Image src={dark ? "/white.png" : "/light-mode.png"} alt="Logo" />

 			{/* Search */}
 			<Box p="md">
@@ -204,4 +182,4 @@ export function Sidebar({ className }: SidebarProps) {
 			</Stack>
 		</Box>
 	);
-}
+}
--- a/src/components/sosial-page.tsx
+++ b/src/components/sosial-page.tsx
@@ -1,465 +1,47 @@
-import {
-	Badge,
-	Card,
-	Grid,
-	GridCol,
-	Group,
-	List,
-	Progress,
-	Stack,
-	Text,
-	ThemeIcon,
-	Title,
-	useMantineColorScheme,
-} from "@mantine/core";
-import {
-	IconAward,
-	IconBabyCarriage,
-	IconBook,
-	IconCalendarEvent,
-	IconHeartbeat,
-	IconMedicalCross,
-	IconSchool,
-	IconStethoscope,
-} from "@tabler/icons-react";
-import { useState } from "react";
+import { Grid, GridCol, Stack } from "@mantine/core";
+import { Beasiswa } from "./sosial/beasiswa";
+import { EventCalendar } from "./sosial/event-calendar";
+import { HealthStats } from "./sosial/health-stats";
+import { Pendidikan } from "./sosial/pendidikan";
+import { PosyanduSchedule } from "./sosial/posyandu-schedule";
+import { SummaryCards } from "./sosial/summary-cards";

 const SosialPage = () => {
-	const { colorScheme } = useMantineColorScheme();
-	const dark = colorScheme === "dark";
-
-	// Sample data for health statistics
-	const healthStats = {
-		ibuHamil: 87,
-		balita: 342,
-		alertStunting: 12,
-		posyanduAktif: 8,
-	};
-
-	// Sample data for health progress
-	const healthProgress = [
-		{ label: "Imunisasi Lengkap", value: 92, color: "green" },
-		{ label: "Pemeriksaan Rutin", value: 88, color: "blue" },
-		{ label: "Gizi Baik", value: 86, color: "teal" },
-		{ label: "Target Stunting", value: 14, color: "red" },
-	];
-
-	// Sample data for posyandu schedule
-	const posyanduSchedule = [
-		{
-			nama: "Posyandu Mawar",
-			tanggal: "Senin, 15 Feb 2026",
-			jam: "08:00 - 11:00",
-		},
-		{
-			nama: "Posyandu Melati",
-			tanggal: "Selasa, 16 Feb 2026",
-			jam: "08:00 - 11:00",
-		},
-		{
-			nama: "Posyandu Dahlia",
-			tanggal: "Rabu, 17 Feb 2026",
-			jam: "08:00 - 11:00",
-		},
-		{
-			nama: "Posyandu Anggrek",
-			tanggal: "Kamis, 18 Feb 2026",
-			jam: "08:00 - 11:00",
-		},
-	];
-
-	// Sample data for education stats
-	const educationStats = {
-		siswa: {
-			tk: 125,
-			sd: 480,
-			smp: 210,
-			sma: 150,
-		},
-		sekolah: {
-			jumlah: 8,
-			guru: 42,
-		},
-	};
-
-	// Sample data for scholarships
-	const scholarshipData = {
-		penerima: 45,
-		dana: "Rp 1.200.000.000",
-		tahunAjaran: "2025/2026",
-	};
-
-	// Sample data for cultural events
-	const culturalEvents = [
-		{
-			nama: "Hari Kesaktian Pancasila",
-			tanggal: "1 Oktober 2025",
-			lokasi: "Balai Desa",
-		},
-		{
-			nama: "Festival Budaya Desa",
-			tanggal: "20 Mei 2026",
-			lokasi: "Lapangan Desa",
-		},
-		{
-			nama: "Perayaan HUT Desa",
-			tanggal: "17 Agustus 2026",
-			lokasi: "Balai Desa",
-		},
-	];
-
 	return (
 		<Stack gap="lg">
-			{/* Health Statistics Cards */}
+			{/* Top Summary Cards - 4 Grid */}
+			<SummaryCards />
+
+			{/* Second Row - 2 Column Grid */}
 			<Grid gutter="md">
-				<GridCol span={{ base: 12, sm: 6, md: 3 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-					>
-						<Group justify="space-between" align="center">
-							<Stack gap={0}>
-								<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-									Ibu Hamil Aktif
-								</Text>
-								<Text size="xl" fw={700} c={dark ? "dark.0" : "black"}>
-									{healthStats.ibuHamil}
-								</Text>
-							</Stack>
-							<ThemeIcon
-								variant="light"
-								color="darmasaba-blue"
-								size="xl"
-								radius="xl"
-							>
-								<IconHeartbeat size={24} />
-							</ThemeIcon>
-						</Group>
-					</Card>
+				{/* Left - Statistik Kesehatan */}
+				<GridCol span={{ base: 12, lg: 6 }}>
+					<HealthStats />
 				</GridCol>

-				<GridCol span={{ base: 12, sm: 6, md: 3 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-					>
-						<Group justify="space-between" align="center">
-							<Stack gap={0}>
-								<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-									Balita Terdaftar
-								</Text>
-								<Text size="xl" fw={700} c={dark ? "dark.0" : "black"}>
-									{healthStats.balita}
-								</Text>
-							</Stack>
-							<ThemeIcon
-								variant="light"
-								color="darmasaba-success"
-								size="xl"
-								radius="xl"
-							>
-								<IconBabyCarriage size={24} />
-							</ThemeIcon>
-						</Group>
-					</Card>
-				</GridCol>
-
-				<GridCol span={{ base: 12, sm: 6, md: 3 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-					>
-						<Group justify="space-between" align="center">
-							<Stack gap={0}>
-								<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-									Alert Stunting
-								</Text>
-								<Text size="xl" fw={700} c="red">
-									{healthStats.alertStunting}
-								</Text>
-							</Stack>
-							<ThemeIcon variant="light" color="red" size="xl" radius="xl">
-								<IconStethoscope size={24} />
-							</ThemeIcon>
-						</Group>
-					</Card>
-				</GridCol>
-
-				<GridCol span={{ base: 12, sm: 6, md: 3 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-					>
-						<Group justify="space-between" align="center">
-							<Stack gap={0}>
-								<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-									Posyandu Aktif
-								</Text>
-								<Text size="xl" fw={700} c={dark ? "dark.0" : "black"}>
-									{healthStats.posyanduAktif}
-								</Text>
-							</Stack>
-							<ThemeIcon
-								variant="light"
-								color="darmasaba-warning"
-								size="xl"
-								radius="xl"
-							>
-								<IconMedicalCross size={24} />
-							</ThemeIcon>
-						</Group>
-					</Card>
+				{/* Right - Jadwal Posyandu */}
+				<GridCol span={{ base: 12, lg: 6 }}>
+					<PosyanduSchedule />
 				</GridCol>
 			</Grid>

-			{/* Health Progress Bars */}
-			<Card
-				p="md"
-				radius="md"
-				withBorder
-				bg={dark ? "#141D34" : "white"}
-				style={{ borderColor: dark ? "#141D34" : "white" }}
-			>
-				<Title order={3} mb="md" c={dark ? "dark.0" : "black"}>
-					Statistik Kesehatan
-				</Title>
-				<Stack gap="md">
-					{healthProgress.map((item, index) => (
-						<div key={index}>
-							<Group justify="space-between" mb={5}>
-								<Text size="sm" fw={500} c={dark ? "dark.0" : "black"}>
-									{item.label}
-								</Text>
-								<Text size="sm" fw={600} c={dark ? "dark.0" : "black"}>
-									{item.value}%
-								</Text>
-							</Group>
-							<Progress
-								value={item.value}
-								size="lg"
-								radius="xl"
-								color={item.color}
-							/>
-						</div>
-					))}
-				</Stack>
-			</Card>
-
+			{/* Third Row - 2 Column Grid */}
 			<Grid gutter="md">
-				{/* Jadwal Posyandu */}
+				{/* Left - Pendidikan */}
 				<GridCol span={{ base: 12, lg: 6 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-					>
-						<Title order={3} mb="md" c={dark ? "dark.0" : "black"}>
-							Jadwal Posyandu
-						</Title>
-						<Stack gap="sm">
-							{posyanduSchedule.map((item, index) => (
-								<Card
-									key={index}
-									p="md"
-									radius="md"
-									withBorder
-									bg={dark ? "#263852ff" : "#F1F5F9"}
-									style={{ borderColor: dark ? "#263852ff" : "#F1F5F9" }}
-									h="100%"
-								>
-									<Group justify="space-between">
-										<Stack gap={0}>
-											<Text fw={500} c={dark ? "dark.0" : "black"}>
-												{item.nama}
-											</Text>
-											<Text size="sm" c={dark ? "dark.0" : "black"}>
-												{item.tanggal}
-											</Text>
-										</Stack>
-										<Badge variant="light" color="darmasaba-blue">
-											{item.jam}
-										</Badge>
-									</Group>
-								</Card>
-							))}
-						</Stack>
-					</Card>
+					<Pendidikan />
 				</GridCol>

-				{/* Pendidikan */}
+				{/* Right - Beasiswa Desa */}
 				<GridCol span={{ base: 12, lg: 6 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-						h="100%"
-					>
-						<Title order={3} mb="md" c={dark ? "dark.0" : "black"}>
-							Pendidikan
-						</Title>
-						<Stack gap="md">
-							<Group justify="space-between">
-								<Text fw={500} c={dark ? "dark.0" : "black"}>
-									TK / PAUD
-								</Text>
-								<Text fw={700} c={dark ? "dark.0" : "black"}>
-									{educationStats.siswa.tk}
-								</Text>
-							</Group>
-							<Group justify="space-between">
-								<Text fw={500} c={dark ? "dark.0" : "black"}>
-									SD
-								</Text>
-								<Text fw={700} c={dark ? "dark.0" : "black"}>
-									{educationStats.siswa.sd}
-								</Text>
-							</Group>
-							<Group justify="space-between">
-								<Text fw={500} c={dark ? "dark.0" : "black"}>
-									SMP
-								</Text>
-								<Text fw={700} c={dark ? "dark.0" : "black"}>
-									{educationStats.siswa.smp}
-								</Text>
-							</Group>
-							<Group justify="space-between">
-								<Text fw={500} c={dark ? "dark.0" : "black"}>
-									SMA
-								</Text>
-								<Text fw={700} c={dark ? "dark.0" : "black"}>
-									{educationStats.siswa.sma}
-								</Text>
-							</Group>
-
-							<Card
-								withBorder
-								radius="md"
-								p="md"
-								mt="md"
-								bg={dark ? "#263852ff" : "#F1F5F9"}
-								style={{ borderColor: dark ? "#263852ff" : "#F1F5F9" }}
-							>
-								<Group justify="space-between">
-									<Text fw={500} c={dark ? "dark.0" : "black"}>
-										Jumlah Lembaga Pendidikan
-									</Text>
-									<Text fw={700} c={dark ? "dark.0" : "black"}>
-										{educationStats.sekolah.jumlah}
-									</Text>
-								</Group>
-								<Group justify="space-between" mt="sm">
-									<Text fw={500} c={dark ? "dark.0" : "black"}>
-										Jumlah Tenaga Pengajar
-									</Text>
-									<Text fw={700} c={dark ? "dark.0" : "black"}>
-										{educationStats.sekolah.guru}
-									</Text>
-								</Group>
-							</Card>
-						</Stack>
-					</Card>
+					<Beasiswa />
 				</GridCol>
 			</Grid>

-			<Grid gutter="md">
-				{/* Beasiswa Desa */}
-				<GridCol span={{ base: 12, lg: 6 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-						h="100%"
-					>
-						<Group justify="space-between" align="center">
-							<Stack gap={0}>
-								<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-									Beasiswa Desa
-								</Text>
-								<Text size="xl" fw={700} c={dark ? "dark.0" : "black"}>
-									Penerima: {scholarshipData.penerima}
-								</Text>
-							</Stack>
-							<ThemeIcon
-								variant="light"
-								color="darmasaba-success"
-								size="xl"
-								radius="xl"
-							>
-								<IconAward size={24} />
-							</ThemeIcon>
-						</Group>
-						<Text mt="md" c={dark ? "dark.0" : "black"}>
-							Dana Tersalurkan:{" "}
-							<Text span fw={700}>
-								{scholarshipData.dana}
-							</Text>
-						</Text>
-						<Text mt="sm" c={dark ? "dark.3" : "dimmed"}>
-							Tahun Ajaran: {scholarshipData.tahunAjaran}
-						</Text>
-					</Card>
-				</GridCol>
-
-				{/* Kalender Event Budaya */}
-				<GridCol span={{ base: 12, lg: 6 }}>
-					<Card
-						p="md"
-						radius="md"
-						withBorder
-						bg={dark ? "#141D34" : "white"}
-						style={{ borderColor: dark ? "#141D34" : "white" }}
-						h="100%"
-					>
-						<Title order={3} mb="md" c={dark ? "dark.0" : "black"}>
-							Kalender Event Budaya
-						</Title>
-						<List spacing="sm">
-							{culturalEvents.map((event, index) => (
-								<List.Item
-									key={index}
-									icon={
-										<ThemeIcon color="darmasaba-blue" size={24} radius="xl">
-											<IconCalendarEvent size={12} />
-										</ThemeIcon>
-									}
-								>
-									<Group justify="space-between">
-										<Text fw={500} c={dark ? "dark.0" : "black"}>
-											{event.nama}
-										</Text>
-										<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-											{event.lokasi}
-										</Text>
-									</Group>
-									<Text size="sm" c={dark ? "dark.3" : "dimmed"}>
-										{event.tanggal}
-									</Text>
-								</List.Item>
-							))}
-						</List>
-					</Card>
-				</GridCol>
-			</Grid>
+			{/* Bottom Section - Event Budaya */}
+			<EventCalendar />
 		</Stack>
 	);
 };

-export default SosialPage;
+export default SosialPage;
--- a/src/components/sosial/beasiswa.tsx
+++ b/src/components/sosial/beasiswa.tsx
@@ -0,0 +1,80 @@
+import {
+	Card,
+	Group,
+	Stack,
+	Text,
+	ThemeIcon,
+	Title,
+	useMantineColorScheme,
+} from "@mantine/core";
+import { IconAward } from "@tabler/icons-react";
+
+interface ScholarshipData {
+	penerima: number;
+	dana: string;
+	tahunAjaran: string;
+}
+
+interface BeasiswaProps {
+	data?: ScholarshipData;
+}
+
+export const Beasiswa = ({ data }: BeasiswaProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	const defaultData: ScholarshipData = {
+		penerima: 45,
+		dana: "Rp 1.200.000.000",
+		tahunAjaran: "2025/2026",
+	};
+
+	const displayData = data || defaultData;
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+			h={"100%"}
+		>
+			<Group justify="space-between" align="center">
+				<Stack gap={2}>
+					<Text size="sm" c={dark ? "white" : "dimmed"} fw={500}>
+						Beasiswa Desa
+					</Text>
+					<Text size="xl" fw={700} c={dark ? "white" : "#1e3a5f"}>
+						Penerima: {displayData.penerima}
+					</Text>
+				</Stack>
+				<ThemeIcon
+					variant="light"
+					color="darmasaba-success"
+					size="xl"
+					radius="xl"
+				>
+					<IconAward size={24} />
+				</ThemeIcon>
+			</Group>
+			<Stack gap="xs" mt="md">
+				<Group justify="space-between">
+					<Text c={dark ? "white" : "dimmed"}>Dana Tersalurkan:</Text>
+					<Text fw={700} c={dark ? "white" : "#1e3a5f"}>
+						{displayData.dana}
+					</Text>
+				</Group>
+				<Group justify="space-between">
+					<Text c={dark ? "white" : "dimmed"}>Tahun Ajaran:</Text>
+					<Text c={dark ? "white" : "#1e3a5f"}>{displayData.tahunAjaran}</Text>
+				</Group>
+			</Stack>
+		</Card>
+	);
+};
--- a/src/components/sosial/event-calendar.tsx
+++ b/src/components/sosial/event-calendar.tsx
@@ -0,0 +1,104 @@
+import {
+	Card,
+	Group,
+	Stack,
+	Text,
+	ThemeIcon,
+	Title,
+	useMantineColorScheme,
+} from "@mantine/core";
+import { IconCalendarEvent } from "@tabler/icons-react";
+
+interface EventItem {
+	id: string;
+	nama: string;
+	tanggal: string;
+	lokasi: string;
+}
+
+interface EventCalendarProps {
+	data?: EventItem[];
+}
+
+export const EventCalendar = ({ data }: EventCalendarProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	const defaultData: EventItem[] = [
+		{
+			id: "1",
+			nama: "Hari Kesaktian Pancasila",
+			tanggal: "1 Oktober 2025",
+			lokasi: "Balai Desa",
+		},
+		{
+			id: "2",
+			nama: "Festival Budaya Desa",
+			tanggal: "20 Mei 2026",
+			lokasi: "Lapangan Desa",
+		},
+		{
+			id: "3",
+			nama: "Perayaan HUT Desa",
+			tanggal: "17 Agustus 2026",
+			lokasi: "Balai Desa",
+		},
+	];
+
+	const displayData = data || defaultData;
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+		>
+			<Title order={3} mb="md" c={dark ? "dark.0" : "#1e3a5f"}>
+				Kalender Event Budaya
+			</Title>
+			<Stack gap="sm">
+				{displayData.map((event) => (
+					<Card
+						key={event.id}
+						p="md"
+						radius="md"
+						withBorder
+						bg={dark ? "#263852ff" : "#F1F5F9"}
+						style={{ borderColor: dark ? "#263852ff" : "#F1F5F9" }}
+					>
+						<Group justify="space-between" mb="xs">
+							<Group gap="sm" align="center">
+								<ThemeIcon
+									color="darmasaba-blue"
+									size="md"
+									radius="xl"
+									variant="light"
+								>
+									<IconCalendarEvent size={16} />
+								</ThemeIcon>
+								<Text fw={600} c={dark ? "dark.0" : "#1e3a5f"}>
+									{event.nama}
+								</Text>
+							</Group>
+							<Text size="sm" c={dark ? "dark.3" : "dimmed"} fw={500}>
+								{event.lokasi}
+							</Text>
+						</Group>
+						<Group pl={36}>
+							<Text size="sm" c={dark ? "white" : "gray.6"}>
+								{event.tanggal}
+							</Text>
+						</Group>
+					</Card>
+				))}
+			</Stack>
+		</Card>
+	);
+};
--- a/src/components/sosial/health-stats.tsx
+++ b/src/components/sosial/health-stats.tsx
@@ -0,0 +1,77 @@
+import {
+	Card,
+	Group,
+	Progress,
+	Stack,
+	Text,
+	Title,
+	useMantineColorScheme,
+} from "@mantine/core";
+
+interface HealthProgressItem {
+	label: string;
+	value: number;
+	color: string;
+}
+
+interface HealthStatsProps {
+	data?: HealthProgressItem[];
+}
+
+export const HealthStats = ({ data }: HealthStatsProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	const defaultData: HealthProgressItem[] = [
+		{ label: "Imunisasi Lengkap", value: 92, color: "green" },
+		{ label: "Pemeriksaan Rutin", value: 88, color: "blue" },
+		{ label: "Gizi Baik", value: 86, color: "teal" },
+		{ label: "Target Stunting", value: 14, color: "red" },
+	];
+
+	const displayData = data || defaultData;
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+			h={"100%"}
+		>
+			<Title order={3} mb="md" c={dark ? "dark.0" : "#1e3a5f"}>
+				Statistik Kesehatan
+			</Title>
+			<Stack gap="md">
+				{displayData.map((item, index) => (
+					<div key={index}>
+						<Group justify="space-between" mb={5}>
+							<Text size="sm" fw={500} c={dark ? "dark.0" : "#1e3a5f"}>
+								{item.label}
+							</Text>
+							<Text
+								size="sm"
+								fw={600}
+								c={item.color === "red" ? "red" : dark ? "dark.0" : "#1e3a5f"}
+							>
+								{item.value}%
+							</Text>
+						</Group>
+						<Progress
+							value={item.value}
+							size="lg"
+							radius="xl"
+							color={item.color}
+						/>
+					</div>
+				))}
+			</Stack>
+		</Card>
+	);
+};
--- a/src/components/sosial/pendidikan.tsx
+++ b/src/components/sosial/pendidikan.tsx
@@ -0,0 +1,124 @@
+import {
+	Card,
+	Group,
+	Stack,
+	Text,
+	Title,
+	useMantineColorScheme,
+} from "@mantine/core";
+
+interface EducationData {
+	siswa: {
+		tk: number;
+		sd: number;
+		smp: number;
+		sma: number;
+	};
+	sekolah: {
+		jumlah: number;
+		guru: number;
+	};
+}
+
+interface PendidikanProps {
+	data?: EducationData;
+}
+
+export const Pendidikan = ({ data }: PendidikanProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	const defaultData: EducationData = {
+		siswa: {
+			tk: 125,
+			sd: 480,
+			smp: 210,
+			sma: 150,
+		},
+		sekolah: {
+			jumlah: 8,
+			guru: 42,
+		},
+	};
+
+	const displayData = data || defaultData;
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+		>
+			<Title order={3} mb="md" c={dark ? "dark.0" : "#1e3a5f"}>
+				Pendidikan
+			</Title>
+			<Stack gap="md">
+				<Group justify="space-between">
+					<Text fw={500} c={dark ? "dark.0" : "#1e3a5f"}>
+						TK / PAUD
+					</Text>
+					<Text fw={700} c={dark ? "dark.0" : "#1e3a5f"}>
+						{displayData.siswa.tk}
+					</Text>
+				</Group>
+				<Group justify="space-between">
+					<Text fw={500} c={dark ? "dark.0" : "#1e3a5f"}>
+						SD
+					</Text>
+					<Text fw={700} c={dark ? "dark.0" : "#1e3a5f"}>
+						{displayData.siswa.sd}
+					</Text>
+				</Group>
+				<Group justify="space-between">
+					<Text fw={500} c={dark ? "dark.0" : "#1e3a5f"}>
+						SMP
+					</Text>
+					<Text fw={700} c={dark ? "dark.0" : "#1e3a5f"}>
+						{displayData.siswa.smp}
+					</Text>
+				</Group>
+				<Group justify="space-between">
+					<Text fw={500} c={dark ? "dark.0" : "#1e3a5f"}>
+						SMA
+					</Text>
+					<Text fw={700} c={dark ? "dark.0" : "#1e3a5f"}>
+						{displayData.siswa.sma}
+					</Text>
+				</Group>
+
+				<Card
+					withBorder
+					radius="md"
+					p="md"
+					mt="md"
+					bg={dark ? "#263852ff" : "#F1F5F9"}
+					style={{ borderColor: dark ? "#263852ff" : "#F1F5F9" }}
+				>
+					<Group justify="space-between">
+						<Text fw={500} c={dark ? "dark.0" : "#1e3a5f"}>
+							Jumlah Lembaga Pendidikan
+						</Text>
+						<Text fw={700} c={dark ? "dark.0" : "#1e3a5f"}>
+							{displayData.sekolah.jumlah}
+						</Text>
+					</Group>
+					<Group justify="space-between" mt="sm">
+						<Text fw={500} c={dark ? "dark.0" : "#1e3a5f"}>
+							Jumlah Tenaga Pengajar
+						</Text>
+						<Text fw={700} c={dark ? "dark.0" : "#1e3a5f"}>
+							{displayData.sekolah.guru}
+						</Text>
+					</Group>
+				</Card>
+			</Stack>
+		</Card>
+	);
+};
--- a/src/components/sosial/posyandu-schedule.tsx
+++ b/src/components/sosial/posyandu-schedule.tsx
@@ -0,0 +1,99 @@
+import {
+	Badge,
+	Card,
+	Group,
+	Stack,
+	Text,
+	Title,
+	useMantineColorScheme,
+} from "@mantine/core";
+
+interface PosyanduItem {
+	id: string;
+	nama: string;
+	tanggal: string;
+	jam: string;
+}
+
+interface PosyanduScheduleProps {
+	data?: PosyanduItem[];
+}
+
+export const PosyanduSchedule = ({ data }: PosyanduScheduleProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	const defaultData: PosyanduItem[] = [
+		{
+			id: "1",
+			nama: "Posyandu Mawar",
+			tanggal: "Senin, 15 Feb 2026",
+			jam: "08:00 - 11:00",
+		},
+		{
+			id: "2",
+			nama: "Posyandu Melati",
+			tanggal: "Selasa, 16 Feb 2026",
+			jam: "08:00 - 11:00",
+		},
+		{
+			id: "3",
+			nama: "Posyandu Dahlia",
+			tanggal: "Rabu, 17 Feb 2026",
+			jam: "08:00 - 11:00",
+		},
+		{
+			id: "4",
+			nama: "Posyandu Anggrek",
+			tanggal: "Kamis, 18 Feb 2026",
+			jam: "08:00 - 11:00",
+		},
+	];
+
+	const displayData = data || defaultData;
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+		>
+			<Title order={3} mb="md" c={dark ? "dark.0" : "#1e3a5f"}>
+				Jadwal Posyandu
+			</Title>
+			<Stack gap="sm">
+				{displayData.map((item) => (
+					<Card
+						key={item.id}
+						p="md"
+						radius="md"
+						withBorder
+						bg={dark ? "#263852ff" : "#F1F5F9"}
+						style={{ borderColor: dark ? "#263852ff" : "#F1F5F9" }}
+					>
+						<Group justify="space-between">
+							<Stack gap={0}>
+								<Text fw={600} c={dark ? "white" : "#1e3a5f"}>
+									{item.nama}
+								</Text>
+								<Text size="sm" c={dark ? "white" : "dimmed"}>
+									{item.tanggal}
+								</Text>
+							</Stack>
+							<Badge variant="light" color="darmasaba-blue" size="md">
+								{item.jam}
+							</Badge>
+						</Group>
+					</Card>
+				))}
+			</Stack>
+		</Card>
+	);
+};
--- a/src/components/sosial/summary-cards.tsx
+++ b/src/components/sosial/summary-cards.tsx
@@ -0,0 +1,144 @@
+import {
+	Card,
+	Grid,
+	GridCol,
+	Group,
+	Stack,
+	Text,
+	ThemeIcon,
+	useMantineColorScheme,
+} from "@mantine/core";
+import {
+	IconBabyCarriage,
+	IconHeartbeat,
+	IconMedicalCross,
+	IconStethoscope,
+} from "@tabler/icons-react";
+
+interface SummaryCardProps {
+	title: string;
+	value: number;
+	subtitle?: string;
+	icon: React.ReactNode;
+	color: string;
+	highlight?: boolean;
+	backgroundColor: string;
+}
+
+const SummaryCard = ({
+	title,
+	value,
+	subtitle,
+	icon,
+	color,
+	highlight = false,
+	backgroundColor,
+}: SummaryCardProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+		>
+			<Group justify="space-between" align="center">
+				<Stack gap={2}>
+					<Text size="sm" c={dark ? "dark.3" : "dimmed"} fw={500}>
+						{title}
+					</Text>
+					<Text
+						size="xl"
+						fw={700}
+						c={highlight ? "red" : dark ? "white" : "#1e3a5f"}
+					>
+						{value}
+					</Text>
+					{subtitle && (
+						<Text size="xs" c={dark ? "white" : "gray.6"}>
+							{subtitle}
+						</Text>
+					)}
+				</Stack>
+				<ThemeIcon bg={backgroundColor} color={color} size="xl" radius="xl">
+					{icon}
+				</ThemeIcon>
+			</Group>
+		</Card>
+	);
+};
+
+interface HealthSummaryData {
+	ibuHamil: number;
+	balita: number;
+	alertStunting: number;
+	posyanduAktif: number;
+}
+
+interface SummaryCardsProps {
+	data?: HealthSummaryData;
+}
+
+export const SummaryCards = ({ data }: SummaryCardsProps) => {
+	const defaultData: HealthSummaryData = {
+		ibuHamil: 87,
+		balita: 342,
+		alertStunting: 12,
+		posyanduAktif: 8,
+	};
+
+	const displayData = data || defaultData;
+
+	return (
+		<Grid gutter="md">
+			<GridCol span={{ base: 12, sm: 6, lg: 3 }}>
+				<SummaryCard
+					title="Ibu Hamil Aktif"
+					value={displayData.ibuHamil}
+					subtitle="Aktif"
+					icon={<IconHeartbeat size={20} />}
+					color="white"
+					backgroundColor="#1E3A5F"
+				/>
+			</GridCol>
+			<GridCol span={{ base: 12, sm: 6, lg: 3 }}>
+				<SummaryCard
+					title="Balita Terdaftar"
+					value={displayData.balita}
+					subtitle="Terdaftar"
+					icon={<IconBabyCarriage size={20} />}
+					color="white"
+					backgroundColor="#1E3A5F"
+				/>
+			</GridCol>
+			<GridCol span={{ base: 12, sm: 6, lg: 3 }}>
+				<SummaryCard
+					title="Alert Stunting"
+					value={displayData.alertStunting}
+					subtitle="Perhatian"
+					icon={<IconStethoscope size={20} />}
+					color="white"
+					backgroundColor="#1E3A5F"
+				/>
+			</GridCol>
+			<GridCol span={{ base: 12, sm: 6, lg: 3 }}>
+				<SummaryCard
+					title="Posyandu Aktif"
+					value={displayData.posyanduAktif}
+					subtitle="Aktif"
+					icon={<IconMedicalCross size={20} />}
+					color="white"
+					backgroundColor="#1E3A5F"
+				/>
+			</GridCol>
+		</Grid>
+	);
+};
--- a/src/components/ui/help-card.tsx
+++ b/src/components/ui/help-card.tsx
@@ -51,9 +51,7 @@ export const HelpCard = ({
 					{icon && (
 						<div
 							style={{
-								backgroundColor: isDark
-									? theme.colors.blue[8]
-									: theme.colors.blue[0],
+								backgroundColor: isDark ? "#263852ff" : "#1E3A5F",
 								borderRadius: "8px",
 								padding: "8px",
 								display: "flex",
--- a/src/components/umkm/header-toggle.tsx
+++ b/src/components/umkm/header-toggle.tsx
@@ -0,0 +1,75 @@
+import {
+	Button,
+	Card,
+	Group,
+	Title,
+	useMantineColorScheme,
+} from "@mantine/core";
+import { useSnapshot } from "valtio";
+import { setRange, umkmStore } from "../../store/umkm";
+
+type TimeRange = "minggu" | "bulan";
+
+interface HeaderToggleProps {
+	title?: string;
+	onRangeChange?: (range: TimeRange) => void;
+}
+
+export const HeaderToggle = ({
+	title = "Update Penjualan Produk",
+	onRangeChange,
+}: HeaderToggleProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+	const { selectedRange } = useSnapshot(umkmStore);
+
+	const handleRangeChange = (range: TimeRange) => {
+		setRange(range);
+		onRangeChange?.(range);
+	};
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1e3a5f" : "#1e3a5f"}
+			style={{ borderColor: dark ? "#1e3a5f" : "#1e3a5f" }}
+		>
+			<Group justify="space-between" align="center" px="md" py="xs">
+				<Title order={3} c="white">
+					{title}
+				</Title>
+				<Group gap="xs">
+					<Button
+						variant={selectedRange === "minggu" ? "white" : "transparent"}
+						onClick={() => handleRangeChange("minggu")}
+						c={selectedRange === "minggu" ? "#1e3a5f" : "white"}
+						fw={600}
+						radius="xl"
+						size="sm"
+						style={{
+							opacity: selectedRange === "minggu" ? 1 : 0.8,
+						}}
+					>
+						Minggu ini
+					</Button>
+					<Button
+						variant={selectedRange === "bulan" ? "white" : "transparent"}
+						onClick={() => handleRangeChange("bulan")}
+						c={selectedRange === "bulan" ? "#1e3a5f" : "white"}
+						fw={600}
+						radius="xl"
+						size="sm"
+						style={{
+							opacity: selectedRange === "bulan" ? 1 : 0.8,
+						}}
+					>
+						Bulan ini
+					</Button>
+				</Group>
+			</Group>
+		</Card>
+	);
+};
--- a/src/components/umkm/produk-unggulan.tsx
+++ b/src/components/umkm/produk-unggulan.tsx
@@ -0,0 +1,104 @@
+import { Card, Group, Stack, Text, useMantineColorScheme } from "@mantine/core";
+
+interface MetricCardProps {
+	title: string;
+	value: string | number;
+	trend?: {
+		value: number;
+		label: string;
+	};
+}
+
+const MetricCard = ({ title, value, trend }: MetricCardProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	return (
+		<Group justify="space-between" align="center">
+			<Text size="sm" c={dark ? "white" : "dimmed"} fw={500}>
+				{title}
+			</Text>
+			<Stack gap={0} align="flex-end">
+				<Text size="lg" fw={700} c={dark ? "white" : "#1e3a5f"}>
+					{value}
+				</Text>
+				{trend && (
+					<Text size="xs" c={trend.value >= 0 ? "green" : "red"} fw={600}>
+						{trend.value >= 0 ? "↑" : "↓"} {Math.abs(trend.value)}%{" "}
+						{trend.label}
+					</Text>
+				)}
+			</Stack>
+		</Group>
+	);
+};
+
+interface ProdukUnggulanProps {
+	data?: {
+		totalPenjualan: number;
+		produkAktif: number;
+		totalTransaksi: number;
+		trend?: {
+			value: number;
+			label: string;
+		};
+	};
+}
+
+export const ProdukUnggulan = ({ data }: ProdukUnggulanProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	const defaultData = {
+		totalPenjualan: 30900000,
+		produkAktif: 7,
+		totalTransaksi: 500,
+		trend: {
+			value: 18,
+			label: "vs bulan lalu",
+		},
+	};
+
+	const displayData = data || defaultData;
+
+	const formatCurrency = (value: number) => {
+		if (value >= 1000000) {
+			return `Rp ${(value / 1000000).toFixed(1)}M`;
+		}
+		if (value >= 1000) {
+			return `Rp ${(value / 1000).toFixed(0)}K`;
+		}
+		return `Rp ${value.toLocaleString()}`;
+	};
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+		>
+			<Stack gap="lg">
+				<MetricCard
+					title="Total Penjualan"
+					value={formatCurrency(displayData.totalPenjualan)}
+					trend={displayData.trend}
+				/>
+				<MetricCard
+					title="Produk Aktif"
+					value={`${displayData.produkAktif} kategori`}
+				/>
+				<MetricCard
+					title="Total Transaksi"
+					value={`${displayData.totalTransaksi} transaksi`}
+				/>
+			</Stack>
+		</Card>
+	);
+};
--- a/src/components/umkm/sales-table.tsx
+++ b/src/components/umkm/sales-table.tsx
@@ -0,0 +1,264 @@
+import {
+	Badge,
+	Button,
+	Card,
+	Group,
+	Select,
+	Table,
+	Text,
+	Title,
+	useMantineColorScheme,
+} from "@mantine/core";
+import { IconArrowDown, IconArrowUp } from "@tabler/icons-react";
+
+export interface SalesData {
+	id: string;
+	produk: string;
+	penjualanBulanIni: number;
+	bulanLalu: number;
+	trend: number;
+	volume: string;
+	stok: number;
+	unit: string;
+}
+
+interface SalesTableProps {
+	data?: SalesData[];
+	onDetailClick?: (product: SalesData) => void;
+}
+
+export const SalesTable = ({ data, onDetailClick }: SalesTableProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	const defaultData: SalesData[] = [
+		{
+			id: "1",
+			produk: "Beras Premium Organik",
+			penjualanBulanIni: 8500000,
+			bulanLalu: 7600000,
+			trend: 12,
+			volume: "650 Kg",
+			stok: 850,
+			unit: "Kg",
+		},
+		{
+			id: "2",
+			produk: "Keripik Singkong",
+			penjualanBulanIni: 4200000,
+			bulanLalu: 3800000,
+			trend: 11,
+			volume: "320 Kg",
+			stok: 120,
+			unit: "Kg",
+		},
+		{
+			id: "3",
+			produk: "Madu Alami",
+			penjualanBulanIni: 3750000,
+			bulanLalu: 4100000,
+			trend: -9,
+			volume: "150 Liter",
+			stok: 45,
+			unit: "Liter",
+		},
+		{
+			id: "4",
+			produk: "Kecap Tradisional",
+			penjualanBulanIni: 2800000,
+			bulanLalu: 2500000,
+			trend: 12,
+			volume: "280 Botol",
+			stok: 95,
+			unit: "Botol",
+		},
+		{
+			id: "5",
+			produk: "Sambal Bu Rudy",
+			penjualanBulanIni: 2100000,
+			bulanLalu: 2300000,
+			trend: -9,
+			volume: "180 Botol",
+			stok: 35,
+			unit: "Botol",
+		},
+	];
+
+	const displayData = data || defaultData;
+
+	const formatCurrency = (value: number) => {
+		if (value >= 1000000) {
+			return `Rp ${(value / 1000000).toFixed(1)}M`;
+		}
+		if (value >= 1000) {
+			return `Rp ${(value / 1000).toFixed(0)}K`;
+		}
+		return `Rp ${value.toLocaleString()}`;
+	};
+
+	const getStockStatus = (stock: number) => {
+		if (stock > 200) return { color: "green", label: "Aman" };
+		if (stock > 50) return { color: "yellow", label: "Sedang" };
+		return { color: "red", label: "Rendah" };
+	};
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+		>
+			<Group justify="space-between" mb="md">
+				<Title order={4} c={dark ? "dark.0" : "#1e3a5f"}>
+					Detail Penjualan Produk
+				</Title>
+				<Group gap="xs">
+					<Select
+						placeholder="Filter kategori"
+						data={[
+							{ value: "semua", label: "Semua Kategori" },
+							{ value: "makanan", label: "Makanan" },
+							{ value: "minuman", label: "Minuman" },
+							{ value: "kerajinan", label: "Kerajinan" },
+						]}
+						defaultValue="semua"
+						w={180}
+						size="sm"
+					/>
+					<Select
+						placeholder="Filter UMKM"
+						data={[
+							{ value: "semua", label: "Semua UMKM" },
+							{ value: "umkm1", label: "Warung Pak Joko" },
+							{ value: "umkm2", label: "Ibu Sari Snack" },
+						]}
+						defaultValue="semua"
+						w={180}
+						size="sm"
+					/>
+				</Group>
+			</Group>
+
+			<Table
+				stickyHeader
+				stickyHeaderOffset={60}
+				highlightOnHover
+				withRowBorders={false}
+				verticalSpacing="sm"
+			>
+				<Table.Thead>
+					<Table.Tr>
+						<Table.Th style={{ backgroundColor: dark ? "#1e3a5f" : "#f8f9fa" }}>
+							<Text size="sm" fw={600} c={dark ? "white" : "dimmed"}>
+								Produk
+							</Text>
+						</Table.Th>
+						<Table.Th style={{ backgroundColor: dark ? "#1e3a5f" : "#f8f9fa" }}>
+							<Text size="sm" fw={600} c={dark ? "white" : "dimmed"}>
+								Penjualan Bulan Ini
+							</Text>
+						</Table.Th>
+						<Table.Th style={{ backgroundColor: dark ? "#1e3a5f" : "#f8f9fa" }}>
+							<Text size="sm" fw={600} c={dark ? "white" : "dimmed"}>
+								Bulan Lalu
+							</Text>
+						</Table.Th>
+						<Table.Th style={{ backgroundColor: dark ? "#1e3a5f" : "#f8f9fa" }}>
+							<Text size="sm" fw={600} c={dark ? "white" : "dimmed"}>
+								Trend
+							</Text>
+						</Table.Th>
+						<Table.Th style={{ backgroundColor: dark ? "#1e3a5f" : "#f8f9fa" }}>
+							<Text size="sm" fw={600} c={dark ? "white" : "dimmed"}>
+								Volume
+							</Text>
+						</Table.Th>
+						<Table.Th style={{ backgroundColor: dark ? "#1e3a5f" : "#f8f9fa" }}>
+							<Text size="sm" fw={600} c={dark ? "white" : "dimmed"}>
+								Stok
+							</Text>
+						</Table.Th>
+						<Table.Th style={{ backgroundColor: dark ? "#1e3a5f" : "#f8f9fa" }}>
+							<Text size="sm" fw={600} c={dark ? "white" : "dimmed"}>
+								Aksi
+							</Text>
+						</Table.Th>
+					</Table.Tr>
+				</Table.Thead>
+				<Table.Tbody>
+					{displayData.map((product) => {
+						const stockStatus = getStockStatus(product.stok);
+						return (
+							<Table.Tr
+								key={product.id}
+								style={{
+									backgroundColor: dark ? "#141D34" : "white",
+								}}
+							>
+								<Table.Td>
+									<Text fw={600} c={dark ? "dark.0" : "#1e3a5f"}>
+										{product.produk}
+									</Text>
+								</Table.Td>
+								<Table.Td>
+									<Text size="sm" fw={600} c={dark ? "dark.0" : "#1e3a5f"}>
+										{formatCurrency(product.penjualanBulanIni)}
+									</Text>
+								</Table.Td>
+								<Table.Td>
+									<Text size="sm" c={dark ? "white" : "dimmed"}>
+										{formatCurrency(product.bulanLalu)}
+									</Text>
+								</Table.Td>
+								<Table.Td>
+									<Group gap="xs">
+										{product.trend >= 0 ? (
+											<IconArrowUp size={16} color="green" />
+										) : (
+											<IconArrowDown size={16} color="red" />
+										)}
+										<Text
+											size="sm"
+											fw={600}
+											c={product.trend >= 0 ? "green" : "red"}
+										>
+											{Math.abs(product.trend)}%
+										</Text>
+									</Group>
+								</Table.Td>
+								<Table.Td>
+									<Text size="sm" c={dark ? "dark.0" : "#1e3a5f"}>
+										{product.volume}
+									</Text>
+								</Table.Td>
+								<Table.Td>
+									<Badge variant="light" color={stockStatus.color} size="sm">
+										{product.stok} {product.unit} ({stockStatus.label})
+									</Badge>
+								</Table.Td>
+								<Table.Td>
+									<Button
+										variant="subtle"
+										size="compact-sm"
+										color="darmasaba-blue"
+										radius="xl"
+										onClick={() => onDetailClick?.(product)}
+									>
+										Detail
+									</Button>
+								</Table.Td>
+							</Table.Tr>
+						);
+					})}
+				</Table.Tbody>
+			</Table>
+		</Card>
+	);
+};
--- a/src/components/umkm/summary-cards.tsx
+++ b/src/components/umkm/summary-cards.tsx
@@ -0,0 +1,159 @@
+import {
+	Avatar,
+	Card,
+	Grid,
+	GridCol,
+	Group,
+	Stack,
+	Text,
+	useMantineColorScheme,
+} from "@mantine/core";
+import {
+	IconCategory,
+	IconCurrencyDollar,
+	IconTrendingUp,
+	IconUsers,
+} from "@tabler/icons-react";
+
+interface KpiCardProps {
+	title: string;
+	value: string | number;
+	subtitle?: string;
+	icon: React.ReactNode;
+	color: string;
+	backgroundColor: string;
+}
+
+const KpiCard = ({
+	title,
+	value,
+	subtitle,
+	icon,
+	color,
+	backgroundColor,
+}: KpiCardProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	const formatValue = (val: string | number) => {
+		if (typeof val === "number") {
+			if (val >= 1000000) {
+				return `${(val / 1000000).toFixed(1)}M`;
+			}
+			if (val >= 1000) {
+				return `${(val / 1000).toFixed(1)}K`;
+			}
+			return val.toLocaleString();
+		}
+		return val;
+	};
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+		>
+			<Group justify="space-between" align="center">
+				<Stack gap={2}>
+					<Text size="sm" c={dark ? "dark.3" : "dimmed"} fw={500}>
+						{title}
+					</Text>
+					<Text size="xl" fw={700} c={dark ? "white" : "#1e3a5f"}>
+						{formatValue(value)}
+					</Text>
+					{subtitle && (
+						<Text size="xs" c={dark ? "white" : "gray.6"}>
+							{subtitle}
+						</Text>
+					)}
+				</Stack>
+				<Avatar
+					color={color}
+					bg={backgroundColor}
+					size={40}
+					radius="xl"
+					style={{
+						display: "flex",
+						alignItems: "center",
+						justifyContent: "center",
+					}}
+				>
+					{icon}
+				</Avatar>
+			</Group>
+		</Card>
+	);
+};
+
+interface SummaryCardsProps {
+	data?: {
+		umkmAktif: number;
+		umkmTerdaftar: number;
+		omzet: number;
+		kategoriTerbanyak: { count: number; name: string };
+	};
+}
+
+export const SummaryCards = ({ data }: SummaryCardsProps) => {
+	const defaultData = {
+		umkmAktif: 45,
+		umkmTerdaftar: 68,
+		omzet: 48000000,
+		kategoriTerbanyak: { count: 34, name: "Kuliner" },
+	};
+
+	const displayData = data || defaultData;
+
+	const kpiData: KpiCardProps[] = [
+		{
+			title: "UMKM Aktif",
+			value: displayData.umkmAktif,
+			subtitle: "Beroperasi",
+			icon: <IconCurrencyDollar size={25} />,
+			color: "white",
+			backgroundColor: "#1E3A5F",
+		},
+		{
+			title: "UMKM Terdaftar",
+			value: displayData.umkmTerdaftar,
+			subtitle: "Total registrasi",
+			icon: <IconUsers size={25} />,
+			color: "white",
+			backgroundColor: "#1E3A5F",
+		},
+		{
+			title: "Omzet",
+			value: displayData.omzet,
+			subtitle: "Omzet BUMDes per bulan",
+			icon: <IconTrendingUp size={25} />,
+			color: "white",
+			backgroundColor: "#1E3A5F",
+		},
+		{
+			title: "UMKM Terbanyak",
+			value: displayData.kategoriTerbanyak.count,
+			subtitle: `Kategori ${displayData.kategoriTerbanyak.name}`,
+			icon: <IconTrendingUp size={25} />,
+			color: "white",
+			backgroundColor: "#1E3A5F",
+		},
+	];
+
+	return (
+		<Grid gutter="md">
+			{kpiData.map((kpi, index) => (
+				<GridCol key={index} span={{ base: 12, sm: 6, lg: 3 }}>
+					<KpiCard {...kpi} />
+				</GridCol>
+			))}
+		</Grid>
+	);
+};
--- a/src/components/umkm/top-products.tsx
+++ b/src/components/umkm/top-products.tsx
@@ -0,0 +1,144 @@
+import {
+	Badge,
+	Card,
+	Group,
+	Stack,
+	Text,
+	Title,
+	useMantineColorScheme,
+} from "@mantine/core";
+
+interface TopProduct {
+	rank: number;
+	name: string;
+	umkmName: string;
+	revenue: number;
+	quantitySold: number;
+	trend: number;
+}
+
+interface TopProductsProps {
+	products?: TopProduct[];
+}
+
+const formatCurrency = (value: number) => {
+	if (value >= 1000000) {
+		return `${(value / 1000000).toFixed(1)}M`;
+	}
+	if (value >= 1000) {
+		return `${(value / 1000).toFixed(0)}K`;
+	}
+	return value.toString();
+};
+
+const formatNumber = (value: number) => {
+	if (value >= 1000) {
+		return `${(value / 1000).toFixed(1)}K`;
+	}
+	return value.toString();
+};
+
+export const TopProducts = ({ products }: TopProductsProps) => {
+	const { colorScheme } = useMantineColorScheme();
+	const dark = colorScheme === "dark";
+
+	const defaultProducts: TopProduct[] = [
+		{
+			rank: 1,
+			name: "Beras Premium Organik",
+			umkmName: "Warung Pak Joko",
+			revenue: 8500000,
+			quantitySold: 650,
+			trend: 12,
+		},
+		{
+			rank: 2,
+			name: "Keripik Singkong",
+			umkmName: "Ibu Sari Snack",
+			revenue: 4200000,
+			quantitySold: 320,
+			trend: 8,
+		},
+		{
+			rank: 3,
+			name: "Madu Alami",
+			umkmName: "Peternakan Lebah",
+			revenue: 3750000,
+			quantitySold: 150,
+			trend: 5,
+		},
+	];
+
+	const displayProducts = products || defaultProducts;
+
+	const getRankColor = (rank: number) => {
+		if (rank === 1) return "yellow";
+		if (rank === 2) return "gray";
+		if (rank === 3) return "orange";
+		return "blue";
+	};
+
+	return (
+		<Card
+			p="md"
+			radius="xl"
+			withBorder
+			shadow="sm"
+			bg={dark ? "#1E293B" : "white"}
+			style={{
+				borderColor: dark ? "#334155" : "white",
+				boxShadow: "0 1px 3px 0 rgb(0 0 0 / 0.1)",
+				transition: "transform 0.15s ease, box-shadow 0.15s ease",
+			}}
+		>
+			<Title order={4} mb="md" c={dark ? "dark.0" : "#1e3a5f"}>
+				Top 3 Produk Terlaris
+			</Title>
+			<Stack gap="sm">
+				{displayProducts.map((product) => (
+					<Group key={product.rank} justify="space-between" align="center">
+						<Group gap="sm">
+							<Badge
+								variant="filled"
+								color={getRankColor(product.rank)}
+								radius="xl"
+								size="lg"
+								w={30}
+								h={30}
+							>
+								{product.rank}
+							</Badge>
+							<Stack gap={0}>
+								<Text fw={600} c={dark ? "white" : "#1e3a5f"}>
+									{product.name}
+								</Text>
+								<Text size="sm" c={dark ? "white" : "dimmed"}>
+									{product.umkmName}
+								</Text>
+								<Group gap="xs" mt={2}>
+									<Text size="xs" c={dark ? "white" : "gray.6"}>
+										Rp {formatCurrency(product.revenue)}
+									</Text>
+									<Text size="xs" c={dark ? "white" : "gray.6"}>
+										•
+									</Text>
+									<Text size="xs" c={dark ? "white" : "gray.6"}>
+										{formatNumber(product.quantitySold)} terjual
+									</Text>
+								</Group>
+							</Stack>
+						</Group>
+						<Badge
+							variant="light"
+							color={product.trend >= 0 ? "green" : "red"}
+							size="sm"
+						>
+							{product.trend >= 0 ? "+" : ""}
+							{product.trend}%
+						</Badge>
+					</Group>
+				))}
+			</Stack>
+		</Card>
+	);
+};
--- a/src/hooks/use-sidebar-fullscreen.ts
+++ b/src/hooks/use-sidebar-fullscreen.ts
@@ -0,0 +1,35 @@
+import { useDisclosure } from "@mantine/hooks";
+import { useState } from "react";
+
+export function useSidebarFullscreen() {
+	const [opened, { toggle: toggleMobile }] = useDisclosure();
+	const [sidebarCollapsed, setSidebarCollapsed] = useDisclosure(false);
+	const [clickCount, setClickCount] = useState(0);
+
+	const toggleSidebar = () => {
+		setSidebarCollapsed.toggle();
+		setClickCount(0);
+	};
+
+	const handleMainClick = () => {
+		if (!sidebarCollapsed) {
+			const newCount = clickCount + 1;
+			setClickCount(newCount);
+
+			if (newCount === 2) {
+				toggleSidebar();
+			} else {
+				setTimeout(() => setClickCount(0), 300);
+			}
+		}
+	};
+
+	return {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+		isCollapsed: sidebarCollapsed,
+	};
+}
--- a/src/index.css
+++ b/src/index.css
@@ -1 +1 @@
-@import "tailwindcss";
+@import "tailwindcss";
--- a/src/index.ts
+++ b/src/index.ts
@@ -12,240 +12,240 @@ const isProduction = process.env.NODE_ENV === "production";

 // Auto-seed database in production (ensure admin user exists)
 if (isProduction && process.env.ADMIN_EMAIL) {
-  try {
-    console.log("🌱 Running database seed in production...");
-    const { runSeed } = await import("../prisma/seed.ts");
-    await runSeed();
-  } catch (error) {
-    console.error("⚠️ Production seed failed:", error);
-    // Don't crash the server if seed fails
-  }
+	try {
+		console.log("🌱 Running database seed in production...");
+		const { runSeed } = await import("../prisma/seed.ts");
+		await runSeed();
+	} catch (error) {
+		console.error("⚠️ Production seed failed:", error);
+		// Don't crash the server if seed fails
+	}
 }

 const app = new Elysia().use(api);

 if (!isProduction) {
-  // Development: Use Vite middleware
-  const { createVite } = await import("./vite");
-  const vite = await createVite();
+	// Development: Use Vite middleware
+	const { createVite } = await import("./vite");
+	const vite = await createVite();

-  // Serve PWA/TWA assets in dev (root and nested path support)
-  const _servePwaAsset = (srcPath: string) => () => Bun.file(srcPath);
+	// Serve PWA/TWA assets in dev (root and nested path support)
+	const _servePwaAsset = (srcPath: string) => () => Bun.file(srcPath);

-  app.post("/__open-in-editor", ({ body }) => {
-    const { relativePath, lineNumber, columnNumber } = body as {
-      relativePath: string;
-      lineNumber: number;
-      columnNumber: number;
-    };
+	app.post("/__open-in-editor", ({ body }) => {
+		const { relativePath, lineNumber, columnNumber } = body as {
+			relativePath: string;
+			lineNumber: number;
+			columnNumber: number;
+		};

-    openInEditor(relativePath, {
-      line: lineNumber,
-      column: columnNumber,
-      editor: "antigravity",
-    });
+		openInEditor(relativePath, {
+			line: lineNumber,
+			column: columnNumber,
+			editor: "antigravity",
+		});

-    return { ok: true };
-  });
+		return { ok: true };
+	});

-  // Vite middleware for other requests
-  app.all("*", async ({ request }) => {
-    const url = new URL(request.url);
-    const pathname = url.pathname;
+	// Vite middleware for other requests
+	app.all("*", async ({ request }) => {
+		const url = new URL(request.url);
+		const pathname = url.pathname;

-    // Serve transformed index.html for root or any path that should be handled by the SPA
-    if (
-      pathname === "/" ||
-      (!pathname.includes(".") &&
-        !pathname.startsWith("/@") &&
-        !pathname.startsWith("/inspector") &&
-        !pathname.startsWith("/__open-stack-frame-in-editor") &&
-        !pathname.startsWith("/api"))
-    ) {
-      try {
-        const htmlPath = path.resolve("src/index.html");
-        let html = fs.readFileSync(htmlPath, "utf-8");
-        html = await vite.transformIndexHtml(pathname, html);
+		// Serve transformed index.html for root or any path that should be handled by the SPA
+		if (
+			pathname === "/" ||
+			(!pathname.includes(".") &&
+				!pathname.startsWith("/@") &&
+				!pathname.startsWith("/inspector") &&
+				!pathname.startsWith("/__open-stack-frame-in-editor") &&
+				!pathname.startsWith("/api"))
+		) {
+			try {
+				const htmlPath = path.resolve("src/index.html");
+				let html = fs.readFileSync(htmlPath, "utf-8");
+				html = await vite.transformIndexHtml(pathname, html);

-        return new Response(html, {
-          headers: { "Content-Type": "text/html" },
-        });
-      } catch (e) {
-        console.error(e);
-      }
-    }
+				return new Response(html, {
+					headers: { "Content-Type": "text/html" },
+				});
+			} catch (e) {
+				console.error(e);
+			}
+		}

-    return new Promise<Response>((resolve) => {
-      // Use a Proxy to mock Node.js req because Bun's Request is read-only
-      const req = new Proxy(request, {
-        get(target, prop) {
-          if (prop === "url") return pathname + url.search;
-          if (prop === "method") return request.method;
-          if (prop === "headers")
-            return Object.fromEntries(request.headers as any);
-          return (target as any)[prop];
-        },
-      }) as any;
+		return new Promise<Response>((resolve) => {
+			// Use a Proxy to mock Node.js req because Bun's Request is read-only
+			const req = new Proxy(request, {
+				get(target, prop) {
+					if (prop === "url") return pathname + url.search;
+					if (prop === "method") return request.method;
+					if (prop === "headers")
+						return Object.fromEntries(request.headers as any);
+					return (target as any)[prop];
+				},
+			}) as any;

-      const res = {
-        statusCode: 200,
-        setHeader(name: string, value: string) {
-          this.headers[name.toLowerCase()] = value;
-        },
-        getHeader(name: string) {
-          return this.headers[name.toLowerCase()];
-        },
-        writeHead(code: number, headers: Record<string, string>) {
-          this.statusCode = code;
-          Object.assign(this.headers, headers);
-        },
-        write(chunk: any, callback?: () => void) {
-          // Collect chunks for streaming responses
-          if (!this._chunks) this._chunks = [];
-          this._chunks.push(chunk);
-          if (callback) callback();
-          return true; // Indicate we can accept more data
-        },
-        headers: {} as Record<string, string>,
-        end(data: any) {
-          // Handle potential Buffer or string data from Vite
-          let body = data;
-          // If we have collected chunks from write() calls, combine them
-          if (this._chunks && this._chunks.length > 0) {
-            body = Buffer.concat(this._chunks);
-          }
-          if (data instanceof Uint8Array) {
-            body = data;
-          } else if (typeof data === "string") {
-            body = data;
-          } else if (data) {
-            body = String(data);
-          }
+			const res = {
+				statusCode: 200,
+				setHeader(name: string, value: string) {
+					this.headers[name.toLowerCase()] = value;
+				},
+				getHeader(name: string) {
+					return this.headers[name.toLowerCase()];
+				},
+				writeHead(code: number, headers: Record<string, string>) {
+					this.statusCode = code;
+					Object.assign(this.headers, headers);
+				},
+				write(chunk: any, callback?: () => void) {
+					// Collect chunks for streaming responses
+					if (!this._chunks) this._chunks = [];
+					this._chunks.push(chunk);
+					if (callback) callback();
+					return true; // Indicate we can accept more data
+				},
+				headers: {} as Record<string, string>,
+				end(data: any) {
+					// Handle potential Buffer or string data from Vite
+					let body = data;
+					// If we have collected chunks from write() calls, combine them
+					if (this._chunks && this._chunks.length > 0) {
+						body = Buffer.concat(this._chunks);
+					}
+					if (data instanceof Uint8Array) {
+						body = data;
+					} else if (typeof data === "string") {
+						body = data;
+					} else if (data) {
+						body = String(data);
+					}

-          resolve(
-            new Response(body || "", {
-              status: this.statusCode,
-              headers: this.headers,
-            }),
-          );
-        },
-        // Minimal event emitter mock
-        once() {
-          return this;
-        },
-        on() {
-          return this;
-        },
-        emit() {
-          return this;
-        },
-        removeListener() {
-          return this;
-        },
-      } as any;
+					resolve(
+						new Response(body || "", {
+							status: this.statusCode,
+							headers: this.headers,
+						}),
+					);
+				},
+				// Minimal event emitter mock
+				once() {
+					return this;
+				},
+				on() {
+					return this;
+				},
+				emit() {
+					return this;
+				},
+				removeListener() {
+					return this;
+				},
+			} as any;

-      vite.middlewares(req, res, (err: any) => {
-        if (err) {
-          console.error("Vite middleware error:", err);
-          resolve(new Response(err.stack || err.toString(), { status: 500 }));
-          return;
-        }
-        // If Vite doesn't handle it, return 404
-        resolve(new Response("Not Found", { status: 404 }));
-      });
-    });
-  });
+			vite.middlewares(req, res, (err: any) => {
+				if (err) {
+					console.error("Vite middleware error:", err);
+					resolve(new Response(err.stack || err.toString(), { status: 500 }));
+					return;
+				}
+				// If Vite doesn't handle it, return 404
+				resolve(new Response("Not Found", { status: 404 }));
+			});
+		});
+	});
 } else {
-  // Production: Final catch-all for static files and SPA fallback
-  app.all("*", async ({ request }) => {
-    const url = new URL(request.url);
-    const pathname = url.pathname;
+	// Production: Final catch-all for static files and SPA fallback
+	app.all("*", async ({ request }) => {
+		const url = new URL(request.url);
+		const pathname = url.pathname;

-    // 1. Try exact match in dist
-    let filePath = path.join(
-      "dist",
-      pathname === "/" ? "index.html" : pathname,
-    );
+		// 1. Try exact match in dist
+		let filePath = path.join(
+			"dist",
+			pathname === "/" ? "index.html" : pathname,
+		);

-    // 1.1 Special handling for PWA/TWA assets that might not be in dist (since we use custom bun build)
-    if (isProduction) {
-      const srcPath = path.join("src", pathname);
-      if (fs.existsSync(srcPath)) {
-        filePath = srcPath;
-      }
-      // Check public folder for static assets
-      const publicPath = path.join("public", pathname);
-      if (fs.existsSync(publicPath)) {
-        filePath = publicPath;
-      }
-    }
+		// 1.1 Special handling for PWA/TWA assets that might not be in dist (since we use custom bun build)
+		if (isProduction) {
+			const srcPath = path.join("src", pathname);
+			if (fs.existsSync(srcPath)) {
+				filePath = srcPath;
+			}
+			// Check public folder for static assets
+			const publicPath = path.join("public", pathname);
+			if (fs.existsSync(publicPath)) {
+				filePath = publicPath;
+			}
+		}

-    // 2. If not found and looks like an asset (has extension), try root of dist or src
-    if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
-      if (pathname.includes(".") && !pathname.endsWith("/")) {
-        const filename = path.basename(pathname);
+		// 2. If not found and looks like an asset (has extension), try root of dist or src
+		if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
+			if (pathname.includes(".") && !pathname.endsWith("/")) {
+				const filename = path.basename(pathname);

-        // Try root of dist
-        const fallbackDistPath = path.join("dist", filename);
-        if (
-          fs.existsSync(fallbackDistPath) &&
-          fs.statSync(fallbackDistPath).isFile()
-        ) {
-          filePath = fallbackDistPath;
-        }
-        // Try public folder
-        else {
-          const fallbackPublicPath = path.join("public", filename);
-          if (
-            fs.existsSync(fallbackPublicPath) &&
-            fs.statSync(fallbackPublicPath).isFile()
-          ) {
-            filePath = fallbackPublicPath;
-          }
-        }
-        // Special handling for PWA files in src
-        if (pathname.includes("assetlinks.json")) {
-          const srcFilename = pathname.includes("assetlinks.json")
-            ? ".well-known/assetlinks.json"
-            : filename;
-          const fallbackSrcPath = path.join("src", srcFilename);
-          if (
-            fs.existsSync(fallbackSrcPath) &&
-            fs.statSync(fallbackSrcPath).isFile()
-          ) {
-            filePath = fallbackSrcPath;
-          }
-        }
-      }
-    }
+				// Try root of dist
+				const fallbackDistPath = path.join("dist", filename);
+				if (
+					fs.existsSync(fallbackDistPath) &&
+					fs.statSync(fallbackDistPath).isFile()
+				) {
+					filePath = fallbackDistPath;
+				}
+				// Try public folder
+				else {
+					const fallbackPublicPath = path.join("public", filename);
+					if (
+						fs.existsSync(fallbackPublicPath) &&
+						fs.statSync(fallbackPublicPath).isFile()
+					) {
+						filePath = fallbackPublicPath;
+					}
+				}
+				// Special handling for PWA files in src
+				if (pathname.includes("assetlinks.json")) {
+					const srcFilename = pathname.includes("assetlinks.json")
+						? ".well-known/assetlinks.json"
+						: filename;
+					const fallbackSrcPath = path.join("src", srcFilename);
+					if (
+						fs.existsSync(fallbackSrcPath) &&
+						fs.statSync(fallbackSrcPath).isFile()
+					) {
+						filePath = fallbackSrcPath;
+					}
+				}
+			}
+		}

-    if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
-      const file = Bun.file(filePath);
-      return new Response(file, {
-        headers: {
-          Vary: "Accept-Encoding",
-        },
-      });
-    }
+		if (fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
+			const file = Bun.file(filePath);
+			return new Response(file, {
+				headers: {
+					Vary: "Accept-Encoding",
+				},
+			});
+		}

-    // 3. SPA Fallback: Serve index.html
-    const indexHtml = path.join("dist", "index.html");
-    if (fs.existsSync(indexHtml)) {
-      return new Response(Bun.file(indexHtml), {
-        headers: {
-          Vary: "Accept-Encoding",
-        },
-      });
-    }
+		// 3. SPA Fallback: Serve index.html
+		const indexHtml = path.join("dist", "index.html");
+		if (fs.existsSync(indexHtml)) {
+			return new Response(Bun.file(indexHtml), {
+				headers: {
+					Vary: "Accept-Encoding",
+				},
+			});
+		}

-    return new Response("Not Found", { status: 404 });
-  });
+		return new Response("Not Found", { status: 404 });
+	});
 }

 app.listen(PORT);

 console.log(
-  `🚀 Server running at http://localhost:${PORT} in ${isProduction ? "production" : "development"} mode`,
+	`🚀 Server running at http://localhost:${PORT} in ${isProduction ? "production" : "development"} mode`,
 );

 export type ApiApp = typeof app;
--- a/src/middleware/authMiddleware.tsx
+++ b/src/middleware/authMiddleware.tsx
@@ -61,19 +61,11 @@ type RouteRule = {

 const routeRules: RouteRule[] = [
 	// Public routes - no auth required
-	{
-		match: (p) => p === "/" || p === "/signin" || p === "/signup",
-		requireAuth: false,
-	},
-	// Profile routes - auth required for all roles
-	{
-		match: (p) => p === "/profile" || p.startsWith("/profile/"),
-		requireAuth: true,
-		redirectTo: "/signin",
-	},
-	// Dashboard and main pages - auth required for all roles (not just admin)
 	{
 		match: (p) =>
+			p === "/" ||
+			p === "/signin" ||
+			p === "/signup" ||
 			p.startsWith("/kinerja-divisi") ||
 			p.startsWith("/pengaduan") ||
 			p.startsWith("/jenna") ||
@@ -83,7 +75,13 @@ const routeRules: RouteRule[] = [
 			p.startsWith("/sosial") ||
 			p.startsWith("/keamanan") ||
 			p.startsWith("/bantuan") ||
-			p.startsWith("/pengaturan"),
+			p.startsWith("/pengaturan") ||
+			p.startsWith("/users"),
+		requireAuth: false,
+	},
+	// Profile routes - auth required for all roles
+	{
+		match: (p) => p === "/profile" || p.startsWith("/profile/"),
 		requireAuth: true,
 		redirectTo: "/signin",
 	},
@@ -152,4 +150,4 @@ export function createProtectedRoute(options: ProtectedRouteOptions = {}) {
 * Default Middleware Export
 * ================================ */

-export const protectedRouteMiddleware = createProtectedRoute();
+export const protectedRouteMiddleware = createProtectedRoute();
--- a/src/routes/__root.tsx
+++ b/src/routes/__root.tsx
@@ -8,24 +8,18 @@ import { createRootRoute, Outlet } from "@tanstack/react-router";
 export const Route = createRootRoute({
 	component: RootComponent,
 	beforeLoad: async ({ location }) => {
-		// Only apply auth middleware for routes that need it
-		// Public routes: /, /signin, /signup
-		const isPublicRoute =
-			location.pathname === "/" ||
-			location.pathname === "/signin" ||
-			location.pathname === "/signup";
-
-		if (isPublicRoute) {
-			return;
-		}
-
-		// Apply protected route middleware for all other routes
+		// Apply protected route middleware for all routes
+		// The middleware will determine which routes are public vs protected
 		const context = await protectedRouteMiddleware({ location });
-		authStore.user = context?.user as any;
-		authStore.session = context?.session as any;
+		
+		// Only set auth store if we have user data (for protected routes)
+		if (context?.user) {
+			authStore.user = context?.user as any;
+			authStore.session = context?.session as any;
+		}
 	},
 });

 function RootComponent() {
 	return <Outlet />;
-}
+}
--- a/src/routes/admin/route.tsx
+++ b/src/routes/admin/route.tsx
@@ -37,10 +37,6 @@ import { authStore } from "../../store/auth";
 export const Route = createFileRoute("/admin")({
 	component: DashboardLayout,
 	beforeLoad: protectedRouteMiddleware,
-	onEnter({ context }) {
-		authStore.user = context?.user as any;
-		authStore.session = context?.session as any;
-	},
 });

 function DashboardLayout() {
--- a/src/routes/bantuan.tsx
+++ b/src/routes/bantuan.tsx
@@ -1,16 +1,22 @@
 import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
 import { createFileRoute } from "@tanstack/react-router";
 import { Header } from "@/components/header";
 import HelpPage from "@/components/help-page";
 import { Sidebar } from "@/components/sidebar";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";

 export const Route = createFileRoute("/bantuan")({
-	component: BantuanPage,
+	component: BantuanRoute,
 });

-function BantuanPage() {
-	const [opened, { toggle }] = useDisclosure();
+function BantuanRoute() {
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
 	const { colorScheme } = useMantineColorScheme();
 	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
 	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
@@ -22,14 +28,19 @@ function BantuanPage() {
 			navbar={{
 				width: 300,
 				breakpoint: "sm",
-				collapsed: { mobile: !opened },
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
 			}}
 			padding="md"
 		>
 			<AppShell.Header bg={headerBgColor}>
 				<Group h="100%" px="md">
-					<Burger opened={opened} onClick={toggle} hiddenFrom="sm" size="sm" />
-					<Header />
+					<Burger
+						opened={opened}
+						onClick={toggleMobile}
+						hiddenFrom="sm"
+						size="sm"
+					/>
+					<Header onSidebarToggle={toggleSidebar} />
 				</Group>
 			</AppShell.Header>

@@ -43,7 +54,11 @@ function BantuanPage() {
 				</div>
 			</AppShell.Navbar>

-			<AppShell.Main bg={mainBgColor}>
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
 				<HelpPage />
 			</AppShell.Main>
 		</AppShell>
--- a/src/routes/bumdes.tsx
+++ b/src/routes/bumdes.tsx
@@ -1,9 +1,66 @@
+import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
 import { createFileRoute } from "@tanstack/react-router";
+import BumdesPage from "@/components/bumdes-page";
+import { Header } from "@/components/header";
+import { Sidebar } from "@/components/sidebar";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";

 export const Route = createFileRoute("/bumdes")({
-	component: RouteComponent,
+	component: BumdesRoute,
 });

-function RouteComponent() {
-	return <div>Hello "/bumdes"!</div>;
+function BumdesRoute() {
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
+	const { colorScheme } = useMantineColorScheme();
+	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
+	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
+	const mainBgColor = colorScheme === "dark" ? "#11192D" : "#edf3f8ff";
+
+	return (
+		<AppShell
+			header={{ height: 60 }}
+			navbar={{
+				width: 300,
+				breakpoint: "sm",
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
+			}}
+			padding="md"
+		>
+			<AppShell.Header bg={headerBgColor}>
+				<Group h="100%" px="md">
+					<Burger
+						opened={opened}
+						onClick={toggleMobile}
+						hiddenFrom="sm"
+						size="sm"
+					/>
+					<Header onSidebarToggle={toggleSidebar} />
+				</Group>
+			</AppShell.Header>
+
+			<AppShell.Navbar
+				p="md"
+				bg={navbarBgColor}
+				style={{ display: "flex", flexDirection: "column" }}
+			>
+				<div style={{ flex: 1, overflowY: "auto" }}>
+					<Sidebar />
+				</div>
+			</AppShell.Navbar>
+
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
+				<BumdesPage />
+			</AppShell.Main>
+		</AppShell>
+	);
 }
--- a/src/routes/demografi-pekerjaan.tsx
+++ b/src/routes/demografi-pekerjaan.tsx
@@ -1,8 +1,8 @@
 import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
 import { createFileRoute } from "@tanstack/react-router";
 import { Header } from "@/components/header";
 import { Sidebar } from "@/components/sidebar";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";
 import DemografiPekerjaan from "../components/demografi-pekerjaan";

 export const Route = createFileRoute("/demografi-pekerjaan")({
@@ -10,7 +10,13 @@ export const Route = createFileRoute("/demografi-pekerjaan")({
 });

 function DemografiPekerjaanPage() {
-	const [opened, { toggle }] = useDisclosure();
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
 	const { colorScheme } = useMantineColorScheme();
 	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
 	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
@@ -22,14 +28,19 @@ function DemografiPekerjaanPage() {
 			navbar={{
 				width: 300,
 				breakpoint: "sm",
-				collapsed: { mobile: !opened },
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
 			}}
 			padding="md"
 		>
 			<AppShell.Header bg={headerBgColor}>
 				<Group h="100%" px="md">
-					<Burger opened={opened} onClick={toggle} hiddenFrom="sm" size="sm" />
-					<Header />
+					<Burger
+						opened={opened}
+						onClick={toggleMobile}
+						hiddenFrom="sm"
+						size="sm"
+					/>
+					<Header onSidebarToggle={toggleSidebar} />
 				</Group>
 			</AppShell.Header>

@@ -43,7 +54,11 @@ function DemografiPekerjaanPage() {
 				</div>
 			</AppShell.Navbar>

-			<AppShell.Main bg={mainBgColor}>
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
 				<DemografiPekerjaan />
 			</AppShell.Main>
 		</AppShell>
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -1,6 +1,7 @@
 import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
 import { createFileRoute } from "@tanstack/react-router";
+import { useState } from "react";
 import { DashboardContent } from "@/components/dashboard-content";
 import { Header } from "@/components/header";
 import { Sidebar } from "@/components/sidebar";
@@ -11,25 +12,41 @@ export const Route = createFileRoute("/")({

 function DashboardPage() {
 	const [opened, { toggle }] = useDisclosure();
+	const [sidebarCollapsed, setSidebarCollapsed] = useDisclosure(false);
+	const [clickCount, setClickCount] = useState(0);
 	const { colorScheme } = useMantineColorScheme();
 	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
 	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
 	const mainBgColor = colorScheme === "dark" ? "#11192D" : "#edf3f8ff";

+	const handleMainClick = () => {
+		if (!sidebarCollapsed) {
+			const newCount = clickCount + 1;
+			setClickCount(newCount);
+
+			if (newCount === 2) {
+				setSidebarCollapsed.toggle();
+				setClickCount(0);
+			} else {
+				setTimeout(() => setClickCount(0), 300);
+			}
+		}
+	};
+
 	return (
 		<AppShell
 			header={{ height: 60 }}
 			navbar={{
 				width: 300,
 				breakpoint: "sm",
-				collapsed: { mobile: !opened },
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
 			}}
 			padding="md"
 		>
 			<AppShell.Header bg={headerBgColor}>
 				<Group h="100%" px="md">
 					<Burger opened={opened} onClick={toggle} hiddenFrom="sm" size="sm" />
-					<Header />
+					<Header onSidebarToggle={setSidebarCollapsed.toggle} />
 				</Group>
 			</AppShell.Header>

@@ -43,9 +60,13 @@ function DashboardPage() {
 				</div>
 			</AppShell.Navbar>

-			<AppShell.Main bg={mainBgColor}>
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
 				<DashboardContent />
 			</AppShell.Main>
 		</AppShell>
 	);
-}
+}
--- a/src/routes/jenna-analytic.tsx
+++ b/src/routes/jenna-analytic.tsx
@@ -1,9 +1,66 @@
+import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
 import { createFileRoute } from "@tanstack/react-router";
+import { Header } from "@/components/header";
+import JennaAnalytic from "@/components/jenna-analytic";
+import { Sidebar } from "@/components/sidebar";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";

 export const Route = createFileRoute("/jenna-analytic")({
-	component: RouteComponent,
+	component: JennaAnalyticPage,
 });

-function RouteComponent() {
-	return <div>Hello "/jenna-analytic"!</div>;
+function JennaAnalyticPage() {
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
+	const { colorScheme } = useMantineColorScheme();
+	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
+	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
+	const mainBgColor = colorScheme === "dark" ? "#11192D" : "#edf3f8ff";
+
+	return (
+		<AppShell
+			header={{ height: 60 }}
+			navbar={{
+				width: 300,
+				breakpoint: "sm",
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
+			}}
+			padding="md"
+		>
+			<AppShell.Header bg={headerBgColor}>
+				<Group h="100%" px="md">
+					<Burger
+						opened={opened}
+						onClick={toggleMobile}
+						hiddenFrom="sm"
+						size="sm"
+					/>
+					<Header onSidebarToggle={toggleSidebar} />
+				</Group>
+			</AppShell.Header>
+
+			<AppShell.Navbar
+				p="md"
+				bg={navbarBgColor}
+				style={{ display: "flex", flexDirection: "column" }}
+			>
+				<div style={{ flex: 1, overflowY: "auto" }}>
+					<Sidebar />
+				</div>
+			</AppShell.Navbar>
+
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
+				<JennaAnalytic />
+			</AppShell.Main>
+		</AppShell>
+	);
 }
--- a/src/routes/keamanan.tsx
+++ b/src/routes/keamanan.tsx
@@ -1,9 +1,66 @@
+import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
 import { createFileRoute } from "@tanstack/react-router";
+import { Header } from "@/components/header";
+import KeamananPage from "@/components/keamanan-page";
+import { Sidebar } from "@/components/sidebar";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";

 export const Route = createFileRoute("/keamanan")({
-	component: RouteComponent,
+	component: KeamananRoute,
 });

-function RouteComponent() {
-	return <div>Hello "/keamanan"!</div>;
+function KeamananRoute() {
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
+	const { colorScheme } = useMantineColorScheme();
+	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
+	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
+	const mainBgColor = colorScheme === "dark" ? "#11192D" : "#edf3f8ff";
+
+	return (
+		<AppShell
+			header={{ height: 60 }}
+			navbar={{
+				width: 300,
+				breakpoint: "sm",
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
+			}}
+			padding="md"
+		>
+			<AppShell.Header bg={headerBgColor}>
+				<Group h="100%" px="md">
+					<Burger
+						opened={opened}
+						onClick={toggleMobile}
+						hiddenFrom="sm"
+						size="sm"
+					/>
+					<Header onSidebarToggle={toggleSidebar} />
+				</Group>
+			</AppShell.Header>
+
+			<AppShell.Navbar
+				p="md"
+				bg={navbarBgColor}
+				style={{ display: "flex", flexDirection: "column" }}
+			>
+				<div style={{ flex: 1, overflowY: "auto" }}>
+					<Sidebar />
+				</div>
+			</AppShell.Navbar>
+
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
+				<KeamananPage />
+			</AppShell.Main>
+		</AppShell>
+	);
 }
--- a/src/routes/keuangan-anggaran.tsx
+++ b/src/routes/keuangan-anggaran.tsx
@@ -1,16 +1,22 @@
 import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
 import { createFileRoute } from "@tanstack/react-router";
 import { Header } from "@/components/header";
 import KeuanganAnggaran from "@/components/keuangan-anggaran";
 import { Sidebar } from "@/components/sidebar";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";

 export const Route = createFileRoute("/keuangan-anggaran")({
 	component: KeuanganAnggaranPage,
 });

 function KeuanganAnggaranPage() {
-	const [opened, { toggle }] = useDisclosure();
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
 	const { colorScheme } = useMantineColorScheme();
 	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
 	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
@@ -22,14 +28,19 @@ function KeuanganAnggaranPage() {
 			navbar={{
 				width: 300,
 				breakpoint: "sm",
-				collapsed: { mobile: !opened },
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
 			}}
 			padding="md"
 		>
 			<AppShell.Header bg={headerBgColor}>
 				<Group h="100%" px="md">
-					<Burger opened={opened} onClick={toggle} hiddenFrom="sm" size="sm" />
-					<Header />
+					<Burger
+						opened={opened}
+						onClick={toggleMobile}
+						hiddenFrom="sm"
+						size="sm"
+					/>
+					<Header onSidebarToggle={toggleSidebar} />
 				</Group>
 			</AppShell.Header>

@@ -43,7 +54,11 @@ function KeuanganAnggaranPage() {
 				</div>
 			</AppShell.Navbar>

-			<AppShell.Main bg={mainBgColor}>
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
 				<KeuanganAnggaran />
 			</AppShell.Main>
 		</AppShell>
--- a/src/routes/kinerja-divisi.tsx
+++ b/src/routes/kinerja-divisi.tsx
@@ -1,16 +1,22 @@
 import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
 import { createFileRoute } from "@tanstack/react-router";
 import { Header } from "@/components/header";
 import KinerjaDivisi from "@/components/kinerja-divisi";
 import { Sidebar } from "@/components/sidebar";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";

 export const Route = createFileRoute("/kinerja-divisi")({
 	component: KinerjaDivisiPage,
 });

 function KinerjaDivisiPage() {
-	const [opened, { toggle }] = useDisclosure();
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
 	const { colorScheme } = useMantineColorScheme();
 	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
 	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
@@ -22,14 +28,19 @@ function KinerjaDivisiPage() {
 			navbar={{
 				width: 300,
 				breakpoint: "sm",
-				collapsed: { mobile: !opened },
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
 			}}
 			padding="md"
 		>
 			<AppShell.Header bg={headerBgColor}>
 				<Group h="100%" px="md">
-					<Burger opened={opened} onClick={toggle} hiddenFrom="sm" size="sm" />
-					<Header />
+					<Burger
+						opened={opened}
+						onClick={toggleMobile}
+						hiddenFrom="sm"
+						size="sm"
+					/>
+					<Header onSidebarToggle={toggleSidebar} />
 				</Group>
 			</AppShell.Header>

@@ -43,7 +54,11 @@ function KinerjaDivisiPage() {
 				</div>
 			</AppShell.Navbar>

-			<AppShell.Main bg={mainBgColor}>
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
 				<KinerjaDivisi />
 			</AppShell.Main>
 		</AppShell>
--- a/src/routes/pengaduan-layanan-publik.tsx
+++ b/src/routes/pengaduan-layanan-publik.tsx
@@ -1,16 +1,22 @@
 import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
-import { useDisclosure } from "@mantine/hooks";
 import { createFileRoute } from "@tanstack/react-router";
 import { Header } from "@/components/header";
 import PengaduanLayananPublik from "@/components/pengaduan-layanan-publik";
 import { Sidebar } from "@/components/sidebar";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";

 export const Route = createFileRoute("/pengaduan-layanan-publik")({
 	component: PengaduanLayananPublikPage,
 });

 function PengaduanLayananPublikPage() {
-	const [opened, { toggle }] = useDisclosure();
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
 	const { colorScheme } = useMantineColorScheme();
 	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
 	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
@@ -22,14 +28,19 @@ function PengaduanLayananPublikPage() {
 			navbar={{
 				width: 300,
 				breakpoint: "sm",
-				collapsed: { mobile: !opened },
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
 			}}
 			padding="md"
 		>
 			<AppShell.Header bg={headerBgColor}>
 				<Group h="100%" px="md">
-					<Burger opened={opened} onClick={toggle} hiddenFrom="sm" size="sm" />
-					<Header />
+					<Burger
+						opened={opened}
+						onClick={toggleMobile}
+						hiddenFrom="sm"
+						size="sm"
+					/>
+					<Header onSidebarToggle={toggleSidebar} />
 				</Group>
 			</AppShell.Header>

@@ -43,7 +54,11 @@ function PengaduanLayananPublikPage() {
 				</div>
 			</AppShell.Navbar>

-			<AppShell.Main bg={mainBgColor}>
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
 				<PengaduanLayananPublik />
 			</AppShell.Main>
 		</AppShell>
--- a/src/routes/pengaturan/akses-dan-tim.tsx
+++ b/src/routes/pengaturan/akses-dan-tim.tsx
@@ -1,9 +1,10 @@
 import { createFileRoute } from "@tanstack/react-router";
+import AksesDanTimSettings from "@/components/pengaturan/akses-dan-tim";

 export const Route = createFileRoute("/pengaturan/akses-dan-tim")({
 	component: RouteComponent,
 });

 function RouteComponent() {
-	return <div>Hello "/pengaturan/akses-dan-tim"!</div>;
+	return <AksesDanTimSettings />;
 }
--- a/src/routes/pengaturan/keamanan.tsx
+++ b/src/routes/pengaturan/keamanan.tsx
@@ -1,9 +1,10 @@
 import { createFileRoute } from "@tanstack/react-router";
+import KeamananSettings from "@/components/pengaturan/keamanan";

 export const Route = createFileRoute("/pengaturan/keamanan")({
 	component: RouteComponent,
 });

 function RouteComponent() {
-	return <div>Hello "/pengaturan/keamanan"!</div>;
+	return <KeamananSettings />;
 }
--- a/src/routes/pengaturan/notifikasi.tsx
+++ b/src/routes/pengaturan/notifikasi.tsx
@@ -1,9 +1,10 @@
 import { createFileRoute } from "@tanstack/react-router";
+import NotifikasiSettings from "@/components/pengaturan/notifikasi";

 export const Route = createFileRoute("/pengaturan/notifikasi")({
 	component: RouteComponent,
 });

 function RouteComponent() {
-	return <div>Hello "/pengaturan/notifikasi"!</div>;
+	return <NotifikasiSettings />;
 }
--- a/src/routes/pengaturan/route.tsx
+++ b/src/routes/pengaturan/route.tsx
@@ -1,21 +1,27 @@
+import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
+import { useMediaQuery } from "@mantine/hooks";
 import {
-	AppShell,
-	Burger,
-	Group,
-	useMantineColorScheme,
-} from "@mantine/core";
-import { useDisclosure, useMediaQuery } from "@mantine/hooks";
-import { createFileRoute, Outlet, useRouterState } from "@tanstack/react-router";
+	createFileRoute,
+	Outlet,
+	useRouterState,
+} from "@tanstack/react-router";
 import { useEffect } from "react";
 import { Header } from "@/components/header";
 import { Sidebar } from "@/components/sidebar";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";

 export const Route = createFileRoute("/pengaturan")({
 	component: PengaturanLayout,
 });

 function PengaturanLayout() {
-	const [opened, { toggle, close }] = useDisclosure();
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
 	const { colorScheme } = useMantineColorScheme();

 	const isMobile = useMediaQuery("(max-width: 48em)");
@@ -28,9 +34,9 @@ function PengaturanLayout() {
 	// Auto close navbar on route change (mobile only)
 	useEffect(() => {
 		if (isMobile && opened) {
-			close();
+			toggleMobile();
 		}
-	}, [routerState.location.pathname, isMobile, opened, close]);
+	}, [routerState.location.pathname, isMobile, opened, toggleMobile]);

 	return (
 		<AppShell
@@ -38,7 +44,7 @@ function PengaturanLayout() {
 			navbar={{
 				width: 300,
 				breakpoint: "sm",
-				collapsed: { mobile: !opened },
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
 			}}
 			padding="md"
 		>
@@ -46,11 +52,11 @@ function PengaturanLayout() {
 				<Group h="100%" px="lg" align="center" wrap="nowrap">
 					<Burger
 						opened={opened}
-						onClick={toggle}
+						onClick={toggleMobile}
 						hiddenFrom="sm"
 						size="sm"
 					/>
-					<Header />
+					<Header onSidebarToggle={toggleSidebar} />
 				</Group>
 			</AppShell.Header>

@@ -64,7 +70,11 @@ function PengaturanLayout() {
 				</div>
 			</AppShell.Navbar>

-			<AppShell.Main bg={mainBgColor}>
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
 				<div className="p-2">
 					<Outlet />
 				</div>
--- a/src/routes/profile/edit.tsx
+++ b/src/routes/profile/edit.tsx
@@ -21,10 +21,6 @@ import { authStore } from "../../store/auth";
 export const Route = createFileRoute("/profile/edit")({
 	component: EditProfile,
 	beforeLoad: protectedRouteMiddleware,
-	onEnter({ context }) {
-		authStore.user = context?.user as any;
-		authStore.session = context?.session as any;
-	},
 });

 function EditProfile() {
--- a/src/routes/profile/index.tsx
+++ b/src/routes/profile/index.tsx
@@ -41,10 +41,6 @@ import { authStore } from "../../store/auth";
 export const Route = createFileRoute("/profile/")({
 	component: Profile,
 	beforeLoad: protectedRouteMiddleware,
-	onEnter({ context }) {
-		authStore.user = context?.user as any;
-		authStore.session = context?.session as any;
-	},
 });

 function Profile() {
--- a/src/routes/sosial.tsx
+++ b/src/routes/sosial.tsx
@@ -1,9 +1,66 @@
+import { AppShell, Burger, Group, useMantineColorScheme } from "@mantine/core";
 import { createFileRoute } from "@tanstack/react-router";
+import { Header } from "@/components/header";
+import { Sidebar } from "@/components/sidebar";
+import SosialPage from "@/components/sosial-page";
+import { useSidebarFullscreen } from "@/hooks/use-sidebar-fullscreen";

 export const Route = createFileRoute("/sosial")({
-	component: RouteComponent,
+	component: SosialRoute,
 });

-function RouteComponent() {
-	return <div>Hello "/sosial"!</div>;
+function SosialRoute() {
+	const {
+		opened,
+		toggleMobile,
+		sidebarCollapsed,
+		toggleSidebar,
+		handleMainClick,
+	} = useSidebarFullscreen();
+	const { colorScheme } = useMantineColorScheme();
+	const headerBgColor = colorScheme === "dark" ? "#11192D" : "#19355E";
+	const navbarBgColor = colorScheme === "dark" ? "#11192D" : "white";
+	const mainBgColor = colorScheme === "dark" ? "#11192D" : "#edf3f8ff";
+
+	return (
+		<AppShell
+			header={{ height: 60 }}
+			navbar={{
+				width: 300,
+				breakpoint: "sm",
+				collapsed: { mobile: !opened, desktop: sidebarCollapsed },
+			}}
+			padding="md"
+		>
+			<AppShell.Header bg={headerBgColor}>
+				<Group h="100%" px="md">
+					<Burger
+						opened={opened}
+						onClick={toggleMobile}
+						hiddenFrom="sm"
+						size="sm"
+					/>
+					<Header onSidebarToggle={toggleSidebar} />
+				</Group>
+			</AppShell.Header>
+
+			<AppShell.Navbar
+				p="md"
+				bg={navbarBgColor}
+				style={{ display: "flex", flexDirection: "column" }}
+			>
+				<div style={{ flex: 1, overflowY: "auto" }}>
+					<Sidebar />
+				</div>
+			</AppShell.Navbar>
+
+			<AppShell.Main
+				bg={mainBgColor}
+				onClick={handleMainClick}
+				style={{ cursor: sidebarCollapsed ? "default" : "pointer" }}
+			>
+				<SosialPage />
+			</AppShell.Main>
+		</AppShell>
+	);
 }
--- a/src/store/sosial.ts
+++ b/src/store/sosial.ts
@@ -0,0 +1,30 @@
+import { proxy } from "valtio";
+
+type SelectedYear = string;
+
+interface SosialState {
+	selectedYear: SelectedYear;
+	filters: {
+		dusun: string | null;
+		kategori: string | null;
+	};
+}
+
+export const sosialStore = proxy<SosialState>({
+	selectedYear: new Date().getFullYear().toString(),
+	filters: {
+		dusun: null,
+		kategori: null,
+	},
+});
+
+export const setYear = (year: SelectedYear) => {
+	sosialStore.selectedYear = year;
+};
+
+export const setFilter = (
+	key: keyof SosialState["filters"],
+	value: string | null,
+) => {
+	sosialStore.filters[key] = value;
+};
--- a/src/store/umkm.ts
+++ b/src/store/umkm.ts
@@ -0,0 +1,30 @@
+import { proxy } from "valtio";
+
+type TimeRange = "minggu" | "bulan";
+
+interface UmkmState {
+	selectedRange: TimeRange;
+	filters: {
+		kategori: string | null;
+		umkm: string | null;
+	};
+}
+
+export const umkmStore = proxy<UmkmState>({
+	selectedRange: "bulan",
+	filters: {
+		kategori: null,
+		umkm: null,
+	},
+});
+
+export const setRange = (range: TimeRange) => {
+	umkmStore.selectedRange = range;
+};
+
+export const setFilter = (
+	key: keyof UmkmState["filters"],
+	value: string | null,
+) => {
+	umkmStore.filters[key] = value;
+};
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -21,7 +21,7 @@ export const getEnv = (key: string, defaultValue = ""): string => {
 };

 export const VITE_PUBLIC_URL = (() => {
-	// Priority: 
+	// Priority:
 	// 1. BETTER_AUTH_URL (standard for better-auth)
 	// 2. VITE_PUBLIC_URL (our app standard)
 	// 3. window.location.origin (browser fallback)
Author	SHA1	Message	Date
nico	3eb84921a1	Fix Konsisten Warna Bg 4	2026-03-25 17:15:07 +08:00
nico	c6415c5aab	Fix Konsisten Warna Bg 2	2026-03-25 17:08:39 +08:00
nico	519a14adaa	Fix Konsisten Warna Bg 2	2026-03-25 17:02:18 +08:00
nico	366c08fbaa	Fix Konsisten Warna Bg	2026-03-25 16:46:59 +08:00
nico	5c09e7a0be	Fix Ga Perlu Akses Login Saat Ke Semua Fitur Dashboard	2026-03-25 15:35:20 +08:00
nico	7c8012d277	Fix Lint-1	2026-03-25 15:07:10 +08:00
nico	687ce11a81	Refactor New Ui Semua Pengaturan	2026-03-25 14:38:37 +08:00
nico	1ba4643e23	Refactor New Ui Pengaturan Umum	2026-03-25 11:56:22 +08:00
nico	113dd7ba6f	Refactor New Ui Sosial, Keamanan, & Bantuan	2026-03-25 11:10:50 +08:00
nico	71a305cd4b	Refactor New Ui Bumdes 02	2026-03-25 10:32:31 +08:00
nico	84b96ca3be	Refactor New Ui Bumdes	2026-03-25 00:09:38 +08:00
nico	8159216a2c	Refactor ui keuangan	2026-03-24 23:17:23 +08:00
nico	d714c09efc	Fix New UI Pengaduan	2026-03-18 00:43:44 +07:00
nico	0a97e31416	Fix New UI Pengaduan	2026-03-18 00:34:53 +07:00
nico	158a2db435	Fix New UI Pengaduan	2026-03-17 21:41:03 +07:00
nico	2d68d4dc06	Fix New UI Kinerja Divisi	2026-03-17 21:19:10 +07:00
nico	97e6caa332	Fix UI Beranda	2026-03-17 21:03:36 +07:00
nico	f0c37272b9	Progress Tampilan UI Dashboard Desa Plus NOC	2026-03-17 20:53:33 +07:00