From 147385add95921465d2512551f30a0000b18b5db Mon Sep 17 00:00:00 2001 From: EliAlarcon Date: Wed, 31 Jan 2024 14:44:04 -0500 Subject: [PATCH] Cambio en widgets --- src/@mock-api/mock-api.json | 54 ++++++++--------- .../project/tabs/budget/BudgetTab.tsx | 2 +- .../budget/widgets/BudgetDetailsWidget.tsx | 8 +-- .../budget/widgets/MonthlyExpensesWidget.tsx | 8 +-- ...Widget.tsx => SemestralExpensesWidget.tsx} | 8 +-- .../budget/widgets/YearlyExpensesWidget.tsx | 8 +-- .../widgets/types/BudgetDetailsDataType.ts | 4 +- .../dashboard/project/tabs/home/HomeTab.tsx | 60 +++++++------------ .../tabs/home/widgets/GithubIssuesWidget.tsx | 56 ----------------- 9 files changed, 67 insertions(+), 141 deletions(-) rename src/app/main/dashboard/project/tabs/budget/widgets/{WeeklyExpensesWidget.tsx => SemestralExpensesWidget.tsx} (93%) diff --git a/src/@mock-api/mock-api.json b/src/@mock-api/mock-api.json index bcd5b67..42a83e8 100644 --- a/src/@mock-api/mock-api.json +++ b/src/@mock-api/mock-api.json @@ -26025,52 +26025,52 @@ }, "budgetDetails": { "columns": [ - "Type", - "Total Budget", - "Expenses (USD)", - "Expenses (%)", - "Remaining (USD)", - "Remaining (%)" + "Número Factura", + "Fecha", + "Cliente", + "Valor (USD)", + "IVA (%)", + "Valor IVA (USD)" ], "rows": [ { - "type": "Concept", - "total": 14880, - "expensesAmount": 14000, + "type": "001-001-001", + "total": "15-01-2024", + "expensesAmount": "Amanda Pérez", "expensesPercentage": 94.08, - "remainingAmount": 880, + "remainingAmount": 12, "remainingPercentage": 5.92 }, { - "type": "Design", - "total": 21080, - "expensesAmount": 17240.34, + "type": "001-001-002", + "total": "14-01-2024", + "expensesAmount": "Sol Villafuerte", "expensesPercentage": 81.78, - "remainingAmount": 3839.66, + "remainingAmount": 12, "remainingPercentage": 18.22 }, { - "type": "Development", - "total": 34720, - "expensesAmount": 3518, + "type": "001-001-003", + "total": "10-01-2024", + "expensesAmount": "Julio Iglesias", "expensesPercentage": 10.13, - "remainingAmount": 31202, + "remainingAmount": 10, "remainingPercentage": 89.87 }, { - "type": "Extras", - "total": 18600, - "expensesAmount": 0, - "expensesPercentage": 0, - "remainingAmount": 18600, + "type": "001-001-004", + "total": "05-01-2024", + "expensesAmount": "Franco Almonte", + "expensesPercentage": 18600, + "remainingAmount": 12, "remainingPercentage": 100 }, { - "type": "Marketing", - "total": 34720, - "expensesAmount": 19859.84, + "type": "001-001-005", + "total": "01-01-2024", + "expensesAmount": "Martin Carrillo", "expensesPercentage": 57.2, - "remainingAmount": 14860.16, + "remainingAmount": 10, "remainingPercentage": 42.8 } ] diff --git a/src/app/main/dashboard/project/tabs/budget/BudgetTab.tsx b/src/app/main/dashboard/project/tabs/budget/BudgetTab.tsx index eafe969..2a8c610 100644 --- a/src/app/main/dashboard/project/tabs/budget/BudgetTab.tsx +++ b/src/app/main/dashboard/project/tabs/budget/BudgetTab.tsx @@ -1,6 +1,6 @@ import { motion } from 'framer-motion'; import BudgetDistributionWidget from './widgets/BudgetDistributionWidget'; -import WeeklyExpensesWidget from './widgets/WeeklyExpensesWidget'; +import WeeklyExpensesWidget from './widgets/SemestralExpensesWidget'; import MonthlyExpensesWidget from './widgets/MonthlyExpensesWidget'; import YearlyExpensesWidget from './widgets/YearlyExpensesWidget'; import BudgetDetailsWidget from './widgets/BudgetDetailsWidget'; diff --git a/src/app/main/dashboard/project/tabs/budget/widgets/BudgetDetailsWidget.tsx b/src/app/main/dashboard/project/tabs/budget/widgets/BudgetDetailsWidget.tsx index e953199..5d93bea 100644 --- a/src/app/main/dashboard/project/tabs/budget/widgets/BudgetDetailsWidget.tsx +++ b/src/app/main/dashboard/project/tabs/budget/widgets/BudgetDetailsWidget.tsx @@ -63,9 +63,8 @@ function BudgetDetailsWidget() { ); } - case 'total': - case 'expensesAmount': - case 'remainingAmount': { + case 'expensesPercentage': + case 'remainingPercentage': { return ( ); } - case 'expensesPercentage': - case 'remainingPercentage': { + case 'remainingAmount': { return (
-
Monthly Expenses
+
Facturación Mensual
heroicons-solid:dots-vertical @@ -72,14 +72,14 @@ function MonthlyExpensesWidget() {
heroicons-solid:trending-up - 2% - above projected + 2% + en aumento
diff --git a/src/app/main/dashboard/project/tabs/budget/widgets/WeeklyExpensesWidget.tsx b/src/app/main/dashboard/project/tabs/budget/widgets/SemestralExpensesWidget.tsx similarity index 93% rename from src/app/main/dashboard/project/tabs/budget/widgets/WeeklyExpensesWidget.tsx rename to src/app/main/dashboard/project/tabs/budget/widgets/SemestralExpensesWidget.tsx index 4e9efe1..b543432 100644 --- a/src/app/main/dashboard/project/tabs/budget/widgets/WeeklyExpensesWidget.tsx +++ b/src/app/main/dashboard/project/tabs/budget/widgets/SemestralExpensesWidget.tsx @@ -56,7 +56,7 @@ function WeeklyExpensesWidget() { return (
-
Weekly Expenses
+
Facturación Semestral
heroicons-solid:dots-vertical @@ -73,14 +73,14 @@ function WeeklyExpensesWidget() {
heroicons-solid:trending-down - 2% - below projected + 2% + a la baja
diff --git a/src/app/main/dashboard/project/tabs/budget/widgets/YearlyExpensesWidget.tsx b/src/app/main/dashboard/project/tabs/budget/widgets/YearlyExpensesWidget.tsx index 457342c..0a346cf 100644 --- a/src/app/main/dashboard/project/tabs/budget/widgets/YearlyExpensesWidget.tsx +++ b/src/app/main/dashboard/project/tabs/budget/widgets/YearlyExpensesWidget.tsx @@ -55,7 +55,7 @@ function YearlyExpensesWidget() { return (
-
Yearly Expenses
+
Facturación Anual
heroicons-solid:dots-vertical @@ -72,14 +72,14 @@ function YearlyExpensesWidget() {
heroicons-solid:trending-up - 2% - above projected + 2% + en aumento
diff --git a/src/app/main/dashboard/project/tabs/budget/widgets/types/BudgetDetailsDataType.ts b/src/app/main/dashboard/project/tabs/budget/widgets/types/BudgetDetailsDataType.ts index 412c00e..a69e58e 100644 --- a/src/app/main/dashboard/project/tabs/budget/widgets/types/BudgetDetailsDataType.ts +++ b/src/app/main/dashboard/project/tabs/budget/widgets/types/BudgetDetailsDataType.ts @@ -3,8 +3,8 @@ */ type BudgetDetailsRow = { type: string; - total: number; - expensesAmount: number; + total: string; + expensesAmount: string; expensesPercentage: number; remainingAmount: number; remainingPercentage: number; diff --git a/src/app/main/dashboard/project/tabs/home/HomeTab.tsx b/src/app/main/dashboard/project/tabs/home/HomeTab.tsx index 8af6ecc..e7f2d67 100644 --- a/src/app/main/dashboard/project/tabs/home/HomeTab.tsx +++ b/src/app/main/dashboard/project/tabs/home/HomeTab.tsx @@ -7,9 +7,9 @@ import GithubIssuesWidget from './widgets/GithubIssuesWidget'; import TaskDistributionWidget from './widgets/TaskDistributionWidget'; import ScheduleWidget from './widgets/ScheduleWidget'; import BudgetDetailsWidget from '../budget/widgets/BudgetDetailsWidget'; -import WeeklyExpensesWidget from '../budget/widgets/WeeklyExpensesWidget'; import MonthlyExpensesWidget from '../budget/widgets/MonthlyExpensesWidget'; import YearlyExpensesWidget from '../budget/widgets/YearlyExpensesWidget'; +import SemestralExpensesWidget from '../budget/widgets/SemestralExpensesWidget'; /** * The HomeTab component. @@ -30,54 +30,38 @@ function HomeTab() { return ( -
- {/*flex flex-col w-full px-24 sm:px-32 - lg:col-span-2 grid grid-cols-1 gap-y-24*/} - - - - - - - - - -
- {/* - - - - - - - - - - - */} + + + + + + + + + diff --git a/src/app/main/dashboard/project/tabs/home/widgets/GithubIssuesWidget.tsx b/src/app/main/dashboard/project/tabs/home/widgets/GithubIssuesWidget.tsx index 1172afb..c9adba0 100644 --- a/src/app/main/dashboard/project/tabs/home/widgets/GithubIssuesWidget.tsx +++ b/src/app/main/dashboard/project/tabs/home/widgets/GithubIssuesWidget.tsx @@ -195,62 +195,6 @@ function GithubIssuesWidget() { Facturas Disponibles - {/* - _theme.palette.mode === 'light' - ? lighten(theme.palette.background.default, 0.4) - : lighten(theme.palette.background.default, 0.02) - }} - className="col-span-2 sm:col-span-1 flex flex-col items-center justify-center py-32 px-4 rounded-2xl" - > - - {overview[currentRange].fixed} - - Proveedores - - - _theme.palette.mode === 'light' - ? lighten(theme.palette.background.default, 0.4) - : lighten(theme.palette.background.default, 0.02) - }} - className="col-span-2 sm:col-span-1 flex flex-col items-center justify-center py-32 px-4 rounded-2xl" - > - - {overview[currentRange]['wont-fix']} - - Facturas Disponibles - */} - {/* - _theme.palette.mode === 'light' - ? lighten(theme.palette.background.default, 0.4) - : lighten(theme.palette.background.default, 0.02) - }} - className="col-span-2 sm:col-span-2 flex flex-col items-center justify-center py-32 px-4 rounded-2x1" - > - - {overview[currentRange]['re-opened']} - - Re-opened - */} - {/* - _theme.palette.mode === 'light' - ? lighten(theme.palette.background.default, 0.4) - : lighten(theme.palette.background.default, 0.02) - }} - className="col-span-2 sm:col-span-1 flex flex-col items-center justify-center py-32 px-4 rounded-2xl" - > - - {overview[currentRange]['needs-triage']} - - Needs Triage - */}