From 240afae36a00dfeac2db8608bfa029fc2824c66d Mon Sep 17 00:00:00 2001
From: Romain CREY <ext.sopra.rcrey@grandlyon.com>
Date: Fri, 29 May 2020 09:21:06 +0200
Subject: [PATCH] WIP modal end of challenge
---
.../ContentComponents/ChallengeList/ChallengesList.tsx | 2 +-
.../ContentComponents/ChallengeModal/ChallengeModal.tsx | 6 +++++-
src/locales/en.json | 2 +-
src/styles/components/_challenges.scss | 3 ++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/components/ContentComponents/ChallengeList/ChallengesList.tsx b/src/components/ContentComponents/ChallengeList/ChallengesList.tsx
index 22db63076..ef84ae360 100644
--- a/src/components/ContentComponents/ChallengeList/ChallengesList.tsx
+++ b/src/components/ContentComponents/ChallengeList/ChallengesList.tsx
@@ -38,8 +38,8 @@ const ChallengesList: React.FC<ChallengesListProps> = ({
const [paddingBottom, setPaddingBottom] = useState(0)
const handleCloseClick = () => {
- setOpenChallengeModal(false)
setOngoingChallenge(null)
+ setOpenChallengeModal(false)
}
const setRightChallengeInTheMiddle = (
diff --git a/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx b/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx
index 45faf3f4c..a25644a65 100644
--- a/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx
+++ b/src/components/ContentComponents/ChallengeModal/ChallengeModal.tsx
@@ -98,7 +98,11 @@ const ChallengeModal: React.FC<ChallengeModalProps> = ({
</span>
</div>
</div>
- <StyledIcon className="cm-badge" icon={badgeIcon} size={100} />
+ <img
+ className="cm-badge"
+ src={badgeIcon}
+ width={screenType === ScreenType.MOBILE ? 180 : 200}
+ ></img>
<div className="cm-txt text-18-bold ">
{' '}
{t('CHALLENGE.CONSOLATION')}
diff --git a/src/locales/en.json b/src/locales/en.json
index 8f90c311f..c1d503cf7 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -191,7 +191,7 @@
}
},
"create_account": {
- "enedis": "Je créé mon compte personnal Enedis"
+ "enedis": "Je créé mon compte personnel Enedis"
},
"window": {
"title": "OAuth"
diff --git a/src/styles/components/_challenges.scss b/src/styles/components/_challenges.scss
index fb1d6c170..c2c327a4a 100644
--- a/src/styles/components/_challenges.scss
+++ b/src/styles/components/_challenges.scss
@@ -249,7 +249,8 @@
}
}
.cm-badge {
- margin: 2rem;
+ position: absolute;
+ top: 115px;
}
.cm-button-valid {
margin-top: 1rem;
--
GitLab