torsten/tippspiel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auth changed to firstname lastname schema

Browse source
This commit is contained in:
Torsten 2017-08-01 14:33:22 +02:00
parent 64e4959884
commit 3f17c76403
11 changed files with 45 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pfosten/resources/views/layouts/nav.blade.php
View file

@ -3,8 +3,9 @@
<div class="container text-center">
<a class="lead" href="/">Start</a> &nbsp; &nbsp; &nbsp;
@if (Auth::check())
<a class="lead" href="/">Start</a> &nbsp; &nbsp; &nbsp;
@if (Auth::user()->admin)
<a class="lead" href="/seasons">Saison</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/rounds">Runden</a> &nbsp; &nbsp; &nbsp;
@ -13,7 +14,7 @@
<a class="lead" href="/tipps">Tipps</a> &nbsp; &nbsp; &nbsp;
<a class="lead" href="/users/ranking/-1" >Rangliste</a> &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;&nbsp; &nbsp; &nbsp;
<label class="lead text ml-auto" >Spieler: {{ Auth::user()->fullname }}</label><a class="lead" href="/logout">(abmelden)</a>
<label class="lead text ml-auto" >Spieler: {{ Auth::user()->name }}</label><a class="lead" href="/logout">(abmelden)</a>
@endif
</div>

8
pfosten/resources/views/registration/create.blade.php
View file

@ -8,12 +8,12 @@
<form method="POST" action="/register">
{{ csrf_field() }}
<div class="form-group">
<label for="name">Kurzname(Login):</label>
<input type="text" class="form-control" id="name" name="name" required>
<label for="firstname">Vorname:</label>
<input type="text" class="form-control" id="firstname" name="firstname" required>
</div>
<div class="form-group">
<label for="fullname">Spielername:</label>
<input type="text" class="form-control" id="fullname" name="fullname" required>
<label for="lastname">Nachname:</label>
<input type="text" class="form-control" id="lastname" name="lastname" required>
</div>
<div class="form-group">
<label for="email">Email:</label>

10
pfosten/resources/views/sessions/create.blade.php
View file

@ -4,14 +4,16 @@
<div class="col-md-8">
<h1>Anmeldung</h1>
<form method="POST" action="/login">
{{ csrf_field() }}
<div class="form-group">
<label for="name">Login:</label>
<input type="text" class="form-control" id="name" name="name" required>
<label for="name">Vorname:</label>
<input type="text" class="form-control" id="firstname" name="firstname" required>
</div>
<div class="form-group">
<label for="name">Nachname:</label>
<input type="text" class="form-control" id="lastname" name="lastname" required>
</div>
<div class="form-group">
<label for="password">Passwort:</label>
<input type="password" class="form-control" id="password" name="password" required>

11
pfosten/resources/views/users/edit.blade.php
View file

@ -18,10 +18,15 @@
<input type="text" class="form-control" id="name" name="name" value="{{ $user->name }}" required>
</div>
<div>
<label style="float:left; width:150px" for="fullname">Spielername:</label>
<input type="text" class="form-control" id="fullname" name="fullname" value="{{ $user->fullname }}" required>
<label style="float:left; width:150px" for="firstname">Vorname:</label>
<input type="text" class="form-control" id="firstname" name="firstname" value="{{ $user->firstname }}" required>
</div>
<p>&nbsp;</p>
<div>
<label style="float:left; width:150px" for="lastname">Nachname:</label>
<input type="text" class="form-control" id="lastname" name="lastname" value="{{ $user->lastname }}" required>
</div>
<p>&nbsp;</p>
<div>
<label style="float:left; width:150px" for="name">Zahlung für Saison:</label>

2
pfosten/resources/views/users/index.blade.php
View file

@ -17,7 +17,7 @@
</tr>
@foreach($users as $user)
<tr>
<td class="table-bordered">&nbsp;<a class="text list-unstyled" href="/users/edit/{{$user->id}}">{{ $user->fullname }}&nbsp;</a></td>
<td class="table-bordered">&nbsp;<a class="text list-unstyled" href="/users/edit/{{$user->id}}">{{ $user->name }}&nbsp;</a></td>
<td class="table-bordered">{{ App\User::is_season_paid($user->id) }}</td>
<td class="table-bordered">&nbsp;{{ ($user->admin ? "Administrator":"Spieler") }}&nbsp;</td>
</tr>

2
pfosten/resources/views/users/ranking.blade.php
View file

@ -135,7 +135,7 @@
<tr>
<td class="table-bordered">&nbsp;<span class="text list-unstyled" href="#" >&nbsp;{{ $user->rank }}&nbsp;</span></td>
<td class="table-bordered"><div style="margin: 0 auto; width: 32px;"><img src="/img/crown.png" style="{{ ($user->dayWinScore == $highestDayScore ? 'float:left;width:32px;height:32px' : 'display: none;') }}"></div></td>
<td class="table-bordered">&nbsp;<a class="text list-unstyled" href="#" style="vertical-align: middle;">{{ $user->fullname }} &nbsp;</a></td>
<td class="table-bordered">&nbsp;<a class="text list-unstyled" href="#" style="vertical-align: middle;">{{ $user->name }} &nbsp;</a></td>
<td class="table-bordered" align="center">&nbsp;{{ $user->totalScore }}&nbsp;</td>
<td class="table-bordered" align="center">&nbsp;{{ $user->dayScore }}&nbsp;</td>
<td class="table-bordered" align="center" style="{{App\Tipp::getCol($user->id,$games[0]->id)}}">&nbsp;{{ $tippDisplay[$user->id][$games[0]->id][0] }}&nbsp;</td>