diff --git a/5/ecolyo.40898faf5f353f883d8e.js b/5/ecolyo.003ebea32f8bf637d687.js similarity index 99% rename from 5/ecolyo.40898faf5f353f883d8e.js rename to 5/ecolyo.003ebea32f8bf637d687.js index 1d7ce762e4f6a2e14578dab8be78644d47e07e09..ee2a48c91e01151e3a684054959df0a5b0b98976 100644 --- a/5/ecolyo.40898faf5f353f883d8e.js +++ b/5/ecolyo.003ebea32f8bf637d687.js @@ -5278,7 +5278,7 @@ var FluidChart = function FluidChart(_ref) { setValidExploration(_enums.UserExplorationID.EXPLORATION003); } }, [containsHalfHourData, currentTimeStep, setValidExploration]); - var DisplayLegend = (0, _react.useCallback)(function () { + var compareLegend = (0, _react.useCallback)(function () { return /*#__PURE__*/_react.default.createElement("div", { className: "compareLegend" }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, { @@ -5329,17 +5329,25 @@ var FluidChart = function FluidChart(_ref) { var isKonnectorUpdatedWithinLastThreeDays = _luxon.DateTime.fromISO((currentFluidStatus === null || currentFluidStatus === void 0 ? void 0 : (_currentFluidStatus$c = currentFluidStatus.connection.konnector) === null || _currentFluidStatus$c === void 0 ? void 0 : _currentFluidStatus$c.updated_at) || '') >= _luxon.DateTime.local().minus({ days: 3 }); + + /** Display no half hour components or FluidChart otherwise */ + var chartContent = function chartContent() { + if (currentTimeStep === _enums.TimeStep.HALF_AN_HOUR && !containsHalfHourData) { + return isKonnectorUpdatedWithinLastThreeDays ? /*#__PURE__*/_react.default.createElement(_HalfHourUpcoming.default, null) : /*#__PURE__*/_react.default.createElement(_HalfHourNoDataFailure.default, null); + } + return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", { + className: "fluidchart-content" + }, /*#__PURE__*/_react.default.createElement(_FluidChartSwipe.default, { + fluidType: fluidType, + setActive: setActive + })), showCompare && currentTimeStep !== _enums.TimeStep.YEAR && /*#__PURE__*/_react.default.createElement(_core.Slide, { + direction: "right", + in: showCompare + }, compareLegend())); + }; return /*#__PURE__*/_react.default.createElement("div", { className: "fluidchart-root" - }, !isFluidConnected && LastDataValid, currentTimeStep === _enums.TimeStep.HALF_AN_HOUR && !containsHalfHourData ? isKonnectorUpdatedWithinLastThreeDays ? /*#__PURE__*/_react.default.createElement(_HalfHourUpcoming.default, null) : /*#__PURE__*/_react.default.createElement(_HalfHourNoDataFailure.default, null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", { - className: "fluidchart-content" - }, /*#__PURE__*/_react.default.createElement(_FluidChartSwipe.default, { - fluidType: fluidType, - setActive: setActive - })), showCompare && currentTimeStep !== _enums.TimeStep.YEAR && /*#__PURE__*/_react.default.createElement(_core.Slide, { - direction: "right", - in: showCompare - }, DisplayLegend())), /*#__PURE__*/_react.default.createElement(_TimeStepSelector.default, { + }, !isFluidConnected && LastDataValid, chartContent(), /*#__PURE__*/_react.default.createElement(_TimeStepSelector.default, { fluidType: fluidType }), currentTimeStep !== _enums.TimeStep.YEAR && /*#__PURE__*/_react.default.createElement("div", { className: "fluidchart-footer" diff --git a/app/ecolyo.0e9a98e5b090511a2e9d.js b/app/ecolyo.886345f2b5ccf9bc867e.js similarity index 99% rename from app/ecolyo.0e9a98e5b090511a2e9d.js rename to app/ecolyo.886345f2b5ccf9bc867e.js index 3528a187944e03a2e1067f4d0700eddcc75c086b..74f22e41ab30e4301f741f9f7790f6eef5c1011b 100644 --- a/app/ecolyo.0e9a98e5b090511a2e9d.js +++ b/app/ecolyo.886345f2b5ccf9bc867e.js @@ -64,7 +64,7 @@ /******/ /******/ // script path function /******/ function jsonpScriptSrc(chunkId) { -/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"5304880c279a328fb5fb","4":"f03be0cafa79816c7d30","5":"40898faf5f353f883d8e","6":"549e52f150fb1855a51a","7":"0aa5f5c57c463f74cbec","8":"e5c126b21505089b1bec","9":"d291da09c33bf88b3d41","10":"48e22fe54b797e13649d","11":"b5b57265a7650f49bb4f"}[chunkId] + ".js" +/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"3":"5304880c279a328fb5fb","4":"f03be0cafa79816c7d30","5":"003ebea32f8bf637d687","6":"549e52f150fb1855a51a","7":"0aa5f5c57c463f74cbec","8":"e5c126b21505089b1bec","9":"d291da09c33bf88b3d41","10":"48e22fe54b797e13649d","11":"b5b57265a7650f49bb4f"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function diff --git a/index.html b/index.html index 8307a84d4e6ce98be9a9719c6ffd415dc167ebbf..2c161e812f2c6474016ff15cc3052b83d66c89ee 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.f97b7a5aeecbd744b032.js"></script><script src="app/ecolyo.0e9a98e5b090511a2e9d.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.f97b7a5aeecbd744b032.js"></script><script src="app/ecolyo.886345f2b5ccf9bc867e.js"></script></div></body></html> \ No newline at end of file