diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx index 37b50a3..1b5c383 100644 --- a/src/pages/dashboard.tsx +++ b/src/pages/dashboard.tsx @@ -15,6 +15,7 @@ import { dataEconomiaIndicador } from '../services/economiaIndicador' import { EconomiaAcumulada } from '../services/economiaAcumulada' import Chart from '../components/graph/Chart' import { LineBarChart } from '../components/graph/LineBarChart' +import { LineBarChart2 } from '../components/graph/LineBarChart2' import { ConsumoEstimado } from '../services/consumoEstimado' import Head from 'next/head' import recoverUserInformation from '../services/auth' @@ -22,7 +23,7 @@ import { parseCookies } from 'nookies' import { GetServerSideProps } from 'next' import getAPIClient from '../services/ssrApi' -export default function Dashboard({grossAnualGraph, grossAnualYears} : any) { +export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensalGraph, grossMensalYears} : any) { return ( @@ -49,11 +50,17 @@ export default function Dashboard({grossAnualGraph, grossAnualYears} : any) { dataProps={grossAnualGraph} label={grossAnualYears} barLabel year/> + - + + - + @@ -73,6 +80,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { const { ['@smartAuth-token']: token } = parseCookies(ctx) let grossAnualGraph = []; + let grossMensalGraph = []; @@ -83,8 +91,15 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { console.log(res) }) + await apiClient.post('/economy/grossMonthly').then(res => { + grossMensalGraph = res.data.data + + }).catch(res => { + console.log(res) + }) + const grossMensalYears = grossMensalGraph.map((value) => value.mes) const grossAnualYears = grossAnualGraph.map((value) => value.ano) if (!token) { @@ -101,6 +116,8 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { props: { grossAnualGraph, grossAnualYears, + grossMensalYears, + grossMensalGraph, } } } diff --git a/src/pages/estimatedCost.tsx b/src/pages/estimatedCost.tsx index 614aa40..73b5538 100644 --- a/src/pages/estimatedCost.tsx +++ b/src/pages/estimatedCost.tsx @@ -3,6 +3,7 @@ import React from 'react' import Chart from '../components/graph/Chart' import { LineBarChart } from '../components/graph/LineBarChart' +import { LineBarChart2 } from '../components/graph/LineBarChart2' import Header from '../components/header/Header' import PageTitle from '../components/pageTitle/PageTitle' import { ConsumoEstimado } from '../services/consumoEstimado' @@ -17,7 +18,7 @@ export default function EstimatedCost() {
- +
)