From 07471473ad4e6576778f532994394e8967442fa1 Mon Sep 17 00:00:00 2001
From: czup <micrej@st.amu.edu.pl>
Date: Mon, 9 Sep 2019 03:19:59 +0200
Subject: [PATCH] Rejestracja bez logowania i zformatowanego formularza

---
 .../Controllers/RegistrationController.php    | 22 +++++++++++++--
 app/User.php                                  |  3 ++-
 .../2014_10_12_000000_create_users_table.php  | 18 ++++++++++---
 resources/views/register.blade.php            | 27 ++++++++++++++-----
 4 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/RegistrationController.php b/app/Http/Controllers/RegistrationController.php
index a94e6b3..5996ee8 100644
--- a/app/Http/Controllers/RegistrationController.php
+++ b/app/Http/Controllers/RegistrationController.php
@@ -65,11 +65,29 @@ class RegistrationController extends Controller
     {
         $this->validate(request(), [
             'name' => 'required',
+            'surname' => 'required',
             'email' => 'required|email',
-            'password' => 'required'
+            'password' => 'required',
+            'login' => 'required',
+            'PESEL' => 'required',
+            'phoneNumber' => 'required'
+
         ]);
 
-        $user = User::create(request(['name', 'email', 'password', 'testowa']));
+
+        $request = request();
+        $user = User::create([
+            'login' => $request-> login,
+            'password' => $request-> password,
+            'email' => $request-> email,
+            'name' => $request-> name,
+            'surname' => $request-> surname,
+            'PESEL' => $request-> PESEL,
+            'phoneNumber' => $request-> phoneNumber,
+            'functionID' => 1,
+            'degreeID' => 1,
+            'number' => 'ABC123'
+        ]);
 
         auth()->login($user);
 
diff --git a/app/User.php b/app/User.php
index 9d1fd77..0c8ce08 100644
--- a/app/User.php
+++ b/app/User.php
@@ -11,13 +11,14 @@ class User extends Authenticatable
 {
     use Notifiable;
 
+    protected $primaryKey = 'id';
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password', 'testowa'
+        'login', 'name', 'surname', 'password', 'PESEL', 'phoneNumber', 'email', 'fireStationID', 'functionID', 'degreeID', 'number', 'statusID', 'deleted', 'creatorID', 'changingID',
     ];
 
     /**
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 16a6108..3d895e1 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -15,10 +15,22 @@ class CreateUsersTable extends Migration
     {
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('name');
-            $table->string('email')->unique();
+            $table->string('login', 45);
+            $table->string('password', 100);
+            $table->string('name', 45);
+            $table->string('surname', 45);
+            $table->string('PESEL',11);
+            $table->string('phoneNumber', 9);
+            $table->string('email', 50)->unique();
+            $table->integer('fireStationID')->nullable();
+            $table->integer('functionID');
+            $table->integer('degreeID');
+            $table->string('number', 45)->nullable()->default(null);
+            $table->integer('statusID')->default(0);
+            $table->integer('deleted')->default(0);
+            $table->integer('creatorID')->nullable()->default(null);
+            $table->integer('changingID')->nullable()->default(null);
             $table->timestamp('email_verified_at')->nullable();
-            $table->string('password');
             $table->rememberToken();
             $table->timestamps();
         });
diff --git a/resources/views/register.blade.php b/resources/views/register.blade.php
index 6db4f11..0353978 100644
--- a/resources/views/register.blade.php
+++ b/resources/views/register.blade.php
@@ -63,10 +63,30 @@
     <form method="POST" action="/register">
         {{ csrf_field() }}
         <div class="form-group">
-            <label for="name">Name:</label>
+            <label for="name">Imię:</label>
             <input type="text" class="form-control" id="name" name="name">
         </div>
 
+        <div class="form-group">
+            <label for="name">Nazwisko:</label>
+            <input type="text" class="form-control" id="surname" name="surname">
+        </div>
+
+        <div class="form-group">
+            <label for="name">Login:</label>
+            <input type="text" class="form-control" id="login" name="login">
+        </div>
+
+        <div class="form-group">
+            <label for="name">Pesel:</label>
+            <input type="text" class="form-control" id="PESEL" name="PESEL">
+        </div>
+
+        <div class="form-group">
+            <label for="name">Numer telefonu:</label>
+            <input type="text" class="form-control" id="phoneNumber" name="phoneNumber">
+        </div>
+
         <div class="form-group">
             <label for="email">Email:</label>
             <input type="email" class="form-control" id="email" name="email">
@@ -77,11 +97,6 @@
             <input type="password" class="form-control" id="password" name="password">
         </div>
 
-        <div class="form-group">
-            <label for="testowa">Wartosc Testowa:</label>
-            <input type="text" class="form-control" id="testowa" name="testowa">
-        </div>
-
         <div class="form-group">
             <button style="cursor:pointer" type="submit" class="btn btn-primary">Submit</button>
         </div>