From a37c9f429acf3c004d63c5ebed5691e0badc5ba6 Mon Sep 17 00:00:00 2001
From: czup <micrej@st.amu.edu.pl>
Date: Tue, 17 Sep 2019 19:59:20 +0200
Subject: [PATCH] Jednostki

---
 .../Controllers/RegistrationController.php    |  2 -
 app/Http/Controllers/SessionsController.php   |  2 +-
 app/User.php                                  |  2 +-
 .../2014_10_12_000000_create_users_table.php  |  1 -
 ...2019_06_03_202145_create_flights_table.php | 31 ------------
 ..._06_03_213746_create_uzytkowniks_table.php | 31 ------------
 ..._13_220544_create__fire_stations_table.php | 49 +++++++++++++++++++
 resources/views/inc/formerrors.blade.php      | 11 +++++
 resources/views/login.blade.php               |  6 +--
 resources/views/register.blade.php            |  7 +--
 10 files changed, 66 insertions(+), 76 deletions(-)
 delete mode 100644 database/migrations/2019_06_03_202145_create_flights_table.php
 delete mode 100644 database/migrations/2019_06_03_213746_create_uzytkowniks_table.php
 create mode 100644 database/migrations/2019_09_13_220544_create__fire_stations_table.php
 create mode 100644 resources/views/inc/formerrors.blade.php

diff --git a/app/Http/Controllers/RegistrationController.php b/app/Http/Controllers/RegistrationController.php
index 5996ee8..89ad9e9 100644
--- a/app/Http/Controllers/RegistrationController.php
+++ b/app/Http/Controllers/RegistrationController.php
@@ -68,7 +68,6 @@ class RegistrationController extends Controller
             'surname' => 'required',
             'email' => 'required|email',
             'password' => 'required',
-            'login' => 'required',
             'PESEL' => 'required',
             'phoneNumber' => 'required'
 
@@ -77,7 +76,6 @@ class RegistrationController extends Controller
 
         $request = request();
         $user = User::create([
-            'login' => $request-> login,
             'password' => $request-> password,
             'email' => $request-> email,
             'name' => $request-> name,
diff --git a/app/Http/Controllers/SessionsController.php b/app/Http/Controllers/SessionsController.php
index 34c02c1..5d25142 100644
--- a/app/Http/Controllers/SessionsController.php
+++ b/app/Http/Controllers/SessionsController.php
@@ -13,7 +13,7 @@ class SessionsController extends Controller
 
     public function store()
     {
-        if (auth()->attempt(request(['login', 'password'])) == false) {
+        if (auth()->attempt(request(['email', 'password'])) == false) {
             return back()->withErrors([
                 'message' => 'The email or password is incorrect, please try again'
             ]);
diff --git a/app/User.php b/app/User.php
index 0c8ce08..1ac71ef 100644
--- a/app/User.php
+++ b/app/User.php
@@ -18,7 +18,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'login', 'name', 'surname', 'password', 'PESEL', 'phoneNumber', 'email', 'fireStationID', 'functionID', 'degreeID', 'number', 'statusID', 'deleted', 'creatorID', 'changingID',
+        '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 3d895e1..7c5efa6 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -15,7 +15,6 @@ class CreateUsersTable extends Migration
     {
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('login', 45);
             $table->string('password', 100);
             $table->string('name', 45);
             $table->string('surname', 45);
diff --git a/database/migrations/2019_06_03_202145_create_flights_table.php b/database/migrations/2019_06_03_202145_create_flights_table.php
deleted file mode 100644
index 98a0da0..0000000
--- a/database/migrations/2019_06_03_202145_create_flights_table.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateFlightsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('flights', function (Blueprint $table) {
-            $table->increments('id');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('flights');
-    }
-}
diff --git a/database/migrations/2019_06_03_213746_create_uzytkowniks_table.php b/database/migrations/2019_06_03_213746_create_uzytkowniks_table.php
deleted file mode 100644
index 3e97aed..0000000
--- a/database/migrations/2019_06_03_213746_create_uzytkowniks_table.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateUzytkowniksTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('uzytkowniks', function (Blueprint $table) {
-            $table->increments('id');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('uzytkowniks');
-    }
-}
diff --git a/database/migrations/2019_09_13_220544_create__fire_stations_table.php b/database/migrations/2019_09_13_220544_create__fire_stations_table.php
new file mode 100644
index 0000000..443501d
--- /dev/null
+++ b/database/migrations/2019_09_13_220544_create__fire_stations_table.php
@@ -0,0 +1,49 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateFireStationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('fireStations', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name', 45);
+            $table->integer('number');
+            $table->string('voivodeship', 45);
+            $table->string('county', 45);
+            $table->string('community', 45);
+            $table->string('postOffice', 45);
+            $table->string('zipCode', 6);
+            $table->string('address', 45);
+            $table->float('latitude', 9,5);
+            $table->float('longitude', 9,5);
+            $table->string('KRS', 10);
+            $table->string('NIP', 10);
+            $table->string('phoneNumber', 11);
+            $table->string('email', 100);
+            $table->integer('deleted')->default(0);
+            $table->integer('creatorID')->nullable()->default(null);
+            $table->integer('changingID')->nullable()->default(null);
+            $table->rememberToken();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('fireStations');
+    }
+}
diff --git a/resources/views/inc/formerrors.blade.php b/resources/views/inc/formerrors.blade.php
new file mode 100644
index 0000000..906587b
--- /dev/null
+++ b/resources/views/inc/formerrors.blade.php
@@ -0,0 +1,11 @@
+@if(count($errors))
+<div class="form-group">
+    <div class="alert alert-danger">
+        <ul>
+            @foreach($errors->all() as $error)
+            <li>{{$error}}</li>
+            @endforeach
+        </ul>
+    </div>
+</div>
+@endif
diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php
index 7ff05dd..3d1a4e9 100644
--- a/resources/views/login.blade.php
+++ b/resources/views/login.blade.php
@@ -7,8 +7,8 @@
     <form method="POST" action="/login">
         {{ csrf_field() }}
         <div class="form-group">
-            <label for="name">Login:</label>
-            <input type="text" class="form-control" id="login" name="login">
+            <label for="email">Email:</label>
+            <input type="text" class="form-control" id="email" name="email">
         </div>
 
         <div class="form-group">
@@ -19,7 +19,7 @@
         <div class="form-group">
             <button style="cursor:pointer" type="submit" class="btn btn-primary">Login</button>
         </div>
-{{--        @include('partials.formerrors')--}}
+        @include('inc.formerrors')
     </form>
 
 @endsection
diff --git a/resources/views/register.blade.php b/resources/views/register.blade.php
index 0353978..97b8717 100644
--- a/resources/views/register.blade.php
+++ b/resources/views/register.blade.php
@@ -72,11 +72,6 @@
             <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">
@@ -100,7 +95,7 @@
         <div class="form-group">
             <button style="cursor:pointer" type="submit" class="btn btn-primary">Submit</button>
         </div>
-{{--        @include('partials.formerrors')--}}
+        @include('inc.formerrors')
     </form>
 
 @stop