Skip to content

Commit 39cdd35

Browse files
rakieta2015rakieta2015
committed
Merge branch 'devel'
2 parents a0d76c5 + 1f6763b commit 39cdd35

File tree

7 files changed

+18014
-35
lines changed

7 files changed

+18014
-35
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -72,58 +72,57 @@
7272
},
7373
"dependencies": {
7474
"@coreui/chartjs": "^2.0.0",
75-
"@coreui/coreui": "^3.0.0",
75+
"@coreui/coreui": "^3.2.0",
7676
"@coreui/icons": "^1.0.1",
77-
"@coreui/utils": "^1.2.2",
78-
"@popperjs/core": "^2.0.6",
77+
"@coreui/utils": "^1.2.4",
78+
"@popperjs/core": "^2.4.0",
7979
"chart.js": "^2.9.3",
8080
"perfect-scrollbar": "1.5.0",
8181
"axios": "^0.19.0",
82-
"cropperjs": "^1.5.6",
83-
"laravel-mix": "^5.0.0",
84-
"pace-progress": "1.0.2"
82+
"cropperjs": "^1.5.7",
83+
"laravel-mix": "^5.0.4"
8584
},
8685
"devDependencies": {
8786
"@babel/cli": "^7.8.4",
88-
"@babel/core": "^7.8.4",
89-
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
87+
"@babel/core": "^7.9.6",
88+
"@babel/plugin-proposal-object-rest-spread": "^7.9.6",
9089
"@babel/preset-env": "^7.9.6",
9190
"@coreui/svg-injector": "^1.0.0",
9291
"@coreui/vendors-injector": "^1.0.2",
93-
"autoprefixer": "^9.7.4",
94-
"babel-eslint": "^10.0.3",
92+
"autoprefixer": "^9.8.0",
93+
"babel-eslint": "^10.1.0",
9594
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
9695
"browser-sync": "^2.26.7",
97-
"chalk": "^3.0.0",
96+
"chalk": "^4.0.0",
9897
"clean-css-cli": "^4.3.0",
9998
"copyfiles": "^2.2.0",
100-
"cross-env": "^7.0.0",
101-
"eslint": "^6.8.0",
99+
"cross-env": "^7.0.2",
100+
"eslint": "^7.0.0",
102101
"eslint-config-xo": "^0.29.1",
103-
"eslint-plugin-import": "^2.20.1",
104-
"eslint-plugin-unicorn": "^16.1.1",
102+
"eslint-plugin-import": "^2.20.2",
103+
"eslint-plugin-unicorn": "^20.0.0",
105104
"foreach-cli": "^1.8.1",
106-
"js-beautify": "^1.10.3",
107-
"jsdom": "^16.2.0",
108-
"minimist": "^1.2.2",
109-
"node-sass": "^4.13.1",
110-
"nodemon": "^2.0.2",
105+
"js-beautify": "^1.11.0",
106+
"jsdom": "^16.2.2",
107+
"minimist": "^1.2.5",
108+
"node-sass": "^4.14.1",
109+
"nodemon": "^2.0.4",
111110
"npm-run-all": "^4.1.5",
112-
"postcss-cli": "^7.1.0",
111+
"postcss-cli": "^7.1.1",
113112
"postcss-combine-duplicated-selectors": "^8.1.0",
114113
"postcss-merge-rules": "^4.0.3",
115114
"pug": "^2.0.4",
116115
"resolve-url-loader": "^3.1.0",
117116
"rimraf": "^3.0.2",
118117
"sass-loader": "^8.0.2",
119-
"shelljs": "^0.8.3",
120-
"stylelint": "^13.2.0",
118+
"shelljs": "^0.8.4",
119+
"stylelint": "^13.5.0",
121120
"stylelint-config-recommended-scss": "^4.2.0",
122121
"stylelint-config-standard": "^20.0.0",
123122
"stylelint-order": "^4.0.0",
124-
"stylelint-scss": "^3.14.2",
123+
"stylelint-scss": "^3.17.2",
125124
"sync-glob": "^1.4.0",
126-
"vue-template-compiler": "^2.6.10"
125+
"vue-template-compiler": "^2.6.11"
127126
},
128127
"engines": {
129128
"node": ">=8"

‎public/mix-manifest.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
"/js/menu-create.js": "/js/menu-create.js",
55
"/css/style.css": "/css/style.css",
66
"/js/menu-edit.js": "/js/menu-edit.js",
7-
"/css/pace.min.css": "/css/pace.min.css",
87
"/css/coreui-chartjs.css": "/css/coreui-chartjs.css",
98
"/css/cropper.css": "/css/cropper.css",
109
"/js/coreui-utils.js": "/js/coreui-utils.js",
1110
"/js/axios.min.js": "/js/axios.min.js",
12-
"/js/pace.min.js": "/js/pace.min.js",
1311
"/js/coreui.bundle.min.js": "/js/coreui.bundle.min.js",
1412
"/js/Chart.min.js": "/js/Chart.min.js",
1513
"/js/coreui-chartjs.bundle.js": "/js/coreui-chartjs.bundle.js",

‎resources/views/dashboard/authBase.blade.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<link href="{{ asset('css/flag-icon.min.css') }}" rel="stylesheet"> <!-- icons -->
4040
<!-- Main styles for this application-->
4141
<link href="{{ asset('css/style.css') }}" rel="stylesheet">
42-
<link href="{{ asset('css/pace.min.css') }}" rel="stylesheet">
4342
<!-- Global site tag (gtag.js) - Google Analytics-->
4443
<script async="" src="https://www.googletagmanager.com/gtag/js?id=UA-118965717-3"></script>
4544
<script>
@@ -63,7 +62,6 @@ function gtag() {
6362
@yield('content')
6463

6564
<!-- CoreUI and necessary plugins-->
66-
<script src="{{ asset('js/pace.min.js') }}"></script>
6765
<script src="{{ asset('js/coreui.bundle.min.js') }}"></script>
6866

6967
@yield('javascript')

‎resources/views/dashboard/base.blade.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<link href="{{ asset('css/flag-icon.min.css') }}" rel="stylesheet"> <!-- icons -->
4040
<!-- Main styles for this application-->
4141
<link href="{{ asset('css/style.css') }}" rel="stylesheet">
42-
<link href="{{ asset('css/pace.min.css') }}" rel="stylesheet">
4342

4443
@yield('css')
4544

@@ -84,7 +83,6 @@ function gtag() {
8483

8584

8685
<!-- CoreUI and necessary plugins-->
87-
<script src="{{ asset('js/pace.min.js') }}"></script>
8886
<script src="{{ asset('js/coreui.bundle.min.js') }}"></script>
8987
<script src="{{ asset('js/coreui-utils.js') }}"></script>
9088
@yield('javascript')

‎resources/views/dashboard/errorBase.blade.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<link href="{{ asset('css/flag-icon.min.css') }}" rel="stylesheet"> <!-- icons -->
4040
<!-- Main styles for this application-->
4141
<link href="{{ asset('css/style.css') }}" rel="stylesheet">
42-
<link href="{{ asset('css/pace.min.css') }}" rel="stylesheet">
4342
<!-- Global site tag (gtag.js) - Google Analytics-->
4443
<script async="" src="https://www.googletagmanager.com/gtag/js?id=UA-118965717-3"></script>
4544
<script>
@@ -63,7 +62,6 @@ function gtag() {
6362
@yield('content')
6463

6564
<!-- CoreUI and necessary plugins-->
66-
<script src="{{ asset('js/pace.min.js') }}"></script>
6765
<script src="{{ asset('js/coreui.bundle.min.js') }}"></script>
6866

6967
@yield('javascript')

‎webpack.mix.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const mix = require('laravel-mix');
1616

1717
//**************** CSS ********************
1818
//css
19-
mix.copy('resources/vendors/pace-progress/css/pace.min.css', 'public/css');
19+
//mix.copy('resources/vendors/pace-progress/css/pace.min.css', 'public/css');
2020
mix.copy('node_modules/@coreui/chartjs/dist/css/coreui-chartjs.css', 'public/css');
2121
mix.copy('node_modules/cropperjs/dist/cropper.css', 'public/css');
2222
//main css
@@ -26,7 +26,7 @@ mix.sass('resources/sass/style.scss', 'public/css');
2626
// general scripts
2727
mix.copy('node_modules/@coreui/utils/dist/coreui-utils.js', 'public/js');
2828
mix.copy('node_modules/axios/dist/axios.min.js', 'public/js');
29-
mix.copy('node_modules/pace-progress/pace.min.js', 'public/js');
29+
//mix.copy('node_modules/pace-progress/pace.min.js', 'public/js');
3030
mix.copy('node_modules/@coreui/coreui/dist/js/coreui.bundle.min.js', 'public/js');
3131
// views scripts
3232
mix.copy('node_modules/chart.js/dist/Chart.min.js', 'public/js');

0 commit comments

Comments
 (0)