Skip to content

Commit 13d0219

Browse files
LittleKing205LittleKing205
committed
Some Bug fixing
1 parent 0f5f1b8 commit 13d0219

File tree

5 files changed

+16
-19
lines changed

5 files changed

+16
-19
lines changed

‎app/Http/Controllers/TippController.php

+3-5
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
class TippController extends Controller
1717
{
1818

19-
public function redictToDay(Request $request, OpenLiga $openLiga, $league) {
20-
return redirect(route('tipps', ['league' => $league, 'day' => $openLiga->getCurrentDay($league)]));
21-
}
22-
23-
public function show(Request $request, $league, $day) {
19+
public function show(Request $request, OpenLiga $openLiga, $league, $day = null) {
2420
$leagueName = $league.'. Bundesliga';
21+
if (is_null($day))
22+
$day = $openLiga->getCurrentDay($league);
2523
if ($league < 1 || $league > 2 || $day < 1 || $day > 34)
2624
abort(404);
2725

‎resources/views/components/layout/sidebar.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@foreach([1, 2] as $league)
2222
<div class="sb-sidenav-menu-heading">{{ $league }}. Bundesliga</div>
23-
<a class="nav-link" href="{{ route('tippsWithoutDay', ['league' => $league]) }}">
23+
<a class="nav-link" href="{{ route('tipps', ['league' => $league]) }}">
2424
<div class="sb-nav-link-icon"><i class="fas fa-pencil-alt"></i></div>
2525
Tippen
2626
</a>

‎resources/views/profile.blade.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@
2222
<form action="{{ route('profile.update') }}" method="POST">
2323
@csrf
2424
@method('patch')
25-
<div class="form-group row">
25+
<div class="form-group mb-3 row">
2626
<label for="inputUsername" class="col-sm-2 col-form-label">Benutzername</label>
2727
<div class="col-sm-10">
2828
<input type="text" class="form-control" id="inputUsername" placeholder="Benutzername" readonly value="{{ $user->username }}">
2929
</div>
3030
</div>
31-
<div class="form-group row">
31+
<div class="form-group mb-3 row">
3232
<label for="inputDisplayName" class="col-sm-2 col-form-label">Name</label>
3333
<div class="col-sm-10">
3434
<input name="name" type="text" class="form-control" id="inputDisplayName" placeholder="Name" value="{{ $user->name }}">
3535
</div>
3636
</div>
37-
<div class="form-group row">
37+
<div class="form-group mb-3 row">
3838
<label for="inputEmail" class="col-sm-2 col-form-label">Email</label>
3939
<div class="col-sm-10">
4040
<input name="email" type="email" class="form-control" id="inputEmail" placeholder="Email" value="{{ $user->email }}">
4141
</div>
4242
</div>
43-
<div class="form-group row">
43+
<div class="form-group mb-3 row">
4444
<label for="inputPassword" class="col-sm-2 col-form-label">Passwort</label>
4545
<div class="col-sm-10">
4646
<input name="password" type="password" class="form-control" id="inputPassword" placeholder="Passwort" value="">
4747
</div>
4848
</div>
49-
<div class="form-group row">
49+
<div class="form-group mb-3 row">
5050
<label for="inputPasswordConfirm" class="col-sm-2 col-form-label">Passwort Wiederholen</label>
5151
<div class="col-sm-10">
5252
<input name="password_confirmation" type="password" class="form-control" id="inputPasswordConfirm" placeholder="Passwort" value="">
@@ -124,7 +124,7 @@
124124
<form action="{{ route('profile.updateColors') }}" method="POST">
125125
@csrf
126126
@method('patch')
127-
<div class="form-group row">
127+
<div class="form-group mb-3 row">
128128
<label for="inputDefaultColor" class="col-sm-2 col-form-label">Standart Farbe</label>
129129
<div class="col-sm-10">
130130
<select name="default" class="form-select" id="inputDefaultColor" aria-label="select">
@@ -135,7 +135,7 @@
135135
</div>
136136
</div>
137137

138-
<div class="form-group row">
138+
<div class="form-group mb-3 row">
139139
<label for="inputDefaultLockedColor" class="col-sm-2 col-form-label">Gesperrter Button</label>
140140
<div class="col-sm-10">
141141
<select name="default_locked" class="form-select" id="inputDefaultLockedColor" aria-label="select">
@@ -146,7 +146,7 @@
146146
</div>
147147
</div>
148148

149-
<div class="form-group row">
149+
<div class="form-group mb-3 row">
150150
<label for="inputTippedColor" class="col-sm-2 col-form-label">Getippter Button</label>
151151
<div class="col-sm-10">
152152
<select name="user_tipp" class="form-select" id="inputTippedColor" aria-label="select">
@@ -157,7 +157,7 @@
157157
</div>
158158
</div>
159159

160-
<div class="form-group row">
160+
<div class="form-group mb-3 row">
161161
<label for="inputGameResultColor" class="col-sm-2 col-form-label">Spielergebnis</label>
162162
<div class="col-sm-10">
163163
<select name="game_result" class="form-select" id="inputGameResultColor" aria-label="select">
@@ -168,7 +168,7 @@
168168
</div>
169169
</div>
170170

171-
<div class="form-group row">
171+
<div class="form-group mb-3 row">
172172
<label for="inputUserWrongTippColor" class="col-sm-2 col-form-label">Falscher Tipp</label>
173173
<div class="col-sm-10">
174174
<select name="user_wrong_tipp" class="form-select" id="inputUserWrongTippColor" aria-label="select">
@@ -179,7 +179,7 @@
179179
</div>
180180
</div>
181181

182-
<div class="form-group row">
182+
<div class="form-group mb-3 row">
183183
<label for="inputNotTippedColor" class="col-sm-2 col-form-label">Nicht getipptes Ergebnis</label>
184184
<div class="col-sm-10">
185185
<select name="not_tipped" class="form-select" id="inputNotTippedColor" aria-label="select">

‎resources/views/tipps.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
@section('breadcump')
66
<li class="breadcrumb-item active"><a href="{{ route('dashboard') }}">Dashboard</a></li>
7-
<li class="breadcrumb-item active"><a href="{{ route('tippsWithoutDay', ["league" => $league]) }}">{{ $leagueName }}</a></li>
7+
<li class="breadcrumb-item active"><a href="{{ route('tipps', ["league" => $league]) }}">{{ $leagueName }}</a></li>
88
<li class="breadcrumb-item active">{{ $day }}. Spieltag</li>
99
@endsection
1010

‎routes/web.php

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
Route::patch('/profil/updateButtonColors', [ProfileController::class, 'updateColors'])->name('profile.updateColors');
4242

4343
// Tipps
44-
Route::get('/tipp/bl{league}', [TippController::class, 'redictToDay'])->name('tippsWithoutDay');
4544
Route::get('/tipp/bl{league}/{day?}', [TippController::class, 'show'])->name('tipps');
4645
Route::post('/tipp/save', [TippController::class, 'store'])->name('tippStore');
4746

0 commit comments

Comments
 (0)