From d2c15d61ad0b78e45e0925404eb98e7d84e32312 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Wed, 5 Jul 2023 14:58:27 +0000
Subject: [PATCH] publish: Merge branch 'mock-store' into 'dev'
generated from commit 7073df88c8a94e2a3b6f377e391f27bc7750ce17
---
...4ec7.js => ecolyo.43da79ce35b253d452e4.js} | 2 +-
...bed7.js => ecolyo.b63f14a0f6ec5af5bb8b.js} | 54 ++++++++++++-------
index.html | 2 +-
3 files changed, 37 insertions(+), 21 deletions(-)
rename 6/{ecolyo.1540774c38e7b6124ec7.js => ecolyo.43da79ce35b253d452e4.js} (100%)
rename app/{ecolyo.cbff1dac70405363bed7.js => ecolyo.b63f14a0f6ec5af5bb8b.js} (99%)
diff --git a/6/ecolyo.1540774c38e7b6124ec7.js b/6/ecolyo.43da79ce35b253d452e4.js
similarity index 100%
rename from 6/ecolyo.1540774c38e7b6124ec7.js
rename to 6/ecolyo.43da79ce35b253d452e4.js
index baef61fdf..7a7c2b113 100644
--- a/6/ecolyo.1540774c38e7b6124ec7.js
+++ b/6/ecolyo.43da79ce35b253d452e4.js
@@ -91,8 +91,8 @@ var EcogestureView = function EcogestureView() {
t = _useI18n.t;
var client = (0, _cozyClient.useClient)();
- var dispatch = (0, _reactRedux.useDispatch)();
var tab = new URLSearchParams((0, _reactRouterDom.useLocation)().search).get('tab');
+ var dispatch = (0, _reactRedux.useDispatch)();
var _useSelector = (0, _reactRedux.useSelector)(function (state) {
return state.ecolyo;
diff --git a/app/ecolyo.cbff1dac70405363bed7.js b/app/ecolyo.b63f14a0f6ec5af5bb8b.js
similarity index 99%
rename from app/ecolyo.cbff1dac70405363bed7.js
rename to app/ecolyo.b63f14a0f6ec5af5bb8b.js
index e99aa1b82..d5f153166 100644
--- a/app/ecolyo.cbff1dac70405363bed7.js
+++ b/app/ecolyo.b63f14a0f6ec5af5bb8b.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"cb69fe8a89fd2277b94f","4":"57299cb28a6df1ed84ea","5":"f608963dea1009d4de60","6":"1540774c38e7b6124ec7","7":"ecc0c43fa7f6c253f692","8":"a9363dc7eb1de5bcc528","9":"4facae32c2f3722bac49","10":"e8a00fc8bc16cb5a9dfd"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"cb69fe8a89fd2277b94f","4":"57299cb28a6df1ed84ea","5":"f608963dea1009d4de60","6":"43da79ce35b253d452e4","7":"ecc0c43fa7f6c253f692","8":"a9363dc7eb1de5bcc528","9":"4facae32c2f3722bac49","10":"e8a00fc8bc16cb5a9dfd"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -15066,6 +15066,12 @@ var TermsView = function TermsView() {
var client = (0, _cozyClient.useClient)();
var dispatch = (0, _reactRedux.useDispatch)();
+
+ var _useSelector = (0, _reactRedux.useSelector)(function (state) {
+ return state.ecolyo.global;
+ }),
+ termsStatus = _useSelector.termsStatus;
+
var navigate = (0, _reactRouterDom.useNavigate)();
var _useState = (0, _react.useState)(false),
@@ -15088,11 +15094,6 @@ var TermsView = function TermsView() {
openLegalNoticeModal = _useState8[0],
setOpenLegalNoticeModal = _useState8[1];
- var _useSelector = (0, _reactRedux.useSelector)(function (state) {
- return state.ecolyo.global;
- }),
- termsStatus = _useSelector.termsStatus;
-
var toggleCGUModal = function toggleCGUModal() {
setOpenCGUModal(function (prev) {
return !prev;
@@ -17580,25 +17581,39 @@ var initialState = {
explorationHash: '',
isFirstConnection: false,
partnersIssueSeenDate: {
- enedis: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z'),
- egl: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z'),
- grdf: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z')
+ enedis: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z', {
+ zone: 'utc'
+ }),
+ egl: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z', {
+ zone: 'utc'
+ }),
+ grdf: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z', {
+ zone: 'utc'
+ })
},
- lastConnectionDate: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z'),
- customPopupDate: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z'),
+ lastConnectionDate: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z', {
+ zone: 'utc'
+ }),
+ customPopupDate: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z', {
+ zone: 'utc'
+ }),
haveSeenLastAnalysis: true,
sendAnalysisNotification: true,
sendConsumptionAlert: false,
waterDailyConsumptionLimit: 0,
mailToken: '',
- monthlyAnalysisDate: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z'),
+ monthlyAnalysisDate: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z', {
+ zone: 'utc'
+ }),
isProfileTypeCompleted: false,
isProfileEcogestureCompleted: false,
onboarding: {
isWelcomeSeen: true
},
haveSeenEcogestureModal: false,
- activateHalfHourDate: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z')
+ activateHalfHourDate: _luxon.DateTime.fromISO('0000-01-01T00:00:00.000Z', {
+ zone: 'utc'
+ })
};
var profileReducer = function profileReducer() {
@@ -36955,16 +36970,12 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
var ChallengeCardUnlocked = function ChallengeCardUnlocked(_ref) {
var userChallenge = _ref.userChallenge;
- var client = (0, _cozyClient.useClient)();
- var dispatch = (0, _reactRedux.useDispatch)();
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
- var _useState = (0, _react.useState)(false),
- _useState2 = (0, _slicedToArray2.default)(_useState, 2),
- openNoFluidModal = _useState2[0],
- setopenNoFluidModal = _useState2[1];
+ var client = (0, _cozyClient.useClient)();
+ var dispatch = (0, _reactRedux.useDispatch)();
var _useSelector = (0, _reactRedux.useSelector)(function (state) {
return state.ecolyo.global;
@@ -36972,6 +36983,11 @@ var ChallengeCardUnlocked = function ChallengeCardUnlocked(_ref) {
fluidTypes = _useSelector.fluidTypes,
fluidStatus = _useSelector.fluidStatus;
+ var _useState = (0, _react.useState)(false),
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+ openNoFluidModal = _useState2[0],
+ setopenNoFluidModal = _useState2[1];
+
var _useState3 = (0, _react.useState)(_challengeLocked.default),
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
challengeIcon = _useState4[0],
diff --git a/index.html b/index.html
index 5b20d8b56..10bbf34b3 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.69beab954af56959f24c.js"></script><script src="app/ecolyo.cbff1dac70405363bed7.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.69beab954af56959f24c.js"></script><script src="app/ecolyo.b63f14a0f6ec5af5bb8b.js"></script></div></body></html>
\ No newline at end of file
--
GitLab