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.

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

[TECH] Améliorer la structure des écrans d'instruction (PIX-12902). #9264

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 9 additions & 27 deletions mon-pix/app/components/certification-instructions/step-five.hbs
Original file line number Diff line number Diff line change
@@ -1,41 +1,23 @@
<div class="certification-instructions__content">
<span class="certification-instructions__question--bold">{{t "pages.certification-instructions.steps.5.text"}}</span>
<ul class="certification-instructions-content__list">
<div class="instructions-content">
<span class="instructions-content__title--bold">{{t "pages.certification-instructions.steps.5.text"}}</span>
<ul class="instructions-content-list">
<li>
<span class="certification-instructions__text--bold">
{{t "pages.certification-instructions.steps.5.list.no-communication.strong-text"}}
</span>
{{t "pages.certification-instructions.steps.5.list.no-communication.text"}}
{{t "pages.certification-instructions.steps.5.list.no-communication" htmlSafe=true}}
</li>
<li>
<span class="certification-instructions__text--bold">
{{t "pages.certification-instructions.steps.5.list.no-connected-device.strong-text"}}
</span>
{{t "pages.certification-instructions.steps.5.list.no-connected-device.text"}}
{{t "pages.certification-instructions.steps.5.list.no-connected-device" htmlSafe=true}}
</li>
<li>
<span class="certification-instructions__text--bold">
{{t "pages.certification-instructions.steps.5.list.no-cheat-sheet.strong-text"}}
</span>
{{t "pages.certification-instructions.steps.5.list.no-cheat-sheet.text"}}
{{t "pages.certification-instructions.steps.5.list.no-cheat-sheet" htmlSafe=true}}
</li>
<li>
<span class="certification-instructions__text--bold">
{{t "pages.certification-instructions.steps.5.list.no-artificial-intelligence.strong-text"}}
</span>
{{t "pages.certification-instructions.steps.5.list.no-artificial-intelligence.text"}}
{{t "pages.certification-instructions.steps.5.list.no-artificial-intelligence" htmlSafe=true}}
</li>
<li>
<span class="certification-instructions__text--bold">
{{t "pages.certification-instructions.steps.5.list.no-forum.strong-text"}}
</span>
{{t "pages.certification-instructions.steps.5.list.no-forum.text"}}
{{t "pages.certification-instructions.steps.5.list.no-forum" htmlSafe=true}}
</li>
<li>
<span class="certification-instructions__text--bold">
{{t "pages.certification-instructions.steps.5.list.other.strong-text"}}
</span>
{{t "pages.certification-instructions.steps.5.list.other.text"}}
{{t "pages.certification-instructions.steps.5.list.other" htmlSafe=true}}
</li>
</ul>
<PixCheckbox {{on "change" this.onChange}}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="certification-instructions__content">
<p>{{this.text}}</p>
</div>
<p>
{{t "pages.certification-instructions.steps.4.paragraph.text" htmlSafe=true}}
</p>
12 changes: 0 additions & 12 deletions mon-pix/app/components/certification-instructions/step-four.js

This file was deleted.

18 changes: 16 additions & 2 deletions mon-pix/app/components/certification-instructions/step-one.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
<div class="certification-instructions__content">
<p>{{this.text}}</p>
<div class="instructions-content">
<h3 class="instructions-content__title--bold">
{{t "pages.certification-instructions.steps.1.question"}}
</h3>

<p class="instructions-content__paragraph">
{{t "pages.certification-instructions.steps.1.paragraphs.1.text" htmlSafe=true}}
</p>

<p class="instructions-content__paragraph">
{{t "pages.certification-instructions.steps.1.paragraphs.2.text" htmlSafe=true}}
</p>

<p class="instructions-content__paragraph">
{{t "pages.certification-instructions.steps.1.paragraphs.3.text" htmlSafe=true}}
</p>
</div>
12 changes: 0 additions & 12 deletions mon-pix/app/components/certification-instructions/step-one.js

This file was deleted.

35 changes: 27 additions & 8 deletions mon-pix/app/components/certification-instructions/step-three.hbs
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
<div class="certification-instructions-content__images">
{{#each this.information.images as |image|}}
<img class="certification-instructions-content__size" src={{image}} alt="" />
{{/each}}
</div>
<div class="instructions-content-with-images">
<div class="instructions-content__images">
<img
class="instructions-content__image"
src="/images/illustrations/certification-instructions-steps/regular-challenge-round.svg"
alt={{t "pages.certification-instructions.steps.3.images.regular-challenge"}}
/>
<img
class="instructions-content__image"
src="/images/illustrations/certification-instructions-steps/focus-challenge-round.svg"
alt={{t "pages.certification-instructions.steps.3.images.focus-challenge"}}
/>
</div>
<dl class="instructions-description-list">
<dt class="instructions-content__title--bold">
{{t "pages.certification-instructions.steps.3.paragraphs.1.title"}}
</dt>
<dd class="instructions-description-list__first-description">
{{t "pages.certification-instructions.steps.3.paragraphs.1.text" htmlSafe=true}}
</dd>

<div class="certification-instructions__content">
<p>{{this.information.text}}</p>
<p>{{this.information.secondText}}</p>
<dt class="instructions-content__title--bold">
{{t "pages.certification-instructions.steps.3.paragraphs.2.title"}}
</dt>
<dd>
{{t "pages.certification-instructions.steps.3.paragraphs.2.text" htmlSafe=true}}
</dd>
</dl>
</div>
23 changes: 0 additions & 23 deletions mon-pix/app/components/certification-instructions/step-three.js

This file was deleted.

44 changes: 37 additions & 7 deletions mon-pix/app/components/certification-instructions/step-two.hbs
Original file line number Diff line number Diff line change
@@ -1,8 +1,38 @@
<div class="certification-instructions-content__images">
<img class="certification-instructions-content__size" src={{this.information.image}} alt="" />
<p class="certification-instructions-content-images__image-text">{{this.information.imageText}}</p>
</div>
<div class="certification-instructions__content">
<p>{{this.information.text}}</p>
<p>{{this.information.secondText}}</p>
<div class="instructions-content-with-images">
<div class="instructions-content-with-images__legend">
<img
class="instructions-content__image"
src="/images/illustrations/certification-instructions-steps/clock.svg"
alt=""
/>
<p>
<span class="instructions-content-with-images__legend--bold">
{{t "pages.certification-instructions.steps.2.legend.strong-text"}}
</span>

{{t "pages.certification-instructions.steps.2.legend.text"}}
</p>
</div>

<div class="instructions-content-step-two">
<h3 class="instructions-content__title--bold">
{{t "pages.certification-instructions.steps.2.paragraphs.1.question"}}
</h3>

<p class="instructions-content-step-two__paragraph">
{{t "pages.certification-instructions.steps.2.paragraphs.1.text" htmlSafe=true}}
</p>

<h3 class="instructions-content__title--bold">
{{t "pages.certification-instructions.steps.2.paragraphs.2.question"}}
</h3>
<p>
{{t "pages.certification-instructions.steps.2.paragraphs.2.text" htmlSafe=true}}

<br />
<span class="instructions-content__text--light">
{{t "pages.certification-instructions.steps.2.paragraphs.2.light-text"}}
</span>
</p>
</div>
</div>
23 changes: 0 additions & 23 deletions mon-pix/app/components/certification-instructions/step-two.js

This file was deleted.

42 changes: 20 additions & 22 deletions mon-pix/app/components/certification-instructions/steps.hbs
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
<h2 class="certification-instructions__title">{{this.title}}</h2>
<h2 class="instructions-step__title">{{this.title}}</h2>

<div class="certification-instructions__content">
{{#if (eq this.pageId 1)}}
<CertificationInstructions::StepOne />
{{/if}}
{{#if (eq this.pageId 2)}}
<CertificationInstructions::StepTwo />
{{/if}}
{{#if (eq this.pageId 3)}}
<CertificationInstructions::StepThree />
{{/if}}
{{#if (eq this.pageId 4)}}
<CertificationInstructions::StepFour />
{{/if}}
{{#if (eq this.pageId 5)}}
<CertificationInstructions::StepFive @enableNextButton={{this.enableNextButton}} />
{{/if}}
</div>
{{#if (eq this.pageId 1)}}
<CertificationInstructions::StepOne />
{{/if}}
{{#if (eq this.pageId 2)}}
<CertificationInstructions::StepTwo />
{{/if}}
{{#if (eq this.pageId 3)}}
<CertificationInstructions::StepThree />
{{/if}}
{{#if (eq this.pageId 4)}}
<CertificationInstructions::StepFour />
{{/if}}
{{#if (eq this.pageId 5)}}
<CertificationInstructions::StepFive @enableNextButton={{this.enableNextButton}} />
{{/if}}

<footer class="certification-instructions__footer">
<div class="certification-instructions-footer__dots">
<footer class="instructions-footer">
<div>
{{#each this.paging as |page-class|}}
<img
class="certification-instructions-footer-dots__dot {{page-class}}"
class="instructions-footer__dot {{page-class}}"
src="/images/illustrations/certification-instructions-steps/ellipse.svg"
alt=""
/>
{{/each}}
</div>
<div class="certification-instructions-footer__buttons">
<div class="instructions-footer__buttons">
{{#if this.showPreviousButton}}
<PixButton
@size="large"
Expand Down
Loading