samtny / league-frontend

app/Http/Controllers/AssociationsController.php

Spacing +28 added lines, -28 removed lines

@@ -26,7 +26,7 @@ 
     }
 
     public function view(Association $association) {
-        return view('association.view', ['association' => $association]);
+        return view('association.view', [ 'association' => $association ]);
     }
 
     public function edit(Association $association) {
@@ -46,7 +46,7 @@ 
 
     public function home() {
         if (!empty($this->association)) {
-            return view('association.home', ['association' => $this->association]);
+            return view('association.home', [ 'association' => $this->association ]);
         }
         else {
             abort(404);
@@ -54,35 +54,35 @@ 
     }
 
     public function divisions(Association $association) {
-        return view('association.divisions', ['association' => $association]);
+        return view('association.divisions', [ 'association' => $association ]);
     }
 
     public function teams(Association $association) {
-        return view('association.teams', ['association' => $association]);
+        return view('association.teams', [ 'association' => $association ]);
     }
 
     public function venues(Association $association) {
-        return view('association.venues', ['association' => $association]);
+        return view('association.venues', [ 'association' => $association ]);
     }
 
     public function series(Association $association) {
-        return view('association.series', ['association' => $association]);
+        return view('association.series', [ 'association' => $association ]);
     }
 
     public function users(Association $association) {
-        return view('association.users', ['association' => $association]);
+        return view('association.users', [ 'association' => $association ]);
     }
 
     public function viewUser(Association $association, User $user) {
-        return view('association.user.view', ['association' => $association, 'user' => $user]);
+        return view('association.user.view', [ 'association' => $association, 'user' => $user ]);
     }
 
     public function editUser(Association $association, User $user) {
-        return view('association.user.edit', ['association' => $association, 'user' => $user]);
+        return view('association.user.edit', [ 'association' => $association, 'user' => $user ]);
     }
 
     public function userToken(Association $association, User $user) {
-        return view('association.user.token', ['association' => $association, 'user' => $user]);
+        return view('association.user.token', [ 'association' => $association, 'user' => $user ]);
     }
 
     public function userTokenRefresh(Association $association, User $user) {
@@ -92,7 +92,7 @@ 
             'api_token' => hash('sha256', $token),
         ])->save();
 
-        return view('association.user.token-refresh', ['association' => $association, 'user' => $user, 'token' => $token]);
+        return view('association.user.token-refresh', [ 'association' => $association, 'user' => $user, 'token' => $token ]);
     }
 
     public function updateUser(Request $request, Association $association, User $user) {
@@ -112,12 +112,12 @@ 
             return redirect($url)->with('success', 'Data saved successfully!');
         }
 
-        return redirect()->route('user', ['id' => \Auth::user()->id]);
+        return redirect()->route('user', [ 'id' => \Auth::user()->id ]);
 
     }
 
     public function addUser(Association $association) {
-        return view('association.user.add', ['association' => $association]);
+        return view('association.user.add', [ 'association' => $association ]);
     }
 
     public function submitScoreBegin(Request $request) {
@@ -129,13 +129,13 @@ 
 
             // get rounds with start_date < today, but greater than today - 1 week
             $rounds = Round::whereIn('schedule_id', $schedules->pluck('id'))
-                ->where('start_date','>=', date('Y-m-d', strtotime('-1 week')))
+                ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week')))
                 ->where('start_date', '<=', date('Y-m-d', strtotime("today")))->get();
 
             $divisions = Division::whereIn('id', $rounds->pluck('division_id'))->get();
 
             if (count($divisions) === 1) {
-                $request->division_id = $divisions[0]->id;
+                $request->division_id = $divisions[ 0 ]->id;
 
                 return $this->submitScoreStep2($request);
             }
@@ -165,7 +165,7 @@ 
             $rounds = Round::whereIn('schedule_id', $schedules->pluck('id'))
                 ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week')))
                 ->where('start_date', '<=', date('Y-m-d', strtotime("today")))
-                ->where(function ($query) {
+                ->where(function($query) {
                     $query->where('scores_closed', 0);
                     $query->orWhereNull('scores_closed');
                 })
@@ -264,11 +264,11 @@ 
     }
 
     public function standings() {
-        return view('association.standings', ['association' => $this->association]);
+        return view('association.standings', [ 'association' => $this->association ]);
     }
 
     public function schedule() {
-        return view('association.schedule', ['association' => $this->association]);
+        return view('association.schedule', [ 'association' => $this->association ]);
     }
 
     public function css() {
@@ -293,7 +293,7 @@ 
             $association->save();
 
             // TODO: Do not necessarily "onboard" for certain roles?
-            return redirect()->route('onboard.association', ['association' => $association]);
+            return redirect()->route('onboard.association', [ 'association' => $association ]);
         }
         else {
             return view('denied');
@@ -339,13 +339,13 @@ 
             return redirect($url)->with('success', 'Data saved successfully!');
         }
 
-        return redirect()->route('user', ['id' => \Auth::user()->id]);
+        return redirect()->route('user', [ 'id' => \Auth::user()->id ]);
 
     }
 
     public function create() {
         if (Bouncer::can('create', Association::class)) {
-            return view('association.create', ['current_user' => \Auth::user()]);
+            return view('association.create', [ 'current_user' => \Auth::user() ]);
         }
         else {
             return view('denied');
@@ -353,7 +353,7 @@ 
     }
 
     public function deleteConfirm(Association $association) {
-        return view('association.delete', ['association' => $association]);
+        return view('association.delete', [ 'association' => $association ]);
     }
 
     public function delete(Association $association) {
@@ -363,25 +363,25 @@ 
     }
 
     public function undeleteConfirm(Association $association) {
-        return view('association.undelete', ['association' => $association]);
+        return view('association.undelete', [ 'association' => $association ]);
     }
 
     public function undelete(Association $association) {
         $association->restore();
 
-        return redirect()->route('user', ['user' => \Auth::user()])->with('success', 'Association restored successfully.');
+        return redirect()->route('user', [ 'user' => \Auth::user() ])->with('success', 'Association restored successfully.');
     }
 
     public function about() {
-        return view('association.about' , ['association' => $this->association]);
+        return view('association.about', [ 'association' => $this->association ]);
     }
 
     public function rules() {
-        return view('association.rules' , ['association' => $this->association]);
+        return view('association.rules', [ 'association' => $this->association ]);
     }
 
     public function contact() {
-        return view('forms.contact', ['association' => $this->association]);
+        return view('forms.contact', [ 'association' => $this->association ]);
     }
 
     public function contactSubmit(Request $request) {
@@ -412,7 +412,7 @@ 
      */
     public function contactSubmissions(Association $association)
     {
-        return view('association.contact_submissions', ['association' => $association]);
+        return view('association.contact_submissions', [ 'association' => $association ]);
     }
 
 }

Braces +14 added lines, -28 removed lines

@@ -39,8 +39,7 @@ 
                 'venues' => Venue::orderBy('name', 'ASC')->where('association_id', $association->id)->get(),
                 'current_user' => \Auth::user()
             ]);
-        }
-        else {
+        } else {
             return view('denied');
         }
     }
@@ -48,8 +47,7 @@ 
     public function home() {
         if (!empty($this->association)) {
             return view('association.home', ['association' => $this->association]);
-        }
-        else {
+        } else {
             abort(404);
         }
     }
@@ -101,8 +99,7 @@ 
         if (isset($request->assoc_admin)) {
             Bouncer::assign('assocadmin')->to($user);
             Bouncer::allow($user)->toManage($association);
-        }
-        else {
+        } else {
             Bouncer::disallow($user)->toManage($association);
             Bouncer::retract('assocadmin')->from($user);
         }
@@ -139,15 +136,13 @@ 
                 $request->division_id = $divisions[0]->id;
 
                 return $this->submitScoreStep2($request);
-            }
-            else {
+            } else {
                 return view('forms.results.choose-division', [
                     'association' => $this->association,
                     'divisions' => $divisions,
                     ]);
             }
-        }
-        else {
+        } else {
             abort(404);
         }
     }
@@ -177,8 +172,7 @@ 
                 'association' => $this->association,
                 'rounds' => $rounds,
                 ]);
-        }
-        else {
+        } else {
             abort(404);
         }
     }
@@ -191,8 +185,7 @@ 
                 'association' => $this->association,
                 'match' => $match,
                 ]);
-        }
-        else {
+        } else {
             abort(404);
         }
     }
@@ -222,20 +215,17 @@ 
                     return view('forms.results.thanks', [
                         'association' => $this->association,
                         ]);
-                }
-                else {
+                } else {
                     return view('forms.results.choose-winner', [
                         'association' => $this->association,
                         'match' => PLMatch::find($submission->match_id),
                         'submission' => $submission,
                         ]);
                 }
-            }
-            else {
+            } else {
                 abort(404);
             }
-        }
-        else {
+        } else {
             abort(404);
         }
     }
@@ -254,12 +244,10 @@ 
                 return view('forms.results.thanks', [
                     'association' => $this->association,
                     ]);
-            }
-            else {
+            } else {
                 abort(404);
             }
-        }
-        else {
+        } else {
             abort(404);
         }
     }
@@ -295,8 +283,7 @@ 
 
             // TODO: Do not necessarily "onboard" for certain roles?
             return redirect()->route('onboard.association', ['association' => $association]);
-        }
-        else {
+        } else {
             return view('denied');
         }
     }
@@ -347,8 +334,7 @@ 
     public function create() {
         if (Bouncer::can('create', Association::class)) {
             return view('association.create', ['current_user' => \Auth::user()]);
-        }
-        else {
+        } else {
             return view('denied');
         }
     }

app/PLMatch.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 class PLMatch extends Model
 {
 
-    protected $fillable = array('name', 'start_date', 'end_date', 'association_id',  'series_id', 'division_id', 'schedule_id', 'round_id', 'venue_id', 'home_team_id', 'away_team_id');
+    protected $fillable = array('name', 'start_date', 'end_date', 'association_id', 'series_id', 'division_id', 'schedule_id', 'round_id', 'venue_id', 'home_team_id', 'away_team_id');
 
     public function association() {
         return $this->belongsTo('App\Association');