@@ -28,6 +28,6 @@ |
||
28 | 28 | */ |
29 | 29 | public function handle() |
30 | 30 | { |
31 | - $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL); |
|
31 | + $this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL); |
|
32 | 32 | } |
33 | 33 | } |
@@ -29,13 +29,13 @@ |
||
29 | 29 | $emailToSendTo = $request->input('email'); |
30 | 30 | $body = $request->input('message'); |
31 | 31 | |
32 | - Mail::send('emails.contact', ['body' => $body], function ($message) use ($name,$emailToSendTo) { |
|
32 | + Mail::send('emails.contact', [ 'body' => $body ], function($message) use ($name, $emailToSendTo) { |
|
33 | 33 | $message->from('[email protected]', "From: {$name}"); |
34 | 34 | |
35 | 35 | $message->to($emailToSendTo)->subject("Message From Laravel Hackathon Starter Contact Form"); |
36 | 36 | }); |
37 | 37 | |
38 | - return redirect()->route('contact')->with('info','Your Message has been dispatched successfully'); |
|
38 | + return redirect()->route('contact')->with('info', 'Your Message has been dispatched successfully'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | } |
@@ -23,33 +23,33 @@ discard block |
||
23 | 23 | | |
24 | 24 | */ |
25 | 25 | |
26 | -Route::group(['middleware' => ['web']], function () { |
|
26 | +Route::group([ 'middleware' => [ 'web' ] ], function() { |
|
27 | 27 | |
28 | - Route::get('/', function () { |
|
28 | + Route::get('/', function() { |
|
29 | 29 | return view('welcome'); |
30 | 30 | }); |
31 | 31 | |
32 | - Route::get('/api', function () { |
|
32 | + Route::get('/api', function() { |
|
33 | 33 | return view('apidashboard'); |
34 | 34 | }); |
35 | 35 | |
36 | 36 | Route::get('/login', [ |
37 | 37 | 'uses' => 'Auth\AuthController@getLogin', |
38 | 38 | 'as' => 'auth.login', |
39 | - 'middleware' => ['guest'] |
|
39 | + 'middleware' => [ 'guest' ] |
|
40 | 40 | ]); |
41 | 41 | |
42 | 42 | |
43 | 43 | Route::post('/login', [ |
44 | 44 | 'uses' => 'Auth\AuthController@postLogin', |
45 | - 'middleware' => ['guest'] |
|
45 | + 'middleware' => [ 'guest' ] |
|
46 | 46 | ]); |
47 | 47 | |
48 | 48 | |
49 | 49 | Route::get('/signup', [ |
50 | 50 | 'uses' => 'Auth\AuthController@getRegister', |
51 | 51 | 'as' => 'auth.register', |
52 | - 'middleware' => ['guest'] |
|
52 | + 'middleware' => [ 'guest' ] |
|
53 | 53 | ]); |
54 | 54 | |
55 | 55 | Route::get('auth/logout', [ |
@@ -59,10 +59,10 @@ discard block |
||
59 | 59 | |
60 | 60 | Route::post('/signup', [ |
61 | 61 | 'uses' => 'Auth\AuthController@postRegister', |
62 | - 'middleware' => ['guest'] |
|
62 | + 'middleware' => [ 'guest' ] |
|
63 | 63 | ]); |
64 | 64 | |
65 | - Route::get('/contact', function () { |
|
65 | + Route::get('/contact', function() { |
|
66 | 66 | return view('contact'); |
67 | 67 | }); |
68 | 68 |
@@ -37,7 +37,7 @@ |
||
37 | 37 | */ |
38 | 38 | public function map(Router $router) |
39 | 39 | { |
40 | - $router->group(['namespace' => $this->namespace], function ($router) { |
|
40 | + $router->group([ 'namespace' => $this->namespace ], function($router) { |
|
41 | 41 | require app_path('Http/routes.php'); |
42 | 42 | }); |
43 | 43 | } |
@@ -26,6 +26,9 @@ discard block |
||
26 | 26 | return $this->execute(($request->has('code') || $request->has('oauth_token')), $provider); |
27 | 27 | } |
28 | 28 | |
29 | + /** |
|
30 | + * @param boolean $request |
|
31 | + */ |
|
29 | 32 | public function execute($request, $provider) |
30 | 33 | { |
31 | 34 | if (! $request) { |
@@ -41,6 +44,7 @@ discard block |
||
41 | 44 | /** |
42 | 45 | * Find a user by username or create a new user |
43 | 46 | * @param |
47 | + * @param \Laravel\Socialite\Contracts\User $userData |
|
44 | 48 | * @return |
45 | 49 | */ |
46 | 50 | public function findByProviderIdOrCreate($userData, $provider) |
@@ -103,7 +107,7 @@ discard block |
||
103 | 107 | /** |
104 | 108 | * Get Data from Social Media Account |
105 | 109 | * @param string $provider |
106 | - * @return collection |
|
110 | + * @return \Laravel\Socialite\Contracts\User |
|
107 | 111 | */ |
108 | 112 | private function getSocialUser($provider) |
109 | 113 | { |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace App\Http\Controllers; |
4 | 4 | |
5 | 5 | use Illuminate\Http\Request; |
6 | - |
|
7 | -use App\Http\Requests; |
|
8 | 6 | use App\Http\Controllers\Controller; |
9 | 7 | use Illuminate\Contracts\Auth\Guard; |
10 | 8 | use Laravel\Socialite\Contracts\Factory as Socialite; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | |
29 | 29 | public function execute($request, $provider) |
30 | 30 | { |
31 | - if (! $request) { |
|
31 | + if (!$request) { |
|
32 | 32 | return $this->getAuthorizationFirst($provider); |
33 | 33 | } |
34 | 34 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | |
52 | 52 | $username = $this->isEmailExists($userData->getNickName()) ? null : $userData->getEmail(); |
53 | 53 | |
54 | - if (empty($user)) { |
|
54 | + if (empty($user)) { |
|
55 | 55 | $user = User::create([ |
56 | 56 | 'fullname' => $userData->getName(), |
57 | 57 | 'username' => $username, |
@@ -69,16 +69,16 @@ discard block |
||
69 | 69 | |
70 | 70 | private function isUsernameExists($username = null) |
71 | 71 | { |
72 | - $username = User::whereUsername($username)->first()['username']; |
|
72 | + $username = User::whereUsername($username)->first()[ 'username' ]; |
|
73 | 73 | |
74 | - return (! is_null($username)) ? true : false; |
|
74 | + return (!is_null($username)) ? true : false; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | private function isEmailExists($email = null) |
78 | 78 | { |
79 | - $email = User::whereEmail($email)->first()['email']; |
|
79 | + $email = User::whereEmail($email)->first()[ 'email' ]; |
|
80 | 80 | |
81 | - return (! is_null($email)) ? true : false; |
|
81 | + return (!is_null($email)) ? true : false; |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | 'username' => $user->username, |
101 | 101 | ]; |
102 | 102 | |
103 | - if (! empty(array_diff($dbData, $socialData))) { |
|
103 | + if (!empty(array_diff($dbData, $socialData))) { |
|
104 | 104 | $user->avatar = $userData->getAvatar(); |
105 | 105 | $user->fullname = $userData->getName(); |
106 | 106 | $user->username = $userData->getNickName(); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function __construct() |
39 | 39 | { |
40 | - $this->middleware('guest', ['except' => 'logout']); |
|
40 | + $this->middleware('guest', [ 'except' => 'logout' ]); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
@@ -64,9 +64,9 @@ discard block |
||
64 | 64 | protected function create(array $data) |
65 | 65 | { |
66 | 66 | return User::create([ |
67 | - 'fullname' => $data['name'], |
|
68 | - 'email' => $data['email'], |
|
69 | - 'password' => bcrypt($data['password']), |
|
67 | + 'fullname' => $data[ 'name' ], |
|
68 | + 'email' => $data[ 'email' ], |
|
69 | + 'password' => bcrypt($data[ 'password' ]), |
|
70 | 70 | ]); |
71 | 71 | } |
72 | 72 |
@@ -26,7 +26,7 @@ |
||
26 | 26 | |
27 | 27 | public function getAvatarUrl() |
28 | 28 | { |
29 | - if(is_null($this->avatar)) { |
|
29 | + if (is_null($this->avatar)) { |
|
30 | 30 | return "http://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))) . "?d=mm&s=40"; |
31 | 31 | } |
32 | 32 |