diff --git a/public/SDGS-1.png b/public/SDGS-1.png new file mode 100644 index 0000000..2a0437e Binary files /dev/null and b/public/SDGS-1.png differ diff --git a/public/SDGS-16.png b/public/SDGS-16.png new file mode 100644 index 0000000..09821a1 Binary files /dev/null and b/public/SDGS-16.png differ diff --git a/public/SDGS-3.png b/public/SDGS-3.png new file mode 100644 index 0000000..b65cd01 Binary files /dev/null and b/public/SDGS-3.png differ diff --git a/public/SDGS-7.png b/public/SDGS-7.png new file mode 100644 index 0000000..c57ea96 Binary files /dev/null and b/public/SDGS-7.png differ diff --git a/src/components/dashboard-content.tsx b/src/components/dashboard-content.tsx index d0c8b8e..888caf4 100644 --- a/src/components/dashboard-content.tsx +++ b/src/components/dashboard-content.tsx @@ -1,4 +1,5 @@ import { + Briefcase, Calendar, CheckCircle, FileText, @@ -27,7 +28,9 @@ import { Card, // Added for icon containers Grid, Group, + Image, Progress, + SimpleGrid, Stack, Text, ThemeIcon, @@ -67,9 +70,16 @@ const eventData = [ ]; const apbdesData = [ - { name: "Belanja", value: 70, color: "blue" }, - { name: "Pendapatan", value: 90, color: "green" }, - { name: "Pembangunan", value: 50, color: "orange" }, + { name: "Belanja", value: 390, label: "390M" }, + { name: "Pendapatan", value: 470, label: "470M" }, + { name: "Pembiayaan", value: 290, label: "290M" }, +]; + +const sdgsData = [ + { label: "Desa Berenergi Bersih Dan Terbarukan", value: 99.64, image: "/SDGS-7.png" }, + { label: "Desa Damai Berkeadilan", value: 78.65, image: "/SDGS-16.png" }, + { label: "Desa Sehat Dan Sejahtera", value: 77.37, image: "/SDGS-3.png" }, + { label: "Desa Tanpa Kemiskinan", value: 52.62, image: "/SDGS-1.png" } ]; export function DashboardContent() { @@ -109,7 +119,7 @@ export function DashboardContent() { variant="filled" size="xl" radius="xl" - color={dark ? "gray" : "darmasaba-blue"} + color={dark ? "gray" : "darmasaba-navy"} > @@ -143,7 +153,7 @@ export function DashboardContent() { variant="filled" size="xl" radius="xl" - color={dark ? "gray" : "darmasaba-blue"} + color={dark ? "gray" : "darmasaba-navy"} > @@ -180,7 +190,7 @@ export function DashboardContent() { variant="filled" size="xl" radius="xl" - color={dark ? "gray" : "darmasaba-blue"} + color={dark ? "gray" : "darmasaba-navy"} > @@ -214,7 +224,7 @@ export function DashboardContent() { variant="filled" size="xl" radius="xl" - color={dark ? "gray" : "darmasaba-blue"} + color={dark ? "gray" : "darmasaba-navy"} > @@ -282,7 +292,7 @@ export function DashboardContent() { @@ -375,46 +385,7 @@ export function DashboardContent() { {/* Original SVG icon */} - - - - - - + Divisi Teraktif @@ -433,7 +404,7 @@ export function DashboardContent() { value={(divisi.value / 37) * 100} size="sm" radius="xl" - color="blue" + color="#1E3A5F" /> ))} @@ -459,7 +430,7 @@ export function DashboardContent() { @@ -493,18 +464,53 @@ export function DashboardContent() { {data.name} - + + + + {data.label} + + ))} + + {/* SDGS Desa */} + + + SDGS Desa + + + {sdgsData.map((data, index) => ( + + + + + + {data.label} + + + {data.value} + + + + + ))} + + ); } diff --git a/src/components/sidebar.tsx b/src/components/sidebar.tsx index bc25cde..53ee82b 100644 --- a/src/components/sidebar.tsx +++ b/src/components/sidebar.tsx @@ -61,6 +61,8 @@ export function Sidebar({ className }: SidebarProps) { (item) => location.pathname === item.path, ); + const headerBgColor = colorScheme === "dark" ? "#ebedf0ff" : "#19355E"; + return ( {/* Logo */} @@ -92,7 +94,7 @@ export function Sidebar({ className }: SidebarProps) { label={item.name} active={isActive} variant="subtle" - color="blue" + color={headerBgColor} style={{ background: isActive ? isActiveBg : "transparent", fontWeight: isActive ? "bold" : "normal", diff --git a/src/utils/auth.ts b/src/utils/auth.ts index 2622ba2..c2551c5 100644 --- a/src/utils/auth.ts +++ b/src/utils/auth.ts @@ -21,6 +21,7 @@ export const auth = betterAuth({ clientId: process.env.GITHUB_CLIENT_ID || "CLIENT_ID_MISSING", clientSecret: process.env.GITHUB_CLIENT_SECRET || "CLIENT_SECRET_MISSING", enabled: true, + redirectURI: `${baseUrl}/api/auth/callback/github`, }, }, user: {