From 8e6a7b3a85f362035b2ac532b3856557d7a3e5b1 Mon Sep 17 00:00:00 2001
From: joseCorte-exe <josecorte-corte@hotmail.com>
Date: Wed, 18 May 2022 11:54:44 -0300
Subject: [PATCH] more changes

---
 src/components/graph/ChartView.ts               |  2 +-
 src/components/graph/LineChart.tsx              |  8 ++++----
 src/components/sidebar/Sidebar.tsx              |  2 +-
 src/pages/accumulatedSavings.tsx                |  2 +-
 src/pages/chartTelemetry.tsx                    |  8 ++++----
 src/pages/estimatedCost.tsx                     |  2 +-
 src/pages/grossSavings.tsx                      |  2 +-
 src/pages/industryInfo.tsx                      | 17 +++++++++++++++++
 .../layouts/industryInfo/IndustryInfoView.ts    | 12 ++++++++++++
 9 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 src/pages/industryInfo.tsx
 create mode 100644 src/styles/layouts/industryInfo/IndustryInfoView.ts

diff --git a/src/components/graph/ChartView.ts b/src/components/graph/ChartView.ts
index d48c114..5a80505 100644
--- a/src/components/graph/ChartView.ts
+++ b/src/components/graph/ChartView.ts
@@ -4,7 +4,7 @@ export const ChartView = styled.div`
   width: 90%;
 
   div{
-    margin-top: 32px;
+    /* margin-top: 10px; */
   }
 
   @media (max-width: 900px) {
diff --git a/src/components/graph/LineChart.tsx b/src/components/graph/LineChart.tsx
index b2665b8..807f9dd 100644
--- a/src/components/graph/LineChart.tsx
+++ b/src/components/graph/LineChart.tsx
@@ -131,7 +131,7 @@ export default function LineChart({ title, subtitle, data1, data2, data3, data4,
         label: dataset3? dataset3 : '',
         data: data3.map(value => value),
         borderColor: 'rgb(109, 109, 109)' ,
-        backgroundColor: 'rgba(90, 90, 90, 0.5)',
+        backgroundColor: 'rgba(90, 90, 90, 0)',
       },
     ],
   } : dataset2? {
@@ -141,13 +141,13 @@ export default function LineChart({ title, subtitle, data1, data2, data3, data4,
         label: dataset1? dataset1 : 'Dataset 1',
         data: data1.map(value => value),
         borderColor: 'rgb(53, 162, 235)',
-        backgroundColor: 'rgba(53, 162, 235, 0.5)',
+        backgroundColor: 'rgba(53, 162, 235, 0)',
       },
       {
         label: dataset2? dataset2 : '',
         data: data2.map(value => value),
         borderColor: 'rgb(255, 114, 32)' ,
-        backgroundColor: 'rgba(255, 145, 0, 0.5)' ,
+        backgroundColor: 'rgba(255, 145, 0, 0)' ,
       },
     ],
   } : {
@@ -157,7 +157,7 @@ export default function LineChart({ title, subtitle, data1, data2, data3, data4,
         label: dataset1? dataset1 : 'Dataset 1',
         data: data1.map(value => value),
         borderColor: 'rgb(53, 162, 235)',
-        backgroundColor: 'rgba(53, 162, 235, 0.5)',
+        backgroundColor: 'rgba(53, 162, 235, 0)',
       },
     ],
   }
diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx
index 5058884..4ae79c4 100644
--- a/src/components/sidebar/Sidebar.tsx
+++ b/src/components/sidebar/Sidebar.tsx
@@ -36,7 +36,7 @@ export default function Sidebar() {
         <Link href='/telemetria'><li className={router.pathname=='/telemetria'? 'actualPath' : null}><Image src='/assets/sidebar/telemetryIcon.svg' width={25} height={25} />{'Telemetria >'}</li></Link>
         <Link href='/resumoOperacao'><li className={router.pathname=='/resumoOperacao'? 'actualPath' : null} ><Image src='/assets/sidebar/summaryOperationsIcon.svg' width={25} height={25} />{'Resumo de Op. '}</li></Link>
         <Link href='/news'><li className={router.pathname=='/news'? 'actualPath' : null}><Image src='/assets/sidebar/newsIcon.svg' width={25} height={25} />{'Notícias >'}</li></Link>
-        <Link href='#'><li className={router.pathname=='/sectorialInfo'? 'actualPath' : null}><Image src='/assets/sidebar/sectorialInfoIcon.svg' width={25} height={25} />{'Info Setorial >'}</li></Link>
+        <Link href='/industryInfo'><li className={router.pathname=='/sectorialInfo'? 'actualPath' : null}><Image src='/assets/sidebar/sectorialInfoIcon.svg' width={25} height={25} />{'Info Setorial >'}</li></Link>
         {/* <Link href='/consumption'><li className={router.pathname=='/consumption'? 'actualPath' : null} ><Image src='/assets/sidebar/consumptionIcon.svg' width={25} height={25} />{'Consumo'}</li></Link> */}
         <Link href='/notifications'><li className={router.pathname=='/notifications'? 'actualPath' : null}><Image src='/assets/sidebar/notificationsIcon.svg' width={25} height={25} />{'Notificações >'}</li></Link>
         <Link href='/aboutUs'><li className={router.pathname=='/aboutUs'? 'actualPath' : null}><Image src='/assets/sidebar/dashboardIcon.svg' width={25} height={25} />{'Sobre Nós >'}</li></Link>
diff --git a/src/pages/accumulatedSavings.tsx b/src/pages/accumulatedSavings.tsx
index 9a2d043..3ac3cdc 100644
--- a/src/pages/accumulatedSavings.tsx
+++ b/src/pages/accumulatedSavings.tsx
@@ -14,7 +14,7 @@ export default function AccumulatedSavings() {
       <Header name='' />
       <PageTitle title='Economia Acumulada' subtitle='Economia Bruta Estimada e Acumulada anual (Valores em R$ mil)' />
       <section>
-        <SingleBar title='Economia Bruta Estimada e Acumulada' subtitle='(Valores em R$ mil)' label={EconomiaAcumulada.label1}  dataProps={EconomiaAcumulada.data2} />
+        <SingleBar title='Economia Bruta Estimada e Acumulada' subtitle='(Valores em R$ mil)' dataset='Consolidada' label={EconomiaAcumulada.label1}  dataProps={EconomiaAcumulada.data2} />
       </section>
     </AccumulatedSavingsView>
   )
diff --git a/src/pages/chartTelemetry.tsx b/src/pages/chartTelemetry.tsx
index 5cb69c0..8a780d5 100644
--- a/src/pages/chartTelemetry.tsx
+++ b/src/pages/chartTelemetry.tsx
@@ -18,10 +18,10 @@ export default function chartTelemetry() {
       <Header name='' />
       <PageTitle title='Telemetria - Graficos' subtitle='Gráficos' />
       <section>
-        <LineChart title='Fator potencia' subtitle='' data1={FatorPotencia.data} data2={FatorPotencia.data4} data3={[]} data4={[]} label={FatorPotencia.label1} />
-        <LineChart title='Consumo decretizado em 1 hora' subtitle='' data1={ConsumoDecretizadoLine.data} data2={[]} data3={[]} data4={[]} label={ConsumoDecretizadoLine.label1} />
-        <SingleBar title='Consumo decretizado em 1 hora' subtitle='' dataProps={ConsumoDecretizadoBar.data} label={ConsumoDecretizadoBar.label} />
-        <LineBarChart data1={ConsumoDecretizadoLine.data1} data2={ConsumoDecretizadoLine.data} data3={[]} label={ConsumoDecretizadoLine.label1} title='Demanda Contratada X Registrada' subtitle='' red/>
+        <LineChart title='Fator de Potencia' subtitle='' data1={FatorPotencia.data} data2={FatorPotencia.data4} data3={[]} data4={[]} dataset1='fator de potencia' label={FatorPotencia.label1} />
+        <LineChart title='Consumo decretizado em 1 hora' subtitle='' data1={ConsumoDecretizadoLine.data} data2={[]} data3={[]} data4={[]} dataset1='Demanda registrada' label={ConsumoDecretizadoLine.label1} />
+        <SingleBar title='Consumo decretizado em 1 hora' subtitle='' dataProps={ConsumoDecretizadoBar.data} label={ConsumoDecretizadoBar.label} dataset={'Consumo'} />
+        <LineBarChart data1={ConsumoDecretizadoLine.data1} data3={ConsumoDecretizadoLine.data} dataset1={'Demanda contratada + 5%'} dataset2={'barra1'} dataset3={'2021'} label={ConsumoDecretizadoLine.label1} title='Demanda Contratada X Registrada' subtitle='' red/>
       </section>
     </ChatTelemetryView>
   )
diff --git a/src/pages/estimatedCost.tsx b/src/pages/estimatedCost.tsx
index 8ff220e..9a53a5d 100644
--- a/src/pages/estimatedCost.tsx
+++ b/src/pages/estimatedCost.tsx
@@ -14,7 +14,7 @@ export default function EstimatedCost() {
       <Header name='' />
       <PageTitle title='Custos Estimados' subtitle='Comparativo de Custo Estimado' />
       <section>
-        <LineBarChart data1={ConsumoEstimado.data2} data2={ConsumoEstimado.data} data3={ConsumoEstimado.data1} label={ConsumoEstimado.label} title='Custo Estimado' subtitle='' />
+        <LineBarChart data1={ConsumoEstimado.data2} data2={ConsumoEstimado.data} data3={ConsumoEstimado.data1} dataset1="Economia (R$)" dataset2='Cativo' dataset3='Livre' label={ConsumoEstimado.label} title='Custo Estimado' subtitle='' />
       </section>
     </EstimatedCostView>
   )
diff --git a/src/pages/grossSavings.tsx b/src/pages/grossSavings.tsx
index 9f65d3a..a3cc64e 100644
--- a/src/pages/grossSavings.tsx
+++ b/src/pages/grossSavings.tsx
@@ -14,7 +14,7 @@ export default function GrossSavings() {
       <Header name='' />
       <PageTitle title='Economia Bruta' subtitle='Economia Bruta Estimada e Acumulada anual (Valores em R$ mil)' />
       <section>
-        <SingleBar title='Economia Bruta Estimada e Acumulada Anual' subtitle='(Valores em R$ mil)' label={dataEconomiaBruta.labels}  dataProps={dataEconomiaBruta.data} />
+        <SingleBar title='Economia Bruta Estimada e Acumulada Anual' subtitle='(Valores em R$ mil)' label={dataEconomiaBruta.labels} dataset='Consolidada' dataProps={dataEconomiaBruta.data} />
       </section>
     </GrossSavingsView>
   )
diff --git a/src/pages/industryInfo.tsx b/src/pages/industryInfo.tsx
new file mode 100644
index 0000000..32fe8c1
--- /dev/null
+++ b/src/pages/industryInfo.tsx
@@ -0,0 +1,17 @@
+import React from 'react'
+import BasicButton from '../components/buttons/basicButton/BasicButton'
+import Header from '../components/header/Header'
+import PageTitle from '../components/pageTitle/PageTitle'
+import { IndustryInfoView } from '../styles/layouts/industryInfo/IndustryInfoView'
+
+export default function industryInfo() {
+  return (
+    <IndustryInfoView>
+    <Header name='' />
+    <div className='title'>
+      <PageTitle title='Info Setorial' subtitle='info setorial' />
+    </div>
+    <BasicButton title='Baixar PDF' />
+    </IndustryInfoView>
+  )
+}
diff --git a/src/styles/layouts/industryInfo/IndustryInfoView.ts b/src/styles/layouts/industryInfo/IndustryInfoView.ts
new file mode 100644
index 0000000..f2757ae
--- /dev/null
+++ b/src/styles/layouts/industryInfo/IndustryInfoView.ts
@@ -0,0 +1,12 @@
+import styled from "styled-components";
+
+export const IndustryInfoView = styled.main`
+  display: flex;
+  flex-direction: column;
+
+  width: 100%;
+
+  .title {
+    margin-bottom: 50px;
+  }
+`