fix navigator and transition bug

deck9 · Oct 25, 2024 · b1304ca · b1304ca
1 parent 74a978f
commit b1304ca
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/resources/js/forms/classic/layout/FormSubmittedPage.vue b/resources/js/forms/classic/layout/FormSubmittedPage.vue
@@ -1,23 +1,23 @@
 <template>
-  <div class="form-message-prose conversation-theme">
-    <h1>
-      {{ store.form?.eoc_headline || t("form_submitted") }}
-    </h1>
-    <div
-      v-if="store.form?.eoc_text"
-      class="mt-2"
-      v-html="store.form?.eoc_text"
-    ></div>
-  </div>
-
   <div>
-    <CallToActionButton
-      v-if="store.form?.show_cta_link && store.callToActionUrl"
-      :href="store.callToActionUrl"
-      :label="store.form?.cta_label ?? t('close')"
-    />
-
-    <SocialLinks v-if="store.form?.show_social_links" class="mt-8" />
+    <div class="form-message-prose conversation-theme">
+      <h1>
+        {{ store.form?.eoc_headline || t("form_submitted") }}
+      </h1>
+      <div
+        v-if="store.form?.eoc_text"
+        class="mt-2"
+        v-html="store.form?.eoc_text"
+      ></div>
+    </div>
+    <div>
+      <CallToActionButton
+        v-if="store.form?.show_cta_link && store.callToActionUrl"
+        :href="store.callToActionUrl"
+        :label="store.form?.cta_label ?? t('close')"
+      />
+      <SocialLinks v-if="store.form?.show_social_links" class="mt-8" />
+    </div>
   </div>
 </template>
 

diff --git a/resources/js/forms/classic/layout/Navigator.vue b/resources/js/forms/classic/layout/Navigator.vue
@@ -82,6 +82,10 @@ const currentPage = computed(() => {
 });
 
 const progress = computed(() => {
-  return Math.round((store.currentBlockIndex / totalPages.value) * 100);
+  if (store.currentBlockIndex <= 0) {
+    return 0;
+  }
+
+  return Math.round(((store.currentBlockIndex + 1) / totalPages.value) * 100);
 });
 </script>