diff --git a/.editorconfig b/.editorconfig index 150979a0a4047259070191eabcb2055ff450cd06..cd230f5bc2fea8028935e4670612c029bc06684d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,7 +5,7 @@ root = true [*] charset = utf-8 -end_of_line = lf +end_of_line = crlf trim_trailing_whitespace = true insert_final_newline = true indent_style = space diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e03917be92623b5ec32d0237d46113c340a77cd9..1ecbeffe212bf59e5699fd0fd98116492ffda2fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ build-dev: - git config --global user.email "$GIT_USER" - git config --global user.password "$GIT_PWD" - git config user.email "$GIT_USER" - - git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/llle_project/enedis-sge-konnector.git + - git remote set-url origin https://"$GIT_USER":"$GIT_PWD"@forge.grandlyon.com/web-et-numerique/llle_project/enedis-sge-konnector.git - git config --global credential.helper store - yarn deploy-dev diff --git a/manifest.konnector b/manifest.konnector index a0e89626c1f2157235c1def3e9059ef318aca42a..45b0262f958981d0f00811acd76ab276ac392474 100644 --- a/manifest.konnector +++ b/manifest.konnector @@ -1,10 +1,10 @@ { - "version": "1.0.0", + "version": "1.0.1", "name": "Enedis SGE", "type": "konnector", "language": "node", "icon": "icon.png", - "slug": "enedissgegrandlyon", + "slug": "enedis-sge-grandlyon", "source": "https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-sge-konnector.git", "editor": "Cozy", "vendor_link": "Link to the target website", @@ -58,6 +58,9 @@ "enedis data": { "description": "Requises pour accéder et stocker les données collectées par le compteur Linky et exposées par les API Enedis (consommations d’électricité à la demi-heure, au jour, mois et année). " }, + "files": { + "description": "Cozy files" + }, "accounts": { "description": "Utilisé pour accéder à vos données de consommation." } @@ -70,6 +73,9 @@ "enedis data": { "description": "Required to access and store the data collected by the Linky meter and exposed by Enedis APIs (half-an-hour, daily, monthly and yearly consumption)." }, + "files": { + "description": "Cozy files" + }, "accounts": { "description": "Used to access your consumption data." } diff --git a/package.json b/package.json index f26d68d6e40c4a680934a1fa185fe21e4c099ba3..4fe35f1d23ffddd902dc14581a41098e311d9689 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "build": "webpack", "lint": "eslint --fix .", "deploy": "git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build}", - "deploy-dev": "git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build-dev} --repo=${DEPLOY_REPOSITORY:-https://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git}", + "deploy-dev": "git-directory-deploy --directory build/ --branch ${DEPLOY_BRANCH:-build-dev}", "cozyPublish": "cozy-app-publish --token $REGISTRY_TOKEN --build-commit $(git rev-parse ${DEPLOY_BRANCH:-build})", "travisDeployKey": "./bin/generate_travis_deploy_key" },