correct color component

Reviewed-on: #3
Co-authored-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
Co-committed-by: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>

react-openapi/Admin.tsx

@@ -1,5 +1,4 @@
 import * as React from "react";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { useAuth, AuthPage } from "../react-auth";
 import { UploadProvider } from "./providers/UploadProvider";
 import AdminLayout from "./components/AdminLayout";
@@ -13,17 +12,17 @@ import {
   Route,
   useNavigate,
   useParams,
-  Navigate,
 } from "react-router-dom";
 
-const queryClient = new QueryClient();
-
-// Create a context for the app config
-export const ConfigContext = React.createContext<AppConfig | null>(null);
+import { ConfigContext } from "./providers/ConfigContext";
 
 function Dashboard({ basePath }: { basePath: string }) {
   const config = React.useContext(ConfigContext);
   const navigate = useNavigate();
+
+  const resources = config?.resources || [];
+  const visibleResources = resources.filter((res) => !res.hidden);
+
   return (
     <Box>
       <Typography variant="h4" gutterBottom>
@@ -41,7 +40,7 @@ function Dashboard({ basePath }: { basePath: string }) {
           mt: 4,
         }}
       >
-        {config?.resources.map((res) => (
+        {visibleResources.map((res) => (
           <Paper 
             key={res.name} 
             sx={{ 
@@ -51,7 +50,7 @@ function Dashboard({ basePath }: { basePath: string }) {
                 transition: 'transform 0.2s',
                 '&:hover': { transform: 'translateY(-4px)', boxShadow: 4 }
             }}
-            onClick={() => navigate(`${basePath}/${res.name}`)}
+            onClick={() => navigate(`/admin/${res.name}`)}
           >
             <Typography variant="h6" color="primary">{res.pluralLabel}</Typography>
             <Typography variant="body2" color="text.secondary">Manage {res.pluralLabel.toLowerCase()}</Typography>
@@ -69,6 +68,9 @@ function AdminApp({ basePath }: { basePath: string }) {
   const config = React.useContext(ConfigContext);
   const navigate = useNavigate();
 
+  const resources = config?.resources || [];
+  const visibleResources = resources.filter((res) => !res.hidden);
+
   if (!currentUser) {
     return (
       <AuthPage
@@ -88,8 +90,8 @@ function AdminApp({ basePath }: { basePath: string }) {
     <AdminLayout
       username={currentUser.username}
       onLogout={logout}
-      onSelectResource={(name) => navigate(`${basePath}/${name}`)}
-      resources={config?.resources || []}
+      onSelectResource={(name) => navigate(`/admin/${name}`)}
+      resources={visibleResources}
     >
       <Routes>
         <Route path="/" element={<Dashboard basePath={basePath} />} />
@@ -120,14 +122,17 @@ interface AdminProps {
 }
 
 export default function Admin({ basePath = "/admin", resourceOverrides = {}, profileConfig = {} }: AdminProps) {
-  const [config, setConfig] = React.useState<AppConfig | null>(null);
+  const existingConfig = React.useContext(ConfigContext);
+  const [config, setConfig] = React.useState<AppConfig | null>(existingConfig);
 
   React.useEffect(() => {
-    getAppConfig(resourceOverrides, profileConfig).then((cfg) => {
-      initializeApiClients(cfg.baseUrl, cfg.authBaseUrl);
-      setConfig(cfg);
-    });
-  }, [resourceOverrides, profileConfig]);
+    if (!existingConfig) {
+      getAppConfig(resourceOverrides, profileConfig).then((cfg) => {
+        initializeApiClients(cfg.baseUrl, cfg.authBaseUrl);
+        setConfig(cfg);
+      });
+    }
+  }, [resourceOverrides, profileConfig, existingConfig]);
 
   if (!config) {
     return (
@@ -144,13 +149,21 @@ export default function Admin({ basePath = "/admin", resourceOverrides = {}, pro
     );
   }
 
+  const content = (
+    <UploadProvider>
+      <AdminApp basePath={basePath} />
+    </UploadProvider>
+  );
+
+  // If we have an existing config, we are already inside a Provider and QueryClient
+  if (existingConfig) {
+    return content;
+  }
+
+  // Fallback for standalone usage
   return (
-    <QueryClientProvider client={queryClient}>
-      <ConfigContext.Provider value={config}>
-        <UploadProvider>
-          <AdminApp basePath={basePath} />
-        </UploadProvider>
-      </ConfigContext.Provider>
-    </QueryClientProvider>
+    <ConfigContext.Provider value={config}>
+      {content}
+    </ConfigContext.Provider>
   );
 }

react-openapi/api/client.ts

@@ -7,6 +7,28 @@ import { createApiClient } from "../../react-auth";
 let _api: AxiosInstance | null = null;
 let _auth: AxiosInstance | null = null;
 
+function withParamsSerializer(instance: AxiosInstance): AxiosInstance {
+  instance.defaults.paramsSerializer = {
+    serialize: (params) => {
+      const searchParams = new URLSearchParams();
+
+      Object.entries(params).forEach(([key, value]) => {
+        if (Array.isArray(value)) {
+          value.forEach((v) => {
+            searchParams.append(key, String(v)); // NO []
+          });
+        } else if (value !== undefined && value !== null) {
+          searchParams.append(key, String(value));
+        }
+      });
+
+      return searchParams.toString();
+    },
+  };
+
+  return instance;
+}
+
 export const api = {
   get: (...args: Parameters<AxiosInstance["get"]>) => {
     if (!_api) throw new Error("API client not initialized");
@@ -38,6 +60,6 @@ export const auth = {
 };
 
 export function initializeApiClients(baseUrl: string, authBaseUrl: string) {
-  _api = createApiClient(baseUrl);
-  _auth = createApiClient(authBaseUrl);
+  _api = withParamsSerializer(createApiClient(baseUrl));
+  _auth = withParamsSerializer(createApiClient(authBaseUrl));
 }

react-openapi/components/EnhancedTable.tsx

@@ -104,12 +104,12 @@ export default function EnhancedTable({
         <GridActionsCellItem
           icon={<VisibilityIcon />}
           label="View"
-          onClick={() => navigate(`/${config.name}/${params.id}`)}
+          onClick={() => navigate(`/admin/${config.name}/${params.id}`)}
         />,
         <GridActionsCellItem
           icon={<EditIcon />}
           label="Edit"
-          onClick={() => navigate(`/${config.name}/edit/${params.id}`)}
+          onClick={() => navigate(`/admin/${config.name}/edit/${params.id}`)}
         />,
         <GridActionsCellItem
           icon={<DeleteIcon />}
@@ -222,8 +222,8 @@ function MobileCardRow({ row, config, onDelete, onNavigate, navigate }: any) {
                         <MoreVertIcon fontSize="small" />
                     </IconButton>
                     <Menu anchorEl={anchorEl} open={open} onClose={handleClose}>
-                        <MenuItem onClick={() => { handleClose(); navigate(`/${config.name}/${id}`); }}>View</MenuItem>
-                        <MenuItem onClick={() => { handleClose(); navigate(`/${config.name}/edit/${id}`); }}>Edit</MenuItem>
+                        <MenuItem onClick={() => { handleClose(); navigate(`/admin/${config.name}/${id}`); }}>View</MenuItem>
+                        <MenuItem onClick={() => { handleClose(); navigate(`/admin/${config.name}/edit/${id}`); }}>Edit</MenuItem>
                         <MenuItem onClick={() => { handleClose(); onDelete(id); }} sx={{ color: 'error.main' }}>Delete</MenuItem>
                     </Menu>
                 </Box>
@@ -242,7 +242,7 @@ function MobileCardRow({ row, config, onDelete, onNavigate, navigate }: any) {
                 </Box>
             </CardContent>
             <CardActions sx={{ justifyContent: 'flex-end', px: 2, pb: 2 }}>
-                 <Button size="small" onClick={() => navigate(`/${config.name}/${id}`)}>View Details</Button>
+                 <Button size="small" onClick={() => navigate(`/admin/${config.name}/${id}`)}>View Details</Button>
             </CardActions>
         </Card>
     );
@@ -359,7 +359,7 @@ function FieldRenderer({ params, field, fieldKey, config, onNavigate, navigate,
                 label={value} 
                 size="small" 
                 color="primary"
-                onClick={(e) => { e.stopPropagation(); navigate(`/${config.name}/${params.row[config.primaryKey]}`); }}
+                onClick={(e) => { e.stopPropagation(); navigate(`/admin/${config.name}/${params.row[config.primaryKey]}`); }}
                 sx={{ cursor: 'pointer', fontWeight: 'bold' }}
             />
         );

react-openapi/components/GenericForm.tsx

@@ -11,7 +11,7 @@ import { useUpload } from '../providers/UploadProvider';
 import { useQueries } from '@tanstack/react-query';
 import { useResource } from '../hooks/useResource';
 import FormField from './fields/FormField';
-import { ConfigContext } from '../Admin';
+import { ConfigContext } from '../providers/ConfigContext';
 
 interface GenericFormProps {
   config: ResourceConfig;
@@ -67,7 +67,8 @@ export default function GenericForm({
   const relationDataMap = React.useMemo(() => {
     const map: Record<string, any[]> = {};
     allRelations.forEach((relName, index) => {
-        map[relName] = queries[index].data || [];
+      // @ts-ignore
+      map[relName] = queries[index].data || [];
     });
     return map;
   }, [allRelations, queries]);

react-openapi/components/ProfileView.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Box, Typography, Paper, CircularProgress, Alert } from '@mui/material';
 import { useResource } from '../hooks/useResource';
 import GenericForm from './GenericForm';
-import { ConfigContext } from '../Admin';
+import { ConfigContext } from '../providers/ConfigContext';
 
 export default function ProfileView() {
   const appConfig = React.useContext(ConfigContext);

react-openapi/components/ResourceView.tsx

@@ -48,11 +48,11 @@ export default function ResourceView({ config, onNavigateToResource }: ResourceV
   const deleteMutation = useDelete();
 
   const handleEdit = (item: any) => {
-    navigate(`/${config.name}/edit/${item[config.primaryKey]}`);
+    navigate(`/admin/${config.name}/edit/${item[config.primaryKey]}`);
   };
 
   const handleCreate = () => {
-    navigate(`/${config.name}/create`);
+    navigate(`/admin/${config.name}/create`);
   };
 
   const handleSave = async (formData: any) => {
@@ -62,7 +62,7 @@ export default function ResourceView({ config, onNavigateToResource }: ResourceV
       } else {
         await createMutation.mutateAsync(formData);
       }
-      navigate(`/${config.name}`);
+      navigate(`/admin/${config.name}`);
     } catch (err) {
       console.error('Save failed:', err);
     }
@@ -90,7 +90,7 @@ export default function ResourceView({ config, onNavigateToResource }: ResourceV
           onEdit={handleEdit}
           onDelete={handleDelete}
           onCreate={handleCreate}
-          onNavigateToResource={(res, id) => navigate(`/${res}/${id}`)}
+          onNavigateToResource={(res, id) => navigate(`/admin/${res}/${id}`)}
         />
       ) : (
         <Paper sx={{ p: 4 }}>
@@ -98,10 +98,10 @@ export default function ResourceView({ config, onNavigateToResource }: ResourceV
             config={config}
             initialData={isCreate ? null : itemQuery.data}
             onSave={handleSave}
-            onCancel={() => navigate(`/${config.name}`)}
+            onCancel={() => navigate(`/admin/${config.name}`)}
             loading={createMutation.isPending || updateMutation.isPending}
             readOnly={isView}
-            onEditClick={() => navigate(`/${config.name}/edit/${id}`)}
+            onEditClick={() => navigate(`/admin/${config.name}/edit/${id}`)}
           />
         </Paper>
       )}

react-openapi/components/fields/FormField.tsx

@@ -71,7 +71,7 @@ export default function FormField({
 
   // 2. Relation Handling (Select / Multi-Select)
   if (field.relation && relationDataMap[field.relation]) {
-    const relationData = relationDataMap[field.relation];
+    const relationData = relationDataMap[field.relation].data;
     const isArrayRelation = field.type === 'array';
     
     // Determine how to display the related item

react-openapi/hooks/useResource.ts

@@ -1,16 +1,22 @@
-import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import { useQuery, useMutation, useQueryClient, keepPreviousData } from "@tanstack/react-query";
 import { api } from "../api/client";
 import { ResourceConfig } from "../types/config";
+import { ConfigContext } from "../providers/ConfigContext";
+import * as React from "react";
 
-export function useResource<T = any>(config: ResourceConfig) {
+export function useResource<T = any>(config: ResourceConfig | undefined) {
   const queryClient = useQueryClient();
-  const { name, endpoint, primaryKey } = config;
+  
+  // Return empty/disabled hooks if config is missing
+  const { name = '', endpoint = '', primaryKey = 'id' } = config || {};
 
   // --- READ ALL ---
   const useList = (params?: any) => 
     useQuery({
       queryKey: [name, "list", params],
       queryFn: async () => {
+        if (!endpoint) return { data: [], total: 0 };
+        console.log('params:', params);
         // @ts-ignore
         const res = await api.get<T[]>(endpoint, { params });
         const total = res.headers ? parseInt(res.headers['x-total-count'] || res.headers['X-Total-Count']) : undefined;
@@ -18,7 +24,9 @@ export function useResource<T = any>(config: ResourceConfig) {
             data: res.data, 
             total: isNaN(total as any) ? undefined : total 
         };
-      }
+      },
+      enabled: !!endpoint,
+      placeholderData: keepPreviousData,
     });
 
   // --- READ ONE ---
@@ -26,18 +34,19 @@ export function useResource<T = any>(config: ResourceConfig) {
     useQuery({
       queryKey: [name, "detail", id],
       queryFn: async () => {
-        if (!id) return null;
+        if (!id || !endpoint) return null;
         // @ts-ignore
         const res = await api.get<T>(`${endpoint}/${id}`);
         return res.data;
       },
-      enabled: !!id,
+      enabled: !!id && !!endpoint,
     });
 
   // --- CREATE ---
   const useCreate = () =>
     useMutation({
       mutationFn: async (data: Partial<T>) => {
+        if (!endpoint) throw new Error("Endpoint not defined");
         // @ts-ignore
         const res = await api.post<T>(endpoint, data);
         return res.data;
@@ -51,6 +60,7 @@ export function useResource<T = any>(config: ResourceConfig) {
   const useUpdate = () =>
     useMutation({
       mutationFn: async ({ id, data }: { id: string; data: Partial<T> }) => {
+        if (!endpoint) throw new Error("Endpoint not defined");
         // @ts-ignore
         const res = await api.put<T>(`${endpoint}/${id}`, data);
         return res.data;
@@ -67,6 +77,7 @@ export function useResource<T = any>(config: ResourceConfig) {
   const useDelete = () =>
     useMutation({
       mutationFn: async (id: string) => {
+        if (!endpoint) throw new Error("Endpoint not defined");
         await api.delete(`${endpoint}/${id}`);
         return id;
       },
@@ -79,6 +90,7 @@ export function useResource<T = any>(config: ResourceConfig) {
   const getListQueryOptions = (params?: any) => ({
     queryKey: [name, "list", params],
     queryFn: async () => {
+      if (!endpoint) return { data: [], total: 0 };
       // @ts-ignore
       const res = await api.get<T[]>(endpoint, { params });
       const total = res.headers ? parseInt(res.headers['x-total-count'] || res.headers['X-Total-Count']) : undefined;
@@ -87,6 +99,7 @@ export function useResource<T = any>(config: ResourceConfig) {
           total: isNaN(total as any) ? undefined : total 
       };
     },
+    enabled: !!endpoint,
   });
 
   // --- READ ME ---
@@ -94,16 +107,19 @@ export function useResource<T = any>(config: ResourceConfig) {
     useQuery({
       queryKey: [name, "me"],
       queryFn: async () => {
+        if (!endpoint) return null;
         // @ts-ignore
         const res = await api.get<T>(`${endpoint}/me`);
         return res.data;
       },
+      enabled: !!endpoint,
     });
 
   // --- UPDATE ME ---
   const useUpdateMe = () =>
     useMutation({
       mutationFn: async (data: Partial<T>) => {
+        if (!endpoint) throw new Error("Endpoint not defined");
         // @ts-ignore
         const res = await api.put<T>(`${endpoint}/me`, data);
         return res.data;
@@ -125,3 +141,10 @@ export function useResource<T = any>(config: ResourceConfig) {
     getListQueryOptions,
   };
 }
+
+export function useResourceByName<T = any>(name: string) {
+  const config = React.useContext(ConfigContext);
+  const resourceConfig = config?.resources.find((r) => r.name === name);
+  return useResource<T>(resourceConfig);
+}
+

react-openapi/index.ts

@@ -2,3 +2,6 @@ export { default as Admin } from "./Admin";
 export { api, auth, initializeApiClients } from "./api/client";
 export { getAppConfig } from "./config";
 export type { AppConfig, ResourceConfig, ResourceField } from "./types/config";
+export { AppProvider } from "./providers/AppProvider";
+export { ConfigContext, useConfig } from "./providers/ConfigContext";
+export { useResource, useResourceByName } from "./hooks/useResource";

react-openapi/providers/AppProvider.tsx

@@ -0,0 +1,70 @@
+import * as React from "react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { ConfigContext } from "./ConfigContext";
+import { getAppConfig } from "../config";
+import { initializeApiClients } from "../api/client";
+import { AppConfig } from "../types/config";
+import { Box, CircularProgress } from "@mui/material";
+
+const defaultQueryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      staleTime: 5 * 60 * 1000,
+      retry: 1,
+      refetchOnWindowFocus: false,
+    },
+  },
+});
+
+interface AppProviderProps {
+  children: React.ReactNode;
+  resourceOverrides?: Record<string, any>;
+  profileConfig?: any;
+  queryClient?: QueryClient;
+}
+
+export function AppProvider({
+  children,
+  resourceOverrides = {},
+  profileConfig = {},
+  queryClient = defaultQueryClient,
+}: AppProviderProps) {
+  const [config, setConfig] = React.useState<AppConfig | null>(null);
+  const [loading, setLoading] = React.useState(true);
+
+  React.useEffect(() => {
+    getAppConfig(resourceOverrides, profileConfig)
+      .then((cfg) => {
+        initializeApiClients(cfg.baseUrl, cfg.authBaseUrl);
+        setConfig(cfg);
+        setLoading(false);
+      })
+      .catch((err) => {
+        console.error("Failed to load OpenAPI configuration:", err);
+        setLoading(false);
+      });
+  }, [resourceOverrides, profileConfig]);
+
+  if (loading) {
+    return (
+      <Box
+        sx={{
+          display: "flex",
+          justifyContent: "center",
+          alignItems: "center",
+          height: "100vh",
+        }}
+      >
+        <CircularProgress />
+      </Box>
+    );
+  }
+
+  return (
+    <QueryClientProvider client={queryClient}>
+      <ConfigContext.Provider value={config}>
+        {children}
+      </ConfigContext.Provider>
+    </QueryClientProvider>
+  );
+}

react-openapi/providers/ConfigContext.tsx

@@ -0,0 +1,12 @@
+import * as React from "react";
+import { AppConfig } from "../types/config";
+
+export const ConfigContext = React.createContext<AppConfig | null>(null);
+
+export function useConfig() {
+  const context = React.useContext(ConfigContext);
+  if (context === undefined) {
+    throw new Error("useConfig must be used within a ConfigProvider");
+  }
+  return context;
+}

react-openapi/types/config.ts

@@ -30,6 +30,7 @@ export interface ResourceConfig {
   primaryKey: string;
   fields: Record<string, ResourceField>;
   pagination?: boolean;
+  hidden?: boolean;
 }
 
 export interface AppConfig {

react-openapi/types/overrides.ts

@@ -12,4 +12,5 @@ export interface FieldOverride {
 export interface ResourceOverride {
   fields?: Record<string, FieldOverride>;
   pagination?: boolean;
+  hidden?: boolean;
 }

react-openapi/utils/openapi_loader.ts

@@ -162,6 +162,7 @@ export async function loadConfigFromOpenApi(baseUrl: string, configuration: Reco
       primaryKey: "id", // Strict default, no heuristics
       fields,
       pagination: resourceOverride.pagination,
+      hidden: resourceOverride.hidden,
     });
   }
 

src/Dashboard.tsx

@@ -2,90 +2,82 @@ import * as React from "react";
 import {
   Box,
   Container,
-  Grid,
   CircularProgress,
   Alert,
-  ToggleButton,
-  ToggleButtonGroup
+  TextField,
+  Paper,
+  Autocomplete,
+  Button
 } from "@mui/material";
 
-import LatestItemsList, { LatestItem } from "./components/LatestItemsList";
-import HistoryChart from "./components/HistoryChart";
-
+import ConfigurableDashboard from "./components/Dashboard";
+import { DashboardState } from "./components/Dashboard";
+import { configuration } from "./dashboard-config";
 import {
-  fetchLatestTransactions,
-  fetchAggregatedExpenses,
-  fetchAggregatedIncome,
-  AggregatedDashboardData
-} from "./utils/dashboardLoader";
+  useReport,
+  prepareReport,
+} from "./features/report";
 
 export default function Dashboard() {
-  const [latest, setLatest] = React.useState<{
-    expense: LatestItem[];
-    income: LatestItem[];
-  }>({
-    expense: [],
-    income: []
+  const [flow, setFlow] = React.useState<"outflows" | "inflows">("outflows");
+
+  const [appliedPayees, setAppliedPayees] = React.useState<string[]>([]);
+  const [appliedTags, setAppliedTags] = React.useState<string[]>([]);
+
+  const [payeeInput, setPayeeInput] = React.useState<string[]>([]);
+  const [tagsInput, setTagsInput] = React.useState<string[]>([]);
+
+  const [loadedPayees, setLoadedPayees] = React.useState<string[]>([]);
+  const [loadedTags, setLoadedTags] = React.useState<string[]>([]);
+
+  const report = useReport({
+    periods: ["daily", "weekly", "monthly", "all"],
+    flow: flow,
+    payee: appliedPayees.length > 0 ? appliedPayees : undefined,
+    tags: appliedTags.length > 0 ? appliedTags : undefined,
   });
 
-  const [aggregated, setAggregated] = React.useState<{
-    expense: AggregatedDashboardData | null;
-    income: AggregatedDashboardData | null;
-  }>({
-    expense: null,
-    income: null
-  });
-
-  const [mode, setMode] =
-    React.useState<"expense" | "income">("expense");
-
-  const [loading, setLoading] = React.useState(true);
-  const [error, setError] = React.useState<string | null>(null);
-
-  // -------- LOAD ONCE --------
   React.useEffect(() => {
-    async function loadData() {
-      try {
-        setLoading(true);
-
-        const [
-          latestExpense,
-          latestIncome,
-          expenseData,
-          incomeData
-        ] = await Promise.all([
-          fetchLatestTransactions("expense"),
-          fetchLatestTransactions("income"),
-          fetchAggregatedExpenses(),
-          fetchAggregatedIncome()
-        ]);
-
-        setLatest({
-          expense: latestExpense,
-          income: latestIncome
+    if (report.data?.data) {
+      setLoadedPayees(prev => {
+        const pSet = new Set<string>(prev);
+        report.data.data.buckets.forEach((b: any) => {
+          Object.values(b.periods).forEach((periodArray: any) => {
+            periodArray?.forEach((p: any) => {
+              p.metric?.transactions?.forEach((t: any) => {
+                if (t.payee?.name) pSet.add(t.payee.name);
+              });
+            });
+          });
         });
+        return Array.from(pSet).sort();
+      });
 
-        setAggregated({
-          expense: expenseData,
-          income: incomeData
+      setLoadedTags(prev => {
+        const tSet = new Set<string>(prev);
+        report.data.data.buckets.forEach((b: any) => {
+          Object.values(b.periods).forEach((periodArray: any) => {
+            periodArray?.forEach((p: any) => {
+              p.metric?.transactions?.forEach((t: any) => {
+                t.tags?.forEach((tag: any) => tSet.add(tag.name || tag));
+              });
+            });
+          });
         });
-
-      } catch (err: any) {
-        console.error(err);
-        setError(err.message || "Failed to load dashboard data");
-      } finally {
-        setLoading(false);
-      }
+        return Array.from(tSet).sort();
+      });
     }
+  }, [report.data?.data]);
 
-    loadData();
+  const isLoading = report.isLoading;
+  const error = report.error;
+
+  /** Callback for the ConfigurableDashboard's flow toggle */
+  const handleFlowChange = React.useCallback((newState: DashboardState) => {
+    setFlow(newState.flow);
   }, []);
 
-  const currentData = aggregated[mode];
-  const currentLatest = latest[mode];
-
-  // -------- UI STATES --------
-  if (loading) {
+  if (isLoading && !report.data) {
     return (
       <Box sx={{ display: "flex", justifyContent: "center", alignItems: "center", height: "60vh" }}>
         <CircularProgress />
@@ -96,45 +88,81 @@ export default function Dashboard() {
   if (error) {
     return (
       <Container sx={{ mt: 4 }}>
-        <Alert severity="error">{error}</Alert>
+        <Alert severity="error">{String(error)}</Alert>
       </Container>
     );
   }
 
+  if (!report.data) {
+    return null;
+  }
+
+  const data = prepareReport(report.data.data);
   return (
-    <Container sx={{ mt: 4, mb: 4 }}>
-      {/* -------- TOGGLE -------- */}
-      <Box sx={{ display: "flex", justifyContent: "center", mb: 3 }}>
-        <ToggleButtonGroup
-          value={mode}
-          exclusive
-          onChange={(_, val) => val && setMode(val)}
+    <Box>
+      <Container>
+        <Paper 
+          sx={{ 
+            mt: 4, 
+            p: 2, 
+            display: "flex", 
+            flexDirection: { xs: "column", sm: "row" },
+            gap: 2, 
+            alignItems: { xs: "stretch", sm: "flex-end" }, 
+            borderRadius: 4,
+            mb: -2 // pull up to be closer to the dashboard container below
+          }} 
+          elevation={0} 
+          variant="outlined"
         >
-          <ToggleButton value="expense">Expenses</ToggleButton>
-          <ToggleButton value="income">Income</ToggleButton>
-        </ToggleButtonGroup>
-      </Box>
-
-      <Grid container spacing={4} direction="row">
-        {/* LEFT → 1/3 */}
-        <Grid size={4}>
-          <LatestItemsList
-            title={`Recent ${mode === "expense" ? "Expenses" : "Income"}`}
-            items={currentLatest}
-            onViewAll={() => {}}
-          />
-        </Grid>
-
-        {/* RIGHT → 2/3 */}
-        <Grid size={8}>
-          <HistoryChart
-            header={`${mode === "expense" ? "Expense" : "Income"} Breakdown`}
-            summary="Interactive chronological tracking"
-            tabs={["Week", "Month", "Year"]}
-            data={currentData?.chartData || {}}
-          />
-        </Grid>
-      </Grid>
-    </Container>
+          <Box sx={{ display: 'flex', flexDirection: 'column', flex: 1, minWidth: { sm: 250 } }}>
+            <Box sx={{ typography: 'caption', mb: 1, color: 'text.secondary' }}>
+              Filter by Payee
+            </Box>
+            <Autocomplete
+              multiple
+              freeSolo
+              options={loadedPayees}
+              value={payeeInput}
+              onChange={(_, val) => setPayeeInput(val as string[])}
+              renderInput={(params) => <TextField {...params} placeholder="Add payees..." />}
+              sx={{ '& .MuiOutlinedInput-root': { height: 'auto', minHeight: '2.5rem', py: 0.5 } }}
+            />
+          </Box>
+          <Box sx={{ display: 'flex', flexDirection: 'column', flex: 1, minWidth: { sm: 250 } }}>
+            <Box sx={{ typography: 'caption', mb: 1, color: 'text.secondary' }}>
+              Filter by Tags
+            </Box>
+            <Autocomplete
+              multiple
+              freeSolo
+              options={loadedTags}
+              value={tagsInput}
+              onChange={(_, val) => setTagsInput(val as string[])}
+              renderInput={(params) => <TextField {...params} placeholder="Add tags..." />}
+              sx={{ '& .MuiOutlinedInput-root': { height: 'auto', minHeight: '2.5rem', py: 0.5 } }}
+            />
+          </Box>
+          <Button 
+            variant="contained" 
+            size="large"
+            onClick={() => {
+              setAppliedPayees(payeeInput);
+              setAppliedTags(tagsInput);
+            }}
+            disabled={isLoading}
+            sx={{ height: 40, borderRadius: 2 }}
+          >
+            Apply
+          </Button>
+        </Paper>
+      </Container>
+      <ConfigurableDashboard
+        config={configuration}
+        data={data}
+        isFetching={report.isFetching}
+        onFlowChange={handleFlowChange}
+      />
+    </Box>
   );
 }

src/Header.tsx

@@ -83,12 +83,14 @@ export default function Header({
         <Typography
           variant="h6"
           noWrap
-          sx={{ flexGrow: 1, fontWeight: "bold", cursor: "pointer" }}
+          sx={{ fontWeight: "bold", cursor: "pointer" }}
           onClick={() => navigate("/")}
         >
           {headerTitle}
         </Typography>
 
+        <span style={{ flexGrow: 1 }} />
+
         {/* AUTH SECTION */}
         {isAuthenticated ? (
           <>
@@ -101,10 +103,10 @@ export default function Header({
             >
               <Button
                 color="inherit"
-                onClick={() => navigate("/dashboard")}
+                onClick={() => navigate("/admin")}
                 sx={{ textTransform: "none", fontWeight: 500 }}
               >
-                Dashboard
+                Admin
               </Button>
               <Button
                 color="inherit"

src/Home.tsx

@@ -84,7 +84,7 @@ export default function Home() {
               variant="contained"
               size="large"
               endIcon={<ArrowForwardIcon />}
-              onClick={() => navigate("/admin")}
+              onClick={() => navigate("/dashboard")}
               sx={{
                 px: 4,
                 py: 1.5,

src/components/Dashboard/Dashboard.models.ts

@@ -0,0 +1,55 @@
+import * as React from "react";
+import {
+  ReportData,
+  GroupKey,
+} from "../../features/report";
+
+export type DashboardFlow = "outflows" | "inflows";
+export type DashboardPeriodType = "rolling" | "calendar";
+export type DashboardSelectedPeriodId = string | null;
+
+export interface DashboardState {
+  flow: DashboardFlow;
+  periodType: DashboardPeriodType;
+  selectedPeriodId: DashboardSelectedPeriodId;
+  selectedGroupKey: GroupKey | null;
+  comparison: boolean;
+}
+
+export interface DashboardSection {
+  id: string;
+  title?: string;
+  summary?: string;
+  component: React.ComponentType<any>;
+  settings?: Record<string, any>;
+  isList?: boolean;
+  style?: {
+    size?: number;
+    [key: string]: any;
+  };
+}
+
+export interface ColorDefinition {
+  primary: string;
+  background?: string;
+  text?: string;
+}
+
+export interface ThemeAwarePalette {
+  light: ColorDefinition;
+  dark: ColorDefinition;
+}
+
+export interface DashboardConfig {
+  sections: DashboardSection[];
+  style?: {
+    palette?: Record<DashboardFlow, ThemeAwarePalette>;
+  };
+}
+
+export interface DashboardProps {
+  config: DashboardConfig;
+  data: ReportData;
+  isFetching?: boolean;
+  onFlowChange?: (state: DashboardState) => void;
+}

src/components/Dashboard/Dashboard.tsx

@@ -0,0 +1,64 @@
+import * as React from "react";
+import DashboardView from "./Dashboard.view";
+import { DashboardProps, DashboardState } from "./Dashboard.models";
+
+export default function Dashboard(props: DashboardProps) {
+  const [state, setState] = React.useState<DashboardState>({
+    flow: "outflows",
+    periodType: "rolling",
+    selectedPeriodId: null,
+    selectedGroupKey: null,
+    comparison: false,
+  });
+
+  const toggleFlow = (
+    event: React.MouseEvent<HTMLElement>,
+    newFlow: "outflows" | "inflows" | null
+  ) => {
+    if (newFlow === null) return;
+
+    setState(prev => {
+      if (prev.flow === newFlow) return prev;
+
+      const next = { ...prev, flow: newFlow };
+      props.onFlowChange?.(next);
+
+      return next;
+    });
+  };
+
+  const togglePeriodType = () => {
+    setState(prev => ({
+      ...prev,
+      periodType: prev.periodType === "rolling" ? "calendar" : "rolling",
+    }));
+  };
+
+  const toggleComparison = () => {
+    setState(prev => ({
+      ...prev,
+      comparison: !prev.comparison,
+    }));
+  };
+
+  const setSelectedPeriodId = (selectedPeriodId: typeof state.selectedPeriodId) => {
+    setState(prev => ({ ...prev, selectedPeriodId }));
+  };
+
+  const setSelectedGroupKey = (groupKey: typeof state.selectedGroupKey) => {
+    setState(prev => ({ ...prev, selectedGroupKey: groupKey }));
+  };
+
+  return (
+    <DashboardView
+      {...props}
+      state={state}
+      setState={setState}
+      toggleFlow={toggleFlow}
+      togglePeriodType={togglePeriodType}
+      toggleComparison={toggleComparison}
+      setSelectedPeriodId={setSelectedPeriodId}
+      setSelectedGroupKey={setSelectedGroupKey}
+    />
+  );
+}

src/components/Dashboard/Dashboard.view.tsx

@@ -0,0 +1,143 @@
+import * as React from "react";
+import {
+  Box,
+  Container,
+  Grid,
+  Typography,
+  ToggleButton,
+  ToggleButtonGroup,
+  Button
+} from "@mui/material";
+import { useTheme, alpha } from "@mui/material/styles";
+import { GroupKey } from "../../features/report";
+import { DashboardProps, DashboardState } from "./Dashboard.models";
+
+interface ViewProps extends DashboardProps {
+  state: DashboardState;
+  setState: React.Dispatch<React.SetStateAction<DashboardState>>;
+  toggleFlow: (event: React.MouseEvent<HTMLElement>, newFlow: "outflows" | "inflows" | null) => void;
+  togglePeriodType: () => void;
+  setSelectedPeriodId: (id: string | null) => void;
+  setSelectedGroupKey: (groupKey: GroupKey | null) => void;
+  toggleComparison: () => void;
+}
+
+export default function DashboardView({
+  config,
+  data,
+  state,
+  setState,
+  toggleFlow,
+  togglePeriodType,
+  toggleComparison,
+  setSelectedPeriodId,
+  setSelectedGroupKey,
+}: ViewProps) {
+  const theme = useTheme();
+  const themeMode = theme.palette.mode;
+  const { flow, periodType, comparison, selectedPeriodId, selectedGroupKey } = state;
+
+  // Resolve colors with fallbacks
+  const colors = React.useMemo(() => {
+    const palette = config.style?.palette?.[flow];
+    const modeColors = palette ? palette[themeMode] : null;
+
+    if (modeColors) {
+      return {
+        primary: modeColors.primary,
+        light: modeColors.background || alpha(modeColors.primary, 0.1),
+        text: modeColors.text || (themeMode === 'light' ? theme.palette.text.primary : '#fff')
+      };
+    }
+
+    // Fallback to standard theme colors
+    const themeColor = flow === 'outflows' ? theme.palette.error : theme.palette.success;
+    return {
+      primary: themeColor.main,
+      light: alpha(themeColor.main, themeMode === 'light' ? 0.08 : 0.15),
+      text: themeColor.main
+    };
+  }, [config.style?.palette, flow, themeMode, theme.palette]);
+
+  return (
+    <Container
+      sx={{
+        mt: 4,
+        mb: 4,
+        background: `linear-gradient(180deg, ${colors.light} 0%, transparent 100%)`,
+        borderRadius: 4,
+        p: 2,
+        transition: 'background 0.3s ease'
+      }}
+    >
+      <Box sx={{ display: "flex", flexDirection: "column", alignItems: "center", mb: 3 }}>
+        <ToggleButtonGroup
+          value={flow}
+          exclusive
+          onChange={toggleFlow}
+          sx={{
+            borderRadius: 3,
+            overflow: "hidden",
+            "& .MuiToggleButton-root": {
+              px: 3,
+              textTransform: "none",
+              color: "text.secondary"
+            },
+            "&.Mui-selected": {
+              bgcolor: colors.primary,
+              color: "white",
+              borderColor: colors.primary
+            },
+          }}
+        >
+          <ToggleButton value="outflows">Outflows</ToggleButton>
+          <ToggleButton value="inflows">Inflows</ToggleButton>
+        </ToggleButtonGroup>
+
+        {selectedGroupKey && Object.keys(selectedGroupKey).length > 0 && (
+          <Button 
+            size="small" 
+            sx={{ mt: 1, textTransform: "none" }}
+            onClick={() => setSelectedGroupKey(null)}
+          >
+            Clear Drill-down
+          </Button>
+        )}
+      </Box>
+
+      <Grid container spacing={4}>
+        {config.sections.map((section) => {
+          const Component = section.component;
+          
+          return (
+            <Grid key={section.id} size={section.style?.size || 12 as any}>
+              <Component
+                {...section.settings}
+                header={section.title}
+                summary={section.summary}
+                reportData={data}
+                title={section.title}
+                accentColor={colors.primary}
+                colorScheme={colors}
+
+                // State management
+                flow={flow}
+
+                periodType={periodType}
+                comparison={comparison}
+                selectedPeriodId={selectedPeriodId}
+                selectedGroupKey={selectedGroupKey}
+
+                togglePeriodType={togglePeriodType}
+                toggleComparison={toggleComparison}
+                setSelectedPeriodId={setSelectedPeriodId}
+                setSelectedGroupKey={setSelectedGroupKey}
+                isFetching={arguments[0].isFetching}
+              />
+            </Grid>
+          );
+        })}
+      </Grid>
+    </Container>
+  );
+}

src/components/Dashboard/index.ts

@@ -0,0 +1,2 @@
+export { default } from "./Dashboard";
+export * from "./Dashboard.models";

src/components/HistoryChart.tsx

@@ -1,130 +0,0 @@
-import * as React from "react";
-import { Box, Typography, ToggleButtonGroup, ToggleButton, Paper } from "@mui/material";
-
-export interface ChartDataPoint {
-  id: string;
-  amount: number;
-  count?: number;
-  highlighted?: boolean;
-}
-
-export interface HistoryChartProps {
-  header: string;
-  summary?: string;
-  tabs: string[];
-  data: Record<string, ChartDataPoint[]>;
-}
-
-export default function HistoryChart({
-  header,
-  summary,
-  tabs,
-  data,
-}: HistoryChartProps) {
-  const [activeTab, setActiveTab] = React.useState<string>(tabs[0] || "");
-
-  const handleTabChange = (_: React.MouseEvent<HTMLElement>, newTab: string | null) => {
-    if (newTab !== null) {
-      setActiveTab(newTab);
-    }
-  };
-
-  const activeDataKey = activeTab.toLowerCase();
-  const currentData = data[activeDataKey] || data[activeTab] || [];
-
-  const maxAmount = Math.max(...currentData.map((d) => d.amount), 1);
-
-  return (
-    <Paper sx={{ p: { xs: 2, sm: 4 }, borderRadius: 4, width: "100%", boxShadow: 'none', border: '1px solid', borderColor: 'divider' }}>
-      <Typography variant="h6" fontWeight={700} gutterBottom>
-        {header}
-      </Typography>
-      {summary && (
-        <Typography variant="body2" color="text.secondary" sx={{ mb: 3 }}>
-          {summary}
-        </Typography>
-      )}
-
-      <ToggleButtonGroup
-        value={activeTab}
-        exclusive
-        onChange={handleTabChange}
-        fullWidth
-        sx={{
-          mb: 4,
-          bgcolor: (theme) => theme.palette.mode === 'dark' ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.02)',
-          borderRadius: 8,
-          p: 0.5,
-          "& .MuiToggleButton-root": {
-            border: "none",
-            borderRadius: 8,
-            textTransform: "capitalize",
-            fontWeight: 600,
-            color: "text.secondary",
-            "&.Mui-selected": {
-              bgcolor: (theme) => theme.palette.mode === 'dark' ? 'primary.dark' : 'primary.light',
-              color: (theme) => theme.palette.mode === 'dark' ? 'primary.contrastText' : 'primary.main',
-              boxShadow: '0 2px 8px rgba(0,0,0,0.05)',
-            },
-          },
-        }}
-      >
-        {tabs.map((tab) => (
-          <ToggleButton key={tab} value={tab}>
-            {tab}
-          </ToggleButton>
-        ))}
-      </ToggleButtonGroup>
-
-      {/* Chart Area */}
-      {currentData.length > 0 ? (
-        <Box sx={{ display: "flex", alignItems: "flex-end", height: 200, mt: 4, position: 'relative' }}>
-          {currentData.map((point) => {
-            const heightPerc = (point.amount / maxAmount) * 100;
-            return (
-              <Box
-                key={point.id}
-                sx={{
-                  flex: 1,
-                  display: "flex",
-                  flexDirection: "column",
-                  alignItems: "center",
-                  justifyContent: "flex-end",
-                  height: "100%",
-                }}
-              >
-                <Typography variant="caption" sx={{ mb: 1, opacity: 0.7, fontSize: '0.65rem', display: { xs: 'none', sm: 'block' } }}>
-                  {point.amount > 0 ? `Rs ${point.amount}` : ''}
-                </Typography>
-                
-                <Box
-                  sx={{
-                    width: "40%",
-                    minWidth: 12,
-                    maxWidth: 32,
-                    height: `${heightPerc}%`,
-                    minHeight: "4px",
-                    bgcolor: point.highlighted ? "error.main" : "grey.300",
-                    borderRadius: 4,
-                    transition: "height 0.5s cubic-bezier(0.4, 0, 0.2, 1)",
-                    ...(point.highlighted && {
-                      boxShadow: (theme) => `0 4px 12px ${theme.palette.error.main}40`,
-                    }),
-                  }}
-                />
-                
-                <Typography variant="caption" color="text.secondary" sx={{ mt: 1, fontWeight: 500, fontSize: '0.7rem' }}>
-                  {point.id}
-                </Typography>
-              </Box>
-            );
-          })}
-        </Box>
-      ) : (
-        <Box sx={{ height: 200, display: "flex", alignItems: "center", justifyContent: "center" }}>
-          <Typography color="text.secondary">No Data Available</Typography>
-        </Box>
-      )}
-    </Paper>
-  );
-}

src/components/HistoryChart/HistoryChart.adapter.ts

@@ -0,0 +1,73 @@
+import { ReportData } from "../../features/report";
+import {
+  mergeBucketPeriods,
+  getAmount,
+  PeriodKey,
+} from "../report.helpers";
+import { ChartDataPoint } from "./HistoryChart.models";
+
+// ─── Tab → PeriodKey ─────────────────────────────────────────
+
+const TAB_TO_KEY: Record<string, PeriodKey> = {
+  Daily: "daily",
+  Weekly: "weekly",
+  Monthly: "monthly",
+  "All Time": "all",
+};
+
+export function tabToKey(tab: string): PeriodKey {
+  return TAB_TO_KEY[tab] ?? "all";
+}
+
+// ─── Comparison ──────────────────────────────────────────────
+
+function attachComparison(
+  points: ChartDataPoint[],
+  key: PeriodKey
+): ChartDataPoint[] {
+  const getCompareIndex = (i: number) => {
+    if (key === "daily") return i - 7;
+    if (key === "weekly") return i - 4;
+    if (key === "monthly") return i - 12;
+    return -1;
+  };
+
+  return points.map((p, i) => {
+    const ci = getCompareIndex(i);
+
+    return {
+      ...p,
+      compare:
+        ci >= 0 && points[ci]
+          ? {
+              id: points[ci].id,
+              label: points[ci].label,
+              amount: points[ci].amount,
+            }
+          : undefined,
+    };
+  });
+}
+
+// ─── Main adapter ────────────────────────────────────────────
+
+export function buildChartData(
+  reportData: ReportData,
+  key: PeriodKey,
+  flow: "outflows" | "inflows",
+  comparison: boolean
+): ChartDataPoint[] {
+  const merged = mergeBucketPeriods(reportData.buckets, key);
+
+  let points: ChartDataPoint[] = merged.map((p) => ({
+    id: p.id,
+    label: p.label,
+    amount: getAmount(p),
+  }));
+
+  if (comparison) {
+    points = attachComparison(points, key);
+  }
+
+  return points;
+}

src/components/HistoryChart/HistoryChart.models.ts

@@ -0,0 +1,42 @@
+import {
+  DashboardFlow,
+  DashboardPeriodType,
+  DashboardSelectedPeriodId
+} from "../Dashboard";
+import { ReportData } from "../../features/report";
+
+export interface _ChartDataPoint {
+  id: string;
+  label: string;
+  amount: number;
+  highlighted?: boolean;
+}
+
+export interface ChartDataPoint extends _ChartDataPoint {
+  compare?: _ChartDataPoint;
+}
+
+export interface HistoryChartProps {
+  header: string;
+  summary?: string;
+  tabs: string[];
+
+  reportData: ReportData;
+
+  colorScheme: {
+    primary: string;
+    light: string;
+    text: string;
+  };
+
+  flow: DashboardFlow;
+  periodType: DashboardPeriodType;
+  selectedPeriodId: DashboardSelectedPeriodId;
+  comparison: boolean;
+
+  togglePeriodType: () => void;
+  setSelectedPeriodId: (id: string | null) => void;
+  toggleComparison: () => void;
+
+  isFetching?: boolean;
+}

src/components/HistoryChart/HistoryChart.tsx

@@ -0,0 +1,91 @@
+import * as React from "react";
+import { HistoryChartProps } from "./HistoryChart.models";
+import HistoryChartView from "./HistoryChart.view";
+import { buildChartData, tabToKey } from "./HistoryChart.adapter";
+
+export default function HistoryChart(props: HistoryChartProps) {
+  const {
+    tabs,
+    reportData,
+    flow,
+    comparison,
+    selectedPeriodId,
+    setSelectedPeriodId
+  } = props;
+
+  const [activeTab, setActiveTab] = React.useState<string>(tabs[0] || "");
+  const [startIndex, setStartIndex] = React.useState(0);
+
+  const activeDataKey = tabToKey(activeTab);
+
+  const currentData = React.useMemo(() => {
+    return buildChartData(reportData, activeDataKey, flow, comparison);
+  }, [reportData, activeDataKey, flow, comparison]);
+
+  const maxAmount =
+    currentData.length > 0
+      ? Math.max(
+          ...currentData.flatMap((d) =>
+            comparison
+              ? [d.amount, ...(d.compare ? [d.compare.amount] : [])]
+              : [d.amount]
+          ),
+          1
+        )
+      : 1;
+
+  const visibleCountMap = {
+    daily: 7,
+    weekly: 6,
+    monthly: 4,
+    all: 4,
+  };
+
+  const visibleCount = visibleCountMap[activeDataKey] ?? 4;
+
+  const total = currentData.length;
+
+  const clampedStartIndex = Math.min(
+    startIndex,
+    Math.max(total - visibleCount, 0)
+  );
+
+  React.useEffect(() => {
+    if (startIndex !== clampedStartIndex) {
+      setStartIndex(clampedStartIndex);
+    }
+  }, [startIndex, clampedStartIndex]);
+
+  const visibleData = currentData.slice(
+    clampedStartIndex,
+    clampedStartIndex + visibleCount
+  );
+
+  React.useEffect(() => {
+    setSelectedPeriodId(null);
+  }, [activeTab]);
+
+  React.useEffect(() => {
+    if (
+      selectedPeriodId &&
+      !visibleData.some((p) => p.id === selectedPeriodId)
+    ) {
+      setSelectedPeriodId(null);
+    }
+  }, [visibleData, selectedPeriodId]);
+
+  return (
+    <HistoryChartView
+      {...props}
+      activeTab={activeTab}
+      setActiveTab={setActiveTab}
+      currentData={currentData}
+      visibleData={visibleData}
+      maxAmount={maxAmount}
+      visibleCount={visibleCount}
+      startIndex={clampedStartIndex}
+      setStartIndex={setStartIndex}
+      activeDataKey={activeDataKey}
+    />
+  );
+}

src/components/HistoryChart/HistoryChart.utils.ts

@@ -0,0 +1,27 @@
+import { ChartDataPoint } from "./HistoryChart.models";
+
+export const formatDisplay = (
+  point: ChartDataPoint,
+  tab: string,
+  comparison: boolean
+) => {
+  const base = point.amount;
+  const cmp = point.compare?.amount ?? 0;
+
+  const formatShort = (val: number) => {
+    if (tab === "monthly" && val >= 100000) {
+      return `${(val / 100000).toFixed(2)}L`;
+    }
+    if (tab === "weekly" && val >= 1000) {
+      return `${(val / 1000).toFixed(1)}K`;
+    }
+    return val.toLocaleString("en-IN");
+  };
+
+  if (!comparison) return `₹ ${formatShort(base)}`;
+
+  const diff = base - cmp;
+  const sign = diff >= 0 ? "+" : "-";
+
+  return `₹ ${formatShort(base)} (${sign}${formatShort(Math.abs(diff))})`;
+};

src/components/HistoryChart/HistoryChart.view.tsx

@@ -0,0 +1,220 @@
+import * as React from "react";
+import {
+  Box,
+  Typography,
+  ToggleButtonGroup,
+  ToggleButton,
+  Paper
+} from "@mui/material";
+import { useTheme, alpha } from "@mui/material/styles";
+import IconButton from "@mui/material/IconButton";
+import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
+import ChevronRightIcon from "@mui/icons-material/ChevronRight";
+import {
+  ChartDataPoint,
+  HistoryChartProps,
+} from "./HistoryChart.models";
+import { formatDisplay } from "./HistoryChart.utils";
+
+interface ViewProps extends HistoryChartProps {
+  activeTab: string;
+  setActiveTab: (v: string) => void;
+  currentData: ChartDataPoint[];
+  visibleData: ChartDataPoint[];
+  maxAmount: number;
+  visibleCount: number;
+  startIndex: number;
+  setStartIndex: React.Dispatch<React.SetStateAction<number>>;
+  activeDataKey: string;
+}
+
+export default function HistoryChartView(props: ViewProps) {
+  const {
+    header,
+    summary,
+    tabs,
+    colorScheme,
+
+    flow,
+    periodType,
+    selectedPeriodId,
+    comparison,
+
+    togglePeriodType,
+    setSelectedPeriodId,
+    toggleComparison,
+
+    activeTab,
+    setActiveTab,
+    currentData,
+    visibleData,
+    maxAmount,
+    visibleCount,
+    startIndex,
+    setStartIndex,
+    activeDataKey,
+  } = props;
+
+  const theme = useTheme();
+  const isDark = theme.palette.mode === "dark";
+
+  const total = currentData.length;
+  const maxStartIndex = Math.max(total - visibleCount, 0);
+  const clampedStartIndex = Math.min(startIndex, maxStartIndex);
+
+  const handleTabChange = (_: React.MouseEvent<HTMLElement>, newTab: string | null) => {
+    if (newTab !== null) setActiveTab(newTab);
+  };
+
+  const canGoLeft = clampedStartIndex > 0;
+  const canGoRight = clampedStartIndex < maxStartIndex;
+
+  const handlePrev = () => {
+    if (!canGoLeft) return;
+    setStartIndex((prev) => Math.max(prev - visibleCount, 0));
+  };
+
+  const handleNext = () => {
+    if (!canGoRight) return;
+    setStartIndex((prev) => {
+      const next = prev + visibleCount;
+      return Math.min(next, maxStartIndex);
+    });
+  };
+
+  return (
+    <Paper
+      sx={{
+        p: { xs: 2.5, sm: 4 },
+        borderRadius: 4,
+        width: "100%",
+        boxShadow: "none",
+        border: "1px solid",
+        borderColor: "divider",
+        bgcolor: isDark ? "background.paper" : colorScheme.light,
+        opacity: props.isFetching ? 0.6 : 1,
+        transition: "opacity 0.3s ease",
+        pointerEvents: props.isFetching ? "none" : "auto",
+      }}
+    >
+      <Typography variant="h6" fontWeight={700} gutterBottom>
+        {header}
+      </Typography>
+
+      {summary && (
+        <Typography variant="body2" color="text.secondary" sx={{ mb: 3 }}>
+          {summary}
+        </Typography>
+      )}
+
+      <ToggleButtonGroup value={activeTab} exclusive onChange={handleTabChange} fullWidth sx={{ mb: 4 }}>
+        {tabs.map((tab) => (
+          <ToggleButton key={tab} value={tab}>
+            {tab}
+          </ToggleButton>
+        ))}
+      </ToggleButtonGroup>
+
+      <Box sx={{ display: "flex", justifyContent: "space-between", mb: 3 }}>
+        <ToggleButtonGroup value={periodType} exclusive onChange={togglePeriodType} size="small">
+          <ToggleButton value="rolling">Rolling</ToggleButton>
+          <ToggleButton value="calendar">Calendar</ToggleButton>
+        </ToggleButtonGroup>
+
+        <ToggleButton
+          value="compare"
+          selected={comparison}
+          onChange={toggleComparison}
+          size="small"
+        >
+          Compare
+        </ToggleButton>
+      </Box>
+
+      {currentData.length > 0 ? (
+        <Box sx={{ position: "relative", mt: 4 }}>
+          {canGoLeft && (
+            <IconButton onClick={handlePrev} size="small" sx={{ position: "absolute", left: 0, top: "50%" }}>
+              <ChevronLeftIcon fontSize="small" />
+            </IconButton>
+          )}
+
+          <Box sx={{ display: "flex", alignItems: "flex-end", height: 220, mt: 4 }}>
+            {visibleData.map((point) => {
+              const currentHeight = (point.amount / maxAmount) * 100;
+              const compareHeight = comparison
+                ? ((point.compare?.amount ?? 0) / maxAmount) * 100
+                : 0;
+
+              const isSelected = selectedPeriodId === point.id;
+              const display = formatDisplay(point, activeDataKey, comparison);
+
+              return (
+                <Box
+                  key={point.id}
+                  onClick={() =>
+                    setSelectedPeriodId(isSelected ? null : point.id)
+                  }
+                  sx={{
+                    flex: 1,
+                    display: "flex",
+                    flexDirection: "column",
+                    alignItems: "center",
+                    cursor: "pointer",
+                    height: "100%"
+                  }}
+                >
+                  <Box sx={{ display: "flex", alignItems: "flex-end", gap: 1, height: "100%" }}>
+                    {comparison && (
+                      <Box
+                        sx={{
+                          width: 8,
+                          height: `${compareHeight}%`,
+                          bgcolor: alpha(colorScheme.primary, 0.4),
+                          borderRadius: "4px 4px 0 0"
+                        }}
+                      />
+                    )}
+
+                    <Box
+                      sx={{
+                        width: 12,
+                        height: `${currentHeight}%`,
+                        bgcolor: isSelected ? "warning.main" : colorScheme.primary,
+                        borderRadius: "4px 4px 0 0"
+                      }}
+                    />
+                  </Box>
+
+                  <Typography variant="caption">
+                    {point.label}
+                  </Typography>
+
+                  {comparison && point.compare && (
+                    <Typography variant="caption" color="text.secondary">
+                      {point.compare.label}
+                    </Typography>
+                  )}
+
+                  <Typography variant="caption">
+                    {display}
+                  </Typography>
+                </Box>
+              );
+            })}
+          </Box>
+
+          {canGoRight && (
+            <IconButton onClick={handleNext} size="small" sx={{ position: "absolute", right: 0, top: "50%" }}>
+              <ChevronRightIcon fontSize="small" />
+            </IconButton>
+          )}
+        </Box>
+      ) : (
+        <Box sx={{ height: 200, display: "flex", alignItems: "center", justifyContent: "center" }}>
+          <Typography color="text.secondary">No Data Available</Typography>
+        </Box>
+      )}
+    </Paper>
+  );
+}

src/components/HistoryChart/index.ts

@@ -0,0 +1,2 @@
+export { default } from "./HistoryChart";
+export * from "./HistoryChart.models";

src/components/LatestItems/LatestItems.adapter.ts

@@ -0,0 +1,79 @@
+import { ReportData, Transaction, GroupKey } from "../../features/report";
+import {
+  mergeBucketPeriods,
+  periodIdToKey,
+  formatCurrency,
+  filterBuckets,
+} from "../report.helpers";
+import { LatestItem } from "./LatestItems.models";
+
+// ─── Transaction extraction ─────────────────────────────────
+
+function extractTransactions(
+  reportData: ReportData,
+  selectedPeriodId: string | null,
+  selectedGroupKey: GroupKey | null,
+): Transaction[] {
+  // 1. Get raw transactions
+  let rawTxns: Transaction[] = [];
+
+  if (selectedPeriodId) {
+    const key = periodIdToKey(selectedPeriodId);
+    const periods = mergeBucketPeriods(reportData.buckets, key);
+    const selected = periods.find((p) => p.id === selectedPeriodId);
+    rawTxns = selected?.metric.transactions || [];
+  } else {
+    const periods = mergeBucketPeriods(reportData.buckets, "all");
+    if (periods.length > 0) {
+      rawTxns = periods[0].metric.transactions || [];
+    }
+  }
+
+  // 2. Filter by group key
+  if (selectedGroupKey) {
+    rawTxns = rawTxns.filter(txn => {
+      let match = true;
+      if (selectedGroupKey.tags && selectedGroupKey.tags.length > 0) {
+        if (!txn.tags) match = false;
+        else {
+          const txnTags = txn.tags.map(t => typeof t === "string" ? t : t.name);
+          if (!selectedGroupKey.tags.every(selectedTag => txnTags.includes(selectedTag))) match = false;
+        }
+      }
+      if (match && selectedGroupKey.payee && selectedGroupKey.payee.length > 0) {
+        if (!txn.payee || !txn.payee.name) match = false;
+        else {
+          if (!selectedGroupKey.payee.includes(txn.payee.name)) match = false;
+        }
+      }
+      return match;
+    });
+  }
+
+  return rawTxns;
+}
+
+// ─── Main adapter ────────────────────────────────────────────
+
+export function buildLatestItems(
+  reportData: ReportData,
+  selectedPeriodId: string | null,
+  selectedGroupKey: GroupKey | null,
+  flow: "outflows" | "inflows"
+): LatestItem[] {
+  const txns = extractTransactions(reportData, selectedPeriodId, selectedGroupKey);
+
+  return txns
+    .sort(
+      (a, b) =>
+        new Date(b.occurred_at).getTime() -
+        new Date(a.occurred_at).getTime()
+    )
+    .map((t, index) => ({
+      id: index + 1,
+      title: t.payee.name,
+      subtitle: t.tags.map((tag) => tag.name).join(", "),
+      amount: formatCurrency(t.amount),
+      timeAgo: new Date(t.occurred_at).toLocaleDateString("en-IN"),
+    }));
+}

src/components/LatestItems/LatestItems.models.ts

@@ -0,0 +1,16 @@
+export interface LatestItem {
+  id: string | number;
+  title: string;
+  subtitle: string;
+  amount: string;
+  timeAgo: string;
+}
+
+export interface LatestItemsViewProps {
+  items: LatestItem[];
+  header: string;
+  accentColor: string;
+  canExpand: boolean;
+  onExpand: () => void;
+  isFetching?: boolean;
+}

src/components/LatestItems/LatestItems.tsx

@@ -0,0 +1,47 @@
+import * as React from "react";
+import { ReportData, GroupKey } from "../../features/report";
+import { buildLatestItems } from "./LatestItems.adapter";
+import LatestItemsView from "./LatestItems.view";
+
+type Props = {
+  reportData: ReportData;
+  flow: "outflows" | "inflows";
+  header: string;
+  selectedPeriodId: string | null;
+  selectedGroupKey?: GroupKey | null;
+  accentColor: string;
+  isFetching?: boolean;
+};
+
+export default function LatestItems({
+  reportData,
+  flow,
+  header,
+  selectedPeriodId,
+  selectedGroupKey = null,
+  accentColor,
+  isFetching,
+}: Props) {
+  const [visibleCount, setVisibleCount] = React.useState(5);
+
+  const allItems = React.useMemo(() => {
+    return buildLatestItems(reportData, selectedPeriodId, selectedGroupKey, flow);
+  }, [reportData, selectedPeriodId, selectedGroupKey, flow]);
+
+  const visibleItems = React.useMemo(() => {
+    return allItems.slice(0, visibleCount);
+  }, [allItems, visibleCount]);
+
+  const canExpand = visibleCount < allItems.length;
+
+  return (
+    <LatestItemsView
+      items={visibleItems}
+      header={header}
+      accentColor={accentColor}
+      canExpand={canExpand}
+      isFetching={isFetching}
+      onExpand={() => setVisibleCount((prev) => prev + 5)}
+    />
+  );
+}

src/components/LatestItems/LatestItems.view.tsx

@@ -7,51 +7,27 @@ import {
   Avatar,
   Typography,
   Box,
-  Button,
+  IconButton,
 } from "@mui/material";
+import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
+import { LatestItemsViewProps } from "./LatestItems.models";
 
-export interface LatestItem {
-  id: string | number;
-  icon: React.ReactNode;
-  iconBgColor?: string;
-  title: string;
-  subtitle: string;
-  amount: string;
-  timeAgo: string;
-}
-
-export interface LatestItemsListProps {
-  title?: string;
-  items: LatestItem[];
-  onViewAll?: () => void;
-}
-
-export default function LatestItemsList({
-  title = "Recent Transactions",
+export default function LatestItemsView({
   items,
-  onViewAll,
-}: LatestItemsListProps) {
+  header,
+  accentColor,
+  canExpand,
+  onExpand,
+  isFetching,
+}: LatestItemsViewProps) {
   return (
-    <Box sx={{ width: "100%", bgcolor: "background.paper", borderRadius: 4, p: 2 }}>
-      {/* Header */}
-      <Box sx={{ display: "flex", justifyContent: "space-between", alignItems: "center", mb: 2, px: 2 }}>
+    <Box sx={{ width: "100%", bgcolor: "background.paper", borderRadius: 4, p: 2, opacity: isFetching ? 0.6 : 1, transition: "opacity 0.3s ease", pointerEvents: isFetching ? "none" : "auto" }}>
+      <Box sx={{ mb: 2, px: 2 }}>
         <Typography variant="h6" fontWeight="bold">
-          {title}
+          {header}
         </Typography>
-        {onViewAll && (
-          <Button
-            variant="text"
-            color="inherit"
-            size="small"
-            sx={{ textTransform: "none", color: "text.secondary", fontWeight: "medium" }}
-            onClick={onViewAll}
-          >
-            view all
-          </Button>
-        )}
       </Box>
 
-      {/* List */}
       <List disablePadding>
         {items.map((item, index) => (
           <ListItem
@@ -62,28 +38,24 @@ export default function LatestItemsList({
               mb: index !== items.length - 1 ? 1 : 0,
               borderRadius: 3,
               "&:hover": { bgcolor: "action.hover" },
-              transition: "background-color 0.2s ease",
             }}
           >
             <ListItemAvatar>
               <Avatar
                 variant="rounded"
                 sx={{
-                  bgcolor: item.iconBgColor || "grey.200",
-                  color: "inherit",
+                  bgcolor: `${accentColor}22`,
                   width: 48,
                   height: 48,
                   borderRadius: 3,
                   mr: 2,
                 }}
-              >
-                {item.icon}
-              </Avatar>
+              />
             </ListItemAvatar>
 
             <ListItemText
               primary={
-                <Typography variant="subtitle1" fontWeight={600} color="text.primary">
+                <Typography variant="subtitle1" fontWeight={600}>
                   {item.title}
                 </Typography>
               }
@@ -95,15 +67,23 @@ export default function LatestItemsList({
             />
 
             <Box sx={{ textAlign: "right" }}>
-              <Typography variant="subtitle1" fontWeight={700} color="text.primary">
+              <Typography variant="subtitle1" fontWeight={700}>
                 {item.amount}
               </Typography>
-              <Typography variant="caption" color="text.secondary" sx={{ display: 'block', mt: 0.5 }}>
+              <Typography variant="caption" color="text.secondary">
                 {item.timeAgo}
               </Typography>
             </Box>
           </ListItem>
         ))}
+
+        {canExpand && (
+          <Box sx={{ display: "flex", justifyContent: "center", mt: 2 }}>
+            <IconButton size="small" onClick={onExpand}>
+              <ExpandMoreIcon />
+            </IconButton>
+          </Box>
+        )}
       </List>
     </Box>
   );

src/components/LatestItems/index.ts

@@ -0,0 +1,2 @@
+export { default } from "./LatestItems";
+export * from "./LatestItems.models";

src/components/ProgressCard.tsx

@@ -1,80 +0,0 @@
-import * as React from "react";
-import { Box, Typography, Paper, LinearProgress, linearProgressClasses } from "@mui/material";
-
-export interface ProgressCardProps {
-  header: string;
-  summary?: string;
-  progressAmount: number;
-  totalAmount: number;
-  colorTheme?: "primary" | "secondary" | "error" | "info" | "success" | "warning";
-}
-
-export default function ProgressCard({
-  header,
-  summary,
-  progressAmount,
-  totalAmount,
-  colorTheme = "info",
-}: ProgressCardProps) {
-  const percentage = Math.min(100, Math.max(0, (progressAmount / totalAmount) * 100)) || 0;
-  
-  const displaySummary = summary ?? `Rs ${progressAmount} / Rs ${totalAmount}`;
-  
-  const parts = displaySummary.split('/');
-  const prefixAmount = parts[0]?.trim() || '';
-  const suffixString = parts.length > 1 ? `/ ${parts.slice(1).join('/').trim()}` : '';
-
-  return (
-    <Paper
-      elevation={4}
-      sx={{
-        width: "100%",
-        p: { xs: 3, md: 4 },
-        borderRadius: 4,
-        background: (theme) =>
-          colorTheme === "info"
-            ? "linear-gradient(135deg, #0284c7 0%, #06b6d4 100%)"
-            : `linear-gradient(135deg, ${theme.palette[colorTheme].main} 0%, ${theme.palette[colorTheme].light} 100%)`,
-        color: "#fff",
-        display: "flex",
-        flexDirection: "column",
-        alignItems: "center",
-        justifyContent: "center",
-        position: 'relative',
-        overflow: 'hidden',
-        boxShadow: (theme) => `0 12px 24px -10px ${theme.palette.mode === 'dark' ? '#000' : theme.palette[colorTheme].main}`,
-      }}
-    >
-      <Typography variant="subtitle1" fontWeight={600} sx={{ opacity: 0.9, mb: 1 }}>
-        {header}
-      </Typography>
-
-      <Typography variant="h3" fontWeight={800} sx={{ mb: 3 }}>
-        {prefixAmount}{" "}
-        {suffixString && (
-          <Typography component="span" variant="subtitle1" sx={{ opacity: 0.7, fontWeight: 500 }}>
-            {suffixString}
-          </Typography>
-        )}
-      </Typography>
-
-      <Box sx={{ width: "85%" }}>
-        <LinearProgress
-          variant="determinate"
-          value={percentage}
-          sx={{
-            height: 10,
-            borderRadius: 5,
-            [`&.${linearProgressClasses.colorPrimary}`]: {
-              backgroundColor: "rgba(0, 0, 0, 0.2)",
-            },
-            [`& .${linearProgressClasses.bar}`]: {
-              borderRadius: 5,
-              backgroundColor: "#fff", 
-            },
-          }}
-        />
-      </Box>
-    </Paper>
-  );
-}

src/components/ProgressCard/ProgressCard.models.ts

@@ -0,0 +1,11 @@
+export interface ProgressCardProps {
+  header: string;
+  summary?: string;
+  progressAmount: number;
+  totalAmount: number;
+  colorTheme?: "primary" | "secondary" | "error" | "info" | "success" | "warning";
+  compact?: boolean;
+  selected?: boolean;
+  onClick?: () => void;
+  isFetching?: boolean;
+}

src/components/ProgressCard/ProgressCard.tsx

@@ -0,0 +1,25 @@
+import * as React from "react";
+import ProgressCardView from "./ProgressCard.view";
+import { ProgressCardProps } from "./ProgressCard.models";
+import { getPercentage, formatCurrency } from "../report.helpers";
+
+export default function ProgressCard(props: ProgressCardProps) {
+  const { progressAmount, totalAmount, compact = false } = props;
+
+  const percentage = getPercentage(progressAmount, totalAmount);
+  
+  const formattedProgress = formatCurrency(progressAmount);
+  const formattedTotal = formatCurrency(totalAmount);
+
+  return (
+    <ProgressCardView
+      {...props}
+      percentage={percentage}
+      formattedProgress={formattedProgress}
+      formattedTotal={formattedTotal}
+      compact={compact}
+      selected={props.selected}
+      onClick={props.onClick}
+    />
+  );
+}

src/components/ProgressCard/ProgressCard.view.tsx

@@ -0,0 +1,143 @@
+import * as React from "react";
+import {
+  Box,
+  Typography,
+  Paper,
+  LinearProgress,
+  Divider,
+  linearProgressClasses
+} from "@mui/material";
+import { useTheme, alpha } from "@mui/material/styles";
+import { ProgressCardProps } from "./ProgressCard.models";
+
+interface ViewProps extends ProgressCardProps {
+  percentage: number;
+  formattedProgress: string;
+  formattedTotal: string;
+  selected?: boolean;
+  onClick?: () => void;
+}
+
+export default function ProgressCardView({
+  header,
+  colorTheme = "info",
+  percentage,
+  formattedProgress,
+  formattedTotal,
+  compact = false,
+  selected,
+  onClick,
+}: ViewProps) {
+  const theme = useTheme();
+  const isDark = theme.palette.mode === "dark";
+
+  return (
+    <Paper
+      elevation={compact ? 2 : 4}
+      onClick={onClick}
+      sx={{
+        width: "100%",
+        p: compact ? { xs: 2.5, md: 3 } : { xs: 3, md: 4 },
+        borderRadius: compact ? 3 : 4,
+        cursor: onClick ? "pointer" : "default",
+        transform: selected ? "scale(1.02)" : "scale(1)",
+        transition: "transform 0.2s ease, box-shadow 0.2s ease",
+        background: (theme) => {
+          const baseColor = theme.palette[colorTheme]?.main || theme.palette.primary.main;
+          const lightColor = theme.palette[colorTheme]?.light || theme.palette.primary.light;
+          return isDark
+            ? `linear-gradient(135deg, ${alpha(baseColor, 0.9)} 0%, ${alpha(baseColor, 0.3)} 100%)`
+            : `linear-gradient(135deg, ${baseColor} 0%, ${lightColor} 100%)`;
+        },
+        color: "#fff",
+        display: "flex",
+        flexDirection: "column",
+        alignItems: compact ? "flex-start" : "center",
+        justifyContent: "center",
+        position: "relative",
+        overflow: "hidden",
+        border: selected 
+          ? `2px solid #fff`
+          : isDark ? "1px solid rgba(255,255,255,0.1)" : "none",
+        boxShadow: (theme) => {
+          const baseShadow = `0 ${compact ? 6 : 12}px ${compact ? 12 : 24}px -10px ${
+            isDark
+              ? "rgba(0,0,0,0.5)"
+              : theme.palette[colorTheme]?.main || theme.palette.primary.main
+          }`;
+          return selected 
+            ? `${baseShadow}, 0 0 0 2px ${theme.palette.background.paper}, 0 0 0 4px ${theme.palette[colorTheme]?.main || theme.palette.primary.main}` 
+            : baseShadow;
+        },
+        opacity: arguments[0].isFetching ? 0.6 : 1,
+        pointerEvents: arguments[0].isFetching ? "none" : "auto",
+      }}
+    >
+      <Typography 
+        variant={compact ? "body2" : "subtitle1"} 
+        fontWeight={700} 
+        sx={{ 
+          opacity: 0.95, 
+          mb: compact ? 1.5 : 2, 
+          width: '100%', 
+          overflow: 'hidden', 
+          textOverflow: 'ellipsis', 
+          whiteSpace: 'nowrap',
+          letterSpacing: 0.5,
+          textShadow: isDark ? '0 1px 2px rgba(0,0,0,0.3)' : 'none'
+        }}
+      >
+        {header}
+      </Typography>
+
+      <Box sx={{ mb: compact ? 2 : 3, width: '100%' }}>
+        <Typography
+          variant={compact ? "h5" : "h3"}
+          fontWeight={900}
+          sx={{ mb: 0.5, lineHeight: 1.2, textShadow: isDark ? '0 2px 4px rgba(0,0,0,0.3)' : 'none' }}
+        >
+          {formattedProgress}
+        </Typography>
+
+        <Divider
+          sx={{
+            my: 1,
+            borderColor: "rgba(255,255,255,0.25)",
+            width: "100%",
+          }}
+        />
+
+        <Typography
+          variant={compact ? "caption" : "body2"}
+          sx={{
+            opacity: 0.85,
+            fontWeight: 500,
+            display: "block",
+            color: "rgba(255,255,255,0.9)"
+          }}
+        >
+          of {formattedTotal}
+        </Typography>
+      </Box>
+
+      <Box sx={{ width: "100%", mt: 'auto' }}>
+        <LinearProgress
+          variant="determinate"
+          value={percentage}
+          sx={{
+            height: compact ? 6 : 10,
+            borderRadius: 5,
+            [`&.${linearProgressClasses.colorPrimary}`]: {
+              backgroundColor: "rgba(0, 0, 0, 0.25)",
+            },
+            [`& .${linearProgressClasses.bar}`]: {
+              borderRadius: 5,
+              backgroundColor: "#fff",
+              boxShadow: '0 0 8px rgba(255,255,255,0.4)'
+            },
+          }}
+        />
+      </Box>
+    </Paper>
+  );
+}

src/components/ProgressCard/TopPayees.adapter.ts

@@ -0,0 +1,65 @@
+import { mergeBucketPeriods, periodIdToKey } from "../report.helpers";
+import { GroupKey, ReportData } from "../../features/report";
+
+export interface PayeeItem {
+  name: string;
+  amount: number;
+}
+
+export function extractTopPayees(
+  reportData: ReportData,
+  flow: "outflows" | "inflows",
+  selectedPeriodId?: string | null,
+  selectedGroupKey?: GroupKey | null
+): { items: PayeeItem[]; total: number } {
+  const payeeMap = new Map<string, number>();
+
+  let targetPeriods = [];
+
+  if (selectedPeriodId) {
+    const key = periodIdToKey(selectedPeriodId);
+    const periods = mergeBucketPeriods(reportData.buckets, key);
+    const selected = periods.find((p) => p.id === selectedPeriodId);
+    if (selected) {
+      targetPeriods.push(selected);
+    }
+  } else {
+    // If no specific period is selected, aggregate over the "all" period bucket
+    targetPeriods = mergeBucketPeriods(reportData.buckets, "all");
+  }
+
+  for (const p of targetPeriods) {
+    let txns = p.metric.transactions || [];
+    
+    if (selectedGroupKey?.tags && selectedGroupKey.tags.length > 0) {
+      txns = txns.filter(txn => {
+        if (!txn.tags) return false;
+        const txnTags = txn.tags.map(t => typeof t === "string" ? t : t.name);
+        return selectedGroupKey.tags!.every(selectedTag => txnTags.includes(selectedTag));
+      });
+    }
+
+    for (const txn of txns) {
+      if (txn.payee && txn.payee.name) {
+        const current = payeeMap.get(txn.payee.name) || 0;
+        payeeMap.set(txn.payee.name, current + txn.amount);
+      }
+    }
+  }
+
+  let items: PayeeItem[] = [];
+  let total = 0;
+
+  for (const [name, amount] of payeeMap.entries()) {
+    items.push({ name, amount });
+    total += amount;
+  }
+
+  // Sort descending by amount
+  items.sort((a, b) => b.amount - a.amount);
+
+  return {
+    items: items.slice(0, 4), // Top 4
+    total,
+  };
+}

src/components/ProgressCard/TopPayees.tsx

@@ -0,0 +1,93 @@
+import * as React from "react";
+import { Box, Paper, Typography } from "@mui/material";
+import { ReportData, GroupKey } from "../../features/report";
+import ProgressCard from "./ProgressCard";
+import { extractTopPayees } from "./TopPayees.adapter";
+
+type Props = {
+  reportData: ReportData;
+  flow: "outflows" | "inflows";
+  header: string;
+  selectedPeriodId?: string | null;
+  selectedGroupKey?: GroupKey | null;
+  setSelectedGroupKey?: (key: GroupKey | null) => void;
+  compact?: boolean;
+  isFetching?: boolean;
+};
+
+export default function TopPayees({
+  reportData,
+  flow,
+  header,
+  selectedPeriodId,
+  selectedGroupKey,
+  setSelectedGroupKey,
+  compact = true,
+  isFetching,
+}: Props) {
+  const { items, total } = React.useMemo(() => {
+    return extractTopPayees(reportData, flow, selectedPeriodId, selectedGroupKey);
+  }, [reportData, flow, selectedPeriodId, selectedGroupKey]);
+
+  return (
+    <Paper
+      sx={{
+        p: { xs: 2.5, sm: 4 },
+        borderRadius: 4,
+        width: "100%",
+        boxShadow: "none",
+        border: "1px solid",
+        borderColor: "divider",
+        bgcolor: "background.paper",
+        opacity: isFetching ? 0.6 : 1,
+        transition: "opacity 0.3s ease",
+        pointerEvents: isFetching ? "none" : "auto",
+      }}
+    >
+      <Typography variant="h6" fontWeight={700} gutterBottom>
+        {header}
+      </Typography>
+
+      <Box
+        sx={{
+          display: "grid",
+          gridTemplateColumns: {
+            xs: "1fr",
+            sm: "repeat(2, 1fr)",
+            md: "repeat(4, 1fr)",
+          },
+          gap: 2,
+        }}
+      >
+        {items.map((item) => {
+          const isSelected = selectedGroupKey?.payee?.includes(item.name);
+          return (
+            <ProgressCard
+              key={item.name}
+              header={item.name}
+              progressAmount={item.amount}
+              totalAmount={total}
+              compact={compact}
+              colorTheme={flow === "outflows" ? "error" : "success"}
+              selected={isSelected}
+              isFetching={isFetching}
+              onClick={() => {
+                if (setSelectedGroupKey) {
+                  let newKey = selectedGroupKey ? { ...selectedGroupKey } : {};
+
+                  if (isSelected) {
+                    delete newKey.payee;
+                  } else {
+                    newKey.payee = [item.name];
+                  }
+
+                  setSelectedGroupKey(Object.keys(newKey).length ? newKey : null);
+                }
+              }}
+            />
+          );
+        })}
+      </Box>
+    </Paper>
+  );
+}

src/components/ProgressCard/TopTags.adapter.ts

@@ -0,0 +1,71 @@
+import { ReportData } from "../../features/report";
+import {
+  mergeBucketPeriods,
+  periodIdToKey,
+} from "../report.helpers";
+
+import { GroupKey } from "../../features/report";
+
+export interface TagItem {
+  tag: string;
+  amount: number;
+}
+
+export function extractTopTags(
+  reportData: ReportData,
+  flow: "outflows" | "inflows",
+  selectedPeriodId?: string | null,
+  selectedGroupKey?: GroupKey | null
+): { items: TagItem[]; total: number } {
+  const tagMap = new Map<string, number>();
+
+  let periodKey: ReturnType<typeof periodIdToKey> = "all";
+  if (selectedPeriodId) {
+    periodKey = periodIdToKey(selectedPeriodId);
+  }
+
+  const periods = mergeBucketPeriods(reportData.buckets, periodKey);
+
+  let period = periods[0];
+  if (selectedPeriodId) {
+    period = periods.find(p => p.id === selectedPeriodId) || period;
+  } else if (periods.length > 0) {
+    period = periods.reduce((latest, p) =>
+      new Date(p.start).getTime() > new Date(latest.start).getTime()
+        ? p
+        : latest
+    );
+  }
+
+  if (period && period.metric && period.metric.transactions) {
+    let txns = period.metric.transactions;
+    if (selectedGroupKey?.payee && selectedGroupKey.payee.length > 0) {
+      txns = txns.filter(txn => 
+        txn.payee?.name && selectedGroupKey.payee!.includes(txn.payee.name)
+      );
+    }
+
+    for (const txn of txns) {
+      if (txn.tags && txn.tags.length > 0) {
+        for (const tagObj of txn.tags) {
+          const tagName = typeof tagObj === "string" ? tagObj : tagObj.name;
+          tagMap.set(tagName, (tagMap.get(tagName) || 0) + txn.amount);
+        }
+      } else {
+        tagMap.set("Untagged", (tagMap.get("Untagged") || 0) + txn.amount);
+      }
+    }
+  }
+
+  const arr = Array.from(tagMap.entries()).map(([tag, amount]) => ({
+    tag,
+    amount,
+  }));
+
+  arr.sort((a, b) => b.amount - a.amount);
+
+  const top = arr.slice(0, 4);
+  const total = top.reduce((sum, t) => sum + t.amount, 0);
+
+  return { items: top, total };
+}

src/components/ProgressCard/TopTags.tsx

@@ -0,0 +1,93 @@
+import * as React from "react";
+import { Box, Paper, Typography } from "@mui/material";
+import { ReportData, GroupKey } from "../../features/report";
+import ProgressCard from "./ProgressCard";
+import { extractTopTags } from "./TopTags.adapter";
+
+type Props = {
+  reportData: ReportData;
+  flow: "outflows" | "inflows";
+  header: string;
+  selectedPeriodId?: string | null;
+  selectedGroupKey?: GroupKey | null;
+  setSelectedGroupKey?: (key: GroupKey | null) => void;
+  compact?: boolean;
+  isFetching?: boolean;
+};
+
+export default function TopTags({
+  reportData,
+  flow,
+  header,
+  selectedPeriodId,
+  selectedGroupKey,
+  setSelectedGroupKey,
+  compact = true,
+  isFetching,
+}: Props) {
+  const { items, total } = React.useMemo(() => {
+    return extractTopTags(reportData, flow, selectedPeriodId, selectedGroupKey);
+  }, [reportData, flow, selectedPeriodId, selectedGroupKey]);
+
+  return (
+    <Paper
+      sx={{
+        p: { xs: 2.5, sm: 4 },
+        borderRadius: 4,
+        width: "100%",
+        boxShadow: "none",
+        border: "1px solid",
+        borderColor: "divider",
+        bgcolor: "background.paper",
+        opacity: isFetching ? 0.6 : 1,
+        transition: "opacity 0.3s ease",
+        pointerEvents: isFetching ? "none" : "auto",
+      }}
+    >
+      <Typography variant="h6" fontWeight={700} gutterBottom>
+        {header}
+      </Typography>
+
+      <Box
+        sx={{
+          display: "grid",
+          gridTemplateColumns: {
+            xs: "1fr",
+            sm: "repeat(2, 1fr)",
+            md: "repeat(4, 1fr)",
+          },
+          gap: 2,
+        }}
+      >
+        {items.map((item) => {
+          const isSelected = selectedGroupKey?.tags?.includes(item.tag);
+          return (
+            <ProgressCard
+              key={item.tag}
+              header={item.tag}
+              progressAmount={item.amount}
+              totalAmount={total}
+              compact={compact}
+              colorTheme={flow === "outflows" ? "error" : "success"}
+              selected={isSelected}
+              isFetching={isFetching}
+              onClick={() => {
+                if (setSelectedGroupKey) {
+                  let newKey = selectedGroupKey ? { ...selectedGroupKey } : {};
+                  
+                  if (isSelected) {
+                    delete newKey.tags;
+                  } else {
+                    newKey.tags = [item.tag];
+                  }
+
+                  setSelectedGroupKey(Object.keys(newKey).length ? newKey : null);
+                }
+              }}
+            />
+          );
+        })}
+      </Box>
+    </Paper>
+  );
+}

src/components/ProgressCard/index.ts

@@ -0,0 +1,2 @@
+export { default } from "./ProgressCard";
+export * from "./ProgressCard.models";

src/components/report.helpers.ts

@@ -0,0 +1,142 @@
+import {
+  ReportPeriod,
+  ReportBucket,
+  GroupKey,
+  PeriodType,
+} from "../features/report";
+
+// ─── Types ────────────────────────────────────────────────────
+
+export type PeriodKey = PeriodType;
+
+export type DecoratedPeriod = ReportPeriod & {
+  id: string;
+  label: string;
+};
+
+// ─── Period helpers ───────────────────────────────────────────
+
+const PREFIX_TO_KEY: Record<string, PeriodKey> = {
+  D: "daily",
+  W: "weekly",
+  M: "monthly",
+  ALL: "all",
+};
+
+/**
+ * Derive the period key from a decorated-period id.
+ * E.g. `"W:2026-04-28_2026-05-04"` → `"weekly"`
+ */
+export function periodIdToKey(periodId: string): PeriodKey {
+  const prefix = periodId.split(":")[0];
+  return PREFIX_TO_KEY[prefix] ?? "all";
+}
+
+// ─── Metric helpers ───────────────────────────────────────────
+
+export function getAmount(period: ReportPeriod): number {
+  return period.metric.sum;
+}
+
+function mergeMetric(a: ReportPeriod["metric"], b: ReportPeriod["metric"]) {
+  const sum = a.sum + b.sum;
+  const count = a.count + b.count;
+
+  return {
+    ...a,
+    sum,
+    count,
+    average: count > 0 ? sum / count : 0,
+    transactions:
+      a.transactions || b.transactions
+        ? [...(a.transactions || []), ...(b.transactions || [])]
+        : undefined,
+  };
+}
+
+/**
+ * Merge periods with the same id across all buckets, summing
+ * their metrics and concatenating transactions.
+ *
+ * Returns sorted by start date ascending.
+ */
+export function mergeBucketPeriods(
+  buckets: ReportBucket[],
+  key: PeriodKey
+): DecoratedPeriod[] {
+  const map = new Map<string, DecoratedPeriod>();
+
+  for (const bucket of buckets) {
+    const periods = (bucket.periods[key] || []) as DecoratedPeriod[];
+
+    for (const p of periods) {
+      const existing = map.get(p.id);
+
+      if (!existing) {
+        map.set(p.id, {
+          ...p,
+          metric: { ...p.metric },
+        });
+      } else {
+        map.set(p.id, {
+          ...existing,
+          metric: mergeMetric(existing.metric, p.metric),
+        });
+      }
+    }
+  }
+
+  return Array.from(map.values()).sort(
+    (a, b) => new Date(a.start).getTime() - new Date(b.start).getTime()
+  );
+}
+
+// ─── Formatting ───────────────────────────────────────────────
+
+export const formatCurrency = (val: number) => {
+  const absVal = Math.abs(val);
+  if (absVal >= 100000) {
+    return `₹ ${(val / 100000).toFixed(2)}L`;
+  }
+  if (absVal >= 1000) {
+    return `₹ ${(val / 1000).toFixed(2)}k`;
+  }
+  return `₹ ${val.toFixed(2)}`;
+};
+
+export const getPercentage = (progressAmount: number, totalAmount: number) => {
+  if (!totalAmount) return 0;
+  return Math.min(100, Math.max(0, (progressAmount / totalAmount) * 100));
+};
+
+// ─── Group filtering ──────────────────────────────────────────
+
+/**
+ * Check if a bucket's group_key matches the selected GroupKey.
+ * Every dimension present in `selected` must exist in the bucket
+ * and contain all the selected values.
+ */
+export function matchesGroupKey(
+  bucket: ReportBucket,
+  selected: GroupKey
+): boolean {
+  for (const [dim, values] of Object.entries(selected)) {
+    const bucketValues = bucket.group_key[dim];
+    if (!bucketValues) return false;
+    if (!(values as string[]).every((v) => bucketValues.includes(v)))
+      return false;
+  }
+  return true;
+}
+
+/**
+ * Return only buckets matching the selected group key,
+ * or all buckets if no selection.
+ */
+export function filterBuckets(
+  buckets: ReportBucket[],
+  selectedGroupKey: GroupKey | null
+): ReportBucket[] {
+  if (!selectedGroupKey) return buckets;
+  return buckets.filter((b) => matchesGroupKey(b, selectedGroupKey));
+}

src/dashboard-config.ts

@@ -0,0 +1,80 @@
+import HistoryChart from "./components/HistoryChart";
+import LatestItems from "./components/LatestItems";
+import { DashboardConfig } from "./components/Dashboard";
+import TopTags from "./components/ProgressCard/TopTags";
+import TopPayees from "./components/ProgressCard/TopPayees";
+
+export const configuration: DashboardConfig = {
+  sections: [
+    {
+      id: "breakdown",
+      title: "Breakdown",
+      summary: "Interactive chronological tracking",
+      component: HistoryChart,
+      settings: {
+        tabs: ["Weekly", "Monthly"],
+      },
+      style: {
+        size: 12,
+      },
+    },
+    {
+      id: "top-categories",
+      title: 'Top Categories',
+      component: TopTags,
+      settings: {
+        compact: true,
+      },
+      style: {
+        size: 12,
+      },
+    },
+    {
+      id: "top-payees",
+      title: 'Top Payees',
+      component: TopPayees,
+      settings: {
+        compact: true,
+      },
+      style: {
+        size: 12,
+      },
+    },
+    {
+      id: "items",
+      title: 'Recent Transactions',
+      component: LatestItems,
+      style: {
+        size: 12,
+      },
+    },
+  ],
+  style: {
+    palette: {
+      outflows: {
+        light: {
+          primary: "#d32f2f",
+          background: "#fdecea",
+          text: "#b71c1c"
+        },
+        dark: {
+          primary: "#f44336",
+          background: "rgba(244, 67, 54, 0.15)",
+          text: "#ffcdd2"
+        }
+      },
+      inflows: {
+        light: {
+          primary: "#2e7d32",
+          background: "#e8f5e9",
+          text: "#1b5e20"
+        },
+        dark: {
+          primary: "#4caf50",
+          background: "rgba(76, 175, 80, 0.15)",
+          text: "#c8e6c9"
+        }
+      }
+    }
+  }
+};

src/features/report/index.ts

@@ -0,0 +1,15 @@
+export {
+  useReport
+} from './useReport'
+export type {
+  Transaction,
+  ReportData,
+  ReportBucket,
+  ReportPeriod,
+  ReportQuery,
+  GroupKey,
+  PeriodType,
+} from './report.models'
+export {
+  prepareReport
+} from './report.utils'

src/features/report/report.models.ts

@@ -0,0 +1,112 @@
+export interface Payor {
+  id?: string;
+  name: string;
+  username: string;
+  email: string;
+}
+
+export interface Payee {
+  type: "merchant" | "person" | "transfer" | "other";
+  name: string;
+}
+
+export interface Account {
+  id: string;
+  name: string;
+  number: string;
+  type: "cash" | "bank" | "credit_card" | "wallet" | "other";
+  currency: string;
+  is_active?: boolean;
+}
+
+export interface Tag {
+  id: string;
+  name: string;
+  icon: string;
+  parent_id?: string | null;
+}
+
+export interface Transaction {
+  id: string;
+  payor: Payor;
+  payee: Payee;
+  amount: number;
+  account: Account;
+  tags: Tag[];
+  occurred_at: string;
+  created_at: string;
+}
+
+// -----------------------------
+// Metrics
+// -----------------------------
+
+export interface ReportMetric {
+  sum: number;
+  count: number;
+  average: number;
+  transactions?: Transaction[];
+}
+
+// -----------------------------
+// Period
+// -----------------------------
+
+export type PeriodType = "daily" | "weekly" | "monthly" | "all";
+
+export interface ReportPeriod {
+  start: string;
+  end: string;
+  metric: ReportMetric;
+}
+
+// -----------------------------
+// Group (bucket)
+// -----------------------------
+
+export type GroupKey = {
+  [dimension: string]: string[];
+};
+
+export interface ReportBucket {
+  group_key: GroupKey;
+
+  periods: {
+    daily?: ReportPeriod[];
+    weekly?: ReportPeriod[];
+    monthly?: ReportPeriod[];
+    all?: ReportPeriod[];
+  };
+}
+
+// -----------------------------
+// Report Query
+// -----------------------------
+
+export interface ReportQuery {
+  accounts?: string[] | null;
+  ignore_self?: boolean | null;
+  start_date?: string | null;
+  end_date?: string | null;
+  min_amount?: number | null;
+  max_amount?: number | null;
+}
+
+// -----------------------------
+// Final Report
+// -----------------------------
+
+export interface ReportData {
+  snapshot_id?: string | null;
+
+  flow?: "inflows" | "outflows" | null;
+
+  periods: PeriodType[];
+
+  tags?: string[] | null;
+  payee?: string[] | null;
+
+  buckets: ReportBucket[];
+
+  query: ReportQuery;
+}

src/features/report/report.utils.ts

@@ -0,0 +1,117 @@
+import {
+  ReportData,
+  ReportPeriod,
+  PeriodType,
+} from "./report.models";
+
+/* ---------- ID BUILDING ---------- */
+
+function formatDate(d: Date): string {
+  const y = d.getUTCFullYear();
+  const m = String(d.getUTCMonth() + 1).padStart(2, "0");
+  const day = String(d.getUTCDate()).padStart(2, "0");
+  return `${y}-${m}-${day}`;
+}
+
+function buildPeriodId(
+  type: PeriodType,
+  start: Date,
+  end: Date
+): string {
+  const s = formatDate(start);
+  const e = formatDate(end);
+
+  switch (type) {
+    case "daily":
+      return `D:${s}_${e}`;
+    case "weekly":
+      return `W:${s}_${e}`;
+    case "monthly":
+      return `M:${s}_${e}`;
+    case "all":
+      return `ALL:${s}_${e}`;
+    default:
+      return `${s}_${e}`;
+  }
+}
+
+/* ---------- LABEL BUILDING ---------- */
+
+const dayFmt = new Intl.DateTimeFormat("en-GB", {
+  day: "numeric",
+  month: "short",
+  timeZone: "UTC",
+});
+
+const monthDayFmt = new Intl.DateTimeFormat("en-GB", {
+  month: "short",
+  day: "numeric",
+  timeZone: "UTC",
+});
+
+const monthFmt = new Intl.DateTimeFormat("en-GB", {
+  month: "short",
+  timeZone: "UTC",
+});
+
+const yearFmt = new Intl.DateTimeFormat("en-GB", {
+  year: "numeric",
+  timeZone: "UTC",
+});
+
+function buildLabel(
+  type: PeriodType,
+  start: Date,
+  end: Date
+): string {
+  switch (type) {
+    case "daily":
+      return dayFmt.format(start);
+
+    case "weekly": {
+      const sDay = start.getUTCDate();
+      const m = monthFmt.format(start);
+      return `${sDay} ${m}`;
+    }
+
+    case "monthly":
+      return `${monthFmt.format(start)} ${yearFmt.format(start)}`;
+
+    default:
+      return `${monthDayFmt.format(start)} - ${monthDayFmt.format(end)}`;
+  }
+}
+
+/* ---------- MAIN ---------- */
+
+function decoratePeriods(
+  type: PeriodType,
+  periods: ReportPeriod[]
+): (ReportPeriod & { id: string; label: string })[] {
+  return periods.map((p) => ({
+    ...p,
+    id: buildPeriodId(type, new Date(p.start + "Z"), new Date(p.end + "Z")),
+    label: buildLabel(type, new Date(p.start + "Z"), new Date(p.end + "Z")),
+  }));
+}
+
+export function prepareReport(reportData: ReportData): ReportData {
+  return {
+    ...reportData,
+    buckets: reportData.buckets.map((bucket) => {
+      const newPeriods: typeof bucket.periods = {};
+
+      for (const type of reportData.periods) {
+        const arr = bucket.periods[type];
+        if (arr) {
+          newPeriods[type] = decoratePeriods(type, arr);
+        }
+      }
+
+      return {
+        ...bucket,
+        periods: newPeriods,
+      };
+    }),
+  };
+}

src/features/report/useReport.ts

@@ -0,0 +1,18 @@
+import { useResourceByName } from "../../../react-openapi";
+
+export interface ReportParams {
+  snapshot_id?: string;
+  periods?: ("daily" | "weekly" | "monthly" | "all")[];
+  flow?: "inflows" | "outflows";
+  payee?: string[];
+  tags?: string[];
+}
+
+export function useReport(params: ReportParams) {
+  const { useList } = useResourceByName("reports");
+
+  return useList({
+    ...params,
+    periods: params.periods,
+  });
+}

src/main.jsx

@@ -12,7 +12,7 @@ import {
 } from "@mui/material";
 import Home from './Home';
 import Dashboard from './Dashboard';
-import { Admin, initializeApiClients } from '../react-openapi';
+import { Admin, AppProvider } from '../react-openapi';
 import { configuration, profileConfiguration } from './openapi-config';
 import { Buffer } from 'buffer';
 import process from 'process';
@@ -21,17 +21,13 @@ import Header from './Header';
 import Footer from './Footer';
 import AppTheme from './AppTheme';
 
-// Polyfill Node.js globals for browser environment (needed by SwaggerParser)
 window.Buffer = Buffer;
 window.process = process;
 
 const rootElement = document.getElementById('root');
 const root = createRoot(rootElement);
-const API_BASE = import.meta.env.VITE_API_BASE_URL;
-const AUTH_BASE = import.meta.env.VITE_AUTH_BASE_URL;
 
-// Initialize global API clients so all components across khata-ui have generic API access
-initializeApiClients(API_BASE, AUTH_BASE);
+const AUTH_BASE = import.meta.env.VITE_AUTH_BASE_URL;
 
 const routerMapping = [
   { path: "/", component: Home, headerTitle: "Home" },
@@ -41,35 +37,36 @@ const routerMapping = [
 ];
 
 root.render(
-  <BrowserRouter>
-    <AuthProvider authBaseUrl={AUTH_BASE}>
-      <AppTheme>
-        <CssBaseline enableColorScheme />
-        <Header routerMapping={routerMapping} />
+  <AppProvider resourceOverrides={configuration} profileConfig={profileConfiguration}>
+    <BrowserRouter>
+      <AuthProvider authBaseUrl={AUTH_BASE}>
+        <AppTheme>
+          <CssBaseline enableColorScheme />
+          <Header routerMapping={routerMapping} />
 
-        <Box sx={{ pb: 8 }}>
-          <Toolbar />
+          <Box sx={{ pb: 8 }}>
+            <Toolbar />
 
-          <Routes>
-            {routerMapping.map(({ path, component: Component }) => (
-              <Route
-                key={path}
-                path={path}
-                element={
-                  path.startsWith("/admin") ? (
-                    <Component basePath="/admin" resourceOverrides={configuration} profileConfig={profileConfiguration} />
-                  ) : (
-                    <Component />
-                  )
-                }
-              />
-            ))}
-          </Routes>
+            <Routes>
+              {routerMapping.map(({ path, component: Component }) => (
+                <Route
+                  key={path}
+                  path={path}
+                  element={
+                    path.startsWith("/admin") ? (
+                      <Component basePath="/admin" />
+                    ) : (
+                      <Component />
+                    )
+                  }
+                />
+              ))}
+            </Routes>
+          </Box>
 
-        </Box>
-
-        <Footer />
-      </AppTheme>
-    </AuthProvider>
-  </BrowserRouter>
+          <Footer />
+        </AppTheme>
+      </AuthProvider>
+    </BrowserRouter>
+  </AppProvider>
 );

src/openapi-config.ts

@@ -40,6 +40,9 @@ export const configuration: Record<string, ResourceOverride> = {
     },
     pagination: true,
   },
+  reports: {
+    hidden: true
+  }
 };
 
 export const profileConfiguration = {

src/utils/dashboardLoader.ts

@@ -1,223 +0,0 @@
-import { api } from "../../react-openapi";
-import { LatestItem } from "../components/LatestItemsList";
-import { ChartDataPoint } from "../components/HistoryChart";
-import * as React from "react";
-import MonetizationOnIcon from "@mui/icons-material/MonetizationOn";
-
-// ---------------- ICON ----------------
-const DEFAULT_ICON = React.createElement(MonetizationOnIcon, {
-  sx: { color: "#388e3c" }
-});
-
-// ---------------- HELPERS ----------------
-const format = (d: Date) =>
-  `${d.getDate()} ${d.toLocaleString("default", { month: "short" })}`;
-
-const startOfDay = (d: Date) => {
-  const x = new Date(d);
-  x.setHours(0, 0, 0, 0);
-  return x;
-};
-
-const endOfDay = (d: Date) => {
-  const x = new Date(d);
-  x.setHours(23, 59, 59, 999);
-  return x;
-};
-
-const getStartOfWeek = (d: Date) => {
-  const date = new Date(d);
-  const day = date.getDay() || 7;
-  if (day !== 1) date.setDate(date.getDate() - (day - 1));
-  return startOfDay(date);
-};
-
-// ---------------- LATEST ----------------
-export async function fetchLatestTransactions(
-  type: "expense" | "income"
-): Promise<LatestItem[]> {
-  const res = await api.get("/expenses", {
-    params: { limit: 100, sort: "-occurred_at" }
-  });
-
-  const items = res.data?.items || res.data || [];
-
-  const isValid = (amt: number) =>
-    type === "expense" ? amt < 0 : amt > 0;
-
-  return items
-    .filter((item: any) => isValid(Number(item.amount) || 0))
-    .slice(0, 10)
-    .map((exp: any, index: number) => {
-      const time = new Date(
-        exp.occurred_at || exp.created_at || Date.now()
-      ).getTime();
-
-      const diffDays = Math.floor(
-        Math.abs(Date.now() - time) / (1000 * 60 * 60 * 24)
-      );
-
-      return {
-        id: exp.id || index,
-        icon: DEFAULT_ICON,
-        iconBgColor:
-          type === "expense" ? "#ffebee" : "#e8f5e9",
-        title: exp.payee?.name || exp.payee || "Unknown Payee",
-        subtitle: exp.category?.name || exp.account?.name || "Transaction",
-        amount: `Rs ${Math.abs(exp.amount || 0)}`,
-        timeAgo: diffDays === 0 ? "Today" : `${diffDays} days ago`
-      };
-    });
-}
-
-// ---------------- TYPES ----------------
-export interface AggregatedDashboardData {
-  chartData: Record<string, ChartDataPoint[]>;
-  totalAmount: number;
-  topPayees: Array<{ payeeName: string; amount: number }>;
-}
-
-// ---------------- AGGREGATION ----------------
-export async function fetchAggregatedData(
-  type: "expense" | "income"
-): Promise<AggregatedDashboardData> {
-  const res = await api.get("/expenses", { params: { limit: 0 } });
-  const all: any[] = res.data?.items || res.data || [];
-
-  const now = new Date();
-
-  let totalAmount = 0;
-  const payeeMap: Record<string, number> = {};
-
-  const isValid = (amt: number) =>
-    type === "expense" ? amt < 0 : amt > 0;
-
-  const normalize = (amt: number) => Math.abs(amt);
-
-  // ---------------- WEEK ----------------
-  const weekBuckets: Record<string, number> = {
-    Mon: 0, Tue: 0, Wed: 0, Thu: 0,
-    Fri: 0, Sat: 0, Sun: 0
-  };
-
-  const weekStart = getStartOfWeek(now);
-  const weekEnd = endOfDay(new Date(weekStart.getTime() + 6 * 86400000));
-
-  // ---------------- MONTH (5 rolling weeks) ----------------
-  const monthBuckets: {
-    label: string;
-    start: Date;
-    end: Date;
-    amount: number;
-  }[] = [];
-
-  for (let i = 0; i < 5; i++) {
-    const end = endOfDay(new Date(now.getTime() - i * 7 * 86400000));
-    const start = startOfDay(new Date(end.getTime() - 6 * 86400000));
-
-    monthBuckets.push({
-      label: `${format(start)} - ${format(end)}`,
-      start,
-      end,
-      amount: 0
-    });
-  }
-
-  // ---------------- YEAR (12 months) ----------------
-  const yearBuckets: {
-    label: string;
-    start: Date;
-    end: Date;
-    amount: number;
-  }[] = [];
-
-  for (let i = 0; i < 12; i++) {
-    const d = new Date(now);
-    d.setMonth(d.getMonth() - i);
-
-    const start = new Date(d.getFullYear(), d.getMonth(), 1);
-    const end = endOfDay(new Date(d.getFullYear(), d.getMonth() + 1, 0));
-
-    yearBuckets.push({
-      label: d.toLocaleString("default", { month: "short" }),
-      start,
-      end,
-      amount: 0
-    });
-  }
-
-  // ---------------- LOOP ----------------
-  for (const item of all) {
-    const d = new Date(
-      item.occurred_at || item.created_at || Date.now()
-    );
-
-    const amtRaw = Number(item.amount) || 0;
-    if (!isValid(amtRaw)) continue;
-
-    const amt = normalize(amtRaw);
-
-    totalAmount += amt;
-
-    const payee = item.payee?.name || item.payee || "Unknown";
-    payeeMap[payee] = (payeeMap[payee] || 0) + amt;
-
-    // WEEK
-    if (d >= weekStart && d <= weekEnd) {
-      const day = ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"][d.getDay()];
-      if (weekBuckets[day] !== undefined) {
-        weekBuckets[day] += amt;
-      }
-    }
-
-    // MONTH
-    monthBuckets.forEach(b => {
-      if (d >= b.start && d <= b.end) {
-        b.amount += amt;
-      }
-    });
-
-    // YEAR
-    yearBuckets.forEach(b => {
-      if (d >= b.start && d <= b.end) {
-        b.amount += amt;
-      }
-    });
-  }
-
-  const toPoints = (b: any): ChartDataPoint[] =>
-    Object.entries(b).map(([k, v]: any) => ({
-      id: k,
-      amount: typeof v === "number" ? v : v.amount,
-      subLabel: typeof v === "number" ? undefined : v.range
-    }));
-
-  const chartData = {
-    week: toPoints(weekBuckets),
-    month: toPoints(monthBuckets),
-    year: toPoints(yearBuckets)
-  };
-
-  // highlight max
-  Object.values(chartData).forEach(group => {
-    let max = group[0];
-    for (const g of group) {
-      if (g.amount > max.amount) max = g;
-    }
-    if (max.amount > 0) max.highlighted = true;
-  });
-
-  const topPayees = Object.entries(payeeMap)
-    .map(([name, amt]) => ({ payeeName: name, amount: amt }))
-    .sort((a, b) => b.amount - a.amount)
-    .slice(0, 5);
-
-  return { chartData, totalAmount, topPayees };
-}
-
-// ---------------- EXPORTS ----------------
-export const fetchAggregatedExpenses = () =>
-  fetchAggregatedData("expense");
-
-export const fetchAggregatedIncome = () =>
-  fetchAggregatedData("income");