diff --git a/docker/cozy-app-dev-with-app.sh b/docker/cozy-app-dev-with-app.sh index 48d4233a86b7d5ff13449b5b8e277ef45c4ae5cf..411697baf08b253e0e1bcbad2676ab1759768af2 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'; then - echo "Removing konnector enedis..." - cozy-stack konnectors uninstall enedis + if cozy-stack konnectors ls | grep 'enedisgrandlyon'; then + echo "Removing konnector enedisgrandlyon..." + cozy-stack konnectors uninstall enedisgrandlyon fi - if cozy-stack konnectors ls | grep 'grdf'; then - echo "Removing konnector grdf..." - cozy-stack konnectors uninstall grdf + if cozy-stack konnectors ls | grep 'grdfgrandlyon'; then + echo "Removing konnector grdfgrandlyon..." + cozy-stack konnectors uninstall grdfgrandlyon fi - if cozy-stack konnectors ls | grep 'egl'; then - echo "Removing konnector egl..." - cozy-stack konnectors uninstall egl + if cozy-stack konnectors ls | grep 'eglgrandlyon'; then + echo "Removing konnector eglgrandlyon..." + cozy-stack konnectors uninstall eglgrandlyon fi - cozy-stack konnectors install enedis git://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git#build - cozy-stack konnectors install grdf git://forge.grandlyon.com/web-et-numerique/llle_project/grdf-konnector.git#build - cozy-stack konnectors install egl git://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git#build + cozy-stack konnectors install enedisgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git#build + cozy-stack konnectors install grdfgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/grdf-konnector.git#build + cozy-stack konnectors install eglgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git#build } wait_for() { diff --git a/manifest.webapp b/manifest.webapp index 3dd53b04b3ecbda02bf102dcde656bee4c7c9449..42da9006536ea11fa56462b407064458145f79af 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -3,7 +3,7 @@ "slug": "ecolyo", "icon": "icon.svg", "categories": [], - "version": "0.1.2", + "version": "0.1.3", "licence": "AGPL-3.0", "editor": "Métropole de Lyon", "default_locale": "fr", diff --git a/package.json b/package.json index 58a9068f8429cb305238c3bf3804f76e18d6d5f8..0f25d3a4aff0ed8df7a914abc7c36e446c5db17a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecolyo", - "version": "0.1.2", + "version": "0.1.3", "scripts": { "tx": "tx pull --all || true", "lint": "yarn lint:js && yarn lint:styles", diff --git a/src/components/CommonKit/Card/StyledCard.tsx b/src/components/CommonKit/Card/StyledCard.tsx index 24b76412ce0a685a053b1eb0f9fb69527fe4961a..b5d825a00429bcd1ebc53c9f09a2775362d72637 100644 --- a/src/components/CommonKit/Card/StyledCard.tsx +++ b/src/components/CommonKit/Card/StyledCard.tsx @@ -11,7 +11,7 @@ const CardBase = withStyles({ background: 'linear-gradient(180deg, #323339 0%, #25262B 100%)', border: '1px solid', boxSizing: 'border-box', - boxShadow: '0px 4px 16px', + boxShadow: '0px 4px 8px rgba(0, 0, 0, 0.75)', borderRadius: '4px', margin: '10px 0px 20px 0px', //maxWidth: '155px', diff --git a/test/data/accountData.json b/test/data/accountData.json new file mode 100644 index 0000000000000000000000000000000000000000..4ffc2d98337c82313cea9359b41e2fa3a5eb7f8f --- /dev/null +++ b/test/data/accountData.json @@ -0,0 +1,38 @@ +{"io.cozy.accounts": + [ + { + "account_type": "grdfgrandlyon", + "auth": { + "credentials_encrypted": "bmFjbI7TqHf7FTj8b6T8JyV7ORUSYjziwua6bnbh0P3CE/3dJ9G0w6GdtmhbuqxAgqiQS/uqrZw=", + "login": "test" + }, + "identifier": "login", + "state": null + }, + { + "account_type": "eglgrandlyon", + "auth": { + "credentials_encrypted": "bmFjbHI5OoL+VNCT6JDFYea1dNiBGGNJM1zY0M4uWcjhALJcQT9uk9p9WPD7+1OryCAoYf9eaSE=", + "login": "test" + }, + "identifier": "login", + "state": null + }, + { + "account_type": "enedisgrandlyon", + "name": "", + "oauth": { + "access_token": "", + "expires_at": "2020-06-16T04:17:03.285910671+02:00", + "refresh_token": "", + "token_type": "Bearer" + }, + "oauth_callback_results": { + "issued_at": "1592232569642", + "refresh_token_issued_at": "1592232569642", + "scope": "/v4/metering_data/production_load_curve.GET /v3/customers/usage_points/addresses.GET /v4/metering_data/consumption_load_curve.GET /v3/customers/usage_points/contracts.GET /v4/metering_data/daily_production.GET /v4/metering_data/daily_consumption.GET /v4/metering_data/daily_consumption_max_power.GET /v3/customers/identity.GET", + "usage_points_id": "" + } + } + ] +} \ No newline at end of file diff --git a/test/importAccount.bat b/test/importAccount.bat new file mode 100644 index 0000000000000000000000000000000000000000..422527a01294153da2dd0ed71db8017bee897900 --- /dev/null +++ b/test/importAccount.bat @@ -0,0 +1,4 @@ +@echo off +echo Please provide cozysessid (can be found after connection in browser dev tool) +set /p token="CozySessid ? : " +ACH -t %token% import ./data/accountData.json