From 2cbc1ddaf9995d7f06d5d0f503902a674b9713cd Mon Sep 17 00:00:00 2001
From: Vedde <zelenvedran@gmail.com>
Date: Wed, 10 Jun 2020 08:33:06 +0200
Subject: [PATCH 1/2] added user folder/view updated EventController.php &
 web.php

---
 skolehjem/app/Http/Controllers/EventController.php | 11 +++++++----
 skolehjem/laravel.sqlite                           |  0
 skolehjem/resources/views/user/index.blade.php     |  9 +++++++++
 skolehjem/routes/web.php                           |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 skolehjem/laravel.sqlite
 create mode 100644 skolehjem/resources/views/user/index.blade.php

diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index db61a07..881efd2 100644
--- a/skolehjem/app/Http/Controllers/EventController.php
+++ b/skolehjem/app/Http/Controllers/EventController.php
@@ -2,18 +2,21 @@
 
 namespace App\Http\Controllers;
 
+use App\User;
 use Illuminate\Http\Request;
 
 class EventController extends Controller
 {
     /**
-     * Display a listing of the resource.
+     * Display a listing of the resource..
      *
      * @return \Illuminate\Http\Response
      */
-    public function index()
+    public function index(Request $request)
     {
-        //
+        $users = User::query()->paginate($request->query("limit", 20));
+
+        return view("user.index", [ "users" => $users]);
     }
 
     /**
@@ -23,7 +26,7 @@ class EventController extends Controller
      */
     public function create()
     {
-        //
+        return view("user.create");
     }
 
     /**
diff --git a/skolehjem/laravel.sqlite b/skolehjem/laravel.sqlite
new file mode 100644
index 0000000..e69de29
diff --git a/skolehjem/resources/views/user/index.blade.php b/skolehjem/resources/views/user/index.blade.php
new file mode 100644
index 0000000..f6cd88a
--- /dev/null
+++ b/skolehjem/resources/views/user/index.blade.php
@@ -0,0 +1,9 @@
+@extends('layout.base')
+
+@section('content')
+
+    <ul>
+
+    </ul>
+
+@endsection
diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php
index 495e801..0427a76 100644
--- a/skolehjem/routes/web.php
+++ b/skolehjem/routes/web.php
@@ -18,3 +18,4 @@ use Illuminate\Support\Facades\Route;
 //});
 
 Route::get("/", "RootController@index")->name("root.index");
+

From 643ac9e3de0a804d37c114b9fdd6101242706bbd Mon Sep 17 00:00:00 2001
From: Vedde <zelenvedran@gmail.com>
Date: Wed, 10 Jun 2020 12:29:18 +0200
Subject: [PATCH 2/2] added values to migrations.

---
 .../2020_06_08_085447_create_washing_reservations.php          | 2 +-
 .../database/migrations/2020_06_08_090004_create_events.php    | 2 ++
 .../migrations/2020_06_08_123954_create_washing_machines.php   | 1 +
 .../2020_06_09_081126_alter_washing_reservations.php           | 3 +--
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php b/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php
index 4aaf16b..e732b55 100644
--- a/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php
+++ b/skolehjem/database/migrations/2020_06_08_085447_create_washing_reservations.php
@@ -15,7 +15,7 @@ class CreateWashingReservations extends Migration
     {
         Schema::create('washing_reservations', function (Blueprint $table) {
             $table->id();
-            $table->time("time");
+            $table->timestamp("time");
             $table->timestamps();
         });
     }
diff --git a/skolehjem/database/migrations/2020_06_08_090004_create_events.php b/skolehjem/database/migrations/2020_06_08_090004_create_events.php
index 9302b16..20f7676 100644
--- a/skolehjem/database/migrations/2020_06_08_090004_create_events.php
+++ b/skolehjem/database/migrations/2020_06_08_090004_create_events.php
@@ -15,6 +15,8 @@ class CreateEvents extends Migration
     {
         Schema::create('events', function (Blueprint $table) {
             $table->id();
+            $table->string("name");
+            $table->string("description");
             $table->timestamps();
         });
     }
diff --git a/skolehjem/database/migrations/2020_06_08_123954_create_washing_machines.php b/skolehjem/database/migrations/2020_06_08_123954_create_washing_machines.php
index 6c78c5b..7ef26d1 100644
--- a/skolehjem/database/migrations/2020_06_08_123954_create_washing_machines.php
+++ b/skolehjem/database/migrations/2020_06_08_123954_create_washing_machines.php
@@ -15,6 +15,7 @@ class CreateWashingMachines extends Migration
     {
         Schema::create('washing_machines', function (Blueprint $table) {
             $table->id();
+            $table->string("name")->unique();
             $table->timestamps();
         });
     }
diff --git a/skolehjem/database/migrations/2020_06_09_081126_alter_washing_reservations.php b/skolehjem/database/migrations/2020_06_09_081126_alter_washing_reservations.php
index 06995b9..54cba2f 100644
--- a/skolehjem/database/migrations/2020_06_09_081126_alter_washing_reservations.php
+++ b/skolehjem/database/migrations/2020_06_09_081126_alter_washing_reservations.php
@@ -13,9 +13,8 @@ class AlterWashingReservations extends Migration
      */
     public function up()
     {
-        //
-    }
 
+    }
     /**
      * Reverse the migrations.
      *