CASH-79: move save progress out of questions-page-layout up to page level

src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue

@@ -25,7 +25,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+                <div class="col-md-6 col-xl-4 question-chain-wrapper">
                     <div v-for="(questionsDatum, i) in questionsData" :key="questionsDatum.key">
                         <questionChain
                             ref="questionChain"
@@ -37,14 +37,14 @@
                             :validationRules="validationRules" />
                     </div>
 
+                    <slot></slot>
+
                     <navbar
                         ref="navbar"
                         cmsWidgetName="FunnelFooterWidget"
                         :isForwardActionDisabled="!isMetaValid"
                         @back-clicked="handleBackButtonAction"
                         @ForwardClicked="handleForwardButtonAction" />
-
-                    <saveProgressModalQuestion modalWidgetName="SaveProgressModalWidget" />
                 </div>
             </div>
         </div>
@@ -59,7 +59,6 @@ import questionChain from "@/digital-components/question-chain/question-chain";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
-import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-question/save-progress-modal-question";
 
 export default {
     name: "questions-page",
@@ -102,7 +101,6 @@ export default {
         funnelSubHeader,
         navbar,
         loadingModal,
-        saveProgressModalQuestion,
     },
 };
 </script>
@@ -116,5 +114,13 @@ export default {
             text-align: left;
         }
     }
+    .question-chain-wrapper {
+        display: flex;
+        flex-direction: column;
+
+        .nav-bar {
+            order: 1;
+        }
+    }
 }
 </style>

src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue

@@ -102,6 +102,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.save-progress-modal-question {
+    order: 2;
+}
 .applied-promo {
     font-size: 0.875rem;
     font-weight: 500;

src/layouts/part-questions/part-questions.vue

@@ -12,13 +12,19 @@
             @forwardButtonAction="forwardButtonAction"
             @back-click="navigateBack"
             :key="currentGlassIndex"
-            :index="currentGlassIndex" />
+            :index="currentGlassIndex">
+            
+            <!-- save progress goes into <slot> on questions-page-layout -->
+            <saveProgressModalQuestion modalWidgetName="SaveProgressModalWidget" />
+
+        </questions-page-layout>
     </Form>
 </template>
 
 <script>
 // Components
 import questionsPageLayout from "@/fmg-components/layouts/questions-page-layout/questions-page-layout";
+import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-question/save-progress-modal-question";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -185,6 +191,7 @@ export default {
     components: {
         Form,
         questionsPageLayout,
+        saveProgressModalQuestion,
     },
 };
 </script>