Skip to content

Commit 94a0648

Browse files
lionel-bijaouilionel-bijaoui
authored
Merge pull request #121 from lionel-bijaoui/separate_bundle
Separate bundle and remove deprecated fields
2 parents ade96b4 + 63268f4 commit 94a0648

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+124
-702
lines changed

‎dev/full/data.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Fakerator from "fakerator";
2-
import moment from "moment";
2+
import fecha from "fecha";
33

44
let fakerator = new Fakerator();
55

@@ -26,8 +26,8 @@ module.exports = {
2626
user.bio = fakerator.lorem.paragraph();
2727
let dob = fakerator.date.past(40, "1998-01-01");
2828
user.dob = dob.valueOf();
29-
user.time = moment().format("hh:mm:ss");
30-
user.age = moment().year() - moment(dob).year();
29+
user.time = fecha.format(new Date(), "hh:mm:ss");
30+
user.age = fecha.format(new Date().getFullYear() - dob, "YY");
3131
user.rank = fakerator.random.number(1, 10);
3232
user.role = fakerator.random.arrayElement(roles).id;
3333
//user.mobile = fakerator.phone.phoneNumber();

‎dev/full/schema.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import moment from "moment";
1+
import fecha from "fecha";
22

33
import {
44
validators
@@ -352,7 +352,7 @@ module.exports = {
352352
label: "Created (label field)",
353353
model: "created",
354354
get(model) {
355-
return model && model.created ? moment(model.created).format("LLL") : "-";
355+
// return model && model.created ? fecha.format(model.created,"MMMM D YYYY H") : "-";
356356
},
357357
styleClasses: "half-width"
358358
}, {
@@ -535,8 +535,8 @@ module.exports = {
535535
model: "dob",
536536
required: true,
537537
placeholder: "User's birth of date",
538-
min: moment("1900-01-01").toDate(),
539-
max: moment("2018-01-01").toDate(),
538+
min: fecha.parse("1900-01-01", "YYYY-MM-DD"),
539+
max: fecha.parse("2018-01-01", "YYYY-MM-DD"),
540540
validator: [
541541
validators.date
542542
],

‎package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
"main": "dist/vue-form-generator.js",
77
"scripts": {
88
"prebuild": "npm run test",
9-
"build": "webpack --progress --config webpack.build.config.js",
9+
"build:core": "webpack --progress --config webpack.build.config.js --define process.env.FULL_BUNDLE=false --output-filename=vue-form-generator-core.js",
10+
"build:full": "webpack --progress --config webpack.build.config.js --define process.env.FULL_BUNDLE=true",
11+
"build": "npm run build:core && npm run build:full",
1012
"dev": "webpack-dev-server --config webpack.dev.config.js --inline --hot --content-base dev/",
1113
"lint": "eslint --ext=.js,.vue src test/unit/specs",
1214
"coverall": "cat ./test/unit/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
@@ -34,6 +36,8 @@
3436
"files": [
3537
"dist/vue-form-generator.js",
3638
"dist/vue-form-generator.css",
39+
"dist/vue-form-generator-core.js",
40+
"dist/vue-form-generator-core.css",
3741
"src"
3842
],
3943
"author": "Icebob",
@@ -79,7 +83,6 @@
7983
"mocha": "2.5.3",
8084
"mocha-generators": "1.2.0",
8185
"mocha-loader": "0.7.1",
82-
"moment": "2.17.1",
8386
"node-sass": "3.10.1",
8487
"phantomjs-prebuilt": "2.1.14",
8588
"sass-loader": "3.2.0",

‎src/fields/fieldCheckbox.vue renamed to ‎src/fields/core/fieldCheckbox.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
88
export default {
99
mixins: [ abstractField ]

‎src/fields/fieldChecklist.vue renamed to ‎src/fields/core/fieldChecklist.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<script>
2222
import {isObject, isNil} from "lodash";
23-
import abstractField from "./abstractField";
23+
import abstractField from "../abstractField";
2424
2525
export default {
2626
mixins: [ abstractField ],

‎src/fields/fieldInput.vue renamed to ‎src/fields/core/fieldInput.vue

+6-3
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,22 @@
3636
</template>
3737

3838
<script>
39-
import abstractField from "./abstractField";
39+
import abstractField from "../abstractField";
4040
import fecha from "fecha";
4141
4242
export default {
4343
mixins: [ abstractField ],
4444
methods: {
4545
formatValueToField(value) {
46-
if (value != null) {
46+
console.info(value);
47+
if (typeof value === "undefined") {
48+
return value;
49+
}else{
4750
switch(this.schema.inputType){
4851
case "date":
4952
return fecha.format(value, "YYYY-MM-DD");
5053
case "datetime":
51-
return fecha.format(value);
54+
return fecha.format(value, "YYYY-MM-DD HH:mm:ss");
5255
case "datetime-local":
5356
return fecha.format(value, "YYYY-MM-DDTHH:mm:ss");
5457
default:

‎src/fields/fieldLabel.vue renamed to ‎src/fields/core/fieldLabel.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
88
export default {
99
mixins: [ abstractField ]

‎src/fields/fieldRadios.vue renamed to ‎src/fields/core/fieldRadios.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<script>
1010
import {isObject} from "lodash";
11-
import abstractField from "./abstractField";
11+
import abstractField from "../abstractField";
1212
1313
export default {
1414
mixins: [ abstractField ],

‎src/fields/fieldSelect.vue renamed to ‎src/fields/core/fieldSelect.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<script>
88
import {isObject} from "lodash";
9-
import abstractField from "./abstractField";
9+
import abstractField from "../abstractField";
1010
1111
export default {
1212
mixins: [ abstractField ],

‎src/fields/fieldSubmit.vue renamed to ‎src/fields/core/fieldSubmit.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import { isFunction } from "lodash";
88
99
export default {

‎src/fields/fieldTextArea.vue renamed to ‎src/fields/core/fieldTextArea.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
88
export default {
99
mixins: [ abstractField ]

‎src/fields/fieldColor.vue

-26
This file was deleted.

‎src/fields/fieldEmail.vue

-14
This file was deleted.

‎src/fields/fieldNumber.vue

-14
This file was deleted.

‎src/fields/fieldPassword.vue

-14
This file was deleted.

‎src/fields/fieldRange.vue

-25
This file was deleted.

‎src/fields/fieldText.vue

-15
This file was deleted.

‎src/fields/fieldCleave.vue renamed to ‎src/fields/optional/fieldCleave.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import { defaults } from "lodash";
88
99
export default {

‎src/fields/fieldDateTimePicker.vue renamed to ‎src/fields/optional/fieldDateTimePicker.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
<script>
99
/* global $ */
10-
import abstractField from "./abstractField";
10+
import abstractField from "../abstractField";
1111
import { defaults } from "lodash";
12-
import dateFieldHelper from "../utils/dateFieldHelper";
12+
import dateFieldHelper from "../../utils/dateFieldHelper";
1313
1414
let inputFormat = "YYYY-MM-DD HH:mm:ss";
1515

‎src/fields/fieldGoogleAddress.vue renamed to ‎src/fields/optional/fieldGoogleAddress.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* https://github.com/gocanto/google-autocomplete
99
*/
1010
11-
import abstractField from "./abstractField";
11+
import abstractField from "../abstractField";
1212
import { isFunction } from "lodash";
1313
1414
/* global google */

‎src/fields/fieldImage.vue renamed to ‎src/fields/optional/fieldImage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</template>
88

99
<script>
10-
import abstractField from "./abstractField";
10+
import abstractField from "../abstractField";
1111
1212
export default {
1313
mixins: [ abstractField ],

‎src/fields/fieldMasked.vue renamed to ‎src/fields/optional/fieldMasked.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<script>
66
/* global $ */
7-
import abstractField from "./abstractField";
7+
import abstractField from "../abstractField";
88
99
export default {
1010
mixins: [ abstractField ],

‎src/fields/fieldNoUiSlider.vue renamed to ‎src/fields/optional/fieldNoUiSlider.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import { isArray, defaults } from "lodash";
88
99
export default {

‎src/fields/fieldPikaday.vue renamed to ‎src/fields/optional/fieldPikaday.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import { defaults } from "lodash";
8-
import dateFieldHelper from "../utils/dateFieldHelper";
8+
import dateFieldHelper from "../../utils/dateFieldHelper";
99
1010
let inputFormat = "YYYY-MM-DD";
1111

‎src/fields/fieldRangeSlider.vue renamed to ‎src/fields/optional/fieldRangeSlider.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<script>
66
/* global $ */
7-
import abstractField from "./abstractField";
7+
import abstractField from "../abstractField";
88
import { defaults, isArray } from "lodash";
99
1010
export default {

‎src/fields/fieldSelectEx.vue renamed to ‎src/fields/optional/fieldSelectEx.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<script>
88
/* global $ */
99
import {isObject} from "lodash";
10-
import abstractField from "./abstractField";
10+
import abstractField from "../abstractField";
1111
1212
export default {
1313
mixins: [ abstractField ],

‎src/fields/fieldSpectrum.vue renamed to ‎src/fields/optional/fieldSpectrum.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<script>
66
/* global $ */
7-
import abstractField from "./abstractField";
7+
import abstractField from "../abstractField";
88
import { defaults } from "lodash";
99
export default {
1010
mixins: [ abstractField ],

‎src/fields/fieldStaticMap.vue renamed to ‎src/fields/optional/fieldStaticMap.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
</template>
44

55
<script>
6-
import abstractField from "./abstractField";
6+
import abstractField from "../abstractField";
77
import { defaults } from "lodash";
88
99
export default {

‎src/fields/fieldSwitch.vue renamed to ‎src/fields/optional/fieldSwitch.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</template>
77

88
<script>
9-
import abstractField from "./abstractField";
9+
import abstractField from "../abstractField";
1010
1111
export default {
1212
mixins: [ abstractField ],

‎src/fields/fieldVueMultiSelect.vue renamed to ‎src/fields/optional/fieldVueMultiSelect.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
)
4141
</template>
4242
<script>
43-
import abstractField from "./abstractField";
43+
import abstractField from "../abstractField";
4444
4545
export default {
4646
mixins: [abstractField],

0 commit comments

Comments
 (0)