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..582a396b2e5271057dc85b3ff8807ef267a737bd 100644 --- a/docker/cozy-app-dev-with-app.sh +++ b/docker/cozy-app-dev-with-app.sh @@ -203,22 +203,22 @@ do_install_app() { cozy-stack apps install collect 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 + echo "Installing konnectors ------" + 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/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/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;