From ebc1bc48077ed3bb8b9b942332f365c6f5d2768e Mon Sep 17 00:00:00 2001 From: Elizabeth Date: Mon, 29 Jan 2024 16:27:56 -0500 Subject: [PATCH] Cambio Dashboard --- src/@mock-api/mock-api.json | 18 +++--- .../dashboard/project/ProjectDashboardApp.tsx | 36 ----------- .../project/ProjectDashboardAppHeader.tsx | 59 +------------------ .../budget/widgets/BudgetDetailsWidget.tsx | 2 +- .../dashboard/project/tabs/home/HomeTab.tsx | 40 +++++++++---- .../tabs/home/widgets/GithubIssuesWidget.tsx | 46 +++++++++------ 6 files changed, 72 insertions(+), 129 deletions(-) diff --git a/src/@mock-api/mock-api.json b/src/@mock-api/mock-api.json index c537593..bcd5b67 100644 --- a/src/@mock-api/mock-api.json +++ b/src/@mock-api/mock-api.json @@ -25743,17 +25743,17 @@ } }, "ranges": { - "this-week": "This Week", - "last-week": "Last Week" + "this-week": "Mensual", + "last-week": "Semestral" }, "labels": [ - "Mon", - "Tue", - "Wed", - "Thu", - "Fri", - "Sat", - "Sun" + "Enero", + "Febrero", + "Marzo", + "Abril", + "Mayo", + "Junio", + "Julio" ], "series": { "this-week": [ diff --git a/src/app/main/dashboard/project/ProjectDashboardApp.tsx b/src/app/main/dashboard/project/ProjectDashboardApp.tsx index 81d1983..3ddc9e5 100644 --- a/src/app/main/dashboard/project/ProjectDashboardApp.tsx +++ b/src/app/main/dashboard/project/ProjectDashboardApp.tsx @@ -40,43 +40,7 @@ function ProjectDashboardApp() { header={} content={
- - ) - }} - > - - - - {tabValue === 0 && } - {tabValue === 1 && } - {tabValue === 2 && }
} /> diff --git a/src/app/main/dashboard/project/ProjectDashboardAppHeader.tsx b/src/app/main/dashboard/project/ProjectDashboardAppHeader.tsx index b4740b8..6b522de 100644 --- a/src/app/main/dashboard/project/ProjectDashboardAppHeader.tsx +++ b/src/app/main/dashboard/project/ProjectDashboardAppHeader.tsx @@ -67,21 +67,14 @@ function ProjectDashboardAppHeader() {
- {`Welcome back, ${user.data.displayName}!`} + Dashboard -
- - heroicons-solid:bell - - You have 2 new messages and 15 new tasks + {`${user.data.displayName}`}
@@ -91,58 +84,12 @@ function ProjectDashboardAppHeader() { className="whitespace-nowrap" variant="contained" color="primary" - startIcon={heroicons-solid:mail} - > - Messages - - -
- - - {projects && - projects.map((project) => ( - { - handleChangeProject(project.id); - }} - > - {project.name} - - ))} - -
); } 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 9ac5fe8..e953199 100644 --- a/src/app/main/dashboard/project/tabs/budget/widgets/BudgetDetailsWidget.tsx +++ b/src/app/main/dashboard/project/tabs/budget/widgets/BudgetDetailsWidget.tsx @@ -25,7 +25,7 @@ function BudgetDetailsWidget() { return ( - Budget Details + Facturas Recientes
diff --git a/src/app/main/dashboard/project/tabs/home/HomeTab.tsx b/src/app/main/dashboard/project/tabs/home/HomeTab.tsx index 6a1075f..8af6ecc 100644 --- a/src/app/main/dashboard/project/tabs/home/HomeTab.tsx +++ b/src/app/main/dashboard/project/tabs/home/HomeTab.tsx @@ -6,6 +6,10 @@ import FeaturesWidget from './widgets/FeaturesWidget'; 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'; /** * The HomeTab component. @@ -31,7 +35,29 @@ function HomeTab() { initial="hidden" animate="show" > - +
+ {/*flex flex-col w-full px-24 sm:px-32 + lg:col-span-2 grid grid-cols-1 gap-y-24*/} + + + + + + + + + +
+ {/* @@ -42,7 +68,7 @@ function HomeTab() { - +
*/} - - - - + ); 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 3be5499..1172afb 100644 --- a/src/app/main/dashboard/project/tabs/home/widgets/GithubIssuesWidget.tsx +++ b/src/app/main/dashboard/project/tabs/home/widgets/GithubIssuesWidget.tsx @@ -114,7 +114,7 @@ function GithubIssuesWidget() {
- Github Issues Summary + Resumen
- New vs. Closed - + */}
- Overview + Descripción
{overview[currentRange]['new-issues']} - New Issues + Recaudación
-
+
- {overview[currentRange]['closed-issues']} + {/* {overview[currentRange]['closed-issues']} */} 0 - Closed + Facturas Emitidas
- + + {/* {overview[currentRange]['closed-issues']} */} 20 + + IVA Cobrado +
+
+ + {/* {overview[currentRange]['closed-issues']} */} 50 + + Facturas Disponibles +
+ {/* _theme.palette.mode === 'light' @@ -195,7 +207,7 @@ function GithubIssuesWidget() { {overview[currentRange].fixed} - Fixed + Proveedores {overview[currentRange]['wont-fix']} - Won't 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-1 flex flex-col items-center justify-center py-32 px-4 rounded-2xl" + 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' @@ -238,7 +250,7 @@ function GithubIssuesWidget() { {overview[currentRange]['needs-triage']} Needs Triage - + */}