@@ -2,5 +2,5 @@ |
||
| 2 | 2 | |
| 3 | 3 | function load_asset($asset_url) |
| 4 | 4 | { |
| 5 | - return ( env('APP_ENV') === 'production' ) ? secure_asset($asset_url) : asset($asset_url); |
|
| 5 | + return (env('APP_ENV') === 'production') ? secure_asset($asset_url) : asset($asset_url); |
|
| 6 | 6 | } |
@@ -23,27 +23,27 @@ 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 | - Route::group(['prefix' => 'api'], function() { |
|
| 36 | + Route::group([ 'prefix' => 'api' ], function() { |
|
| 37 | 37 | Route::get('github', [ |
| 38 | 38 | 'uses' => 'GithubController@getPage', |
| 39 | 39 | 'as' => 'api.github', |
| 40 | - 'middleware' => ['auth'] |
|
| 40 | + 'middleware' => [ 'auth' ] |
|
| 41 | 41 | ]); |
| 42 | 42 | |
| 43 | 43 | Route::get('twitter', [ |
| 44 | 44 | 'uses' => 'TwitterController@getPage', |
| 45 | 45 | 'as' => 'api.twitter', |
| 46 | - 'middleware' => ['auth'] |
|
| 46 | + 'middleware' => [ 'auth' ] |
|
| 47 | 47 | ]); |
| 48 | 48 | |
| 49 | 49 | Route::get('lastfm', [ |
@@ -117,13 +117,13 @@ discard block |
||
| 117 | 117 | Route::get('facebook', [ |
| 118 | 118 | 'uses' => 'FacebookController@getPage', |
| 119 | 119 | 'as' => 'api.facebook', |
| 120 | - 'middleware' => ['auth'] |
|
| 120 | + 'middleware' => [ 'auth' ] |
|
| 121 | 121 | ]); |
| 122 | 122 | |
| 123 | 123 | Route::get('linkedin', [ |
| 124 | 124 | 'uses' => 'LinkedInController@getPage', |
| 125 | 125 | 'as' => 'api.linkedin', |
| 126 | - 'middleware' => ['auth'] |
|
| 126 | + 'middleware' => [ 'auth' ] |
|
| 127 | 127 | ]); |
| 128 | 128 | |
| 129 | 129 | Route::get('foursquare', [ |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | Route::get('instagram', [ |
| 135 | 135 | 'uses' => 'InstagramController@getPage', |
| 136 | 136 | 'as' => 'api.instagram', |
| 137 | - 'middleware' => ['auth'] |
|
| 137 | + 'middleware' => [ 'auth' ] |
|
| 138 | 138 | ]); |
| 139 | 139 | |
| 140 | 140 | Route::get('tumblr', [ |
@@ -151,18 +151,18 @@ discard block |
||
| 151 | 151 | Route::post('/tweet/new', [ |
| 152 | 152 | 'uses' => 'TwitterController@sendTweet', |
| 153 | 153 | 'as' => 'tweet.new', |
| 154 | - 'middleware' => ['auth'] |
|
| 154 | + 'middleware' => [ 'auth' ] |
|
| 155 | 155 | ]); |
| 156 | 156 | |
| 157 | 157 | Route::get('/login', [ |
| 158 | 158 | 'uses' => 'Auth\AuthController@getLogin', |
| 159 | 159 | 'as' => 'auth.login', |
| 160 | - 'middleware' => ['guest'] |
|
| 160 | + 'middleware' => [ 'guest' ] |
|
| 161 | 161 | ]); |
| 162 | 162 | |
| 163 | 163 | Route::post('/login', [ |
| 164 | 164 | 'uses' => 'Auth\AuthController@postLogin', |
| 165 | - 'middleware' => ['guest'] |
|
| 165 | + 'middleware' => [ 'guest' ] |
|
| 166 | 166 | ]); |
| 167 | 167 | |
| 168 | 168 | // Password Reset Routes... |
@@ -176,50 +176,50 @@ discard block |
||
| 176 | 176 | Route::get('/account', [ |
| 177 | 177 | 'uses' => 'AccountController@getAccountPage', |
| 178 | 178 | 'as' => 'account.dashboard', |
| 179 | - 'middleware' => ['auth'] |
|
| 179 | + 'middleware' => [ 'auth' ] |
|
| 180 | 180 | ]); |
| 181 | 181 | |
| 182 | 182 | Route::post('/account/profile', [ |
| 183 | 183 | 'uses' => 'AccountController@updateProfile', |
| 184 | 184 | 'as' => 'account.profile', |
| 185 | - 'middleware' => ['auth'] |
|
| 185 | + 'middleware' => [ 'auth' ] |
|
| 186 | 186 | ]); |
| 187 | 187 | |
| 188 | 188 | Route::post('/account/photo', [ |
| 189 | 189 | 'uses' => 'AccountController@updateAvatar', |
| 190 | 190 | 'as' => 'account.avatar', |
| 191 | - 'middleware' => ['auth'] |
|
| 191 | + 'middleware' => [ 'auth' ] |
|
| 192 | 192 | ]); |
| 193 | 193 | |
| 194 | 194 | Route::post('/account/password', [ |
| 195 | 195 | 'uses' => 'AccountController@changePassword', |
| 196 | 196 | 'as' => 'account.password', |
| 197 | - 'middleware' => ['auth'] |
|
| 197 | + 'middleware' => [ 'auth' ] |
|
| 198 | 198 | ]); |
| 199 | 199 | |
| 200 | 200 | Route::post('/account/delete/now', [ |
| 201 | 201 | 'uses' => 'AccountController@deleteAccount', |
| 202 | 202 | 'as' => 'account.delete.now', |
| 203 | - 'middleware' => ['auth'] |
|
| 203 | + 'middleware' => [ 'auth' ] |
|
| 204 | 204 | ]); |
| 205 | 205 | |
| 206 | 206 | |
| 207 | 207 | Route::get('/account/confirm/delete', [ |
| 208 | 208 | 'uses' => 'AccountController@redirectToConfirmDeletePage', |
| 209 | 209 | 'as' => 'account.confirm.delete', |
| 210 | - 'middleware' => ['auth'] |
|
| 210 | + 'middleware' => [ 'auth' ] |
|
| 211 | 211 | ]); |
| 212 | 212 | |
| 213 | 213 | Route::get('/account/delete/later', [ |
| 214 | 214 | 'uses' => 'AccountController@dontDeleteAccount', |
| 215 | 215 | 'as' => 'account.dont.delete', |
| 216 | - 'middleware' => ['auth'] |
|
| 216 | + 'middleware' => [ 'auth' ] |
|
| 217 | 217 | ]); |
| 218 | 218 | |
| 219 | 219 | Route::get('/signup', [ |
| 220 | 220 | 'uses' => 'Auth\AuthController@getRegister', |
| 221 | 221 | 'as' => 'auth.register', |
| 222 | - 'middleware' => ['guest'] |
|
| 222 | + 'middleware' => [ 'guest' ] |
|
| 223 | 223 | ]); |
| 224 | 224 | |
| 225 | 225 | Route::get('logout', [ |
@@ -229,10 +229,10 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | Route::post('/signup', [ |
| 231 | 231 | 'uses' => 'Auth\AuthController@postRegister', |
| 232 | - 'middleware' => ['guest'] |
|
| 232 | + 'middleware' => [ 'guest' ] |
|
| 233 | 233 | ]); |
| 234 | 234 | |
| 235 | - Route::get('/contact', function () { |
|
| 235 | + Route::get('/contact', function() { |
|
| 236 | 236 | return view('contact'); |
| 237 | 237 | }); |
| 238 | 238 | |
@@ -38,8 +38,8 @@ |
||
| 38 | 38 | $tracks = array_slice($this->getTopTracks(), 0, 10); |
| 39 | 39 | |
| 40 | 40 | return view('api.lastfm')->withDetails($details) |
| 41 | - ->withAlbums($albums) |
|
| 42 | - ->withTracks($tracks); |
|
| 41 | + ->withAlbums($albums) |
|
| 42 | + ->withTracks($tracks); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | /** |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | /** |
| 11 | 11 | * @var array |
| 12 | 12 | */ |
| 13 | - protected $sampleArtist = ['artist' => 'The Pierces']; |
|
| 13 | + protected $sampleArtist = [ 'artist' => 'The Pierces' ]; |
|
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * LastFm Object |
@@ -49,9 +49,9 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | private function getArtistInfo() |
| 51 | 51 | { |
| 52 | - $result = (array)$this->lastfm->artist_getInfo($this->sampleArtist); |
|
| 52 | + $result = (array) $this->lastfm->artist_getInfo($this->sampleArtist); |
|
| 53 | 53 | |
| 54 | - return $result['artist']; |
|
| 54 | + return $result[ 'artist' ]; |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | /** |
@@ -60,9 +60,9 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | private function getTopAlbums() |
| 62 | 62 | { |
| 63 | - $result = (array)$this->lastfm->artist_getTopAlbums($this->sampleArtist); |
|
| 63 | + $result = (array) $this->lastfm->artist_getTopAlbums($this->sampleArtist); |
|
| 64 | 64 | |
| 65 | - return $result['topalbums']->album; |
|
| 65 | + return $result[ 'topalbums' ]->album; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
@@ -71,8 +71,8 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | private function getTopTracks() |
| 73 | 73 | { |
| 74 | - $result = (array)$this->lastfm->artist_getTopTracks($this->sampleArtist); |
|
| 74 | + $result = (array) $this->lastfm->artist_getTopTracks($this->sampleArtist); |
|
| 75 | 75 | |
| 76 | - return $result['toptracks']->track; |
|
| 76 | + return $result[ 'toptracks' ]->track; |
|
| 77 | 77 | } |
| 78 | 78 | } |
@@ -27,8 +27,8 @@ |
||
| 27 | 27 | |
| 28 | 28 | public function getAvatarUrl() |
| 29 | 29 | { |
| 30 | - if(is_null($this->avatar)) { |
|
| 31 | - return "http://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))) . "?d=mm&s=40"; |
|
| 30 | + if (is_null($this->avatar)) { |
|
| 31 | + return "http://www.gravatar.com/avatar/".md5(strtolower(trim($this->email)))."?d=mm&s=40"; |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | return $this->avatar; |
@@ -34,14 +34,14 @@ discard block |
||
| 34 | 34 | public function updateProfile(Request $request) |
| 35 | 35 | { |
| 36 | 36 | $this->validate($request, [ |
| 37 | - 'email' => 'required|email|min:3|unique:users,email,'. $this->id, |
|
| 37 | + 'email' => 'required|email|min:3|unique:users,email,'.$this->id, |
|
| 38 | 38 | 'fullname' => 'required|min:3' |
| 39 | 39 | ]); |
| 40 | 40 | |
| 41 | 41 | $values = $request->all(); |
| 42 | 42 | $this->user->fill($values)->save(); |
| 43 | 43 | |
| 44 | - return redirect()->back()->with('info','Your Profile has been updated successfully'); |
|
| 44 | + return redirect()->back()->with('info', 'Your Profile has been updated successfully'); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function updateAvatar(Request $request) |
@@ -50,14 +50,14 @@ discard block |
||
| 50 | 50 | 'file_name' => 'required|mimes:jpeg,bmp,png|between:1,7000', |
| 51 | 51 | ]); |
| 52 | 52 | |
| 53 | - $filename = $request->file('file_name')->getRealPath(); |
|
| 53 | + $filename = $request->file('file_name')->getRealPath(); |
|
| 54 | 54 | |
| 55 | 55 | Cloudder::upload($filename, null); |
| 56 | 56 | list($width, $height) = getimagesize($filename); |
| 57 | 57 | |
| 58 | - $fileUrl = Cloudder::show(Cloudder::getPublicId(), ["width" => $width, "height" => $height]); |
|
| 58 | + $fileUrl = Cloudder::show(Cloudder::getPublicId(), [ "width" => $width, "height" => $height ]); |
|
| 59 | 59 | |
| 60 | - $this->user->update(['avatar' => $fileUrl]); |
|
| 60 | + $this->user->update([ 'avatar' => $fileUrl ]); |
|
| 61 | 61 | |
| 62 | 62 | return redirect()->back()->with('info', 'Your Avatar has been updated Successfully'); |
| 63 | 63 | } |
@@ -28,11 +28,11 @@ discard block |
||
| 28 | 28 | public function __construct() |
| 29 | 29 | { |
| 30 | 30 | $this->baseUrl = 'https://query.yahooapis.com/v1/public/yql'; |
| 31 | - $this->client = new Client(['base_uri' => $this->baseUrl]); |
|
| 31 | + $this->client = new Client([ 'base_uri' => $this->baseUrl ]); |
|
| 32 | 32 | |
| 33 | 33 | $query = "SELECT * FROM weather.forecast WHERE (location = 10007)"; |
| 34 | 34 | |
| 35 | - $relativeUrl = '?q=' . $query . '&format=json'; |
|
| 35 | + $relativeUrl = '?q='.$query.'&format=json'; |
|
| 36 | 36 | $this->setGetResponse($relativeUrl); |
| 37 | 37 | } |
| 38 | 38 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | */ |
| 43 | 43 | private function setGetResponse($relativeUrl) |
| 44 | 44 | { |
| 45 | - $this->response = $this->client->get($this->baseUrl . $relativeUrl, []); |
|
| 45 | + $this->response = $this->client->get($this->baseUrl.$relativeUrl, [ ]); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | */ |
| 61 | 61 | private function getData() |
| 62 | 62 | { |
| 63 | - return $this->getResponse()['query']['results']['channel']; |
|
| 63 | + return $this->getResponse()[ 'query' ][ 'results' ][ 'channel' ]; |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use GuzzleHttp\Client; |
| 6 | -use App\Http\Requests; |
|
| 7 | 6 | |
| 8 | 7 | class YahooController extends Controller |
| 9 | 8 | { |
@@ -25,13 +25,13 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function __construct() |
| 27 | 27 | { |
| 28 | - $this->baseUrl = self::YAHOO_API; |
|
| 29 | - $this->client = new Client(['base_uri' => $this->baseUrl]); |
|
| 28 | + $this->baseUrl = self::YAHOO_API; |
|
| 29 | + $this->client = new Client(['base_uri' => $this->baseUrl]); |
|
| 30 | 30 | |
| 31 | - $query = "SELECT * FROM weather.forecast WHERE (location = 10007)"; |
|
| 31 | + $query = "SELECT * FROM weather.forecast WHERE (location = 10007)"; |
|
| 32 | 32 | |
| 33 | - $relativeUrl = '?q=' . $query . '&format=json'; |
|
| 34 | - $this->setGetResponse($relativeUrl); |
|
| 33 | + $relativeUrl = '?q=' . $query . '&format=json'; |
|
| 34 | + $this->setGetResponse($relativeUrl); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -62,10 +62,10 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * Return all data to the Yahoo API dashboard |
|
| 67 | - * @return mixed |
|
| 68 | - */ |
|
| 65 | + /** |
|
| 66 | + * Return all data to the Yahoo API dashboard |
|
| 67 | + * @return mixed |
|
| 68 | + */ |
|
| 69 | 69 | public function getPage() |
| 70 | 70 | { |
| 71 | 71 | $data = $this->getData(); |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | public function __construct() |
| 38 | 38 | { |
| 39 | 39 | $this->baseUrl = 'https://api.linkedin.com/v1'; |
| 40 | - $this->client = new Client(['base_uri' => $this->baseUrl]); |
|
| 40 | + $this->client = new Client([ 'base_uri' => $this->baseUrl ]); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -46,13 +46,13 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | private function setRequestOptions() |
| 48 | 48 | { |
| 49 | - $authBearer = 'Bearer '. Auth::user()->getAccessToken(); |
|
| 50 | - $this->client = new Client(['base_uri' => $this->baseUrl, |
|
| 49 | + $authBearer = 'Bearer '.Auth::user()->getAccessToken(); |
|
| 50 | + $this->client = new Client([ 'base_uri' => $this->baseUrl, |
|
| 51 | 51 | 'headers' => [ |
| 52 | 52 | 'Authorization' => $authBearer, |
| 53 | 53 | 'Content-Type' => 'application/json', |
| 54 | 54 | 'Accept' => 'application/json' |
| 55 | - ]]); |
|
| 55 | + ] ]); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | private function setGetResponse($relativeUrl) |
| 63 | 63 | { |
| 64 | - $this->response = $this->client->get($this->baseUrl . $relativeUrl, []); |
|
| 64 | + $this->response = $this->client->get($this->baseUrl.$relativeUrl, [ ]); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** |
@@ -29,19 +29,19 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | protected $response; |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * Initialize the Controller with necessary arguments |
|
| 34 | - */ |
|
| 32 | + /** |
|
| 33 | + * Initialize the Controller with necessary arguments |
|
| 34 | + */ |
|
| 35 | 35 | public function __construct() |
| 36 | 36 | { |
| 37 | 37 | $this->baseUrl = self::LINKEDIN_API; |
| 38 | 38 | $this->client = new Client(['base_uri' => $this->baseUrl]); |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * Set options for making the Client request |
|
| 43 | - * @return void |
|
| 44 | - */ |
|
| 41 | + /** |
|
| 42 | + * Set options for making the Client request |
|
| 43 | + * @return void |
|
| 44 | + */ |
|
| 45 | 45 | private function setRequestOptions() |
| 46 | 46 | { |
| 47 | 47 | $authBearer = 'Bearer '. Auth::user()->getAccessToken(); |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use App\Http\Requests; |
|
| 7 | 6 | use MJErwin\Clockwork\ClockworkClient; |
| 8 | 7 | use MJErwin\Clockwork\Message; |
| 9 | 8 | |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Http\Controllers; |
| 4 | 4 | |
| 5 | 5 | use GuzzleHttp\Client; |
| 6 | -use App\Http\Requests; |
|
| 7 | 6 | |
| 8 | 7 | class NytController extends Controller |
| 9 | 8 | { |
@@ -27,9 +27,9 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | public function __construct() |
| 29 | 29 | { |
| 30 | - $this->baseUrl = self::API_URL; |
|
| 31 | - $this->client = new Client(['base_uri' => $this->baseUrl]); |
|
| 32 | - $this->setGetResponse($this->getRelativeUrl()); |
|
| 30 | + $this->baseUrl = self::API_URL; |
|
| 31 | + $this->client = new Client(['base_uri' => $this->baseUrl]); |
|
| 32 | + $this->setGetResponse($this->getRelativeUrl()); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | public function __construct() |
| 29 | 29 | { |
| 30 | 30 | $this->baseUrl = self::API_URL; |
| 31 | - $this->client = new Client(['base_uri' => $this->baseUrl]); |
|
| 31 | + $this->client = new Client([ 'base_uri' => $this->baseUrl ]); |
|
| 32 | 32 | $this->setGetResponse($this->getRelativeUrl()); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | private function setGetResponse($relativeUrl) |
| 50 | 50 | { |
| 51 | - $this->response = $this->client->get($this->baseUrl . $relativeUrl, []); |
|
| 51 | + $this->response = $this->client->get($this->baseUrl.$relativeUrl, [ ]); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | private function getData() |
| 68 | 68 | { |
| 69 | - return $this->getResponse()['results']['lists'][0]['books']; |
|
| 69 | + return $this->getResponse()[ 'results' ][ 'lists' ][ 0 ][ 'books' ]; |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |