Merge standard code from other projects

This commit is contained in:
Deon George 2021-02-17 21:28:19 +11:00
parent 31749c03b0
commit 338296982b
4 changed files with 6 additions and 6 deletions

View File

@ -41,7 +41,7 @@ return [
| |
*/ */
'debug' => env('APP_DEBUG', false), 'debug' => (bool) env('APP_DEBUG', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -217,6 +217,7 @@ return [
'Gate' => Illuminate\Support\Facades\Gate::class, 'Gate' => Illuminate\Support\Facades\Gate::class,
'Gravatar' => Creativeorange\Gravatar\Facades\Gravatar::class, 'Gravatar' => Creativeorange\Gravatar\Facades\Gravatar::class,
'Hash' => Illuminate\Support\Facades\Hash::class, 'Hash' => Illuminate\Support\Facades\Hash::class,
'Http' => Illuminate\Support\Facades\Http::class,
'Lang' => Illuminate\Support\Facades\Lang::class, 'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class, 'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class, 'Mail' => Illuminate\Support\Facades\Mail::class,

View File

@ -14,8 +14,7 @@
"laravel-mix": "^5.0.1", "laravel-mix": "^5.0.1",
"resolve-url-loader": "^2.3.1", "resolve-url-loader": "^2.3.1",
"sass": "^1.15.2", "sass": "^1.15.2",
"sass-loader": "^8.0.0", "sass-loader": "^8.0.0"
"vue-template-compiler": "^2.6.11"
}, },
"dependencies": { "dependencies": {
"axios": "^0.19", "axios": "^0.19",

2
public/js/app.js vendored

File diff suppressed because one or more lines are too long

View File

@ -17,9 +17,9 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
* allows your team to easily build robust real-time web applications. * allows your team to easily build robust real-time web applications.
*/ */
/*
import Echo from 'laravel-echo'; import Echo from 'laravel-echo';
/*
window.Pusher = require('pusher-js'); window.Pusher = require('pusher-js');
window.Echo = new Echo({ window.Echo = new Echo({
@ -28,7 +28,7 @@ window.Echo = new Echo({
wsHost: window.location.hostname, wsHost: window.location.hostname,
wsPort: 6001, wsPort: 6001,
disableStats: true, disableStats: true,
useTLS: false, encrypted: true,
}); });
*/ */