diff --git a/1/ecolyo.a02283acd610af395692.js b/1/ecolyo.184d8578e90767ccd45d.js
similarity index 99%
rename from 1/ecolyo.a02283acd610af395692.js
rename to 1/ecolyo.184d8578e90767ccd45d.js
index fd5d034fe0410176be5b0dd3bde64655885b9883..4044abe209568279df9904b499a70e845ad762b9 100644
--- a/1/ecolyo.a02283acd610af395692.js
+++ b/1/ecolyo.184d8578e90767ccd45d.js
@@ -2023,7 +2023,7 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
}, /*#__PURE__*/_react.default.createElement(_Icon.default, {
icon: _rightArrow.default,
size: 24
- }))), !isLoading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, monthDataloads && monthDataloads.weekend && monthDataloads.week && monthDataloads.weekend[0] !== null && monthDataloads.week[0] !== null ? /*#__PURE__*/_react.default.createElement(_ElecHalfHourChart.default, {
+ }))), !isLoading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, monthDataloads ? /*#__PURE__*/_react.default.createElement(_ElecHalfHourChart.default, {
dataLoad: isWeekend ? monthDataloads.weekend : monthDataloads.week,
isWeekend: isWeekend
}) : /*#__PURE__*/_react.default.createElement("p", {
@@ -2066,7 +2066,7 @@ var ElecHalfHourMonthlyAnalysis = function ElecHalfHourMonthlyAnalysis(_ref) {
className: "text-18-normal"
}, " %")), /*#__PURE__*/_react.default.createElement("div", {
className: "text-18-bold"
- }, elecPrice && elecPrice.price ? (enedisAnalysisValues.minimumLoad * elecPrice.price).toFixed(1) : '---', /*#__PURE__*/_react.default.createElement("span", {
+ }, elecPrice ? (enedisAnalysisValues.minimumLoad * elecPrice.price).toFixed(1) : '---', /*#__PURE__*/_react.default.createElement("span", {
className: "text-18-normal"
}, " \u20AC"))) : /*#__PURE__*/_react.default.createElement("span", null, "----"))), /*#__PURE__*/_react.default.createElement("div", {
onClick: toggleOpenModal,
diff --git a/app/ecolyo.bdd47c0923972882babd.js b/app/ecolyo.8b247a3757f82479c029.js
similarity index 99%
rename from app/ecolyo.bdd47c0923972882babd.js
rename to app/ecolyo.8b247a3757f82479c029.js
index 6368cfde4151014954e277a5d9028365699779c3..5b81c1b9d348628b6e852fbd580e4546dd01ccc3 100644
--- a/app/ecolyo.bdd47c0923972882babd.js
+++ b/app/ecolyo.8b247a3757f82479c029.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"a02283acd610af395692","2":"6d183490608e68bc82c9","3":"5d19de1575246b277882","4":"cfcd9b2d3c81cc9cb42e","5":"5609d37bf09749392927","6":"158d599f0e6726037360","8":"4626a4c9d98e09f86ede","9":"d4ed13f0af358fe273b8","10":"aa0b42e4690c9d480efb","11":"4e1decb956d30ee3f07e","12":"07e0b4696f5cc248d537"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"184d8578e90767ccd45d","2":"6d183490608e68bc82c9","3":"5d19de1575246b277882","4":"cfcd9b2d3c81cc9cb42e","5":"5609d37bf09749392927","6":"158d599f0e6726037360","8":"4626a4c9d98e09f86ede","9":"d4ed13f0af358fe273b8","10":"aa0b42e4690c9d480efb","11":"4e1decb956d30ee3f07e","12":"07e0b4696f5cc248d537"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -701,7 +701,7 @@ var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _reactDom = __webpack_require__("i8i4");
-var _cozyClient = __webpack_require__("SH7X");
+var _cozyClient = _interopRequireWildcard(__webpack_require__("SH7X"));
var _reactRedux = __webpack_require__("/MKj");
@@ -713,45 +713,77 @@ var _oauth = __webpack_require__("sDS3");
var _lodash = __webpack_require__("LvDl");
-var _client = __webpack_require__("1L0a");
+var _manifest = _interopRequireDefault(__webpack_require__("pZg0"));
-var _bar = __webpack_require__("WL0o");
+var _doctypes = _interopRequireDefault(__webpack_require__("D2hQ"));
+
+var _history = __webpack_require__("LhCv");
+
+var _reactRouterDom = __webpack_require__("55Ip");
+
+var _matomoTracker = _interopRequireDefault(__webpack_require__("vMBp"));
(function () {
var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
enterModule && enterModule(module);
})();
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
return a;
};
var setupApp = (0, _lodash.memoize)(function () {
- var root = document.querySelector('[role=application]');
-
- var _getValues = (0, _bar.getValues)(root.dataset),
- lang = _getValues.lang;
+ var history = (0, _history.createBrowserHistory)(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
- var polyglot = (0, _I18n.initTranslation)(lang, function (lang) {
+ var root = document.querySelector('[role=application]');
+ var data = JSON.parse(root.dataset.cozy);
+ var protocol = window.location.protocol;
+ var cozyUrl = "".concat(protocol, "//").concat(data.domain);
+ var locale = 'fr';
+ var polyglot = (0, _I18n.initTranslation)(locale, function (lang) {
return __webpack_require__("/KVF")("./".concat(lang));
});
- var client = (0, _client.getClient)();
+ var client = new _cozyClient.default({
+ uri: cozyUrl,
+ token: data.token,
+ appMetadata: {
+ slug: _manifest.default.name,
+ version: _manifest.default.version
+ },
+ schema: _doctypes.default
+ });
var persistedState = {};
var store = (0, _store.default)(client, persistedState);
- /** I don't know why I need to for this... But if I don't it seems that
- * we have a race between configureStore and initBar resulting in
- * an error from cozy-client "store is already defined"
- */
-
- setTimeout(function () {
- (0, _bar.initBar)(client);
- }, 0);
+ cozy.bar.init({
+ appName: data.app.name,
+ appEditor: data.app.editor,
+ cozyClient: client,
+ iconPath: data.app.icon,
+ lang: data.locale,
+ replaceTitleOnMobile: false,
+ appSlug: data.app.slug,
+ appNamePrefix: data.app.prefix
+ });
+ Piwik.getTracker();
+ var tracker = new _matomoTracker.default({
+ cozyUrl: cozyUrl,
+ url: "https://matomo.self-data.alpha.grandlyon.com/",
+ siteId: 1,
+ history: history,
+ phpFilename: 'matomo.php'
+ });
return {
root: root,
store: store,
client: client,
- lang: lang,
- polyglot: polyglot
+ locale: locale,
+ polyglot: polyglot,
+ history: history,
+ tracker: tracker
};
});
@@ -760,8 +792,10 @@ var init = function init() {
root = _setupApp.root,
store = _setupApp.store,
client = _setupApp.client,
- lang = _setupApp.lang,
- polyglot = _setupApp.polyglot;
+ locale = _setupApp.locale,
+ polyglot = _setupApp.polyglot,
+ history = _setupApp.history,
+ tracker = _setupApp.tracker;
if ((0, _oauth.handleOAuthResponse)()) return;
@@ -772,9 +806,11 @@ var init = function init() {
}, /*#__PURE__*/_react.default.createElement(_cozyClient.CozyProvider, {
client: client
}, /*#__PURE__*/_react.default.createElement(_I18n.I18n, {
- lang: lang,
+ lang: locale,
polyglot: polyglot
- }, /*#__PURE__*/_react.default.createElement(App, null)))), root);
+ }, /*#__PURE__*/_react.default.createElement(_reactRouterDom.HashRouter, history, /*#__PURE__*/_react.default.createElement(App, {
+ tracker: tracker
+ }))))), root);
}; // initial rendering of the application
@@ -2217,78 +2253,6 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
/***/ }),
-/***/ "1L0a":
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-
-var _interopRequireDefault = __webpack_require__("TqRt");
-
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-exports.getClient = void 0;
-
-var _cozyClient = _interopRequireDefault(__webpack_require__("SH7X"));
-
-var _manifest = _interopRequireDefault(__webpack_require__("pZg0"));
-
-var _doctypes = _interopRequireDefault(__webpack_require__("D2hQ"));
-
-(function () {
- var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
- enterModule && enterModule(module);
-})();
-
-var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
- return a;
-};
-
-/**
- * Returns cozy client instance
- * @returns {object} cozy client instance
- */
-var getClient = function getClient() {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- var root = document.querySelector('[role=application]');
- var data = root.dataset;
- var protocol = window.location.protocol;
- var cozyUrl = "".concat(protocol, "//").concat(data.cozyDomain);
- return new _cozyClient.default({
- uri: cozyUrl,
- token: data.cozyToken,
- appMetadata: {
- slug: _manifest.default.name,
- version: _manifest.default.version
- },
- schema: _doctypes.default
- });
-};
-
-exports.getClient = getClient;
-;
-
-(function () {
- var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
-
- if (!reactHotLoader) {
- return;
- }
-
- reactHotLoader.register(getClient, "getClient", "/home/remi/D\xE9veloppement/ecolyo/src/utils/client.ts");
-})();
-
-;
-
-(function () {
- var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
- leaveModule && leaveModule(module);
-})();
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("YuTi")(module)))
-
-/***/ }),
-
/***/ "1RIw":
/***/ (function(module, exports, __webpack_require__) {
@@ -19997,8 +19961,6 @@ var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
__webpack_require__("Tg1I");
-var _App = __webpack_require__("w0Hc");
-
var _reactRedux = __webpack_require__("/MKj");
var _global = __webpack_require__("c4IZ");
@@ -20009,6 +19971,8 @@ var _screen = __webpack_require__("41Xj");
var _FeedbackModal = _interopRequireDefault(__webpack_require__("ak4Y"));
+var _reactRouterDom = __webpack_require__("55Ip");
+
(function () {
var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
enterModule && enterModule(module);
@@ -20029,6 +19993,7 @@ var Content = function Content(_ref) {
_ref$background = _ref.background,
background = _ref$background === void 0 ? 'inherit' : _ref$background;
var dispatch = (0, _reactRedux.useDispatch)();
+ var history = (0, _reactRouterDom.useHistory)();
var _useSelector = (0, _reactRedux.useSelector)(function (state) {
return state.ecolyo.global;
@@ -20051,20 +20016,18 @@ var Content = function Content(_ref) {
* Handle Desktop scroll
*/
- var handleWindowScroll = function handleWindowScroll() {
+ var handleWindowScroll = (0, _react.useCallback)(function () {
app && app.scrollTo(0, 0);
window.scrollTo(0, 0);
- }; // Set listners for scroll
-
+ }, [app]); // Set listners for scroll
(0, _react.useEffect)(function () {
- var listner = _App.history.listen(handleWindowScroll);
-
+ var listner = history.listen(handleWindowScroll);
return function () {
// remove listner subscription
listner();
};
- }, []);
+ }, [handleWindowScroll, history]);
(0, _react.useEffect)(function () {
function handleResize() {
if (innerWidth <= 768) {
@@ -20096,8 +20059,8 @@ var Content = function Content(_ref) {
}, children));
};
-__signature__(Content, "useDispatch{dispatch}\nuseSelector{{ screenType }}\nuseSelector{{ isFeedbacksOpen }}\nuseCallback{handleFeedbackModalClose}\nuseEffect{}\nuseEffect{}", function () {
- return [_reactRedux.useDispatch, _reactRedux.useSelector, _reactRedux.useSelector];
+__signature__(Content, "useDispatch{dispatch}\nuseHistory{history}\nuseSelector{{ screenType }}\nuseSelector{{ isFeedbacksOpen }}\nuseCallback{handleFeedbackModalClose}\nuseCallback{handleWindowScroll}\nuseEffect{}\nuseEffect{}", function () {
+ return [_reactRedux.useDispatch, _reactRouterDom.useHistory, _reactRedux.useSelector, _reactRedux.useSelector];
});
var _default = Content;
@@ -21484,109 +21447,6 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
/***/ }),
-/***/ "WL0o":
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(module) {
-
-var _interopRequireDefault = __webpack_require__("TqRt");
-
-Object.defineProperty(exports, "__esModule", {
- value: true
-});
-exports.initBar = exports.getValues = void 0;
-
-var _manifest = _interopRequireDefault(__webpack_require__("pZg0"));
-
-(function () {
- var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
- enterModule && enterModule(module);
-})();
-
-var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
- return a;
-};
-
-var getDataOrDefault = function getDataOrDefault(data, defaultData) {
- return /^\{\{\..*\}\}$/.test(data) ? defaultData : data;
-}; //NOSONAR
-
-/**
- * default data will allow to display correctly the cozy-bar
- * in the standalone (without cozy-stack connexion)
- */
-
-
-var getValues = function getValues(_ref) {
- var cozyAppName = _ref.cozyAppName,
- cozyAppNamePrefix = _ref.cozyAppNamePrefix,
- cozyIconPath = _ref.cozyIconPath;
- var defaultValues = {
- appIconDefault: __webpack_require__("ZAKO"),
- appNamePrefixDefault: _manifest.default.name_prefix,
- appNameDefault: _manifest.default.name,
- appLocaleDefault: 'fr'
- };
- return {
- appName: getDataOrDefault(cozyAppName, defaultValues.appNameDefault),
- appNamePrefix: getDataOrDefault(cozyAppNamePrefix, defaultValues.appNamePrefixDefault),
- iconPath: getDataOrDefault(cozyIconPath, defaultValues.appIconDefault),
- lang: defaultValues.appLocaleDefault
- };
-};
-/**
- * Cozy bar initialization
- * @param {object} client - cozy client
- */
-
-
-exports.getValues = getValues;
-
-var initBar = function initBar(client) {
- var root = document.querySelector('[role=application]');
-
- var _getValues = getValues(root.dataset),
- appName = _getValues.appName,
- appNamePrefix = _getValues.appNamePrefix,
- iconPath = _getValues.iconPath,
- lang = _getValues.lang;
-
- cozy.bar.init({
- appName: appName,
- appNamePrefix: appNamePrefix,
- cozyClient: client,
- iconPath: iconPath,
- lang: lang,
- replaceTitleOnMobile: false
- });
-};
-
-exports.initBar = initBar;
-;
-
-(function () {
- var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
-
- if (!reactHotLoader) {
- return;
- }
-
- reactHotLoader.register(getDataOrDefault, "getDataOrDefault", "/home/remi/D\xE9veloppement/ecolyo/src/utils/bar.ts");
- reactHotLoader.register(getValues, "getValues", "/home/remi/D\xE9veloppement/ecolyo/src/utils/bar.ts");
- reactHotLoader.register(initBar, "initBar", "/home/remi/D\xE9veloppement/ecolyo/src/utils/bar.ts");
-})();
-
-;
-
-(function () {
- var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
- leaveModule && leaveModule(module);
-})();
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("YuTi")(module)))
-
-/***/ }),
-
/***/ "WoNc":
/***/ (function(module, exports, __webpack_require__) {
@@ -22694,13 +22554,6 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
/***/ }),
-/***/ "ZAKO":
-/***/ (function(module, exports) {
-
-module.exports = "/img/icon.e4891962a18ac2a487b21f0381a5513f.svg";
-
-/***/ }),
-
/***/ "ZSA5":
/***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -35582,6 +35435,186 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
/***/ }),
+/***/ "vMBp":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+
+var _interopRequireDefault = __webpack_require__("TqRt");
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(__webpack_require__("lwsE"));
+
+var _createClass2 = _interopRequireDefault(__webpack_require__("W8MJ"));
+
+var _defineProperty2 = _interopRequireDefault(__webpack_require__("lSNA"));
+
+var _appDataset = __webpack_require__("uVqs");
+
+var _objectHash = _interopRequireDefault(__webpack_require__("1EKS"));
+
+(function () {
+ var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+ enterModule && enterModule(module);
+})();
+
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+ return a;
+};
+
+var MatomoTracker = /*#__PURE__*/function () {
+ function MatomoTracker(_ref) {
+ var cozyUrl = _ref.cozyUrl,
+ url = _ref.url,
+ siteId = _ref.siteId,
+ history = _ref.history,
+ _ref$phpFilename = _ref.phpFilename,
+ phpFilename = _ref$phpFilename === void 0 ? 'matomo.php' : _ref$phpFilename;
+ (0, _classCallCheck2.default)(this, MatomoTracker);
+ (0, _defineProperty2.default)(this, "cozyUrl", void 0);
+ (0, _defineProperty2.default)(this, "url", void 0);
+ (0, _defineProperty2.default)(this, "siteId", void 0);
+ (0, _defineProperty2.default)(this, "phpFilename", void 0);
+ (0, _defineProperty2.default)(this, "history", void 0);
+ (0, _defineProperty2.default)(this, "unlistenFromHistory", void 0);
+
+ if (url === undefined || siteId === undefined) {
+ throw new Error('MatomoTracker cannot be initialized! SiteId and url are mandatory.');
+ }
+
+ this.cozyUrl = cozyUrl;
+ this.url = url;
+ this.siteId = siteId;
+ this.phpFilename = phpFilename;
+ this.history = history;
+
+ this.unlistenFromHistory = function () {
+ return null;
+ };
+
+ this.init();
+ }
+
+ (0, _createClass2.default)(MatomoTracker, [{
+ key: "init",
+ value: function init() {
+ if (typeof window !== 'undefined') {
+ window._paq = window._paq || [];
+ MatomoTracker.push(['enableHeartBeatTimer', 30]);
+ MatomoTracker.push(['setSiteId', this.siteId]);
+ MatomoTracker.push(['setReferrerUrl', 'https://ecolyo.com']);
+ MatomoTracker.push(['setTrackerUrl', "".concat(this.url + this.phpFilename)]);
+ MatomoTracker.push(['setUserId', (0, _objectHash.default)(this.cozyUrl)]);
+ MatomoTracker.push(['enableLinkTracking']);
+ }
+
+ return {
+ push: MatomoTracker.push,
+ track: this.track,
+ connectToHistory: this.connectToHistory,
+ disconnectFromHistory: this.disconnectFromHistory
+ };
+ }
+ }, {
+ key: "configure",
+ value: function configure() {
+ var cozyDomain;
+ var userId;
+ var root = document.querySelector('[role=application]');
+
+ if (root && root.dataset) {
+ cozyDomain = (0, _appDataset.readCozyDataFromDOM)('cozyDomain');
+ }
+
+ if (cozyDomain) {
+ userId = cozyDomain;
+ var indexOfPort = cozyDomain.indexOf(':');
+
+ if (indexOfPort >= 0) {
+ userId = userId.substring(0, indexOfPort);
+ }
+ }
+
+ if (userId) {
+ MatomoTracker.push(['setUserId', userId]);
+ }
+ }
+ }, {
+ key: "connectToHistory",
+ value: function connectToHistory() {
+ var _this = this;
+
+ this.unlistenFromHistory = this.history.listen(function (loc) {
+ _this.track(loc);
+ });
+ }
+ }, {
+ key: "disconnectFromHistory",
+ value: function disconnectFromHistory() {
+ if (this.unlistenFromHistory) {
+ this.unlistenFromHistory();
+ return true;
+ }
+
+ return false;
+ }
+ }, {
+ key: "track",
+ value: function track(loc) {
+ if (typeof window === 'undefined') {
+ return;
+ }
+
+ var currentPath = loc.hash.substring(1);
+ MatomoTracker.push(['setDocumentTitle', currentPath.substring(1)]);
+ MatomoTracker.push(['setCustomUrl', 'https://ecolyo.com' + currentPath]);
+ MatomoTracker.push(['setUserId', (0, _objectHash.default)(this.cozyUrl)]);
+ MatomoTracker.push(['trackPageView']);
+ }
+ }, {
+ key: "__reactstandin__regenerateByEval",
+ value: // @ts-ignore
+ function __reactstandin__regenerateByEval(key, code) {
+ // @ts-ignore
+ this[key] = eval(code);
+ }
+ }], [{
+ key: "push",
+ value: function push(args) {
+ window._paq.push(args);
+ }
+ }]);
+ return MatomoTracker;
+}();
+
+exports.default = MatomoTracker;
+;
+
+(function () {
+ var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+
+ if (!reactHotLoader) {
+ return;
+ }
+
+ reactHotLoader.register(MatomoTracker, "MatomoTracker", "/home/remi/D\xE9veloppement/ecolyo/src/utils/matomoTracker.ts");
+})();
+
+;
+
+(function () {
+ var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+ leaveModule && leaveModule(module);
+})();
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("YuTi")(module)))
+
+/***/ }),
+
/***/ "vOAL":
/***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -35637,14 +35670,12 @@ var _interopRequireDefault = __webpack_require__("TqRt");
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.history = exports.default = exports.App = void 0;
+exports.default = exports.App = void 0;
-var _react = _interopRequireDefault(__webpack_require__("q1tI"));
+var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
var _reactRouterDom = __webpack_require__("55Ip");
-var _history = __webpack_require__("LhCv");
-
var _Layout = __webpack_require__("Bh3+");
var _reactRedux = __webpack_require__("/MKj");
@@ -35666,14 +35697,17 @@ var _WelcomeModal = _interopRequireDefault(__webpack_require__("TabY"));
enterModule && enterModule(module);
})();
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
return a;
};
-var history = (0, _history.createBrowserHistory)();
-exports.history = history;
+var App = function App(_ref) {
+ var tracker = _ref.tracker;
-var App = function App() {
var _useSelector = (0, _reactRedux.useSelector)(function (state) {
return state.ecolyo.profile;
}),
@@ -35685,6 +35719,15 @@ var App = function App() {
}),
termsStatus = _useSelector2.termsStatus;
+ (0, _react.useEffect)(function () {
+ if (termsStatus.accepted) {
+ tracker.connectToHistory();
+ }
+
+ return function () {
+ tracker.disconnectFromHistory();
+ };
+ }, [termsStatus.accepted, tracker]);
return /*#__PURE__*/_react.default.createElement(_reactRouterDom.HashRouter, history, /*#__PURE__*/_react.default.createElement(_Layout.Layout, null, /*#__PURE__*/_react.default.createElement(_SplashRoot.default, {
splashComponent: _SplashScreen.default,
splashErrorComponent: _SplashScreenError.default
@@ -35700,7 +35743,7 @@ var App = function App() {
exports.App = App;
-__signature__(App, "useSelector{{ onboarding, isProfileEcogestureCompleted }}\nuseSelector{{ termsStatus }}", function () {
+__signature__(App, "useSelector{{ onboarding, isProfileEcogestureCompleted }}\nuseSelector{{ termsStatus }}\nuseEffect{}", function () {
return [_reactRedux.useSelector, _reactRedux.useSelector];
});
@@ -35716,7 +35759,6 @@ exports.default = _default2;
return;
}
- reactHotLoader.register(history, "history", "/home/remi/D\xE9veloppement/ecolyo/src/components/App.tsx");
reactHotLoader.register(App, "App", "/home/remi/D\xE9veloppement/ecolyo/src/components/App.tsx");
reactHotLoader.register(_default, "default", "/home/remi/D\xE9veloppement/ecolyo/src/components/App.tsx");
})();
diff --git a/img/icon.e4891962a18ac2a487b21f0381a5513f.svg b/img/icon.e4891962a18ac2a487b21f0381a5513f.svg
deleted file mode 100644
index 7c0e38096960afb18746a2285ee2533ede3f46ef..0000000000000000000000000000000000000000
--- a/img/icon.e4891962a18ac2a487b21f0381a5513f.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.01323 15.059C14.8544 12.3888 14.3227 8.59276 13.9682 2.93081C11.7705 2.8343 9.82099 2.15873 8.01323 1.03278C6.20546 2.15873 4.25592 2.8343 2.05825 2.93081C1.70378 8.59276 1.17209 12.3888 8.01323 15.059Z" fill="#1B1C22"/>
-<path d="M8.01325 0L7.54979 0.288665C5.85495 1.34429 4.05006 1.96586 2.01981 2.05502L1.23259 2.08959L1.18335 2.87604C1.16873 3.10958 1.15353 3.34193 1.13842 3.57294C0.97583 6.05878 0.823332 8.39029 1.50758 10.3994C2.29645 12.7158 4.12651 14.483 7.69452 15.8756L8.01325 16V15.059C1.44034 12.4935 1.67345 8.88869 2.01622 3.58822C2.03021 3.37192 2.04438 3.1528 2.05827 2.93081C4.25595 2.8343 6.20549 2.15873 8.01325 1.03277V0Z" fill="#FFC600"/>
-<path d="M8.01323 0L8.4767 0.288665C10.1715 1.34429 11.9764 1.96586 14.0067 2.05502L14.7939 2.08959L14.8431 2.87604C14.8578 3.10958 14.873 3.34193 14.8881 3.57294C15.0507 6.05878 15.2032 8.39029 14.5189 10.3994C13.73 12.7158 11.9 14.483 8.33197 15.8756L8.01323 16V15.059C14.5862 12.4935 14.353 8.88869 14.0103 3.58822C13.9963 3.37192 13.9821 3.1528 13.9682 2.93081C11.7705 2.8343 9.821 2.15873 8.01323 1.03277V0Z" fill="#DB8300"/>
-<path d="M5.85148 5.51416H6.16248C6.28668 5.51416 6.4058 5.56292 6.49363 5.64973C6.58146 5.73653 6.6308 5.85427 6.6308 5.97703V10.6758H5.38316V5.97703C5.38316 5.85427 5.4325 5.73653 5.52033 5.64973C5.60815 5.56292 5.72727 5.51416 5.85148 5.51416ZM8.01233 7.80214H8.32333C8.44754 7.80214 8.56666 7.85091 8.65448 7.93771C8.74231 8.02452 8.79165 8.14225 8.79165 8.26502V10.6758H7.54401V8.26502C7.54401 8.14225 7.59335 8.02452 7.68118 7.93771C7.76901 7.85091 7.88813 7.80214 8.01233 7.80214ZM10.302 6.91708H10.613C10.7372 6.91708 10.8563 6.96584 10.9441 7.05265C11.032 7.13945 11.0813 7.25719 11.0813 7.37995V10.6758H9.83366V7.37995C9.83366 7.25719 9.883 7.13945 9.97083 7.05265C10.0587 6.96584 10.1778 6.91708 10.302 6.91708Z" fill="#FFC600"/>
-</svg>
diff --git a/index.html b/index.html
index 67cf7cc54f42cfd9f20940d7a731d5a29d7c99ef..260ce1e93e9059436fa1e464a9269585a1a5cfc0 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">{{.ThemeCSS}} {{.CozyBar}}</head><body><div role="application" class="application" data-cozy-token="{{.Token}}" data-cozy-domain="{{.Domain}}" data-cozy-locale="{{.Locale}}" data-cozy-app-name="{{.AppName}}" data-cozy-app-slug="{{.AppSlug}}" data-cozy-app-name-prefix="{{.AppNamePrefix}}" data-cozy-app-editor="{{.AppEditor}}" data-cozy-icon-path="{{.IconPath}}"><script src="vendors/ecolyo.9ef8963918d22f22ad3a.js"></script><script src="app/ecolyo.bdd47c0923972882babd.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">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.9ec3ae3274614fc2983f.js"></script><script src="app/ecolyo.8b247a3757f82479c029.js"></script></div></body></html>
\ No newline at end of file
diff --git a/vendors/ecolyo.9ef8963918d22f22ad3a.js b/vendors/ecolyo.9ec3ae3274614fc2983f.js
similarity index 99%
rename from vendors/ecolyo.9ef8963918d22f22ad3a.js
rename to vendors/ecolyo.9ec3ae3274614fc2983f.js
index c8fbc723567159b7252712da9e4c19808ae66f0f..0f0a99f5a57ddaef1dc10dc05e1798e4d4555896 100644
--- a/vendors/ecolyo.9ef8963918d22f22ad3a.js
+++ b/vendors/ecolyo.9ec3ae3274614fc2983f.js
@@ -315393,6 +315393,104 @@ __webpack_require__.r(__webpack_exports__);
});
+/***/ }),
+
+/***/ "uVqs":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(module) {
+
+var _interopRequireDefault = __webpack_require__("TqRt");
+
+Object.defineProperty(exports, "__esModule", {
+ value: true
+});
+exports.resetCache = exports.readCozyDataFromDOM = exports.readCozyData = exports.readApplicationDataset = void 0;
+
+var _memoize = _interopRequireDefault(__webpack_require__("44Ds"));
+
+(function () {
+ var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+ enterModule && enterModule(module);
+})();
+
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+ return a;
+};
+
+var readApplicationDataset = (0, _memoize.default)(function () {
+ var root = document.querySelector('[role=application]');
+ return root && root.dataset;
+});
+exports.readApplicationDataset = readApplicationDataset;
+var readCozyData = (0, _memoize.default)(function () {
+ var dataset = readApplicationDataset();
+
+ if (dataset && dataset.cozy) {
+ return JSON.parse(dataset.cozy);
+ }
+
+ return null;
+});
+/**
+ * Reads an attribute set by the stack from the DOM
+ *
+ * A cozy app must receives on data from the stack, typically on the
+ * [role=application] node. Here, we try first to read from data-cozy
+ * and we fallback on data-[attrName].
+ */
+
+exports.readCozyData = readCozyData;
+var readCozyDataFromDOM = (0, _memoize.default)(function (attrName) {
+ var data = readCozyData();
+
+ if (data && data[attrName] !== undefined) {
+ return data[attrName] === 'true' || data[attrName] === 'false' ? JSON.parse(data[attrName]) : data[attrName];
+ }
+
+ var appDataset = readApplicationDataset();
+
+ if (!appDataset) {
+ return;
+ }
+
+ var attrName2 = "cozy".concat(attrName[0].toUpperCase()).concat(attrName.substring(1));
+ var value = appDataset[attrName2];
+ return value === undefined ? undefined : value === '' || JSON.parse(value);
+});
+exports.readCozyDataFromDOM = readCozyDataFromDOM;
+
+var resetCache = function resetCache() {
+ readCozyDataFromDOM.cache = new _memoize.default.Cache();
+ readCozyData.cache = new _memoize.default.Cache();
+ readApplicationDataset.cache = new _memoize.default.Cache();
+};
+
+exports.resetCache = resetCache;
+;
+
+(function () {
+ var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+
+ if (!reactHotLoader) {
+ return;
+ }
+
+ reactHotLoader.register(readApplicationDataset, "readApplicationDataset", "/home/remi/D\xE9veloppement/ecolyo/node_modules/cozy-ui/transpiled/react/helpers/appDataset.js");
+ reactHotLoader.register(readCozyData, "readCozyData", "/home/remi/D\xE9veloppement/ecolyo/node_modules/cozy-ui/transpiled/react/helpers/appDataset.js");
+ reactHotLoader.register(readCozyDataFromDOM, "readCozyDataFromDOM", "/home/remi/D\xE9veloppement/ecolyo/node_modules/cozy-ui/transpiled/react/helpers/appDataset.js");
+ reactHotLoader.register(resetCache, "resetCache", "/home/remi/D\xE9veloppement/ecolyo/node_modules/cozy-ui/transpiled/react/helpers/appDataset.js");
+})();
+
+;
+
+(function () {
+ var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+ leaveModule && leaveModule(module);
+})();
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("YuTi")(module)))
+
/***/ }),
/***/ "uXMh":