diff --git a/package.json b/package.json index f34f75a..48c1f94 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "@hookform/resolvers": "^2.9.1", "@material-ui/core": "^4.12.4", "@material-ui/icons": "^4.11.3", + "@material-ui/pickers": "^3.3.10", "@mui/icons-material": "^5.8.2", "@mui/material": "^5.6.4", "@mui/x-data-grid": "^5.11.0", @@ -35,9 +36,11 @@ "axios": "^0.27.2", "chart.js": "^3.7.1", "chartjs-plugin-datalabels": "^2.0.0", + "date-fns": "^2.28.0", "eslint-plugin-react": "^7.29.4", "eslit": "^6.0.0", "faker": "5.5.3", + "form-data": "^4.0.0", "fs-extra": "^10.1.0", "install": "^0.13.0", "next": "12.1.6", diff --git a/public/assets/banners/faq.jpg b/public/assets/banners/faq.jpg new file mode 100644 index 0000000..c9555fe Binary files /dev/null and b/public/assets/banners/faq.jpg differ diff --git a/public/assets/banners/faq1.png b/public/assets/banners/faq1.png new file mode 100644 index 0000000..63d5afd Binary files /dev/null and b/public/assets/banners/faq1.png differ diff --git a/public/assets/banners/infoSetorial.jpg b/public/assets/banners/infoSetorial.jpg new file mode 100644 index 0000000..98c71f2 Binary files /dev/null and b/public/assets/banners/infoSetorial.jpg differ diff --git a/public/assets/banners/notificacoes.jpg b/public/assets/banners/notificacoes.jpg new file mode 100644 index 0000000..61c3ede Binary files /dev/null and b/public/assets/banners/notificacoes.jpg differ diff --git a/src/components/graph/Chart.tsx b/src/components/graph/Chart.tsx index 501e565..c4c8017 100644 --- a/src/components/graph/Chart.tsx +++ b/src/components/graph/Chart.tsx @@ -90,7 +90,7 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, { label: dataset1? dataset1 : '2021', data: data1.map(value => value.custo_unit), - backgroundColor: '#255488' + backgroundColor: '#C2d5fb' // backgroundColor: (value, ctx) => { // return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); // }, @@ -98,7 +98,7 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, { label: dataset2? dataset2 : '2022', data: data2.map(value => value.custo_unit), - backgroundColor: '#255488' + backgroundColor: '#C2d5fb' // backgroundColor: (value, ctx) => { // return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); // }, diff --git a/src/components/graph/Chart2.tsx b/src/components/graph/Chart2.tsx index df60959..888a314 100644 --- a/src/components/graph/Chart2.tsx +++ b/src/components/graph/Chart2.tsx @@ -64,7 +64,7 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, sum += data; }); const percentage = data1[ctx.dataIndex].econ_percentual? (data1[ctx.dataIndex].econ_percentual*100).toFixed(0)+"%" : ''; - const result = ` ${parseInt(value)!=0? parseInt(value).toLocaleString('pt-br') : ''}\n ${parseInt(value)!=0? percentage : ''}` + const result = ` ${parseInt(value)!=0? percentage : ''}\n ${parseInt(value)!=0? parseInt(value).toLocaleString('pt-br') : ''}` return value==null? null : result }, @@ -72,7 +72,7 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, offset: 0, align: "end", font: { - size: !miniature? 15 : 10, + size: !miniature? 18 : 10, } }, legend: { @@ -104,6 +104,18 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, // backgroundColor: (value, ctx) => { // return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); // }, + }, + { + type: 'line', + label: 'Acumulado', + backgroundColor: '#255488', + data: [], + }, + { + type: 'line', + label: 'Estimado', + backgroundColor: draw('diagonal-right-left', '#C2d5fb'), + data: [], } ], } diff --git a/src/components/graph/LineBarChart2.tsx b/src/components/graph/LineBarChart2.tsx index 8f235d7..bef8f19 100644 --- a/src/components/graph/LineBarChart2.tsx +++ b/src/components/graph/LineBarChart2.tsx @@ -105,7 +105,7 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red dataArr.map(data => { sum += data; }); - const result = `${parseInt(value).toLocaleString('pt-br')}` + const result = `${(parseInt(value)/1000).toLocaleString('pt-br')}` return value==null? null : result } @@ -129,11 +129,13 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red borderColor: red? '#f00' : '#0c9200', datalabels: { - backgroundColor: 'white' + backgroundColor: 'white', + borderRadius: 8, + opacity: .8 }, borderWidth: 2, fill: false, - data: data1.map(value => value.economia_mensal), + data: data1.map(value => value.economia_mensal/1000), }, { type: 'bar' as const, @@ -141,7 +143,7 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red backgroundColor: (value, ctx) => { return hashurado? data1[value.dataIndex]?.dad_estimado == false? '#C2D5FB' : pattern.draw('diagonal', '#C2D5FB') : '#C2D5FB' }, - data: data3.map(value => value.custo_cativo), + data: data3.map(value => value.custo_cativo/1000), }, { type: 'bar' as const, @@ -150,8 +152,20 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red backgroundColor: (value, ctx) => { return hashurado? data1[value.dataIndex]?.dad_estimado == false? '#255488' : pattern.draw('diagonal', '#255488') : '#255488' }, - data: data2.map(value => value.custo_livre), + data: data2.map(value => value.custo_livre/1000), }, + { + type: 'line', + label: 'Acumulado', + backgroundColor: '#255488', + data: [], + }, + { + type: 'line', + label: 'Estimado', + backgroundColor: pattern.draw('diagonal-right-left', '#C2d5fb'), + data: [], + } ], } : { labels, diff --git a/src/components/graph/SingleBar.tsx b/src/components/graph/SingleBar.tsx index 432561b..aebf803 100644 --- a/src/components/graph/SingleBar.tsx +++ b/src/components/graph/SingleBar.tsx @@ -32,6 +32,9 @@ export function SingleBar({ title, subtitle, dataProps, label, dataset, barLabel responsive: true, scales: { x: { + font: { + size: 20 + }, grid: { display: false } @@ -58,10 +61,10 @@ export function SingleBar({ title, subtitle, dataProps, label, dataset, barLabel display: true, color: barLabel? 'black' : "rgba(255, 255, 255, 0)", anchor: "end", - offset: -40, + offset: -60, align: "start", font: { - size: !miniature? 15 : 10 + size: !miniature? 22 : 10 } }, legend: { diff --git a/src/components/header/HeaderView.ts b/src/components/header/HeaderView.ts index 0e39fd4..cdf4923 100644 --- a/src/components/header/HeaderView.ts +++ b/src/components/header/HeaderView.ts @@ -21,7 +21,7 @@ export const HeaderView = styled.header` padding: 14px; - margin-right: 20px; + margin-left: 20px; p{ color: white; diff --git a/src/pages/aboutUs/index.tsx b/src/pages/aboutUs/index.tsx index 8269c76..8e2a17b 100644 --- a/src/pages/aboutUs/index.tsx +++ b/src/pages/aboutUs/index.tsx @@ -20,7 +20,7 @@ export default function aboutUs({userName, text}) {
-