From 6875488224497d5b9a6463368999eb39bb2c72cf Mon Sep 17 00:00:00 2001
From: Romain CREY <ext.sopra.rcrey@grandlyon.com>
Date: Fri, 12 Jun 2020 16:35:15 +0200
Subject: [PATCH] click on all graph + txt month compare + header size

---
 src/components/ContainerComponents/Header/Header.tsx     | 6 ++----
 .../ViewContainer/SingleFluidViewContainer.tsx           | 9 +++++----
 src/components/ContentComponents/Charts/Bar.tsx          | 1 +
 src/locales/fr.json                                      | 2 +-
 src/styles/components/_barchart.scss                     | 6 ++++--
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/ContainerComponents/Header/Header.tsx b/src/components/ContainerComponents/Header/Header.tsx
index e0d487f60..d5b20f5af 100644
--- a/src/components/ContainerComponents/Header/Header.tsx
+++ b/src/components/ContainerComponents/Header/Header.tsx
@@ -54,12 +54,10 @@ const Header: React.FC<HeaderProps> = ({
       <div className="header-top">
         <div className="header-content">
           {textKey && (
-            <div className="header-text text-14-normal-uppercase">
-              {t(textKey)}
-            </div>
+            <div className="header-text text-22-bold">{t(textKey)}</div>
           )}
           {desktopTitleKey && (
-            <div className="header-text-desktop text-22-normal">
+            <div className="header-text-desktop text-22-bold">
               {displayBackArrow && (
                 <StyledIconButton
                   className="cv-button"
diff --git a/src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx
index b66142e65..3afebee24 100644
--- a/src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx
+++ b/src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner'
 import CozyBar from 'components/ContainerComponents/CozyBar/CozyBar'
 import Header from 'components/ContainerComponents/Header/Header'
@@ -43,6 +43,9 @@ const SingleFluidViewContainer: React.FC<SingleFluidViewContainerProps> = ({
   const defineHeaderHeight = (height: number) => {
     setHeaderHeight(height)
   }
+  useEffect(() => {
+    console.log('chart', isChartLoading, 'in', isIndicatorsLoading)
+  }, [isChartLoading, isIndicatorsLoading])
 
   return (
     <>
@@ -70,9 +73,7 @@ const SingleFluidViewContainer: React.FC<SingleFluidViewContainerProps> = ({
         )}
         <div
           className={`${
-            isChartLoading || isIndicatorsLoading
-              ? 'chart-indicator-none'
-              : 'chart-indicator-display'
+            isChartLoading ? 'chart-indicator-none' : 'chart-indicator-display'
           }`}
         >
           <FluidChartContainer
diff --git a/src/components/ContentComponents/Charts/Bar.tsx b/src/components/ContentComponents/Charts/Bar.tsx
index 0b2460a3f..8342a11b7 100644
--- a/src/components/ContentComponents/Charts/Bar.tsx
+++ b/src/components/ContentComponents/Charts/Bar.tsx
@@ -150,6 +150,7 @@ const Bar = (props: BarProps) => {
           )}, -40)`}
         >
           <rect
+            onClick={handleClick}
             x="0"
             y="0"
             width={showCompare ? getBandWidth() * 2 : getBandWidth()}
diff --git a/src/locales/fr.json b/src/locales/fr.json
index b8375f0d9..bd69f91c2 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -84,7 +84,7 @@
     },
     "MONTH": {
       "STEP": "Par mois",
-      "COMPARELABEL": "Comparer au mois précédent"
+      "COMPARELABEL": "Comparer à l'année précédente"
     },
     "DAY": {
       "STEP": "Par jour",
diff --git a/src/styles/components/_barchart.scss b/src/styles/components/_barchart.scss
index 6f575e0fc..ec8686209 100644
--- a/src/styles/components/_barchart.scss
+++ b/src/styles/components/_barchart.scss
@@ -11,10 +11,12 @@
   }
 }
 .background-true {
-  display: inline;
+  // display: inline;
+  opacity: 1;
 }
 .background-false {
-  display: none;
+  // display: none;
+  opacity: 0;
 }
 .bar-ELECTRICITY {
   fill: $elec-off-color;
-- 
GitLab