From d134893755c6f4a7dab9bd32b8471108bc72c2f7 Mon Sep 17 00:00:00 2001
From: venarius <tim.lange@titanhq.de>
Date: Tue, 15 Sep 2020 11:56:31 +0000
Subject: [PATCH] NEW: Added component question type

---
 examples/slots/Example.vue                    | 70 +++++++++++++++++++
 examples/slots/ExampleComponent.vue           | 60 ++++++++++++++++
 examples/slots/main.js                        | 12 ++++
 src/components/Question.vue                   |  8 ++-
 .../QuestionTypes/ComponentType.vue           | 33 +++++++++
 src/models/QuestionModel.js                   |  5 +-
 6 files changed, 184 insertions(+), 4 deletions(-)
 create mode 100644 examples/slots/Example.vue
 create mode 100644 examples/slots/ExampleComponent.vue
 create mode 100644 examples/slots/main.js
 create mode 100644 src/components/QuestionTypes/ComponentType.vue

diff --git a/examples/slots/Example.vue b/examples/slots/Example.vue
new file mode 100644
index 00000000..e568ab26
--- /dev/null
+++ b/examples/slots/Example.vue
@@ -0,0 +1,70 @@
+// Create and setup your form here
+ 
+<template>
+  <div>
+    <header>
+      <div class="f-container">
+        <!-- Add custom logo here -->
+        <svg xmlns="http://www.w3.org/2000/svg" width='150' height='32' fill='white' viewBox="0 0 361.3 69.57">
+          <g data-name="Layer 2">
+            <g data-name="Layer 1">
+              <path d="M35.05 12.34h-22v9.88h20.24v10H13.08V54.7H0V2.36h35.05zM79 35q0 9.74-5.32 15.35t-15.07 5.6q-9.68 0-15-5.6T38.25 35q0-9.84 5.36-15.42t15-5.57q9.7 0 15 5.61T79 35zm-12.62.07a24.64 24.64 0 00-.58-5.85 10.88 10.88 0 00-1.6-3.75 6 6 0 00-2.46-2.05 7.91 7.91 0 00-3.13-.58 8.34 8.34 0 00-3 .51 5.82 5.82 0 00-2.46 2A10.8 10.8 0 0051.5 29a24.06 24.06 0 00-.63 6 23.19 23.19 0 00.6 5.85A11 11 0 0053 44.47a5.77 5.77 0 002.46 2 8.22 8.22 0 003.27.63 7.84 7.84 0 003-.63 5.68 5.68 0 002.45-1.9 11.19 11.19 0 001.65-3.64 24.4 24.4 0 00.58-5.88zM112.08 26.86h-1a9.16 9.16 0 00-2-.37c-.89-.08-1.88-.12-3-.12a16 16 0 00-4.06.56 36.9 36.9 0 00-4.13 1.34V54.7H85.57V15.22h12.31v5.66c.56-.51 1.34-1.16 2.33-1.95a23.8 23.8 0 012.73-1.88 15.17 15.17 0 013.11-1.39 11 11 0 013.36-.58h1.33c.49 0 .94.06 1.34.1zM164 54.7V35c0-1.94 0-3.59-.11-4.92a10 10 0 00-.63-3.27 3.59 3.59 0 00-1.63-1.85 6.93 6.93 0 00-3.12-.58 6.71 6.71 0 00-2.77.62 18.65 18.65 0 00-3 1.74v28h-12.4V35c0-1.92 0-3.56-.12-4.9a10.27 10.27 0 00-.65-3.29 3.59 3.59 0 00-1.63-1.85 6.84 6.84 0 00-3.08-.58 6.63 6.63 0 00-3 .71 21.81 21.81 0 00-2.82 1.65v28h-12.3V15.22h12.3v4.36a34.59 34.59 0 015.7-4 12.45 12.45 0 016-1.44 11.68 11.68 0 016.36 1.73 10.78 10.78 0 014.25 5.13 36.16 36.16 0 016.65-5.09 12.93 12.93 0 016.39-1.78 13.23 13.23 0 014.92.88 9.57 9.57 0 013.69 2.64 12.47 12.47 0 012.48 4.52 23.27 23.27 0 01.82 6.83v25.7zM254.85 68.55a32.87 32.87 0 01-4.24.78 65.92 65.92 0 01-6.66.24 21.07 21.07 0 01-7-1 12.93 12.93 0 01-4.83-2.94 11.81 11.81 0 01-2.9-4.43 17.71 17.71 0 01-1.11-5.52q-11.12-.49-17.49-7.7t-6.38-19.4q0-12.63 6.75-20t18.6-7.33q11.81 0 18.59 7.29t6.79 20a31.14 31.14 0 01-3.85 15.87 21.31 21.31 0 01-10.88 9.4c0 2.56.61 4.32 1.7 5.3s3 1.45 5.75 1.45a12.87 12.87 0 003.31-.46 13 13 0 002.55-.9h1.3zm-17-26.75a17.08 17.08 0 002.6-5.33 28.31 28.31 0 00.92-8 28.3 28.3 0 00-1-8 16.55 16.55 0 00-2.58-5.4 10 10 0 00-3.79-2.99 10.92 10.92 0 00-4.41-.94 10.72 10.72 0 00-4.39.87 10.51 10.51 0 00-3.8 3.07 16 16 0 00-2.62 5.42 28.41 28.41 0 00-1 8.05 28.14 28.14 0 001 8 16.17 16.17 0 002.6 5.33 9.8 9.8 0 003.76 3.12 11 11 0 004.43.93 10.61 10.61 0 004.5-1 9.77 9.77 0 003.76-3.13zM298.65 54.7h-12.3v-4.36a33.11 33.11 0 01-5.87 4.06 13.61 13.61 0 01-6.37 1.39q-5.87 0-9.15-3.71t-3.29-11.16v-25.7H274V34.8c0 2 .06 3.71.16 5a10.09 10.09 0 00.76 3.27 3.84 3.84 0 001.74 1.86 7 7 0 003.28.63 9.42 9.42 0 003.08-.63 13.4 13.4 0 003.29-1.72v-28h12.3zM320.73 9.6h-13V0h13zm-.35 45.1h-12.31V15.22h12.31zM361.3 54.7h-34.52v-8.12l18.84-22.11h-18v-9.25h33.29v8L342 45.28h19.3z"/>
+            </g>
+          </g>
+        </svg>
+      </div>
+    </header>
+
+    <flow-form
+      ref="flowform"
+      v-bind:questions="questions"
+      v-bind:language="language"
+    />
+  </div>
+</template>
+
+<script>
+  /*
+    Copyright (c) 2020 - present, DITDOT Ltd. - MIT Licence
+    https://www.ditdot.hr/en
+  */
+
+  // Import necessary components and classes
+  import FlowForm from '../../src/components/FlowForm.vue'
+  import QuestionModel, { QuestionType } from '../../src/models/QuestionModel'
+  import LanguageModel from '../../src/models/LanguageModel'
+  // If using the npm package, use the following line instead of the ones above.
+  // import FlowForm, { QuestionModel, QuestionType, ChoiceOption, LanguageModel } from '@ditdot-dev/vue-flow-form'
+
+  import ExampleComponent from './ExampleComponent.vue'
+
+  export default {
+    name: 'example',
+    components: {
+      FlowForm
+    },
+    data() {
+      return {
+        submitted: false,
+        completed: false,
+        language: new LanguageModel(),
+        // Create question list with QuestionModel instances
+        questions: [      
+          new QuestionModel({
+            title: 'Check out this component below!',
+            type: QuestionType.Component,
+            component: ExampleComponent, // put your component here
+            validateComponent: true // tell vue-flow-form if it should validate the component by calling isValid() on it
+          }),
+        ]
+      }
+    }
+  }
+</script>
+
+<style lang="css">
+  @import '../../src/assets/css/themes/theme-purple.css';
+  /* If using the npm package, use the following lines instead of the one above */
+  /* @import '~@ditdot-dev/vue-flow-form/dist/vue-flow-form.css'; */
+  /* @import '~@ditdot-dev/vue-flow-form/dist/vue-flow-form.theme-purple.css'; */
+</style>
\ No newline at end of file
diff --git a/examples/slots/ExampleComponent.vue b/examples/slots/ExampleComponent.vue
new file mode 100644
index 00000000..6b1f6e6a
--- /dev/null
+++ b/examples/slots/ExampleComponent.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="form-outer">
+    <p class="question-title">What is 2+2?</p>
+    <input type="number" v-model="num" placeholder="Enter the solution" :class="{ invalid: showError }" @input="validateNumber()" />
+    <p v-if="showError" class="error">Invalid answer</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExampleComponent',
+  data () {
+    return {
+      num: 0,
+      showError: false
+    }
+  },
+  methods: {
+    isValid () {
+      // if something is invalid on your component ->
+      // show the user a error message and return false
+      return this.validateNumber()
+    },
+    validateNumber () {
+      if (parseInt(this.num) === 4) {
+        this.showError = false
+        return true
+      } else {
+        this.showError = true
+        return false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-outer, input {
+  background: white;
+  padding: 1rem;
+  border-radius: 0.25rem !important;
+  box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
+}
+.question-title {
+  font-size: 1.5rem;
+  margin: 0;
+}
+input {
+  border: 1px solid lightgray !important;
+  padding: 0.25rem 0.5rem !important;
+}
+input.invalid {
+  color: rgb(189, 0, 0) !important;
+}
+.error {
+  color: rgb(189, 0, 0) !important;
+  font-size: 0.75rem;
+  margin: 5px 0 0 0;
+}
+</style>
diff --git a/examples/slots/main.js b/examples/slots/main.js
new file mode 100644
index 00000000..ff358470
--- /dev/null
+++ b/examples/slots/main.js
@@ -0,0 +1,12 @@
+/*
+  Copyright (c) 2020 - present, DITDOT Ltd. - MIT Licence
+  https://github.com/ditdot-dev/vue-flow-form
+  https://www.ditdot.hr/en
+*/
+
+import Vue from 'vue'
+import Example from './Example.vue'
+
+new Vue({
+  render: h => h(Example)
+}).$mount('#app')
diff --git a/src/components/Question.vue b/src/components/Question.vue
index b8fa405d..e56ba185 100644
--- a/src/components/Question.vue
+++ b/src/components/Question.vue
@@ -60,7 +60,7 @@
           v-on:click.prevent="onEnter"
           v-bind:aria-label="language.ariaOk"
         >
-            <span v-if="question.type === QuestionType.SectionBreak">{{ language.continue }}</span>
+            <span v-if="question.type === QuestionType.SectionBreak || question.type === QuestionType.Component">{{ language.continue }}</span>
             <span v-else>{{ language.ok }}</span>
         </button>
         <a 
@@ -96,6 +96,7 @@
   import FlowFormSectionBreakType from './QuestionTypes/SectionBreakType.vue'
   import FlowFormTextType from './QuestionTypes/TextType.vue'
   import FlowFormUrlType from './QuestionTypes/UrlType.vue'
+  import FlowFormComponentType from './QuestionTypes/ComponentType.vue'
   import { IsMobile } from '../mixins/IsMobile'
   
 
@@ -111,7 +112,8 @@
       FlowFormPhoneType,
       FlowFormSectionBreakType,
       FlowFormTextType,
-      FlowFormUrlType
+      FlowFormUrlType,
+      FlowFormComponentType
     },
     props: {
       question: QuestionModel,
@@ -204,7 +206,7 @@
       showOkButton() {
         const q = this.$refs.questionComponent
 
-        if (this.question.type === QuestionType.SectionBreak) {
+        if (this.question.type === QuestionType.SectionBreak || this.question.type === QuestionType.Component) {
           return this.active
         }
 
diff --git a/src/components/QuestionTypes/ComponentType.vue b/src/components/QuestionTypes/ComponentType.vue
new file mode 100644
index 00000000..b843d34d
--- /dev/null
+++ b/src/components/QuestionTypes/ComponentType.vue
@@ -0,0 +1,33 @@
+<template>
+  <div>
+    <component v-if="question.component" v-bind:is="question.component" ref="component" />
+  </div>
+</template>
+
+<script>
+  /*
+    Copyright (c) 2020 - present, DITDOT Ltd. - MIT Licence
+    https://github.com/ditdot-dev/vue-flow-form
+    https://www.ditdot.hr/en
+  */
+
+  import BaseType from './BaseType.vue'
+  import { QuestionType } from '../../models/QuestionModel'
+  import LanguageModel from '../../models/LanguageModel'
+
+  export default {
+    extends: BaseType,
+    name: QuestionType.Slot,
+    methods: {
+      onEnter() {
+        this.dirty = true
+
+        this._onEnter()
+      },
+
+      isValid() {
+        return this.question.validateComponent ? this.$refs.component.isValid() : true
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/models/QuestionModel.js b/src/models/QuestionModel.js
index acd2f843..cc65aef7 100644
--- a/src/models/QuestionModel.js
+++ b/src/models/QuestionModel.js
@@ -16,7 +16,8 @@ export const QuestionType = Object.freeze({
   Phone: 'FlowFormPhoneType',
   SectionBreak: 'FlowFormSectionBreakType',
   Text: 'FlowFormTextType',
-  Url: 'FlowFormUrlType'
+  Url: 'FlowFormUrlType',
+  Component: 'FlowFormComponentType'
 })
 
 export const DropdownOptionBlank = Object.freeze({
@@ -72,6 +73,8 @@ export default class QuestionModel {
     this.content = null
     this.inline = false
     this.helpText = null
+    this.component = null
+    this.validateComponent = false
 
     Object.assign(this, options)