From 6fd2985ff5d368bfb98548b7a4042883dc93f430 Mon Sep 17 00:00:00 2001 From: formsdev <136701234+formsdev@users.noreply.github.com> Date: Sun, 31 Dec 2023 17:09:01 +0530 Subject: [PATCH] Nuxt Migration notifications (#265) * Nuxt Migration notifications * @input to @update:model-value * change field type fixes * @update:model-value * Enable form-block-logic-editor * vue-confetti migration * PR request changes * useAlert in setup --- client/app.vue | 3 +- client/components/global/Notifications.vue | 46 +- .../open/components/RecordOperations.vue | 13 +- .../open/forms/OpenCompleteForm.vue | 8 +- .../open/forms/components/CopyContent.vue | 4 +- .../open/forms/components/FormEditor.vue | 4 +- .../form-components/FormCustomization.vue | 59 +- .../form-logic-components/ColumnCondition.vue | 6 +- .../form-logic-components/ConditionEditor.vue | 6 +- .../FormBlockLogicEditor.vue | 3 +- .../templates/FormTemplateModal.vue | 9 +- .../open/forms/fields/FormFieldEdit.vue | 2 +- .../forms/fields/components/BlockOptions.vue | 6 +- .../fields/components/ChangeFieldType.vue | 4 +- .../forms/fields/components/FieldOptions.vue | 21 +- .../open/tables/components/OpenSelect.vue | 3 +- .../pages/auth/components/RegisterForm.vue | 4 +- .../forms/create/CreateFormBaseModal.vue | 16 +- .../components/pages/forms/show/ExtraMenu.vue | 9 +- .../pages/forms/show/RegenerateFormLink.vue | 2 +- .../pages/pricing/CheckoutDetailsModal.vue | 2 +- client/composables/useAlert.js | 51 + client/composables/useConfetti.js | 22 + client/mixins/forms/saveUpdateAlert.js | 4 +- client/nuxt.config.ts | 3 +- client/package-lock.json | 1621 ++++------------- client/package.json | 4 +- client/pages/forms/[slug]/edit.vue | 2 +- client/pages/forms/create/index.vue | 2 +- client/pages/settings/account.vue | 4 +- client/pages/settings/admin.vue | 2 +- client/pages/settings/billing.vue | 2 +- client/pages/settings/workspace.vue | 10 +- client/pages/subscriptions/error.vue | 2 +- client/pages/subscriptions/success.vue | 4 +- client/pages/templates/[slug].vue | 2 +- client/plugins/vue-confetti.client.js | 5 + client/stores/workspaces.js | 6 + 38 files changed, 586 insertions(+), 1390 deletions(-) create mode 100644 client/composables/useAlert.js create mode 100644 client/composables/useConfetti.js create mode 100644 client/plugins/vue-confetti.client.js diff --git a/client/app.vue b/client/app.vue index 75c9eaa..c10c3e2 100644 --- a/client/app.vue +++ b/client/app.vue @@ -27,7 +27,8 @@ - + + diff --git a/client/components/global/Notifications.vue b/client/components/global/Notifications.vue index b7cbbdf..a31cbd7 100644 --- a/client/components/global/Notifications.vue +++ b/client/components/global/Notifications.vue @@ -1,9 +1,9 @@ diff --git a/client/components/open/components/RecordOperations.vue b/client/components/open/components/RecordOperations.vue index 972bff6..f98cd4e 100644 --- a/client/components/open/components/RecordOperations.vue +++ b/client/components/open/components/RecordOperations.vue @@ -34,6 +34,11 @@ export default { default: () => {} } }, + setup () { + return { + useAlert: useAlert() + } + }, data () { return { } @@ -44,18 +49,18 @@ export default { }, methods: { onDeleteClick () { - this.alertConfirm('Do you really want to delete this record?', this.deleteRecord) + this.useAlert.confirm('Do you really want to delete this record?', this.deleteRecord) }, async deleteRecord () { axios.delete('/api/open/forms/' + this.form.id + '/records/' + this.rowid + '/delete').then(async (response) => { if (response.data.type === 'success') { this.$emit('deleted') - this.alertSuccess(response.data.message) + this.useAlert.success(response.data.message) } else { - this.alertError('Something went wrong!') + this.useAlert.error('Something went wrong!') } }).catch((error) => { - this.alertError(error.response.data.message) + this.useAlert.error(error.response.data.message) }) } } diff --git a/client/components/open/forms/OpenCompleteForm.vue b/client/components/open/forms/OpenCompleteForm.vue index 843dddf..2c1e2a9 100644 --- a/client/components/open/forms/OpenCompleteForm.vue +++ b/client/components/open/forms/OpenCompleteForm.vue @@ -129,7 +129,8 @@ export default { setup(props) { return { isIframe: useIsIframe(), - pendingSubmission: pendingSubmission(props.form) + pendingSubmission: pendingSubmission(props.form), + confetti: useConfetti() } }, @@ -214,12 +215,11 @@ export default { // If enabled display confetti if (this.form.confetti_on_submission) { - this.playConfetti() + this.confetti.play() } }).catch((error) => { if (error.response && error.response.data && error.response.data.message) { - console.error(error) - // this.alertError(error.response.data.message) + useAlert().error(error.response.data.message) } this.loading = false onFailure() diff --git a/client/components/open/forms/components/CopyContent.vue b/client/components/open/forms/components/CopyContent.vue index 828c64a..95643b3 100644 --- a/client/components/open/forms/components/CopyContent.vue +++ b/client/components/open/forms/components/CopyContent.vue @@ -56,9 +56,9 @@ export default { document.execCommand('copy') document.body.removeChild(el) if(this.isDraft){ - this.alertWarning('Copied! But other people won\'t be able to see the form since it\'s currently in draft mode') + useAlert().warning('Copied! But other people won\'t be able to see the form since it\'s currently in draft mode') } else { - this.alertSuccess('Copied!') + useAlert().success('Copied!') } } diff --git a/client/components/open/forms/components/FormEditor.vue b/client/components/open/forms/components/FormEditor.vue index 9a1a7e5..f8876b5 100644 --- a/client/components/open/forms/components/FormEditor.vue +++ b/client/components/open/forms/components/FormEditor.vue @@ -217,9 +217,9 @@ export default { methods: { displayFormModificationAlert (responseData) { if (responseData.form && responseData.form.cleanings && Object.keys(responseData.form.cleanings).length > 0) { - // this.alertWarning(responseData.message) + useAlert().warning(responseData.message) } else { - // this.alertSuccess(responseData.message) + useAlert().success(responseData.message) } }, openCrisp () { diff --git a/client/components/open/forms/components/form-components/FormCustomization.vue b/client/components/open/forms/components/form-components/FormCustomization.vue index cc31c59..0962f66 100644 --- a/client/components/open/forms/components/form-components/FormCustomization.vue +++ b/client/components/open/forms/components/form-components/FormCustomization.vue @@ -19,7 +19,7 @@ />
- Need another theme? Send us some suggestions! + Need another theme? Send us some suggestions!
@@ -80,56 +80,25 @@ - diff --git a/client/components/open/forms/components/form-logic-components/ColumnCondition.vue b/client/components/open/forms/components/form-logic-components/ColumnCondition.vue index 443b433..62d6b49 100644 --- a/client/components/open/forms/components/form-logic-components/ColumnCondition.vue +++ b/client/components/open/forms/components/form-logic-components/ColumnCondition.vue @@ -6,20 +6,20 @@