From 10a424bc17456c313c5010416ae36d42a746b0b1 Mon Sep 17 00:00:00 2001 From: build-pipeline <build-token> Date: Tue, 25 Jul 2023 13:51:15 +0000 Subject: [PATCH] publish: Merge branch '520-astuces-probleme-de-chargement' into 'dev' generated from commit 20b5a3dc13c73c6a8d0319636151d5f1e830fbfc --- ...5111.js => ecolyo.2b511cc19b26b50403ba.js} | 135 +++++++++--------- ...6e06.js => ecolyo.ed0861bcd1528132798c.js} | 2 +- index.html | 2 +- 3 files changed, 67 insertions(+), 72 deletions(-) rename 9/{ecolyo.d41ce4d7fb2ce55b5111.js => ecolyo.2b511cc19b26b50403ba.js} (87%) rename app/{ecolyo.f07fae74d1d7ed8f6e06.js => ecolyo.ed0861bcd1528132798c.js} (99%) diff --git a/9/ecolyo.d41ce4d7fb2ce55b5111.js b/9/ecolyo.2b511cc19b26b50403ba.js similarity index 87% rename from 9/ecolyo.d41ce4d7fb2ce55b5111.js rename to 9/ecolyo.2b511cc19b26b50403ba.js index 32004eb61..27a1a9934 100644 --- a/9/ecolyo.d41ce4d7fb2ce55b5111.js +++ b/9/ecolyo.2b511cc19b26b50403ba.js @@ -278,78 +278,73 @@ var SingleEcogesture = function SingleEcogesture() { subscribed = false; }; }, [client, currentChallenge, ecogestureID, ecogestureService, setValidExploration]); - - if (ecogesture) { - return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, { - titleKey: 'common.title_ecogesture', - displayBackArrow: true - }), /*#__PURE__*/_react.default.createElement(_Header.default, { - setHeaderHeight: setHeaderHeight, - desktopTitleKey: 'common.title_ecogesture', - displayBackArrow: true - }), /*#__PURE__*/_react.default.createElement(_Content.default, { - heightOffset: headerHeight - }, isLoading && /*#__PURE__*/_react.default.createElement("div", { - className: "loaderContainer" - }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)), !isLoading && /*#__PURE__*/_react.default.createElement("div", { - className: "single-ecogesture" - }, /*#__PURE__*/_react.default.createElement("div", { - className: "icon-container" - }, ecogestureIcon && /*#__PURE__*/_react.default.createElement(_StyledIcon.default, { - className: "icon-big", - icon: ecogestureIcon, - size: 220 - })), /*#__PURE__*/_react.default.createElement("div", { - className: "details" - }, /*#__PURE__*/_react.default.createElement("div", { - className: "text-22 title" - }, ecogesture.shortName), /*#__PURE__*/_react.default.createElement("div", { - className: "efficiency" - }, /*#__PURE__*/_react.default.createElement("span", { - className: "text text-14-normal" - }, t('ecogesture_modal.efficiency')), /*#__PURE__*/_react.default.createElement(_EfficiencyRating.default, { - result: Math.round(ecogesture.efficiency) - }))), /*#__PURE__*/_react.default.createElement("div", { - className: "styled-container" - }, /*#__PURE__*/_react.default.createElement("div", { - className: "long-name text-18-bold" - }, ecogesture.longName), /*#__PURE__*/_react.default.createElement("div", { - className: "toggle-text text-15-normal", - onClick: toggleMoreDetail, - role: "button" - }, isMoreDetail ? t('ecogesture_modal.show_less') : t('ecogesture_modal.show_more')), /*#__PURE__*/_react.default.createElement("div", { - className: (0, _classnames.default)('description text-16-normal-150', (0, _defineProperty2.default)({}, 'block', isMoreDetail === true)) - }, ecogesture.longDescription)), selectionCompleted && /*#__PURE__*/_react.default.createElement("div", { - className: "buttons-selection" - }, /*#__PURE__*/_react.default.createElement(_IconButton.default, { - "aria-label": t('ecogesture.objective'), - onClick: toggleObjective, - classes: { - root: "btn-secondary-negative objective-btn ".concat(isObjective && 'active'), - label: 'text-15-normal' - } - }, /*#__PURE__*/_react.default.createElement(_Icon.default, { - className: "status-icon", - icon: isObjective ? _objectiveEnabled.default : _objectiveDisabled.default, - size: 40 - }), /*#__PURE__*/_react.default.createElement("span", null, t('ecogesture.objective'))), /*#__PURE__*/_react.default.createElement(_IconButton.default, { - "aria-label": t('ecogesture.doing'), - onClick: toggleDoing, - classes: { - root: "btn-secondary-negative doing-btn ".concat(isDoing && 'active'), - label: 'text-15-normal' - } - }, /*#__PURE__*/_react.default.createElement(_Icon.default, { - className: "status-icon", - icon: isDoing ? _doingEnabled.default : _doingDisabled.default, - size: 40 - }), /*#__PURE__*/_react.default.createElement("span", null, t('ecogesture.doing'))))))); - } - - return /*#__PURE__*/_react.default.createElement(_ErrorPage.default, { + return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CozyBar.default, { + titleKey: 'common.title_ecogesture', + displayBackArrow: true + }), /*#__PURE__*/_react.default.createElement(_Header.default, { + setHeaderHeight: setHeaderHeight, + desktopTitleKey: 'common.title_ecogesture', + displayBackArrow: true + }), /*#__PURE__*/_react.default.createElement(_Content.default, { + heightOffset: headerHeight + }, isLoading && /*#__PURE__*/_react.default.createElement("div", { + className: "loaderContainer" + }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)), !isLoading && !ecogesture && /*#__PURE__*/_react.default.createElement(_ErrorPage.default, { text: t('error_page.no_ecogesture'), returnPage: 'ecogestures' - }); + }), !isLoading && ecogesture && /*#__PURE__*/_react.default.createElement("div", { + className: "single-ecogesture" + }, /*#__PURE__*/_react.default.createElement("div", { + className: "icon-container" + }, ecogestureIcon && /*#__PURE__*/_react.default.createElement(_StyledIcon.default, { + className: "icon-big", + icon: ecogestureIcon, + size: 220 + })), /*#__PURE__*/_react.default.createElement("div", { + className: "details" + }, /*#__PURE__*/_react.default.createElement("div", { + className: "text-22 title" + }, ecogesture.shortName), /*#__PURE__*/_react.default.createElement("div", { + className: "efficiency" + }, /*#__PURE__*/_react.default.createElement("span", { + className: "text text-14-normal" + }, t('ecogesture_modal.efficiency')), /*#__PURE__*/_react.default.createElement(_EfficiencyRating.default, { + result: Math.round(ecogesture.efficiency) + }))), /*#__PURE__*/_react.default.createElement("div", { + className: "styled-container" + }, /*#__PURE__*/_react.default.createElement("div", { + className: "long-name text-18-bold" + }, ecogesture.longName), /*#__PURE__*/_react.default.createElement("div", { + className: "toggle-text text-15-normal", + onClick: toggleMoreDetail, + role: "button" + }, isMoreDetail ? t('ecogesture_modal.show_less') : t('ecogesture_modal.show_more')), /*#__PURE__*/_react.default.createElement("div", { + className: (0, _classnames.default)('description text-16-normal-150', (0, _defineProperty2.default)({}, 'block', isMoreDetail === true)) + }, ecogesture.longDescription)), selectionCompleted && /*#__PURE__*/_react.default.createElement("div", { + className: "buttons-selection" + }, /*#__PURE__*/_react.default.createElement(_IconButton.default, { + "aria-label": t('ecogesture.objective'), + onClick: toggleObjective, + classes: { + root: "btn-secondary-negative objective-btn ".concat(isObjective && 'active'), + label: 'text-15-normal' + } + }, /*#__PURE__*/_react.default.createElement(_Icon.default, { + className: "status-icon", + icon: isObjective ? _objectiveEnabled.default : _objectiveDisabled.default, + size: 40 + }), /*#__PURE__*/_react.default.createElement("span", null, t('ecogesture.objective'))), /*#__PURE__*/_react.default.createElement(_IconButton.default, { + "aria-label": t('ecogesture.doing'), + onClick: toggleDoing, + classes: { + root: "btn-secondary-negative doing-btn ".concat(isDoing && 'active'), + label: 'text-15-normal' + } + }, /*#__PURE__*/_react.default.createElement(_Icon.default, { + className: "status-icon", + icon: isDoing ? _doingEnabled.default : _doingDisabled.default, + size: 40 + }), /*#__PURE__*/_react.default.createElement("span", null, t('ecogesture.doing'))))))); }; var _default = SingleEcogesture; diff --git a/app/ecolyo.f07fae74d1d7ed8f6e06.js b/app/ecolyo.ed0861bcd1528132798c.js similarity index 99% rename from app/ecolyo.f07fae74d1d7ed8f6e06.js rename to app/ecolyo.ed0861bcd1528132798c.js index 1fdbb6c45..acf699ce7 100644 --- a/app/ecolyo.f07fae74d1d7ed8f6e06.js +++ b/app/ecolyo.ed0861bcd1528132798c.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":"00b7bb572cf6a542f328","7":"a370d4053c6db809d6d5","8":"a9363dc7eb1de5bcc528","9":"d41ce4d7fb2ce55b5111","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js" +/******/ return __webpack_require__.p + "" + ({}[chunkId]||chunkId) + "/ecolyo." + {"1":"415fd625cd64389d9c8d","3":"69bb5ef59bba3ab8f904","4":"c76888d97f431150c7d1","5":"0c0733cd2d8d715775f6","6":"00b7bb572cf6a542f328","7":"a370d4053c6db809d6d5","8":"a9363dc7eb1de5bcc528","9":"2b511cc19b26b50403ba","10":"24e1a14cab96b50d3fbd"}[chunkId] + ".js" /******/ } /******/ /******/ // The require function diff --git a/index.html b/index.html index fdcd04d2a..6ee494a90 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.f07fae74d1d7ed8f6e06.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.ed0861bcd1528132798c.js"></script></div></body></html> \ No newline at end of file -- GitLab