feat: Add transaction type, select component, and income/expense calc…

…ulation This commit adds a new feature for transaction types, a select component, and updates to calculate income and expense for accounts.
xDeFc0nx · Jan 25, 2025 · 6066177 · 6066177
1 parent 36a0ae7
commit 6066177
Show file tree

Hide file tree

Showing 13 changed files with 491 additions and 149 deletions.
diff --git a/client/README.md b/client/README.md
diff --git a/client/package.json b/client/package.json
@@ -17,6 +17,7 @@
     "@radix-ui/react-dropdown-menu": "^2.1.4",
     "@radix-ui/react-label": "^2.1.1",
     "@radix-ui/react-progress": "^1.1.1",
+    "@radix-ui/react-select": "^2.1.5",
     "@radix-ui/react-separator": "^1.1.1",
     "@radix-ui/react-slot": "^1.1.1",
     "@radix-ui/react-toast": "^1.2.4",

diff --git a/client/pnpm-lock.yaml b/client/pnpm-lock.yaml
diff --git a/client/src/components/context/userData.tsx b/client/src/components/context/userData.tsx
@@ -12,13 +12,16 @@ export interface Account {
   ID: string;
   UserID: string;
   AccountID: string;
+  Income: number;
+  Expense: number;
   AccountBalance: number;
   Type: string;
 }
 export interface Transaction {
   ID: string;
   UserID: string;
   AccountID: string;
+  Type: string;
   Amount: number;
   Description: string;
   IsRecurring: boolean;
@@ -66,7 +69,6 @@ export const UserDataProvider = ({
     if (socket && isReady) {
       socket.send('getUser');
       socket.send('getAccounts');
-
       socket.onMessage((msg) => {
         const response = JSON.parse(msg);
 

diff --git a/client/src/components/sidebar/app-sidebar.tsx b/client/src/components/sidebar/app-sidebar.tsx
@@ -25,7 +25,6 @@ const data = {
       url: '/app/transactions',
       icon: CreditCard,
     },
-
   ],
 };
 

diff --git a/client/src/components/sidebar/nav-main.tsx b/client/src/components/sidebar/nav-main.tsx
@@ -1,6 +1,4 @@
-import {
-  type LucideIcon,
-} from 'lucide-react';
+import { type LucideIcon } from 'lucide-react';
 import {
   Collapsible,
   CollapsibleContent,
@@ -39,12 +37,12 @@ export function NavMain({
           >
             <SidebarMenuItem>
               <CollapsibleTrigger asChild>
-                 <Link to={item.url}>
-                <SidebarMenuButton tooltip={item.name}>
-                  {item.icon && <item.icon />}
-                  <span>{item.name}</span>
-                </SidebarMenuButton>
-                  </Link>
+                <Link to={item.url}>
+                  <SidebarMenuButton tooltip={item.name}>
+                    {item.icon && <item.icon />}
+                    <span>{item.name}</span>
+                  </SidebarMenuButton>
+                </Link>
               </CollapsibleTrigger>
             </SidebarMenuItem>
           </Collapsible>
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,6 @@ const data = { @@
           url: '/app/transactions',
           icon: CreditCard,
         },
       ],
     };
@@ Expand Down @@