diff --git a/app/ecolyo.e27d3d31c3bfb3269589.js b/app/ecolyo.0bf2f78f487a87e1cb5e.js
similarity index 99%
rename from app/ecolyo.e27d3d31c3bfb3269589.js
rename to app/ecolyo.0bf2f78f487a87e1cb5e.js
index 16d8b00f43775f4eb5161c0f911e79f210bb25c2..76dc65219b1287b606aa712816bb455c3e804d14 100644
--- a/app/ecolyo.e27d3d31c3bfb3269589.js
+++ b/app/ecolyo.0bf2f78f487a87e1cb5e.js
@@ -2727,14 +2727,15 @@ exports.default = void 0;
var _regenerator = _interopRequireDefault(__webpack_require__("hJxD"));
var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__("HZZ/"));
var _slicedToArray2 = _interopRequireDefault(__webpack_require__("XkwL"));
+var _Loader = _interopRequireDefault(__webpack_require__("6oIw"));
var _cozyClient = __webpack_require__("xEu0");
var _react = _interopRequireWildcard(__webpack_require__("ivGQ"));
var _reactRouterDom = __webpack_require__("Iyno");
var _quiz = _interopRequireDefault(__webpack_require__("RZ5E"));
var _hooks = __webpack_require__("6FOS");
+__webpack_require__("Pe/V");
var _QuizQuestionContent = _interopRequireDefault(__webpack_require__("B/R6"));
var _QuizQuestionContentCustom = _interopRequireDefault(__webpack_require__("Dmu8"));
-__webpack_require__("Pe/V");
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 QuizQuestion = function QuizQuestion(_ref) {
@@ -2756,10 +2757,6 @@ var QuizQuestion = function QuizQuestion(_ref) {
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
isCustomQuest = _useState4[0],
setIsCustomQuest = _useState4[1];
- var _useState5 = (0, _react.useState)(false),
- _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
- customQuestionLoading = _useState6[0],
- setCustomQuestionLoading = _useState6[1];
var goBack = function goBack() {
navigate('/challenges');
};
@@ -2782,7 +2779,6 @@ var QuizQuestion = function QuizQuestion(_ref) {
customQuestion = _context.sent;
if (subscribed) {
setCustomQuestion(customQuestion);
- setCustomQuestionLoading(false);
}
case 5:
case "end":
@@ -2794,19 +2790,19 @@ var QuizQuestion = function QuizQuestion(_ref) {
return _loadCustomQuestion.apply(this, arguments);
}
if (isCustomQuest) {
- setCustomQuestionLoading(true);
loadCustomQuestion();
}
return function () {
subscribed = false;
};
}, [client, fluidTypes, isCustomQuest, userChallenge.quiz.customQuestion]);
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isCustomQuest && customQuestion ? /*#__PURE__*/_react.default.createElement(_QuizQuestionContentCustom.default, {
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isCustomQuest ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !customQuestion ? /*#__PURE__*/_react.default.createElement("div", {
+ className: "question-loading"
+ }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)) : /*#__PURE__*/_react.default.createElement(_QuizQuestionContentCustom.default, {
userChallenge: userChallenge,
goBack: goBack,
- customQuestion: customQuestion,
- isLoading: customQuestionLoading
- }) : /*#__PURE__*/_react.default.createElement(_QuizQuestionContent.default, {
+ customQuestion: customQuestion
+ })) : /*#__PURE__*/_react.default.createElement(_QuizQuestionContent.default, {
userChallenge: userChallenge,
setIsCustomQuest: setIsCustomQuest,
goBack: goBack
@@ -9875,7 +9871,6 @@ var _slicedToArray2 = _interopRequireDefault(__webpack_require__("XkwL"));
var _Button = _interopRequireDefault(__webpack_require__("49+2"));
var _close = _interopRequireDefault(__webpack_require__("lCJQ"));
var _StyledIconButton = _interopRequireDefault(__webpack_require__("90PE"));
-var _Loader = _interopRequireDefault(__webpack_require__("6oIw"));
var _QuizExplanationModal = _interopRequireDefault(__webpack_require__("XBZy"));
var _cozyClient = __webpack_require__("xEu0");
var _I18n = __webpack_require__("nUfk");
@@ -9891,8 +9886,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
var QuizQuestionContentCustom = function QuizQuestionContentCustom(_ref) {
var userChallenge = _ref.userChallenge,
goBack = _ref.goBack,
- customQuestion = _ref.customQuestion,
- isLoading = _ref.isLoading;
+ customQuestion = _ref.customQuestion;
var _useI18n = (0, _I18n.useI18n)(),
t = _useI18n.t;
var client = (0, _cozyClient.useClient)();
@@ -9985,9 +9979,7 @@ var QuizQuestionContentCustom = function QuizQuestionContentCustom(_ref) {
className: "index-question"
}, "5/5"), /*#__PURE__*/_react.default.createElement("p", {
className: "question-title text-18-bold"
- }, t('quiz.consumption_question')), isLoading ? /*#__PURE__*/_react.default.createElement("div", {
- className: "question-loading"
- }, /*#__PURE__*/_react.default.createElement(_Loader.default, null)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("p", {
+ }, t('quiz.consumption_question')), /*#__PURE__*/_react.default.createElement("p", {
className: "question text-18-bold"
}, customQuestion.questionLabel), customQuestion.answers.map(function (answer, index) {
return /*#__PURE__*/_react.default.createElement("div", {
@@ -10003,7 +9995,7 @@ var QuizQuestionContentCustom = function QuizQuestionContentCustom(_ref) {
htmlFor: "answer".concat(index),
className: "text-16-bold"
}, answer.answerLabel));
- }))), /*#__PURE__*/_react.default.createElement(_Button.default, {
+ })), /*#__PURE__*/_react.default.createElement(_Button.default, {
"aria-label": t('quiz.accessibility.button_validate'),
onClick: validateQuestion,
disabled: !userChoice,
@@ -15788,7 +15780,7 @@ var QuizService = /*#__PURE__*/function () {
while (1) {
switch (_context7.prev = _context7.next) {
case 0:
- result = questionResult ? _enums.UserQuestionState.CORRECT : _enums.UserQuestionState.UNCORRECT;
+ result = questionResult ? _enums.UserQuestionState.CORRECT : _enums.UserQuestionState.INCORRECT;
updatedQuestions = userQuiz.questions.map(function (question, index) {
if (index === questionIndex) {
return _objectSpread(_objectSpread({}, question), {}, {
@@ -24268,7 +24260,7 @@ exports.UserQuestionState = UserQuestionState;
(function (UserQuestionState) {
UserQuestionState[UserQuestionState["UNLOCKED"] = 0] = "UNLOCKED";
UserQuestionState[UserQuestionState["CORRECT"] = 1] = "CORRECT";
- UserQuestionState[UserQuestionState["UNCORRECT"] = 2] = "UNCORRECT";
+ UserQuestionState[UserQuestionState["INCORRECT"] = 2] = "INCORRECT";
})(UserQuestionState || (exports.UserQuestionState = UserQuestionState = {}));
/***/ }),
diff --git a/index.html b/index.html
index 80439b72ec77565f7ecda270be069de01bc3652f..229f5938209016d9e261773ccf1741beb1dd3f54 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.9cebad5ae7ea932ed345.js"></script><script src="app/ecolyo.e27d3d31c3bfb3269589.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.9cebad5ae7ea932ed345.js"></script><script src="app/ecolyo.0bf2f78f487a87e1cb5e.js"></script></div></body></html>
\ No newline at end of file
diff --git a/public/ecolyo.11235f51d17850dbe788.js b/public/ecolyo.60c6b27d6a1b25efe899.js
similarity index 99%
rename from public/ecolyo.11235f51d17850dbe788.js
rename to public/ecolyo.60c6b27d6a1b25efe899.js
index c208148f11766b2fbbc6121652145049f4bf8da5..e7968452837420c08dae734b6c1a4a0befc134bb 100644
--- a/public/ecolyo.11235f51d17850dbe788.js
+++ b/public/ecolyo.60c6b27d6a1b25efe899.js
@@ -125277,7 +125277,7 @@ exports.UserQuestionState = UserQuestionState;
(function (UserQuestionState) {
UserQuestionState[UserQuestionState["UNLOCKED"] = 0] = "UNLOCKED";
UserQuestionState[UserQuestionState["CORRECT"] = 1] = "CORRECT";
- UserQuestionState[UserQuestionState["UNCORRECT"] = 2] = "UNCORRECT";
+ UserQuestionState[UserQuestionState["INCORRECT"] = 2] = "INCORRECT";
})(UserQuestionState || (exports.UserQuestionState = UserQuestionState = {}));
/***/ }),
diff --git a/public/index.html b/public/index.html
index 38fe679304182f89e647862c22651a21c085ae97..54014c5c62cdbdfa6362fba883c7070dae6e9865 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo | Désabonnement</title><link rel="icon" type="image/png" href="public/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="public/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="mask-icon" href="public/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="public/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="public/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="../public/ecolyo.11235f51d17850dbe788.js"></script></div></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang="{{.Locale}}"><head><meta charset="utf-8"><title>Ecolyo | Désabonnement</title><link rel="icon" type="image/png" href="public/favicon-32x32.png" sizes="32x32"><link rel="icon" type="image/png" href="public/favicon-16x16.png" sizes="16x16"><!-- PWA Manifest --><link rel="mask-icon" href="public/safari-pinned-tab.svg" color="#297EF2"><meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,viewport-fit=cover"><!-- PWA iOS --><link rel="apple-touch-icon" sizes="180x180" href="public/apple-touch-icon.png"><link rel="apple-touch-startup-image" href="public/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="../public/ecolyo.60c6b27d6a1b25efe899.js"></script></div></body></html>
\ No newline at end of file
diff --git a/services/aggregatorUsageEvents/ecolyo.js b/services/aggregatorUsageEvents/ecolyo.js
index fec246769be6819c709adddafc2513825523be50..cd60418eb241ca1753a03b777c247c743d71a507 100644
--- a/services/aggregatorUsageEvents/ecolyo.js
+++ b/services/aggregatorUsageEvents/ecolyo.js
@@ -46787,7 +46787,7 @@ exports.UserQuestionState = UserQuestionState;
(function (UserQuestionState) {
UserQuestionState[UserQuestionState["UNLOCKED"] = 0] = "UNLOCKED";
UserQuestionState[UserQuestionState["CORRECT"] = 1] = "CORRECT";
- UserQuestionState[UserQuestionState["UNCORRECT"] = 2] = "UNCORRECT";
+ UserQuestionState[UserQuestionState["INCORRECT"] = 2] = "INCORRECT";
})(UserQuestionState || (exports.UserQuestionState = UserQuestionState = {}));
/***/ }),
diff --git a/services/consumptionAlert/ecolyo.js b/services/consumptionAlert/ecolyo.js
index 29ae19dbaa5c215995966e3dc49608b86c8f8084..0e37754564aa856dd0d39d43af74a5c3126f18bd 100644
--- a/services/consumptionAlert/ecolyo.js
+++ b/services/consumptionAlert/ecolyo.js
@@ -46384,7 +46384,7 @@ exports.UserQuestionState = UserQuestionState;
(function (UserQuestionState) {
UserQuestionState[UserQuestionState["UNLOCKED"] = 0] = "UNLOCKED";
UserQuestionState[UserQuestionState["CORRECT"] = 1] = "CORRECT";
- UserQuestionState[UserQuestionState["UNCORRECT"] = 2] = "UNCORRECT";
+ UserQuestionState[UserQuestionState["INCORRECT"] = 2] = "INCORRECT";
})(UserQuestionState || (exports.UserQuestionState = UserQuestionState = {}));
/***/ }),
diff --git a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
index 6033cdf98e81e768b88710d298f27866c0fd0bbd..2b40a865a1b558ea5f9f2fb89bea4be302744ce7 100644
--- a/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
+++ b/services/enedisHalfHourMonthlyAnalysis/ecolyo.js
@@ -46384,7 +46384,7 @@ exports.UserQuestionState = UserQuestionState;
(function (UserQuestionState) {
UserQuestionState[UserQuestionState["UNLOCKED"] = 0] = "UNLOCKED";
UserQuestionState[UserQuestionState["CORRECT"] = 1] = "CORRECT";
- UserQuestionState[UserQuestionState["UNCORRECT"] = 2] = "UNCORRECT";
+ UserQuestionState[UserQuestionState["INCORRECT"] = 2] = "INCORRECT";
})(UserQuestionState || (exports.UserQuestionState = UserQuestionState = {}));
/***/ }),
diff --git a/services/fluidsPrices/ecolyo.js b/services/fluidsPrices/ecolyo.js
index 2378a996b6f6037a53a5916e580a00f20381c0ba..8f2c1fa76b4737ee35045af487d3c2864ee7ec28 100644
--- a/services/fluidsPrices/ecolyo.js
+++ b/services/fluidsPrices/ecolyo.js
@@ -46384,7 +46384,7 @@ exports.UserQuestionState = UserQuestionState;
(function (UserQuestionState) {
UserQuestionState[UserQuestionState["UNLOCKED"] = 0] = "UNLOCKED";
UserQuestionState[UserQuestionState["CORRECT"] = 1] = "CORRECT";
- UserQuestionState[UserQuestionState["UNCORRECT"] = 2] = "UNCORRECT";
+ UserQuestionState[UserQuestionState["INCORRECT"] = 2] = "INCORRECT";
})(UserQuestionState || (exports.UserQuestionState = UserQuestionState = {}));
/***/ }),
diff --git a/services/monthlyReportNotification/ecolyo.js b/services/monthlyReportNotification/ecolyo.js
index d57e751d0fd3ed16c50aa4738f2d1479837ab673..f2b40e09f0806bd24a12cda224024f5067d4932d 100644
--- a/services/monthlyReportNotification/ecolyo.js
+++ b/services/monthlyReportNotification/ecolyo.js
@@ -46384,7 +46384,7 @@ exports.UserQuestionState = UserQuestionState;
(function (UserQuestionState) {
UserQuestionState[UserQuestionState["UNLOCKED"] = 0] = "UNLOCKED";
UserQuestionState[UserQuestionState["CORRECT"] = 1] = "CORRECT";
- UserQuestionState[UserQuestionState["UNCORRECT"] = 2] = "UNCORRECT";
+ UserQuestionState[UserQuestionState["INCORRECT"] = 2] = "INCORRECT";
})(UserQuestionState || (exports.UserQuestionState = UserQuestionState = {}));
/***/ }),