diff --git a/config.json b/config.json
index 8f7a5dda25b3264a7e75cccf9fe7fb3d6f2afad3..68fd0241db2ed57d426280ba1b56a374435f1e69 100644
--- a/config.json
+++ b/config.json
@@ -20,8 +20,8 @@
"konnectorConfig": {
"name": "eau du grand lyon",
"type": "WATER",
- "slug": "egl-api-connector",
- "id": "io.cozy.konnectors/egl-api-connector"
+ "slug": "egl-konnector",
+ "id": "io.cozy.konnectors/egl-konnector"
}
},
{
@@ -32,8 +32,8 @@
"konnectorConfig": {
"name": "grdf",
"type": "GAS",
- "slug": "grdf-scraping-connector",
- "id": "io.cozy.konnectors/grdf-scraping-connector"
+ "slug": "grdf-konnector",
+ "id": "io.cozy.konnectors/grdf-konnector"
}
}
]
diff --git a/docker/cozy-app-dev-with-app.sh b/docker/cozy-app-dev-with-app.sh
index 7735060557361a7ace77d27bbd44d7de1bc4b8c5..0a5efd959320f6d1d66a157de0b06bcf9ae0509a 100644
--- a/docker/cozy-app-dev-with-app.sh
+++ b/docker/cozy-app-dev-with-app.sh
@@ -204,21 +204,21 @@ do_install_app() {
echo "App succesfully installed"
echo "Installing konnectors"
- if cozy-stack konnectors ls | grep 'enedis-scraping-connector'; then
- echo "Removing enedis-scraping-connector..."
- cozy-stack konnectors uninstall enedis-scraping-connector
+ if cozy-stack konnectors ls | grep 'enedis-konnector'; then
+ echo "Removing enedis-konnector..."
+ cozy-stack konnectors uninstall enedis-konnector
fi
- if cozy-stack konnectors ls | grep 'grdf-scraping-connector'; then
- echo "Removing grdf-scraping-connector..."
- cozy-stack konnectors uninstall grdf-scraping-connector
+ if cozy-stack konnectors ls | grep 'grdf-konnector'; then
+ echo "Removing grdf-konnector..."
+ cozy-stack konnectors uninstall grdf-konnector
fi
- if cozy-stack konnectors ls | grep 'egl-api-connector'; then
- echo "Removing egl-api-connector..."
- cozy-stack konnectors uninstall egl-api-connector
+ if cozy-stack konnectors ls | grep 'egl-konnector'; then
+ echo "Removing egl-konnector..."
+ cozy-stack konnectors uninstall egl-konnector
fi
- cozy-stack konnectors install enedis-scraping-connector file:///data/cozy_konnectors/enedis-scraping-connector-build
- cozy-stack konnectors install grdf-scraping-connector file:///data/cozy_konnectors/grdf-scraping-connector-build
- cozy-stack konnectors install egl-api-connector file:///data/cozy_konnectors/egl-api-connector-build
+ cozy-stack konnectors install enedis-konnector file:///data/cozy_konnectors/enedis-konnector-build
+ cozy-stack konnectors install grdf-konnector file:///data/cozy_konnectors/grdf-konnector-build
+ cozy-stack konnectors install egl-konnector file:///data/cozy_konnectors/egl-konnector-build
}
wait_for() {
diff --git a/src/assets/icons/tabbar/parametre/off.svg b/src/assets/icons/tabbar/parametre/off.svg
index 7d541abe20060a23e480dc441d20217f2c61ca82..d6f3627a79145b6d3607e2e70238046adf371a25 100644
--- a/src/assets/icons/tabbar/parametre/off.svg
+++ b/src/assets/icons/tabbar/parametre/off.svg
@@ -1,5 +1,8 @@
<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M26.2446 17.844V24H24.7566V17.844H26.2446Z" fill="#A0A0A0"/>
-<circle cx="25.5" cy="19.5" r="9.5" stroke="#A0A0A0"/>
-<path d="M26.3706 15.808C26.4226 15.696 26.4486 15.576 26.4486 15.448C26.4486 15.316 26.4226 15.192 26.3706 15.076C26.3186 14.96 26.2486 14.86 26.1606 14.776C26.0766 14.692 25.9766 14.626 25.8606 14.578C25.7446 14.526 25.6206 14.5 25.4886 14.5C25.3606 14.5 25.2386 14.526 25.1226 14.578C25.0106 14.626 24.9126 14.692 24.8286 14.776C24.7446 14.86 24.6766 14.96 24.6246 15.076C24.5766 15.192 24.5526 15.316 24.5526 15.448C24.5526 15.576 24.5766 15.696 24.6246 15.808C24.6766 15.92 24.7446 16.018 24.8286 16.102C24.9126 16.186 25.0106 16.254 25.1226 16.306C25.2386 16.354 25.3606 16.378 25.4886 16.378C25.6206 16.378 25.7446 16.354 25.8606 16.306C25.9766 16.254 26.0766 16.186 26.1606 16.102C26.2486 16.018 26.3186 15.92 26.3706 15.808Z" fill="#A0A0A0"/>
+<line x1="14.5" y1="11.5" x2="35.5" y2="11.5" stroke="#A0A0A0" stroke-linecap="round"/>
+<line x1="14.5" y1="18.5" x2="35.5" y2="18.5" stroke="#A0A0A0" stroke-linecap="round"/>
+<line x1="14.5" y1="25.5" x2="35.5" y2="25.5" stroke="#A0A0A0" stroke-linecap="round"/>
+<circle cx="28.5" cy="11.5" r="2.5" fill="#A0A0A0"/>
+<circle cx="20.5" cy="18.5" r="2.5" fill="#A0A0A0"/>
+<circle cx="29.5" cy="25.5" r="2.5" fill="#A0A0A0"/>
</svg>
diff --git a/src/assets/icons/tabbar/parametre/on.svg b/src/assets/icons/tabbar/parametre/on.svg
index 6107997d018426dafb65c6fc528434848018580b..0361aa95a4efc3056fb66d40d27558bb5a2a2b88 100644
--- a/src/assets/icons/tabbar/parametre/on.svg
+++ b/src/assets/icons/tabbar/parametre/on.svg
@@ -1,3 +1,8 @@
<svg width="50" height="36" viewBox="0 0 50 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5 19.5C15.5 13.9772 19.9772 9.5 25.5 9.5C31.0228 9.5 35.5 13.9772 35.5 19.5C35.5 25.0228 31.0228 29.5 25.5 29.5C19.9772 29.5 15.5 25.0228 15.5 19.5ZM26.3706 15.808C26.4226 15.696 26.4486 15.576 26.4486 15.448C26.4486 15.316 26.4226 15.192 26.3706 15.076C26.3186 14.96 26.2486 14.86 26.1606 14.776C26.0766 14.692 25.9766 14.626 25.8606 14.578C25.7446 14.526 25.6206 14.5 25.4886 14.5C25.3606 14.5 25.2386 14.526 25.1226 14.578C25.0106 14.626 24.9126 14.692 24.8286 14.776C24.7446 14.86 24.6766 14.96 24.6246 15.076C24.5766 15.192 24.5526 15.316 24.5526 15.448C24.5526 15.576 24.5766 15.696 24.6246 15.808C24.6766 15.92 24.7446 16.018 24.8286 16.102C24.9126 16.186 25.0106 16.254 25.1226 16.306C25.2386 16.354 25.3606 16.378 25.4886 16.378C25.6206 16.378 25.7446 16.354 25.8606 16.306C25.9766 16.254 26.0766 16.186 26.1606 16.102C26.2486 16.018 26.3186 15.92 26.3706 15.808ZM26.2446 17.844V24H24.7566V17.844H26.2446Z" fill="#E3B82A"/>
+<line x1="14.5" y1="11.5" x2="35.5" y2="11.5" stroke="#E3B82A" stroke-linecap="round"/>
+<line x1="14.5" y1="18.5" x2="35.5" y2="18.5" stroke="#E3B82A" stroke-linecap="round"/>
+<line x1="14.5" y1="25.5" x2="35.5" y2="25.5" stroke="#E3B82A" stroke-linecap="round"/>
+<circle cx="28.5" cy="11.5" r="2.5" fill="#E3B82A"/>
+<circle cx="20.5" cy="18.5" r="2.5" fill="#E3B82A"/>
+<circle cx="29.5" cy="25.5" r="2.5" fill="#E3B82A"/>
</svg>
diff --git a/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx b/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx
index 5f4af50a6a4572bc934d78b52180d8feca867680..d2950a971658fefee61bb962b04552e54ddc310c 100644
--- a/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx
+++ b/src/components/ContainerComponents/ViewContainer/FinishedChallengeDetailsViewContainer.tsx
@@ -3,7 +3,11 @@ import { translate } from 'cozy-ui/react/I18n'
import CozyBar from 'components/ContainerComponents/CozyBar/CozyBar'
import Header from 'components/ContainerComponents/Header/Header'
import Content from 'components/ContainerComponents/Content/Content'
-import { UserChallenge, TypeChallenge } from 'services/dataChallengeContracts'
+import {
+ UserChallenge,
+ TypeChallenge,
+ BadgeState,
+} from 'services/dataChallengeContracts'
import StyledSpinner from 'components/CommonKit/Spinner/StyledSpinner'
import StyledIconButton from 'components/CommonKit/IconButton/StyledIconButton'
import DefaultChallengeIcon from 'assets/icons/badges/default.svg'
@@ -68,7 +72,7 @@ const FinishedChallengeDetailsViewContainer: React.FC<FinishedChallengeDetailsVi
const result =
challenge &&
- formatNumberValues(challenge.maxEnergy - challenge.currentEnergy)
+ formatNumberValues(Math.abs(challenge.maxEnergy - challenge.currentEnergy))
return (
<React.Fragment>
@@ -98,7 +102,7 @@ const FinishedChallengeDetailsViewContainer: React.FC<FinishedChallengeDetailsVi
</div>
{challenge.challengeType &&
challenge.challengeType.type === TypeChallenge.CHALLENGE ? (
- challenge.maxEnergy - challenge.currentEnergy > 0 ? (
+ challenge.badge === BadgeState.SUCCESS ? (
<div className="cp-result text-18-bold">
<div>{t('CHALLENGE.RESULT_POSITIF')}</div>
<div className="cp-result-positif text-18-normal">{`${result} €`}</div>
@@ -116,7 +120,7 @@ const FinishedChallengeDetailsViewContainer: React.FC<FinishedChallengeDetailsVi
icon={badgeIcon ? badgeIcon : DefaultChallengeIcon}
size={screenType === ScreenType.MOBILE ? 150 : 200}
/>
- {challenge.badge === 1 ? (
+ {challenge.badge === BadgeState.SUCCESS ? (
<StyledIcon
className="cp-win-star"
icon={StarIcon}
diff --git a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
index 8f1cd9c4dd24c82f800150141e055bb9061af66b..98d6a138ce14b7f782d6e030079790733a8820d9 100644
--- a/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
+++ b/src/components/ContentComponents/KonnectorViewer/KonnectorViewerCard.tsx
@@ -196,10 +196,10 @@ const KonnectorViewerCard: React.FC<KonnectorViewerCardProps> = ({
switch (jobState) {
case JobState.Errored:
return failurePicto
- case JobState.Running:
- return pendingPicto
- case JobState.Done:
- return successPicto
+ // case JobState.Running:
+ // return pendingPicto
+ // case JobState.Done:
+ // return successPicto
default:
return ''
}
diff --git a/src/components/ContentComponents/KonnectorViewer/picto-failure.png b/src/components/ContentComponents/KonnectorViewer/picto-failure.png
index ce92455bd6edffc8d2c57a33c8165542f71b6da4..26fd495cc5648367aadddb76efd05a2702132d26 100644
Binary files a/src/components/ContentComponents/KonnectorViewer/picto-failure.png and b/src/components/ContentComponents/KonnectorViewer/picto-failure.png differ
diff --git a/src/styles/base/_layout.scss b/src/styles/base/_layout.scss
index 3a8b44a639a7a5bc82449da64793a8d8cfde5a02..c7cc19fdf95b2df2683a60b4ef3612ea6d744663 100644
--- a/src/styles/base/_layout.scss
+++ b/src/styles/base/_layout.scss
@@ -28,7 +28,6 @@ body {
}
[role='banner'] .coz-bar-container {
- padding: 0;
background-color: white;
@media #{$large-phone} {
padding: 0 3.25em 0 0;
diff --git a/src/styles/components/_ecogesture.scss b/src/styles/components/_ecogesture.scss
index 514e51619b99aa8073e16abfed7c270c776aa43c..ad7d87741a5148bebc287611e3d5b0fc047ad75a 100644
--- a/src/styles/components/_ecogesture.scss
+++ b/src/styles/components/_ecogesture.scss
@@ -7,7 +7,7 @@
flex-direction: column;
align-items: center;
justify-content: center;
- padding: 1rem 1.5rem;
+ padding: 1rem 1.5rem 2.5rem 1.5rem;
.negawatt-button-content{
width: calc(53rem - 2%);
margin: 0 1%;
@@ -85,7 +85,6 @@
.em-header {
color: $text-bright;
border-bottom: 1px solid rgba(163, 163, 163, 0.4);
- margin-bottom: 1rem;
padding-bottom: 1em;
width: 100%;
display: flex;
@@ -141,10 +140,13 @@
.em-content-box-text {
display: flex;
flex-direction: column;
- padding: 0.5rem 1.5rem;
+ padding: 1.5rem 1.5rem;
width: 22.125rem;
@media #{$large-phone} {
width: 100%;
}
+ .em-description {
+ padding-bottom: 2.5rem;
+ }
}
}
diff --git a/src/styles/components/_konnector.scss b/src/styles/components/_konnector.scss
index c8efaa03950de79aca956ea024a8d7bf04ff68ff..efd3c1e77da3e75aa4bd79929dc2968433cce686 100644
--- a/src/styles/components/_konnector.scss
+++ b/src/styles/components/_konnector.scss
@@ -103,6 +103,8 @@
}
.state-icon {
- height: 20px;
- width: 20px;
+ height: 22px;
+ width: 22px;
+ margin-left: 32px;
+ margin-bottom: 40px;
}
diff --git a/src/styles/components/_modal.scss b/src/styles/components/_modal.scss
index 2d8cfd5af762661ff2653ba7bfe2c00e1cc76505..49cae038dd39a9ad0f76c4fed1563dc9d0bf0d7e 100644
--- a/src/styles/components/_modal.scss
+++ b/src/styles/components/_modal.scss
@@ -31,7 +31,7 @@
max-height: unset;
}
transform: translate(-50%, -50%);
- padding: 1rem 0;
+ padding: 1rem 0 0 0;
box-sizing: border-box;
box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.55);
border-radius: 4px;