WI

client/components/forms/TextInput.vue

@@ -7,7 +7,7 @@
     </template>
 
     <input :id="id?id:name" v-model="compVal" :disabled="disabled?true:null"
-           :type="nativeType"
+           :type="nativeType" :autocomplete="autocomplete"
            :pattern="pattern"
            :style="inputStyle"
            :class="[theme.default.input, { '!ring-red-500 !ring-2': hasError, '!cursor-not-allowed !bg-gray-200': disabled }]"
@@ -42,6 +42,7 @@ export default {
     accept: { type: String, default: null },
     min: { type: Number, required: false, default: null },
     max: { type: Number, required: false, default: null },
+    autocomplete: { default: null },
     maxCharLimit: { type: Number, required: false, default: null },
     showCharLimit: { type: Boolean, required: false, default: false },
     pattern: { type: String, default: null }

client/components/forms/components/VSelect.vue

@@ -73,7 +73,7 @@
 
 <script>
 import Collapsible from '~/components/global/transitions/Collapsible.vue'
-import { themes } from '../../../config/form-themes'
+import { themes } from '../../../lib/forms/form-themes.js'
 import TextInput from '../TextInput.vue'
 import debounce from 'debounce'
 import Fuse from 'fuse.js'

client/components/forms/useFormInput.js

@@ -1,5 +1,5 @@
 import { ref, computed, watch } from 'vue'
-import { themes } from '~/config/form-themes.js'
+import { themes } from '~/lib/forms/form-themes.js'
 
 export const inputProps = {
   id: { type: String, default: null },

client/components/open/forms/OpenCompleteForm.vue

@@ -111,7 +111,7 @@
 import Form from 'vform'
 import OpenForm from './OpenForm.vue'
 import OpenFormButton from './OpenFormButton.vue'
-import { themes } from '~/config/form-themes.js'
+import { themes } from '~/lib/forms/form-themes.js'
 import VButton from '~/components/global/VButton.vue'
 import VTransition from '~/components/global/transitions/VTransition.vue'
 import FormPendingSubmissionKey from '../../../mixins/forms/form-pending-submission-key.js'

client/components/open/forms/OpenForm.vue

@@ -62,12 +62,9 @@
 <script>
 import axios from 'axios'
 import Form from 'vform'
-import { computed } from 'vue'
-import { useRecordsStore } from '../../../stores/records'
-import { useWorkingFormStore } from '../../../stores/working_form'
 import OpenFormButton from './OpenFormButton.vue'
 import clonedeep from 'clone-deep'
-import FormLogicPropertyResolver from '../../../forms/FormLogicPropertyResolver.js'
+import FormLogicPropertyResolver from "~/lib/forms/FormLogicPropertyResolver.js";
 import OpenFormField from './OpenFormField.vue'
 import draggable from 'vuedraggable'
 import FormPendingSubmissionKey from '../../../mixins/forms/form-pending-submission-key.js'

client/components/open/forms/OpenFormButton.vue

@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { themes } from '~/config/form-themes.js'
+import { themes } from '~/lib/forms/form-themes.js'
 
 export default {
   name: 'OpenFormButton',

client/components/open/forms/OpenFormField.vue

@@ -80,9 +80,8 @@
 
 <script>
 import { computed } from 'vue'
-import { useWorkingFormStore } from '../../../stores/working_form'
+import FormLogicPropertyResolver from "~/lib/forms/FormLogicPropertyResolver.js"
-import FormLogicPropertyResolver from '../../../forms/FormLogicPropertyResolver.js'
+import FormPendingSubmissionKey from '~/mixins/forms/form-pending-submission-key.js'
-import FormPendingSubmissionKey from '../../../mixins/forms/form-pending-submission-key.js'
 
 export default {
   name: 'OpenFormField',

client/components/pages/forms/show/UrlFormPrefill.vue

@@ -67,7 +67,7 @@
 import FormUrlPrefill from '../../../open/forms/components/FormUrlPrefill.vue'
 import ProTag from '~/components/global/ProTag.vue'
 import OpenForm from '../../../open/forms/OpenForm.vue'
-import { themes } from '~/config/form-themes.js'
+import { themes } from '~/lib/forms/form-themes.js'
 
 export default {
   name: 'UrlFormPrefill',

client/components/pages/templates/SingleTemplate.vue

@@ -39,45 +39,18 @@
 </template>
 
 <script>
-import { computed } from 'vue'
-import { useTemplatesStore } from '../../../stores/templates'
 import TemplateTags from './TemplateTags.vue'
 
 export default {
   components: { TemplateTags },
 
   props: {
-    slug: {
+    template: {
-      type: String,
+      type: Object,
       required: true
     }
   },
 
-  setup () {
-    const templatesStore = useTemplatesStore()
-    return {
-      templatesStore
-    }
-  },
-
-  data: () => ({}),
-
-  computed: {
-    template () {
-      return this.templatesStore.getBySlug(this.slug)
-    }
-  },
-
-  watch: {
-    slug () {
-      this.templatesStore.loadTemplate(this.slug)
-    }
-  },
-
-  mounted () {
-    this.templatesStore.loadTemplate(this.slug)
-  },
-
   methods: {
     cleanQuotes (str) {
       // Remove starting and ending quotes if any

client/components/pages/templates/TemplateTags.vue

@@ -71,10 +71,12 @@ export default {
     },
     types () {
       if (!this.template) return null
+      console.log('template in types',this.template)
       return this.templatesStore.getTemplateTypes(this.template.types)
     },
     industries () {
       if (!this.template) return null
+      console.log('template in types',this.template)
       return this.templatesStore.getTemplateIndustries(this.template.industries)
     }
   },

client/components/pages/templates/TemplatesList.vue

@@ -16,7 +16,7 @@
             </div>
           </div>
           <div class="flex-1 w-full md:max-w-xs">
-            <text-input name="search" :form="searchTemplate" placeholder="Search..." />
+            <text-input autocomplete="off" name="search" :form="searchTemplate" placeholder="Search..."/>
           </div>
         </div>
 
@@ -28,13 +28,13 @@
         </p>
         <div v-else class="relative z-10">
           <div class="grid grid-cols-1 mt-8 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-8 sm:gap-y-12">
-            <single-template v-for="template in enrichedTemplates" :key="template.id" :slug="template.slug" />
+            <single-template v-for="template in enrichedTemplates" :key="template.id" :template="template"/>
           </div>
         </div>
       </div>
     </section>
 
-    <template v-if="!onlyMy">
+
     <section class="py-12 bg-white border-t border-gray-200 sm:py-16">
       <div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
         <div class="flex items-center justify-between">
@@ -74,34 +74,35 @@
         </div>
       </div>
     </section>
-    </template>
   </div>
 </template>
 
 <script>
 import {computed} from 'vue'
-import { useAuthStore } from '../../../stores/auth'
-import { useTemplatesStore } from '../../../stores/templates'
 import Form from 'vform'
 import Fuse from 'fuse.js'
 import SingleTemplate from './SingleTemplate.vue'
 
-const loadTemplates = function (onlyMy) {
+// const loadTemplates = function (onlyMy) {
-  const templatesStore = useTemplatesStore()
+//   const templatesStore = useTemplatesStore()
-  if(onlyMy){
+//   if(onlyMy){
-    templatesStore.loadAll({'onlymy':true})
+//     templatesStore.loadAll({'onlymy':true})
-  } else {
+//   } else {
-    templatesStore.loadIfEmpty()
+//     templatesStore.loadIfEmpty()
-  }
+//   }
-}
+// }
 
 export default {
   name: 'TemplatesList',
   components: {SingleTemplate},
   props: {
-    onlyMy: {
+    templates: {
+      type: Array,
+      required: true
+    },
+    loading: {
       type: Boolean,
-      required: false
+      default: false
     }
   },
 
@@ -110,8 +111,6 @@ export default {
     const templatesStore = useTemplatesStore()
     return {
       user: computed(() => authStore.user),
-      templates : computed(() => templatesStore.content),
-      templatesLoading : computed(() => templatesStore.loading),
       industries: computed(() => templatesStore.industries),
       types: computed(() => templatesStore.types)
     }
@@ -127,10 +126,6 @@ export default {
 
   watch: {},
 
-  mounted () {
-    loadTemplates(this.onlyMy)
-  },
-
   computed: {
     industriesOptions() {
       return [{name: 'All Industries', value: 'all'}].concat(Object.values(this.industries).map((industry) => {
@@ -149,7 +144,7 @@ export default {
       }))
     },
     enrichedTemplates() {
-      let enrichedTemplates = (this.onlyMy && this.user) ? this.templates.filter((item) => { return item.creator_id === this.user.id}) : this.templates
+      let enrichedTemplates = this.templates
 
       // Filter by Selected Type
       if (this.selectedType && this.selectedType !== 'all') {
@@ -184,7 +179,5 @@ export default {
       })
     }
   },
-
-  methods: {}
 }
 </script>

client/lib/forms/FormLogicConditionChecker.js

@@ -0,0 +1,325 @@
+export function conditionsMet (conditions, formData) {
+  if (conditions === undefined || conditions === null) {
+    return false
+  }
+
+  // If it's not a group, just a single condition
+  if (conditions.operatorIdentifier === undefined) {
+    return propertyConditionMet(conditions.value, conditions.value ? formData[conditions.value.property_meta.id] : null)
+  }
+
+  if (conditions.operatorIdentifier === 'and') {
+    let isvalid = true
+    conditions.children.forEach(childrenCondition => {
+      if (!conditionsMet(childrenCondition, formData)) {
+        isvalid = false
+      }
+    })
+    return isvalid
+  } else if (conditions.operatorIdentifier === 'or') {
+    let isvalid = false
+    conditions.children.forEach(childrenCondition => {
+      if (conditionsMet(childrenCondition, formData)) {
+        isvalid = true
+      }
+    })
+    return isvalid
+  }
+
+  throw new Error('Unexcepted operatorIdentifier:' + conditions.operatorIdentifier)
+}
+
+function propertyConditionMet (propertyCondition, value) {
+  if (!propertyCondition) {
+    return false
+  }
+  switch (propertyCondition.property_meta.type) {
+    case 'text':
+    case 'url':
+    case 'email':
+    case 'phone_number':
+      return textConditionMet(propertyCondition, value)
+    case 'number':
+      return numberConditionMet(propertyCondition, value)
+    case 'checkbox':
+      return checkboxConditionMet(propertyCondition, value)
+    case 'select':
+      return selectConditionMet(propertyCondition, value)
+    case 'date':
+      return dateConditionMet(propertyCondition, value)
+    case 'multi_select':
+      return multiSelectConditionMet(propertyCondition, value)
+    case 'files':
+      return filesConditionMet(propertyCondition, value)
+  }
+  return false
+}
+
+function checkEquals (condition, fieldValue) {
+  return condition.value === fieldValue
+}
+
+function checkContains (condition, fieldValue) {
+  return (fieldValue) ? fieldValue.includes(condition.value) : false
+}
+
+function checkListContains (condition, fieldValue) {
+  if (!fieldValue) return false
+  
+  if (Array.isArray(condition.value)) {
+    return condition.value.every(r => fieldValue.includes(r))
+  } else {
+    return fieldValue.includes(condition.value)
+  }
+}
+
+function checkStartsWith (condition, fieldValue) {
+  return fieldValue.startsWith(condition.value)
+}
+
+function checkendsWith (condition, fieldValue) {
+  return fieldValue && fieldValue.endsWith(condition.value)
+}
+
+function checkIsEmpty (condition, fieldValue) {
+  return (!fieldValue || fieldValue.length === 0)
+}
+
+function checkGreaterThan (condition, fieldValue) {
+  return (condition.value && fieldValue && parseFloat(fieldValue) > parseFloat(condition.value))
+}
+
+function checkGreaterThanEqual (condition, fieldValue) {
+  return (condition.value && fieldValue && parseFloat(fieldValue) >= parseFloat(condition.value))
+}
+
+function checkLessThan (condition, fieldValue) {
+  return (condition.value && fieldValue && parseFloat(fieldValue) < parseFloat(condition.value))
+}
+
+function checkLessThanEqual (condition, fieldValue) {
+  return (condition.value && fieldValue && parseFloat(fieldValue) <= parseFloat(condition.value))
+}
+
+function checkBefore (condition, fieldValue) {
+  return (condition.value && fieldValue && fieldValue > condition.value)
+}
+
+function checkAfter (condition, fieldValue) {
+  return (condition.value && fieldValue && fieldValue < condition.value)
+}
+
+function checkOnOrBefore (condition, fieldValue) {
+  return (condition.value && fieldValue && fieldValue >= condition.value)
+}
+
+function checkOnOrAfter (condition, fieldValue) {
+  return (condition.value && fieldValue && fieldValue <= condition.value)
+}
+
+function checkPastWeek (condition, fieldValue) {
+  if (!fieldValue) return false
+  const fieldDate = new Date(fieldValue)
+  const today = new Date()
+  return (fieldDate <= today && fieldDate >= new Date(today.getFullYear(), today.getMonth(), today.getDate() - 7))
+}
+
+function checkPastMonth (condition, fieldValue) {
+  if (!fieldValue) return false
+  const fieldDate = new Date(fieldValue)
+  const today = new Date()
+  return (fieldDate <= today && fieldDate >= new Date(today.getFullYear(), today.getMonth() - 1, today.getDate()))
+}
+
+function checkPastYear (condition, fieldValue) {
+  if (!fieldValue) return false
+  const fieldDate = new Date(fieldValue)
+  const today = new Date()
+  return (fieldDate <= today && fieldDate >= new Date(today.getFullYear() - 1, today.getMonth(), today.getDate()))
+}
+
+function checkNextWeek (condition, fieldValue) {
+  if (!fieldValue) return false
+  const fieldDate = new Date(fieldValue)
+  const today = new Date()
+  return (fieldDate >= today && fieldDate <= new Date(today.getFullYear(), today.getMonth(), today.getDate() + 7))
+}
+
+function checkNextMonth (condition, fieldValue) {
+  if (!fieldValue) return false
+  const fieldDate = new Date(fieldValue)
+  const today = new Date()
+  return (fieldDate >= today && fieldDate <= new Date(today.getFullYear(), today.getMonth() + 1, today.getDate()))
+}
+
+function checkNextYear (condition, fieldValue) {
+  if (!fieldValue) return false
+  const fieldDate = new Date(fieldValue)
+  const today = new Date()
+  return (fieldDate >= today && fieldDate <= new Date(today.getFullYear() + 1, today.getMonth(), today.getDate()))
+}
+
+function checkLength (condition, fieldValue, operator = '===') {
+  if(!fieldValue || fieldValue.length === 0) return false;
+  switch (operator) {
+    case '===':
+      return fieldValue.length === parseInt(condition.value)
+    case '!==':
+      return fieldValue.length !== parseInt(condition.value)
+    case '>':
+      return fieldValue.length > parseInt(condition.value)
+    case '>=':
+      return fieldValue.length >= parseInt(condition.value)
+    case '<':
+      return fieldValue.length < parseInt(condition.value)
+    case '<=':
+      return fieldValue.length <= parseInt(condition.value)
+  }
+  return false
+}
+
+function textConditionMet (propertyCondition, value) {
+  switch (propertyCondition.operator) {
+    case 'equals':
+      return checkEquals(propertyCondition, value)
+    case 'does_not_equal':
+      return !checkEquals(propertyCondition, value)
+    case 'contains':
+      return checkContains(propertyCondition, value)
+    case 'does_not_contain':
+      return !checkContains(propertyCondition, value)
+    case 'starts_with':
+      return checkStartsWith(propertyCondition, value)
+    case 'ends_with':
+      return checkendsWith(propertyCondition, value)
+    case 'is_empty':
+      return checkIsEmpty(propertyCondition, value)
+    case 'is_not_empty':
+      return !checkIsEmpty(propertyCondition, value)
+    case 'content_length_equals':
+      return checkLength(propertyCondition, value, '===')
+    case 'content_length_does_not_equal':
+      return checkLength(propertyCondition, value, '!==')
+    case 'content_length_greater_than':
+      return checkLength(propertyCondition, value, '>')
+    case 'content_length_greater_than_or_equal_to':
+      return checkLength(propertyCondition, value, '>=')
+    case 'content_length_less_than':
+      return checkLength(propertyCondition, value, '<')
+    case 'content_length_less_than_or_equal_to':
+      return checkLength(propertyCondition, value, '<=')
+  }
+  return false
+}
+
+function numberConditionMet (propertyCondition, value) {
+  switch (propertyCondition.operator) {
+    case 'equals':
+      return checkEquals(propertyCondition, value)
+    case 'does_not_equal':
+      return !checkEquals(propertyCondition, value)
+    case 'greater_than':
+      return checkGreaterThan(propertyCondition, value)
+    case 'less_than':
+      return checkLessThan(propertyCondition, value)
+    case 'greater_than_or_equal_to':
+      return checkGreaterThanEqual(propertyCondition, value)
+    case 'less_than_or_equal_to':
+      return checkLessThanEqual(propertyCondition, value)
+    case 'is_empty':
+      return checkIsEmpty(propertyCondition, value)
+    case 'is_not_empty':
+      return checkIsEmpty(propertyCondition, value)
+    case 'content_length_equals':
+      return checkLength(propertyCondition, value, '===')
+    case 'content_length_does_not_equal':
+      return checkLength(propertyCondition, value, '!==')
+    case 'content_length_greater_than':
+      return checkLength(propertyCondition, value, '>')
+    case 'content_length_greater_than_or_equal_to':
+      return checkLength(propertyCondition, value, '>=')
+    case 'content_length_less_than':
+      return checkLength(propertyCondition, value, '<')
+    case 'content_length_less_than_or_equal_to':
+      return checkLength(propertyCondition, value, '<=')
+  }
+  return false
+}
+
+function checkboxConditionMet (propertyCondition, value) {
+  switch (propertyCondition.operator) {
+    case 'equals':
+      return checkEquals(propertyCondition, value)
+    case 'does_not_equal':
+      return !checkEquals(propertyCondition, value)
+  }
+  return false
+}
+
+function selectConditionMet (propertyCondition, value) {
+  switch (propertyCondition.operator) {
+    case 'equals':
+      return checkEquals(propertyCondition, value)
+    case 'does_not_equal':
+      return !checkEquals(propertyCondition, value)
+    case 'is_empty':
+      return checkIsEmpty(propertyCondition, value)
+    case 'is_not_empty':
+      return !checkIsEmpty(propertyCondition, value)
+  }
+  return false
+}
+
+function dateConditionMet (propertyCondition, value) {
+  switch (propertyCondition.operator) {
+    case 'equals':
+      return checkEquals(propertyCondition, value)
+    case 'before':
+      return checkBefore(propertyCondition, value)
+    case 'after':
+      return checkAfter(propertyCondition, value)
+    case 'on_or_before':
+      return checkOnOrBefore(propertyCondition, value)
+    case 'on_or_after':
+      return checkOnOrAfter(propertyCondition, value)
+    case 'is_empty':
+      return checkIsEmpty(propertyCondition, value)
+    case 'past_week':
+      return checkPastWeek(propertyCondition, value)
+    case 'past_month':
+      return checkPastMonth(propertyCondition, value)
+    case 'past_year':
+      return checkPastYear(propertyCondition, value)
+    case 'next_week':
+      return checkNextWeek(propertyCondition, value)
+    case 'next_month':
+      return checkNextMonth(propertyCondition, value)
+    case 'next_year':
+      return checkNextYear(propertyCondition, value)
+  }
+  return false
+}
+
+function multiSelectConditionMet (propertyCondition, value) {
+  switch (propertyCondition.operator) {
+    case 'contains':
+      return checkListContains(propertyCondition, value)
+    case 'does_not_contain':
+      return !checkListContains(propertyCondition, value)
+    case 'is_empty':
+      return checkIsEmpty(propertyCondition, value)
+    case 'is_not_empty':
+      return !checkIsEmpty(propertyCondition, value)
+  }
+  return false
+}
+
+function filesConditionMet (propertyCondition, value) {
+  switch (propertyCondition.operator) {
+    case 'is_empty':
+      return checkIsEmpty(propertyCondition, value)
+    case 'is_not_empty':
+      return !checkIsEmpty(propertyCondition, value)
+  }
+  return false
+}

client/lib/forms/FormLogicPropertyResolver.js

@@ -0,0 +1,60 @@
+import { conditionsMet } from './FormLogicConditionChecker'
+class FormLogicPropertyResolver {
+  conditionsMet = conditionsMet;
+  property = null;
+  formData = null;
+  logic = false;
+
+  constructor (property, formData) {
+    this.property = property
+    this.formData = formData
+    this.logic = (property.logic !== undefined) ? property.logic : false
+  }
+
+  isHidden () {
+    if (!this.logic) {
+      return this.property.hidden
+    }
+
+    const conditionsMet = this.conditionsMet(this.logic.conditions, this.formData)
+    if (conditionsMet && this.property.hidden && this.logic.actions.length > 0 && this.logic.actions.includes('show-block')) {
+      return false
+    } else if (conditionsMet && !this.property.hidden && this.logic.actions.length > 0 && this.logic.actions.includes('hide-block')) {
+      return true
+    } else {
+      return this.property.hidden
+    }
+  }
+
+  isRequired () {
+    if (!this.logic) {
+      return this.property.required
+    }
+
+    const conditionsMet = this.conditionsMet(this.logic.conditions, this.formData)
+    if (conditionsMet && this.property.required && this.logic.actions.length > 0 && this.logic.actions.includes('make-it-optional')) {
+      return false
+    } else if (conditionsMet && !this.property.required && this.logic.actions.length > 0 && this.logic.actions.includes('require-answer')) {
+      return true
+    } else {
+      return this.property.required
+    }
+  }
+
+  isDisabled () {
+    if (!this.logic) {
+      return this.property.disabled
+    }
+
+    const conditionsMet = this.conditionsMet(this.logic.conditions, this.formData)
+    if (conditionsMet && this.property.disabled && this.logic.actions.length > 0 && this.logic.actions.includes('enable-block')) {
+      return false
+    } else if (conditionsMet && !this.property.disabled && this.logic.actions.length > 0 && this.logic.actions.includes('disable-block')) {
+      return true
+    } else {
+      return this.property.disabled
+    }
+  }
+}
+
+export default FormLogicPropertyResolver

client/lib/forms/FormPropertyLogicRule.js

@@ -0,0 +1,123 @@
+import OpenFilters from '../../data/open_filters.json'
+class FormPropertyLogicRule {
+  property = null
+  logic = null
+  isConditionCorrect = true
+  isActionCorrect = true
+  ACTIONS_VALUES = [
+    'show-block',
+    'hide-block',
+    'make-it-optional',
+    'require-answer',
+    'enable-block',
+    'disable-block'
+  ]
+  CONDITION_MAPPING = OpenFilters
+
+  constructor (property) {
+    this.property = property
+    this.logic = (property.logic !== undefined && property.logic) ? property.logic : null
+  }
+
+  isValid () {
+    if (this.logic && this.logic['conditions']) {
+      this.checkConditions(this.logic['conditions'])
+      this.checkActions((this.logic && this.logic['actions']) ? this.logic['actions'] : null)
+    }
+
+    return this.isConditionCorrect && this.isActionCorrect
+  }
+
+  checkConditions (conditions) {
+    if (conditions && conditions['operatorIdentifier']) {
+      if ((conditions['operatorIdentifier'] !== 'and') && (conditions['operatorIdentifier'] !== 'or')) {
+        this.isConditionCorrect = false
+        return
+      }
+
+      if (conditions['operatorIdentifier']['children'] !== undefined || !Array.isArray(conditions['children'])) {
+        this.isConditionCorrect = false
+        return
+      }
+
+      conditions['children'].forEach(childrenCondition => {
+        this.checkConditions(childrenCondition)
+      })
+    } else if (conditions && conditions['identifier']) {
+      this.checkBaseCondition(conditions)
+    }
+  }
+
+  checkBaseCondition (condition) {
+    if (condition['value'] === undefined || 
+        condition['value']['property_meta'] === undefined || 
+        condition['value']['property_meta']['type'] === undefined || 
+        condition['value']['operator'] === undefined || 
+        condition['value']['value'] === undefined
+      ) {
+      this.isConditionCorrect = false
+      return
+    }
+
+    const typeField = condition['value']['property_meta']['type']
+    const operator = condition['value']['operator']
+    const value = condition['value']['value']
+
+    if (this.CONDITION_MAPPING[typeField] === undefined || 
+      this.CONDITION_MAPPING[typeField]['comparators'][operator] === undefined
+      ) {
+      this.isConditionCorrect = false
+      return
+    }
+ 
+    const type = this.CONDITION_MAPPING[typeField]['comparators'][operator]['expected_type']
+    if (Array.isArray(type)) {
+      let foundCorrectType = false
+      type.forEach(subtype => {
+        if (this.valueHasCorrectType(subtype, value)) {
+          foundCorrectType = true
+        }
+      })
+      if (!foundCorrectType) {
+        this.isConditionCorrect = false
+      }
+    } else {
+      if (!this.valueHasCorrectType(type, value)) {
+        this.isConditionCorrect = false
+      }
+    }
+  }
+
+  valueHasCorrectType (type, value) {
+    if (
+        (type === 'string' && typeof value !== 'string') ||
+        (type === 'boolean' && typeof value !== 'boolean') ||
+        (type === 'number' && typeof value !== 'number') ||
+        (type === 'object' && !Array.isArray(value))
+    ) {
+      return false
+    }
+    return true
+  }
+
+  checkActions (conditions) {
+    if (Array.isArray(conditions) && conditions.length > 0) {
+      conditions.forEach(val => {
+        if (this.ACTIONS_VALUES.indexOf(val) === -1 ||
+            (['nf-text', 'nf-code', 'nf-page-break', 'nf-divider', 'nf-image'].indexOf(this.property["type"]) > -1 && ['hide-block', 'show-block'].indexOf(val) === -1) ||
+            (this.property["hidden"] !== undefined && this.property["hidden"] && ['show-block', 'require-answer'].indexOf(val) === -1) ||
+            (this.property["required"] !== undefined && this.property["required"] && ['make-it-optional', 'hide-block', 'disable-block'].indexOf(val) === -1) ||
+            (this.property["disabled"] !== undefined && this.property["disabled"] && ['enable-block', 'require-answer', 'make-it-optional'].indexOf(val) === -1)
+        ) {
+          this.isActionCorrect = false
+          return
+        }
+      })
+    } else {
+      this.isActionCorrect = false
+    }
+  }
+
+}
+
+export default FormPropertyLogicRule

client/mixins/forms/input.js

@@ -1,4 +1,4 @@
-import { themes } from '~/config/form-themes.js'
+import { themes } from '~/lib/forms/form-themes.js'
 
 export default {
   props: {

client/nuxt.config.ts

@@ -11,6 +11,16 @@ const modules = [
 if (opnformConfig.sentry_dsn) {
     modules.push('@nuxtjs/sentry')
 }
+
+const cachedRoutes = [
+    '/',
+    '/ai-form-builder',
+    '/login',
+    '/register',
+    '/privacy-policy',
+    '/terms-conditions',
+].reduce((acc, curr) => (acc[curr] = {swr: 60 * 60}, acc), {});
+
 export default defineNuxtConfig({
     devtools: {enabled: true},
     css: ['~/scss/app.scss'],
@@ -39,17 +49,11 @@ export default defineNuxtConfig({
             path: '~/components/global',
             pathPrefix: false,
         },
+        {
+            path: '~/components/pages',
+            pathPrefix: false,
+        },
         '~/components',
     ],
-    routeRules: {
+    routeRules: { ... cachedRoutes}
-        '/ai-form-builder': {
-            swr: 60 * 60
-        },
-        '/privacy-policy': {
-            swr: 60 * 60
-        },
-        '/terms-conditions': {
-            swr: 60 * 60
-        },
-    }
 })

client/pages/forms/show-public.vue

@@ -54,7 +54,6 @@ import { computed } from 'vue'
 import { useFormsStore } from '../../stores/forms'
 import { useRecordsStore } from '../../stores/records'
 import OpenCompleteForm from '../../components/open/forms/OpenCompleteForm.vue'
-import Cookies from 'js-cookie'
 import sha256 from 'js-sha256'
 import SeoMeta from '../../mixins/seo-meta.js'
 
@@ -169,7 +168,9 @@ export default {
 
   methods: {
     passwordEntered (password) {
-      Cookies.set('password-' + this.form.slug, sha256(password), { expires: 7, sameSite: 'None', secure: true })
+      if (process.client) {
+        useCookie('password-' + this.form.slug, {maxAge: { expires: 60*60*7}}).value = sha256(password)
+      }
       loadForm(this.formSlug).then(() => {
         if (this.form.is_password_protected) {
           this.$refs['open-complete-form'].addPasswordError('Invalid password.')

client/pages/templates/[slug].vue

@@ -73,7 +73,8 @@
         <div class="absolute bottom-0 translate-y-full inset-x-0">
           <div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl -mt-[20px]">
             <div class="flex items-center justify-center">
-              <v-button v-track.use_template_button_clicked class="mx-auto w-full max-w-[300px]" :to="{path: createFormWithTemplateUrl}">
+              <v-button v-track.use_template_button_clicked class="mx-auto w-full max-w-[300px]"
+                        :to="{path: createFormWithTemplateUrl}">
                 Use this template
               </v-button>
             </div>
@@ -130,7 +131,7 @@
           </div>
 
           <div class="grid grid-cols-1 gap-8 mt-8 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 sm:gap-y-12">
-            <single-template v-for="related in template.related_templates" :key="related" :slug="related" />
+            <single-template v-for="related in template.related_templates" :key="related.id" :template="related"/>
           </div>
         </div>
       </section>
@@ -198,9 +199,6 @@
 <script>
 import Form from 'vform'
 import {computed} from 'vue'
-import { useAuthStore } from '../../stores/auth'
-import { useTemplatesStore } from '../../stores/templates'
-import OpenFormFooter from '../../components/pages/OpenFormFooter.vue'
 import OpenCompleteForm from '../../components/open/forms/OpenCompleteForm.vue'
 import Breadcrumb from '~/components/global/Breadcrumb.vue'
 import SeoMeta from '../../mixins/seo-meta.js'
@@ -210,21 +208,20 @@ import FormTemplateModal from '../../components/open/forms/components/templates/
 
 export default {
 
-  components: { Breadcrumb, OpenFormFooter, OpenCompleteForm, TemplateTags, SingleTemplate, FormTemplateModal },
+  components: {Breadcrumb, OpenCompleteForm, TemplateTags, SingleTemplate, FormTemplateModal},
   mixins: [SeoMeta],
 
-  beforeRouteEnter (to, from, next) {
-    const templatesStore = useTemplatesStore()
-    if (to.params?.slug) {
-      templatesStore.loadTemplate(to.params?.slug)
-      templatesStore.loadTypesAndIndustries()
-    }
-    next()
-  },
-
   setup() {
     const authStore = useAuthStore()
     const templatesStore = useTemplatesStore()
+
+    const route = useRoute()
+    const slug = computed(() => route.params.slug)
+    if (slug) {
+      templatesStore.loadTemplate(slug)
+    }
+
+
     return {
       templatesStore,
       authenticated: computed(() => authStore.check),
@@ -239,7 +236,8 @@ export default {
     }
   },
 
-  mounted () {},
+  mounted() {
+  },
 
   methods: {
     cleanQuotes(str) {

client/pages/templates/index.vue

@@ -13,21 +13,18 @@
       </div>
     </section>
 
-    <templates-list />
+    <templates-list :templates="templates" :loading="loading" />
 
     <open-form-footer class="mt-8 border-t"/>
   </div>
 </template>
 
 <script>
-import OpenFormFooter from '../components/pages/OpenFormFooter.vue'
+import SeoMeta from '../../mixins/seo-meta.js'
-import TemplatesList from '../components/pages/templates/TemplatesList.vue'
-import SeoMeta from '../mixins/seo-meta.js'
 import {useTemplatesStore} from "~/stores/templates.js";
 
 export default {
 
-  components: { OpenFormFooter, TemplatesList },
   mixins: [SeoMeta],
 
   props: {
@@ -38,16 +35,10 @@ export default {
   setup() {
     const templatesStore = useTemplatesStore()
     templatesStore.loadAll()
+    return {
+      templates: templatesStore.content,
+      loading: templatesStore.loading
+    }
   },
-
-  data () {
-    return {}
-  },
-
-  mounted () {},
-
-  computed: {},
-
-  methods: {}
 }
 </script>

client/stores/templates.js

@@ -3,7 +3,7 @@ import {defineStore} from 'pinia'
 export const templatesEndpoint = '/templates'
 export const useTemplatesStore = defineStore('templates', {
   state: () => ({
-    content: [],
+    content: [], // TODO: convert to a map
     industries: {},
     types: {},
     allLoaded: false,
@@ -61,12 +61,14 @@ export const useTemplatesStore = defineStore('templates', {
     },
     async loadTypesAndIndustries() {
       if (Object.keys(this.industries).length === 0 || Object.keys(this.types).length === 0) {
-        const files = import.meta.glob('~/data/forms/templates/*.json')
+        // const files = import.meta.glob('~/data/forms/templates/*.json')
-        this.industries = await files['/data/forms/templates/industries.json']()
+        // console.log(await files['/data/forms/templates/industries.json']())
-        this.types = await files['/data/forms/templates/types.json']()
+        // this.industries = await files['/data/forms/templates/industries.json']()
+        // this.types = await files['/data/forms/templates/types.json']()
       }
     },
     loadTemplate(slug) {
+      console.log('loading template',slug)
       this.startLoading()
       this.loadTypesAndIndustries()