Merge pull request #481 from lionel-bijaoui/lb_streamlined_schema

Streamlining of schema

Author: lionel-bijaoui

.editorconfig

@@ -7,3 +7,7 @@ charset = utf-8
 indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
+
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2

.eslintrc.js

@@ -12,8 +12,8 @@ module.exports = {
 	globals: {
 		process: true
 	},
-	extends: ["eslint:recommended", "plugin:vue/essential"],
-	plugins: ["prettier"],
+	extends: ["eslint:recommended", "prettier", "plugin:vue/essential"],
+	plugins: ["prettier", "babel"],
 	rules: {
 		indent: [1, "tab", { SwitchCase: 1 }],
 		quotes: [1, "double", { allowTemplateLiterals: true }],

.travis.yml

@@ -1,19 +1,30 @@
 language: node_js
 cache:
   directories:
-  - node_modules
+    - node_modules
+
 node_js:
-    - "9"
-    - "8"
-    - "6"
-after_success:
-  - npm run coverall
+  - "10"
+  - "8"
+  - "6"
+
+before_install:
+  - npm i -g npm@">=4.0.0"
+
+install:
+  - npm install
+
+script:
+  - npm test
 
 deploy:
   provider: npm
   email: $NPM_EMAIL
   api_key: $NPM_API_KEY
   skip_cleanup: true
-  on: 
-    tags: true          
-    node: "8"
+  on:
+    tags: true
+    node: "8"
+
+after_success:
+  - npm run coverall

dev/projects/basic/app.vue

@@ -36,9 +36,11 @@ export default {
 				fields: [
 					{
 						type: "input",
-						inputType: "text",
-						label: "First Name",
 						model: "first_name",
+						label: "First Name",
+						fieldOptions: {
+							inputType: "text"
+						},
 						attributes: {
 							input: {
 								"data-toggle": "tooltip"
@@ -60,9 +62,11 @@ export default {
 					},
 					{
 						type: "input",
-						inputType: "color",
 						label: "Color",
 						model: "color",
+						fieldOptions: {
+							inputType: "color"
+						},
 						attributes: {
 							input: {
 								"data-target": "tooltip"
@@ -71,18 +75,20 @@ export default {
 					},
 					{
 						type: "submit",
-						buttonText: "Change Previous Type",
 						attributes: {
 							input: {
 								"data-target": "toggle"
 							}
 						},
-						onSubmit: () => {
-							// this.schema.fields[2].type = "input";
-							if (this.schema.fields[2].inputType === "color") {
-								this.schema.fields[2].inputType = "text";
-							} else {
-								this.schema.fields[2].inputType = "color";
+						fieldOptions: {
+							buttonText: "Change Previous Type",
+							onSubmit: () => {
+								// this.schema.fields[2].type = "input";
+								if (this.schema.fields[2].fieldOptions.inputType === "color") {
+									this.schema.fields[2].fieldOptions.inputType = "text";
+								} else {
+									this.schema.fields[2].fieldOptions.inputType = "color";
+								}
 							}
 						}
 					}

dev/projects/checklist/app.vue

@@ -1,16 +1,16 @@
 <template>
 	<div class="container">
-        <h1>Checklist</h1>
+		<h1>Checklist</h1>
 		<div class="row">
-            <div class="col-sm-12">
+			<div class="col-sm-12">
 				<vue-form-generator :schema="schema" :model="model" :options="formOptions"></vue-form-generator>
-            </div>
-        </div>
+			</div>
+		</div>
 		<div class="row">
-            <div class="col-sm-12">
-                <pre v-if="model" v-html="prettyModel"></pre>
-            </div>
-        </div>
+			<div class="col-sm-12">
+				<pre v-if="model" v-html="prettyModel"></pre>
+			</div>
+		</div>
 	</div>
 </template>
 
@@ -35,8 +35,10 @@ export default {
 						model: "skills",
 						required: true,
 						inputName: "skill",
-						min: 2,
-						listBox: true,
+						fieldOptions: {
+							min: 2,
+							listBox: true
+						},
 						values: ["HTML5", "Javascript", "CSS3", "CoffeeScript", "AngularJS", "ReactJS", "VueJS"],
 						validator: validators.array,
 						onChanged(model) {

dev/projects/full/index.html

@@ -13,7 +13,7 @@
 	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/ion-rangeslider/2.1.4/css/ion.rangeSlider.skinHTML5.css">
 	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/pikaday/1.4.0/css/pikaday.min.css">
 	<link rel="stylesheet" type="text/css" href="https://unpkg.com/[email protected]/dist/vue-multiselect.min.css">
-	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.min.css">
+	<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/11.1.0/nouislider.min.css">
 
 
 	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.js"></script>
@@ -30,7 +30,7 @@
 	<script type="text/javascript" src="https://unpkg.com/[email protected]/dist/vue-multiselect.min.js"></script>
 	<script type="text/javascript" src="https://rawgit.com/nosir/cleave.js/master/dist/cleave.min.js"></script>
 	<script type="text/javascript" src="https://nosir.github.io/cleave.js/lib/cleave-phone.i18n.js"></script>
-	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.js"></script>
+	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/11.1.0/nouislider.js"></script>
 	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pikaday/1.5.1/pikaday.min.js"></script>
 	<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCEz-sX9bRJorDS-D_JL0JkZVZe2gzoUMw&amp;libraries=places"></script>