Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

 Conflicts:

	skolehjem/routes/web.php

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");
     }
 
     /**

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();
         });
     }

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();
         });
     }

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();
         });
     }

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.
      *

skolehjem/resources/views/user/index.blade.php

@@ -0,0 +1,9 @@
+@extends('layout.base')
+
+@section('content')
+
+    <ul>
+
+    </ul>
+
+@endsection