Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat vil 625/transition popup #1007

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Feat vil 625/transition popup #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d95b5bf
Modification of transition popup
ousamazemzami Nov 8, 2024
c6c9e6e
Modification of transition popup
ousamazemzami Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/components/WelcomeModal/SecondPhase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,15 @@ export const SecondPhase = () => {
<>
<div
id="new-user-desc"
style={{ minHeight: '15rem', display: 'flex', flexDirection: 'column', alignItems: 'center', textAlign: 'center', marginTop: '2rem' }}
style={{ minHeight: '15rem', display: 'flex', flexDirection: 'column', alignItems: 'center', textAlign: 'center' }}
>
<div style={{ display: 'flex', justifyContent: 'center', gap: '2rem' }}>
<div>
<p>Avant de passer à la phase suivante, prenez 5 minutes pour nous faire vos retours sur la phase 1 :</p>
<a href={urlForm} target="_blank" rel="noopener noreferrer" style={{ textDecoration: 'underline', color: '#4c3ed9' }}>
Vos retours sur la phase 1 d&apos;1Village 2024/25
</a>
</div>
<div style={{ display: 'flex', justifyContent: 'center', gap: '2rem', marginTop: '2rem' }}>
<div>
<p>Si vous n&apos;avez pas encore résolu l&apos;énigme avec votre classe, retournez sur la phase 1.</p>
<Button
Expand Down Expand Up @@ -96,13 +102,6 @@ export const SecondPhase = () => {
</Button>
</div>
</div>

<div style={{ marginTop: '2rem' }}>
Avant de passer à la phase suivante, prenez 5 minutes pour nous faire vos retours sur la phase 1 :{' '}
<a href={urlForm} target="_blank" rel="noopener noreferrer" style={{ textDecoration: 'underline', color: '#4c3ed9' }}>
Vos retours sur la phase 1 d&apos;1Village 2024/25
</a>
</div>
</div>
</>
}
Expand Down
19 changes: 9 additions & 10 deletions src/components/WelcomeModal/ThirdPhase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const ThirdPhase = () => {
const { enqueueSnackbar } = useSnackbar();
const [isModalOpen, setIsModalOpen] = React.useState(true);
const urlForm = 'https://docs.google.com/forms/d/e/1FAIpQLSfncEkPDYsPjK3RCjX_YBUC2uNxD-RAd2Bn_KGlimv765M-Vw/viewform';
const textToDisplay = 'Avant de passer à la phase suivante, prenez 5 minutes pour nous faire vos retours sur la phase 1 : ';
const textToDisplay = 'Avant de passer à la phase suivante, prenez 5 minutes pour nous faire vos retours sur la phase 2 : ';
const textForUrl = "Vos retours sur la phase 2 d'1Village 2024/25";

if (!user) {
Expand Down Expand Up @@ -51,9 +51,15 @@ export const ThirdPhase = () => {
<>
<div
id="new-user-desc"
style={{ minHeight: '15rem', display: 'flex', flexDirection: 'column', alignItems: 'center', textAlign: 'center', marginTop: '2rem' }}
style={{ minHeight: '15rem', display: 'flex', flexDirection: 'column', alignItems: 'center', textAlign: 'center' }}
>
<div style={{ display: 'flex', justifyContent: 'center', gap: '2rem' }}>
<div>
<p>{textToDisplay}</p>
<a href={urlForm} target="_blank" rel="noopener noreferrer" style={{ textDecoration: 'underline', color: '#4c3ed9' }}>
{textForUrl}
</a>
</div>
<div style={{ display: 'flex', justifyContent: 'center', gap: '2rem', marginTop: '2rem' }}>
<div>
<p>{'Si vous voulez poursuivre les échanges avec vos pélicopains, retournez sur la phase 2'}</p>
<Button
Expand Down Expand Up @@ -98,13 +104,6 @@ export const ThirdPhase = () => {
</Button>
</div>
</div>

<div style={{ marginTop: '2rem' }}>
{textToDisplay}
<a href={urlForm} target="_blank" rel="noopener noreferrer" style={{ textDecoration: 'underline', color: '#4c3ed9' }}>
{textForUrl}
</a>
</div>
</div>
</>
}
Expand Down
Loading