From 3028e0242170d56922820a582c0eae0dfd221122 Mon Sep 17 00:00:00 2001 From: Elhoucine Azayou Date: Wed, 3 Jul 2024 15:37:28 +0200 Subject: [PATCH] feat(#vil-489): responsive vrac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Inclus les pages suivantes: * creer reportage * lancer un defi * jeu mimic * creer enigme * reagir une activité * poser une auestion * parametrer hymne * creer une histoire * re-inventer histoire * chanter un couplet --- src/components/Steps.tsx | 20 ++++- src/components/StepsButtons.tsx | 22 ++++-- src/components/activities/ActivitySelect.tsx | 6 +- src/components/activities/List.tsx | 6 +- .../anthem/AnthemTrack/AnthemTrack.module.css | 10 --- .../anthem/AnthemTrack/AnthemTrack.tsx | 76 +++++++++++++------ src/components/buttons/ThemeChoiceButton.tsx | 14 +++- src/components/selectors/MimicSelector.tsx | 51 +++++++++++-- src/pages/chanter-un-couplet/1.tsx | 5 +- src/pages/chanter-un-couplet/2.tsx | 5 +- src/pages/chanter-un-couplet/3.tsx | 5 +- src/pages/chanter-un-couplet/4.tsx | 5 +- src/pages/chanter-un-couplet/5.tsx | 5 +- src/pages/chanter-un-couplet/index.tsx | 5 +- src/pages/chanter-un-couplet/success.tsx | 5 +- src/pages/creer-un-jeu/index.tsx | 5 +- src/pages/creer-un-jeu/mimique/1.tsx | 5 +- src/pages/creer-un-jeu/mimique/2.tsx | 5 +- src/pages/creer-un-jeu/mimique/3.tsx | 5 +- src/pages/creer-un-jeu/mimique/4.tsx | 5 +- src/pages/creer-un-jeu/mimique/index.tsx | 41 +++++----- src/pages/creer-un-jeu/mimique/jouer.tsx | 5 +- src/pages/creer-un-jeu/mimique/success.tsx | 5 +- src/pages/creer-une-enigme/1.tsx | 5 +- src/pages/creer-une-enigme/2.tsx | 5 +- src/pages/creer-une-enigme/3.tsx | 5 +- src/pages/creer-une-enigme/4.tsx | 5 +- src/pages/creer-une-enigme/index.tsx | 5 +- src/pages/creer-une-enigme/success.tsx | 5 +- src/pages/creer-une-histoire/1.tsx | 9 ++- src/pages/creer-une-histoire/2.tsx | 9 ++- src/pages/creer-une-histoire/3.tsx | 9 ++- src/pages/creer-une-histoire/4.tsx | 9 ++- src/pages/creer-une-histoire/5.tsx | 5 +- src/pages/creer-une-histoire/index.tsx | 28 +++---- src/pages/creer-une-histoire/success.tsx | 5 +- src/pages/lancer-un-defi/1.tsx | 5 +- src/pages/lancer-un-defi/2.tsx | 5 +- src/pages/lancer-un-defi/3.tsx | 5 +- src/pages/lancer-un-defi/4.tsx | 5 +- src/pages/lancer-un-defi/culinaire/1.tsx | 8 +- src/pages/lancer-un-defi/culinaire/2.tsx | 5 +- src/pages/lancer-un-defi/culinaire/3.tsx | 5 +- src/pages/lancer-un-defi/culinaire/4.tsx | 5 +- src/pages/lancer-un-defi/ecologique/1.tsx | 5 +- src/pages/lancer-un-defi/ecologique/2.tsx | 5 +- src/pages/lancer-un-defi/ecologique/3.tsx | 5 +- src/pages/lancer-un-defi/ecologique/4.tsx | 5 +- src/pages/lancer-un-defi/index.tsx | 5 +- src/pages/lancer-un-defi/linguistique/1.tsx | 5 +- src/pages/lancer-un-defi/linguistique/2.tsx | 5 +- src/pages/lancer-un-defi/linguistique/3.tsx | 5 +- src/pages/lancer-un-defi/linguistique/4.tsx | 5 +- src/pages/lancer-un-defi/linguistique/5.tsx | 5 +- src/pages/lancer-un-defi/success.tsx | 5 +- src/pages/parametrer-hymne/1.tsx | 10 ++- src/pages/parametrer-hymne/2.tsx | 5 +- src/pages/parametrer-hymne/3.tsx | 5 +- src/pages/parametrer-hymne/4.tsx | 5 +- src/pages/parametrer-hymne/5.tsx | 5 +- src/pages/parametrer-hymne/success.tsx | 5 +- src/pages/poser-une-question/1.tsx | 5 +- src/pages/poser-une-question/2.tsx | 5 +- src/pages/poser-une-question/3.tsx | 5 +- src/pages/poser-une-question/success.tsx | 5 +- src/pages/re-inventer-une-histoire/1.tsx | 9 ++- src/pages/re-inventer-une-histoire/2.tsx | 9 ++- src/pages/re-inventer-une-histoire/3.tsx | 9 ++- src/pages/re-inventer-une-histoire/4.tsx | 9 ++- src/pages/re-inventer-une-histoire/5.tsx | 7 +- src/pages/re-inventer-une-histoire/index.tsx | 5 +- .../re-inventer-une-histoire/success.tsx | 5 +- src/pages/reagir-a-une-activite/1.tsx | 5 +- src/pages/reagir-a-une-activite/2.tsx | 5 +- src/pages/reagir-a-une-activite/3.tsx | 5 +- src/pages/reagir-a-une-activite/success.tsx | 5 +- src/pages/realiser-un-reportage/1.tsx | 5 +- src/pages/realiser-un-reportage/2.tsx | 5 +- src/pages/realiser-un-reportage/3.tsx | 5 +- src/pages/realiser-un-reportage/index.tsx | 5 +- src/pages/realiser-un-reportage/success.tsx | 5 +- 81 files changed, 416 insertions(+), 255 deletions(-) diff --git a/src/components/Steps.tsx b/src/components/Steps.tsx index 3e1a74799..6463dc49f 100644 --- a/src/components/Steps.tsx +++ b/src/components/Steps.tsx @@ -58,10 +58,26 @@ export const Steps = ({ steps, urls, activeStep = 0, errorSteps = [], onBeforeLe }} /> } - sx={{ zIndex: 1, position: 'relative', background: 'none', p: 3 }} + sx={{ + zIndex: 1, + position: 'relative', + background: 'none', + p: { + xs: '24px 0', + md: 3, + }, + }} > {steps.map((label, index) => ( - + { xs: '0.2rem', sm: '1rem', }, - margin: '3rem 0', + margin: '1rem 0', minHeight: '2rem', }} > {prev !== undefined && (typeof prev === 'string' ? ( - ) : ( - @@ -43,13 +49,19 @@ export const StepsButton = ({ prev, next }: StepsButtonProps) => { {next !== undefined && (typeof next === 'string' ? ( - ) : ( - diff --git a/src/components/activities/ActivitySelect.tsx b/src/components/activities/ActivitySelect.tsx index 20dfb7efc..0f34598b4 100644 --- a/src/components/activities/ActivitySelect.tsx +++ b/src/components/activities/ActivitySelect.tsx @@ -79,9 +79,9 @@ export const ActivitySelect = ({ value, onChange, onSelect, style, label = 'Sél }} additionalContent={ selectedActivity !== null ? ( -
+
-
+
@@ -84,13 +90,19 @@ const MimicSelector = ({ MimicData, mimicNumber, onDataChange, onVideoChange, on {!isFieldValid(MimicData.video as string | null) && (
{!showError && ( - )} {showError && (
- Ce champ est obligatoire @@ -114,7 +126,13 @@ const MimicSelector = ({ MimicData, mimicNumber, onDataChange, onVideoChange, on value={MimicData.signification || ''} label="Signification réelle" onChange={onDataChange('signification')} - style={{ width: '100%', margin: '10px' }} + sx={{ + width: '100%', + margin: { + xs: 0, + md: '10px', + }, + }} error={showError && !isFieldValid(MimicData.signification)} helperText={showError && !isFieldValid(MimicData.signification) ? 'Ce champ est obligatoire' : ''} inputProps={{ @@ -133,7 +151,14 @@ const MimicSelector = ({ MimicData, mimicNumber, onDataChange, onVideoChange, on label="Origine" value={MimicData.origine || ''} onChange={onDataChange('origine')} - style={{ width: '100%', margin: '10px', fontStyle: 'italic' }} + sx={{ + width: '100%', + margin: { + xs: 0, + md: '10px', + }, + fontStyle: 'italic', + }} helperText={'Ce champ est optionnel'} inputProps={{ maxLength: 800, @@ -155,7 +180,13 @@ const MimicSelector = ({ MimicData, mimicNumber, onDataChange, onVideoChange, on label="Signification inventée 1" value={MimicData.fakeSignification1 || ''} onChange={onDataChange('fakeSignification1')} - style={{ width: '100%', margin: '10px' }} + sx={{ + width: '100%', + margin: { + xs: 0, + md: '10px', + }, + }} error={showError && !isFieldValid(MimicData.fakeSignification1)} helperText={showError && !isFieldValid(MimicData.fakeSignification1) ? 'Ce champ est obligatoire' : ''} inputProps={{ @@ -173,7 +204,13 @@ const MimicSelector = ({ MimicData, mimicNumber, onDataChange, onVideoChange, on label="Signification inventée 2" value={MimicData.fakeSignification2 || ''} onChange={onDataChange('fakeSignification2')} - style={{ width: '100%', margin: '10px' }} + sx={{ + width: '100%', + margin: { + xs: 0, + md: '10px', + }, + }} error={showError && !isFieldValid(MimicData.fakeSignification2)} helperText={showError && !isFieldValid(MimicData.fakeSignification2) ? 'Ce champ est obligatoire' : ''} inputProps={{ diff --git a/src/pages/chanter-un-couplet/1.tsx b/src/pages/chanter-un-couplet/1.tsx index d412033ed..8f6856f0e 100644 --- a/src/pages/chanter-un-couplet/1.tsx +++ b/src/pages/chanter-un-couplet/1.tsx @@ -8,6 +8,7 @@ import styles from '../../styles/chanter-un-couplet.module.css'; import { postMixAudio } from 'src/api/audio/audio-mix.post'; import { deleteAudio } from 'src/api/audio/audio.delete'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import type { AudioMixerTrack } from 'src/components/audio/AudioMixer/AudioMixer'; @@ -143,7 +144,7 @@ const SongStep1 = () => { } return ( -
+ { /> )}
-
+ diff --git a/src/pages/chanter-un-couplet/2.tsx b/src/pages/chanter-un-couplet/2.tsx index 2b7ad5c76..f75e1affd 100644 --- a/src/pages/chanter-un-couplet/2.tsx +++ b/src/pages/chanter-un-couplet/2.tsx @@ -3,6 +3,7 @@ import React from 'react'; import styles from '../../styles/chanter-un-couplet.module.css'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { SyllableEditor } from 'src/components/activities/content/editors/SyllableEditor'; @@ -35,7 +36,7 @@ const SongStep2 = () => { return ( -
+ {
-
+ ); }; diff --git a/src/pages/chanter-un-couplet/3.tsx b/src/pages/chanter-un-couplet/3.tsx index e766ccb0c..d38e8b14c 100644 --- a/src/pages/chanter-un-couplet/3.tsx +++ b/src/pages/chanter-un-couplet/3.tsx @@ -3,6 +3,7 @@ import React from 'react'; import styles from '../../styles/chanter-un-couplet.module.css'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { SyllableEditor } from 'src/components/activities/content/editors/SyllableEditor'; @@ -35,7 +36,7 @@ const SongStep3 = () => { const introChorus = data?.anthemTracks?.find((track) => track.type === TrackType.INTRO_CHORUS); return ( -
+ {
-
+ ); }; diff --git a/src/pages/chanter-un-couplet/4.tsx b/src/pages/chanter-un-couplet/4.tsx index a452eeba2..d3af47d69 100644 --- a/src/pages/chanter-un-couplet/4.tsx +++ b/src/pages/chanter-un-couplet/4.tsx @@ -10,6 +10,7 @@ import styles from '../../styles/chanter-un-couplet.module.css'; import { postMixAudio } from 'src/api/audio/audio-mix.post'; import { deleteAudio } from 'src/api/audio/audio.delete'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import AudioEditor from 'src/components/activities/content/editors/AudioEditor/AudioEditor'; @@ -215,7 +216,7 @@ const SongStep4 = () => { return ( -
+ {
- + ); }; diff --git a/src/pages/chanter-un-couplet/5.tsx b/src/pages/chanter-un-couplet/5.tsx index a6a18d06f..f97e67ae8 100644 --- a/src/pages/chanter-un-couplet/5.tsx +++ b/src/pages/chanter-un-couplet/5.tsx @@ -8,6 +8,7 @@ import Button from '@mui/material/Button'; import CircularProgress from '@mui/material/CircularProgress'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { AudioPlayer } from 'src/components/audio/AudioPlayer'; @@ -49,7 +50,7 @@ const SongStep5 = () => { return ( -
+ {
- + diff --git a/src/pages/chanter-un-couplet/index.tsx b/src/pages/chanter-un-couplet/index.tsx index ab8c306e5..b26b195e3 100644 --- a/src/pages/chanter-un-couplet/index.tsx +++ b/src/pages/chanter-un-couplet/index.tsx @@ -2,6 +2,7 @@ import { useRouter } from 'next/router'; import React from 'react'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { StepsButton } from 'src/components/StepsButtons'; import { AudioPlayer } from 'src/components/audio/AudioPlayer'; import { ActivityContext } from 'src/contexts/activityContext'; @@ -85,7 +86,7 @@ const Anthem = () => { } return ( -
+

Découvrez l'hymne de votre village idéal

@@ -110,7 +111,7 @@ const Anthem = () => {

À la fin de l'année, vous pourrez écouter l'hymne composé des couplets de tous les pélicopains !

-
+ ); diff --git a/src/pages/chanter-un-couplet/success.tsx b/src/pages/chanter-un-couplet/success.tsx index e5dc6effa..b243eb836 100644 --- a/src/pages/chanter-un-couplet/success.tsx +++ b/src/pages/chanter-un-couplet/success.tsx @@ -4,13 +4,14 @@ import React from 'react'; import { Button } from '@mui/material'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { bgPage } from 'src/styles/variables.const'; import PelicoSouriant from 'src/svg/pelico/pelico-souriant.svg'; const SongSuccess = () => { return ( -
+

Votre couplet a bien été publié !

@@ -22,7 +23,7 @@ const SongSuccess = () => {
-
+ ); }; diff --git a/src/pages/creer-un-jeu/index.tsx b/src/pages/creer-un-jeu/index.tsx index 100bf5e15..37d141028 100644 --- a/src/pages/creer-un-jeu/index.tsx +++ b/src/pages/creer-un-jeu/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { ActivityChoice } from 'src/components/activities/ActivityChoice'; import MimiqueIcon from 'src/svg/jeu/mimique.svg'; import MonnaieIcon from 'src/svg/jeu/monnaie.svg'; @@ -25,7 +26,7 @@ const activities = [ const Jeu = () => { return ( -
+

Choisissez le jeu auquel vous souhaitez jouer

@@ -33,7 +34,7 @@ const Jeu = () => {

-
+ ); }; diff --git a/src/pages/creer-un-jeu/mimique/1.tsx b/src/pages/creer-un-jeu/mimique/1.tsx index d5e736113..73c0125e0 100644 --- a/src/pages/creer-un-jeu/mimique/1.tsx +++ b/src/pages/creer-un-jeu/mimique/1.tsx @@ -4,6 +4,7 @@ import React from 'react'; import { isGame } from 'src/activity-types/anyActivity'; import { DEFAULT_MIMIC_DATA, isMimic } from 'src/activity-types/game.constants'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { BackButton } from 'src/components/buttons/BackButton'; import MimicSelector from 'src/components/selectors/MimicSelector'; @@ -77,7 +78,7 @@ const MimiqueStep1 = () => { return ( -
+ {!isEdit && } { onPrev={null} onVideoChange={videoChange} /> -
+ ); }; diff --git a/src/pages/creer-un-jeu/mimique/2.tsx b/src/pages/creer-un-jeu/mimique/2.tsx index 476f83f3c..62221c2a4 100644 --- a/src/pages/creer-un-jeu/mimique/2.tsx +++ b/src/pages/creer-un-jeu/mimique/2.tsx @@ -4,6 +4,7 @@ import React from 'react'; import { isGame } from 'src/activity-types/anyActivity'; import { isMimic, isMimicValid } from 'src/activity-types/game.constants'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import MimicSelector from 'src/components/selectors/MimicSelector'; import { ActivityContext } from 'src/contexts/activityContext'; @@ -60,7 +61,7 @@ const MimiqueStep2 = () => { return ( -
+ { onPrev={onPrev} onVideoChange={videoChange} /> -
+ ); }; diff --git a/src/pages/creer-un-jeu/mimique/3.tsx b/src/pages/creer-un-jeu/mimique/3.tsx index fa5fe96fd..185d4620e 100644 --- a/src/pages/creer-un-jeu/mimique/3.tsx +++ b/src/pages/creer-un-jeu/mimique/3.tsx @@ -4,6 +4,7 @@ import React from 'react'; import { isGame } from 'src/activity-types/anyActivity'; import { isMimic, isMimicValid } from 'src/activity-types/game.constants'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import MimicSelector from 'src/components/selectors/MimicSelector'; import { ActivityContext } from 'src/contexts/activityContext'; @@ -61,7 +62,7 @@ const MimiqueStep3 = () => { return ( -
+ { onPrev={onPrev} onVideoChange={videoChange} /> -
+ ); }; diff --git a/src/pages/creer-un-jeu/mimique/4.tsx b/src/pages/creer-un-jeu/mimique/4.tsx index 579ef745c..d9c6bfa3c 100644 --- a/src/pages/creer-un-jeu/mimique/4.tsx +++ b/src/pages/creer-un-jeu/mimique/4.tsx @@ -9,6 +9,7 @@ import { Grid, Button, Radio, RadioGroup, FormControlLabel, Backdrop, CircularPr import { isGame } from 'src/activity-types/anyActivity'; import { isMimic, isMimicValid } from 'src/activity-types/game.constants'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { CustomRadio } from 'src/components/buttons/CustomRadio'; import { EditButton } from 'src/components/buttons/EditButton'; @@ -67,7 +68,7 @@ const MimiqueStep4 = () => { return ( -
+ {

{data.game3.origine}

- + diff --git a/src/pages/creer-un-jeu/mimique/index.tsx b/src/pages/creer-un-jeu/mimique/index.tsx index f6f4a2290..405a84d57 100644 --- a/src/pages/creer-un-jeu/mimique/index.tsx +++ b/src/pages/creer-un-jeu/mimique/index.tsx @@ -3,15 +3,17 @@ import { useRouter } from 'next/router'; import React from 'react'; import Button from '@mui/material/Button'; +import { Box } from '@mui/system'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; const Mimique = () => { const router = useRouter(); return ( -
+

Qu’est-ce qu’une mimique ?

Une mimique est un geste du corps qui exprime une émotion ou une pensée, et que l’on fait dans certaine situation. Par exemple, un signe des @@ -25,25 +27,24 @@ const Mimique = () => { illustrant la mimique, une explication de sa signification et de son origine. Pour pimenter le jeu, à chaque étape vous devrez également inventer deux significations fausses … à vos Pélicopains de deviner ce qui signifie réellement vos mimiques !

- - - -
+ + + + + + ); }; diff --git a/src/pages/creer-un-jeu/mimique/jouer.tsx b/src/pages/creer-un-jeu/mimique/jouer.tsx index 0a417f035..33bd90d26 100644 --- a/src/pages/creer-un-jeu/mimique/jouer.tsx +++ b/src/pages/creer-un-jeu/mimique/jouer.tsx @@ -12,6 +12,7 @@ import { AvatarImg } from 'src/components/Avatar'; import { Base } from 'src/components/Base'; import { Flag } from 'src/components/Flag'; import { Modal } from 'src/components/Modal'; +import { PageLayout } from 'src/components/PageLayout'; import { UserDisplayName } from 'src/components/UserDisplayName'; import { RightNavigation } from 'src/components/accueil/RightNavigation'; import GameStats from 'src/components/activities/GameStats'; @@ -287,7 +288,7 @@ const PlayMimic = () => { return ( } hideLeftNav showSubHeader> -
+

Jouer au jeu des mimiques !

@@ -442,7 +443,7 @@ const PlayMimic = () => { -
+ ); }; diff --git a/src/pages/creer-un-jeu/mimique/success.tsx b/src/pages/creer-un-jeu/mimique/success.tsx index d629ffa5b..a538d4121 100644 --- a/src/pages/creer-un-jeu/mimique/success.tsx +++ b/src/pages/creer-un-jeu/mimique/success.tsx @@ -6,6 +6,7 @@ import Button from '@mui/material/Button'; import { isGame } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { ActivityContext } from 'src/contexts/activityContext'; import { useGameRequests } from 'src/services/useGames'; import { bgPage } from 'src/styles/variables.const'; @@ -30,7 +31,7 @@ const PresentationSuccess = () => { return ( -
+

{'Vos mimiques ont bien été publiées !'}

@@ -59,7 +60,7 @@ const PresentationSuccess = () => { )}
-
+ ); }; diff --git a/src/pages/creer-une-enigme/1.tsx b/src/pages/creer-une-enigme/1.tsx index fb6959f44..15d20681e 100644 --- a/src/pages/creer-une-enigme/1.tsx +++ b/src/pages/creer-une-enigme/1.tsx @@ -7,6 +7,7 @@ import { isEnigme } from 'src/activity-types/anyActivity'; import { ENIGME_TYPES, getCategoryName } from 'src/activity-types/enigme.constants'; import type { EnigmeData } from 'src/activity-types/enigme.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { BackButton } from 'src/components/buttons/BackButton'; @@ -111,7 +112,7 @@ const EnigmeStep1 = () => { return ( -
+ {!isEdit && } { )}
- + ); }; diff --git a/src/pages/creer-une-enigme/2.tsx b/src/pages/creer-une-enigme/2.tsx index eb9b7366a..5cb1d24d9 100644 --- a/src/pages/creer-une-enigme/2.tsx +++ b/src/pages/creer-une-enigme/2.tsx @@ -5,6 +5,7 @@ import { isEnigme } from 'src/activity-types/anyActivity'; import { ENIGME_TYPES, getSubcategoryName } from 'src/activity-types/enigme.constants'; import type { EnigmeData } from 'src/activity-types/enigme.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentEditor } from 'src/components/activities/content'; @@ -61,7 +62,7 @@ const EnigmeStep2 = () => { return ( -
+ { />
- + ); }; diff --git a/src/pages/creer-une-enigme/3.tsx b/src/pages/creer-une-enigme/3.tsx index 6d3542107..9a9f931bb 100644 --- a/src/pages/creer-une-enigme/3.tsx +++ b/src/pages/creer-une-enigme/3.tsx @@ -5,6 +5,7 @@ import { isEnigme } from 'src/activity-types/anyActivity'; import { getSubcategoryName } from 'src/activity-types/enigme.constants'; import type { EnigmeData } from 'src/activity-types/enigme.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentEditor } from 'src/components/activities/content'; @@ -61,7 +62,7 @@ const EnigmeStep3 = () => { return ( -
+ { />
- + ); }; diff --git a/src/pages/creer-une-enigme/4.tsx b/src/pages/creer-une-enigme/4.tsx index e24bc711b..b4d1110ed 100644 --- a/src/pages/creer-une-enigme/4.tsx +++ b/src/pages/creer-une-enigme/4.tsx @@ -12,6 +12,7 @@ import { isEnigme } from 'src/activity-types/anyActivity'; import { ENIGME_TYPES, getCategoryName, getSubcategoryName } from 'src/activity-types/enigme.constants'; import type { EnigmeData } from 'src/activity-types/enigme.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentView } from 'src/components/activities/content/ContentView'; @@ -74,7 +75,7 @@ const EnigmeStep4 = () => { return ( -
+ {
- + diff --git a/src/pages/creer-une-enigme/index.tsx b/src/pages/creer-une-enigme/index.tsx index afa257054..73e4aa9d2 100644 --- a/src/pages/creer-une-enigme/index.tsx +++ b/src/pages/creer-une-enigme/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { ActivityChoice } from 'src/components/activities/ActivityChoice'; import EvenementIcon from 'src/svg/enigme/evenement-mystere.svg'; import LocationIcon from 'src/svg/enigme/location.svg'; @@ -48,7 +49,7 @@ const activities = [ const Enigme = () => { return ( -
+

Qu'allez vous faire deviner à vos Pélicopains ?

@@ -57,7 +58,7 @@ const Enigme = () => {
-
+
); }; diff --git a/src/pages/creer-une-enigme/success.tsx b/src/pages/creer-une-enigme/success.tsx index 688ce8e98..20292a32b 100644 --- a/src/pages/creer-une-enigme/success.tsx +++ b/src/pages/creer-une-enigme/success.tsx @@ -4,13 +4,14 @@ import React from 'react'; import { Button } from '@mui/material'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { bgPage } from 'src/styles/variables.const'; import PelicoSouriant from 'src/svg/pelico/pelico-souriant.svg'; const PresentationSuccess = () => { return ( -
+

Votre énigme a bien été publiée !

@@ -22,7 +23,7 @@ const PresentationSuccess = () => {
-
+ ); }; diff --git a/src/pages/creer-une-histoire/1.tsx b/src/pages/creer-une-histoire/1.tsx index d90da9376..bc9be1629 100644 --- a/src/pages/creer-une-histoire/1.tsx +++ b/src/pages/creer-une-histoire/1.tsx @@ -9,6 +9,7 @@ import { isStory } from 'src/activity-types/anyActivity'; import { DEFAULT_STORY_DATA, ODD_CHOICE } from 'src/activity-types/story.constants'; import { Base } from 'src/components/Base'; import { KeepRatio } from 'src/components/KeepRatio'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ImageModal } from 'src/components/activities/content/editors/ImageEditor/ImageModal'; @@ -76,7 +77,7 @@ const StoryStep1 = () => { return ( -
+ {!isEdit && } {

Choisissez et dessinez l’objectif du développement durable à atteindre

Pour atteindre votre objectif de développement durable, vous choisirez un objet et un lieu aux étapes suivantes.

Choisissez votre objectif et dessinez-le.

- +
-
+
setIsImageModalOpen(true)} style={{ width: '100%', color: `${isError ? errorColor : primaryColor}` }}>
{
-
+ ); }; diff --git a/src/pages/creer-une-histoire/2.tsx b/src/pages/creer-une-histoire/2.tsx index a1c6ece68..560a1add2 100644 --- a/src/pages/creer-une-histoire/2.tsx +++ b/src/pages/creer-une-histoire/2.tsx @@ -8,6 +8,7 @@ import { TextField, Grid, ButtonBase } from '@mui/material'; import { isStory } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; import { KeepRatio } from 'src/components/KeepRatio'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ImageModal } from 'src/components/activities/content/editors/ImageEditor/ImageModal'; @@ -64,7 +65,7 @@ const StoryStep2 = () => { } return ( -
+ { Cet objet, tout comme le lieu que vous choisirez à l’étape suivante, est magique ! Grâce à leurs pouvoirs, le village idéal va atteindre l’objectif du développement durable que vous avez choisi à l’étape précédente.

- +
-
+
setIsImageModalOpen(true)} style={{ width: '100%', color: `${primaryColor}` }}>
{
-
+ ); }; diff --git a/src/pages/creer-une-histoire/3.tsx b/src/pages/creer-une-histoire/3.tsx index dff02cb9f..c797dfb52 100644 --- a/src/pages/creer-une-histoire/3.tsx +++ b/src/pages/creer-une-histoire/3.tsx @@ -8,6 +8,7 @@ import { TextField, Grid, ButtonBase } from '@mui/material'; import { isStory } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; import { KeepRatio } from 'src/components/KeepRatio'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ImageModal } from 'src/components/activities/content/editors/ImageEditor/ImageModal'; @@ -79,7 +80,7 @@ const StoryStep3 = () => { return ( -
+ { Ce lieu, tout comme l’objet que vous avez choisi à l’étape précédente, est extraodinaire ! Grâce à leurs pouvoirs, le village idéal va atteindre l’objectif de développement durable que vous avez choisi.

- +
-
+
setIsImageModalOpen(true)} style={{ width: '100%', color: `${primaryColor}` }}>
{
-
+ ); }; diff --git a/src/pages/creer-une-histoire/4.tsx b/src/pages/creer-une-histoire/4.tsx index 083094080..cf7227884 100644 --- a/src/pages/creer-une-histoire/4.tsx +++ b/src/pages/creer-une-histoire/4.tsx @@ -8,6 +8,7 @@ import { TextField, Grid, ButtonBase } from '@mui/material'; import { isStory } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; import { KeepRatio } from 'src/components/KeepRatio'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ImageModal } from 'src/components/activities/content/editors/ImageEditor/ImageModal'; @@ -72,7 +73,7 @@ const StoryStep4 = () => { return ( -
+ { Racontez à vos pélicopains comment le village-idéal et l’objet magique nous permettent d’atteindre l’objectif du développement durable que vous avez choisi ! Illustrez votre histoire avec un dessin de votre visite dans le village-idéal.

- + -
+
setIsImageModalOpen(true)} style={{ width: '100%', color: `${primaryColor}` }}>
{
-
+ ); }; diff --git a/src/pages/creer-une-histoire/5.tsx b/src/pages/creer-une-histoire/5.tsx index 7dc8d84e7..514defc94 100644 --- a/src/pages/creer-une-histoire/5.tsx +++ b/src/pages/creer-une-histoire/5.tsx @@ -7,6 +7,7 @@ import { Tooltip, Button, Backdrop, CircularProgress } from '@mui/material'; import { isStory } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; import { ImageStepContainer } from 'src/components/FinalStep/ImageStepContainer'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getErrorSteps } from 'src/components/activities/storyChecks'; @@ -85,7 +86,7 @@ const StoryStep5 = () => { return ( -
+ { />
-
+
diff --git a/src/pages/creer-une-histoire/index.tsx b/src/pages/creer-une-histoire/index.tsx index d622a0d07..1b58e9d22 100644 --- a/src/pages/creer-une-histoire/index.tsx +++ b/src/pages/creer-une-histoire/index.tsx @@ -1,14 +1,15 @@ import Link from 'next/link'; import React from 'react'; -import { Button } from '@mui/material'; +import { Box, Button } from '@mui/material'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; const Story = () => { return ( -
+

Inventer l’histoire du village-idéal

Comme vous le savez déjà, les Olympiades de Pélico ont commencé et elles ont lieu dans le village-idéal, l’endroit où tout est possible… @@ -35,21 +36,14 @@ const Story = () => { Laissez libre court à votre imagination ! Souvenez-vous que si l’objectif du développement durable est bien réel, l’objet et lieu que vous choisissez pour l’atteindre sont magiques 🙂

-
- - - + + + + + + ); }; diff --git a/src/pages/creer-une-histoire/success.tsx b/src/pages/creer-une-histoire/success.tsx index 280071c07..cb74e9199 100644 --- a/src/pages/creer-une-histoire/success.tsx +++ b/src/pages/creer-une-histoire/success.tsx @@ -4,13 +4,14 @@ import React from 'react'; import { Button } from '@mui/material'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { bgPage } from 'src/styles/variables.const'; import PelicoSouriant from 'src/svg/pelico/pelico-souriant.svg'; const StorySuccess = () => { return ( -
+

Votre histoire a bien été publiée ! @@ -24,7 +25,7 @@ const StorySuccess = () => {

-
+ ); }; diff --git a/src/pages/lancer-un-defi/1.tsx b/src/pages/lancer-un-defi/1.tsx index f278a0fa2..5d575b9e5 100644 --- a/src/pages/lancer-un-defi/1.tsx +++ b/src/pages/lancer-un-defi/1.tsx @@ -7,6 +7,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { DEFI, isFree } from 'src/activity-types/defi.constants'; import type { FreeDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { BackButton } from 'src/components/buttons/BackButton'; @@ -67,7 +68,7 @@ const FreeDefiStep1 = () => { return ( -
+ {!isEdit && } { /> {}
-
+ ); }; diff --git a/src/pages/lancer-un-defi/2.tsx b/src/pages/lancer-un-defi/2.tsx index 18f9e5bbf..8391e558c 100644 --- a/src/pages/lancer-un-defi/2.tsx +++ b/src/pages/lancer-un-defi/2.tsx @@ -5,6 +5,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isFree } from 'src/activity-types/defi.constants'; import type { FreeDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentEditor } from 'src/components/activities/content'; @@ -48,7 +49,7 @@ const FreeDefiStep2 = () => { return ( -
+ {
-
+ ); }; diff --git a/src/pages/lancer-un-defi/3.tsx b/src/pages/lancer-un-defi/3.tsx index 50251decc..f04cd1ae0 100644 --- a/src/pages/lancer-un-defi/3.tsx +++ b/src/pages/lancer-un-defi/3.tsx @@ -7,6 +7,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { FREE_DEFIS, isFree } from 'src/activity-types/defi.constants'; import type { FreeDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getErrorSteps } from 'src/components/activities/defiChecksFree'; @@ -68,7 +69,7 @@ const FreeDefiStep3 = () => { return ( -
+ {
-
+ ); }; diff --git a/src/pages/lancer-un-defi/4.tsx b/src/pages/lancer-un-defi/4.tsx index 89e5c0fc1..8b67de604 100644 --- a/src/pages/lancer-un-defi/4.tsx +++ b/src/pages/lancer-un-defi/4.tsx @@ -12,6 +12,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isFree, getDefi, DEFI } from 'src/activity-types/defi.constants'; import type { FreeDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentView } from 'src/components/activities/content/ContentView'; @@ -67,7 +68,7 @@ const FreeDefiStep4 = () => { return ( -
+ {
-
+ diff --git a/src/pages/lancer-un-defi/culinaire/1.tsx b/src/pages/lancer-un-defi/culinaire/1.tsx index 9bc5b3aa7..cd719ac7b 100644 --- a/src/pages/lancer-un-defi/culinaire/1.tsx +++ b/src/pages/lancer-un-defi/culinaire/1.tsx @@ -10,6 +10,7 @@ import { DEFI, isCooking } from 'src/activity-types/defi.constants'; import type { CookingDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; import { KeepRatio } from 'src/components/KeepRatio'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ImageModal } from 'src/components/activities/content/editors/ImageEditor/ImageModal'; @@ -84,7 +85,7 @@ const DefiStep1 = () => { return ( -
+ {!isEdit && } {
-
+
setIsImageModalOpen(true)} style={{ width: '100%' }}>
{ backgroundColor: bgPage, height: '100%', width: '100%', + maxWidth: '320px', display: 'flex', alignItems: 'center', justifyContent: 'center', @@ -201,7 +203,7 @@ const DefiStep1 = () => {
{}
-
+ ); }; diff --git a/src/pages/lancer-un-defi/culinaire/2.tsx b/src/pages/lancer-un-defi/culinaire/2.tsx index ae598d05c..ff7d830fd 100644 --- a/src/pages/lancer-un-defi/culinaire/2.tsx +++ b/src/pages/lancer-un-defi/culinaire/2.tsx @@ -5,6 +5,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isCooking } from 'src/activity-types/defi.constants'; import type { CookingDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentEditor } from 'src/components/activities/content'; @@ -48,7 +49,7 @@ const DefiStep2 = () => { return ( -
+ {
-
+
); }; diff --git a/src/pages/lancer-un-defi/culinaire/3.tsx b/src/pages/lancer-un-defi/culinaire/3.tsx index 96c515382..424817b06 100644 --- a/src/pages/lancer-un-defi/culinaire/3.tsx +++ b/src/pages/lancer-un-defi/culinaire/3.tsx @@ -7,6 +7,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isCooking, COOKING_DEFIS } from 'src/activity-types/defi.constants'; import type { CookingDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getErrorSteps } from 'src/components/activities/defiChecksCooking'; @@ -67,7 +68,7 @@ const DefiStep3 = () => { return ( -
+ {
-
+
); }; diff --git a/src/pages/lancer-un-defi/culinaire/4.tsx b/src/pages/lancer-un-defi/culinaire/4.tsx index 5b88fcade..c1f4c3c5e 100644 --- a/src/pages/lancer-un-defi/culinaire/4.tsx +++ b/src/pages/lancer-un-defi/culinaire/4.tsx @@ -14,6 +14,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isCooking, getDefi, DEFI } from 'src/activity-types/defi.constants'; import type { CookingDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentView } from 'src/components/activities/content/ContentView'; @@ -69,7 +70,7 @@ const DefiStep4 = () => { return ( -
+ {
-
+ diff --git a/src/pages/lancer-un-defi/ecologique/1.tsx b/src/pages/lancer-un-defi/ecologique/1.tsx index b592ce36f..b42b7f7ff 100644 --- a/src/pages/lancer-un-defi/ecologique/1.tsx +++ b/src/pages/lancer-un-defi/ecologique/1.tsx @@ -5,6 +5,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isEco, DEFI, ECO_ACTIONS } from 'src/activity-types/defi.constants'; import type { EcoDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { BackButton } from 'src/components/buttons/BackButton'; import { ThemeChoiceButton } from 'src/components/buttons/ThemeChoiceButton'; @@ -49,7 +50,7 @@ const DefiEcoStep1 = () => { return ( -
+ {!isEdit && } { ))}
-
+
); }; diff --git a/src/pages/lancer-un-defi/ecologique/2.tsx b/src/pages/lancer-un-defi/ecologique/2.tsx index 24710471a..61d53c9c2 100644 --- a/src/pages/lancer-un-defi/ecologique/2.tsx +++ b/src/pages/lancer-un-defi/ecologique/2.tsx @@ -5,6 +5,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isEco } from 'src/activity-types/defi.constants'; import type { EcoDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentEditor } from 'src/components/activities/content/'; @@ -48,7 +49,7 @@ const DefiEcoStep2 = () => { return ( -
+ {
-
+ ); }; diff --git a/src/pages/lancer-un-defi/ecologique/3.tsx b/src/pages/lancer-un-defi/ecologique/3.tsx index 614b13c6c..a57aa8b76 100644 --- a/src/pages/lancer-un-defi/ecologique/3.tsx +++ b/src/pages/lancer-un-defi/ecologique/3.tsx @@ -7,6 +7,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isEco, ECO_DEFIS } from 'src/activity-types/defi.constants'; import type { EcoDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getErrorSteps } from 'src/components/activities/defiEcologieChecks'; @@ -68,7 +69,7 @@ const DefiEcoStep3 = () => { return ( -
+ {
- + ); }; diff --git a/src/pages/lancer-un-defi/ecologique/4.tsx b/src/pages/lancer-un-defi/ecologique/4.tsx index 898acf422..b1f8fcca3 100644 --- a/src/pages/lancer-un-defi/ecologique/4.tsx +++ b/src/pages/lancer-un-defi/ecologique/4.tsx @@ -12,6 +12,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isEco, getDefi, ECO_ACTIONS, DEFI } from 'src/activity-types/defi.constants'; import type { EcoDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentView } from 'src/components/activities/content/ContentView'; @@ -67,7 +68,7 @@ const DefiEcoStep4 = () => { return ( -
+ {
- + diff --git a/src/pages/lancer-un-defi/index.tsx b/src/pages/lancer-un-defi/index.tsx index 2569b4a15..ee4139b4d 100644 --- a/src/pages/lancer-un-defi/index.tsx +++ b/src/pages/lancer-un-defi/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { ActivityChoice } from 'src/components/activities/ActivityChoice'; import CulinaireIcon from 'src/svg/defi/culinaire.svg'; import EcologiqueIcon from 'src/svg/defi/ecologique.svg'; @@ -39,7 +40,7 @@ const activities = [ const Defi = () => { return ( -
+

Choisissez le défi que vous souhaitez réaliser

@@ -49,7 +50,7 @@ const Defi = () => {

-
+ ); }; diff --git a/src/pages/lancer-un-defi/linguistique/1.tsx b/src/pages/lancer-un-defi/linguistique/1.tsx index 923e7ee8b..a05720202 100644 --- a/src/pages/lancer-un-defi/linguistique/1.tsx +++ b/src/pages/lancer-un-defi/linguistique/1.tsx @@ -9,6 +9,7 @@ import { DEFI, isLanguage, LANGUAGE_SCHOOL } from 'src/activity-types/defi.const import type { LanguageDefiData } from 'src/activity-types/defi.types'; import type { MascotteData } from 'src/activity-types/mascotte.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { BackButton } from 'src/components/buttons/BackButton'; @@ -127,7 +128,7 @@ const DefiStep1 = () => { return ( -
+ {!isEdit && } {
{} - + ); }; diff --git a/src/pages/lancer-un-defi/linguistique/2.tsx b/src/pages/lancer-un-defi/linguistique/2.tsx index 3004b6c93..42b0c2962 100644 --- a/src/pages/lancer-un-defi/linguistique/2.tsx +++ b/src/pages/lancer-un-defi/linguistique/2.tsx @@ -7,6 +7,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isLanguage, LANGUAGE_THEMES } from 'src/activity-types/defi.constants'; import type { LanguageDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { getErrorSteps } from 'src/components/activities/defiLanguageChecks'; import { ThemeChoiceButton } from 'src/components/buttons/ThemeChoiceButton'; @@ -51,7 +52,7 @@ const DefiStep2 = () => { return ( -
+ { />
- + ); }; diff --git a/src/pages/lancer-un-defi/linguistique/3.tsx b/src/pages/lancer-un-defi/linguistique/3.tsx index 9944e1e51..b82c5138d 100644 --- a/src/pages/lancer-un-defi/linguistique/3.tsx +++ b/src/pages/lancer-un-defi/linguistique/3.tsx @@ -5,6 +5,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isLanguage, LANGUAGE_THEMES } from 'src/activity-types/defi.constants'; import type { LanguageDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentEditor } from 'src/components/activities/content'; @@ -74,7 +75,7 @@ const DefiStep3 = () => { return ( -
+ {
- + ); }; diff --git a/src/pages/lancer-un-defi/linguistique/4.tsx b/src/pages/lancer-un-defi/linguistique/4.tsx index cff4786aa..81bc82099 100644 --- a/src/pages/lancer-un-defi/linguistique/4.tsx +++ b/src/pages/lancer-un-defi/linguistique/4.tsx @@ -7,6 +7,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isLanguage, LANGUAGE_DEFIS, LANGUAGE_THEMES } from 'src/activity-types/defi.constants'; import type { LanguageDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getErrorSteps } from 'src/components/activities/defiLanguageChecks'; @@ -66,7 +67,7 @@ const DefiStep4 = () => { return ( -
+ {
- + ); }; diff --git a/src/pages/lancer-un-defi/linguistique/5.tsx b/src/pages/lancer-un-defi/linguistique/5.tsx index d2ad4905b..2fba4173c 100644 --- a/src/pages/lancer-un-defi/linguistique/5.tsx +++ b/src/pages/lancer-un-defi/linguistique/5.tsx @@ -12,6 +12,7 @@ import { isDefi } from 'src/activity-types/anyActivity'; import { isLanguage, getDefi, getLanguageTheme, DEFI, LANGUAGE_THEMES } from 'src/activity-types/defi.constants'; import type { LanguageDefiData } from 'src/activity-types/defi.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentView } from 'src/components/activities/content/ContentView'; @@ -70,7 +71,7 @@ const DefiStep5 = () => { return ( -
+ {
- + diff --git a/src/pages/lancer-un-defi/success.tsx b/src/pages/lancer-un-defi/success.tsx index be76904b7..77d29af96 100644 --- a/src/pages/lancer-un-defi/success.tsx +++ b/src/pages/lancer-un-defi/success.tsx @@ -4,13 +4,14 @@ import React from 'react'; import { Button } from '@mui/material'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { bgPage } from 'src/styles/variables.const'; import PelicoSouriant from 'src/svg/pelico/pelico-souriant.svg'; const DefiSuccess = () => { return ( -
+
{
-
+ ); }; diff --git a/src/pages/parametrer-hymne/1.tsx b/src/pages/parametrer-hymne/1.tsx index 2828da3a8..5deee374b 100644 --- a/src/pages/parametrer-hymne/1.tsx +++ b/src/pages/parametrer-hymne/1.tsx @@ -1,6 +1,7 @@ import { useRouter } from 'next/router'; import React from 'react'; +import { Box } from '@mui/material'; import Backdrop from '@mui/material/Backdrop'; import CircularProgress from '@mui/material/CircularProgress'; @@ -10,6 +11,7 @@ import { isAnthem } from 'src/activity-types/anyActivity'; import { postMixAudio } from 'src/api/audio/audio-mix.post'; import { deleteAudio } from 'src/api/audio/audio.delete'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import AnthemTrack from 'src/components/activities/anthem/AnthemTrack/AnthemTrack'; @@ -113,14 +115,14 @@ const AnthemStep1 = () => { ) : ( -
+ -
+

Mettre en ligne les pistes sonores du couplet

Commencez le paramétrage en mettant en ligne les différentes pistes sonores du couplet :

@@ -139,8 +141,8 @@ const AnthemStep1 = () => { ), )}
-
-
+ + diff --git a/src/pages/parametrer-hymne/2.tsx b/src/pages/parametrer-hymne/2.tsx index 6e45f5364..d5410a2f9 100644 --- a/src/pages/parametrer-hymne/2.tsx +++ b/src/pages/parametrer-hymne/2.tsx @@ -8,6 +8,7 @@ import styles from '../../styles/parametrer-hymne.module.css'; import { postMixAudio } from 'src/api/audio/audio-mix.post'; import { deleteAudio } from 'src/api/audio/audio.delete'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import AnthemTrack from 'src/components/activities/anthem/AnthemTrack/AnthemTrack'; @@ -96,7 +97,7 @@ const AnthemStep2 = () => { return ( -
+ { >
- + diff --git a/src/pages/parametrer-hymne/3.tsx b/src/pages/parametrer-hymne/3.tsx index be7c1c24a..ca10c35b7 100644 --- a/src/pages/parametrer-hymne/3.tsx +++ b/src/pages/parametrer-hymne/3.tsx @@ -6,6 +6,7 @@ import { ButtonBase, Card } from '@mui/material'; import styles from '../../styles/parametrer-hymne.module.css'; import { isAnthem } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getErrorSteps } from 'src/components/activities/anthemChecks'; @@ -46,7 +47,7 @@ const AnthemStep3 = () => { return ( -
+ {
- + ); }; diff --git a/src/pages/parametrer-hymne/4.tsx b/src/pages/parametrer-hymne/4.tsx index 645ba2a7c..ceb13c238 100644 --- a/src/pages/parametrer-hymne/4.tsx +++ b/src/pages/parametrer-hymne/4.tsx @@ -6,6 +6,7 @@ import { ButtonBase, Card } from '@mui/material'; import styles from '../../styles/parametrer-hymne.module.css'; import { isAnthem } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getErrorSteps } from 'src/components/activities/anthemChecks'; @@ -54,7 +55,7 @@ const AnthemStep4 = () => { return ( -
+ {
- + ); }; diff --git a/src/pages/parametrer-hymne/5.tsx b/src/pages/parametrer-hymne/5.tsx index c7ac8446e..8acd6eb77 100644 --- a/src/pages/parametrer-hymne/5.tsx +++ b/src/pages/parametrer-hymne/5.tsx @@ -9,6 +9,7 @@ import CircularProgress from '@mui/material/CircularProgress'; import { isAnthem } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getErrorSteps } from 'src/components/activities/anthemChecks'; @@ -63,7 +64,7 @@ const AnthemStep5 = () => { return ( -
+ {
- + diff --git a/src/pages/parametrer-hymne/success.tsx b/src/pages/parametrer-hymne/success.tsx index 55656ed89..a6fa212a0 100644 --- a/src/pages/parametrer-hymne/success.tsx +++ b/src/pages/parametrer-hymne/success.tsx @@ -4,13 +4,14 @@ import React from 'react'; import { Button } from '@mui/material'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { bgPage } from 'src/styles/variables.const'; import PelicoSouriant from 'src/svg/pelico/pelico-souriant.svg'; const AnthemSuccess = () => { return ( -
+

Votre hymne a bien été paramétré !

@@ -22,7 +23,7 @@ const AnthemSuccess = () => {
-
+ ); }; diff --git a/src/pages/poser-une-question/1.tsx b/src/pages/poser-une-question/1.tsx index 0acad5115..53ac3861e 100644 --- a/src/pages/poser-une-question/1.tsx +++ b/src/pages/poser-une-question/1.tsx @@ -6,6 +6,7 @@ import { Button } from '@mui/material'; import { isQuestion } from 'src/activity-types/anyActivity'; import { AvatarImg } from 'src/components/Avatar'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { UserDisplayName } from 'src/components/UserDisplayName'; @@ -86,7 +87,7 @@ const Question1 = () => { return ( -
+ {
- + ); }; diff --git a/src/pages/poser-une-question/2.tsx b/src/pages/poser-une-question/2.tsx index 410dc6b45..686206acf 100644 --- a/src/pages/poser-une-question/2.tsx +++ b/src/pages/poser-une-question/2.tsx @@ -6,6 +6,7 @@ import { ButtonBase, TextField, Card } from '@mui/material'; import { isQuestion } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { DeleteButton } from 'src/components/buttons/DeleteButton'; @@ -62,7 +63,7 @@ const Question2 = () => { return ( -
+ {
- + ); }; diff --git a/src/pages/poser-une-question/3.tsx b/src/pages/poser-une-question/3.tsx index 4df746587..c2f9e6ed0 100644 --- a/src/pages/poser-une-question/3.tsx +++ b/src/pages/poser-une-question/3.tsx @@ -12,6 +12,7 @@ import CircularProgress from '@mui/material/CircularProgress'; import { isQuestion } from 'src/activity-types/anyActivity'; import type { QuestionActivity } from 'src/activity-types/question.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getActivityPhase } from 'src/components/activities/utils'; @@ -108,7 +109,7 @@ const Question3 = () => { return ( -
+ {
- + diff --git a/src/pages/poser-une-question/success.tsx b/src/pages/poser-une-question/success.tsx index 7c829876d..be143e51d 100644 --- a/src/pages/poser-une-question/success.tsx +++ b/src/pages/poser-une-question/success.tsx @@ -5,6 +5,7 @@ import React from 'react'; import { Button } from '@mui/material'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { ActivityContext } from 'src/contexts/activityContext'; import { bgPage } from 'src/styles/variables.const'; import PelicoSouriant from 'src/svg/pelico/pelico-souriant.svg'; @@ -24,7 +25,7 @@ const QuestionSuccess = () => { return ( -
+

{questionsCount > 1 ? 'Vos questions ont bien été enregistrées !' : 'Votre question a bien été enregistrée !'}

@@ -36,7 +37,7 @@ const QuestionSuccess = () => {
-
+ ); }; diff --git a/src/pages/re-inventer-une-histoire/1.tsx b/src/pages/re-inventer-une-histoire/1.tsx index 5518ddbb5..49c41d4ee 100644 --- a/src/pages/re-inventer-une-histoire/1.tsx +++ b/src/pages/re-inventer-une-histoire/1.tsx @@ -9,6 +9,7 @@ import { isStory } from 'src/activity-types/anyActivity'; import { ODD_CHOICE } from 'src/activity-types/story.constants'; import { Base } from 'src/components/Base'; import { KeepRatio } from 'src/components/KeepRatio'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ImageModal } from 'src/components/activities/content/editors/ImageEditor/ImageModal'; @@ -61,7 +62,7 @@ const ReInventStoryStep1 = () => { return ( -
+ {!isEdit && } {

Choisissez et dessinez l’objectif du développement durable à atteindre

Pour atteindre votre objectif de développement durable, vous choisirez un objet et un lieu aux étapes précédentes.

Choisissez votre objectif et dessinez-le.

- +
-
+
setIsImageModalOpen(true)} style={{ width: '100%', color: `${isError ? errorColor : primaryColor}` }}>
{
-
+ ); }; diff --git a/src/pages/re-inventer-une-histoire/2.tsx b/src/pages/re-inventer-une-histoire/2.tsx index 7f51d15cc..184def91f 100644 --- a/src/pages/re-inventer-une-histoire/2.tsx +++ b/src/pages/re-inventer-une-histoire/2.tsx @@ -8,6 +8,7 @@ import { TextField, Grid, ButtonBase } from '@mui/material'; import { isStory } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; import { KeepRatio } from 'src/components/KeepRatio'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ImageModal } from 'src/components/activities/content/editors/ImageEditor/ImageModal'; @@ -62,7 +63,7 @@ const ReInventStoryStep2 = () => { return ( -
+ { Cet objet, tout comme le lieu que vous choisirez à l’étape suivante, est magique ! Grâce à leurs pouvoirs, le village idéal va atteindre l’objectif du développement durable que vous avez choisi à l’étape précédente.

- +
-
+
setIsImageModalOpen(true)} style={{ width: '100%', color: `${primaryColor}` }}>
{
-
+ ); }; diff --git a/src/pages/re-inventer-une-histoire/3.tsx b/src/pages/re-inventer-une-histoire/3.tsx index 931adc0e2..fb6cba2df 100644 --- a/src/pages/re-inventer-une-histoire/3.tsx +++ b/src/pages/re-inventer-une-histoire/3.tsx @@ -8,6 +8,7 @@ import { TextField, Grid, ButtonBase } from '@mui/material'; import { isStory } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; import { KeepRatio } from 'src/components/KeepRatio'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ImageModal } from 'src/components/activities/content/editors/ImageEditor/ImageModal'; @@ -69,7 +70,7 @@ const ReInventStoryStep3 = () => { return ( -
+ { Ce lieu, tout comme l’objet que vous avez choisi à l’étape précédente, est extraodinaire ! Grâce à leurs pouvoirs, le village idéal va atteindre l’objectif de développement durable que vous avez choisi.

- +
-
+
setIsImageModalOpen(true)} style={{ width: '100%', color: `${primaryColor}` }}>
{
-
+ ); }; diff --git a/src/pages/re-inventer-une-histoire/4.tsx b/src/pages/re-inventer-une-histoire/4.tsx index 91784dd7c..12f2391d7 100644 --- a/src/pages/re-inventer-une-histoire/4.tsx +++ b/src/pages/re-inventer-une-histoire/4.tsx @@ -8,6 +8,7 @@ import { TextField, Grid, ButtonBase } from '@mui/material'; import { isStory } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; import { KeepRatio } from 'src/components/KeepRatio'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ImageModal } from 'src/components/activities/content/editors/ImageEditor/ImageModal'; @@ -72,7 +73,7 @@ const ReInventStoryStep4 = () => { return ( -
+ { Racontez à vos pélicopains comment le village-idéal et l’objet magique nous permettent d’atteindre l’objectif du développement durable que vous avez choisi ! Illustrez votre histoire avec un dessin de votre visite dans le village-idéal.

- + -
+
setIsImageModalOpen(true)} style={{ width: '100%', color: `${primaryColor}` }}>
{
-
+ ); }; diff --git a/src/pages/re-inventer-une-histoire/5.tsx b/src/pages/re-inventer-une-histoire/5.tsx index e69121268..9ef60b516 100644 --- a/src/pages/re-inventer-une-histoire/5.tsx +++ b/src/pages/re-inventer-une-histoire/5.tsx @@ -7,6 +7,7 @@ import { Tooltip, Button, Backdrop, CircularProgress } from '@mui/material'; import { isStory } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; import { ImageStepContainer } from 'src/components/FinalStep/ImageStepContainer'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { getErrorSteps } from 'src/components/activities/storyChecks'; @@ -102,7 +103,7 @@ const ReInventStoryStep5 = () => { return ( -
+ {

{isEdit ? ( -
+
-
+
diff --git a/src/pages/re-inventer-une-histoire/index.tsx b/src/pages/re-inventer-une-histoire/index.tsx index 77067a20a..6db85ec73 100644 --- a/src/pages/re-inventer-une-histoire/index.tsx +++ b/src/pages/re-inventer-une-histoire/index.tsx @@ -3,6 +3,7 @@ import React from 'react'; import { DEFAULT_STORY_DATA } from 'src/activity-types/story.constants'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { StepsButton } from 'src/components/StepsButtons'; import StoryPictureWheel from 'src/components/storyPictureWheel/storyPictureWheel'; import { ActivityContext } from 'src/contexts/activityContext'; @@ -60,7 +61,7 @@ const InspiredStory = () => { return ( <> -
+

Ré-inventer l’histoire du village-idéal

Comme vous le savez déjà, les Olympiades de Pélico ont commencé et elles ont lieu dans le village-idéal, l’endroit où tout est possible… @@ -87,7 +88,7 @@ const InspiredStory = () => { Inspirez-vous de ce qu’ils ont dessiné et laissez libre court à votre imagination ! Souvenez-vous que si l’objectif du développement durable est bien réel, l’objet et lieu que vous choisissez pour l’atteindre sont magiques 🙂

-
+ {/* Roulette images */} { return ( -
+

Votre histoire a bien été publiée ! @@ -24,7 +25,7 @@ const InspiredStorySuccess = () => {

-
+ ); }; diff --git a/src/pages/reagir-a-une-activite/1.tsx b/src/pages/reagir-a-une-activite/1.tsx index a8a646d13..9b4cb0c1a 100644 --- a/src/pages/reagir-a-une-activite/1.tsx +++ b/src/pages/reagir-a-une-activite/1.tsx @@ -3,6 +3,7 @@ import React from 'react'; import { isReaction } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { ActivitySelect } from 'src/components/activities/ActivitySelect'; import { DESC } from 'src/components/activities/utils'; @@ -71,7 +72,7 @@ const ReactionStep1 = () => { return ( -
+ { ))}
-
+
); }; diff --git a/src/pages/reagir-a-une-activite/2.tsx b/src/pages/reagir-a-une-activite/2.tsx index 2890b9bce..6f13b2b56 100644 --- a/src/pages/reagir-a-une-activite/2.tsx +++ b/src/pages/reagir-a-une-activite/2.tsx @@ -3,6 +3,7 @@ import React from 'react'; import { isReaction } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentEditor } from 'src/components/activities/content'; @@ -48,7 +49,7 @@ const ReactionStep2 = () => { return ( -
+ {
-
+ ); }; diff --git a/src/pages/reagir-a-une-activite/3.tsx b/src/pages/reagir-a-une-activite/3.tsx index aba75f391..731eb8283 100644 --- a/src/pages/reagir-a-une-activite/3.tsx +++ b/src/pages/reagir-a-une-activite/3.tsx @@ -10,6 +10,7 @@ import CircularProgress from '@mui/material/CircularProgress'; import { isReaction } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import ActivityLink from 'src/components/activities/Link'; @@ -71,7 +72,7 @@ const ReactionStep3 = () => { return ( -
+ {
-
+ diff --git a/src/pages/reagir-a-une-activite/success.tsx b/src/pages/reagir-a-une-activite/success.tsx index b7aee8c2c..2de1adc84 100644 --- a/src/pages/reagir-a-une-activite/success.tsx +++ b/src/pages/reagir-a-une-activite/success.tsx @@ -4,13 +4,14 @@ import React from 'react'; import { Button } from '@mui/material'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { bgPage } from 'src/styles/variables.const'; import PelicoSouriant from 'src/svg/pelico/pelico-souriant.svg'; const ReactionSuccess = () => { return ( -
+
{
-
+ ); }; diff --git a/src/pages/realiser-un-reportage/1.tsx b/src/pages/realiser-un-reportage/1.tsx index 9e5263624..12e5e1508 100644 --- a/src/pages/realiser-un-reportage/1.tsx +++ b/src/pages/realiser-un-reportage/1.tsx @@ -6,6 +6,7 @@ import { TextField } from '@mui/material'; import { getReportage } from 'src/activity-types/reportage.constants'; import type { ReportageData } from 'src/activity-types/reportage.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { Activities } from 'src/components/activities/List'; @@ -71,7 +72,7 @@ const ReportageStep1 = () => { return ( -
+ {!isEdit && } {
)}
-
+ ); }; diff --git a/src/pages/realiser-un-reportage/2.tsx b/src/pages/realiser-un-reportage/2.tsx index 8d84ce0ef..9815b8859 100644 --- a/src/pages/realiser-un-reportage/2.tsx +++ b/src/pages/realiser-un-reportage/2.tsx @@ -5,6 +5,7 @@ import { isReportage } from 'src/activity-types/anyActivity'; import { getReportage } from 'src/activity-types/reportage.constants'; import type { ReportageData } from 'src/activity-types/reportage.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentEditor } from 'src/components/activities/content'; @@ -50,7 +51,7 @@ const ReportageStep2 = () => { return ( -
+ {
-
+ ); }; diff --git a/src/pages/realiser-un-reportage/3.tsx b/src/pages/realiser-un-reportage/3.tsx index 1346a8b6d..da607ce5e 100644 --- a/src/pages/realiser-un-reportage/3.tsx +++ b/src/pages/realiser-un-reportage/3.tsx @@ -12,6 +12,7 @@ import { isReportage } from 'src/activity-types/anyActivity'; import { getReportage } from 'src/activity-types/reportage.constants'; import type { ReportageData } from 'src/activity-types/reportage.types'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ContentView } from 'src/components/activities/content/ContentView'; @@ -72,7 +73,7 @@ const ReportageStep3 = () => { return ( -
+ {
-
+
diff --git a/src/pages/realiser-un-reportage/index.tsx b/src/pages/realiser-un-reportage/index.tsx index d014d9689..4cbceee99 100644 --- a/src/pages/realiser-un-reportage/index.tsx +++ b/src/pages/realiser-un-reportage/index.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { ActivityChoice } from 'src/components/activities/ActivityChoice'; import ArtIcon from 'src/svg/indice-culturel/art.svg'; import CuisineIcon from 'src/svg/indice-culturel/cuisine.svg'; @@ -80,7 +81,7 @@ const reportages = [ const Reportage = () => { return ( -
+

Sur quel thème souhaitez-vous réaliser votre reportage ?

@@ -90,7 +91,7 @@ const Reportage = () => {

Commencez par choisir le thème de votre reportage.

-
+ ); }; diff --git a/src/pages/realiser-un-reportage/success.tsx b/src/pages/realiser-un-reportage/success.tsx index 1a9855c2f..e3e4c11d5 100644 --- a/src/pages/realiser-un-reportage/success.tsx +++ b/src/pages/realiser-un-reportage/success.tsx @@ -4,13 +4,14 @@ import React from 'react'; import { Button } from '@mui/material'; import { Base } from 'src/components/Base'; +import { PageLayout } from 'src/components/PageLayout'; import { bgPage } from 'src/styles/variables.const'; import PelicoSouriant from 'src/svg/pelico/pelico-souriant.svg'; const ReportageSuccess = () => { return ( -
+

Votre reportage a bien été publié ! @@ -24,7 +25,7 @@ const ReportageSuccess = () => {

-
+ ); };