@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | $division->save(); |
32 | 32 | |
33 | - return redirect()->route('association.divisions', ['association' => $association]); |
|
33 | + return redirect()->route('association.divisions', [ 'association' => $association ]); |
|
34 | 34 | } |
35 | 35 | else { |
36 | 36 | return view('denied'); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | $division->save(); |
51 | 51 | |
52 | - return redirect()->route('association.divisions', ['association' => $association]); |
|
52 | + return redirect()->route('association.divisions', [ 'association' => $association ]); |
|
53 | 53 | } |
54 | 54 | else { |
55 | 55 | return view('denied'); |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | |
71 | 71 | public function deleteConfirm(Association $association, Division $division) { |
72 | 72 | if (Bouncer::can('delete', $division)) { |
73 | - return view('division.delete', ['division' => $division]); |
|
73 | + return view('division.delete', [ 'division' => $division ]); |
|
74 | 74 | } |
75 | 75 | else { |
76 | 76 | return view('denied'); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | if (Bouncer::can('delete', $division)) { |
82 | 82 | $division->delete(); |
83 | 83 | |
84 | - return redirect()->route('association.divisions', ['association' => $association])->with('success', 'Division deleted successfully.'); |
|
84 | + return redirect()->route('association.divisions', [ 'association' => $association ])->with('success', 'Division deleted successfully.'); |
|
85 | 85 | } |
86 | 86 | else { |
87 | 87 | return view('denied'); |
@@ -31,8 +31,7 @@ discard block |
||
31 | 31 | $division->save(); |
32 | 32 | |
33 | 33 | return redirect()->route('association.divisions', ['association' => $association]); |
34 | - } |
|
35 | - else { |
|
34 | + } else { |
|
36 | 35 | return view('denied'); |
37 | 36 | } |
38 | 37 | } |
@@ -50,8 +49,7 @@ discard block |
||
50 | 49 | $division->save(); |
51 | 50 | |
52 | 51 | return redirect()->route('association.divisions', ['association' => $association]); |
53 | - } |
|
54 | - else { |
|
52 | + } else { |
|
55 | 53 | return view('denied'); |
56 | 54 | } |
57 | 55 | } |
@@ -62,8 +60,7 @@ discard block |
||
62 | 60 | 'association' => $association, |
63 | 61 | 'division' => $division, |
64 | 62 | ]); |
65 | - } |
|
66 | - else { |
|
63 | + } else { |
|
67 | 64 | return view('denied'); |
68 | 65 | } |
69 | 66 | } |
@@ -71,8 +68,7 @@ discard block |
||
71 | 68 | public function deleteConfirm(Association $association, Division $division) { |
72 | 69 | if (Bouncer::can('delete', $division)) { |
73 | 70 | return view('division.delete', ['division' => $division]); |
74 | - } |
|
75 | - else { |
|
71 | + } else { |
|
76 | 72 | return view('denied'); |
77 | 73 | } |
78 | 74 | } |
@@ -82,8 +78,7 @@ discard block |
||
82 | 78 | $division->delete(); |
83 | 79 | |
84 | 80 | return redirect()->route('association.divisions', ['association' => $association])->with('success', 'Division deleted successfully.'); |
85 | - } |
|
86 | - else { |
|
81 | + } else { |
|
87 | 82 | return view('denied'); |
88 | 83 | } |
89 | 84 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | $team->save(); |
32 | 32 | |
33 | - return redirect()->route('association.teams', ['association' => $association]); |
|
33 | + return redirect()->route('association.teams', [ 'association' => $association ]); |
|
34 | 34 | } |
35 | 35 | else { |
36 | 36 | return view('denied'); |
@@ -43,14 +43,14 @@ discard block |
||
43 | 43 | 'name' => 'required|max:255', |
44 | 44 | ]); |
45 | 45 | |
46 | - $team = Team::where(['id' => $team->id])->first(); |
|
46 | + $team = Team::where([ 'id' => $team->id ])->first(); |
|
47 | 47 | |
48 | 48 | $team->name = $request->name; |
49 | 49 | $team->venue_id = !empty($request->venue_id) ? $request->venue_id : null; |
50 | 50 | |
51 | 51 | $team->save(); |
52 | 52 | |
53 | - return redirect()->route('association.teams', ['association' => $team->association]); |
|
53 | + return redirect()->route('association.teams', [ 'association' => $team->association ]); |
|
54 | 54 | } |
55 | 55 | else { |
56 | 56 | return view('denied'); |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | } |
59 | 59 | |
60 | 60 | public function edit(Association $association, Team $team) { |
61 | - return view('team.edit', ['team' => $team]); |
|
61 | + return view('team.edit', [ 'team' => $team ]); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | public function deleteConfirm(Association $association, Team $team) { |
65 | 65 | if (Bouncer::can('delete', $team)) { |
66 | - return view('team.delete', ['team' => $team]); |
|
66 | + return view('team.delete', [ 'team' => $team ]); |
|
67 | 67 | } |
68 | 68 | else { |
69 | 69 | return view('denied'); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | if (Bouncer::can('delete', $team)) { |
75 | 75 | $team->delete(); |
76 | 76 | |
77 | - return redirect()->route('association.teams', ['association' => $association])->with('success', 'Team deleted successfully.'); |
|
77 | + return redirect()->route('association.teams', [ 'association' => $association ])->with('success', 'Team deleted successfully.'); |
|
78 | 78 | } |
79 | 79 | else { |
80 | 80 | return view('denied'); |
@@ -31,8 +31,7 @@ discard block |
||
31 | 31 | $team->save(); |
32 | 32 | |
33 | 33 | return redirect()->route('association.teams', ['association' => $association]); |
34 | - } |
|
35 | - else { |
|
34 | + } else { |
|
36 | 35 | return view('denied'); |
37 | 36 | } |
38 | 37 | } |
@@ -51,8 +50,7 @@ discard block |
||
51 | 50 | $team->save(); |
52 | 51 | |
53 | 52 | return redirect()->route('association.teams', ['association' => $team->association]); |
54 | - } |
|
55 | - else { |
|
53 | + } else { |
|
56 | 54 | return view('denied'); |
57 | 55 | } |
58 | 56 | } |
@@ -64,8 +62,7 @@ discard block |
||
64 | 62 | public function deleteConfirm(Association $association, Team $team) { |
65 | 63 | if (Bouncer::can('delete', $team)) { |
66 | 64 | return view('team.delete', ['team' => $team]); |
67 | - } |
|
68 | - else { |
|
65 | + } else { |
|
69 | 66 | return view('denied'); |
70 | 67 | } |
71 | 68 | } |
@@ -75,8 +72,7 @@ discard block |
||
75 | 72 | $team->delete(); |
76 | 73 | |
77 | 74 | return redirect()->route('association.teams', ['association' => $association])->with('success', 'Team deleted successfully.'); |
78 | - } |
|
79 | - else { |
|
75 | + } else { |
|
80 | 76 | return view('denied'); |
81 | 77 | } |
82 | 78 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | $venue->save(); |
31 | 31 | |
32 | - return redirect()->route('association.venues', ['association' => $association]); |
|
32 | + return redirect()->route('association.venues', [ 'association' => $association ]); |
|
33 | 33 | } |
34 | 34 | else { |
35 | 35 | return view('denied'); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | public function edit(Association $association, Venue $venue) { |
40 | 40 | if (Bouncer::can('edit', Venue::class)) { |
41 | - return view('venue.edit', ['venue' => $venue]); |
|
41 | + return view('venue.edit', [ 'venue' => $venue ]); |
|
42 | 42 | } |
43 | 43 | else { |
44 | 44 | return view('denied'); |
@@ -51,13 +51,13 @@ discard block |
||
51 | 51 | 'name' => 'required|max:255', |
52 | 52 | ]); |
53 | 53 | |
54 | - $venue = Venue::where(['id' => $venue->id])->first(); |
|
54 | + $venue = Venue::where([ 'id' => $venue->id ])->first(); |
|
55 | 55 | |
56 | 56 | $venue->name = $request->name; |
57 | 57 | |
58 | 58 | $venue->save(); |
59 | 59 | |
60 | - return redirect()->route('association.venues', ['association' => $venue->association]); |
|
60 | + return redirect()->route('association.venues', [ 'association' => $venue->association ]); |
|
61 | 61 | } |
62 | 62 | else { |
63 | 63 | return view('denied'); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | public function deleteConfirm(Venue $venue) { |
68 | 68 | if (Bouncer::can('delete', $venue)) { |
69 | - return view('venue.delete', ['venue' => $venue]); |
|
69 | + return view('venue.delete', [ 'venue' => $venue ]); |
|
70 | 70 | } |
71 | 71 | else { |
72 | 72 | return view('denied'); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | |
80 | 80 | $venue->delete(); |
81 | 81 | |
82 | - return redirect()->route('association.venues', ['association' => $association])->with('success', 'Venue deleted successfully.'); |
|
82 | + return redirect()->route('association.venues', [ 'association' => $association ])->with('success', 'Venue deleted successfully.'); |
|
83 | 83 | } |
84 | 84 | else { |
85 | 85 | return view('denied'); |
@@ -30,8 +30,7 @@ discard block |
||
30 | 30 | $venue->save(); |
31 | 31 | |
32 | 32 | return redirect()->route('association.venues', ['association' => $association]); |
33 | - } |
|
34 | - else { |
|
33 | + } else { |
|
35 | 34 | return view('denied'); |
36 | 35 | } |
37 | 36 | } |
@@ -39,8 +38,7 @@ discard block |
||
39 | 38 | public function edit(Association $association, Venue $venue) { |
40 | 39 | if (Bouncer::can('edit', Venue::class)) { |
41 | 40 | return view('venue.edit', ['venue' => $venue]); |
42 | - } |
|
43 | - else { |
|
41 | + } else { |
|
44 | 42 | return view('denied'); |
45 | 43 | } |
46 | 44 | } |
@@ -58,8 +56,7 @@ discard block |
||
58 | 56 | $venue->save(); |
59 | 57 | |
60 | 58 | return redirect()->route('association.venues', ['association' => $venue->association]); |
61 | - } |
|
62 | - else { |
|
59 | + } else { |
|
63 | 60 | return view('denied'); |
64 | 61 | } |
65 | 62 | } |
@@ -67,8 +64,7 @@ discard block |
||
67 | 64 | public function deleteConfirm(Venue $venue) { |
68 | 65 | if (Bouncer::can('delete', $venue)) { |
69 | 66 | return view('venue.delete', ['venue' => $venue]); |
70 | - } |
|
71 | - else { |
|
67 | + } else { |
|
72 | 68 | return view('denied'); |
73 | 69 | } |
74 | 70 | } |
@@ -80,8 +76,7 @@ discard block |
||
80 | 76 | $venue->delete(); |
81 | 77 | |
82 | 78 | return redirect()->route('association.venues', ['association' => $association])->with('success', 'Venue deleted successfully.'); |
83 | - } |
|
84 | - else { |
|
79 | + } else { |
|
85 | 80 | return view('denied'); |
86 | 81 | } |
87 | 82 | } |
@@ -63,8 +63,7 @@ |
||
63 | 63 | if (!empty($division)) { |
64 | 64 | $schedule->name = $division->name; |
65 | 65 | $schedule->sequence = $division->sequence; |
66 | - } |
|
67 | - else { |
|
66 | + } else { |
|
68 | 67 | $schedule->name = $schedule->start_date; |
69 | 68 | $schedule->sequence = null; |
70 | 69 | } |
@@ -14,13 +14,13 @@ discard block |
||
14 | 14 | { |
15 | 15 | |
16 | 16 | public function view(Schedule $schedule) { |
17 | - return view('schedule.view', ['schedule' => $schedule]); |
|
17 | + return view('schedule.view', [ 'schedule' => $schedule ]); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function create(Series $series) { |
21 | 21 | $association_id = $series->association_id; |
22 | - $available_series = \App\Series::where(['association_id' => $series->association_id])->get()->all(); |
|
23 | - $available_divisions = \App\Division::orderBy('sequence' , 'ASC')->where(['association_id' => $series->association_id])->get()->all(); |
|
22 | + $available_series = \App\Series::where([ 'association_id' => $series->association_id ])->get()->all(); |
|
23 | + $available_divisions = \App\Division::orderBy('sequence', 'ASC')->where([ 'association_id' => $series->association_id ])->get()->all(); |
|
24 | 24 | |
25 | 25 | return view('schedule.create', [ |
26 | 26 | 'association_id' => $association_id, |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $schedule->start_date = $start_date; |
65 | 65 | $schedule->end_date = $end_date; |
66 | 66 | |
67 | - $division = Division::where(['id' => $division_id])->first(); |
|
67 | + $division = Division::where([ 'id' => $division_id ])->first(); |
|
68 | 68 | |
69 | 69 | if (!empty($division)) { |
70 | 70 | $schedule->name = $division->name; |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | $start_datetime->add(new \DateInterval('P1D')); |
130 | 130 | } |
131 | 131 | */ |
132 | - return redirect()->route('series.schedules', ['series' => $series]); |
|
132 | + return redirect()->route('series.schedules', [ 'series' => $series ]); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | public function update(Request $request) { |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | */ |
160 | 160 | $request->session()->flash('message', __('Successfully updated schedule')); |
161 | 161 | |
162 | - return redirect()->route('schedule.view', ['schedule' => $schedule]); |
|
162 | + return redirect()->route('schedule.view', [ 'schedule' => $schedule ]); |
|
163 | 163 | |
164 | 164 | } |
165 | 165 |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $match->save(); |
83 | 83 | } |
84 | 84 | |
85 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
85 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | $request->session()->flash('message', __('Successfully updated round')); |
141 | 141 | |
142 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
142 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | public function deleteConfirm(Schedule $schedule, Round $round) { |
@@ -157,6 +157,6 @@ discard block |
||
157 | 157 | $round->delete(); |
158 | 158 | } |
159 | 159 | |
160 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
160 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
161 | 161 | } |
162 | 162 | } |
@@ -17,8 +17,7 @@ |
||
17 | 17 | { |
18 | 18 | if (\Bouncer::can('view-admin-pages')) { |
19 | 19 | return $next($request); |
20 | - } |
|
21 | - else { |
|
20 | + } else { |
|
22 | 21 | return redirect('/'); |
23 | 22 | } |
24 | 23 | } |
@@ -46,7 +46,7 @@ |
||
46 | 46 | public function activeRounds() { |
47 | 47 | return $this->rounds() |
48 | 48 | ->where('rounds.start_date', '>=', date('Y-m-d', strtotime('today -7 days'))) |
49 | - ->where('rounds.start_date', '<=', date('Y-m-d', strtotime('now +7 days')) ); |
|
49 | + ->where('rounds.start_date', '<=', date('Y-m-d', strtotime('now +7 days'))); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | public function users() { |
@@ -36,8 +36,7 @@ discard block |
||
36 | 36 | 'venues' => Venue::orderBy('name', 'ASC')->where('association_id', $association->id)->get(), |
37 | 37 | 'current_user' => \Auth::user() |
38 | 38 | ]); |
39 | - } |
|
40 | - else { |
|
39 | + } else { |
|
41 | 40 | return view('denied'); |
42 | 41 | } |
43 | 42 | } |
@@ -45,8 +44,7 @@ discard block |
||
45 | 44 | public function home() { |
46 | 45 | if (!empty($this->association)) { |
47 | 46 | return view('association.home', ['association' => $this->association]); |
48 | - } |
|
49 | - else { |
|
47 | + } else { |
|
50 | 48 | abort(404); |
51 | 49 | } |
52 | 50 | } |
@@ -80,8 +78,7 @@ discard block |
||
80 | 78 | if (isset($request->assoc_admin)) { |
81 | 79 | Bouncer::assign('assocadmin')->to($user); |
82 | 80 | Bouncer::allow($user)->toManage($association); |
83 | - } |
|
84 | - else { |
|
81 | + } else { |
|
85 | 82 | Bouncer::disallow($user)->toManage($association); |
86 | 83 | Bouncer::retract('assocadmin')->from($user); |
87 | 84 | } |
@@ -118,15 +115,13 @@ discard block |
||
118 | 115 | $request->division_id = $divisions[0]->id; |
119 | 116 | |
120 | 117 | return $this->submitScoreStep2($request); |
121 | - } |
|
122 | - else { |
|
118 | + } else { |
|
123 | 119 | return view('forms.results.choose-division', [ |
124 | 120 | 'association' => $this->association, |
125 | 121 | 'divisions' => $divisions, |
126 | 122 | ]); |
127 | 123 | } |
128 | - } |
|
129 | - else { |
|
124 | + } else { |
|
130 | 125 | abort(404); |
131 | 126 | } |
132 | 127 | } |
@@ -156,8 +151,7 @@ discard block |
||
156 | 151 | 'association' => $this->association, |
157 | 152 | 'rounds' => $rounds, |
158 | 153 | ]); |
159 | - } |
|
160 | - else { |
|
154 | + } else { |
|
161 | 155 | abort(404); |
162 | 156 | } |
163 | 157 | } |
@@ -170,8 +164,7 @@ discard block |
||
170 | 164 | 'association' => $this->association, |
171 | 165 | 'match' => $match, |
172 | 166 | ]); |
173 | - } |
|
174 | - else { |
|
167 | + } else { |
|
175 | 168 | abort(404); |
176 | 169 | } |
177 | 170 | } |
@@ -201,20 +194,17 @@ discard block |
||
201 | 194 | return view('forms.results.thanks', [ |
202 | 195 | 'association' => $this->association, |
203 | 196 | ]); |
204 | - } |
|
205 | - else { |
|
197 | + } else { |
|
206 | 198 | return view('forms.results.choose-winner', [ |
207 | 199 | 'association' => $this->association, |
208 | 200 | 'match' => Match::find($submission->match_id), |
209 | 201 | 'submission' => $submission, |
210 | 202 | ]); |
211 | 203 | } |
212 | - } |
|
213 | - else { |
|
204 | + } else { |
|
214 | 205 | abort(404); |
215 | 206 | } |
216 | - } |
|
217 | - else { |
|
207 | + } else { |
|
218 | 208 | abort(404); |
219 | 209 | } |
220 | 210 | } |
@@ -233,12 +223,10 @@ discard block |
||
233 | 223 | return view('forms.results.thanks', [ |
234 | 224 | 'association' => $this->association, |
235 | 225 | ]); |
236 | - } |
|
237 | - else { |
|
226 | + } else { |
|
238 | 227 | abort(404); |
239 | 228 | } |
240 | - } |
|
241 | - else { |
|
229 | + } else { |
|
242 | 230 | abort(404); |
243 | 231 | } |
244 | 232 | } |
@@ -274,8 +262,7 @@ discard block |
||
274 | 262 | |
275 | 263 | // TODO: Do not necessarily "onboard" for certain roles? |
276 | 264 | return redirect()->route('onboard.association', ['association' => $association]); |
277 | - } |
|
278 | - else { |
|
265 | + } else { |
|
279 | 266 | return view('denied'); |
280 | 267 | } |
281 | 268 | } |
@@ -316,8 +303,7 @@ discard block |
||
316 | 303 | public function create() { |
317 | 304 | if (Bouncer::can('create', Association::class)) { |
318 | 305 | return view('association.create', ['current_user' => \Auth::user()]); |
319 | - } |
|
320 | - else { |
|
306 | + } else { |
|
321 | 307 | return view('denied'); |
322 | 308 | } |
323 | 309 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | } |
27 | 27 | |
28 | 28 | public function view(Association $association) { |
29 | - return view('association.view', ['association' => $association]); |
|
29 | + return view('association.view', [ 'association' => $association ]); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | public function edit(Association $association) { |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | public function home() { |
48 | 48 | if (!empty($this->association)) { |
49 | - return view('association.home', ['association' => $this->association]); |
|
49 | + return view('association.home', [ 'association' => $this->association ]); |
|
50 | 50 | } |
51 | 51 | else { |
52 | 52 | abort(404); |
@@ -54,35 +54,35 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | public function divisions(Association $association) { |
57 | - return view('association.divisions', ['association' => $association]); |
|
57 | + return view('association.divisions', [ 'association' => $association ]); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | public function teams(Association $association) { |
61 | - return view('association.teams', ['association' => $association]); |
|
61 | + return view('association.teams', [ 'association' => $association ]); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | public function venues(Association $association) { |
65 | - return view('association.venues', ['association' => $association]); |
|
65 | + return view('association.venues', [ 'association' => $association ]); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | public function series(Association $association) { |
69 | - return view('association.series', ['association' => $association]); |
|
69 | + return view('association.series', [ 'association' => $association ]); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | public function users(Association $association) { |
73 | - return view('association.users', ['association' => $association]); |
|
73 | + return view('association.users', [ 'association' => $association ]); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | public function viewUser(Association $association, User $user) { |
77 | - return view('association.user.view', ['association' => $association, 'user' => $user]); |
|
77 | + return view('association.user.view', [ 'association' => $association, 'user' => $user ]); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | public function editUser(Association $association, User $user) { |
81 | - return view('association.user.edit', ['association' => $association, 'user' => $user]); |
|
81 | + return view('association.user.edit', [ 'association' => $association, 'user' => $user ]); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | public function userToken(Association $association, User $user) { |
85 | - return view('association.user.token', ['association' => $association, 'user' => $user]); |
|
85 | + return view('association.user.token', [ 'association' => $association, 'user' => $user ]); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | public function userTokenRefresh(Association $association, User $user) { |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | 'api_token' => hash('sha256', $token), |
93 | 93 | ])->save(); |
94 | 94 | |
95 | - return view('association.user.token-refresh', ['association' => $association, 'user' => $user, 'token' => $token]); |
|
95 | + return view('association.user.token-refresh', [ 'association' => $association, 'user' => $user, 'token' => $token ]); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | public function updateUser(Request $request, Association $association, User $user) { |
@@ -112,12 +112,12 @@ discard block |
||
112 | 112 | return redirect($url)->with('success', 'Data saved successfully!'); |
113 | 113 | } |
114 | 114 | |
115 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
115 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
116 | 116 | |
117 | 117 | } |
118 | 118 | |
119 | 119 | public function addUser(Association $association) { |
120 | - return view('association.user.add', ['association' => $association]); |
|
120 | + return view('association.user.add', [ 'association' => $association ]); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | public function submitScoreBegin(Request $request) { |
@@ -129,13 +129,13 @@ discard block |
||
129 | 129 | |
130 | 130 | // get rounds with start_date < today, but greater than today - 1 week |
131 | 131 | $rounds = Round::whereIn('schedule_id', $schedules->pluck('id')) |
132 | - ->where('start_date','>=', date('Y-m-d', strtotime('-1 week'))) |
|
132 | + ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week'))) |
|
133 | 133 | ->where('start_date', '<=', date('Y-m-d', strtotime("today")))->get(); |
134 | 134 | |
135 | 135 | $divisions = Division::whereIn('id', $rounds->pluck('division_id'))->get(); |
136 | 136 | |
137 | 137 | if (count($divisions) === 1) { |
138 | - $request->division_id = $divisions[0]->id; |
|
138 | + $request->division_id = $divisions[ 0 ]->id; |
|
139 | 139 | |
140 | 140 | return $this->submitScoreStep2($request); |
141 | 141 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $rounds = Round::whereIn('schedule_id', $schedules->pluck('id')) |
166 | 166 | ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week'))) |
167 | 167 | ->where('start_date', '<=', date('Y-m-d', strtotime("today"))) |
168 | - ->where(function ($query) { |
|
168 | + ->where(function($query) { |
|
169 | 169 | $query->where('scores_closed', 0); |
170 | 170 | $query->orWhereNull('scores_closed'); |
171 | 171 | }) |
@@ -264,11 +264,11 @@ discard block |
||
264 | 264 | } |
265 | 265 | |
266 | 266 | public function standings() { |
267 | - return view('association.standings', ['association' => $this->association]); |
|
267 | + return view('association.standings', [ 'association' => $this->association ]); |
|
268 | 268 | } |
269 | 269 | |
270 | 270 | public function schedule() { |
271 | - return view('association.schedule', ['association' => $this->association]); |
|
271 | + return view('association.schedule', [ 'association' => $this->association ]); |
|
272 | 272 | } |
273 | 273 | |
274 | 274 | public function css() { |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | $association->save(); |
294 | 294 | |
295 | 295 | // TODO: Do not necessarily "onboard" for certain roles? |
296 | - return redirect()->route('onboard.association', ['association' => $association]); |
|
296 | + return redirect()->route('onboard.association', [ 'association' => $association ]); |
|
297 | 297 | } |
298 | 298 | else { |
299 | 299 | return view('denied'); |
@@ -331,13 +331,13 @@ discard block |
||
331 | 331 | return redirect($url)->with('success', 'Data saved successfully!'); |
332 | 332 | } |
333 | 333 | |
334 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
334 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
335 | 335 | |
336 | 336 | } |
337 | 337 | |
338 | 338 | public function create() { |
339 | 339 | if (Bouncer::can('create', Association::class)) { |
340 | - return view('association.create', ['current_user' => \Auth::user()]); |
|
340 | + return view('association.create', [ 'current_user' => \Auth::user() ]); |
|
341 | 341 | } |
342 | 342 | else { |
343 | 343 | return view('denied'); |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | } |
346 | 346 | |
347 | 347 | public function deleteConfirm(Association $association) { |
348 | - return view('association.delete', ['association' => $association]); |
|
348 | + return view('association.delete', [ 'association' => $association ]); |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | public function delete(Association $association) { |
@@ -355,21 +355,21 @@ discard block |
||
355 | 355 | } |
356 | 356 | |
357 | 357 | public function undeleteConfirm(Association $association) { |
358 | - return view('association.undelete', ['association' => $association]); |
|
358 | + return view('association.undelete', [ 'association' => $association ]); |
|
359 | 359 | } |
360 | 360 | |
361 | 361 | public function undelete(Association $association) { |
362 | 362 | $association->restore(); |
363 | 363 | |
364 | - return redirect()->route('user', ['user' => \Auth::user()])->with('success', 'Association restored successfully.'); |
|
364 | + return redirect()->route('user', [ 'user' => \Auth::user() ])->with('success', 'Association restored successfully.'); |
|
365 | 365 | } |
366 | 366 | |
367 | 367 | public function about() { |
368 | - return view('association.about' , ['association' => $this->association]); |
|
368 | + return view('association.about', [ 'association' => $this->association ]); |
|
369 | 369 | } |
370 | 370 | |
371 | 371 | public function contact() { |
372 | - return view('forms.contact', ['association' => $this->association]); |
|
372 | + return view('forms.contact', [ 'association' => $this->association ]); |
|
373 | 373 | } |
374 | 374 | |
375 | 375 | public function contactSubmit(Request $request) { |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | */ |
401 | 401 | public function contactSubmissions(Association $association) |
402 | 402 | { |
403 | - return view('association.contact_submissions', ['association' => $association]); |
|
403 | + return view('association.contact_submissions', [ 'association' => $association ]); |
|
404 | 404 | } |
405 | 405 | |
406 | 406 | } |
@@ -21,6 +21,6 @@ |
||
21 | 21 | 'api_token' => hash('sha256', $token), |
22 | 22 | ])->save(); |
23 | 23 | |
24 | - return ['token' => $token]; |
|
24 | + return [ 'token' => $token ]; |
|
25 | 25 | } |
26 | 26 | } |