diff --git a/config.json b/config.json index 97b6afd35d485ef36d3b7a831733288265a4bed6..26c228945ddd7a59c627c254d1b3dda9d8a9dcb6 100644 --- a/config.json +++ b/config.json @@ -34,7 +34,7 @@ "konnectorConfig": { "name": "GRDF", "type": "GAS", - "oauth": false, + "oauth": true, "slug": "grdfgrandlyon" }, "siteLink": "https://monespace.grdf.fr/monespace/connexion" diff --git a/manifest.webapp b/manifest.webapp index f843cc5b0616eaaf6a36213e5d36e511121931ca..79b6ffbca353e45934c20a4c0e393c24bef41121 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -3,7 +3,7 @@ "slug": "ecolyo", "icon": "icon.svg", "categories": ["energy"], - "version": "0.2.1", + "version": "0.2.2", "licence": "AGPL-3.0", "editor": "Métropole de Lyon", "default_locale": "fr", diff --git a/package.json b/package.json index 513387fbece506ed4a826dee76476602a115e755..ca247ee63ffba1d04a06a14e3ae207de3473cb8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecolyo", - "version": "0.2.1", + "version": "0.2.2", "scripts": { "tx": "tx pull --all || true", "lint": "yarn lint:js && yarn lint:styles", diff --git a/src/components/Connection/OAuthForm.tsx b/src/components/Connection/OAuthForm.tsx index cded6d9149120ab2396ac8ec8b6aafb74b25a946..46ec2f9d96fa1531065686775db7cb7cd313bb8f 100644 --- a/src/components/Connection/OAuthForm.tsx +++ b/src/components/Connection/OAuthForm.tsx @@ -2,10 +2,14 @@ import React, { useState } from 'react' import { useI18n } from 'cozy-ui/transpiled/react' import { useClient } from 'cozy-client' +import { FluidType } from 'enum/fluid.enum' import { Konnector } from 'models' +import ConfigService from 'services/fluidConfig.service' import { OAuthWindow } from 'cozy-harvest-lib/dist/components/OAuthWindow' import iconEnedisLogo from 'assets/icons/visu/enedis-logo.svg' +import iconGrdfLogo from 'assets/icons/visu/grdf-logo.svg' +import iconEglLogo from 'assets/icons/visu/egl-logo.svg' import StyledAuthButton from 'components/CommonKit/Button/StyledAuthButton' import StyledIcon from 'components/CommonKit/Icon/StyledIcon' import StyledBlackSpinner from 'components/CommonKit/Spinner/StyledBlackSpinner' @@ -44,6 +48,16 @@ const OAuthForm: React.FC<OAuthFormProps> = ({ endOAuth() } + const fluidconfig = new ConfigService().getFluidConfig() + const icon = + konnector.slug === fluidconfig[FluidType.ELECTRICITY].konnectorConfig.slug + ? iconEnedisLogo + : konnector.slug === fluidconfig[FluidType.GAS].konnectorConfig.slug + ? iconGrdfLogo + : konnector.slug === fluidconfig[FluidType.WATER].konnectorConfig.slug + ? iconEglLogo + : '' + const isWaiting = status === WAITING return !konnector ? null : ( <> @@ -58,7 +72,7 @@ const OAuthForm: React.FC<OAuthFormProps> = ({ {isWaiting ? ( <StyledBlackSpinner size={48} /> ) : ( - <StyledIcon icon={iconEnedisLogo} size={48} /> + <StyledIcon icon={icon} size={48} /> )} </div> <div className="authform-button-text text-18-bold"> diff --git a/src/db/challengeTypeData.json b/src/db/challengeTypeData.json index e83ed61d1365bb9a7b8daca1b855d1690cb2abff..2be594a8afa18b8e2374bd1d4da99c5406969d21 100644 --- a/src/db/challengeTypeData.json +++ b/src/db/challengeTypeData.json @@ -3,7 +3,7 @@ "_id": "CHA00000001", "type": 1, "title": "Ecolyo Royal", - "description": "Connecter l'application Ecolyo à votre distributeur d'énergie", + "description": "Connecter l'application Ecolyo à un distributeur d'énergie", "level": 1, "duration": { "days": 0 }, "fluidTypes": [0, 1, 2],