From 04c6dad7c3bf9d26b6e70c771e128cb5bc24f150 Mon Sep 17 00:00:00 2001
From: Romain CREY <ext.sopra.rcrey@grandlyon.com>
Date: Mon, 8 Jun 2020 11:07:16 +0200
Subject: [PATCH] update version + fix ecogestures picto

---
 manifest.webapp                                      |  2 +-
 package.json                                         |  2 +-
 src/components/CommonKit/Button/StyledButton.tsx     |  4 +++-
 .../CommonKit/Button/StyledOauthButton.tsx           | 10 ++++++----
 .../EcogestureList/EcogestureList.tsx                | 12 +++++++-----
 .../EcogestureModal/EcogestureModal.tsx              |  4 ++--
 src/styles/components/_ecogesture.scss               |  3 +++
 7 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/manifest.webapp b/manifest.webapp
index d1e383f95..55e584ba7 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -3,7 +3,7 @@
   "slug": "ecolyo",
   "icon": "icon.svg",
   "categories": [],
-  "version": "0.1.1",
+  "version": "0.1.2",
   "licence": "AGPL-3.0",
   "editor": "Grand Lyon",
   "routes": {
diff --git a/package.json b/package.json
index 7f5b29f91..58a9068f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ecolyo",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "scripts": {
     "tx": "tx pull --all || true",
     "lint": "yarn lint:js && yarn lint:styles",
diff --git a/src/components/CommonKit/Button/StyledButton.tsx b/src/components/CommonKit/Button/StyledButton.tsx
index f5c2c0e7b..a460cc4f7 100644
--- a/src/components/CommonKit/Button/StyledButton.tsx
+++ b/src/components/CommonKit/Button/StyledButton.tsx
@@ -36,6 +36,9 @@ const BaseButton = withStyles({
     fontSize: '1rem',
     lineHeight: '120%',
   },
+  disabled: {
+    opacity: '0.6',
+  },
 })(MuiButton)
 
 const PrimaryButton = withStyles({
@@ -48,7 +51,6 @@ const PrimaryButton = withStyles({
   },
   disabled: {
     background: 'var(--multiColorRadialGradient) !important',
-    opacity: '0.6',
   },
 })(BaseButton)
 
diff --git a/src/components/CommonKit/Button/StyledOauthButton.tsx b/src/components/CommonKit/Button/StyledOauthButton.tsx
index b4b23ea1f..8c641eba8 100644
--- a/src/components/CommonKit/Button/StyledOauthButton.tsx
+++ b/src/components/CommonKit/Button/StyledOauthButton.tsx
@@ -36,20 +36,22 @@ const BaseButton = withStyles({
     fontSize: '1rem',
     lineHeight: '120%',
   },
+  disabled: {
+    opacity: '0.6',
+  },
 })(MuiButton)
 
 const PrimaryButton = withStyles({
   root: {
     background: 'var(--multiColorRadialGradient)',
   },
-  disabled: {
-    background: 'var(--multiColorRadialGradient) !important',
-    opacity: '0.6',
-  },
   label: {
     color: '#000000',
     fontWeight: 'bold',
   },
+  disabled: {
+    background: 'var(--multiColorRadialGradient) !important',
+  },
 })(BaseButton)
 
 const SecondaryButton = withStyles({
diff --git a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx
index f81a02ff2..9b7b21f4d 100644
--- a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx
+++ b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx
@@ -102,11 +102,13 @@ const EcogesturesList: React.FC<EcogesturesListProps> = ({
           </div>
         </>
       )}
-      <EcogestureModal
-        opened={openEcogestureModal}
-        ecogesture={selectedEcogesture}
-        handleCloseClick={handleCloseClick}
-      />
+      {openEcogestureModal && (
+        <EcogestureModal
+          opened={openEcogestureModal}
+          ecogesture={selectedEcogesture}
+          handleCloseClick={handleCloseClick}
+        />
+      )}
     </div>
   )
 }
diff --git a/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx b/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx
index 86d485e80..6e9c2496f 100644
--- a/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx
+++ b/src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx
@@ -44,7 +44,7 @@ const EcogestureModal: React.FC<EcogestureModalProps> = ({
 
   return (
     <>
-      {!ecogesture ? null : (
+      {ecogesture && (
         <Modal
           open={opened}
           border={ecogesture.unlocked}
@@ -56,7 +56,7 @@ const EcogestureModal: React.FC<EcogestureModalProps> = ({
           <div className="em-content-box">
             <div className="em-content-box-text">
               <div className="em-content-box-text-header">
-                {ecogesture.unlocked && (
+                {ecogesture.unlocked && ecogestureIcon && (
                   <div>
                     <Icon className="icon" icon={ecogestureIcon} size={100} />
                   </div>
diff --git a/src/styles/components/_ecogesture.scss b/src/styles/components/_ecogesture.scss
index b36fb496e..4006d837f 100644
--- a/src/styles/components/_ecogesture.scss
+++ b/src/styles/components/_ecogesture.scss
@@ -158,6 +158,9 @@
       flex-direction: column;
       justify-content: center;
       align-items: center;
+      .icon {
+        margin-bottom: 1rem;
+      }
     }
     .em-description {
       padding-bottom: 2.5rem;
-- 
GitLab