diff --git a/src/components/PageLayout.tsx b/src/components/PageLayout.tsx new file mode 100644 index 000000000..30b44b6ea --- /dev/null +++ b/src/components/PageLayout.tsx @@ -0,0 +1,23 @@ +import React from 'react'; + +import { Box } from '@mui/material'; + +type PageLayoutProps = { + children: React.ReactNode; +}; + +export const PageLayout: React.FC = ({ children }) => { + return ( + + {children} + + ); +}; diff --git a/src/pages/contenu-libre/1.tsx b/src/pages/contenu-libre/1.tsx index 3b7381973..698a38f7e 100644 --- a/src/pages/contenu-libre/1.tsx +++ b/src/pages/contenu-libre/1.tsx @@ -3,6 +3,7 @@ import React from 'react'; import { isFreeContent } 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'; @@ -43,7 +44,7 @@ const ContenuLibre = () => { return ( -
+ {!isEdit && } {
- + ); }; diff --git a/src/pages/contenu-libre/2.tsx b/src/pages/contenu-libre/2.tsx index c6995aae3..b1db747be 100644 --- a/src/pages/contenu-libre/2.tsx +++ b/src/pages/contenu-libre/2.tsx @@ -9,6 +9,7 @@ import { getImage } from 'src/activity-types/freeContent.constants'; import type { FreeContentData } from 'src/activity-types/freeContent.types'; import { Base } from 'src/components/Base'; import { Modal } from 'src/components/Modal'; +import { PageLayout } from 'src/components/PageLayout'; import { Steps } from 'src/components/Steps'; import { StepsButton } from 'src/components/StepsButtons'; import { ActivityCard } from 'src/components/activities/ActivityCard'; @@ -69,7 +70,7 @@ const ContenuLibre = () => { return ( -
+ {
- + {/* All Images modal */} { return ( -
+ {
- + diff --git a/src/pages/contenu-libre/index.tsx b/src/pages/contenu-libre/index.tsx index 75a210202..36ded77cf 100644 --- a/src/pages/contenu-libre/index.tsx +++ b/src/pages/contenu-libre/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 { ActivityContext } from 'src/contexts/activityContext'; import { UserContext } from 'src/contexts/userContext'; @@ -30,7 +31,7 @@ const ContenuLibre = () => { return ( -
+

Publication de contenu libre

@@ -39,7 +40,7 @@ const ContenuLibre = () => {

-
+ ); }; diff --git a/src/pages/contenu-libre/success.tsx b/src/pages/contenu-libre/success.tsx index 3d4678224..927dacbc8 100644 --- a/src/pages/contenu-libre/success.tsx +++ b/src/pages/contenu-libre/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 FreeContentSuccess = () => { return ( -
+

Votre publication a bien été publiée !

@@ -22,7 +23,7 @@ const FreeContentSuccess = () => {
-
+ ); }; diff --git a/src/pages/ma-classe.tsx b/src/pages/ma-classe.tsx index 6c5490b51..b0bc3b0b4 100644 --- a/src/pages/ma-classe.tsx +++ b/src/pages/ma-classe.tsx @@ -4,6 +4,7 @@ import { useQueryClient } from 'react-query'; import { isMascotte } from 'src/activity-types/anyActivity'; import { Base } from 'src/components/Base'; import { Modal } from 'src/components/Modal'; +import { PageLayout } from 'src/components/PageLayout'; import { ActivityCard } from 'src/components/activities/ActivityCard'; import { MascotteTemplate } from 'src/components/activities/content/MascotteTemplate'; import { ActivityContext } from 'src/contexts/activityContext'; @@ -91,7 +92,7 @@ const MaClasse = () => { return ( -
+

Notre mascotte

{mascotteActivity && user ? ( @@ -147,7 +148,7 @@ const MaClasse = () => { ) )}
-
+ { return ( -
+ {!isEdit && } {
)} - + ); }; diff --git a/src/pages/symbole/2.tsx b/src/pages/symbole/2.tsx index b6a91529b..f3de73828 100644 --- a/src/pages/symbole/2.tsx +++ b/src/pages/symbole/2.tsx @@ -5,6 +5,7 @@ import { isSymbol } from 'src/activity-types/anyActivity'; import { getSymbol } from 'src/activity-types/symbol.constants'; import type { SymbolData } from 'src/activity-types/symbol.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'; @@ -45,7 +46,7 @@ const SymbolStep2 = () => { return ( -
+ {
- + ); }; diff --git a/src/pages/symbole/3.tsx b/src/pages/symbole/3.tsx index 4d7835b32..43dea64b5 100644 --- a/src/pages/symbole/3.tsx +++ b/src/pages/symbole/3.tsx @@ -12,6 +12,7 @@ import { isSymbol } from 'src/activity-types/anyActivity'; import { getSymbol } from 'src/activity-types/symbol.constants'; import type { SymbolData } from 'src/activity-types/symbol.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'; @@ -65,7 +66,7 @@ const SymbolStep3 = () => { return ( -
+ {
- + diff --git a/src/pages/symbole/index.tsx b/src/pages/symbole/index.tsx index 7651e50e4..98f379d85 100644 --- a/src/pages/symbole/index.tsx +++ b/src/pages/symbole/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 AnimalNationalIcon from 'src/svg/symbole/animal-national.svg'; import DeviseIcon from 'src/svg/symbole/devise.svg'; @@ -80,7 +81,7 @@ const symbols = [ const Symbol = () => { return ( -
+

Quel symbole allez-vous présenter ?

@@ -92,7 +93,7 @@ const Symbol = () => {

-
+ ); }; diff --git a/src/pages/symbole/success.tsx b/src/pages/symbole/success.tsx index abff8617b..74dbe8538 100644 --- a/src/pages/symbole/success.tsx +++ b/src/pages/symbole/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 IndiceSuccess = () => { return ( -
+

Votre symbole a bien été publié !

@@ -22,7 +23,7 @@ const IndiceSuccess = () => {
-
+ ); };