Beautiful Open-Source Form Builder
Fix alert styling + bug fixes and cleaning
Julien Nahumbd27d3a56132
diff --git a/client/components/global/Notifications.vue b/client/components/global/Notifications.vueindex a31cbd7e7..5f1151b03 100644--- a/client/components/global/Notifications.vue+++ b/client/components/global/Notifications.vue@@ -1,121 +1,135 @@<template>- <div class="fixed top-0 bottom-24 right-0 flex px-4 items-start justify-end z-50 relative pointer-events-auto">+ <div class="fixed top-0 bottom-24 right-0 flex px-4 items-start justify-end z-50 pointer-events-auto"><NuxtNotifications><template #body="props">- <div- v-if="props.item.type==='success'"- class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"- >- <div class="flex justify-center items-center w-12 bg-green-500">- <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 fill-current text-white" viewBox="0 0 20 20" fill="currentColor">- <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd" />- </svg>- </div>+ <div class="relative">+ <div+ v-if="props.item.type==='success'"+ class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"+ >+ <div class="flex justify-center items-center w-12 bg-green-500">+ <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 fill-current text-white" viewBox="0 0 20 20"+ fill="currentColor">+ <path fill-rule="evenodd"+ d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"+ clip-rule="evenodd"/>+ </svg>+ </div>- <div class="-mx-3 py-2 px-4">- <div class="mx-3">- <span class="text-green-500 font-semibold pr-6">{{props.item.title}}</span>- <p class="text-gray-600 text-sm">{{props.item.text}}</p>+ <div class="-mx-3 py-2 px-4">+ <div class="mx-3">+ <span class="text-green-500 font-semibold pr-6">{{ props.item.title }}</span>+ <p class="text-gray-600 text-sm">{{ props.item.text }}</p>+ </div></div></div>- </div>- <div- v-if="props.item.type==='info'"- class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"- >- <div class="flex justify-center items-center w-12 bg-blue-500">- <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 fill-current text-white" viewBox="0 0 20 20" fill="currentColor">- <path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z" clip-rule="evenodd" />- </svg>+ <div+ v-if="props.item.type==='info'"+ class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"+ >+ <div class="flex justify-center items-center w-12 bg-blue-500">+ <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6 fill-current text-white" viewBox="0 0 20 20"+ fill="currentColor">+ <path fill-rule="evenodd"+ d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z"+ clip-rule="evenodd"/>+ </svg>+ </div>++ <div class="-mx-3 py-2 px-4">+ <div class="mx-3">+ <span class="text-blue-500 font-semibold pr-6">{{ props.item.title }}</span>+ <p class="text-gray-600 text-sm">T{{ props.item.text }}</p>+ </div>+ </div></div>+ <div+ v-if="props.item.type==='error'"+ class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"+ >+ <div class="flex justify-center items-center w-12 bg-red-500">+ <svg+ class="h-6 w-6 fill-current text-white"+ viewBox="0 0 40 40"+ xmlns="http://www.w3.org/2000/svg"+ >+ <path+ d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM21.6667 28.3333H18.3334V25H21.6667V28.3333ZM21.6667 21.6666H18.3334V11.6666H21.6667V21.6666Z"+ />+ </svg>+ </div>- <div class="-mx-3 py-2 px-4">- <div class="mx-3">- <span class="text-blue-500 font-semibold pr-6">{{props.item.title}}</span>- <p class="text-gray-600 text-sm">T{{props.item.text}}</p>+ <div class="-mx-3 py-2 px-4">+ <div class="mx-3">+ <span class="text-red-500 font-semibold pr-6">{{ props.item.title }}</span>+ <p class="text-gray-600 text-sm">{{ props.item.text }}</p>+ </div></div></div>- </div>- <div- v-if="props.item.type==='error'"- class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"- >- <div class="flex justify-center items-center w-12 bg-red-500">- <svg- class="h-6 w-6 fill-current text-white"- viewBox="0 0 40 40"- xmlns="http://www.w3.org/2000/svg"- >- <path- d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM21.6667 28.3333H18.3334V25H21.6667V28.3333ZM21.6667 21.6666H18.3334V11.6666H21.6667V21.6666Z"- />- </svg>+ <div+ class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"+ v-if="props.item.type==='warning'"+ >+ <div class="flex justify-center items-center w-12 bg-yellow-500">+ <svg+ class="h-6 w-6 fill-current text-white"+ viewBox="0 0 40 40"+ xmlns="http://www.w3.org/2000/svg"+ >+ <path+ d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM21.6667 28.3333H18.3334V25H21.6667V28.3333ZM21.6667 21.6666H18.3334V11.6666H21.6667V21.6666Z"+ />+ </svg>+ </div>++ <div class="-mx-3 py-2 px-4">+ <div class="mx-3">+ <span class="text-yellow-500 font-semibold pr-6">{{ props.item.title }}</span>+ <p class="text-gray-600 text-sm">{{ props.item.text }}</p>+ </div>+ </div></div>+ <div+ class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"+ v-if="props.item.type==='confirm'"+ >+ <div class="flex justify-center items-center w-12 bg-blue-500">+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"+ class="w-6 h-6 text-white">+ <path fill-rule="evenodd"+ d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12zm11.378-3.917c-.89-.777-2.366-.777-3.255 0a.75.75 0 01-.988-1.129c1.454-1.272 3.776-1.272 5.23 0 1.513 1.324 1.513 3.518 0 4.842a3.75 3.75 0 01-.837.552c-.676.328-1.028.774-1.028 1.152v.75a.75.75 0 01-1.5 0v-.75c0-1.279 1.06-2.107 1.875-2.502.182-.088.351-.199.503-.331.83-.727.83-1.857 0-2.584zM12 18a.75.75 0 100-1.5.75.75 0 000 1.5z"+ clip-rule="evenodd"/>+ </svg>+ </div>- <div class="-mx-3 py-2 px-4">- <div class="mx-3">- <span class="text-red-500 font-semibold pr-6">{{props.item.title}}</span>- <p class="text-gray-600 text-sm">{{props.item.text}}</p>+ <div class="-mx-3 py-2 px-4">+ <div class="mx-3">+ <span class="text-blue-500 font-semibold pr-6">{{ props.item.title }}</span>+ <p class="text-gray-600 text-sm">{{ props.item.text }}</p>+ <div class="w-full flex gap-2 mt-1">+ <v-button color="blue" size="small" @click.prevent="props.item.data.success();props.close()">Yes+ </v-button>+ <v-button color="white" size="small"+ @click.prevent="props.item.data.failure();props.close()">No+ </v-button>+ </div>+ </div></div></div>- </div>- <div- class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"- v-if="props.item.type==='warning'"- >- <div class="flex justify-center items-center w-12 bg-yellow-500">+ <button @click="props.close()" class="absolute top-0 right-0 px-2 py-2 cursor-pointer"><svg- class="h-6 w-6 fill-current text-white"- viewBox="0 0 40 40"+ class="fill-current h-6 w-6 text-gray-300 hover:text-gray-500"+ role="button"xmlns="http://www.w3.org/2000/svg"+ viewBox="0 0 20 20">+ <title>Close</title><path- d="M20 3.33331C10.8 3.33331 3.33337 10.8 3.33337 20C3.33337 29.2 10.8 36.6666 20 36.6666C29.2 36.6666 36.6667 29.2 36.6667 20C36.6667 10.8 29.2 3.33331 20 3.33331ZM21.6667 28.3333H18.3334V25H21.6667V28.3333ZM21.6667 21.6666H18.3334V11.6666H21.6667V21.6666Z"+ d="M14.348 14.849a1.2 1.2 0 0 1-1.697 0L10 11.819l-2.651 3.029a1.2 1.2 0 1 1-1.697-1.697l2.758-3.15-2.759-3.152a1.2 1.2 0 1 1 1.697-1.697L10 8.183l2.651-3.031a1.2 1.2 0 1 1 1.697 1.697l-2.758 3.152 2.758 3.15a1.2 1.2 0 0 1 0 1.698z"/></svg>- </div>-- <div class="-mx-3 py-2 px-4">- <div class="mx-3">- <span class="text-yellow-500 font-semibold pr-6">{{props.item.title}}</span>- <p class="text-gray-600 text-sm">{{props.item.text}}</p>- </div>- </div>- </div>- <div- class="flex max-w-sm w-full mx-auto bg-white shadow-md rounded-lg overflow-hidden mt-4"- v-if="props.item.type==='confirm'"- >- <div class="flex justify-center items-center w-12 bg-blue-500">- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6 text-white">- <path fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12zm11.378-3.917c-.89-.777-2.366-.777-3.255 0a.75.75 0 01-.988-1.129c1.454-1.272 3.776-1.272 5.23 0 1.513 1.324 1.513 3.518 0 4.842a3.75 3.75 0 01-.837.552c-.676.328-1.028.774-1.028 1.152v.75a.75.75 0 01-1.5 0v-.75c0-1.279 1.06-2.107 1.875-2.502.182-.088.351-.199.503-.331.83-.727.83-1.857 0-2.584zM12 18a.75.75 0 100-1.5.75.75 0 000 1.5z" clip-rule="evenodd" />- </svg>- </div>-- <div class="-mx-3 py-2 px-4">- <div class="mx-3">- <span class="text-blue-500 font-semibold pr-6">{{props.item.title}}</span>- <p class="text-gray-600 text-sm">{{props.item.text}}</p>- <div class="w-full flex gap-2 mt-1">- <v-button color="blue" size="small" @click.prevent="props.item.data.success();props.close()">Yes</v-button>- <v-button color="gray" shade="light" size="small" @click.prevent="props.item.data.failure();props.close()">No</v-button>- </div>- </div>- </div>+ </button></div>- <button @click="props.close()" class="absolute top-0 right-0 px-2 py-2 cursor-pointer">- <svg- class="fill-current h-6 w-6 text-gray-300 hover:text-gray-500"- role="button"- xmlns="http://www.w3.org/2000/svg"- viewBox="0 0 20 20"- >- <title>Close</title>- <path- d="M14.348 14.849a1.2 1.2 0 0 1-1.697 0L10 11.819l-2.651 3.029a1.2 1.2 0 1 1-1.697-1.697l2.758-3.15-2.759-3.152a1.2 1.2 0 1 1 1.697-1.697L10 8.183l2.651-3.031a1.2 1.2 0 1 1 1.697 1.697l-2.758 3.152 2.758 3.15a1.2 1.2 0 0 1 0 1.698z"- />- </svg>- </button></template></NuxtNotifications></div>diff --git a/client/components/open/forms/components/FormEditor.vue b/client/components/open/forms/components/FormEditor.vueindex f8876b5ff..05b6857be 100644--- a/client/components/open/forms/components/FormEditor.vue+++ b/client/components/open/forms/components/FormEditor.vue@@ -72,7 +72,7 @@<!-- Form Error Modal --><form-error-modal:show="showFormErrorModal"- :validation-error-response="validationErrorResponse"+ :form="form"@close="showFormErrorModal=false"/></div>@@ -216,10 +216,13 @@ export default {methods: {displayFormModificationAlert (responseData) {+ const alert = useAlert()+ console.log("in okd ----.", responseData)if (responseData.form && responseData.form.cleanings && Object.keys(responseData.form.cleanings).length > 0) {- useAlert().warning(responseData.message)- } else {- useAlert().success(responseData.message)+ alert.warning(responseData.message)+ } else if (responseData.message) {+ console.log(responseData.message)+ alert.success(responseData.message)}},openCrisp () {diff --git a/client/components/open/forms/components/FormFieldsEditor.vue b/client/components/open/forms/components/FormFieldsEditor.vueindex e94230aab..72b5210cd 100644--- a/client/components/open/forms/components/FormFieldsEditor.vue+++ b/client/components/open/forms/components/FormFieldsEditor.vue@@ -197,12 +197,7 @@ export default {}},- beforeMount() {- console.log('beforemounted formfields editor with', this.form)- },-mounted () {- console.log('mounted formfields editor with', this.form)this.init()},diff --git a/client/components/open/forms/components/form-components/FormErrorModal.vue b/client/components/open/forms/components/form-components/FormErrorModal.vueindex ec946c4f1..85fe78eb7 100644--- a/client/components/open/forms/components/form-components/FormErrorModal.vue+++ b/client/components/open/forms/components/form-components/FormErrorModal.vue@@ -5,10 +5,10 @@Error saving your form</h2>- <div v-if="validationErrorResponse" class="p-4 border-b border-t">- <p v-if="validationErrorResponse.message" v-text="validationErrorResponse.message" />+ <div v-if="form.errors" class="p-4 border-b border-t">+ <p v-if="form.errors.message" v-text="form.errors.message" /><ul class="list-disc list-inside">- <li v-for="err, key in validationErrorResponse.errors" :key="key">+ <li v-for="err, key in form.errors.errors" :key="key">{{ Array.isArray(err)?err[0]:err }}</li></ul>@@ -29,7 +29,7 @@ export default {components: {},props: {show: { type: Boolean, required: true },- validationErrorResponse: { type: Object, required: false }+ form: { type: Object, required: false }},data: () => ({}),diff --git a/client/components/open/tables/OpenTable.vue b/client/components/open/tables/OpenTable.vueindex 756f48e72..fa8274352 100644--- a/client/components/open/tables/OpenTable.vue+++ b/client/components/open/tables/OpenTable.vue@@ -87,6 +87,7 @@ import OpenCheckbox from './components/OpenCheckbox.vue'import ResizableTh from './components/ResizableTh.vue'import RecordOperations from '../components/RecordOperations.vue'import clonedeep from 'clone-deep'+import {hash} from "~/lib/utils.js";export default {components: { ResizableTh, RecordOperations },diff --git a/client/pages/forms/[slug]/show/share.vue b/client/pages/forms/[slug]/show/share.vueindex 9386b41f5..fd663fcfc 100644--- a/client/pages/forms/[slug]/show/share.vue+++ b/client/pages/forms/[slug]/show/share.vue@@ -45,10 +45,6 @@ export default {form: {type: Object, required: true},},- mounted() {- console.log('form',this.form)- },-data: () => ({shareFormConfig: {hide_title: false,