Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
@rakieta2015
rakieta2015 committed Jun 10, 2020
2 parents a0d76c5 + 1f6763b commit 39cdd35
Show file tree
Hide file tree
Showing 7 changed files with 18,014 additions and 35 deletions.
17,988 changes: 17,988 additions & 0 deletions package-lock.json
View file

Large diffs are not rendered by default.

49 changes: 24 additions & 25 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,58 +72,57 @@
},
"dependencies": {
"@coreui/chartjs": "^2.0.0",
"@coreui/coreui": "^3.0.0",
"@coreui/coreui": "^3.2.0",
"@coreui/icons": "^1.0.1",
"@coreui/utils": "^1.2.2",
"@popperjs/core": "^2.0.6",
"@coreui/utils": "^1.2.4",
"@popperjs/core": "^2.4.0",
"chart.js": "^2.9.3",
"perfect-scrollbar": "1.5.0",
"axios": "^0.19.0",
"cropperjs": "^1.5.6",
"laravel-mix": "^5.0.0",
"pace-progress": "1.0.2"
"cropperjs": "^1.5.7",
"laravel-mix": "^5.0.4"
},
"devDependencies": {
"@babel/cli": "^7.8.4",
"@babel/core": "^7.8.4",
"@babel/plugin-proposal-object-rest-spread": "^7.8.3",
"@babel/core": "^7.9.6",
"@babel/plugin-proposal-object-rest-spread": "^7.9.6",
"@babel/preset-env": "^7.9.6",
"@coreui/svg-injector": "^1.0.0",
"@coreui/vendors-injector": "^1.0.2",
"autoprefixer": "^9.7.4",
"babel-eslint": "^10.0.3",
"autoprefixer": "^9.8.0",
"babel-eslint": "^10.1.0",
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
"browser-sync": "^2.26.7",
"chalk": "^3.0.0",
"chalk": "^4.0.0",
"clean-css-cli": "^4.3.0",
"copyfiles": "^2.2.0",
"cross-env": "^7.0.0",
"eslint": "^6.8.0",
"cross-env": "^7.0.2",
"eslint": "^7.0.0",
"eslint-config-xo": "^0.29.1",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-unicorn": "^16.1.1",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-unicorn": "^20.0.0",
"foreach-cli": "^1.8.1",
"js-beautify": "^1.10.3",
"jsdom": "^16.2.0",
"minimist": "^1.2.2",
"node-sass": "^4.13.1",
"nodemon": "^2.0.2",
"js-beautify": "^1.11.0",
"jsdom": "^16.2.2",
"minimist": "^1.2.5",
"node-sass": "^4.14.1",
"nodemon": "^2.0.4",
"npm-run-all": "^4.1.5",
"postcss-cli": "^7.1.0",
"postcss-cli": "^7.1.1",
"postcss-combine-duplicated-selectors": "^8.1.0",
"postcss-merge-rules": "^4.0.3",
"pug": "^2.0.4",
"resolve-url-loader": "^3.1.0",
"rimraf": "^3.0.2",
"sass-loader": "^8.0.2",
"shelljs": "^0.8.3",
"stylelint": "^13.2.0",
"shelljs": "^0.8.4",
"stylelint": "^13.5.0",
"stylelint-config-recommended-scss": "^4.2.0",
"stylelint-config-standard": "^20.0.0",
"stylelint-order": "^4.0.0",
"stylelint-scss": "^3.14.2",
"stylelint-scss": "^3.17.2",
"sync-glob": "^1.4.0",
"vue-template-compiler": "^2.6.10"
"vue-template-compiler": "^2.6.11"
},
"engines": {
"node": ">=8"
Expand Down
2 changes: 0 additions & 2 deletions public/mix-manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@
"/js/menu-create.js": "/js/menu-create.js",
"/css/style.css": "/css/style.css",
"/js/menu-edit.js": "/js/menu-edit.js",
"/css/pace.min.css": "/css/pace.min.css",
"/css/coreui-chartjs.css": "/css/coreui-chartjs.css",
"/css/cropper.css": "/css/cropper.css",
"/js/coreui-utils.js": "/js/coreui-utils.js",
"/js/axios.min.js": "/js/axios.min.js",
"/js/pace.min.js": "/js/pace.min.js",
"/js/coreui.bundle.min.js": "/js/coreui.bundle.min.js",
"/js/Chart.min.js": "/js/Chart.min.js",
"/js/coreui-chartjs.bundle.js": "/js/coreui-chartjs.bundle.js",
Expand Down
2 changes: 0 additions & 2 deletions resources/views/dashboard/authBase.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<link href="{{ asset('css/flag-icon.min.css') }}" rel="stylesheet"> <!-- icons -->
<!-- Main styles for this application-->
<link href="{{ asset('css/style.css') }}" rel="stylesheet">
<link href="{{ asset('css/pace.min.css') }}" rel="stylesheet">
<!-- Global site tag (gtag.js) - Google Analytics-->
<script async="" src="https://www.googletagmanager.com/gtag/js?id=UA-118965717-3"></script>
<script>
Expand All @@ -63,7 +62,6 @@ function gtag() {
@yield('content')

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

@yield('javascript')
Expand Down
2 changes: 0 additions & 2 deletions resources/views/dashboard/base.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<link href="{{ asset('css/flag-icon.min.css') }}" rel="stylesheet"> <!-- icons -->
<!-- Main styles for this application-->
<link href="{{ asset('css/style.css') }}" rel="stylesheet">
<link href="{{ asset('css/pace.min.css') }}" rel="stylesheet">

@yield('css')

Expand Down Expand Up @@ -84,7 +83,6 @@ function gtag() {


<!-- CoreUI and necessary plugins-->
<script src="{{ asset('js/pace.min.js') }}"></script>
<script src="{{ asset('js/coreui.bundle.min.js') }}"></script>
<script src="{{ asset('js/coreui-utils.js') }}"></script>
@yield('javascript')
Expand Down
2 changes: 0 additions & 2 deletions resources/views/dashboard/errorBase.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<link href="{{ asset('css/flag-icon.min.css') }}" rel="stylesheet"> <!-- icons -->
<!-- Main styles for this application-->
<link href="{{ asset('css/style.css') }}" rel="stylesheet">
<link href="{{ asset('css/pace.min.css') }}" rel="stylesheet">
<!-- Global site tag (gtag.js) - Google Analytics-->
<script async="" src="https://www.googletagmanager.com/gtag/js?id=UA-118965717-3"></script>
<script>
Expand All @@ -63,7 +62,6 @@ function gtag() {
@yield('content')

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

@yield('javascript')
Expand Down
4 changes: 2 additions & 2 deletions webpack.mix.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const mix = require('laravel-mix');

//**************** CSS ********************
//css
mix.copy('resources/vendors/pace-progress/css/pace.min.css', 'public/css');
//mix.copy('resources/vendors/pace-progress/css/pace.min.css', 'public/css');
mix.copy('node_modules/@coreui/chartjs/dist/css/coreui-chartjs.css', 'public/css');
mix.copy('node_modules/cropperjs/dist/cropper.css', 'public/css');
//main css
Expand All @@ -26,7 +26,7 @@ mix.sass('resources/sass/style.scss', 'public/css');
// general scripts
mix.copy('node_modules/@coreui/utils/dist/coreui-utils.js', 'public/js');
mix.copy('node_modules/axios/dist/axios.min.js', 'public/js');
mix.copy('node_modules/pace-progress/pace.min.js', 'public/js');
//mix.copy('node_modules/pace-progress/pace.min.js', 'public/js');
mix.copy('node_modules/@coreui/coreui/dist/js/coreui.bundle.min.js', 'public/js');
// views scripts
mix.copy('node_modules/chart.js/dist/Chart.min.js', 'public/js');
Expand Down

0 comments on commit 39cdd35

Please sign in to comment.