From 4f51a893d5c55933779413f19017bdb749cf4bc3 Mon Sep 17 00:00:00 2001
From: joseCorte-exe <josecorte-corte@hotmail.com>
Date: Fri, 1 Jul 2022 15:51:12 -0300
Subject: [PATCH] changing button telemetry color

---
 src/components/graph/Chart.tsx   | 14 ++++++++------
 src/components/graph/Chart2.tsx  | 14 ++++++++------
 src/components/header/Header.tsx | 10 +++++-----
 src/pages/industryInfo/index.tsx |  3 +--
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/components/graph/Chart.tsx b/src/components/graph/Chart.tsx
index 6508666..501e565 100644
--- a/src/components/graph/Chart.tsx
+++ b/src/components/graph/Chart.tsx
@@ -90,16 +90,18 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1,
       {
         label: dataset1? dataset1 : '2021',
         data: data1.map(value => value.custo_unit),
-        backgroundColor: (value, ctx) => {
-          return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb');
-        },
+        backgroundColor: '#255488'
+        // backgroundColor: (value, ctx) => {
+        //   return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb');
+        // },
       },
       {
         label: dataset2? dataset2 : '2022',
         data: data2.map(value => value.custo_unit),
-        backgroundColor: (value, ctx) => {
-          return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb');
-        },
+        backgroundColor: '#255488'
+        // 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 908fc8b..df60959 100644
--- a/src/components/graph/Chart2.tsx
+++ b/src/components/graph/Chart2.tsx
@@ -92,16 +92,18 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1,
       {
         label: dataset1? dataset1 : '2021',
         data: data1.map(value => value.economia_acumulada? value.economia_acumulada : 0),
-        backgroundColor: (value, ctx) => {
-          return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb');
-        },
+        backgroundColor: '#255488'
+        // backgroundColor: (value, ctx) => {
+        //   return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb');
+        // },
       },
       {
         label: dataset2? dataset2 : '2022',
         data: data2.map(value => value.economia_acumulada? value.economia_acumulada : 0),
-        backgroundColor: (value, ctx) => {
-          return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb');
-        },
+        backgroundColor: '#255488'
+        // backgroundColor: (value, ctx) => {
+        //   return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb');
+        // },
       }
     ],
   }
diff --git a/src/components/header/Header.tsx b/src/components/header/Header.tsx
index 97819e8..520f52f 100644
--- a/src/components/header/Header.tsx
+++ b/src/components/header/Header.tsx
@@ -25,17 +25,17 @@ export default function Header({name, admin, children}: headerInterface) {
         {children}
       </section>
       <section>
-        <div className='icon' >
-          <p>
-            olá, {name}
-          </p>
-        </div>
         {
           !admin && profile_picture?
           <Image src={profile_picture} height={100} width={108}/>
           :
           <Image src='https://kluppdevelopment.s3.sa-east-1.amazonaws.com/avatars/zcgw6O0FxZgxRmIs97WMcUddKurQJcIqSxBLStSc.png' height={75} width={108}/>
         }
+        <div className='icon' >
+          <p>
+            olá, {name}
+          </p>
+        </div>
       </section>
     </HeaderView>
   )
diff --git a/src/pages/industryInfo/index.tsx b/src/pages/industryInfo/index.tsx
index f8b0466..2dc2a0a 100644
--- a/src/pages/industryInfo/index.tsx
+++ b/src/pages/industryInfo/index.tsx
@@ -60,10 +60,9 @@ export default function industryInfo({userName}: any) {
       <Header name={userName}>
         <PageTitle title='Info Setorial' subtitle='Clique em "Baixar PDF", para fazer download do PDF' />
       </Header>
-
+      <p>Um resumo das atualizações gerais do Setor Elétrico, com dados sobre geração consumo, demanda, meteorologia baseadas em informações do ONS, CCEE, ANEEL, 10 Maiores Jornais e Revistas e CPTEC</p>
       <button onClick={() => handleDownloadPdf()}>Baixar PDF</button>
 
-      <p>Um resumo das atualizações gerais do Setor Elétrico, com dados sobre geração consumo, demanda, meteorologia baseadas em informações do ONS, CCEE, ANEEL, 10 Maiores Jornais e Revistas e CPTEC</p>
     </IndustryInfoView>
   )
 }