From 4951e6a623306ad72c8d43e55789c8f283eff5ea Mon Sep 17 00:00:00 2001
From: build-token <build-token>
Date: Tue, 10 Dec 2024 15:42:13 +0000
Subject: [PATCH] publish: Merge branch 'attempt-fix-exploration' into 'dev'
generated from commit ea69a9a101b46d02255c8850203850636f800c1b
---
...9e94bcd9ce7c0.js => ecolyo.50bcfb4eaada554a6195.js} | 10 +++++-----
index.html | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
rename app/{ecolyo.b38f82c9e94bcd9ce7c0.js => ecolyo.50bcfb4eaada554a6195.js} (99%)
diff --git a/app/ecolyo.b38f82c9e94bcd9ce7c0.js b/app/ecolyo.50bcfb4eaada554a6195.js
similarity index 99%
rename from app/ecolyo.b38f82c9e94bcd9ce7c0.js
rename to app/ecolyo.50bcfb4eaada554a6195.js
index 4d35ff038..f8821a3d8 100644
--- a/app/ecolyo.b38f82c9e94bcd9ce7c0.js
+++ b/app/ecolyo.50bcfb4eaada554a6195.js
@@ -2175,7 +2175,7 @@ var ChallengeCardOnGoing = function ChallengeCardOnGoing(_ref) {
updatedChallenge = _context2.sent;
dispatch((0, _challenge2.updateUserChallengeList)(updatedChallenge));
case 5:
- if (userChallenge.progress.quizProgress !== 5) navigate('/challenges/quiz');
+ if (!quizFinished) navigate('/challenges/quiz');
case 6:
case "end":
return _context2.stop();
@@ -2188,10 +2188,10 @@ var ChallengeCardOnGoing = function ChallengeCardOnGoing(_ref) {
};
}();
var goExploration = function goExploration() {
- if (userChallenge.progress.explorationProgress !== 5) navigate('/challenges/exploration');
+ if (!explorationFinished) navigate('/challenges/exploration');
};
var goAction = function goAction() {
- if (userChallenge.progress.actionProgress !== 5) navigate('/challenges/action');
+ if (!actionFinished) navigate('/challenges/action');
};
(0, _react.useEffect)(function () {
var subscribed = true;
@@ -2218,7 +2218,7 @@ var ChallengeCardOnGoing = function ChallengeCardOnGoing(_ref) {
while (1) {
switch (_context3.prev = _context3.next) {
case 0:
- if (!(userChallenge.duel.state === _enums.UserDuelState.LOCKED && userChallenge.progress.actionProgress === 5 && userChallenge.progress.quizProgress === 5 && userChallenge.progress.explorationProgress === 5)) {
+ if (!(userChallenge.duel.state === _enums.UserDuelState.LOCKED && quizFinished && explorationFinished && actionFinished)) {
_context3.next = 5;
break;
}
@@ -2248,7 +2248,7 @@ var ChallengeCardOnGoing = function ChallengeCardOnGoing(_ref) {
return function () {
subscribed = false;
};
- }, [currentDataload, userChallenge, dispatch, challengeService]);
+ }, [currentDataload, userChallenge, dispatch, challengeService, quizFinished, explorationFinished, actionFinished]);
var quizButton = function quizButton() {
return /*#__PURE__*/_react.default.createElement(_core.Button, {
title: t('challenge.card.ongoing.quiz'),
diff --git a/index.html b/index.html
index cac1c3ca7..f024127b7 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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.d9d0a97c74639946de38.js"></script><script src="app/ecolyo.b38f82c9e94bcd9ce7c0.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"><meta name="color-scheme" content="only dark">{{.ThemeCSS}} {{.CozyBar}}<script src="//{{.Domain}}/assets/js/piwik.js"></script></head><body><div role="application" class="application" data-cozy="{{.CozyData}}"><script src="vendors/ecolyo.d9d0a97c74639946de38.js"></script><script src="app/ecolyo.50bcfb4eaada554a6195.js"></script></div></body></html>
\ No newline at end of file
--
GitLab