diff --git a/1/ecolyo.c44aefc530d1de68ee3f.js b/1/ecolyo.415fd625cd64389d9c8d.js
similarity index 93%
rename from 1/ecolyo.c44aefc530d1de68ee3f.js
rename to 1/ecolyo.415fd625cd64389d9c8d.js
index f6a583e4cdf3aa070ea4f6365d979fff387176db..c1d79fbcdcb06ab4d695541b8cbb2aa02d65dbba 100644
--- a/1/ecolyo.c44aefc530d1de68ee3f.js
+++ b/1/ecolyo.415fd625cd64389d9c8d.js
@@ -35,18 +35,15 @@ var GCUView = function GCUView() {
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'common.title_gcu',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_gcu',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement(_GCUContent.default, null)));
};
diff --git a/10/ecolyo.e8a00fc8bc16cb5a9dfd.js b/10/ecolyo.24e1a14cab96b50d3fbd.js
similarity index 93%
rename from 10/ecolyo.e8a00fc8bc16cb5a9dfd.js
rename to 10/ecolyo.24e1a14cab96b50d3fbd.js
index ecaf24682c92605bf21c5f7bc81ef4997c2629dd..6c98aebaddad93dc72d58c16774f305c42fd7150 100644
--- a/10/ecolyo.e8a00fc8bc16cb5a9dfd.js
+++ b/10/ecolyo.24e1a14cab96b50d3fbd.js
@@ -37,18 +37,15 @@ var LegalNoticeView = function LegalNoticeView() {
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'common.title_legal_notice',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_legal_notice',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement(_LegalNoticeContent.default, null)));
};
diff --git a/3/ecolyo.db557ffe5392027c3b46.js b/3/ecolyo.fa2723ff444c1a46bf69.js
similarity index 99%
rename from 3/ecolyo.db557ffe5392027c3b46.js
rename to 3/ecolyo.fa2723ff444c1a46bf69.js
index 3ba55e0313e7d95f0bd2bb11bd3587e2e6fcb07a..58fb67a0352de7be2570baa0ba7b406a64127c63 100644
--- a/3/ecolyo.db557ffe5392027c3b46.js
+++ b/3/ecolyo.fa2723ff444c1a46bf69.js
@@ -570,9 +570,6 @@ var AnalysisView = function AnalysisView() {
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
var dateChartService = new _dateChart.default(); // Handle email report comeback
var _useLocation = (0, _reactRouterDom.useLocation)(),
@@ -639,7 +636,7 @@ var AnalysisView = function AnalysisView() {
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'common.title_analysis'
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_analysis'
}, /*#__PURE__*/_react.default.createElement(_DateNavigator.default, {
disableNext: (0, _date.isLastDateReached)(analysisMonth, _timeStep.TimeStep.MONTH),
@@ -656,7 +653,7 @@ var AnalysisView = function AnalysisView() {
}),
timeStep: _timeStep.TimeStep.MONTH
})), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement(_MonthlyAnalysis.default, {
saveLastScrollPosition: saveLastScrollPosition,
scrollPosition: scrollPosition
diff --git a/4/ecolyo.1a07b3c4fd8b5b253098.js b/4/ecolyo.c76888d97f431150c7d1.js
similarity index 99%
rename from 4/ecolyo.1a07b3c4fd8b5b253098.js
rename to 4/ecolyo.c76888d97f431150c7d1.js
index 7e34d1d746dc1b0820514999432dfca75175bfd0..f3c941a9046f340f21c66279fe56237ff9931fac 100644
--- a/4/ecolyo.1a07b3c4fd8b5b253098.js
+++ b/4/ecolyo.c76888d97f431150c7d1.js
@@ -720,9 +720,10 @@ var ProfileTypeOptions = function ProfileTypeOptions() {
});
};
- var goToForm = (0, _react.useCallback)(function () {
+ var goToForm = function goToForm() {
navigate('/profileType');
- }, [navigate]);
+ };
+
return /*#__PURE__*/_react.default.createElement("div", {
className: "profile-type-root"
}, /*#__PURE__*/_react.default.createElement("div", {
@@ -2076,17 +2077,13 @@ var OptionsView = function OptionsView() {
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = function defineHeaderHeight(height) {
- setHeaderHeight(height);
- };
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'common.title_options'
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_options'
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement(_ProfileTypeOptions.default, null), /*#__PURE__*/_react.default.createElement(_ExportData.default, null), /*#__PURE__*/_react.default.createElement(_ReportOptions.default, null), /*#__PURE__*/_react.default.createElement(_HelpLink.default, null), /*#__PURE__*/_react.default.createElement(_LegalNoticeLink.default, null), /*#__PURE__*/_react.default.createElement(_GCULink.default, null), /*#__PURE__*/_react.default.createElement(_Accessibility.default, null), /*#__PURE__*/_react.default.createElement(_MatomoOptOut.default, null), /*#__PURE__*/_react.default.createElement("div", {
className: "parameters-logos"
}, /*#__PURE__*/_react.default.createElement("img", {
diff --git a/5/ecolyo.accdf661e43d4d2b0ae6.js b/5/ecolyo.ccdaaf8fd4a55cd8ddf1.js
similarity index 99%
rename from 5/ecolyo.accdf661e43d4d2b0ae6.js
rename to 5/ecolyo.ccdaaf8fd4a55cd8ddf1.js
index 1d6747944d68fbb300cc60ff29680cc44329e6de..54a9cbb6caf2790c6b03dc0bf38bcae48e77eb65 100644
--- a/5/ecolyo.accdf661e43d4d2b0ae6.js
+++ b/5/ecolyo.ccdaaf8fd4a55cd8ddf1.js
@@ -1156,9 +1156,6 @@ var ConsumptionView = function ConsumptionView(_ref) {
var updateKey = fluidType !== _fluid.FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate ? "".concat(fluidStatus[fluidType].lastDataDate.toLocaleString(), " + ").concat(fluidStatus[fluidType].status + fluidType) : '';
var lastDataDateKey = fluidType !== _fluid.FluidType.MULTIFLUID && fluidStatus[fluidType].lastDataDate ? "".concat(fluidStatus[fluidType].lastDataDate.toLocaleString() + fluidType) : '';
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
var handleCloseReleaseNoteModal = (0, _react.useCallback)(function () {
setOpenReleaseNoteModal(false);
dispatch((0, _global.showReleaseNotes)({
@@ -1331,7 +1328,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'common.title_consumption'
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_consumption'
}, /*#__PURE__*/_react.default.createElement(_DateNavigator.default, {
disableNext: (0, _date.isLastDateReached)(selectedDate, currentTimeStep),
@@ -1345,7 +1342,7 @@ var ConsumptionView = function ConsumptionView(_ref) {
navigatorDate: selectedDate,
timeStep: currentTimeStep
})), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement(_FluidButtons.default, {
activeFluid: fluidType,
key: updateKey
@@ -3329,9 +3326,6 @@ var FormOAuth = function FormOAuth(_ref) {
endOAuth();
onSuccess(accountId);
}, [endOAuth, onSuccess]);
- var handleOAuthCancel = (0, _react.useCallback)(function () {
- endOAuth();
- }, [endOAuth]);
var isWaiting = status === WAITING;
(0, _react.useEffect)(function () {
if (shouldRefreshConsent) {
@@ -3357,7 +3351,7 @@ var FormOAuth = function FormOAuth(_ref) {
konnector: konnector,
redirectSlug: client.appMetadata.slug,
onSuccess: handleAccountId,
- onCancel: handleOAuthCancel,
+ onCancel: endOAuth,
t: t
}));
};
@@ -4168,7 +4162,7 @@ var _Icon = _interopRequireDefault(__webpack_require__("y6ex"));
var _fluid = __webpack_require__("5Wkc");
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _reactRouterDom = __webpack_require__("SOjZ");
@@ -4180,10 +4174,6 @@ var _utils = __webpack_require__("c+yx");
__webpack_require__("kpuL");
-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 KonnectorViewerList = function KonnectorViewerList() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
@@ -4194,9 +4184,11 @@ var KonnectorViewerList = function KonnectorViewerList() {
fluidStatus = _useAppSelector.fluidStatus;
var navigate = (0, _reactRouterDom.useNavigate)();
- var goToFluid = (0, _react.useCallback)(function (fluidType) {
+
+ var goToFluid = function goToFluid(fluidType) {
navigate("/consumption/".concat((0, _utils.getFluidName)(fluidType)));
- }, [navigate]);
+ };
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, fluidStatus.map(function (fluidStatusItem, key) {
return /*#__PURE__*/_react.default.createElement(_StyledCard.default, {
key: key,
@@ -4293,34 +4285,32 @@ var GrdfConnectModal = function GrdfConnectModal(_ref) {
showForm ? setCurrentStep(StepEnum.GiveConsent) : setCurrentStep(StepEnum.DoYouHaveAccount);
}
}, [showForm, open]);
- var goToCreateAccountStep = (0, _react.useCallback)(function () {
- setCurrentStep(StepEnum.CreateAccount);
- }, []);
- var goToGiveConsentStep = (0, _react.useCallback)(function () {
- setCurrentStep(StepEnum.GiveConsent);
- }, []);
- var goToDoYouHaveAccountStep = (0, _react.useCallback)(function () {
- setCurrentStep(StepEnum.DoYouHaveAccount);
- }, []);
- var handleGoToPartnerSite = (0, _react.useCallback)(function () {
+
+ var handleGoToPartnerSite = function handleGoToPartnerSite() {
goToPartnerSite();
setShowForm(true);
handleCloseClick();
- }, [goToPartnerSite, handleCloseClick, setShowForm]);
- var handleGiveConsentPrevious = (0, _react.useCallback)(function () {
- return showForm ? handleCloseClick() : setCurrentStep(StepEnum.DoYouHaveAccount);
- }, [handleCloseClick, showForm]);
+ };
+
+ var handleGiveConsentPrevious = function handleGiveConsentPrevious() {
+ showForm ? handleCloseClick() : setCurrentStep(StepEnum.DoYouHaveAccount);
+ };
+
var steps = (_steps = {}, (0, _defineProperty2.default)(_steps, StepEnum.DoYouHaveAccount, {
content: /*#__PURE__*/_react.default.createElement(_GrdfDoYouHaveAccount.default, null),
leftButton: /*#__PURE__*/_react.default.createElement(_core.Button, {
- onClick: goToCreateAccountStep,
+ onClick: function onClick() {
+ return setCurrentStep(StepEnum.CreateAccount);
+ },
classes: {
root: 'btn-profile-back',
label: 'text-16-bold'
}
}, t('auth.button_create_account')),
rightButton: /*#__PURE__*/_react.default.createElement(_core.Button, {
- onClick: goToGiveConsentStep,
+ onClick: function onClick() {
+ return setCurrentStep(StepEnum.GiveConsent);
+ },
classes: {
root: 'btn-profile-next',
label: 'text-16-bold'
@@ -4329,7 +4319,9 @@ var GrdfConnectModal = function GrdfConnectModal(_ref) {
}), (0, _defineProperty2.default)(_steps, StepEnum.CreateAccount, {
content: /*#__PURE__*/_react.default.createElement(_GrdfCreateAccount.default, null),
leftButton: /*#__PURE__*/_react.default.createElement(_core.Button, {
- onClick: goToDoYouHaveAccountStep,
+ onClick: function onClick() {
+ return setCurrentStep(StepEnum.DoYouHaveAccount);
+ },
classes: {
root: 'btn-profile-back',
label: 'text-16-bold'
@@ -4825,26 +4817,25 @@ var EpglConnectModal = function EpglConnectModal(_ref) {
setCurrentStep(0);
}
}, [open]);
- var goToCreateAccountStep = (0, _react.useCallback)(function () {
- setCurrentStep(StepEnum.CreateAccount);
- }, []);
- var goToDoYouHaveAccountStep = (0, _react.useCallback)(function () {
- setCurrentStep(StepEnum.DoYouHaveAccount);
- }, []);
- var handleGoToPartnerSite = (0, _react.useCallback)(function () {
+
+ var handleGoToPartnerSite = function handleGoToPartnerSite() {
goToPartnerSite();
setHasCreatedAccount(true);
setShowForm(true);
handleCloseClick();
- }, [goToPartnerSite, handleCloseClick, setHasCreatedAccount, setShowForm]);
- var handleShowForm = (0, _react.useCallback)(function () {
+ };
+
+ var handleShowForm = function handleShowForm() {
setShowForm(true);
handleCloseClick();
- }, [handleCloseClick, setShowForm]);
+ };
+
var steps = (_steps = {}, (0, _defineProperty2.default)(_steps, StepEnum.DoYouHaveAccount, {
content: /*#__PURE__*/_react.default.createElement(_EpglDoYouHaveAccount.default, null),
leftButton: /*#__PURE__*/_react.default.createElement(_core.Button, {
- onClick: goToCreateAccountStep,
+ onClick: function onClick() {
+ return setCurrentStep(StepEnum.CreateAccount);
+ },
classes: {
root: 'btn-profile-back',
label: 'text-16-bold'
@@ -4860,7 +4851,9 @@ var EpglConnectModal = function EpglConnectModal(_ref) {
}), (0, _defineProperty2.default)(_steps, StepEnum.CreateAccount, {
content: /*#__PURE__*/_react.default.createElement(_EpglCreateAccount.default, null),
leftButton: /*#__PURE__*/_react.default.createElement(_core.Button, {
- onClick: goToDoYouHaveAccountStep,
+ onClick: function onClick() {
+ return setCurrentStep(StepEnum.DoYouHaveAccount);
+ },
classes: {
root: 'btn-profile-back',
label: 'text-16-bold'
diff --git a/6/ecolyo.6f3cf7daece8b334ee97.js b/6/ecolyo.ad72db6c65430f444071.js
similarity index 99%
rename from 6/ecolyo.6f3cf7daece8b334ee97.js
rename to 6/ecolyo.ad72db6c65430f444071.js
index b5f26fbec1a8da3f8497dbb3807c2f619a9ba616..59c9e8cead3f2fbd65807e39381e4ec5f4122d96 100644
--- a/6/ecolyo.6f3cf7daece8b334ee97.js
+++ b/6/ecolyo.ad72db6c65430f444071.js
@@ -76,15 +76,6 @@ var TabPanel = function TabPanel(_ref) {
};
var EcogestureView = function EcogestureView() {
- var _useState = (0, _react.useState)(0),
- _useState2 = (0, _slicedToArray2.default)(_useState, 2),
- headerHeight = _useState2[0],
- setHeaderHeight = _useState2[1];
-
- var defineHeaderHeight = function defineHeaderHeight(height) {
- setHeaderHeight(height);
- };
-
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
@@ -99,6 +90,11 @@ var EcogestureView = function EcogestureView() {
profileEcogesture = _useAppSelector.profileEcogesture,
profileType = _useAppSelector.profileType;
+ var _useState = (0, _react.useState)(0),
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+ headerHeight = _useState2[0],
+ setHeaderHeight = _useState2[1];
+
var _useState3 = (0, _react.useState)(tab ? parseInt(tab) : _ecogesture.EcogestureTab.OBJECTIVE),
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
tabValue = _useState4[0],
@@ -303,7 +299,7 @@ var EcogestureView = function EcogestureView() {
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'common.title_ecogestures'
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_ecogestures'
}, /*#__PURE__*/_react.default.createElement(_core.Tabs, {
value: tabValue,
@@ -333,7 +329,7 @@ var EcogestureView = function EcogestureView() {
"aria-controls": "simple-tabpanel-".concat(_ecogesture.EcogestureTab.ALL),
tabIndex: 0
}))), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, isLoading && /*#__PURE__*/_react.default.createElement("div", {
className: "loaderContainer"
}, /*#__PURE__*/_react.default.createElement(_Loader.default, {
diff --git a/9/ecolyo.e29dc5737eae7c9009d3.js b/9/ecolyo.d41ce4d7fb2ce55b5111.js
similarity index 98%
rename from 9/ecolyo.e29dc5737eae7c9009d3.js
rename to 9/ecolyo.d41ce4d7fb2ce55b5111.js
index 30bcbd54202f7a1718d21e214036d66937299f32..32004eb618dd309c96dc96e5eb8833aae1285992 100644
--- a/9/ecolyo.e29dc5737eae7c9009d3.js
+++ b/9/ecolyo.d41ce4d7fb2ce55b5111.js
@@ -134,10 +134,6 @@ var SingleEcogesture = function SingleEcogesture() {
headerHeight = _useState14[0],
setHeaderHeight = _useState14[1];
- var defineHeaderHeight = function defineHeaderHeight(height) {
- setHeaderHeight(height);
- };
-
var _useExploration = (0, _useExploration3.default)(),
_useExploration2 = (0, _slicedToArray2.default)(_useExploration, 2),
setValidExploration = _useExploration2[1];
@@ -288,11 +284,11 @@ var SingleEcogesture = function SingleEcogesture() {
titleKey: 'common.title_ecogesture',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_ecogesture',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, isLoading && /*#__PURE__*/_react.default.createElement("div", {
className: "loaderContainer"
}, /*#__PURE__*/_react.default.createElement(_Loader.default, null)), !isLoading && /*#__PURE__*/_react.default.createElement("div", {
@@ -521,30 +517,24 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
var ErrorPage = function ErrorPage(_ref) {
var text = _ref.text,
returnPage = _ref.returnPage;
- var navigate = (0, _reactRouterDom.useNavigate)();
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
+ var navigate = (0, _reactRouterDom.useNavigate)();
+
var _useState = (0, _react.useState)(0),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = function defineHeaderHeight(height) {
- setHeaderHeight(height);
- };
-
- var handleClick = (0, _react.useCallback)(function () {
- navigate("/".concat(returnPage));
- }, [navigate, returnPage]);
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'error_page.main'
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'error_page.main'
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement("div", {
className: "error-container"
}, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
@@ -555,7 +545,9 @@ var ErrorPage = function ErrorPage(_ref) {
className: "text-18-bold head"
}, text), /*#__PURE__*/_react.default.createElement(_core.Button, {
"aria-label": t('error_page.back'),
- onClick: handleClick,
+ onClick: function onClick() {
+ return navigate("/".concat(returnPage));
+ },
variant: 'contained',
classes: {
root: 'btn-highlight',
diff --git a/app/ecolyo.36824ca035f57d1dd7c9.js b/app/ecolyo.c233854fc59a5d2e094e.js
similarity index 99%
rename from app/ecolyo.36824ca035f57d1dd7c9.js
rename to app/ecolyo.c233854fc59a5d2e094e.js
index a78f1a3f0d7784681491c603e996eb80c5f40478..ecf41b70fa2db63a77693c7ef63b4dcd99da4f23 100644
--- a/app/ecolyo.36824ca035f57d1dd7c9.js
+++ b/app/ecolyo.c233854fc59a5d2e094e.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"c44aefc530d1de68ee3f","3":"db557ffe5392027c3b46","4":"1a07b3c4fd8b5b253098","5":"accdf661e43d4d2b0ae6","6":"6f3cf7daece8b334ee97","7":"1abe158dc55e2f003411","8":"a9363dc7eb1de5bcc528","9":"e29dc5737eae7c9009d3","10":"e8a00fc8bc16cb5a9dfd"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"415fd625cd64389d9c8d","3":"fa2723ff444c1a46bf69","4":"c76888d97f431150c7d1","5":"ccdaaf8fd4a55cd8ddf1","6":"ad72db6c65430f444071","7":"1abe158dc55e2f003411","8":"a9363dc7eb1de5bcc528","9":"d41ce4d7fb2ce55b5111","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -3188,10 +3188,6 @@ var ChallengeView = function ChallengeView() {
containerTranslation = _useState12[0],
setContainerTranslation = _useState12[1];
- var defineHeaderHeight = function defineHeaderHeight(height) {
- setHeaderHeight(height);
- };
-
var resetValues = function resetValues() {
// Method used to cancel a swipe on a simple click
setTouchEnd(0);
@@ -3266,10 +3262,10 @@ var ChallengeView = function ChallengeView() {
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'common.title_challenge'
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_challenge'
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement("div", {
className: "challengeSlider",
onClick: resetValues,
@@ -3770,10 +3766,6 @@ var ActionView = function ActionView() {
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
-
var renderAction = function renderAction(challenge) {
switch (challenge.action.state) {
case _userAction.UserActionState.UNSTARTED:
@@ -3802,11 +3794,11 @@ var ActionView = function ActionView() {
titleKey: 'common.title_action',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_action',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, currentChallenge && renderAction(currentChallenge)));
};
@@ -4556,9 +4548,6 @@ var SgeConnectView = function SgeConnectView() {
headerHeight = _useState8[0],
setHeaderHeight = _useState8[1];
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
var isNextValid = (0, _react.useCallback)(function () {
switch (currentStep) {
case _sgeStep.SgeStep.IdentityAndPDL:
@@ -4639,11 +4628,11 @@ var SgeConnectView = function SgeConnectView() {
titleKey: 'common.title_sge_connect',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_sge_connect',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement("div", {
className: "sge-view"
}, /*#__PURE__*/_react.default.createElement("div", {
@@ -4900,9 +4889,6 @@ var ActionBegin = function ActionBegin(_ref) {
return !prev;
});
}, []);
- var goToList = (0, _react.useCallback)(function () {
- setShowList(true);
- }, [setShowList]);
(0, _react.useEffect)(function () {
var subscribed = true;
@@ -5043,7 +5029,9 @@ var ActionBegin = function ActionBegin(_ref) {
label: 'text-16-normal'
}
}, t('action.apply')), /*#__PURE__*/_react.default.createElement(_core.Button, {
- onClick: goToList,
+ onClick: function onClick() {
+ return setShowList(true);
+ },
classes: {
root: 'btn-secondary-negative',
label: 'text-16-normal'
@@ -5724,20 +5712,6 @@ var DuelOngoing = function DuelOngoing(_ref) {
}
}, _callee);
})), [client, userChallenge, winChallenge, dispatch, userChallengeList, navigate]);
- var setLastResult = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
- return _regenerator.default.wrap(function _callee2$(_context2) {
- while (1) {
- switch (_context2.prev = _context2.next) {
- case 0:
- navigate('/challenges');
-
- case 1:
- case "end":
- return _context2.stop();
- }
- }
- }, _callee2);
- })), [navigate]);
(0, _react.useEffect)(function () {
var subscribed = true;
@@ -5746,18 +5720,18 @@ var DuelOngoing = function DuelOngoing(_ref) {
}
function _setChallengeResult() {
- _setChallengeResult = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+ _setChallengeResult = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
var _yield$challengeServi, isDone, isWin;
- return _regenerator.default.wrap(function _callee3$(_context3) {
+ return _regenerator.default.wrap(function _callee2$(_context2) {
while (1) {
- switch (_context3.prev = _context3.next) {
+ switch (_context2.prev = _context2.next) {
case 0:
- _context3.next = 2;
+ _context2.next = 2;
return challengeService.isChallengeDone(userChallenge, currentDataload);
case 2:
- _yield$challengeServi = _context3.sent;
+ _yield$challengeServi = _context2.sent;
isDone = _yield$challengeServi.isDone;
isWin = _yield$challengeServi.isWin;
@@ -5768,10 +5742,10 @@ var DuelOngoing = function DuelOngoing(_ref) {
case 6:
case "end":
- return _context3.stop();
+ return _context2.stop();
}
}
- }, _callee3);
+ }, _callee2);
}));
return _setChallengeResult.apply(this, arguments);
}
@@ -5789,22 +5763,22 @@ var DuelOngoing = function DuelOngoing(_ref) {
}
function _populateData() {
- _populateData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+ _populateData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
var dataloads;
- return _regenerator.default.wrap(function _callee4$(_context4) {
+ return _regenerator.default.wrap(function _callee3$(_context3) {
while (1) {
- switch (_context4.prev = _context4.next) {
+ switch (_context3.prev = _context3.next) {
case 0:
if (!isFinished) {
- _context4.next = 5;
+ _context3.next = 5;
break;
}
- _context4.next = 3;
+ _context3.next = 3;
return challengeService.getUserChallengeDataload(userChallenge);
case 3:
- dataloads = _context4.sent;
+ dataloads = _context3.sent;
if (subscribed) {
setFinishedDataLoad(dataloads);
@@ -5812,10 +5786,10 @@ var DuelOngoing = function DuelOngoing(_ref) {
case 5:
case "end":
- return _context4.stop();
+ return _context3.stop();
}
}
- }, _callee4);
+ }, _callee3);
}));
return _populateData.apply(this, arguments);
}
@@ -5886,7 +5860,9 @@ var DuelOngoing = function DuelOngoing(_ref) {
handleCloseClick: setResult
}), /*#__PURE__*/_react.default.createElement(_lastDuelModal.default, {
open: isLastDuel,
- handleCloseClick: setLastResult
+ handleCloseClick: function handleCloseClick() {
+ return navigate('/challenges');
+ }
}));
};
@@ -8415,6 +8391,8 @@ 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 DuelView = function DuelView() {
+ var navigate = (0, _reactRouterDom.useNavigate)();
+
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
return state.ecolyo.challenge;
}),
@@ -8429,10 +8407,6 @@ var DuelView = function DuelView() {
var challengeToDisplay = userChallengeList.find(function (challenge) {
return challenge.id === id;
});
- var navigate = (0, _reactRouterDom.useNavigate)();
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
var goBackToChallenge = function goBackToChallenge() {
navigate('/challenges');
@@ -8471,11 +8445,11 @@ var DuelView = function DuelView() {
titleKey: 'common.title_duel',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_duel',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement("div", null, challengeToDisplay && (challengeToDisplay.state === _userChallenge.UserChallengeState.DUEL || challengeToDisplay.state === _userChallenge.UserChallengeState.DONE) ? renderDuel(challengeToDisplay) : /*#__PURE__*/_react.default.createElement(_DuelError.default, null))));
};
@@ -12952,24 +12926,17 @@ var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
var _I18n = __webpack_require__("buk/");
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _reactRouterDom = __webpack_require__("SOjZ");
__webpack_require__("IzCH");
-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 EcogestureSelectionEnd = function EcogestureSelectionEnd() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
var navigate = (0, _reactRouterDom.useNavigate)();
- var goToObjectives = (0, _react.useCallback)(function () {
- navigate('/ecogestures?tab=0');
- }, [navigate]);
return /*#__PURE__*/_react.default.createElement("div", {
className: "eg-selection-end-container"
}, /*#__PURE__*/_react.default.createElement("div", {
@@ -12991,7 +12958,9 @@ var EcogestureSelectionEnd = function EcogestureSelectionEnd() {
root: 'btn-highlight',
label: 'text-16-bold'
},
- onClick: goToObjectives
+ onClick: function onClick() {
+ return navigate('/ecogestures?tab=0');
+ }
}, t('ecogesture_selection.button_ok'))));
};
@@ -14728,10 +14697,6 @@ var UnSubscribe = function UnSubscribe() {
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = function defineHeaderHeight(height) {
- setHeaderHeight(height);
- };
-
var unSubscribe = /*#__PURE__*/function () {
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
return _regenerator.default.wrap(function _callee$(_context) {
@@ -14759,10 +14724,10 @@ var UnSubscribe = function UnSubscribe() {
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'common.title_analysis'
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_analysis'
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement("div", {
className: "unsubscribe-container"
}, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
@@ -15835,9 +15800,6 @@ var EcogestureSelection = function EcogestureSelection() {
openEcogestureSelectionModal = _useState14[0],
setOpenEcogestureSelectionModal = _useState14[1];
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
var ecogestureService = (0, _react.useMemo)(function () {
return new _ecogesture.default(client);
}, [client]);
@@ -15987,13 +15949,13 @@ var EcogestureSelection = function EcogestureSelection() {
return navigate('/ecogestures');
}
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_ecogestures_choice',
displayBackArrow: true
}, /*#__PURE__*/_react.default.createElement("div", {
className: "eg-selection-header"
}, indexEcogesture <= ecogestureList.length - 1 ? "".concat(totalViewed + indexEcogesture + 1, "/").concat(totalAvailable) : '')), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, isLoading && /*#__PURE__*/_react.default.createElement("div", {
className: "loaderContainer"
}, /*#__PURE__*/_react.default.createElement(_Loader.default, null)), !isLoading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderEcogestureSelection(), openEcogestureSelectionModal && /*#__PURE__*/_react.default.createElement(_EcogestureSelectionModal.default, {
@@ -17206,24 +17168,17 @@ var _Button = _interopRequireDefault(__webpack_require__("FtsS"));
var _I18n = __webpack_require__("buk/");
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _reactRouterDom = __webpack_require__("SOjZ");
__webpack_require__("k45u");
-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 ExplorationError = function ExplorationError() {
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
var navigate = (0, _reactRouterDom.useNavigate)();
- var goBack = (0, _react.useCallback)(function () {
- navigate(-1);
- }, [navigate]);
return /*#__PURE__*/_react.default.createElement("div", {
className: "exploration-error-container"
}, /*#__PURE__*/_react.default.createElement("div", {
@@ -17232,7 +17187,9 @@ var ExplorationError = function ExplorationError() {
className: "exploration-error-button"
}, /*#__PURE__*/_react.default.createElement(_Button.default, {
"aria-label": t('exploration.accessibility.button_go_back'),
- onClick: goBack,
+ onClick: function onClick() {
+ return navigate(-1);
+ },
classes: {
root: 'btn-secondary-negative',
label: 'text-16-normal'
@@ -20298,10 +20255,6 @@ var QuizView = function QuizView() {
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
-
var renderQuiz = function renderQuiz(challenge) {
switch (challenge.quiz.state) {
case _userQuiz.UserQuizState.UNLOCKED:
@@ -20330,11 +20283,11 @@ var QuizView = function QuizView() {
titleKey: 'common.title_quiz',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_quiz',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, currentChallenge && renderQuiz(currentChallenge)));
};
@@ -20429,10 +20382,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
var Content = function Content(_ref) {
var children = _ref.children,
- _ref$height = _ref.height,
- height = _ref$height === void 0 ? 0 : _ref$height,
- _ref$background = _ref.background,
- background = _ref$background === void 0 ? 'inherit' : _ref$background;
+ _ref$heightOffset = _ref.heightOffset,
+ heightOffset = _ref$heightOffset === void 0 ? 0 : _ref$heightOffset;
var dispatch = (0, _hooks.useAppDispatch)();
var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
@@ -20466,10 +20417,9 @@ var Content = function Content(_ref) {
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FeedbackModal.default, null), /*#__PURE__*/_react.default.createElement("div", {
className: 'content-view',
style: {
- marginTop: height,
+ marginTop: heightOffset,
paddingBottom: 0,
- minHeight: screenType !== _screen.ScreenType.DESKTOP ? "calc(100vh - ".concat(height, "px - ").concat(cozyBarHeight, "px - ").concat(cozyNavHeight, "px - env(safe-area-inset-top) - env(safe-area-inset-bottom) - env(safe-area-inset-bottom))") : "unset",
- background: background
+ minHeight: screenType !== _screen.ScreenType.DESKTOP ? "calc(100vh - ".concat(heightOffset, "px - ").concat(cozyBarHeight, "px - ").concat(cozyNavHeight, "px - env(safe-area-inset-top) - env(safe-area-inset-bottom) - env(safe-area-inset-bottom))") : "unset"
}
}, children));
};
@@ -21752,10 +21702,6 @@ var ExplorationView = function ExplorationView() {
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []);
-
var renderExploration = function renderExploration(challenge) {
switch (challenge.exploration.state) {
case _userExploration.UserExplorationState.UNLOCKED:
@@ -21779,11 +21725,11 @@ var ExplorationView = function ExplorationView() {
titleKey: 'common.title_exploration',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_exploration',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, currentChallenge && renderExploration(currentChallenge)));
};
@@ -25167,10 +25113,6 @@ var EcogestureFormView = function EcogestureFormView() {
headerHeight = _useState2[0],
setHeaderHeight = _useState2[1];
- var defineHeaderHeight = function defineHeaderHeight(height) {
- setHeaderHeight(height);
- };
-
var shouldOpenModal = new URLSearchParams((0, _reactRouterDom.useLocation)().search).get('modal');
var _useState3 = (0, _react.useState)(_ecogestureForm.EcogestureStepForm.HEATING_TYPE),
@@ -25252,10 +25194,10 @@ var EcogestureFormView = function EcogestureFormView() {
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, {
titleKey: 'common.title_ecogestures'
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_ecogestures'
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, isLoading && /*#__PURE__*/_react.default.createElement("div", {
className: "loaderContainer"
}, /*#__PURE__*/_react.default.createElement(_Loader.default, null)), isProfileTypeCompleted ? /*#__PURE__*/_react.default.createElement(_ProfileTypeView.default, null) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, step === _ecogestureForm.EcogestureStepForm.EQUIPMENTS && /*#__PURE__*/_react.default.createElement(_EcogestureFormEquipment.default, {
@@ -30725,16 +30667,12 @@ var _StyledIcon = _interopRequireDefault(__webpack_require__("I07j"));
var _I18n = __webpack_require__("buk/");
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _reactRouterDom = __webpack_require__("SOjZ");
__webpack_require__("jR4R");
-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 EcogestureSelectionRestart = function EcogestureSelectionRestart(_ref) {
var listLength = _ref.listLength,
restart = _ref.restart;
@@ -30743,9 +30681,6 @@ var EcogestureSelectionRestart = function EcogestureSelectionRestart(_ref) {
t = _useI18n.t;
var navigate = (0, _reactRouterDom.useNavigate)();
- var goToObjectives = (0, _react.useCallback)(function () {
- navigate('/ecogestures?tab=0');
- }, [navigate]);
return /*#__PURE__*/_react.default.createElement("div", {
className: "eg-selection-restart-container"
}, /*#__PURE__*/_react.default.createElement("div", {
@@ -30768,7 +30703,9 @@ var EcogestureSelectionRestart = function EcogestureSelectionRestart(_ref) {
root: 'btn-secondary-negative',
label: 'text-16-normal'
},
- onClick: goToObjectives
+ onClick: function onClick() {
+ return navigate('/ecogestures?tab=0');
+ }
}, t('ecogesture_selection.button_go_to_ecogesture')), /*#__PURE__*/_react.default.createElement(_core.Button, {
"aria-label": t('ecogesture_selection.accessibility.button_continue'),
classes: {
@@ -32183,11 +32120,8 @@ var ProfileTypeView = function ProfileTypeView() {
var _useState11 = (0, _react.useState)(-1),
_useState12 = (0, _slicedToArray2.default)(_useState11, 2),
viewedStep = _useState12[0],
- setViewedStep = _useState12[1];
+ setViewedStep = _useState12[1]; // if ecogesture profile is completed, update default profileType
- var defineHeaderHeight = (0, _react.useCallback)(function (height) {
- setHeaderHeight(height);
- }, []); // if ecogesture profile is completed, update default profileType
(0, _react.useEffect)(function () {
if (profile.isProfileEcogestureCompleted) {
@@ -32310,11 +32244,11 @@ var ProfileTypeView = function ProfileTypeView() {
titleKey: 'common.title_profiletype',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Header.default, {
- setHeaderHeight: defineHeaderHeight,
+ setHeaderHeight: setHeaderHeight,
desktopTitleKey: 'common.title_profiletype',
displayBackArrow: true
}), /*#__PURE__*/_react.default.createElement(_Content.default, {
- height: headerHeight
+ heightOffset: headerHeight
}, /*#__PURE__*/_react.default.createElement("div", {
className: 'profile-type-container'
}, isLoading && /*#__PURE__*/_react.default.createElement(_Loader.default, null), !isLoading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, step !== _profileType2.ProfileTypeStepForm.END && selectForm(), step === _profileType2.ProfileTypeStepForm.END && /*#__PURE__*/_react.default.createElement(_ProfileTypeFinished.default, {
@@ -33549,7 +33483,7 @@ var _userChallenge = __webpack_require__("dQx6");
var _userExploration = __webpack_require__("/rev");
-var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
+var _react = _interopRequireDefault(__webpack_require__("q1tI"));
var _reactRouterDom = __webpack_require__("SOjZ");
@@ -33563,10 +33497,6 @@ var _hooks = __webpack_require__("Zlw4");
__webpack_require__("1RIw");
-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 ExplorationOngoing = function ExplorationOngoing(_ref) {
var userChallenge = _ref.userChallenge;
@@ -33576,9 +33506,6 @@ var ExplorationOngoing = function ExplorationOngoing(_ref) {
var client = (0, _cozyClient.useClient)();
var dispatch = (0, _hooks.useAppDispatch)();
var navigate = (0, _reactRouterDom.useNavigate)();
- var goBack = (0, _react.useCallback)(function () {
- navigate(-1);
- }, [navigate]);
var startExploration = /*#__PURE__*/function () {
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
@@ -33668,7 +33595,9 @@ var ExplorationOngoing = function ExplorationOngoing(_ref) {
}
}, t('exploration.button_already_done')), /*#__PURE__*/_react.default.createElement(_Button.default, {
"aria-label": t('exploration.accessibility.button_already_done'),
- onClick: goBack,
+ onClick: function onClick() {
+ return navigate(-1);
+ },
classes: {
root: 'btn-secondary-negative',
label: 'text-16-normal'
diff --git a/index.html b/index.html
index 57c0c83590a5308cf9b35deccfd747ef30139f2a..3e12b047a205ecadbaf69eb882f3e757fb45b92b 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.36824ca035f57d1dd7c9.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.c233854fc59a5d2e094e.js"></script></div></body></html>
\ No newline at end of file