diff --git a/pfosten/app/Http/Controllers/RegistrationController.php b/pfosten/app/Http/Controllers/RegistrationController.php index 7204b0e3..bcb6841a 100644 --- a/pfosten/app/Http/Controllers/RegistrationController.php +++ b/pfosten/app/Http/Controllers/RegistrationController.php @@ -19,21 +19,16 @@ class RegistrationController extends Controller // Validate form $this->validate(request(), [ - 'name' => 'required', - 'fullname' => 'required', + 'firstname' => 'required', + 'lastname' => 'required', 'email' => 'required|email', 'password' => 'required|confirmed' - ]); + $name =request('firstname')." ".request('lastname'); - if (User::where('name', '=', request('name'))->first() != null) { - \Session::flash('message', 'Login-Name existiert bereits'); - return redirect("/register"); - } - - if (User::where('fullname', '=', request('fullname'))->first() != null) { - \Session::flash('message', 'Spieler-Name existiert bereits'); + if (User::where('name', '=', $name)->first() != null) { + \Session::flash('message', 'Name existiert bereits'); return redirect("/register"); } @@ -45,8 +40,9 @@ class RegistrationController extends Controller // Create and save the user //$user = User::create(request(['name','email','password'])); $user = User::create([ - 'name' => request('name'), - 'fullname' => request('fullname'), + 'name' => $name, + 'firstname' => request('firstname'), + 'lastname' => request('lastname'), 'email'=> request('email'), 'password' => bcrypt(request('password'))]); // Sign them in diff --git a/pfosten/app/Http/Controllers/SessionsController.php b/pfosten/app/Http/Controllers/SessionsController.php index 81d87bbe..54aca080 100644 --- a/pfosten/app/Http/Controllers/SessionsController.php +++ b/pfosten/app/Http/Controllers/SessionsController.php @@ -18,7 +18,10 @@ class SessionsController extends Controller public function store() { // Attempt to authenticate the user - if (!auth()->attempt(request(['name','password']))) { + $name=request('firstname')." ".request('lastname'); + $password=request('password'); + + if (!auth()->attempt(['name'=>$name, 'password'=>$password])) { return back()->withErrors(['message'=>'Bitte Logindaten prüfen und nochmal versuchen.']); } diff --git a/pfosten/app/Http/Controllers/UsersController.php b/pfosten/app/Http/Controllers/UsersController.php index fa07017c..5844a9ba 100755 --- a/pfosten/app/Http/Controllers/UsersController.php +++ b/pfosten/app/Http/Controllers/UsersController.php @@ -77,15 +77,17 @@ class UsersController extends Controller // Validate form $this->validate(request(), [ 'id' => 'required', - 'name' => 'required', - 'fullname' => 'required', + 'firstname' => 'required', + 'lastname' => 'required', 'email'=> 'required' ]); + $user=User::where('id', request('id'))->first(); - $user->name=request('name'); - $user->fullname=request('fullname'); + $user->name=request('firstname')." ".request('lastname'); + $user->firstname=request('firstname'); + $user->lastname=request('lastname'); $user->email=request('email'); if (request()->has('admin')) { diff --git a/pfosten/app/User.php b/pfosten/app/User.php index dbad0c44..b331295b 100644 --- a/pfosten/app/User.php +++ b/pfosten/app/User.php @@ -20,7 +20,7 @@ class User extends Authenticatable * @var array */ protected $fillable = [ - 'name', 'fullname', 'email', 'password', + 'name', 'firstname', 'lastname', 'email', 'password', ]; /** diff --git a/pfosten/database/migrations/2014_10_12_000000_create_users_table.php b/pfosten/database/migrations/2014_10_12_000000_create_users_table.php index dc2a60e6..4dec58c4 100644 --- a/pfosten/database/migrations/2014_10_12_000000_create_users_table.php +++ b/pfosten/database/migrations/2014_10_12_000000_create_users_table.php @@ -15,8 +15,9 @@ class CreateUsersTable extends Migration { Schema::create('users', function (Blueprint $table) { $table->increments('id'); - $table->string('name',32); - $table->string('fullname', 100); + $table->string('name',201); + $table->string('firstname', 100); + $table->string('lastname', 100); $table->string('email',150)->unique(); $table->string('password',100); $table->timestamp('deleted')->nullable(); diff --git a/pfosten/resources/views/layouts/nav.blade.php b/pfosten/resources/views/layouts/nav.blade.php index e781d835..0ed5f457 100644 --- a/pfosten/resources/views/layouts/nav.blade.php +++ b/pfosten/resources/views/layouts/nav.blade.php @@ -3,8 +3,9 @@
- Start       + @if (Auth::check()) + Start       @if (Auth::user()->admin) Saison       Runden       @@ -13,7 +14,7 @@ Tipps       Rangliste                 - (abmelden) + (abmelden) @endif
diff --git a/pfosten/resources/views/registration/create.blade.php b/pfosten/resources/views/registration/create.blade.php index 11fafcc1..d8126009 100644 --- a/pfosten/resources/views/registration/create.blade.php +++ b/pfosten/resources/views/registration/create.blade.php @@ -8,12 +8,12 @@
{{ csrf_field() }}
- - + +
- - + +
diff --git a/pfosten/resources/views/sessions/create.blade.php b/pfosten/resources/views/sessions/create.blade.php index 58e42c50..7afabf49 100644 --- a/pfosten/resources/views/sessions/create.blade.php +++ b/pfosten/resources/views/sessions/create.blade.php @@ -4,14 +4,16 @@

Anmeldung

- {{ csrf_field() }}
- - + + +
+
+ +
-
diff --git a/pfosten/resources/views/users/edit.blade.php b/pfosten/resources/views/users/edit.blade.php index 7a2eb97e..6c4e49ef 100644 --- a/pfosten/resources/views/users/edit.blade.php +++ b/pfosten/resources/views/users/edit.blade.php @@ -18,10 +18,15 @@
- - + +
-

 

+
+ + +
+ +

 

diff --git a/pfosten/resources/views/users/index.blade.php b/pfosten/resources/views/users/index.blade.php index a96e3e92..50184094 100644 --- a/pfosten/resources/views/users/index.blade.php +++ b/pfosten/resources/views/users/index.blade.php @@ -17,7 +17,7 @@ @foreach($users as $user) -  {{ $user->fullname }}  +  {{ $user->name }}  {{ App\User::is_season_paid($user->id) }}  {{ ($user->admin ? "Administrator":"Spieler") }}  diff --git a/pfosten/resources/views/users/ranking.blade.php b/pfosten/resources/views/users/ranking.blade.php index 20205af1..8dd326bd 100755 --- a/pfosten/resources/views/users/ranking.blade.php +++ b/pfosten/resources/views/users/ranking.blade.php @@ -135,7 +135,7 @@   {{ $user->rank }} 
-  {{ $user->fullname }}   +  {{ $user->name }}    {{ $user->totalScore }}   {{ $user->dayScore }}   {{ $tippDisplay[$user->id][$games[0]->id][0] }}