From e2dd0295ff18dffc6b13dfc8cc3f8fb26a35c38b Mon Sep 17 00:00:00 2001 From: Julien Nahum Date: Sun, 24 Dec 2023 20:19:59 +0100 Subject: [PATCH] Remove vform - working on form public page --- app/Models/Forms/Form.php | 2 +- .../open/forms/OpenCompleteForm.vue | 34 +- client/components/open/forms/OpenForm.vue | 62 +- .../components/open/forms/OpenFormField.vue | 31 +- .../open/forms/components/FormSubmissions.vue | 3 +- .../form-components/AddFormBlock.vue | 5 +- .../templates/FormTemplateModal.vue | 5 +- client/components/open/tables/OpenTable.vue | 16 +- .../pages/auth/ForgotPasswordModal.vue | 4 +- .../pages/auth/components/RegisterForm.vue | 4 +- .../pages/pricing/CheckoutDetailsModal.vue | 4 +- client/composables/forms/pendingSubmission.js | 34 + client/composables/useForm.js | 2 +- client/lib/forms/public-page.js | 55 ++ .../utils.js} | 11 +- client/pages/auth/password/email.vue | 3 +- client/pages/auth/password/reset.vue | 3 +- client/pages/auth/verification/resend.vue | 5 +- client/pages/forms/[slug]/index.vue | 145 +++ client/pages/forms/[slug]/show.vue | 5 +- client/pages/forms/create/guest.vue | 11 +- client/pages/forms/show-public.vue | 222 ----- client/pages/settings/account.vue | 6 +- client/pages/settings/admin.vue | 9 +- client/pages/settings/password.vue | 3 +- client/pages/settings/profile.vue | 8 +- client/pages/settings/workspace.vue | 10 +- client/stores/forms.js | 11 +- package-lock.json | 868 ++++++++++++------ package.json | 1 - .../open/forms/OpenCompleteForm.vue | 5 +- resources/js/pages/forms/show-public.vue | 177 ++-- 32 files changed, 951 insertions(+), 813 deletions(-) create mode 100644 client/composables/forms/pendingSubmission.js create mode 100644 client/lib/forms/public-page.js rename client/{mixins/forms/form-pending-submission-key.js => lib/utils.js} (67%) create mode 100644 client/pages/forms/[slug]/index.vue delete mode 100644 client/pages/forms/show-public.vue diff --git a/app/Models/Forms/Form.php b/app/Models/Forms/Form.php index 4ad2424..3fbf021 100644 --- a/app/Models/Forms/Form.php +++ b/app/Models/Forms/Form.php @@ -156,7 +156,7 @@ class Form extends Model implements CachableAttributes if ($this->custom_domain) { return 'https://' . $this->custom_domain . '/forms/' . $this->slug; } - return url('/forms/' . $this->slug); + return '/forms/' . $this->slug; } public function getEditUrlAttribute() diff --git a/client/components/open/forms/OpenCompleteForm.vue b/client/components/open/forms/OpenCompleteForm.vue index 9f9afda..843dddf 100644 --- a/client/components/open/forms/OpenCompleteForm.vue +++ b/client/components/open/forms/OpenCompleteForm.vue @@ -108,20 +108,17 @@ diff --git a/client/pages/forms/[slug]/show.vue b/client/pages/forms/[slug]/show.vue index a6458b7..65df2c7 100644 --- a/client/pages/forms/[slug]/show.vue +++ b/client/pages/forms/[slug]/show.vue @@ -128,7 +128,6 @@ diff --git a/client/pages/settings/account.vue b/client/pages/settings/account.vue index 6cb4f69..3181d08 100644 --- a/client/pages/settings/account.vue +++ b/client/pages/settings/account.vue @@ -16,14 +16,10 @@