Skip to content
This repository was archived by the owner on Apr 1, 2021. It is now read-only.

Commit 9395ec7

Browse files
adenvtadenvt
committed
Merge branch 'develop' into feature/laravel-5.8
2 parents e4a8ce4 + 54e8b75 commit 9395ec7

File tree

15 files changed

+1299
-1034
lines changed

15 files changed

+1299
-1034
lines changed

‎package-lock.json

Lines changed: 1206 additions & 967 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,58 +27,58 @@
2727
"babel-plugin-wildcard": "^5.0.0",
2828
"babel-preset-stage-2": "^6.24.1",
2929
"cross-env": "^5.2",
30-
"eslint": "^5.15.1",
31-
"eslint-config-adenvt": "^2.1.0",
30+
"eslint": "^5.16.0",
31+
"eslint-config-adenvt": "^3.0.0",
3232
"eslint-config-standard": "^12.0.0",
3333
"eslint-formatter-pretty": "^2.1.1",
3434
"eslint-plugin-import": "^2.16.0",
3535
"eslint-plugin-node": "^8.0.1",
36-
"eslint-plugin-promise": "^4.0.1",
36+
"eslint-plugin-promise": "^4.1.1",
3737
"eslint-plugin-standard": "^4.0.0",
38-
"eslint-plugin-unicorn": "^7.1.0",
38+
"eslint-plugin-unicorn": "^8.0.2",
3939
"eslint-plugin-varspacing": "^1.2.1",
4040
"eslint-plugin-vue": "^5.2.2",
41-
"laravel-mix": "^4.0.14",
41+
"laravel-mix": "^4.0.15",
4242
"node-sass": "^4.11.0",
4343
"offline-plugin": "^5.0.6",
4444
"pre-commit": "^1.2.2",
4545
"prettier": "1.16.4",
46-
"resolve-url-loader": "^3.0.1",
47-
"sass": "^1.17.2",
46+
"resolve-url-loader": "^3.1.0",
47+
"sass": "^1.18.0",
4848
"sass-loader": "^7.1.0",
4949
"stylelint": "^9.10.1",
50-
"stylelint-config-sass-guidelines": "^5.3.0",
50+
"stylelint-config-sass-guidelines": "^5.4.0",
5151
"stylelint-scss": "^3.5.4",
5252
"uglifyjs-webpack-plugin": "^2.1.2",
5353
"vue-loader": "15.7.0",
54-
"vue-template-compiler": "^2.6.9",
54+
"vue-template-compiler": "^2.6.10",
5555
"webpackbar": "^3.1.5"
5656
},
5757
"dependencies": {
5858
"animate.css": "^3.7.0",
5959
"axios": "^0.18",
6060
"bootstrap": "^4.3.1",
61-
"bootstrap-vue": "^2.0.0-rc.14",
61+
"bootstrap-vue": "^2.0.0-rc.18",
6262
"chart.js": "^2.8.0",
6363
"flag-icon-css": "^3.3.0",
6464
"font-awesome": "^4.7.0",
65-
"jquery": "^3.3",
65+
"jquery": "^3.4",
6666
"lodash": "^4.17.11",
6767
"moment": "^2.24.0",
68-
"popper.js": "^1.14.7",
68+
"popper.js": "^1.15.0",
6969
"select2": "^4.0.6-rc.1",
7070
"select2-bootstrap4-theme": "^1.0.0",
7171
"simple-line-icons": "^2.4.1",
72-
"vue": "^2.6.9",
73-
"vue-chartjs": "^3.4.0",
72+
"vue": "^2.6.10",
73+
"vue-chartjs": "^3.4.2",
7474
"vue-loading-spinner": "^1.0.11",
7575
"vue-notification": "^1.3.16",
76-
"vue-router": "^3.0.2",
76+
"vue-router": "^3.0.4",
7777
"vue-sweetalert2": "^1.6.4",
7878
"vuejs-datepicker": "^1.5.4",
7979
"vuelidate": "^0.7.4",
8080
"vuex": "^3.1.0",
81-
"vuex-easy-access": "^3.1.5"
81+
"vuex-easy-access": "^3.1.6"
8282
},
8383
"pre-commit": [
8484
"lint"

‎resources/js/bootstrap.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ try {
1717
// Animate CSS
1818
window.$.fn.extend({
1919
animateCss: function (animationName, callback) {
20-
const animationEnd = (function (el) {
20+
const animationEnd = (function (element) {
2121
const animations = {
2222
animation : 'animationend',
2323
OAnimation : 'oAnimationEnd',
@@ -26,7 +26,7 @@ try {
2626
}
2727

2828
for (const t in animations) {
29-
if (el.style[t] !== undefined)
29+
if (element.style[t] !== undefined)
3030
return animations[t]
3131
}
3232
})(document.createElement('div'))
@@ -47,8 +47,8 @@ try {
4747

4848
$.fn.select2.defaults.set('theme', 'bootstrap4')
4949
$.fn.select2.defaults.set('width', '100%')
50-
} catch (err) {
51-
console.error(err)
50+
} catch (error) {
51+
console.error(error)
5252
}
5353

5454
/**

‎resources/js/coreui/components/Header/Header.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@ export default {
7575
$('body').removeClass('header-fixed')
7676
},
7777
methods: {
78-
sidebarToggle (e) {
79-
e.preventDefault()
78+
sidebarToggle (event) {
79+
event.preventDefault()
8080
document.body.classList.toggle('sidebar-hidden')
8181
},
82-
sidebarMinimize (e) {
83-
e.preventDefault()
82+
sidebarMinimize (event) {
83+
event.preventDefault()
8484
document.body.classList.toggle('sidebar-minimized')
8585
},
86-
mobileSidebarToggle (e) {
87-
e.preventDefault()
86+
mobileSidebarToggle (event) {
87+
event.preventDefault()
8888
document.body.classList.toggle('sidebar-mobile-show')
8989
},
90-
asideToggle (e) {
91-
e.preventDefault()
90+
asideToggle (event) {
91+
event.preventDefault()
9292
document.body.classList.toggle('aside-menu-hidden')
9393
},
9494
},

‎resources/js/coreui/components/Loading.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export default {
2323
type : String,
2424
default : 'rotate-square',
2525
validator: function (value) {
26-
return _.keys(Spinner).indexOf(_.pascalCase(value)) !== -1
26+
return _.keys(Spinner).includes(_.pascalCase(value))
2727
},
2828
},
2929
size: {

‎resources/js/coreui/components/Select.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import { isArray } from 'bootstrap-vue/es/utils/array'
99
import { keys } from 'bootstrap-vue/es//utils/object'
1010
11-
function isObject (obj) {
12-
return obj && ({}).toString.call(obj) === '[object Object]'
11+
function isObject (object) {
12+
return object && ({}).toString.call(object) === '[object Object]'
1313
}
1414
1515
export default {
@@ -121,7 +121,7 @@ export default {
121121
})
122122
.val(this.value)
123123
.trigger('change.select2')
124-
.on('change', function (evt) {
124+
.on('change', function (event_) {
125125
vm.localValue = this.value
126126
vm.$emit('input', vm.localValue)
127127
})

‎resources/js/coreui/components/Sidebar/Sidebar.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ export default {
146146
$('body').removeClass('sidebar-fixed')
147147
},
148148
methods: {
149-
handleClick (e) {
150-
e.preventDefault()
151-
e.target.parentElement.classList.toggle('open')
149+
handleClick (event) {
150+
event.preventDefault()
151+
event.target.parentElement.classList.toggle('open')
152152
},
153153
},
154154
}

‎resources/js/coreui/components/Sidebar/SidebarNavDropdown.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ export default {
3434
},
3535
},
3636
methods: {
37-
handleClick (e) {
38-
e.preventDefault()
39-
e.target.parentElement.classList.toggle('open')
37+
handleClick (event) {
38+
event.preventDefault()
39+
event.target.parentElement.classList.toggle('open')
4040
},
4141
},
4242
}

‎resources/js/coreui/views/sample/Dashboard.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,10 @@
961961
hover
962962
head-variant="light"
963963
>
964+
<div slot="HEAD_avatar">
965+
<i class="icon-people" />
966+
</div>
967+
964968
<div
965969
slot="avatar"
966970
slot-scope="item"

‎resources/js/coreui/views/sample/base/Cards.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424
sm="6"
2525
md="4"
2626
>
27-
<b-card header="<i class='fa fa-check'></i> Card with icon">
27+
<b-card>
28+
<template slot="header">
29+
<i class="fa fa-check" /> Card with icon
30+
</template>
2831
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
2932
</b-card>
3033
</b-col>

0 commit comments

Comments
 (0)