From e68a0dadde519c8be2ef58b5e13c7ab7b29a5a98 Mon Sep 17 00:00:00 2001
From: Geoffroy Begouaussel <geoffroy.begouaussel@pix.fr>
Date: Wed, 4 Dec 2024 17:05:00 +0100
Subject: [PATCH] feat(mon-pix): use global AppLayout component on needed pages

---
 mon-pix/app/styles/components/_footer.scss    |   5 +-
 .../authenticated/certifications/join.hbs     |  32 ++---
 .../certifications/start-loading.hbs          |  24 ++--
 .../authenticated/competences/details.hbs     |  22 ++--
 .../authenticated/competences/results.hbs     | 114 ++++++++---------
 .../app/templates/authenticated/sitemap.hbs   |  10 +-
 .../templates/authenticated/user-account.hbs  |  90 +++++++------
 .../authenticated/user-trainings.hbs          |  50 ++++----
 .../user-tutorials/recommended.hbs            |  52 ++++----
 .../authenticated/user-tutorials/saved.hbs    |  40 +++---
 .../templates/download-session-results.hbs    |  14 +-
 mon-pix/app/templates/error.hbs               |  36 +++---
 .../app/templates/fill-in-campaign-code.hbs   | 120 +++++++++---------
 .../fill-in-certificate-verification-code.hbs |  89 +++++++------
 14 files changed, 325 insertions(+), 373 deletions(-)

diff --git a/mon-pix/app/styles/components/_footer.scss b/mon-pix/app/styles/components/_footer.scss
index fff2e3740d5..86f3c87f61c 100644
--- a/mon-pix/app/styles/components/_footer.scss
+++ b/mon-pix/app/styles/components/_footer.scss
@@ -5,7 +5,7 @@
   gap: var(--pix-spacing-4x);
   align-items: flex-start;
   justify-content: space-between;
-  padding-block: var(--pix-spacing-6x);
+  padding-block: var(--pix-spacing-12x) var(--pix-spacing-6x);
   color: var(--pix-neutral-500);
 
   @include device-is('mobile') {
@@ -52,7 +52,8 @@
   }
 
   a {
-    &:hover, &:focus {
+    &:hover,
+    &:focus {
       color: var(--pix-primary-500);
     }
   }
diff --git a/mon-pix/app/templates/authenticated/certifications/join.hbs b/mon-pix/app/templates/authenticated/certifications/join.hbs
index d53d3ed3441..b0f75b615ef 100644
--- a/mon-pix/app/templates/authenticated/certifications/join.hbs
+++ b/mon-pix/app/templates/authenticated/certifications/join.hbs
@@ -1,22 +1,18 @@
 {{page-title (t "pages.certification-start.title")}}
 
-<header role="banner">
-  <NavbarHeader />
-</header>
+<Global::AppLayout>
+  <main class="main" role="main">
+    <PixBackgroundHeader id="main">
 
-<main class="main" role="main">
-  <PixBackgroundHeader id="main">
+      {{#if this.model.isCertifiable}}
+        <PixBlock @shadow="heavy" class="certification-start-page__block">
+          <CertificationBanners @certificationEligibility={{this.model}} @fullName={{this.currentUser.user.fullName}} />
+          <CertificationJoiner @onStepChange={{this.changeStep}} />
+        </PixBlock>
+      {{else}}
+        <CertificationNotCertifiable />
+      {{/if}}
 
-    {{#if this.model.isCertifiable}}
-      <PixBlock @shadow="heavy" class="certification-start-page__block">
-        <CertificationBanners @certificationEligibility={{this.model}} @fullName={{this.currentUser.user.fullName}} />
-        <CertificationJoiner @onStepChange={{this.changeStep}} />
-      </PixBlock>
-    {{else}}
-      <CertificationNotCertifiable />
-    {{/if}}
-
-  </PixBackgroundHeader>
-</main>
-
-<Footer />
\ No newline at end of file
+    </PixBackgroundHeader>
+  </main>
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/authenticated/certifications/start-loading.hbs b/mon-pix/app/templates/authenticated/certifications/start-loading.hbs
index 5a40f79515e..e0ccfbda957 100644
--- a/mon-pix/app/templates/authenticated/certifications/start-loading.hbs
+++ b/mon-pix/app/templates/authenticated/certifications/start-loading.hbs
@@ -1,17 +1,13 @@
-<header role="banner">
-  <NavbarHeader />
-</header>
+<Global::AppLayout>
+  <div class="background-banner-wrapper">
+    <div class="background-banner"></div>
 
-<div class="background-banner-wrapper">
-  <div class="background-banner"></div>
+    <div class="app-nested-loader rounded-panel--over-background-banner rounded-panel rounded-panel--strong">
+      <p class="app-loader__image">
+        <img src="/images/interwind.gif" alt="" role="presentation" />
+      </p>
+      <p class="app-loader__text">{{t "common.loading.default"}}</p>
+    </div>
 
-  <div class="app-nested-loader rounded-panel--over-background-banner rounded-panel rounded-panel--strong">
-    <p class="app-loader__image">
-      <img src="/images/interwind.gif" alt="" role="presentation" />
-    </p>
-    <p class="app-loader__text">{{t "common.loading.default"}}</p>
   </div>
-
-</div>
-
-<Footer />
\ No newline at end of file
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/authenticated/competences/details.hbs b/mon-pix/app/templates/authenticated/competences/details.hbs
index b042a6eb44c..fd382986705 100644
--- a/mon-pix/app/templates/authenticated/competences/details.hbs
+++ b/mon-pix/app/templates/authenticated/competences/details.hbs
@@ -1,15 +1,11 @@
 {{page-title @model.name}}
 
-<header role="banner">
-  <NavbarHeader />
-</header>
-
-<main id="main" class="main background-banner-wrapper competence-details" role="main">
-  <div class="background-banner"></div>
-
-  <div class="rounded-panel rounded-panel--strong rounded-panel--over-background-banner">
-    <ScorecardDetails @scorecard={{@model}} />
-  </div>
-</main>
-
-<Footer />
\ No newline at end of file
+<Global::AppLayout>
+  <main id="main" class="main background-banner-wrapper competence-details" role="main">
+    <div class="background-banner"></div>
+
+    <div class="rounded-panel rounded-panel--strong rounded-panel--over-background-banner">
+      <ScorecardDetails @scorecard={{@model}} />
+    </div>
+  </main>
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/authenticated/competences/results.hbs b/mon-pix/app/templates/authenticated/competences/results.hbs
index f702c92d78d..cb322120efa 100644
--- a/mon-pix/app/templates/authenticated/competences/results.hbs
+++ b/mon-pix/app/templates/authenticated/competences/results.hbs
@@ -1,69 +1,65 @@
 {{page-title (t "pages.competence-result.title")}}
 
-<header role="banner">
-  <NavbarHeader />
-</header>
+<Global::AppLayout>
+  <main id="main" class="background-banner-wrapper" role="main">
+    <div class="background-banner"></div>
 
-<main id="main" class="background-banner-wrapper" role="main">
-  <div class="background-banner"></div>
-
-  <div class="rounded-panel rounded-panel--strong rounded-panel--over-background-banner">
-    <div class="competence-results-panel__header">
-      {{#if @model.scorecard.hasNotEarnedAnything}}
-        <div class="competence-results-panel-header__banner competence-results-panel-header__banner--too-bad">
-          <p class="competence-results-panel-header__banner-result-comment">{{t
-              "pages.competence-result.header.too-bad"
-            }}</p>
-          <div class="competence-results-banner__subtitle competence-results-banner__subtitle--small">
-            {{t "pages.competence-result.header.too-bad-subtitle"}}
-          </div>
-        </div>
-      {{else if @model.scorecard.hasNotReachedLevelOne}}
-        <div class="competence-results-panel-header__banner competence-results-panel-header__banner--not-bad">
-          <p class="competence-results-panel-header__banner-result-comment">{{t
-              "pages.competence-result.header.not-bad"
-            }}</p>
-          <div class="competence-results-banner__subtitle competence-results-banner__subtitle--left">
-            {{t "pages.competence-result.header.not-bad-subtitle"}}
-          </div>
-          <div class="competence-results-banner__text">
-            <div class="competence-results-banner-text__results">
-              <div class="competence-results-banner-text-results__label">{{t
-                  "pages.competence-result.header.you-have-earned"
-                }}</div>
-              <div class="competence-results-banner-text-results__value">{{@model.scorecard.earnedPix}}
-                {{t "common.pix"}}</div>
+    <div class="rounded-panel rounded-panel--strong rounded-panel--over-background-banner">
+      <div class="competence-results-panel__header">
+        {{#if @model.scorecard.hasNotEarnedAnything}}
+          <div class="competence-results-panel-header__banner competence-results-panel-header__banner--too-bad">
+            <p class="competence-results-panel-header__banner-result-comment">{{t
+                "pages.competence-result.header.too-bad"
+              }}</p>
+            <div class="competence-results-banner__subtitle competence-results-banner__subtitle--small">
+              {{t "pages.competence-result.header.too-bad-subtitle"}}
             </div>
           </div>
-        </div>
-      {{else if @model.scorecard.hasReachedAtLeastLevelOne}}
-        <div class="competence-results-panel-header__banner competence-results-panel-header__banner--congrats">
-          <p class="competence-results-panel-header__banner-result-comment">{{t
-              "pages.competence-result.header.congratulations"
-            }}</p>
-          <div class="competence-results-banner__text competence-results-banner__text--spaced">
-            <div class="competence-results-banner-text__results competence-results-banner-text__results--spaced">
-              <div class="competence-results-banner-text-results__label">{{t
-                  "pages.competence-result.header.you-have-reached-level"
-                }}</div>
-              <div class="competence-results-banner-text-results__value">{{t "common.level"}}
-                {{@model.scorecard.level}}</div>
+        {{else if @model.scorecard.hasNotReachedLevelOne}}
+          <div class="competence-results-panel-header__banner competence-results-panel-header__banner--not-bad">
+            <p class="competence-results-panel-header__banner-result-comment">{{t
+                "pages.competence-result.header.not-bad"
+              }}</p>
+            <div class="competence-results-banner__subtitle competence-results-banner__subtitle--left">
+              {{t "pages.competence-result.header.not-bad-subtitle"}}
             </div>
-            <div class="competence-results-banner-text__results competence-results-banner-text__results--spaced">
-              <div class="competence-results-banner-text-results__label">{{t
-                  "pages.competence-result.header.you-have-earned"
-                }}</div>
-              <div class="competence-results-banner-text-results__value">{{@model.scorecard.earnedPix}}
-                {{t "common.pix"}}</div>
+            <div class="competence-results-banner__text">
+              <div class="competence-results-banner-text__results">
+                <div class="competence-results-banner-text-results__label">{{t
+                    "pages.competence-result.header.you-have-earned"
+                  }}</div>
+                <div class="competence-results-banner-text-results__value">{{@model.scorecard.earnedPix}}
+                  {{t "common.pix"}}</div>
+              </div>
             </div>
           </div>
-        </div>
+        {{else if @model.scorecard.hasReachedAtLeastLevelOne}}
+          <div class="competence-results-panel-header__banner competence-results-panel-header__banner--congrats">
+            <p class="competence-results-panel-header__banner-result-comment">{{t
+                "pages.competence-result.header.congratulations"
+              }}</p>
+            <div class="competence-results-banner__text competence-results-banner__text--spaced">
+              <div class="competence-results-banner-text__results competence-results-banner-text__results--spaced">
+                <div class="competence-results-banner-text-results__label">{{t
+                    "pages.competence-result.header.you-have-reached-level"
+                  }}</div>
+                <div class="competence-results-banner-text-results__value">{{t "common.level"}}
+                  {{@model.scorecard.level}}</div>
+              </div>
+              <div class="competence-results-banner-text__results competence-results-banner-text__results--spaced">
+                <div class="competence-results-banner-text-results__label">{{t
+                    "pages.competence-result.header.you-have-earned"
+                  }}</div>
+                <div class="competence-results-banner-text-results__value">{{@model.scorecard.earnedPix}}
+                  {{t "common.pix"}}</div>
+              </div>
+            </div>
+          </div>
+        {{/if}}
+      </div>
+      {{#if @model.scorecard}}
+        <ScorecardDetails @scorecard={{@model.scorecard}} />
       {{/if}}
     </div>
-    {{#if @model.scorecard}}
-      <ScorecardDetails @scorecard={{@model.scorecard}} />
-    {{/if}}
-  </div>
-</main>
-
-<Footer />
\ No newline at end of file
+  </main>
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/authenticated/sitemap.hbs b/mon-pix/app/templates/authenticated/sitemap.hbs
index 217ad6f1183..63836b88d75 100644
--- a/mon-pix/app/templates/authenticated/sitemap.hbs
+++ b/mon-pix/app/templates/authenticated/sitemap.hbs
@@ -1,9 +1,5 @@
 {{page-title (t "pages.sitemap.title")}}
 
-<header role="banner">
-  <NavbarHeader />
-</header>
-
-<Sitemap::Content @model={{@model}} />
-
-<Footer />
\ No newline at end of file
+<Global::AppLayout>
+  <Sitemap::Content @model={{@model}} />
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/authenticated/user-account.hbs b/mon-pix/app/templates/authenticated/user-account.hbs
index 5eba3efc971..f3e5c827afa 100644
--- a/mon-pix/app/templates/authenticated/user-account.hbs
+++ b/mon-pix/app/templates/authenticated/user-account.hbs
@@ -1,57 +1,53 @@
 {{page-title (t "pages.user-account.title")}}
 
-<header role="banner">
-  <NavbarHeader @campaignParticipations={{@model.campaignParticipations}} />
-</header>
+<Global::AppLayout>
+  <main id="main" class="main" role="main">
+    <PixBackgroundHeader class="user-account">
+      <h1 class="user-account__title">{{t "pages.user-account.title"}}</h1>
 
-<main id="main" class="main" role="main">
-  <PixBackgroundHeader class="user-account">
-    <h1 class="user-account__title">{{t "pages.user-account.title"}}</h1>
-
-    <div class="user-account__menu-and-content">
-      <PixBlock class="user-account__menu-block">
-        <nav class="user-account-menu" role="navigation">
-          <ul>
-            <li>
-              <LinkTo @route="authenticated.user-account.personal-information" class="user-account-menu__link">
-                <PixIcon @name="userCircle" @ariaHidden={{true}} />
-                {{t "pages.user-account.personal-information.menu-link-title"}}
-              </LinkTo>
-            </li>
-            <li>
-              <LinkTo @route="authenticated.user-account.connection-methods" class="user-account-menu__link">
-                <PixIcon @name="link" @ariaHidden={{true}} />
-                {{t "pages.user-account.connexion-methods.menu-link-title"}}
-              </LinkTo>
-            </li>
-            {{#if this.isInternationalDomain}}
+      <div class="user-account__menu-and-content">
+        <PixBlock class="user-account__menu-block">
+          <nav class="user-account-menu" role="navigation">
+            <ul>
               <li>
-                <LinkTo @route="authenticated.user-account.language" class="user-account-menu__link">
-                  <PixIcon @name="language" @ariaHidden={{true}} />
-                  {{t "pages.user-account.language.menu-link-title"}}
+                <LinkTo @route="authenticated.user-account.personal-information" class="user-account-menu__link">
+                  <PixIcon @name="userCircle" @ariaHidden={{true}} />
+                  {{t "pages.user-account.personal-information.menu-link-title"}}
                 </LinkTo>
               </li>
-            {{/if}}
-            {{#if @model.accountInfo.canSelfDeleteAccount}}
               <li>
-                <LinkTo
-                  @route="authenticated.user-account.delete-account"
-                  class="user-account-menu__link user-account-menu__link--important"
-                >
-                  <PixIcon @name="delete" @ariaHidden={{true}} />
-                  {{t "pages.user-account.delete-account.menu-link-title"}}
+                <LinkTo @route="authenticated.user-account.connection-methods" class="user-account-menu__link">
+                  <PixIcon @name="link" @ariaHidden={{true}} />
+                  {{t "pages.user-account.connexion-methods.menu-link-title"}}
                 </LinkTo>
               </li>
-            {{/if}}
-          </ul>
-        </nav>
-      </PixBlock>
-
-      <PixBlock class="user-account__content">
-        {{outlet}}
-      </PixBlock>
-    </div>
-  </PixBackgroundHeader>
-</main>
+              {{#if this.isInternationalDomain}}
+                <li>
+                  <LinkTo @route="authenticated.user-account.language" class="user-account-menu__link">
+                    <PixIcon @name="language" @ariaHidden={{true}} />
+                    {{t "pages.user-account.language.menu-link-title"}}
+                  </LinkTo>
+                </li>
+              {{/if}}
+              {{#if @model.accountInfo.canSelfDeleteAccount}}
+                <li>
+                  <LinkTo
+                    @route="authenticated.user-account.delete-account"
+                    class="user-account-menu__link user-account-menu__link--important"
+                  >
+                    <PixIcon @name="delete" @ariaHidden={{true}} />
+                    {{t "pages.user-account.delete-account.menu-link-title"}}
+                  </LinkTo>
+                </li>
+              {{/if}}
+            </ul>
+          </nav>
+        </PixBlock>
 
-<Footer />
\ No newline at end of file
+        <PixBlock class="user-account__content">
+          {{outlet}}
+        </PixBlock>
+      </div>
+    </PixBackgroundHeader>
+  </main>
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/authenticated/user-trainings.hbs b/mon-pix/app/templates/authenticated/user-trainings.hbs
index a98251da6b6..ab963c420ad 100644
--- a/mon-pix/app/templates/authenticated/user-trainings.hbs
+++ b/mon-pix/app/templates/authenticated/user-trainings.hbs
@@ -1,29 +1,27 @@
 {{page-title (t "pages.user-trainings.title")}}
-<header role="banner">
-  <NavbarHeader />
-  <Training::Header />
-</header>
 
-<main id="main" class="main" role="main">
-  <div class="user-trainings-content">
-    {{#if @model.trainings.meta.pagination.rowCount}}
-      <div class="user-trainings-content__container">
-        <ul class="user-trainings-content__list">
-          {{#each @model.trainings as |training|}}
-            <li class="user-trainings-content-list__item">
-              <Training::Card @training={{training}} />
-            </li>
-          {{/each}}
-        </ul>
-        <PixPagination
-          @pagination={{@model.trainings.meta.pagination}}
-          @pageOptions={{this.pageOptions}}
-          @locale={{this.intl.primaryLocale}}
-          @isCondensed="true"
-        />
-      </div>
-    {{/if}}
-  </div>
-</main>
+<Global::AppLayout>
+  <Training::Header />
 
-<Footer />
\ No newline at end of file
+  <main id="main" class="main" role="main">
+    <div class="user-trainings-content">
+      {{#if @model.trainings.meta.pagination.rowCount}}
+        <div class="user-trainings-content__container">
+          <ul class="user-trainings-content__list">
+            {{#each @model.trainings as |training|}}
+              <li class="user-trainings-content-list__item">
+                <Training::Card @training={{training}} />
+              </li>
+            {{/each}}
+          </ul>
+          <PixPagination
+            @pagination={{@model.trainings.meta.pagination}}
+            @pageOptions={{this.pageOptions}}
+            @locale={{this.intl.primaryLocale}}
+            @isCondensed="true"
+          />
+        </div>
+      {{/if}}
+    </div>
+  </main>
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/authenticated/user-tutorials/recommended.hbs b/mon-pix/app/templates/authenticated/user-tutorials/recommended.hbs
index d6ddf91c3bf..6493a49ecdc 100644
--- a/mon-pix/app/templates/authenticated/user-tutorials/recommended.hbs
+++ b/mon-pix/app/templates/authenticated/user-tutorials/recommended.hbs
@@ -1,28 +1,24 @@
-<header role="banner">
-  <NavbarHeader />
-</header>
-
-<main id="main" class="user-tutorials global-page-container" role="main">
-  <Tutorials::Header @onTriggerFilterButton={{this.showSidebar}} @shouldShowFilterButton={{true}} />
-  <UserTutorials::Filters::Sidebar
-    @onSubmit={{this.handleSubmitFilters}}
-    @isVisible={{this.isSidebarVisible}}
-    @areas={{this.model.areas}}
-    @onClose={{this.closeSidebar}}
-  />
-  <div class="user-tutorials-content global-page-container__streched-content">
-    {{#if @model.recommendedTutorials.meta.pagination.rowCount}}
-      <Tutorials::Cards @tutorials={{@model.recommendedTutorials}} />
-      <PixPagination
-        @pagination={{@model.recommendedTutorials.meta.pagination}}
-        @pageOptions={{this.pageOptions}}
-        @locale={{this.intl.primaryLocale}}
-        @isCondensed="true"
-      />
-    {{else}}
-      <Tutorials::RecommendedEmpty />
-    {{/if}}
-  </div>
-</main>
-
-<Footer />
\ No newline at end of file
+<Global::AppLayout>
+  <main id="main" class="user-tutorials global-page-container" role="main">
+    <Tutorials::Header @onTriggerFilterButton={{this.showSidebar}} @shouldShowFilterButton={{true}} />
+    <UserTutorials::Filters::Sidebar
+      @onSubmit={{this.handleSubmitFilters}}
+      @isVisible={{this.isSidebarVisible}}
+      @areas={{this.model.areas}}
+      @onClose={{this.closeSidebar}}
+    />
+    <div class="user-tutorials-content global-page-container__streched-content">
+      {{#if @model.recommendedTutorials.meta.pagination.rowCount}}
+        <Tutorials::Cards @tutorials={{@model.recommendedTutorials}} />
+        <PixPagination
+          @pagination={{@model.recommendedTutorials.meta.pagination}}
+          @pageOptions={{this.pageOptions}}
+          @locale={{this.intl.primaryLocale}}
+          @isCondensed="true"
+        />
+      {{else}}
+        <Tutorials::RecommendedEmpty />
+      {{/if}}
+    </div>
+  </main>
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/authenticated/user-tutorials/saved.hbs b/mon-pix/app/templates/authenticated/user-tutorials/saved.hbs
index e4d92033c28..200eca6f3b3 100644
--- a/mon-pix/app/templates/authenticated/user-tutorials/saved.hbs
+++ b/mon-pix/app/templates/authenticated/user-tutorials/saved.hbs
@@ -1,22 +1,18 @@
-<header role="banner">
-  <NavbarHeader />
-</header>
-
-<main id="main" class="user-tutorials global-page-container" role="main">
-  <Tutorials::Header @onTriggerFilterButton={{this.showSidebar}} @shouldShowFilterButton={{false}} />
-  <div class="user-tutorials-content global-page-container__streched-content">
-    {{#if @model.savedTutorials.meta.pagination.rowCount}}
-      <Tutorials::Cards @tutorials={{@model.savedTutorials}} @afterRemove={{this.refresh}} />
-      <PixPagination
-        @pagination={{@model.savedTutorials.meta.pagination}}
-        @pageOptions={{this.pageOptions}}
-        @locale={{this.intl.primaryLocale}}
-        @isCondensed="true"
-      />
-    {{else}}
-      <Tutorials::SavedEmpty />
-    {{/if}}
-  </div>
-</main>
-
-<Footer />
\ No newline at end of file
+<Global::AppLayout>
+  <main id="main" class="user-tutorials global-page-container" role="main">
+    <Tutorials::Header @onTriggerFilterButton={{this.showSidebar}} @shouldShowFilterButton={{false}} />
+    <div class="user-tutorials-content global-page-container__streched-content">
+      {{#if @model.savedTutorials.meta.pagination.rowCount}}
+        <Tutorials::Cards @tutorials={{@model.savedTutorials}} @afterRemove={{this.refresh}} />
+        <PixPagination
+          @pagination={{@model.savedTutorials.meta.pagination}}
+          @pageOptions={{this.pageOptions}}
+          @locale={{this.intl.primaryLocale}}
+          @isCondensed="true"
+        />
+      {{else}}
+        <Tutorials::SavedEmpty />
+      {{/if}}
+    </div>
+  </main>
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/download-session-results.hbs b/mon-pix/app/templates/download-session-results.hbs
index 67e9d1580fe..9c3cc790b95 100644
--- a/mon-pix/app/templates/download-session-results.hbs
+++ b/mon-pix/app/templates/download-session-results.hbs
@@ -1,11 +1,7 @@
 {{page-title (t "pages.download-session-results.title")}}
 
-<header role="banner">
-  <NavbarHeader />
-</header>
-
-<main role="main">
-  <DownloadSessionResults />
-</main>
-
-<Footer />
\ No newline at end of file
+<Global::AppLayout>
+  <main role="main">
+    <DownloadSessionResults />
+  </main>
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/error.hbs b/mon-pix/app/templates/error.hbs
index 81168238eeb..82561ac248a 100644
--- a/mon-pix/app/templates/error.hbs
+++ b/mon-pix/app/templates/error.hbs
@@ -1,24 +1,20 @@
 {{page-title (t "navigation.error")}}
 
-<header role="banner">
-  <NavbarHeader />
-</header>
-
-<div class="error-page">
-  <div class="rounded-panel rounded-panel--strong error-page__body-section">
-    <div class="error-page__main-content">
-      <h1 class="error-page-main-content__title">{{t "pages.error.first-title"}}</h1>
-      {{t "pages.error.content-text" htmlSafe=true}}
-      <LinkTo @route="authentication.login" class="button button--extra-big button--link error-page__index-link">
-        {{t "navigation.back-to-homepage"}}</LinkTo>
-    </div>
-    <div class="error-page__error">
-      <p class="error-page__error-title">{{this.errorTitle}}</p>
-      <p>{{this.errorStatus}}</p>
-      <p>{{this.errorMessage}}</p>
-      <p>{{this.errorDetail}}</p>
+<Global::AppLayout>
+  <div class="error-page">
+    <div class="rounded-panel rounded-panel--strong error-page__body-section">
+      <div class="error-page__main-content">
+        <h1 class="error-page-main-content__title">{{t "pages.error.first-title"}}</h1>
+        {{t "pages.error.content-text" htmlSafe=true}}
+        <LinkTo @route="authentication.login" class="button button--extra-big button--link error-page__index-link">
+          {{t "navigation.back-to-homepage"}}</LinkTo>
+      </div>
+      <div class="error-page__error">
+        <p class="error-page__error-title">{{this.errorTitle}}</p>
+        <p>{{this.errorStatus}}</p>
+        <p>{{this.errorMessage}}</p>
+        <p>{{this.errorDetail}}</p>
+      </div>
     </div>
   </div>
-</div>
-
-<Footer />
\ No newline at end of file
+</Global::AppLayout>
\ No newline at end of file
diff --git a/mon-pix/app/templates/fill-in-campaign-code.hbs b/mon-pix/app/templates/fill-in-campaign-code.hbs
index 2955b2bdc06..ae96a85832b 100644
--- a/mon-pix/app/templates/fill-in-campaign-code.hbs
+++ b/mon-pix/app/templates/fill-in-campaign-code.hbs
@@ -4,81 +4,77 @@
 <div class="pix-communication-banner">
   <DataProtectionPolicyInformationBanner />
 </div>
+<Global::AppLayout>
+  <main id="main" class="main" role="main">
+    <PixBackgroundHeader>
+      <PixBlock class="fill-in-campaign-code__container">
+        <h1 class="fill-in-campaign-code__title rounded-panel-title">
+          {{this.firstTitle}}
+        </h1>
+        <p id="campaign-code-description" class="fill-in-campaign-code__instruction">{{t
+            "pages.fill-in-campaign-code.description"
+          }}</p>
 
-<header role="banner">
-  <NavbarHeader />
-</header>
+        <label for="campaign-code" class="screen-reader-only">{{t "pages.fill-in-campaign-code.label"}}</label>
+        <form class="fill-in-campaign-code__form" autocomplete="off">
 
-<main id="main" class="main" role="main">
-  <PixBackgroundHeader>
-    <PixBlock class="fill-in-campaign-code__container">
-      <h1 class="fill-in-campaign-code__title rounded-panel-title">
-        {{this.firstTitle}}
-      </h1>
-      <p id="campaign-code-description" class="fill-in-campaign-code__instruction">{{t
-          "pages.fill-in-campaign-code.description"
-        }}</p>
+          <div class="fill-in-campaign-code__form-field">
+            <Input
+              required
+              aria-describedby="campaign-code-description"
+              id="campaign-code"
+              class="input-code"
+              @type="text"
+              @value={{this.campaignCode}}
+              maxlength="9"
+              {{on "keyup" this.clearErrorMessage}}
+            />
+          </div>
 
-      <label for="campaign-code" class="screen-reader-only">{{t "pages.fill-in-campaign-code.label"}}</label>
-      <form class="fill-in-campaign-code__form" autocomplete="off">
+          {{#if this.errorMessage}}
+            <div role="alert" class="fill-in-campaign-code__error">
+              {{this.errorMessage}}
+            </div>
+          {{/if}}
 
-        <div class="fill-in-campaign-code__form-field">
-          <Input
-            required
-            aria-describedby="campaign-code-description"
-            id="campaign-code"
-            class="input-code"
-            @type="text"
-            @value={{this.campaignCode}}
-            maxlength="9"
-            {{on "keyup" this.clearErrorMessage}}
-          />
-        </div>
+          <div class="fill-in-campaign-code__actions">
+            <PixButton
+              @type="submit"
+              class="fill-in-campaign-code__start-button"
+              @triggerAction={{action "startCampaign"}}
+            >
+              {{t "pages.fill-in-campaign-code.start"}}
+            </PixButton>
+          </div>
+        </form>
 
-        {{#if this.errorMessage}}
-          <div role="alert" class="fill-in-campaign-code__error">
-            {{this.errorMessage}}
+        {{#if this.showWarningMessage}}
+          <div class="fill-in-campaign-code__warning">
+            <span>{{this.warningMessage}}</span>
+            <a href="#" class="link" {{action this.disconnect}}>
+              {{t "pages.fill-in-campaign-code.warning-message-logout"}}
+            </a>
           </div>
         {{/if}}
 
-        <div class="fill-in-campaign-code__actions">
-          <PixButton
-            @type="submit"
-            class="fill-in-campaign-code__start-button"
-            @triggerAction={{action "startCampaign"}}
+        <div class="fill-in-campaign-code__explanation">
+          <a
+            href={{t "pages.fill-in-campaign-code.explanation-link"}}
+            class="link"
+            target="_blank"
+            rel="noopener noreferrer"
           >
-            {{t "pages.fill-in-campaign-code.start"}}
-          </PixButton>
-        </div>
-      </form>
-
-      {{#if this.showWarningMessage}}
-        <div class="fill-in-campaign-code__warning">
-          <span>{{this.warningMessage}}</span>
-          <a href="#" class="link" {{action this.disconnect}}>
-            {{t "pages.fill-in-campaign-code.warning-message-logout"}}
+            {{t "pages.fill-in-campaign-code.explanation-message"}}
           </a>
         </div>
+      </PixBlock>
+      {{#if this.canDisplayLanguageSwitcher}}
+        <LanguageSwitcher @selectedLanguage={{this.selectedLanguage}} @onLanguageChange={{this.onLanguageChange}} />
       {{/if}}
+    </PixBackgroundHeader>
+  </main>
 
-      <div class="fill-in-campaign-code__explanation">
-        <a
-          href={{t "pages.fill-in-campaign-code.explanation-link"}}
-          class="link"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          {{t "pages.fill-in-campaign-code.explanation-message"}}
-        </a>
-      </div>
-    </PixBlock>
-    {{#if this.canDisplayLanguageSwitcher}}
-      <LanguageSwitcher @selectedLanguage={{this.selectedLanguage}} @onLanguageChange={{this.onLanguageChange}} />
-    {{/if}}
-  </PixBackgroundHeader>
-</main>
-
-<Footer />
+</Global::AppLayout>
 
 <PixModal
   @title={{t "pages.fill-in-campaign-code.mediacentre-start-campaign-modal.title"}}
diff --git a/mon-pix/app/templates/fill-in-certificate-verification-code.hbs b/mon-pix/app/templates/fill-in-certificate-verification-code.hbs
index 361237bcaa1..a51cb22c5a3 100644
--- a/mon-pix/app/templates/fill-in-certificate-verification-code.hbs
+++ b/mon-pix/app/templates/fill-in-certificate-verification-code.hbs
@@ -1,54 +1,51 @@
 {{! template-lint-disable no-action require-input-label no-unknown-arguments-for-builtin-components }}
 {{page-title (t "pages.fill-in-certificate-verification-code.title")}}
 
-<header role="banner">
-  <NavbarHeader />
-</header>
+<Global::AppLayout>
+  <main role="main">
+    <PixBackgroundHeader id="main">
+      <PixBlock class="fill-in-certificate-verification-code">
+        <h1 class="fill-in-certificate-verification-code__title">
+          {{t "pages.fill-in-certificate-verification-code.first-title"}}
+        </h1>
 
-<main role="main">
-  <PixBackgroundHeader id="main">
-    <PixBlock class="fill-in-certificate-verification-code">
-      <h1 class="fill-in-certificate-verification-code__title">
-        {{t "pages.fill-in-certificate-verification-code.first-title"}}
-      </h1>
+        <p class="fill-in-certificate-verification-code__description">
+          {{t "pages.fill-in-certificate-verification-code.description"}}
+        </p>
 
-      <p class="fill-in-certificate-verification-code__description">
-        {{t "pages.fill-in-certificate-verification-code.description"}}
-      </p>
-
-      <form class="fill-in-certificate-verification-code__form" autocomplete="off">
-        <div class="form__input-and-label">
-          <label for="certificate-verification-code">
-            {{t "pages.fill-in-certificate-verification-code.label"}}
-          </label>
-          <Input
-            required
-            class="input-code"
-            @type="text"
-            id="certificate-verification-code"
-            @value={{this.certificateVerificationCode}}
-            maxlength="10"
-            {{on "keyup" this.clearErrors}}
-          />
-        </div>
+        <form class="fill-in-certificate-verification-code__form" autocomplete="off">
+          <div class="form__input-and-label">
+            <label for="certificate-verification-code">
+              {{t "pages.fill-in-certificate-verification-code.label"}}
+            </label>
+            <Input
+              required
+              class="input-code"
+              @type="text"
+              id="certificate-verification-code"
+              @value={{this.certificateVerificationCode}}
+              maxlength="10"
+              {{on "keyup" this.clearErrors}}
+            />
+          </div>
 
-        <PixButton @type="submit" @triggerAction={{this.checkCertificate}} class="form__actions">
-          {{t "pages.fill-in-certificate-verification-code.verify"}}
-        </PixButton>
+          <PixButton @type="submit" @triggerAction={{this.checkCertificate}} class="form__actions">
+            {{t "pages.fill-in-certificate-verification-code.verify"}}
+          </PixButton>
 
-        {{#if this.errorMessage}}
-          <div class="form__error--validation" aria-live="polite">
-            {{this.errorMessage}}
-          </div>
-        {{/if}}
+          {{#if this.errorMessage}}
+            <div class="form__error--validation" aria-live="polite">
+              {{this.errorMessage}}
+            </div>
+          {{/if}}
 
-        {{#if this.showNotFoundCertificationErrorMessage}}
-          <PixMessage @type="error" @withIcon={{true}}>
-            {{t "pages.fill-in-certificate-verification-code.errors.not-found"}}
-          </PixMessage>
-        {{/if}}
-      </form>
-    </PixBlock>
-  </PixBackgroundHeader>
-</main>
-<Footer />
\ No newline at end of file
+          {{#if this.showNotFoundCertificationErrorMessage}}
+            <PixMessage @type="error" @withIcon={{true}}>
+              {{t "pages.fill-in-certificate-verification-code.errors.not-found"}}
+            </PixMessage>
+          {{/if}}
+        </form>
+      </PixBlock>
+    </PixBackgroundHeader>
+  </main>
+</Global::AppLayout>
\ No newline at end of file