diff --git a/3/ecolyo.43b3278dc1f75170a74d.js b/3/ecolyo.7a5fcce4eb6eb476a6da.js similarity index 99% rename from 3/ecolyo.43b3278dc1f75170a74d.js rename to 3/ecolyo.7a5fcce4eb6eb476a6da.js index da4b70a0360e8430ce9ece80634c518a2c0f15a2..bce7b1848975d3787d295ca78b89fa6aacc2d8fa 100644 --- a/3/ecolyo.43b3278dc1f75170a74d.js +++ b/3/ecolyo.7a5fcce4eb6eb476a6da.js @@ -1063,8 +1063,7 @@ var SgeInit = function SgeInit(_ref) { var _useSelector = (0, _reactRedux.useSelector)(function (state) { return state.ecolyo.global; }), - sgeConnect = _useSelector.sgeConnect, - shouldRefreshConsent = _useSelector.shouldRefreshConsent; + sgeConnect = _useSelector.sgeConnect; var dispatch = (0, _reactRedux.useDispatch)(); @@ -1089,7 +1088,7 @@ var SgeInit = function SgeInit(_ref) { break; } - console.log('shouldLaunchhhh'); + console.log('shouldLaunchhhh variable true'); dispatch((0, _global.updateSgeStore)(_objectSpread(_objectSpread({}, sgeConnect), {}, { shouldLaunchAccount: false }))); @@ -1121,14 +1120,14 @@ var SgeInit = function SgeInit(_ref) { } launchConnect(); - }, [account, connect, dispatch, sgeConnect, update]); - (0, _react.useEffect)(function () { - if (shouldRefreshConsent) { - // If user has selected accept button on Expired consent modal, his account has been deleted on KonnectorViewerCard then automatically launch oauth connexion flow - console.log('sgeConnect store', sgeConnect); - console.log('launch new connexion with account', account); - } - }, [account, sgeConnect, shouldRefreshConsent]); + }, [account, connect, dispatch, sgeConnect, update]); // useEffect(() => { + // if (shouldRefreshConsent) { + // // If user has selected accept button on Expired consent modal, his account has been deleted on KonnectorViewerCard then automatically launch oauth connexion flow + // console.log('sgeConnect store', sgeConnect) + // console.log('launch new connexion with account', account) + // } + // }, [account, sgeConnect, shouldRefreshConsent]) + return /*#__PURE__*/_react.default.createElement("div", { className: "kloginform sge-connect" }, /*#__PURE__*/_react.default.createElement("p", { @@ -1563,10 +1562,7 @@ var ConsumptionView = function ConsumptionView(_ref) { var sgeExpirationDate = (_fluidStatus$FluidTyp2 = fluidStatus[_fluid.FluidType.ELECTRICITY].connection.account) === null || _fluidStatus$FluidTyp2 === void 0 ? void 0 : (_fluidStatus$FluidTyp3 = _fluidStatus$FluidTyp2.data) === null || _fluidStatus$FluidTyp3 === void 0 ? void 0 : _fluidStatus$FluidTyp3.expirationDate; var isoExpirationDate = sgeExpirationDate ? _luxon.DateTime.fromISO(sgeExpirationDate).setZone('utc', { keepLocalTime: true - }).startOf('day').toISO() : ''; - console.log('isoExp', isoExpirationDate); - console.log('today', today); - console.log('comp', isoExpirationDate <= today); // if (isoExpirationDate <= today) { + }).startOf('day').toISO() : ''; // if (isoExpirationDate <= today) { expiredConsents.push(fluidStatus[_fluid.FluidType.ELECTRICITY].fluidType); // } @@ -6575,9 +6571,7 @@ var ExpiredConsentModal = function ExpiredConsentModal(_ref) { }, [dispatch, fluidStatus, fluidType, history, toggleModal]); return /*#__PURE__*/_react.default.createElement(_Dialog.default, { open: open, - onClose: function onClose() { - return handleCloseClick(fluidType); - }, + onClose: toggleModal, "aria-labelledby": 'accessibility-title', classes: { root: 'modal-root', @@ -6588,9 +6582,7 @@ var ExpiredConsentModal = function ExpiredConsentModal(_ref) { }, t('consumption_visualizer.modal.window_title')), /*#__PURE__*/_react.default.createElement(_core.IconButton, { "aria-label": t('consumption_visualizer.modal.close'), className: "modal-paper-close-button", - onClick: function onClick() { - return handleCloseClick(fluidType); - } + onClick: toggleModal }, /*#__PURE__*/_react.default.createElement(_Icon.default, { icon: _close.default, size: 16 diff --git a/app/ecolyo.bbfabc185774422aa521.js b/app/ecolyo.af7375df1678904277f7.js similarity index 99% rename from app/ecolyo.bbfabc185774422aa521.js rename to app/ecolyo.af7375df1678904277f7.js index 795c3c26e993fbf412284b2b374b8ced173530b7..647c4f1ce9d3cd396116d9b1c5ac4d70a4b1bfd2 100644 --- a/app/ecolyo.bbfabc185774422aa521.js +++ b/app/ecolyo.af7375df1678904277f7.js @@ -64,7 +64,7 @@ /******/ /******/ // script path function /******/ function jsonpScriptSrc(chunkId) { -/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"6ba46749230053507f7d","3":"43b3278dc1f75170a74d","4":"5e481431cf0b2359d58d","5":"be40de25a698f7337c41","6":"cf316224f80d91ba8e19","7":"8e0088481e1baf094fa4","8":"bcd9da9f5a58c3f60050","9":"b67676e3ba222d0c6efa","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js" +/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"2":"6ba46749230053507f7d","3":"7a5fcce4eb6eb476a6da","4":"5e481431cf0b2359d58d","5":"be40de25a698f7337c41","6":"cf316224f80d91ba8e19","7":"8e0088481e1baf094fa4","8":"bcd9da9f5a58c3f60050","9":"b67676e3ba222d0c6efa","10":"1823bf23fa5cf052fd8e"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function diff --git a/index.html b/index.html index 4c34a75404a952323810f655cfe2ca033bff8088..7621535a559c9e1eeb06ee52b4733033b96ab896 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}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.c1180bc5cd66dfd3234e.js"></script><script src="app/ecolyo.bbfabc185774422aa521.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.c1180bc5cd66dfd3234e.js"></script><script src="app/ecolyo.af7375df1678904277f7.js"></script></div></body></html> \ No newline at end of file