Skip to content
Snippets Groups Projects
Commit 4741bf10 authored by Hugo NOUTS's avatar Hugo NOUTS
Browse files

Merge branch 'feat/get-consumption-data' into jest-unit-tests

parents 91cd6d35 eed6e55e
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
{
"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."
}
......
......@@ -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"
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment