diff --git a/composer.json b/composer.json
index 4a05fa15..15bb5e1a 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
"laravel/passport": "^7.2",
"laravel/tinker": "^1.0",
"lcobucci/jwt": "3.3.3",
- "milon/barcode": "6.0.3",
+ "milon/barcode": "^6.0.3",
"sentry/sentry-laravel": "^2.3",
"spatie/laravel-permission": "^2.36"
},
@@ -31,7 +31,10 @@
"config": {
"optimize-autoloader": true,
"preferred-install": "dist",
- "sort-packages": true
+ "sort-packages": true,
+ "allow-plugins": {
+ "php-http/discovery": true
+ }
},
"extra": {
"laravel": {
@@ -66,14 +69,5 @@
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
]
- },
- "repositories": [
- {
- "type": "composer",
- "url": "https://repo.willaspace.com/repository/composer-remote/"
- },
- {
- "packagist.org": false
- }
- ]
+ }
}
diff --git a/package.json b/package.json
index 9923a097..f9e1a4ec 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,6 @@
},
"devDependencies": {
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
- "chart.js": "^2.7.3",
- "vue-chartjs": "^3.4.0",
"@fortawesome/fontawesome-free": "^5.7.2",
"@mdi/font": "^2.5.94",
"@vue/cli-plugin-babel": "^3.0.1",
@@ -24,6 +22,7 @@
"bootstrap-sass": "^3.3.7",
"browser-sync": "^2.26.3",
"browser-sync-webpack-plugin": "^2.0.1",
+ "chart.js": "^2.7.3",
"chartist": "0.11.0",
"cross-env": "^5.1",
"css-loader": "2.1.1",
@@ -53,18 +52,19 @@
"vue": "^2.5.17",
"vue-analytics": "^5.8.0",
"vue-chartist": "^2.1.2",
+ "vue-chartjs": "^3.4.0",
"vue-i18n": "^7.4.0",
+ "vue-image-lightbox": "^7.1.0",
+ "vue-lazyload": "^1.3.3",
"vue-meta": "^1.5.2",
"vue-router": "^3.0.1",
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.5.17",
+ "vue2-dropzone": "^3.6.0",
"vuelidate": "^0.7.4",
"vuetify": "^1.2.5",
"vuex": "^3.0.1",
- "vuex-router-sync": "^5.0.0",
- "vue2-dropzone": "^3.6.0",
- "vue-image-lightbox": "^7.1.0",
- "vue-lazyload": "^1.3.3"
+ "vuex-router-sync": "^5.0.0"
},
"dependencies": {
"vue-html-to-paper": "^1.1.0",
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot
index 02a5ecb9..cba6c6cc 100644
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.svg b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.svg
index 1b168ee9..b9881a43 100644
--- a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.svg
+++ b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.svg
@@ -1,16 +1,12 @@
-
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf
index 3926cb17..8d75dedd 100644
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff
index 7bcc97ea..3375bef0 100644
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2
index 2abc94a5..402f81c0 100644
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.eot b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.eot
index 7b7a1d70..a4e59893 100644
Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.eot and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.eot differ
diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.svg b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.svg
index 80cf2b29..463af27c 100644
--- a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.svg
+++ b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.svg
@@ -1,16 +1,12 @@
-