Skip to content
This repository was archived by the owner on Mar 13, 2023. It is now read-only.

Commit af3ecb1

Browse files
committed
Add debugbar and update voyager config
1 parent a9bfa91 commit af3ecb1

File tree

7 files changed

+139
-4
lines changed

7 files changed

+139
-4
lines changed

app/Http/Controllers/Auth/LoginController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Http\Controllers\Controller;
66
use App\User;
77
use Illuminate\Foundation\Auth\AuthenticatesUsers;
8+
use Illuminate\Support\Carbon;
89
use Socialite;
910
use Illuminate\Support\Facades\Auth;
1011

@@ -72,7 +73,7 @@ public function handleProviderCallback($provider)
7273
}
7374

7475
$user = User::where($provider.'_id', '=', $providerUser->getId())
75-
->Where('email', '=', $providerUser->getEmail())
76+
->orWhere('email', '=', $providerUser->getEmail())
7677
->first();
7778

7879
if (is_null($user)) {

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"thujohn/twitter": "^2.2"
2222
},
2323
"require-dev": {
24+
"barryvdh/laravel-debugbar": "^3.1",
2425
"filp/whoops": "^2.0",
2526
"fzaninotto/faker": "^1.4",
2627
"mckenziearts/laravel-command": "^1.0",

composer.lock

Lines changed: 130 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/app.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
'name' => env('APP_NAME', 'Laravel'),
1717

18+
'prefix' => env('APP_PREFIX', 'admin'),
19+
1820
/*
1921
|--------------------------------------------------------------------------
2022
| Application Environment

config/voyager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
'default_role' => 'user',
1616
'namespace' => null,
1717
'default_avatar' => 'users/default.png',
18-
'redirect' => '/console',
18+
'redirect' => '/'. config('app.prefix'),
1919
],
2020

2121
/*

routes/web.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@
5959
});
6060

6161
/** Voyager ROUTE **/
62-
Route::group(['prefix' => 'console'], function () {
62+
Route::group(['prefix' => config('app.prefix')], function () {
6363
Voyager::routes();
6464
});

storage/debugbar/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

0 commit comments

Comments
 (0)