From db014aafeed71bb9b03e98c44b217cb13dd88e65 Mon Sep 17 00:00:00 2001
From: Romain CREY <ext.sopra.rcrey@grandlyon.com>
Date: Wed, 27 May 2020 11:57:12 +0200
Subject: [PATCH] update manifest + ongoingchallenge
---
manifest.webapp | 4 ++--
.../OngoingChallengeDetailsViewContainer.tsx | 14 +-------------
.../Challenge/OngoingChallengePile.tsx | 2 +-
src/styles/components/_challenges.scss | 10 ++++++++--
4 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/manifest.webapp b/manifest.webapp
index 894c73a56..01ede41c5 100644
--- a/manifest.webapp
+++ b/manifest.webapp
@@ -3,7 +3,7 @@
"slug": "ecolyo",
"icon": "icon.svg",
"categories": [],
- "version": "0.1.0",
+ "version": "0.1.1",
"licence": "AGPL-3.0",
"editor": "Grand Lyon",
"routes": {
@@ -26,7 +26,7 @@
},
"loadprofile": {
"description": "Auth to get data from enedis connector",
- "type": "enedis.loadprofile"
+ "type": "io.enedis.loadprofile"
},
"enedisMinute": {
"description": "Auth to get daily data from enedis connector",
diff --git a/src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx
index 67cd375c8..a84750094 100644
--- a/src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx
+++ b/src/components/ContainerComponents/ViewContainer/OngoingChallengeDetailsViewContainer.tsx
@@ -120,7 +120,7 @@ const OngoingChallengeDetailsViewContainer: React.FC<OngoingChallengeDetailsView
? null
: formatCompareChallengeDate(challenge)}
</div>
- <div className="cp-valid">
+ <div className="cp-valid --ongoing">
<StyledStopButton
color="secondary"
onClick={() => stopChallenge(challenge)}
@@ -144,18 +144,6 @@ const OngoingChallengeDetailsViewContainer: React.FC<OngoingChallengeDetailsView
/>
))}
</div>
- {/* <div className="cp-ecogestures">
- <EcogestureCard
- ecogesture={challenge.selectedEcogestures[0]}
- handleClick={() => handleClick(0)}
- challengeEcogesture={1}
- />
- <EcogestureCard
- ecogesture={challenge.selectedEcogestures[1]}
- handleClick={() => handleClick(1)}
- challengeEcogesture={2}
- />
- </div> */}
</div>
</div>
</div>
diff --git a/src/components/ContentComponents/Challenge/OngoingChallengePile.tsx b/src/components/ContentComponents/Challenge/OngoingChallengePile.tsx
index 875d4e3c5..50fec3941 100644
--- a/src/components/ContentComponents/Challenge/OngoingChallengePile.tsx
+++ b/src/components/ContentComponents/Challenge/OngoingChallengePile.tsx
@@ -66,7 +66,7 @@ const OngoingChallengePile: React.FC<OngoingChallengePileProps> = ({
</span>
</div>
) : (
- <div className={`no-values-section text-18-normal`}>
+ <div className={`no-values-section text-18-bold`}>
{t('CHALLENGE.RESULT_NOT_AVAILABLE')}
</div>
)}
diff --git a/src/styles/components/_challenges.scss b/src/styles/components/_challenges.scss
index 0a2815637..e25d2d44c 100644
--- a/src/styles/components/_challenges.scss
+++ b/src/styles/components/_challenges.scss
@@ -326,7 +326,6 @@
display: flex;
flex-direction: row;
align-items: center;
- justify-content: space-between;
width: 100%;
.pile-section {
display: grid;
@@ -351,9 +350,12 @@
.max-energy {
color: $grey-dark;
}
+ .values-section {
+ margin-left: 1rem;
+ }
.no-values-section {
color: $text-white;
- padding-right: 1rem;
+ margin-left: 1rem;
}
}
@@ -446,6 +448,10 @@
width: 90%;
margin-top: 0.75rem;
max-width: 53rem;
+ &.--ongoing {
+ @extend .cp-valid;
+ width: 60%;
+ }
.cp-left-button {
margin-right: 0.25rem;
margin-left: 0;
--
GitLab