From 07bb9aae03860b031f776b2ed70412c33e5eae44 Mon Sep 17 00:00:00 2001 From: build-pipeline <build-token> Date: Mon, 24 Oct 2022 12:32:14 +0000 Subject: [PATCH] publish: Merge branch 'release/2.0' into 'dev' generated from commit 05beaa50f680bda4cc8b265fa547ba15544d8a20 --- ...8859.js => ecolyo.fa46a6da7d14a6222e2d.js} | 65 +++++++++++++++++-- index.html | 2 +- manifest.webapp | 8 ++- services/fluidsPrices/ecolyo.js | 20 +++++- services/monthlyReportNotification/ecolyo.js | 33 ++++++++-- 5 files changed, 114 insertions(+), 14 deletions(-) rename app/{ecolyo.b5f67bdffc5b58b68859.js => ecolyo.fa46a6da7d14a6222e2d.js} (99%) diff --git a/app/ecolyo.b5f67bdffc5b58b68859.js b/app/ecolyo.fa46a6da7d14a6222e2d.js similarity index 99% rename from app/ecolyo.b5f67bdffc5b58b68859.js rename to app/ecolyo.fa46a6da7d14a6222e2d.js index aec92d73d..a2e67cdc9 100644 --- a/app/ecolyo.b5f67bdffc5b58b68859.js +++ b/app/ecolyo.fa46a6da7d14a6222e2d.js @@ -2894,6 +2894,23 @@ exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE /***/ }), +/***/ "37t+": +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP_REC = exports.REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP = void 0; +var REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP = '/remote/org.ecolyo.agent.custom.popup'; +exports.REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP = REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP; +var REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP_REC = '/remote/org.ecolyo.agent.custom.popup.rec'; +exports.REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP_REC = REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP_REC; + +/***/ }), + /***/ "3C90": /***/ (function(module, __webpack_exports__, __webpack_require__) { @@ -4130,6 +4147,8 @@ var _environment = _interopRequireDefault(__webpack_require__("X6DI")); var _cozyLogger = _interopRequireDefault(__webpack_require__("Vggm")); +var _orgEcolyoAgentPartners = __webpack_require__("vIDP"); + var log = _cozyLogger.default.namespace('partnersInfoService'); var PartnersInfoService = /*#__PURE__*/function () { @@ -4155,7 +4174,7 @@ var PartnersInfoService = /*#__PURE__*/function () { switch (_context.prev = _context.next) { case 0: env = new _environment.default(); - remoteUrl = env.isProduction() ? "/remote/org.ecolyo.backoffice.partners.info" : "/remote/org.ecolyo.backoffice.partners.info.rec"; + remoteUrl = env.isProduction() ? _orgEcolyoAgentPartners.REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO : _orgEcolyoAgentPartners.REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO_REC; _context.prev = 2; _context.next = 5; return this._client.getStackClient().fetchJSON('GET', remoteUrl); @@ -21026,6 +21045,8 @@ var _environment = _interopRequireDefault(__webpack_require__("X6DI")); var _cozyLogger = _interopRequireDefault(__webpack_require__("Vggm")); +var _orgEcolyoAgentCustom = __webpack_require__("37t+"); + var log = _cozyLogger.default.namespace('customPupopService'); var CustomPupopService = /*#__PURE__*/function () { @@ -21051,7 +21072,7 @@ var CustomPupopService = /*#__PURE__*/function () { switch (_context.prev = _context.next) { case 0: env = new _environment.default(); - remoteUrl = env.isProduction() ? "/remote/org.ecolyo.backoffice.custom.popup" : "/remote/org.ecolyo.backoffice.custom.popup.rec"; + remoteUrl = env.isProduction() ? _orgEcolyoAgentCustom.REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP : _orgEcolyoAgentCustom.REMOTE_ORG_ECOLYO_AGENT_CUSTOM_POPUP_REC; _context.prev = 2; _context.next = 5; return this._client.getStackClient().fetchJSON('GET', remoteUrl); @@ -28026,6 +28047,23 @@ webpackContext.id = "kGy0"; /***/ }), +/***/ "kKy2": +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.REMOTE_ORG_ECOLYO_AGENT_PRICES_REC = exports.REMOTE_ORG_ECOLYO_AGENT_PRICES = void 0; +var REMOTE_ORG_ECOLYO_AGENT_PRICES = '/remote/org.ecolyo.agent.prices'; +exports.REMOTE_ORG_ECOLYO_AGENT_PRICES = REMOTE_ORG_ECOLYO_AGENT_PRICES; +var REMOTE_ORG_ECOLYO_AGENT_PRICES_REC = '/remote/org.ecolyo.agent.prices.rec'; +exports.REMOTE_ORG_ECOLYO_AGENT_PRICES_REC = REMOTE_ORG_ECOLYO_AGENT_PRICES_REC; + +/***/ }), + /***/ "kPbP": /***/ (function(module, exports, __webpack_require__) { @@ -31580,7 +31618,7 @@ exports.push([module.i, "/* Cozy UI utilities classes */\n/* Cozy UI React compo /***/ "pZg0": /***/ (function(module, exports) { -module.exports = {"name":"Ecolyo","slug":"ecolyo","icon":"icon.svg","categories":["energy"],"version":"2.0.0","licence":"AGPL-3.0","editor":"Métropole de Lyon","default_locale":"fr","locales":{"fr":{"short_description":"Ecolyo est le service proposé par la Métropole de Lyon pour suivre et comprendre les consommations d’énergie et d’eau de votre foyer.","long_description":"Ecolyo est le service proposé par la Métropole de Lyon pour suivre et comprendre les consommations d’énergie et d’eau de votre foyer afin de vous accompagner dans la gestion quotidienne de ces consommations et ce, de façon ludique en vous lançant des défis personnalisés.","permissions":{"ecolyo":{"description":"Requises pour le fonctionnement des différentes parties de l’application (Analyse, liste d’astuces personnalisée, …)."},"enedis":{"description":"Requises pour l’affichage et l’analyse de vos consommations électriques dans Ecolyo. Issues du connecteur Enedis."},"grdf":{"description":"Requises pour l’affichage et l’analyse de vos consommations de gaz dans Ecolyo. Issues du connecteur GRDF."},"egl":{"description":"Requises pour l’affichage et l’analyse de vos consommations d’eau dans Ecolyo. Issues du connecteur Eau du Grand Lyon."},"konnectors":{"description":"Requis pour vérifier la présence des connecteurs Enedis, GRDF et Eau du Grand Lyon ainsi que pour pouvoir les configurer à partir de l’application Ecolyo."},"accounts":{"description":"Requis pour stocker des informations propres aux comptes énergie et eau (Enedis, GRDF, Eau du Grand Lyon). Sont stockés votre numéro de PDL pour Enedis, votre numéro de PCE pour GRDF, vos logins et mots de passe pour Eau du Grand Lyon."},"triggers":{"description":"Requis pour le bon fonctionnement des connecteurs énergie et eau."},"jobs":{"description":"Requis pour le bon fonctionnement des connecteurs énergie et eau."},"terms":{"description":"Nécessaire pour la gestion des consentements de l'application"},"apps":{"description":"Requis par Cozy pour afficher les icônes des applications installées dans la barre Cozy."},"settings":{"description":"Requis pour afficher les paramètres Cozy dans la barre Cozy."},"ecolyo-dju":{"description":"Requis pour la récupération des DJU (Degrés Jours Unifiés), informations météorologiques permettant d’ajuster le modèle de comparaison des consommations énergétiques."},"dacc-dev":{"description":"Requis pour la récupération et l’envoi de statistiques d’utilisation anonymisées dans un environnement de test."},"dacc":{"description":"Requis pour envoyer des statistiques d'utilisation anonymisées."},"backoffice-prod":{"description":"Requis pour la récupération des données de la newsletter."},"backoffice-rec":{"description":"Requis pour la récupération des données de la newsletter dans un environment de test."},"backoffice-custom-popup":{"description":"Requis pour la récupération des alertes personnalisées."},"backoffice-custom-popup-rec":{"description":"Requis pour la récupération des alertes personnalisées dans un environment de test."},"backoffice-partners-info":{"description":"Requis pour la récupération du status des services partenaires"},"backoffice-partners-info-rec":{"description":"Requis pour la récupération du status des services partenaires dans un environment de test."},"backoffice-prices":{"description":"Requis pour la récupération du prix des fluides."},"backoffice-prices-rec":{"description":"Requis pour la récupération du prix des fluides dans un environnement de test."}}},"en":{"short_description":"Ecolyo a free service developed by Métropole de Lyon to help you to monitor and understand the energy and water consumption of your home.","long_description":"Ecolyo a free service developed by the Métropole de Lyon to help you to monitor and understand the energy and water consumption of your home. To help you in reducing your daily consumption it gives you best energy consumption practices, consumption analysis and challenges to take up. At least one Smartmeter is needed among Linky (for electricity), Gazpar (for gas) or Téléo (for water).","permissions":{"ecolyo":{"description":"Required for the operation of the different parts of the application (Analysis, customized eco-gesture lists, etc...)."},"enedis":{"description":"Required for the display and analysis of your electricity consumption in Ecolyo. Retrieved by the Enedis connector."},"grdf":{"description":"Required for the display and analysis of your gas consumption in Ecolyo. Retrieved by the GRDF connector."},"egl":{"description":"Required for the display and analysis of your water consumption in Ecolyo. Retrieved by the Eau du Grand Lyon connector."},"konnectors":{"description":"Required to verify the presence of the Enedis, GRDF and Eau du Grand Lyon connectors as well as to be able to configure them from the Ecolyo application."},"accounts":{"description":"Required to store information specific to energy and water accounts (Enedis, GRDF, Eau du Grand Lyon). Your PDL number for Enedis, your PCE number for GRDF, your logins and passwords for Eau du Grand Lyon are stored."},"triggers":{"description":"Required for the correct functioning of the energy and water connectors."},"jobs":{"description":"Required for the correct functioning of the energy and water connectors."},"terms":{"description":"Required for the correct managment of CGU."},"apps":{"description":"Required to display the icons of installed applications in the Cozy bar."},"settings":{"description":"Required for the application's consents managment"},"ecolyo-dju":{"description":"Required to gather udd data (Unified Degree Days), a meteorological data allowing the app to adjust our energical consumption model. "},"dacc-dev":{"description":"Required for gathering and sending anonymous usage statistics for test environment."},"dacc":{"description":"Required for sending cozy anonymized stats."},"backoffice-prod":{"description":"Required for retrieving newsletter informations from backoffice prod."},"backoffice-rec":{"description":"Required for retrieving newsletter informations from backoffice rec."},"backoffice-custom-popup":{"description":"Required for retrieving custom alerts."},"backoffice-custom-popup-rec":{"description":"Required for retrieving custom alerts in test environment."},"backoffice-partners-info":{"description":"Required for getting the status of partners' services"},"backoffice-partners-info-rec":{"description":"Required for getting the status of partners' services in test environment."},"backoffice-prices":{"description":"Required for getting fluid prices form backoffice prod"},"backoffice-prices-rec":{"description":"Required for getting fluid prices form backoffice rec."}}}},"langs":["fr"],"developer":{"name":"Métropole de Lyon","url":"https://www.grandlyon.com/"},"routes":{"/":{"folder":"/","index":"index.html","public":false}},"services":{"enedisHalfHourMonthlyAnalysis":{"type":"node","file":"services/enedisHalfHourMonthlyAnalysis/ecolyo.js","trigger":"@cron 0 0 8 3 * *"},"monthlyReportNotification":{"type":"node","file":"services/monthlyReportNotification/ecolyo.js","trigger":"@cron 0 0 10 3 * *"},"consumptionAlert":{"type":"node","file":"services/consumptionAlert/ecolyo.js","trigger":"@cron 0 3 * * *"},"aggregatorUsageEvents":{"type":"node","file":"services/aggregatorUsageEvents/ecolyo.js","trigger":"@cron 0 1 * * *"},"fluidsPrices":{"type":"node","file":"services/fluidsPrices/ecolyo.js","trigger":"@cron 0 2 * * *"}},"permissions":{"ecolyo":{"type":"com.grandlyon.ecolyo.*"},"enedis":{"type":"com.grandlyon.enedis.*"},"grdf":{"type":"com.grandlyon.grdf.*"},"egl":{"type":"com.grandlyon.egl.*"},"konnectors":{"type":"io.cozy.konnectors"},"accounts":{"type":"io.cozy.accounts"},"triggers":{"type":"io.cozy.triggers"},"jobs":{"type":"io.cozy.jobs"},"terms":{"type":"io.cozy.terms"},"apps":{"type":"io.cozy.apps","verbs":["GET"]},"settings":{"type":"io.cozy.settings","verbs":["GET"]},"ecolyo-dju":{"type":"org.ecolyo.dju","verbs":["GET"]},"dacc":{"type":"cc.cozycloud.dacc_v2","verbs":["ALL"]},"dacc-dev":{"type":"cc.cozycloud.dacc.dev_v2","verbs":["ALL"]},"backoffice-prod":{"type":"org.ecolyo.agent","verbs":["ALL"]},"backoffice-rec":{"type":"org.ecolyo.agent.rec","verbs":["ALL"]},"backoffice-custom-popup":{"type":"org.ecolyo.agent.custom.popup","verbs":["ALL"]},"backoffice-custom-popup-rec":{"type":"org.ecolyo.agent.custom.popup.rec","verbs":["ALL"]},"backoffice-partners-info":{"type":"org.ecolyo.agent.partners.info","verbs":["ALL"]},"backoffice-partners-info-rec":{"type":"org.ecolyo.agent.partners.info.rec","verbs":["ALL"]},"backoffice-prices":{"type":"org.ecolyo.agent.prices","verbs":["ALL"]},"backoffice-prices-rec":{"type":"org.ecolyo.agent.prices.rec","verbs":["ALL"]}}} +module.exports = {"name":"Ecolyo","slug":"ecolyo","icon":"icon.svg","categories":["energy"],"version":"1.12.1","licence":"AGPL-3.0","editor":"Métropole de Lyon","default_locale":"fr","locales":{"fr":{"short_description":"Ecolyo est le service proposé par la Métropole de Lyon pour suivre et comprendre les consommations d’énergie et d’eau de votre foyer.","long_description":"Ecolyo est le service proposé par la Métropole de Lyon pour suivre et comprendre les consommations d’énergie et d’eau de votre foyer afin de vous accompagner dans la gestion quotidienne de ces consommations et ce, de façon ludique en vous lançant des défis personnalisés.","permissions":{"ecolyo":{"description":"Requises pour le fonctionnement des différentes parties de l’application (Analyse, liste d’astuces personnalisée, …)."},"enedis":{"description":"Requises pour l’affichage et l’analyse de vos consommations électriques dans Ecolyo. Issues du connecteur Enedis."},"grdf":{"description":"Requises pour l’affichage et l’analyse de vos consommations de gaz dans Ecolyo. Issues du connecteur GRDF."},"egl":{"description":"Requises pour l’affichage et l’analyse de vos consommations d’eau dans Ecolyo. Issues du connecteur Eau du Grand Lyon."},"konnectors":{"description":"Requis pour vérifier la présence des connecteurs Enedis, GRDF et Eau du Grand Lyon ainsi que pour pouvoir les configurer à partir de l’application Ecolyo."},"accounts":{"description":"Requis pour stocker des informations propres aux comptes énergie et eau (Enedis, GRDF, Eau du Grand Lyon). Sont stockés votre numéro de PDL pour Enedis, votre numéro de PCE pour GRDF, vos logins et mots de passe pour Eau du Grand Lyon."},"triggers":{"description":"Requis pour le bon fonctionnement des connecteurs énergie et eau."},"jobs":{"description":"Requis pour le bon fonctionnement des connecteurs énergie et eau."},"terms":{"description":"Nécessaire pour la gestion des consentements de l'application"},"apps":{"description":"Requis par Cozy pour afficher les icônes des applications installées dans la barre Cozy."},"settings":{"description":"Requis pour afficher les paramètres Cozy dans la barre Cozy."},"ecolyo-dju":{"description":"Requis pour la récupération des DJU (Degrés Jours Unifiés), informations météorologiques permettant d’ajuster le modèle de comparaison des consommations énergétiques."},"dacc-dev":{"description":"Requis pour la récupération et l’envoi de statistiques d’utilisation anonymisées dans un environnement de test."},"dacc":{"description":"Requis pour envoyer des statistiques d'utilisation anonymisées."},"backoffice-prod":{"description":"Requis pour la récupération des données de la newsletter."},"backoffice-rec":{"description":"Requis pour la récupération des données de la newsletter dans un environment de test."},"backoffice-custom-popup":{"description":"Requis pour la récupération des alertes personnalisées."},"backoffice-custom-popup-rec":{"description":"Requis pour la récupération des alertes personnalisées dans un environment de test."},"backoffice-partners-info":{"description":"Requis pour la récupération du status des services partenaires"},"backoffice-partners-info-rec":{"description":"Requis pour la récupération du status des services partenaires dans un environment de test."},"backoffice-prices":{"description":"Requis pour la récupération du prix des fluides."},"backoffice-prices-rec":{"description":"Requis pour la récupération du prix des fluides dans un environnement de test."}}},"en":{"short_description":"Ecolyo a free service developed by Métropole de Lyon to help you to monitor and understand the energy and water consumption of your home.","long_description":"Ecolyo a free service developed by the Métropole de Lyon to help you to monitor and understand the energy and water consumption of your home. To help you in reducing your daily consumption it gives you best energy consumption practices, consumption analysis and challenges to take up. At least one Smartmeter is needed among Linky (for electricity), Gazpar (for gas) or Téléo (for water).","permissions":{"ecolyo":{"description":"Required for the operation of the different parts of the application (Analysis, customized eco-gesture lists, etc...)."},"enedis":{"description":"Required for the display and analysis of your electricity consumption in Ecolyo. Retrieved by the Enedis connector."},"grdf":{"description":"Required for the display and analysis of your gas consumption in Ecolyo. Retrieved by the GRDF connector."},"egl":{"description":"Required for the display and analysis of your water consumption in Ecolyo. Retrieved by the Eau du Grand Lyon connector."},"konnectors":{"description":"Required to verify the presence of the Enedis, GRDF and Eau du Grand Lyon connectors as well as to be able to configure them from the Ecolyo application."},"accounts":{"description":"Required to store information specific to energy and water accounts (Enedis, GRDF, Eau du Grand Lyon). Your PDL number for Enedis, your PCE number for GRDF, your logins and passwords for Eau du Grand Lyon are stored."},"triggers":{"description":"Required for the correct functioning of the energy and water connectors."},"jobs":{"description":"Required for the correct functioning of the energy and water connectors."},"terms":{"description":"Required for the correct managment of CGU."},"apps":{"description":"Required to display the icons of installed applications in the Cozy bar."},"settings":{"description":"Required for the application's consents managment"},"ecolyo-dju":{"description":"Required to gather udd data (Unified Degree Days), a meteorological data allowing the app to adjust our energical consumption model. "},"dacc-dev":{"description":"Required for gathering and sending anonymous usage statistics for test environment."},"dacc":{"description":"Required for sending cozy anonymized stats."},"agent":{"description":"Required for retrieving informations from our partners."},"backoffice-prod":{"description":"Required for retrieving newsletter informations from backoffice prod."},"backoffice-rec":{"description":"Required for retrieving newsletter informations from backoffice rec."},"backoffice-custom-popup":{"description":"Required for retrieving custom alerts."},"backoffice-custom-popup-rec":{"description":"Required for retrieving custom alerts in test environment."},"backoffice-partners-info":{"description":"Required for getting the status of partners' services"},"backoffice-partners-info-rec":{"description":"Required for getting the status of partners' services in test environment."},"backoffice-prices":{"description":"Required for getting fluid prices form backoffice prod"},"backoffice-prices-rec":{"description":"Required for getting fluid prices form backoffice rec."}}}},"langs":["fr"],"developer":{"name":"Métropole de Lyon","url":"https://www.grandlyon.com/"},"routes":{"/":{"folder":"/","index":"index.html","public":false}},"services":{"enedisHalfHourMonthlyAnalysis":{"type":"node","file":"services/enedisHalfHourMonthlyAnalysis/ecolyo.js","trigger":"@cron 0 0 8 3 * *"},"monthlyReportNotification":{"type":"node","file":"services/monthlyReportNotification/ecolyo.js","trigger":"@cron 0 0 10 3 * *"},"consumptionAlert":{"type":"node","file":"services/consumptionAlert/ecolyo.js","trigger":"@cron 0 3 * * *"},"aggregatorUsageEvents":{"type":"node","file":"services/aggregatorUsageEvents/ecolyo.js","trigger":"@cron 0 1 * * *"},"fluidsPrices":{"type":"node","file":"services/fluidsPrices/ecolyo.js","trigger":"@cron 0 2 * * *"}},"permissions":{"ecolyo":{"type":"com.grandlyon.ecolyo.*"},"enedis":{"type":"com.grandlyon.enedis.*"},"grdf":{"type":"com.grandlyon.grdf.*"},"egl":{"type":"com.grandlyon.egl.*"},"agent":{"type":"org.ecolyo.agent.*"},"konnectors":{"type":"io.cozy.konnectors"},"accounts":{"type":"io.cozy.accounts"},"triggers":{"type":"io.cozy.triggers"},"jobs":{"type":"io.cozy.jobs"},"terms":{"type":"io.cozy.terms"},"apps":{"type":"io.cozy.apps","verbs":["GET"]},"settings":{"type":"io.cozy.settings","verbs":["GET"]},"ecolyo-dju":{"type":"org.ecolyo.dju","verbs":["GET"]},"dacc":{"type":"cc.cozycloud.dacc_v2","verbs":["ALL"]},"dacc-dev":{"type":"cc.cozycloud.dacc.dev_v2","verbs":["ALL"]},"backoffice-prod":{"type":"org.ecolyo.agent","verbs":["ALL"]},"backoffice-rec":{"type":"org.ecolyo.agent.rec","verbs":["ALL"]},"backoffice-custom-popup":{"type":"org.ecolyo.agent.custom.popup","verbs":["ALL"]},"backoffice-custom-popup-rec":{"type":"org.ecolyo.agent.custom.popup.rec","verbs":["ALL"]},"backoffice-partners-info":{"type":"org.ecolyo.agent.partners.info","verbs":["ALL"]},"backoffice-partners-info-rec":{"type":"org.ecolyo.agent.partners.info.rec","verbs":["ALL"]},"backoffice-prices":{"type":"org.ecolyo.agent.prices","verbs":["ALL"]},"backoffice-prices-rec":{"type":"org.ecolyo.agent.prices.rec","verbs":["ALL"]}}} /***/ }), @@ -34188,6 +34226,23 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE /***/ }), +/***/ "vIDP": +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO_REC = exports.REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO = void 0; +var REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO = '/remote/org.ecolyo.agent.partners.info'; +exports.REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO = REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO; +var REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO_REC = '/remote/org.ecolyo.agent.partners.info.rec'; +exports.REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO_REC = REMOTE_ORG_ECOLYO_AGENT_PARTERS_INFO_REC; + +/***/ }), + /***/ "vMBp": /***/ (function(module, exports, __webpack_require__) { @@ -37164,6 +37219,8 @@ var _terms = _interopRequireDefault(__webpack_require__("wPjT")); var _cozyLogger = _interopRequireDefault(__webpack_require__("Vggm")); +var _orgEcolyoAgent = __webpack_require__("kKy2"); + function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; } function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } @@ -37616,7 +37673,7 @@ var InitializationService = /*#__PURE__*/function () { fluidTypes = [_fluid.FluidType.ELECTRICITY, _fluid.FluidType.WATER, _fluid.FluidType.GAS]; allPrices = []; env = new _environment.default(); - remoteUrl = env.isProduction() ? "/remote/org.ecolyo.backoffice.prices" : "/remote/org.ecolyo.backoffice.prices.rec"; + remoteUrl = env.isProduction() ? _orgEcolyoAgent.REMOTE_ORG_ECOLYO_AGENT_PRICES : _orgEcolyoAgent.REMOTE_ORG_ECOLYO_AGENT_PRICES_REC; _i = 0, _fluidTypes = fluidTypes; case 15: diff --git a/index.html b/index.html index 29f794161..872d80b7e 100644 --- a/index.html +++ b/index.html @@ -1 +1 @@ -<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212"><!-- PWA iOS title --><meta name="apple-mobile-web-app-title" content="Ecolyo">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.0d9221201ffbd1127b31.js"></script><script src="app/ecolyo.b5f67bdffc5b58b68859.js"></script></div></body></html> \ No newline at end of file +<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo</title><link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="manifest" href="/manifest.json" crossorigin="use-credentials"><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,user-scalable=0,viewport-fit=cover"><!-- PWA Chrome --><link rel="icon" sizes="192x192" href="/android-chrome-192x192.png"><link rel="icon" sizes="512x512" href="/android-chrome-512x512.png"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="/apple-touch-icon.png"><meta name="apple-mobile-web-app-title" content="Ecolyo"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black"><!-- PWA Colors --><meta name="theme-color" content="#343641"><meta name="background-color" content="#121212"><!-- PWA iOS title --><meta name="apple-mobile-web-app-title" content="Ecolyo">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.0d9221201ffbd1127b31.js"></script><script src="app/ecolyo.fa46a6da7d14a6222e2d.js"></script></div></body></html> \ No newline at end of file diff --git a/manifest.webapp b/manifest.webapp index a652ef6dd..d5c8a6d62 100644 --- a/manifest.webapp +++ b/manifest.webapp @@ -5,7 +5,7 @@ "categories": [ "energy" ], - "version": "2.0.0", + "version": "1.12.1", "licence": "AGPL-3.0", "editor": "Métropole de Lyon", "default_locale": "fr", @@ -128,6 +128,9 @@ "dacc": { "description": "Required for sending cozy anonymized stats." }, + "agent": { + "description": "Required for retrieving informations from our partners." + }, "backoffice-prod": { "description": "Required for retrieving newsletter informations from backoffice prod." }, @@ -209,6 +212,9 @@ "egl": { "type": "com.grandlyon.egl.*" }, + "agent": { + "type": "org.ecolyo.agent.*" + }, "konnectors": { "type": "io.cozy.konnectors" }, diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js index 504a4aaae..839f6e9f3 100644 --- a/services/fluidsPrices/ecolyo.js +++ b/services/fluidsPrices/ecolyo.js @@ -80411,11 +80411,13 @@ var _queryRunner = _interopRequireDefault(__webpack_require__(627)); var _environment = _interopRequireDefault(__webpack_require__(1038)); +var _orgEcolyoAgent = __webpack_require__(1500); + const log = _cozyLogger.default.namespace('fluidPrices'); const getRemotePricesByfluid = async (client, fluidType) => { const env = new _environment.default(); - const remoteUrl = env.isProduction() ? `/remote/org.ecolyo.backoffice.prices` : `/remote/org.ecolyo.backoffice.prices.rec`; + const remoteUrl = env.isProduction() ? _orgEcolyoAgent.REMOTE_ORG_ECOLYO_AGENT_PRICES : _orgEcolyoAgent.REMOTE_ORG_ECOLYO_AGENT_PRICES_REC; const prices = await client.getStackClient().fetchJSON('GET', `${remoteUrl}?fluidtype=${fluidType}`); return prices; }; @@ -80919,5 +80921,21 @@ class FluidPricesService { exports.default = FluidPricesService; +/***/ }), +/* 1500 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.REMOTE_ORG_ECOLYO_AGENT_PRICES_REC = exports.REMOTE_ORG_ECOLYO_AGENT_PRICES = void 0; +const REMOTE_ORG_ECOLYO_AGENT_PRICES = '/remote/org.ecolyo.agent.prices'; +exports.REMOTE_ORG_ECOLYO_AGENT_PRICES = REMOTE_ORG_ECOLYO_AGENT_PRICES; +const REMOTE_ORG_ECOLYO_AGENT_PRICES_REC = '/remote/org.ecolyo.agent.prices.rec'; +exports.REMOTE_ORG_ECOLYO_AGENT_PRICES_REC = REMOTE_ORG_ECOLYO_AGENT_PRICES_REC; + /***/ }) /******/ ]); \ No newline at end of file diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js index f63955e8f..75086bf27 100644 --- a/services/monthlyReportNotification/ecolyo.js +++ b/services/monthlyReportNotification/ecolyo.js @@ -81,7 +81,7 @@ /******/ /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 1500); +/******/ return __webpack_require__(__webpack_require__.s = 1501); /******/ }) /************************************************************************/ /******/ ([ @@ -146914,7 +146914,8 @@ module.exports = (Handlebars["default"] || Handlebars).template({"compiler":[8," /* 1497 */, /* 1498 */, /* 1499 */, -/* 1500 */ +/* 1500 */, +/* 1501 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -146924,6 +146925,8 @@ var _interopRequireDefault = __webpack_require__(1); var _cozyLogger = _interopRequireDefault(__webpack_require__(3)); +var _orgEcolyo = __webpack_require__(1502); + var _fluid = __webpack_require__(620); var _timeStep = __webpack_require__(617); @@ -146946,7 +146949,7 @@ var _utils = __webpack_require__(869); var _service = __webpack_require__(23); -const monthlyReportTemplate = __webpack_require__(1501); +const monthlyReportTemplate = __webpack_require__(1503); const log = _cozyLogger.default.namespace('report'); @@ -147041,7 +147044,7 @@ const getMonthlyReport = async (year, month, client) => { try { const environmentService = new _environment.default(); log('info', environmentService.isProduction() ? 'Fetching data from BO prod' : 'Fetching data from BO rec'); - const result = await client.getStackClient().fetchJSON('GET', environmentService.isProduction() ? `/remote/org.ecolyo.backoffice?year=${year}&month=${month}` : `/remote/org.ecolyo.backoffice.rec?year=${year}&month=${month}`); + const result = await client.getStackClient().fetchJSON('GET', environmentService.isProduction() ? `${_orgEcolyo.REMOTE_ORG_ECOLYO_AGENT}?year=${year}&month=${month}` : `${_orgEcolyo.REMOTE_ORG_ECOLYO_AGENT_REC}?year=${year}&month=${month}`); return result; } catch (error) { log('error', error); @@ -147189,7 +147192,23 @@ const monthlyReportNotification = async ({ (0, _service.runService)(monthlyReportNotification); /***/ }), -/* 1501 */ +/* 1502 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.REMOTE_ORG_ECOLYO_AGENT_REC = exports.REMOTE_ORG_ECOLYO_AGENT = void 0; +const REMOTE_ORG_ECOLYO_AGENT = '/remote/org.ecolyo.agent'; +exports.REMOTE_ORG_ECOLYO_AGENT = REMOTE_ORG_ECOLYO_AGENT; +const REMOTE_ORG_ECOLYO_AGENT_REC = '/remote/org.ecolyo.agent.rec'; +exports.REMOTE_ORG_ECOLYO_AGENT_REC = REMOTE_ORG_ECOLYO_AGENT_REC; + +/***/ }), +/* 1503 */ /***/ (function(module, exports, __webpack_require__) { var Handlebars = __webpack_require__(1471); @@ -147295,12 +147314,12 @@ module.exports = (Handlebars["default"] || Handlebars).template({"1":function(co + alias2(alias1((depth0 != null ? lookupProperty(depth0,"feedbackImageUrl") : depth0), depth0)) + " width=\"53px\" align=\"center\" alt=\"feedback\"></mj-image>\n <mj-text color=\"white\" font-weight=\"900\" align=\"center\" font-size=\"18px\">\n Un problème, une question, une suggestion ?\n </mj-text>\n <mj-text color=\"white\" align=\"center\" font-size=\"18px\">\n N'hésitez pas à nous écrire via la bulle dans le service.\n </mj-text>\n </mj-column>\n </mj-section>\n <mj-section background-color=\"black\">\n <mj-column>\n" + ((stack1 = container.invokePartial(__webpack_require__(1495),depth0,{"name":"base/footer","fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") - + ((stack1 = container.invokePartial(__webpack_require__(1502),depth0,{"name":"base/unsubscribe","fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") + + ((stack1 = container.invokePartial(__webpack_require__(1504),depth0,{"name":"base/unsubscribe","fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") + " </mj-column>\n </mj-section>\n </mj-body>\n</mjml>"; },"usePartial":true,"useData":true}); /***/ }), -/* 1502 */ +/* 1504 */ /***/ (function(module, exports, __webpack_require__) { var Handlebars = __webpack_require__(1471); -- GitLab