From 268beb34e789e6768d1d95ebbbadcab71e92f921 Mon Sep 17 00:00:00 2001
From: build-pipeline <build-token>
Date: Fri, 28 Jul 2023 09:40:47 +0000
Subject: [PATCH] publish: Merge branch '523-keep-ecogesture-filter' into 'dev'
generated from commit d16dc8ac3794015fd56e8e4c9868548b0ee513b0
---
...40bd.js => ecolyo.331378fe588ddf76d676.js} | 246 +++++++++---------
...baf0.js => ecolyo.e1f27ee58a34bed43675.js} | 25 +-
index.html | 2 +-
3 files changed, 137 insertions(+), 136 deletions(-)
rename 6/{ecolyo.6bb7860a485b5dfd40bd.js => ecolyo.331378fe588ddf76d676.js} (84%)
rename app/{ecolyo.d4f13908fdc7e834baf0.js => ecolyo.e1f27ee58a34bed43675.js} (99%)
diff --git a/6/ecolyo.6bb7860a485b5dfd40bd.js b/6/ecolyo.331378fe588ddf76d676.js
similarity index 84%
rename from 6/ecolyo.6bb7860a485b5dfd40bd.js
rename to 6/ecolyo.331378fe588ddf76d676.js
index 49e83b340..74a1a6494 100644
--- a/6/ecolyo.6bb7860a485b5dfd40bd.js
+++ b/6/ecolyo.331378fe588ddf76d676.js
@@ -508,7 +508,7 @@ exports.default = _default;
exports = module.exports = __webpack_require__("JPst")(false);
// Module
-exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.ecogesture-root {\n display: flex;\n flex-direction: column;\n align-items: center;\n padding: 1rem 1.5rem 2.5rem 1.5rem;\n gap: 1rem;\n}\n.ecogesture-root .efficiency-button-content {\n max-width: 52rem;\n width: 100%;\n}\n.ecogesture-root .efficiency-button-content .selection {\n display: flex;\n align-items: center;\n flex-direction: column;\n color: white;\n text-align: center;\n margin: 1rem auto;\n}\n.ecogesture-root .efficiency-button-content .selection button.btn-highlight {\n padding: 0.625rem;\n}\n.ecogesture-root .efficiency-button-content .filters {\n display: flex;\n align-items: center;\n height: 50px;\n color: white;\n position: relative;\n}\n.ecogesture-root .efficiency-button-content .filters .filter {\n height: 45px;\n display: flex;\n align-items: center;\n justify-content: flex-start;\n cursor: pointer;\n}\n.ecogesture-root .efficiency-button-content .filters .filter svg {\n margin-right: 1rem;\n}\n.ecogesture-root .efficiency-button-content .filters .filter .checkicon {\n opacity: 0;\n margin-left: auto;\n transition: all 300ms ease;\n}\n.ecogesture-root .efficiency-button-content .filters .filter .checkicon.active {\n opacity: 1;\n}\n.ecogesture-root .efficiency-button-content .filters .ecogestures {\n font-size: 0.95rem;\n text-transform: initial;\n padding-left: 0.5rem;\n}\n.ecogesture-root .efficiency-button-content .filters .ecogestures.opened {\n color: #e3b82a;\n}\n.ecogesture-root .efficiency-button-content .filters .filter-button {\n display: flex;\n}\n.ecogesture-root .efficiency-button-content .filters .filter-button .button.btn-secondary-negative {\n margin: auto;\n display: flex;\n align-items: center;\n}\n.ecogesture-root .efficiency-button-content .filters .filter-button .button.btn-secondary-negative span {\n display: inline-flex;\n margin-bottom: 0;\n transition: all 300ms ease;\n}\n.ecogesture-root .efficiency-button-content .filters .filter-button .button.btn-secondary-negative svg {\n margin-right: 1rem;\n margin-left: -0.5rem;\n}\n.ecogesture-root .efficiency-button-content button.btn-secondary-negative {\n margin: 0;\n padding: 0.3rem 0.5rem;\n min-width: 11rem;\n height: 2.25rem;\n justify-content: left;\n}\n.ecogesture-root .efficiency-button-content button.btn-secondary-negative.btn-info {\n margin: 0 0 0 1rem;\n padding: 0;\n width: 2.25rem;\n min-width: 2.25rem;\n justify-content: center;\n}\n.ecogesture-root .ecogesture-content {\n display: flex;\n flex-wrap: wrap;\n max-width: 53rem;\n animation: appear 600ms ease;\n width: 100%;\n gap: 1rem;\n}\n@media only screen and (max-width : 1023px) {\n .ecogesture-root .ecogesture-content {\n gap: 0.5rem;\n }\n}\n@keyframes appear {\n from {\n opacity: 0;\n }\n to {\n opacity: 1;\n }\n}\n.ecogesture-root .ecogesture-content .ecogesture-content-loading {\n height: 80vh;\n width: 100%;\n display: flex;\n flex-direction: column;\n justify-content: center;\n align-items: center;\n color: #e0e0e0;\n}\n.ecogesture-root .ecogesture-content .ecogesture-list-item {\n box-sizing: border-box;\n height: 8rem;\n animation: appear 600ms ease;\n display: flex;\n flex: 1;\n flex-basis: 45%;\n max-width: 48%;\n}\n.ecogesture-root .ecogesture-content .ecogesture-list-item > button {\n height: 100%;\n overflow: hidden;\n animation: appear 600ms ease;\n}\n.ecogesture-root .ec-filter-error {\n color: #e0e0e0;\n text-align: center;\n margin-top: 2rem;\n}\n.ecogesture-root .ec-filter-error div:first-child {\n margin-bottom: 1rem;\n}\n\ndiv.filter-menu {\n margin-top: 3.5rem;\n margin-left: -0.5rem;\n color: white;\n background: linear-gradient(0deg, rgba(255, 255, 255, 0.09), rgba(255, 255, 255, 0.09)), linear-gradient(180deg, #323339 0%, #25262b 100%);\n border: 1px solid #a0a0a0;\n box-sizing: border-box;\n box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.55);\n border-radius: 4px;\n z-index: 3;\n width: 220px;\n padding: 0.5rem 0rem;\n font-size: 0.875rem;\n left: 0;\n transition: all 300ms ease;\n}\ndiv.filter-menu.opened {\n display: block;\n}\ndiv.filter-menu .filter {\n padding: 0 1rem;\n}\ndiv.filter-menu .filter.filter-active {\n background: rgba(160, 160, 160, 0.2);\n}\n\n.filter-menu-list li {\n color: #ffffff;\n text-transform: initial;\n font-family: Lato, sans-serif;\n}\n.filter-menu-list li.item-active {\n font-weight: 700;\n}\n\n.filter-menu-icon {\n margin-left: auto;\n min-width: 0;\n}", ""]);
+exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.ecogesture-root {\n display: flex;\n flex-direction: column;\n align-items: center;\n padding: 1rem 1.5rem 2.5rem 1.5rem;\n gap: 1rem;\n}\n.ecogesture-root .efficiency-button-content {\n max-width: 52rem;\n width: 100%;\n display: flex;\n flex-direction: column;\n gap: 1rem;\n}\n.ecogesture-root .efficiency-button-content .selection {\n display: flex;\n align-items: center;\n flex-direction: column;\n color: white;\n text-align: center;\n}\n.ecogesture-root .efficiency-button-content .selection button.btn-highlight {\n padding: 0.625rem;\n}\n.ecogesture-root .efficiency-button-content .filters {\n display: flex;\n align-items: center;\n height: 50px;\n color: white;\n position: relative;\n}\n.ecogesture-root .efficiency-button-content .filters .filter {\n height: 45px;\n display: flex;\n align-items: center;\n justify-content: flex-start;\n cursor: pointer;\n}\n.ecogesture-root .efficiency-button-content .filters .filter svg {\n margin-right: 1rem;\n}\n.ecogesture-root .efficiency-button-content .filters .filter .checkicon {\n opacity: 0;\n margin-left: auto;\n transition: all 300ms ease;\n}\n.ecogesture-root .efficiency-button-content .filters .filter .checkicon.active {\n opacity: 1;\n}\n.ecogesture-root .efficiency-button-content .filters .ecogestures {\n font-size: 0.95rem;\n text-transform: initial;\n padding-left: 0.5rem;\n}\n.ecogesture-root .efficiency-button-content .filters .ecogestures.opened {\n color: #e3b82a;\n}\n.ecogesture-root .efficiency-button-content .filters .filter-button {\n display: flex;\n}\n.ecogesture-root .efficiency-button-content .filters .filter-button .button.btn-secondary-negative {\n margin: auto;\n display: flex;\n align-items: center;\n}\n.ecogesture-root .efficiency-button-content .filters .filter-button .button.btn-secondary-negative span {\n display: inline-flex;\n margin-bottom: 0;\n transition: all 300ms ease;\n}\n.ecogesture-root .efficiency-button-content .filters .filter-button .button.btn-secondary-negative svg {\n margin-right: 1rem;\n margin-left: -0.5rem;\n}\n.ecogesture-root .efficiency-button-content button.btn-secondary-negative {\n margin: 0;\n padding: 0.3rem 0.5rem;\n min-width: 11rem;\n height: 2.25rem;\n justify-content: left;\n}\n.ecogesture-root .efficiency-button-content button.btn-secondary-negative.btn-info {\n margin: 0 0 0 1rem;\n padding: 0;\n width: 2.25rem;\n min-width: 2.25rem;\n justify-content: center;\n}\n.ecogesture-root .ecogesture-content {\n display: flex;\n flex-wrap: wrap;\n max-width: 53rem;\n animation: appear 600ms ease;\n width: 100%;\n gap: 1rem;\n}\n@media only screen and (max-width : 1023px) {\n .ecogesture-root .ecogesture-content {\n gap: 0.5rem;\n }\n}\n@keyframes appear {\n from {\n opacity: 0;\n }\n to {\n opacity: 1;\n }\n}\n.ecogesture-root .ecogesture-content .ecogesture-content-loading {\n height: 80vh;\n width: 100%;\n display: flex;\n flex-direction: column;\n justify-content: center;\n align-items: center;\n color: #e0e0e0;\n}\n.ecogesture-root .ecogesture-content .ecogesture-list-item {\n box-sizing: border-box;\n height: 8rem;\n animation: appear 600ms ease;\n display: flex;\n flex: 1;\n flex-basis: 45%;\n max-width: 48%;\n}\n.ecogesture-root .ecogesture-content .ecogesture-list-item > button {\n height: 100%;\n overflow: hidden;\n animation: appear 600ms ease;\n}\n.ecogesture-root .ec-filter-error {\n color: #e0e0e0;\n text-align: center;\n margin-top: 2rem;\n}\n.ecogesture-root .ec-filter-error div:first-child {\n margin-bottom: 1rem;\n}\n\ndiv.filter-menu {\n margin-top: 3.5rem;\n margin-left: -0.5rem;\n color: white;\n background: linear-gradient(0deg, rgba(255, 255, 255, 0.09), rgba(255, 255, 255, 0.09)), linear-gradient(180deg, #323339 0%, #25262b 100%);\n border: 1px solid #a0a0a0;\n box-sizing: border-box;\n box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.55);\n border-radius: 4px;\n z-index: 3;\n width: 220px;\n padding: 0.5rem 0rem;\n font-size: 0.875rem;\n left: 0;\n transition: all 300ms ease;\n}\ndiv.filter-menu.opened {\n display: block;\n}\ndiv.filter-menu .filter {\n padding: 0 1rem;\n}\ndiv.filter-menu .filter.filter-active {\n background: rgba(160, 160, 160, 0.2);\n}\n\n.filter-menu-list li {\n color: #ffffff;\n text-transform: initial;\n font-family: Lato, sans-serif;\n}\n.filter-menu-list li.item-active {\n font-weight: 700;\n}\n\n.filter-menu-icon {\n margin-left: auto;\n min-width: 0;\n}", ""]);
@@ -850,6 +850,10 @@ var _react = _interopRequireWildcard(__webpack_require__("q1tI"));
var _reactRouterDom = __webpack_require__("SOjZ");
+var _global = __webpack_require__("b3rE");
+
+var _hooks = __webpack_require__("Zlw4");
+
__webpack_require__("Tmyz");
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); }
@@ -867,21 +871,22 @@ var EcogestureList = function EcogestureList(_ref) {
t = _useI18n.t;
var navigate = (0, _reactRouterDom.useNavigate)();
+ var dispatch = (0, _hooks.useAppDispatch)();
- var _useState = (0, _react.useState)(_ecogesture.Usage[_ecogesture.Usage.ALL]),
+ var _useAppSelector = (0, _hooks.useAppSelector)(function (state) {
+ return state.ecolyo.global;
+ }),
+ ecogestureFilter = _useAppSelector.ecogestureFilter;
+
+ var _useState = (0, _react.useState)(false),
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
- activeFilter = _useState2[0],
- setActiveFilter = _useState2[1];
+ openDropDown = _useState2[0],
+ setOpenDropDown = _useState2[1];
- var _useState3 = (0, _react.useState)(false),
+ var _useState3 = (0, _react.useState)(null),
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
- openDropDown = _useState4[0],
- setOpenDropDown = _useState4[1];
-
- var _useState5 = (0, _react.useState)(null),
- _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
- anchorEl = _useState6[0],
- setAnchorEl = _useState6[1];
+ anchorEl = _useState4[0],
+ setAnchorEl = _useState4[1];
var toggleDropDown = function toggleDropDown() {
setOpenDropDown(function (prev) {
@@ -894,136 +899,120 @@ var EcogestureList = function EcogestureList(_ref) {
};
var closeMenu = function closeMenu(usage) {
- usage && setActiveFilter(usage);
+ usage !== undefined && dispatch((0, _global.updateEcogestureFilter)(usage));
setAnchorEl(null);
};
- var filterEcogesture = function filterEcogesture(ecogestures) {
- var filtered = ecogestures.filter(function (ecogesture) {
- return _ecogesture.Usage[ecogesture.usage] === activeFilter;
- }).map(function (ecogesture) {
- return /*#__PURE__*/_react.default.createElement(_EcogestureCard.default, {
- key: ecogesture.id,
- ecogesture: ecogesture,
- selectionCompleted: selectionViewed === selectionTotal
- });
+ var renderEcogestureContent = function renderEcogestureContent() {
+ var isAllUsage = ecogestureFilter === _ecogesture.Usage.ALL;
+ var filteredEcogestures = list.filter(function (ecogesture) {
+ return isAllUsage ? true : ecogesture.usage === ecogestureFilter;
});
- if (filtered.length > 0) {
- return filtered;
- } else {
- return /*#__PURE__*/_react.default.createElement("div", {
- className: "ec-filter-error"
- }, /*#__PURE__*/_react.default.createElement("div", {
- className: "text-20-normal"
- }, t('ecogesture.no_ecogesture_filter.text1')), /*#__PURE__*/_react.default.createElement("div", {
- className: "text-16-italic"
- }, t('ecogesture.no_ecogesture_filter.text2')));
+ if (filteredEcogestures.length > 0) {
+ return filteredEcogestures.map(function (ecogesture) {
+ return /*#__PURE__*/_react.default.createElement(_EcogestureCard.default, {
+ key: ecogesture.id,
+ ecogesture: ecogesture,
+ selectionCompleted: selectionViewed === selectionTotal
+ });
+ });
}
+
+ return /*#__PURE__*/_react.default.createElement("div", {
+ className: "ec-filter-error"
+ }, /*#__PURE__*/_react.default.createElement("div", {
+ className: "text-20-normal"
+ }, t('ecogesture.no_ecogesture_filter.text1')), /*#__PURE__*/_react.default.createElement("div", {
+ className: "text-16-italic"
+ }, t('ecogesture.no_ecogesture_filter.text2')));
};
- var renderEcogestureContent = function renderEcogestureContent() {
- if (list.length > 0) {
- if (activeFilter === _ecogesture.Usage[_ecogesture.Usage.ALL]) {
- return list.map(function (ecogesture) {
- return /*#__PURE__*/_react.default.createElement(_EcogestureCard.default, {
- key: ecogesture.id,
- ecogesture: ecogesture,
- selectionCompleted: selectionViewed === selectionTotal
- });
- });
- } else {
- return filterEcogesture(list);
+ var selectFilters = function selectFilters() {
+ return /*#__PURE__*/_react.default.createElement("div", {
+ className: "filters text-16-normal"
+ }, /*#__PURE__*/_react.default.createElement("div", {
+ className: "filter-button",
+ onClick: function onClick() {
+ return toggleDropDown();
+ },
+ tabIndex: 0,
+ onBlur: function onBlur(e) {
+ if (e.relatedTarget === null) toggleDropDown();
}
- } else if (!displaySelection) {
- return /*#__PURE__*/_react.default.createElement("div", {
- className: "ec-filter-error"
- }, /*#__PURE__*/_react.default.createElement("div", {
- className: "text-20-normal"
- }, t('ecogesture.no_ecogesture_filter.text1')), /*#__PURE__*/_react.default.createElement("div", {
- className: "text-16-italic"
- }, t('ecogesture.no_ecogesture_filter.text2')));
- }
+ }, /*#__PURE__*/_react.default.createElement(_Button.default, {
+ classes: {
+ root: 'btn-secondary-negative',
+ label: 'text-14-normal'
+ },
+ "aria-controls": "simple-menu",
+ "aria-haspopup": "true",
+ "aria-label": t("ecogesture.MENU_TITLE"),
+ onClick: toggleMenu,
+ variant: "contained"
+ }, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
+ icon: _sort.default,
+ size: 20
+ }), /*#__PURE__*/_react.default.createElement("span", {
+ className: openDropDown ? 'ecogestures opened' : 'ecogestures'
+ }, ecogestureFilter === _ecogesture.Usage.ALL ? t("ecogesture.MENU_TITLE") : t("ecogesture.".concat(_ecogesture.Usage[ecogestureFilter])))), /*#__PURE__*/_react.default.createElement(_core.Menu, {
+ anchorEl: anchorEl,
+ keepMounted: true,
+ open: Boolean(anchorEl),
+ onClose: function onClose() {
+ return closeMenu();
+ },
+ PopoverClasses: {
+ paper: 'filter-menu'
+ },
+ variant: "menu",
+ MenuListProps: {
+ className: 'filter-menu-list'
+ }
+ }, Object.values(_ecogesture.Usage).map(function (usage, key) {
+ var active = usage === ecogestureFilter;
+ return typeof usage === 'number' && /*#__PURE__*/_react.default.createElement(_core.MenuItem, {
+ classes: {
+ root: "".concat(active ? 'item-active' : '')
+ },
+ key: key,
+ selected: active,
+ onClick: function onClick() {
+ return closeMenu(usage);
+ }
+ }, t("ecogesture.".concat(_ecogesture.Usage[usage])), active && /*#__PURE__*/_react.default.createElement(_core.ListItemIcon, {
+ classes: {
+ root: 'filter-menu-icon'
+ }
+ }, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
+ icon: _check.default,
+ size: 13
+ })));
+ }))));
};
- return /*#__PURE__*/_react.default.createElement("div", {
- className: "ecogesture-root"
- }, /*#__PURE__*/_react.default.createElement("div", {
- className: "efficiency-button-content"
- }, displaySelection ? /*#__PURE__*/_react.default.createElement(_core.Grow, {
- in: displaySelection
- }, /*#__PURE__*/_react.default.createElement("div", {
- className: "selection text-16-normal"
- }, /*#__PURE__*/_react.default.createElement("span", null, t('ecogesture.selection')), /*#__PURE__*/_react.default.createElement("span", null, "(".concat(selectionViewed, " ").concat(t('ecogesture.selection_2'), " ").concat(selectionTotal, ")")), /*#__PURE__*/_react.default.createElement(_Button.default, {
- "aria-label": t('ecogesture.accessibility.button_selection'),
- classes: {
- root: 'btn-highlight',
- label: 'text-16-bold'
- },
- onClick: function onClick() {
- return navigate('/ecogesture-selection');
- }
- }, t('ecogesture.button_selection')))) : /*#__PURE__*/_react.default.createElement(_core.Grow, {
- in: !displaySelection
- }, /*#__PURE__*/_react.default.createElement("div", {
- className: "filters text-16-normal"
- }, /*#__PURE__*/_react.default.createElement("div", {
- className: "filter-button",
- onClick: function onClick() {
- return toggleDropDown();
- },
- tabIndex: 0,
- onBlur: function onBlur(e) {
- if (e.relatedTarget === null) toggleDropDown();
- }
- }, /*#__PURE__*/_react.default.createElement(_Button.default, {
- classes: {
- root: 'btn-secondary-negative',
- label: 'text-14-normal'
- },
- "aria-controls": "simple-menu",
- "aria-haspopup": "true",
- "aria-label": t("ecogesture.MENU_TITLE"),
- onClick: toggleMenu,
- variant: "contained"
- }, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
- icon: _sort.default,
- size: 20
- }), /*#__PURE__*/_react.default.createElement("span", {
- className: openDropDown ? 'ecogestures opened' : 'ecogestures'
- }, activeFilter === 'ALL' ? t("ecogesture.MENU_TITLE") : t("ecogesture.".concat(activeFilter)))), /*#__PURE__*/_react.default.createElement(_core.Menu, {
- anchorEl: anchorEl,
- keepMounted: true,
- open: Boolean(anchorEl),
- onClose: function onClose() {
- return closeMenu();
- },
- PopoverClasses: {
- paper: 'filter-menu'
- },
- variant: "menu",
- MenuListProps: {
- className: 'filter-menu-list'
- }
- }, Object.values(_ecogesture.Usage).map(function (usage, key) {
- return typeof usage !== 'number' && /*#__PURE__*/_react.default.createElement(_core.MenuItem, {
+ var continueSelection = function continueSelection() {
+ return /*#__PURE__*/_react.default.createElement(_core.Grow, {
+ in: displaySelection
+ }, /*#__PURE__*/_react.default.createElement("div", {
+ className: "selection text-16-normal"
+ }, /*#__PURE__*/_react.default.createElement("span", null, t('ecogesture.selection')), /*#__PURE__*/_react.default.createElement("span", null, "(".concat(selectionViewed, " ").concat(t('ecogesture.selection_2'), " ").concat(selectionTotal, ")")), /*#__PURE__*/_react.default.createElement(_Button.default, {
+ "aria-label": t('ecogesture.accessibility.button_selection'),
classes: {
- root: "".concat(usage === activeFilter ? 'item-active' : '')
+ root: 'btn-highlight',
+ label: 'text-16-bold'
},
- key: key,
- selected: usage === activeFilter,
onClick: function onClick() {
- return closeMenu(usage);
- }
- }, t("ecogesture.".concat(usage)), usage === activeFilter && /*#__PURE__*/_react.default.createElement(_core.ListItemIcon, {
- classes: {
- root: 'filter-menu-icon'
+ return navigate('/ecogesture-selection');
}
- }, /*#__PURE__*/_react.default.createElement(_StyledIcon.default, {
- icon: _check.default,
- size: 13
- })));
- })))))), /*#__PURE__*/_react.default.createElement("div", {
+ }, t('ecogesture.button_selection'))));
+ };
+
+ return /*#__PURE__*/_react.default.createElement("div", {
+ className: "ecogesture-root"
+ }, /*#__PURE__*/_react.default.createElement("div", {
+ className: "efficiency-button-content"
+ }, selectFilters(), displaySelection && continueSelection()), /*#__PURE__*/_react.default.createElement("div", {
className: "ecogesture-content"
}, renderEcogestureContent(), !displaySelection && handleReinitClick && /*#__PURE__*/_react.default.createElement(_Button.default, {
onClick: handleReinitClick,
@@ -1141,7 +1130,6 @@ var EcogestureInitModal = function EcogestureInitModal(_ref) {
}, /*#__PURE__*/_react.default.createElement(_core.Button, {
"aria-label": t('ecogesture.initModal.btn1'),
onClick: handleCloseClick,
- className: "btn1",
classes: {
root: 'btn-secondary-negative',
label: 'text-16-bold'
@@ -1247,7 +1235,7 @@ var result = _node_modules_svg_sprite_loader_runtime_browser_sprite_build_js__WE
exports = module.exports = __webpack_require__("JPst")(false);
// Module
-exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.eg-init-modal {\n color: #e0e0e0;\n margin: 1rem 0;\n}\n.eg-init-modal .title {\n text-align: center;\n color: #e3b82a;\n}\n.eg-init-modal .text {\n margin: 1rem 0;\n}\n.eg-init-modal .buttons-container {\n display: flex;\n}\n.eg-init-modal .buttons-container button {\n min-height: 45px;\n cursor: pointer;\n}\n.eg-init-modal .buttons-container button.btn1 {\n margin-right: 1rem;\n}", ""]);
+exports.push([module.i, "/** BLACK **/\n/** RED **/\n/** YELLOW **/\n/** ORANGE **/\n/** BLUE **/\n/** GREEN **/\n/** WHITE **/\n/** GREY **/\n/** App colors **/\n/** TABS GRADIENT **/\n/** SCROLLBAR **/\n.eg-init-modal {\n color: #e0e0e0;\n margin: 1rem 0;\n}\n.eg-init-modal .title {\n text-align: center;\n color: #e3b82a;\n}\n.eg-init-modal .text {\n margin: 1rem 0;\n}\n.eg-init-modal .buttons-container {\n display: flex;\n gap: 1rem;\n}\n.eg-init-modal .buttons-container button {\n margin: 0;\n}", ""]);
diff --git a/app/ecolyo.d4f13908fdc7e834baf0.js b/app/ecolyo.e1f27ee58a34bed43675.js
similarity index 99%
rename from app/ecolyo.d4f13908fdc7e834baf0.js
rename to app/ecolyo.e1f27ee58a34bed43675.js
index b013494e5..d1df73f86 100644
--- a/app/ecolyo.d4f13908fdc7e834baf0.js
+++ b/app/ecolyo.e1f27ee58a34bed43675.js
@@ -64,7 +64,7 @@
/******/
/******/ // script path function
/******/ function jsonpScriptSrc(chunkId) {
-/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"415fd625cd64389d9c8d","3":"69bb5ef59bba3ab8f904","4":"c76888d97f431150c7d1","5":"0c0733cd2d8d715775f6","6":"6bb7860a485b5dfd40bd","7":"a370d4053c6db809d6d5","8":"a9363dc7eb1de5bcc528","9":"2b511cc19b26b50403ba","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js"
+/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"415fd625cd64389d9c8d","3":"69bb5ef59bba3ab8f904","4":"c76888d97f431150c7d1","5":"0c0733cd2d8d715775f6","6":"331378fe588ddf76d676","7":"a370d4053c6db809d6d5","8":"a9363dc7eb1de5bcc528","9":"2b511cc19b26b50403ba","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js"
/******/ }
/******/
/******/ // The require function
@@ -24144,12 +24144,14 @@ var _interopRequireDefault = __webpack_require__("TqRt");
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.updateTermsStatus = exports.updateSgeStore = exports.updateFluidConnection = exports.toggleChallengeExplorationNotification = exports.toggleChallengeDuelNotification = exports.toggleChallengeActionNotification = exports.toggleAnalysisNotification = exports.showReleaseNotes = exports.setShouldRefreshConsent = exports.setPartnersInfo = exports.setFluidStatus = exports.globalSlice = exports.changeScreenType = void 0;
+exports.updateTermsStatus = exports.updateSgeStore = exports.updateFluidConnection = exports.updateEcogestureFilter = exports.toggleChallengeExplorationNotification = exports.toggleChallengeDuelNotification = exports.toggleChallengeActionNotification = exports.toggleAnalysisNotification = exports.showReleaseNotes = exports.setShouldRefreshConsent = exports.setPartnersInfo = exports.setFluidStatus = exports.globalSlice = exports.changeScreenType = void 0;
var _toConsumableArray2 = _interopRequireDefault(__webpack_require__("RIqP"));
var _toolkit = __webpack_require__("i7Pf");
+var _ecogesture = __webpack_require__("SpsK");
+
var _fluid = __webpack_require__("5Wkc");
var _fluidSlug = __webpack_require__("jFN3");
@@ -24256,7 +24258,8 @@ var initialState = {
dataConsent: false,
pdlConfirm: false,
shouldLaunchAccount: false
- }
+ },
+ ecogestureFilter: _ecogesture.Usage.ALL
};
var getFluidTypesFromStatus = function getFluidTypesFromStatus(fluidStatus) {
@@ -24316,6 +24319,9 @@ var globalSlice = (0, _toolkit.createSlice)({
},
updateSgeStore: function updateSgeStore(state, action) {
state.sgeConnect = action.payload;
+ },
+ updateEcogestureFilter: function updateEcogestureFilter(state, action) {
+ state.ecogestureFilter = action.payload;
}
}
});
@@ -24324,24 +24330,26 @@ var _globalSlice$actions = globalSlice.actions,
changeScreenType = _globalSlice$actions.changeScreenType,
setFluidStatus = _globalSlice$actions.setFluidStatus,
setPartnersInfo = _globalSlice$actions.setPartnersInfo,
- updateSgeStore = _globalSlice$actions.updateSgeStore,
setShouldRefreshConsent = _globalSlice$actions.setShouldRefreshConsent,
showReleaseNotes = _globalSlice$actions.showReleaseNotes,
toggleAnalysisNotification = _globalSlice$actions.toggleAnalysisNotification,
toggleChallengeActionNotification = _globalSlice$actions.toggleChallengeActionNotification,
toggleChallengeDuelNotification = _globalSlice$actions.toggleChallengeDuelNotification,
toggleChallengeExplorationNotification = _globalSlice$actions.toggleChallengeExplorationNotification,
+ updateEcogestureFilter = _globalSlice$actions.updateEcogestureFilter,
updateFluidConnection = _globalSlice$actions.updateFluidConnection,
+ updateSgeStore = _globalSlice$actions.updateSgeStore,
updateTermsStatus = _globalSlice$actions.updateTermsStatus;
exports.updateTermsStatus = updateTermsStatus;
+exports.updateSgeStore = updateSgeStore;
exports.updateFluidConnection = updateFluidConnection;
+exports.updateEcogestureFilter = updateEcogestureFilter;
exports.toggleChallengeExplorationNotification = toggleChallengeExplorationNotification;
exports.toggleChallengeDuelNotification = toggleChallengeDuelNotification;
exports.toggleChallengeActionNotification = toggleChallengeActionNotification;
exports.toggleAnalysisNotification = toggleAnalysisNotification;
exports.showReleaseNotes = showReleaseNotes;
exports.setShouldRefreshConsent = setShouldRefreshConsent;
-exports.updateSgeStore = updateSgeStore;
exports.setPartnersInfo = setPartnersInfo;
exports.setFluidStatus = setFluidStatus;
exports.changeScreenType = changeScreenType;
@@ -25169,6 +25177,11 @@ var EcogestureFormView = function EcogestureFormView() {
handleEndForm();
}
}, [handleEndForm, step]);
+
+ if (isProfileTypeCompleted) {
+ return /*#__PURE__*/_react.default.createElement(_ProfileTypeView.default, null);
+ }
+
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, {
@@ -25178,7 +25191,7 @@ var EcogestureFormView = function EcogestureFormView() {
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, {
+ }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)), !isLoading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, step === _ecogestureForm.EcogestureStepForm.EQUIPMENTS && /*#__PURE__*/_react.default.createElement(_EcogestureFormEquipment.default, {
step: _ecogestureForm.EcogestureStepForm.EQUIPMENTS,
currentProfileEcogesture: currentProfileEcogesture,
setNextStepEcogestureForm: setNextStep,
diff --git a/index.html b/index.html
index ecf98437f..9637926f0 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.d4f13908fdc7e834baf0.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.e1f27ee58a34bed43675.js"></script></div></body></html>
\ No newline at end of file
--
GitLab