diff --git a/1/ecolyo.82b6a612e5f1e7f7e5fa.js b/1/ecolyo.89b9978285bc6cfacf86.js
similarity index 99%
rename from 1/ecolyo.82b6a612e5f1e7f7e5fa.js
rename to 1/ecolyo.89b9978285bc6cfacf86.js
index 89c3eb1ec16664aad17a933fcc915b43ec69b43a..3b7dfbf842a70f0938d53f4dcf94d5346238b4ec 100644
--- a/1/ecolyo.82b6a612e5f1e7f7e5fa.js
+++ b/1/ecolyo.89b9978285bc6cfacf86.js
@@ -5678,7 +5678,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
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 FluidChart = function FluidChart(_ref) {
- var _currentFluidStatus$l;
+ var _currentFluidStatus$l, _currentFluidStatus$l2;
var fluidType = _ref.fluidType,
setActive = _ref.setActive;
@@ -5846,7 +5846,7 @@ var FluidChart = function FluidChart(_ref) {
className: "btnText",
onClick: moveToDate
}, t('consumption_visualizer.last_valid_data', {
- date: (currentFluidStatus === null || currentFluidStatus === void 0 ? void 0 : (_currentFluidStatus$l = currentFluidStatus.lastDataDate) === null || _currentFluidStatus$l === void 0 ? void 0 : _currentFluidStatus$l.toFormat('dd/MM/yy')) || '-'
+ date: (_currentFluidStatus$l = currentFluidStatus === null || currentFluidStatus === void 0 ? void 0 : (_currentFluidStatus$l2 = currentFluidStatus.lastDataDate) === null || _currentFluidStatus$l2 === void 0 ? void 0 : _currentFluidStatus$l2.toFormat('dd/MM/yy')) !== null && _currentFluidStatus$l !== void 0 ? _currentFluidStatus$l : '-'
})), /*#__PURE__*/_react.default.createElement("p", null, t('auth.warningOfflineData')), /*#__PURE__*/_react.default.createElement(_core.Button, {
className: "btnSecondary",
onClick: toggleModalConnection
@@ -5923,7 +5923,7 @@ var ConsumptionDetails = function ConsumptionDetails(_ref) {
currentDatachart = _useAppSelector.currentDatachart,
showCompare = _useAppSelector.showCompare;
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/_react.default.createElement("div", {
className: "consumption-details-root"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "consumption-details-content"
@@ -5931,9 +5931,9 @@ var ConsumptionDetails = function ConsumptionDetails(_ref) {
className: "consumption-details-header text-16-normal-uppercase details-title"
}, (0, _date.convertDateToShortDateString)(currentDatachart.actualData, currentTimeStep), showCompare && /*#__PURE__*/_react.default.createElement("div", {
className: "consumption-details-header compare"
- }, t('consumption.compared'), currentTimeStep === _enums.TimeStep.DAY && ' ', currentTimeStep !== _enums.TimeStep.DAY && ' AU ', (0, _date.convertDateToShortDateString)(currentDatachart.comparisonData, currentTimeStep))), /*#__PURE__*/_react.default.createElement(_TotalConsumption.default, {
+ }, t('consumption.compared'), currentTimeStep === _enums.TimeStep.DAY ? ' ' : ' AU ', (0, _date.convertDateToShortDateString)(currentDatachart.comparisonData, currentTimeStep))), /*#__PURE__*/_react.default.createElement(_TotalConsumption.default, {
fluidType: fluidType
- }))));
+ })));
};
var _default = ConsumptionDetails;
diff --git a/app/ecolyo.1bafc0df3da9d2aedf40.js b/app/ecolyo.7d8ef581405f875657d3.js
similarity index 99%
rename from app/ecolyo.1bafc0df3da9d2aedf40.js
rename to app/ecolyo.7d8ef581405f875657d3.js
index 622cb3f895b87634f711f7dae8b941c3630d1833..4cd98ca6ef2380cc40b553f5625d4c28294d7196 100644
--- a/app/ecolyo.1bafc0df3da9d2aedf40.js
+++ b/app/ecolyo.7d8ef581405f875657d3.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"82b6a612e5f1e7f7e5fa","2":"62e5292a592368584bc8","4":"547587f01552bbb539f2","5":"009425a2968e054ac6c4","6":"f76c729977c86016121a","7":"9376e18b72a7a8ccfe8c","8":"2e9e8423896e91d85c64","9":"559d36d928c393428876","10":"2946952809565809b75b"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"89b9978285bc6cfacf86","2":"62e5292a592368584bc8","4":"547587f01552bbb539f2","5":"009425a2968e054ac6c4","6":"f76c729977c86016121a","7":"9376e18b72a7a8ccfe8c","8":"2e9e8423896e91d85c64","9":"559d36d928c393428876","10":"2946952809565809b75b"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -1286,8 +1286,6 @@ var _analysis = __webpack_require__("JQjK");
var _challenge2 = __webpack_require__("F6Xr");
-var _chart = __webpack_require__("idK9");
-
var _global = __webpack_require__("b3rE");
var _hooks = __webpack_require__("Zlw4");
@@ -1532,7 +1530,7 @@ var SplashRoot = function SplashRoot(_ref) {
function _loadData() {
_loadData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
- var initializationService, customPopupService, partnersInfoService, ms, startTime, transaction, termsStatus, profile, profileType, profileEcogesture, migrationsResult, _yield$Promise$all, _yield$Promise$all2, duelHash, quizHash, challengeHash, explorationHash, analysisResult, updatedProfile, fluidStatus, refDate, lastDataDate, _iterator, _step, fluid, userChallengeList, _filteredCurrentOngoi, _filteredCurrentOngoi2, _filteredCurrentOngoi3, _filteredCurrentDuelC, filteredCurrentOngoingChallenge, actionService, updatedUserChallenge, filteredCurrentDuelChallenge, _yield$initialization, _updatedUserChallenge, dataloads, challengeService, _yield$challengeServi, isDone;
+ var initializationService, customPopupService, partnersInfoService, ms, startTime, transaction, termsStatus, profile, profileType, profileEcogesture, migrationsResult, _yield$Promise$all, _yield$Promise$all2, duelHash, quizHash, challengeHash, explorationHash, analysisResult, updatedProfile, fluidStatus, lastDataDate, _iterator, _step, fluid, userChallengeList, _filteredCurrentOngoi, _filteredCurrentOngoi2, _filteredCurrentOngoi3, _filteredCurrentDuelC, filteredCurrentOngoingChallenge, actionService, updatedUserChallenge, filteredCurrentDuelChallenge, _yield$initialization, _updatedUserChallenge, dataloads, challengeService, _yield$challengeServi, isDone;
return _regenerator.default.wrap(function _callee7$(_context7) {
while (1) {
@@ -1637,7 +1635,6 @@ var SplashRoot = function SplashRoot(_ref) {
if (subscribed) {
dispatch((0, _global.setFluidStatus)(fluidStatus));
- refDate = _luxon.DateTime.fromISO('0001-01-01');
lastDataDate = _luxon.DateTime.fromISO('0001-01-01');
_iterator = _createForOfIteratorHelper(fluidStatus);
@@ -1654,10 +1651,6 @@ var SplashRoot = function SplashRoot(_ref) {
} finally {
_iterator.f();
}
-
- if (lastDataDate > refDate) {
- dispatch((0, _chart.setSelectedDate)(lastDataDate));
- }
} // Init Challenge
@@ -13005,7 +12998,7 @@ var SplashScreen = function SplashScreen(_ref) {
/* hack to make the progress bar start way left */
};
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/_react.default.createElement("div", {
className: "splash-content"
}, /*#__PURE__*/_react.default.createElement("div", {
className: "splash-loader"
@@ -13028,7 +13021,7 @@ var SplashScreen = function SplashScreen(_ref) {
}, /*#__PURE__*/_react.default.createElement("img", {
src: _logos_partenaires.default,
alt: "ensemble de logos"
- }))));
+ })));
};
var _default = SplashScreen;
diff --git a/index.html b/index.html
index 8d07bdd61ef0ae89049e2c9cbc46be7033870b32..ce0e19dc03357fdfb61c9575675a1ddfa7ebc6e6 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,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.9ee7ecded9ec82c2cedd.js"></script><script src="app/ecolyo.1bafc0df3da9d2aedf40.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,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.9ee7ecded9ec82c2cedd.js"></script><script src="app/ecolyo.7d8ef581405f875657d3.js"></script></div></body></html>
\ No newline at end of file