Skip to content

Beautiful Open-Source Form Builder

Form Editor polishing - convert checkbox to toggle & notification as modal (#32)

Chiragf142a0e7990b
diff --git a/resources/js/components/open/forms/components/form-components/FormAboutSubmission.vue b/resources/js/components/open/forms/components/form-components/FormAboutSubmission.vue
index 192074c8d..2ae9bfadb 100644
--- a/resources/js/components/open/forms/components/form-components/FormAboutSubmission.vue
+++ b/resources/js/components/open/forms/components/form-components/FormAboutSubmission.vue
@@ -103,7 +103,7 @@
</template>
<template v-else>
<pro-tag class="float-right"/>
- <checkbox-input name="re_fillable" :form="form" class="mt-4"
+ <toggle-switch-input name="re_fillable" :form="form" class="mt-4"
label="Allow users to fill the form again"
/>
<text-input v-if="form.re_fillable" name="re_fill_button_text"
diff --git a/resources/js/components/open/forms/components/form-components/FormCustomization.vue b/resources/js/components/open/forms/components/form-components/FormCustomization.vue
index 73e3576c3..a9d73821e 100644
--- a/resources/js/components/open/forms/components/form-components/FormCustomization.vue
+++ b/resources/js/components/open/forms/components/form-components/FormCustomization.vue
@@ -59,16 +59,16 @@
:form="form"
label="Color (for buttons & inputs border)"
/>
- <checkbox-input name="hide_title" :form="form" class="mt-4"
+ <toggle-switch-input name="hide_title" :form="form" class="mt-4"
label="Hide Title"
/>
- <checkbox-input name="no_branding" :form="form" class="mt-4"
+ <toggle-switch-input name="no_branding" :form="form" class="mt-4"
label="Remove OpnForm Branding"
/>
- <checkbox-input name="uppercase_labels" :form="form" class="mt-4"
+ <toggle-switch-input name="uppercase_labels" :form="form" class="mt-4"
label="Uppercase Input Labels"
/>
- <checkbox-input name="transparent_background" :form="form" class="mt-4"
+ <toggle-switch-input name="transparent_background" :form="form" class="mt-4"
label="Transparent Background" help="Only applies when form is embedded"
/>
</collapse>
diff --git a/resources/js/components/open/forms/components/form-components/FormNotifications.vue b/resources/js/components/open/forms/components/form-components/FormNotifications.vue
index 804438619..4e9280ef9 100644
--- a/resources/js/components/open/forms/components/form-components/FormNotifications.vue
+++ b/resources/js/components/open/forms/components/form-components/FormNotifications.vue
@@ -11,52 +11,23 @@
<pro-tag />
</h3>
</template>
- <checkbox-input name="notifies" :form="form" class="mt-4"
- label="Receive email notifications on submission"
- />
- <text-area-input v-if="form.notifies" name="notification_emails" :form="form" class="mt-4"
- label="Notification Emails" help="Add one email per line"
- />
- <checkbox-input name="notifies_slack" :form="form" class="mt-4"
- label="Receive a Slack notification on submission"
- />
- <text-input v-if="form.notifies_slack" name="slack_webhook_url" :form="form" class="mt-4"
- label="Slack webhook url" help="help"
- >
- <template #help>
- Receive slack message on each form submission. <a href="https://api.slack.com/messaging/webhooks" target="_blank">Click here</a> to learn how to get a slack webhook url
- </template>
- </text-input>
-
- <checkbox-input :disabled="emailSubmissionConfirmationField===null" name="send_submission_confirmation"
- :form="form" class="mt-4"
- label="Send submission confirmation" :help="emailSubmissionConfirmationHelp"
- />
- <text-input v-if="form.send_submission_confirmation" name="notification_sender"
- :form="form" class="mt-4"
- label="Confirmation Email Sender Name" help="Emails will be sent from our email address but you can customize the name of the Sender"
- />
- <text-input v-if="form.send_submission_confirmation" name="notification_subject"
- :form="form" class="mt-4"
- label="Confirmation email subject" help="Subject of the confirmation email that will be sent"
- />
- <rich-text-area-input v-if="form.send_submission_confirmation" name="notification_body"
- :form="form" class="mt-4"
- label="Confirmation email content" help="Content of the confirmation email that will be sent"
- />
- <checkbox-input v-if="form.send_submission_confirmation" name="notifications_include_submission"
- :form="form" class="mt-4"
- label="Include submission data" help="If enabled the confirmation email will contain form submission answers"
- />
+
+ <form-notifications-option />
+ <form-notifications-slack />
+ <form-notifications-submission-confirmation />
+
</collapse>
</template>
<script>
import Collapse from '../../../../common/Collapse'
import ProTag from '../../../../common/ProTag'
+import FormNotificationsOption from './components/FormNotificationsOption'
+import FormNotificationsSlack from './components/FormNotificationsSlack'
+import FormNotificationsSubmissionConfirmation from './components/FormNotificationsSubmissionConfirmation'
export default {
- components: { Collapse, ProTag },
+ components: { FormNotificationsSubmissionConfirmation, FormNotificationsSlack, FormNotificationsOption, Collapse, ProTag },
props: {
},
data () {
@@ -74,28 +45,10 @@ export default {
set (value) {
this.$store.commit('open/working_form/set', value)
}
- },
- emailSubmissionConfirmationField () {
- const emailFields = this.form.properties.filter((field) => {
- return field.type === 'email' && !field.hidden
- })
- if (emailFields.length === 1) return emailFields[0]
- return null
- },
- emailSubmissionConfirmationHelp () {
- if (this.emailSubmissionConfirmationField) {
- return 'Confirmation will be sent to the email in the "' + this.emailSubmissionConfirmationField.name + '" field.'
- }
- return 'Only available if your form contains 1 email field.'
}
},
watch: {
- emailSubmissionConfirmationField (val) {
- if (val === null) {
- this.$set(this.form, 'send_submission_confirmation', false)
- }
- }
},
mounted () {
diff --git a/resources/js/components/open/forms/components/form-components/FormSecurityPrivacy.vue b/resources/js/components/open/forms/components/form-components/FormSecurityPrivacy.vue
index 333c3da1f..8840f48ee 100644
--- a/resources/js/components/open/forms/components/form-components/FormSecurityPrivacy.vue
+++ b/resources/js/components/open/forms/components/form-components/FormSecurityPrivacy.vue
@@ -9,11 +9,11 @@
</svg> Security & Privacy
</h3>
</template>
- <checkbox-input name="can_be_indexed" :form="form" class="mt-4"
+ <toggle-switch-input name="can_be_indexed" :form="form" class="mt-4"
label="Indexable by Google"
help="If enabled, your form can appear in the search results of Google"
/>
- <checkbox-input name="use_captcha" :form="form" class="mt-4"
+ <toggle-switch-input name="use_captcha" :form="form" class="mt-4"
label="Protect your form with a Captcha"
help="If enabled we will make sure respondant is a human"
/>
diff --git a/resources/js/components/open/forms/components/form-components/components/FormNotificationsOption.vue b/resources/js/components/open/forms/components/form-components/components/FormNotificationsOption.vue
new file mode 100644
index 000000000..3e907e711
--- /dev/null
+++ b/resources/js/components/open/forms/components/form-components/components/FormNotificationsOption.vue
@@ -0,0 +1,75 @@
+<template>
+ <div>
+ <button
+ class="flex items-center mt-3 cursor-pointer relative w-full rounded-lg flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full py-2 px-4 bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 shadow-sm text-base focus:outline-none focus:ring-2 focus:border-transparent focus:ring-opacity-100"
+ @click.prevent="showModal=true"
+ >
+ <div class="flex-grow flex items-center">
+ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+ class="w-5 h-5 inline"
+ >
+ <path stroke-linecap="round" stroke-linejoin="round"
+ d="M21.75 6.75v10.5a2.25 2.25 0 01-2.25 2.25h-15a2.25 2.25 0 01-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25m19.5 0v.243a2.25 2.25 0 01-1.07 1.916l-7.5 4.615a2.25 2.25 0 01-2.36 0L3.32 8.91a2.25 2.25 0 01-1.07-1.916V6.75"
+ />
+ </svg>
+ <p class="flex-grow text-center">
+ Email Notifications
+ </p>
+ </div>
+ <div v-if="form.notifies">
+ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+ class="w-5 h-5 text-nt-blue"
+ >
+ <path stroke-linecap="round" stroke-linejoin="round"
+ d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+ />
+ </svg>
+ </div>
+ </button>
+ <modal :show="showModal" @close="showModal=false">
+ <h2 class="text-2xl font-bold z-10 truncate mb-5 text-nt-blue">
+ Form Notifications
+ <pro-tag />
+ </h2>
+ <toggle-switch-input name="notifies" :form="form" class="mt-4"
+ label="Receive email notifications on submission"
+ />
+ <text-area-input v-if="form.notifies" name="notification_emails" :form="form" class="mt-4"
+ label="Notification Emails" help="Add one email per line"
+ />
+ </modal>
+ </div>
+</template>
+
+<script>
+import ProTag from '../../../../../common/ProTag'
+
+export default {
+ components: { ProTag },
+ props: {},
+ data () {
+ return {
+ showModal: false
+ }
+ },
+
+ computed: {
+ form: {
+ get () {
+ return this.$store.state['open/working_form'].content
+ },
+ /* We add a setter */
+ set (value) {
+ this.$store.commit('open/working_form/set', value)
+ }
+ }
+ },
+
+ watch: {},
+
+ mounted () {
+ },
+
+ methods: {}
+}
+</script>
diff --git a/resources/js/components/open/forms/components/form-components/components/FormNotificationsSlack.vue b/resources/js/components/open/forms/components/form-components/components/FormNotificationsSlack.vue
new file mode 100644
index 000000000..62d82b84e
--- /dev/null
+++ b/resources/js/components/open/forms/components/form-components/components/FormNotificationsSlack.vue
@@ -0,0 +1,73 @@
+<template>
+ <div>
+ <button
+ class="flex items-center mt-3 cursor-pointer relative w-full rounded-lg flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full py-2 px-4 bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 shadow-sm text-base focus:outline-none focus:ring-2 focus:border-transparent focus:ring-opacity-100"
+ @click.prevent="showModal=true"
+ >
+ <div class="flex-grow flex items-center">
+ <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 inline" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14.5 10c-.83 0-1.5-.67-1.5-1.5v-5c0-.83.67-1.5 1.5-1.5s1.5.67 1.5 1.5v5c0 .83-.67 1.5-1.5 1.5z" /><path d="M20.5 10H19V8.5c0-.83.67-1.5 1.5-1.5s1.5.67 1.5 1.5-.67 1.5-1.5 1.5z" /><path d="M9.5 14c.83 0 1.5.67 1.5 1.5v5c0 .83-.67 1.5-1.5 1.5S8 21.33 8 20.5v-5c0-.83.67-1.5 1.5-1.5z" /><path d="M3.5 14H5v1.5c0 .83-.67 1.5-1.5 1.5S2 16.33 2 15.5 2.67 14 3.5 14z" /><path d="M14 14.5c0-.83.67-1.5 1.5-1.5h5c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5h-5c-.83 0-1.5-.67-1.5-1.5z" /><path d="M15.5 19H14v1.5c0 .83.67 1.5 1.5 1.5s1.5-.67 1.5-1.5-.67-1.5-1.5-1.5z" /><path d="M10 9.5C10 8.67 9.33 8 8.5 8h-5C2.67 8 2 8.67 2 9.5S2.67 11 3.5 11h5c.83 0 1.5-.67 1.5-1.5z" /><path d="M8.5 5H10V3.5C10 2.67 9.33 2 8.5 2S7 2.67 7 3.5 7.67 5 8.5 5z" /></svg>
+ <p class="flex-grow text-center">
+ Slack Notifications
+ </p>
+ </div>
+ <div v-if="form.notifies_slack">
+ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+ class="w-5 h-5 text-nt-blue"
+ >
+ <path stroke-linecap="round" stroke-linejoin="round"
+ d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+ />
+ </svg>
+ </div>
+ </button>
+ <modal :show="showModal" @close="showModal=false">
+ <h2 class="text-2xl font-bold z-10 truncate mb-5 text-nt-blue">
+ Slack Notifications
+ <pro-tag />
+ </h2>
+ <toggle-switch-input name="notifies_slack" :form="form" class="mt-4"
+ label="Receive a Slack notification on submission"
+ />
+ <text-input v-if="form.notifies_slack" name="slack_webhook_url" :form="form" class="mt-4"
+ label="Slack webhook url" help="help"
+ >
+ <template #help>
+ Receive slack message on each form submission. <a href="https://api.slack.com/messaging/webhooks" target="_blank">Click here</a> to learn how to get a slack webhook url
+ </template>
+ </text-input>
+ </modal>
+ </div>
+</template>
+
+<script>
+import ProTag from '../../../../../common/ProTag'
+
+export default {
+ components: { ProTag },
+ props: {},
+ data () {
+ return {
+ showModal: false
+ }
+ },
+
+ computed: {
+ form: {
+ get () {
+ return this.$store.state['open/working_form'].content
+ },
+ /* We add a setter */
+ set (value) {
+ this.$store.commit('open/working_form/set', value)
+ }
+ }
+ },
+
+ watch: {},
+
+ mounted () {
+ },
+
+ methods: {}
+}
+</script>
diff --git a/resources/js/components/open/forms/components/form-components/components/FormNotificationsSubmissionConfirmation.vue b/resources/js/components/open/forms/components/form-components/components/FormNotificationsSubmissionConfirmation.vue
new file mode 100644
index 000000000..44a1c1687
--- /dev/null
+++ b/resources/js/components/open/forms/components/form-components/components/FormNotificationsSubmissionConfirmation.vue
@@ -0,0 +1,104 @@
+<template>
+ <div>
+ <button
+ class="flex items-center mt-3 cursor-pointer relative w-full rounded-lg flex-1 appearance-none border border-gray-300 dark:border-gray-600 w-full py-2 px-4 bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 dark:placeholder-gray-500 placeholder-gray-400 shadow-sm text-base focus:outline-none focus:ring-2 focus:border-transparent focus:ring-opacity-100"
+ @click.prevent="showModal=true"
+ >
+ <div class="flex-grow flex items-center">
+ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+ <path stroke-linecap="round" stroke-linejoin="round" d="M6 12L3.269 3.126A59.768 59.768 0 0121.485 12 59.77 59.77 0 013.27 20.876L5.999 12zm0 0h7.5" />
+ </svg>
+ <p class="flex-grow text-center">
+ Send submission confirmation
+ </p>
+ </div>
+ <div v-if="form.send_submission_confirmation">
+ <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+ class="w-5 h-5 text-nt-blue"
+ >
+ <path stroke-linecap="round" stroke-linejoin="round"
+ d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
+ />
+ </svg>
+ </div>
+ </button>
+ <modal :show="showModal" @close="showModal=false">
+ <h2 class="text-2xl font-bold z-10 truncate mb-5 text-nt-blue">
+ Submission confirmation
+ <pro-tag />
+ </h2>
+ <toggle-switch-input :disabled="emailSubmissionConfirmationField===null" name="send_submission_confirmation"
+ :form="form" class="mt-4"
+ label="Send submission confirmation" :help="emailSubmissionConfirmationHelp"
+ />
+ <text-input v-if="form.send_submission_confirmation" name="notification_sender"
+ :form="form" class="mt-4"
+ label="Confirmation Email Sender Name" help="Emails will be sent from our email address but you can customize the name of the Sender"
+ />
+ <text-input v-if="form.send_submission_confirmation" name="notification_subject"
+ :form="form" class="mt-4"
+ label="Confirmation email subject" help="Subject of the confirmation email that will be sent"
+ />
+ <rich-text-area-input v-if="form.send_submission_confirmation" name="notification_body"
+ :form="form" class="mt-4"
+ label="Confirmation email content" help="Content of the confirmation email that will be sent"
+ />
+ <toggle-switch-input v-if="form.send_submission_confirmation" name="notifications_include_submission"
+ :form="form" class="mt-4"
+ label="Include submission data" help="If enabled the confirmation email will contain form submission answers"
+ />
+ </modal>
+ </div>
+</template>
+
+<script>
+import ProTag from '../../../../../common/ProTag'
+
+export default {
+ components: { ProTag },
+ props: {},
+ data () {
+ return {
+ showModal: false
+ }
+ },
+
+ computed: {
+ form: {
+ get () {
+ return this.$store.state['open/working_form'].content
+ },
+ /* We add a setter */
+ set (value) {
+ this.$store.commit('open/working_form/set', value)
+ }
+ },
+ emailSubmissionConfirmationField () {
+ const emailFields = this.form.properties.filter((field) => {
+ return field.type === 'email' && !field.hidden
+ })
+ if (emailFields.length === 1) return emailFields[0]
+ return null
+ },
+ emailSubmissionConfirmationHelp () {
+ if (this.emailSubmissionConfirmationField) {
+ return 'Confirmation will be sent to the email in the "' + this.emailSubmissionConfirmationField.name + '" field.'
+ }
+ return 'Only available if your form contains 1 email field.'
+ }
+ },
+
+ watch: {
+ emailSubmissionConfirmationField (val) {
+ if (val === null) {
+ this.$set(this.form, 'send_submission_confirmation', false)
+ }
+ }
+ },
+
+ mounted () {
+ },
+
+ methods: {}
+}
+</script>