Apply previous changes: slack webhooks, date range issue, 12h am/pm format, today preifl, api-keys

2022-09-21 17:23:37 +02:00
parent 341ee04268
commit 18ed28da2e
19 changed files with 305 additions and 132 deletions
--- a/resources/js/components/forms/DateInput.vue
+++ b/resources/js/components/forms/DateInput.vue
@@ -11,7 +11,8 @@
                  :style="inputStyle" :name="name" :fixed-classes="fixedClasses" :range="dateRange"
                  :placeholder="placeholder" :timepicker="useTime" 
                  :date-format="useTime?'Z':'Y-m-d'" 
-                  :user-format="useTime?'F j, Y - H:i':'F j, Y'"
+                  :user-format="useTime ? amPm ? 'F j, Y - G:i K' : 'F j, Y - H:i' : 'F j, Y'"
+                  :amPm="amPm"
    />
    <small v-if="help" :class="theme.default.help">
      <slot name="help">{{ help }}</slot>
@@ -30,7 +31,8 @@ export default {

  props: {
    withTime: { type: Boolean, default: false },
-    dateRange: { type: Boolean, default: false }
+    dateRange: { type: Boolean, default: false },
+    amPm: { type: Boolean, default: false }
  },

  data: () => ({
--- a/resources/js/components/forms/FlatSelectInput.vue
+++ b/resources/js/components/forms/FlatSelectInput.vue
@@ -1,86 +1,84 @@
 <template>
-    <div :class="wrapperClass">
-        <label v-if="label" :for="id?id:name"
-                :class="[theme.default.label,{'uppercase text-xs':uppercaseLabels, 'text-sm':!uppercaseLabels}]"
-            >
-            {{ label }}
-            <span v-if="required" class="text-red-500 required-dot">*</span>
-        </label>
+  <div :class="wrapperClass">
+    <label v-if="label" :for="id?id:name"
+           :class="[theme.default.label,{'uppercase text-xs':uppercaseLabels, 'text-sm':!uppercaseLabels}]"
+    >
+      {{ label }}
+      <span v-if="required" class="text-red-500 required-dot">*</span>
+    </label>

-        <loader v-if="loading" key="loader" class="h-6 w-6 text-nt-blue mx-auto" />
-        <div v-else v-for="option in options" :key="option[optionKey]" class="flex border mb-4 p-3 cursor-pointer rounded-2xl" @click="onSelect(option[optionKey])">
-            <p class="flex-grow">
-              {{ option[displayKey] }}
-            </p>
-            <span v-if="isSelected(option[optionKey])" class="float-right">
-              <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-                <path fill-rule="evenodd"
-                      d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
-                      clip-rule="evenodd"
-                />
-              </svg>
-            </span>
-        </div>
-
-        <small v-if="help" :class="theme.SelectInput.help">
-            <slot name="help">{{ help }}</slot>
-        </small>
-        <has-error v-if="hasValidation" :form="form" :field="name" />
+    <loader v-if="loading" key="loader" class="h-6 w-6 text-nt-blue mx-auto" />
+    <div v-for="(option, index) in options" v-else :key="option[optionKey]"
+         :class="[theme.default.input,'cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-900 flex',{ 'mb-2': index !== options.length,'ring-red-500 ring-2': hasValidation && form.errors.has(name), 'cursor-not-allowed bg-gray-200':disabled }]"
+         @click="onSelect(option[optionKey])"
+    >
+      <p class="flex-grow">
+        {{ option[displayKey] }}
+      </p>
+      <div v-if="isSelected(option[optionKey])" class="flex items-center">
+        <svg :color="color" xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" 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>
-  </template>

-  <script>
-  import inputMixin from '~/mixins/forms/input'
+    <small v-if="help" :class="theme.SelectInput.help">
+      <slot name="help">{{ help }}</slot>
+    </small>
+    <has-error v-if="hasValidation" :form="form" :field="name" />
+  </div>
+</template>

-  /**
-   * Options: {name,value} objects
-   */
-  export default {
-    name: 'FlatSelectInput',
-    mixins: [inputMixin],
+<script>
+import inputMixin from '~/mixins/forms/input'

-    props: {
-      options: { type: Array, required: true },
-      optionKey: { type: String, default: 'value' },
-      emitKey: { type: String, default: 'value' },
-      displayKey: { type: String, default: 'name' },
-      loading: { type: Boolean, default: false },
-      multiple: { type: Boolean, default: false },
-    },
-    data () {
-      return {
+/**
+ * Options: {name,value} objects
+ */
+export default {
+  name: 'FlatSelectInput',
+  mixins: [inputMixin],
+
+  props: {
+    options: { type: Array, required: true },
+    optionKey: { type: String, default: 'value' },
+    emitKey: { type: String, default: 'value' },
+    displayKey: { type: String, default: 'name' },
+    loading: { type: Boolean, default: false },
+    multiple: { type: Boolean, default: false }
+  },
+  data () {
+    return {}
+  },
+  computed: {},
+  methods: {
+    onSelect (value) {
+      if (this.multiple) {
+        const emitValue = Array.isArray(this.compVal) ? [...this.compVal] : []
+
+        // Already in value, remove it
+        if (this.isSelected(value)) {
+          this.compVal = emitValue.filter((item) => {
+            return item !== value
+          })
+          return
+        }
+
+        // Otherwise add value
+        emitValue.push(value)
+        this.compVal = emitValue
+      } else {
+        this.compVal = (this.compVal === value) ? null : value
      }
    },
-    computed: {
-    },
-    methods: {
-      onSelect (value) {
-        if (this.multiple) {
-          const emitValue = Array.isArray(this.compVal) ? [...this.compVal] : []
+    isSelected (value) {
+      if (!this.compVal) return false

-          // Already in value, remove it
-          if (this.isSelected(value)) {
-            this.compVal = emitValue.filter((item) => {
-              return item !== value
-            })
-            return
-          }
-
-          // Otherwise add value
-          emitValue.push(value)
-          this.compVal = emitValue
-        } else {
-          this.compVal = (this.compVal === value) ? null : value
-        }
-      },
-      isSelected (value) {
-        if(!this.compVal) return false
-
-        if (this.multiple) {
-          return this.compVal.includes(value)
-        }
-        return this.compVal === value
+      if (this.multiple) {
+        return this.compVal.includes(value)
      }
+      return this.compVal === value
    }
  }
-  </script>
+}
+</script>
--- a/resources/js/components/open/forms/OpenForm.vue
+++ b/resources/js/components/open/forms/OpenForm.vue
@@ -288,6 +288,12 @@ export default {
        } else if (urlPrefill && urlPrefill.has(field.id + '[]')) {
          // Array url prefills
          formData[field.id] = urlPrefill.getAll(field.id + '[]')
+        } else if (field.type === 'date' && field.prefill_today === true) { // For Prefill with 'today'
+          const dateObj = new Date()
+          const currentDate = dateObj.getFullYear() + '-' +
+                  String(dateObj.getMonth() + 1).padStart(2, '0') + '-' +
+                  String(dateObj.getDate()).padStart(2, '0')
+          formData[field.id] = currentDate
        } else { // Default prefill if any
          formData[field.id] = field.prefill
        }
@@ -363,6 +369,9 @@ export default {
        } else if (field.date_range) {
          inputProperties.dateRange = true
        }
+        if (field.use_am_pm) {
+          inputProperties.amPm = true
+        }
      } else if (field.type === 'files' || (field.type === 'url' && field.file_upload)) {
        inputProperties.multiple = (field.multiple !== undefined && field.multiple)
        inputProperties.mbLimit = 5
--- a/resources/js/components/open/forms/components/form-components/FormIntegrations.vue
+++ b/resources/js/components/open/forms/components/form-components/FormIntegrations.vue
@@ -2,11 +2,13 @@
  <collapse class="p-5 w-full border-b">
    <template #title>
      <h3 class="font-semibold text-lg">
-        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 inline text-gray-500 mr-2 -mt-1" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 4a2 2 0 114 0v1a1 1 0 001 1h3a1 1 0 011 1v3a1 1 0 01-1 1h-1a2 2 0 100 4h1a1 1 0 011 1v3a1 1 0 01-1 1h-3a1 1 0 01-1-1v-1a2 2 0 10-4 0v1a1 1 0 01-1 1H7a1 1 0 01-1-1v-3a1 1 0 00-1-1H4a2 2 0 110-4h1a1 1 0 001-1V7a1 1 0 011-1h3a1 1 0 001-1V4z" />
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 inline text-gray-500 mr-2 -mt-1" fill="none"
+             viewBox="0 0 24 24" stroke="currentColor">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                d="M11 4a2 2 0 114 0v1a1 1 0 001 1h3a1 1 0 011 1v3a1 1 0 01-1 1h-1a2 2 0 100 4h1a1 1 0 011 1v3a1 1 0 01-1 1h-3a1 1 0 01-1-1v-1a2 2 0 10-4 0v1a1 1 0 01-1 1H7a1 1 0 01-1-1v-3a1 1 0 00-1-1H4a2 2 0 110-4h1a1 1 0 001-1V7a1 1 0 011-1h3a1 1 0 001-1V4z"/>
        </svg>
        Integrations
-        <pro-tag />
+        <pro-tag/>
      </h3>
    </template>
    <text-input name="webhook_url" class="mt-4"
@@ -14,24 +16,26 @@
                label="Webhook URL"
    />

-    <p>
-      <span class="text-uppercase font-semibold text-blue-500">NEW</span> - our Zapier integration is available for
-      beta testers! During the beta, <b>you don't need a Pro subscription</b> to try it out.
-    </p>
-    <p class="w-full text-center mt-5">
-      <a :href="zapierUrl" target="_blank">
-        <v-button color="gray" shade="lighter">
-          <svg class="h-5 w-5 inline text-yellow-500" fill="currentColor" xmlns="http://www.w3.org/2000/svg"
-               viewBox="0 0 512 512"
-          >
-            <path
-              d="M318 256c0 19-4 36-10 52-16 7-34 10-52 10-19 0-36-3-52-9-7-17-10-34-10-53 0-18 3-36 10-52 16-6 33-10 52-10 18 0 36 4 52 10 6 16 10 34 10 52zm182-41H355l102-102c-8-11-17-22-26-32-10-9-21-18-32-26L297 157V12c-13-2-27-3-41-3s-28 1-41 3v145L113 55c-12 8-22 17-32 26-10 10-19 21-27 32l102 102H12s-3 27-3 41 1 28 3 41h144L54 399c16 23 36 43 59 59l102-102v144c13 2 27 3 41 3s28-1 41-3V356l102 102c11-8 22-17 32-27 9-10 18-20 26-32L355 297h145c2-13 3-27 3-41s-1-28-3-41z"
-            />
-          </svg>
-          Zapier Integration
-        </v-button>
-      </a>
-    </p>
+<!--    <div>-->
+<!--      <p>-->
+<!--        <span class="text-uppercase font-semibold text-blue-500">NEW</span> - our Zapier integration is available for-->
+<!--        beta testers!-->
+<!--      </p>-->
+<!--      <p class="w-full text-center mt-5">-->
+<!--        <a :href="zapierUrl" target="_blank">-->
+<!--          <v-button color="gray" shade="lighter">-->
+<!--            <svg class="h-5 w-5 inline text-yellow-500" fill="currentColor" xmlns="http://www.w3.org/2000/svg"-->
+<!--                 viewBox="0 0 512 512"-->
+<!--            >-->
+<!--              <path-->
+<!--                d="M318 256c0 19-4 36-10 52-16 7-34 10-52 10-19 0-36-3-52-9-7-17-10-34-10-53 0-18 3-36 10-52 16-6 33-10 52-10 18 0 36 4 52 10 6 16 10 34 10 52zm182-41H355l102-102c-8-11-17-22-26-32-10-9-21-18-32-26L297 157V12c-13-2-27-3-41-3s-28 1-41 3v145L113 55c-12 8-22 17-32 26-10 10-19 21-27 32l102 102H12s-3 27-3 41 1 28 3 41h144L54 399c16 23 36 43 59 59l102-102v144c13 2 27 3 41 3s28-1 41-3V356l102 102c11-8 22-17 32-27 9-10 18-20 26-32L355 297h145c2-13 3-27 3-41s-1-28-3-41z"-->
+<!--              />-->
+<!--            </svg>-->
+<!--            Zapier Integration-->
+<!--          </v-button>-->
+<!--        </a>-->
+<!--      </p>-->
+<!--    </div>-->
  </collapse>
 </template>

@@ -40,21 +44,19 @@ import Collapse from '../../../../common/Collapse'
 import ProTag from '../../../../common/ProTag'

 export default {
-  components: { Collapse, ProTag },
-  props: {
-  },
-  data () {
-    return {
-    }
+  components: {Collapse, ProTag},
+  props: {},
+  data() {
+    return {}
  },

  computed: {
    form: {
-      get () {
+      get() {
        return this.$store.state['open/working_form'].content
      },
      /* We add a setter */
-      set (value) {
+      set(value) {
        this.$store.commit('open/working_form/set', value)
      }
    },
@@ -64,10 +66,9 @@ export default {

  watch: {},

-  mounted () {
+  mounted() {
  },

-  methods: {
-  }
+  methods: {}
 }
 </script>
--- a/resources/js/components/open/forms/components/form-components/FormNotifications.vue
+++ b/resources/js/components/open/forms/components/form-components/FormNotifications.vue
@@ -15,6 +15,17 @@
    <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"
--- a/resources/js/components/open/forms/fields/FormFieldOptionsModal.vue
+++ b/resources/js/components/open/forms/fields/FormFieldOptionsModal.vue
@@ -111,12 +111,30 @@
        <p class="text-gray-400 mb-5">
          Include time. Or not. This cannot be used with the date range option yet.
        </p>
+        <v-checkbox v-if="field.with_time"
+                    v-model="field.use_am_pm"
+                    name="use_am_pm"
+        >
+          Use 12h AM/PM format
+        </v-checkbox>
+        <p v-if="field.with_time" class="text-gray-400 mb-5">
+          By default, input uses the 24 hours format
+        </p>

        <select-input v-if="field.with_time" name="timezone" class="mt-4"
                      :form="field" :options="timezonesOptions"
                      label="Timezone" :searchable="true"
                      help="Make sure to select correct timezone. Leave blank otherwise."
        />
+        <v-checkbox v-model="field.prefill_today"
+                    name="prefill_today"
+                    @input="onFieldPrefillTodayChange"
+        >
+          Prefill with 'today'
+        </v-checkbox>
+        <p class="text-gray-400 mb-5">
+          if enabled we will pre-fill this field with the current date
+        </p>
      </div>

      <!-- select/multiselect Options   -->
@@ -180,6 +198,11 @@
                      label="Pre-filled value"
                      :multiple="field.type==='multi_select'"
        />
+        <date-input v-else-if="field.type==='date' && field.prefill_today!==true" name="prefill" class="mt-4"
+                    :form="field" :with-time="field.with_time===true" :am-pm="field.use_am_pm===true"
+                    :date-range="field.date_range===true"
+                    label="Pre-filled value"
+        />
        <text-area-input v-else-if="field.type === 'text' && field.multi_lines"
                         name="prefill" class="mt-4"
                         :form="field"
@@ -188,6 +211,7 @@
        <text-input v-else-if="field.type!=='files'" name="prefill" class="mt-4"
                    :form="field"
                    label="Pre-filled value"
+                    :disabled="field.type==='date' && field.prefill_today===true"
        />
        <div v-if="['select','multi_select'].includes(field.type)" class="-mt-3 mb-3 text-gray-400 dark:text-gray-500">
          <small>
@@ -383,10 +407,12 @@ export default {
      this.$set(this.field, 'date_range', val)
      if (this.field.date_range) {
        this.$set(this.field, 'with_time', false)
+        this.$set(this.field, 'prefill_today', false)
      }
    },
    onFieldWithTimeChange (val) {
      this.$set(this.field, 'with_time', val)
+      this.$set(this.field, 'use_am_pm', false)
      if (this.field.with_time) {
        this.$set(this.field, 'date_range', false)
      }
@@ -420,6 +446,15 @@ export default {
      })
      this.$set(this.field, this.field.type, {'options': tmpOpts})
    },
+    onFieldPrefillTodayChange (val) {
+      this.$set(this.field, 'prefill_today', val)
+      if (this.field.prefill_today) {
+        this.$set(this.field, 'prefill', 'Pre-filled with current date')
+        this.$set(this.field, 'date_range', false)
+      } else {
+        this.$set(this.field, 'prefill', null)
+      }
+    },
    onFieldAllowCreationChange (val) {
      this.$set(this.field, 'allow_creation', val)
      if(this.field.allow_creation){
--- a/resources/js/components/service/Amplitude.vue
+++ b/resources/js/components/service/Amplitude.vue
@@ -44,7 +44,7 @@ export default {
      }
    },
    loadAmplitude () {
-      if (this.loaded || !typeof window.amplitude === 'undefined') return
+      if (this.loaded || !typeof window.amplitude === 'undefined' || !window.config.amplitude_code) return

      (function (e, t) {
        const n = e.amplitude || { _q: [], _iq: {} }; const r = t.createElement('script')
@@ -88,7 +88,7 @@ export default {
      })(window, document)

      this.amplitudeInstance = window.amplitude.getInstance()
-      this.amplitudeInstance.init('9952c8b914ce3f2bd494fce2dba18243')
+      this.amplitudeInstance.init(window.config.amplitude_code)
      this.loaded = true
      this.authenticateUser()
    }
--- a/resources/js/components/service/Crisp.vue
+++ b/resources/js/components/service/Crisp.vue
@@ -18,10 +18,10 @@ export default {

  methods: {
    loadCrisp () {
-      if (this.isIframe) return
+      if (this.isIframe || !window.config.crisp_website_id) return

      window.$crisp = []
-      window.CRISP_WEBSITE_ID = '94219d77-06ff-4aec-b07a-5bf26ec8fde1'
+      window.CRISP_WEBSITE_ID = window.config.crisp_website_id

      const script = document.createElement('script')
      script.setAttribute('src', 'https://client.crisp.chat/l.js')
--- a/resources/js/pages/forms/create.vue
+++ b/resources/js/pages/forms/create.vue
@@ -152,6 +152,7 @@ export default {
        properties: [],

        notifies: false,
+        slack_notifies: false,
        send_submission_confirmation: false,
        webhook_url: null,