From 66f7e3b86b6c8af0d2d642749545cd0987576b5f Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 4 Aug 2020 14:11:05 +0200
Subject: [PATCH] fixes

---
 skolehjem/app/Album.php                       | 34 --------
 skolehjem/app/CalendarDate.php                | 16 ----
 skolehjem/app/CalendarEvent.php               | 17 ----
 .../app/Http/Controllers/AlbumController.php  | 85 -------------------
 ...12_100000_create_password_resets_table.php | 34 --------
 ..._08_085447_create_washing_reservations.php |  6 +-
 ...020_06_08_090042_create_calendar_dates.php | 33 -------
 ...20_06_08_090108_create_calendar_events.php | 33 -------
 .../2020_06_30_065154_create_albums_table.php | 34 --------
 ...07_01_062112_create_resource_extension.php |  2 +-
 .../2020_07_01_062544_create_resource.php     |  2 +-
 ..._07_28_061420_create_user_events_table.php |  4 +-
 12 files changed, 8 insertions(+), 292 deletions(-)
 delete mode 100644 skolehjem/app/Album.php
 delete mode 100644 skolehjem/app/CalendarDate.php
 delete mode 100644 skolehjem/app/CalendarEvent.php
 delete mode 100644 skolehjem/app/Http/Controllers/AlbumController.php
 delete mode 100644 skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php
 delete mode 100644 skolehjem/database/migrations/2020_06_08_090042_create_calendar_dates.php
 delete mode 100644 skolehjem/database/migrations/2020_06_08_090108_create_calendar_events.php
 delete mode 100644 skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php

diff --git a/skolehjem/app/Album.php b/skolehjem/app/Album.php
deleted file mode 100644
index 0465646..0000000
--- a/skolehjem/app/Album.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-//The Model to a certain Controller, should contain a class with Controller name to which it belongs.
-// Allows needed strings to passed onto the database. if there is none needed. the class should appear empty.
-
-//Reference to where the file belongs.
-namespace App;
-
-//allows the use of Model library
-use Illuminate\Database\Eloquent\Model;
-
-//Class of which should extend Model Library
-class Album extends Model
-{
-    //protected variable which contains name of database field(s) to be filled.
-    protected $fillable = [
-        'name'
-    ];
-
-    public function parentAlbum()
-    {
-        return $this->belongsTo('App\Album');
-    }
-
-    public function images()
-    {
-        return $this->hasMany('App\Image');
-    }
-
-    public function videos()
-    {
-        return $this->hasMany('App\Video');
-    }
-}
diff --git a/skolehjem/app/CalendarDate.php b/skolehjem/app/CalendarDate.php
deleted file mode 100644
index 74ec905..0000000
--- a/skolehjem/app/CalendarDate.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-//The Model to a certain Controller, should contain a class with Controller name to which it belongs.
-// Allows needed strings to passed onto the database. if there is none. class should appear empty.
-
-//Reference to where the file belongs.
-namespace App;
-
-//allows the use of Model library
-use Illuminate\Database\Eloquent\Model;
-
-//Class of which should extend Model Library
-class CalendarDate extends Model
-{
-    //
-}
diff --git a/skolehjem/app/CalendarEvent.php b/skolehjem/app/CalendarEvent.php
deleted file mode 100644
index 88f997e..0000000
--- a/skolehjem/app/CalendarEvent.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-//The Model to a certain Controller, should contain a class with Controller name to which it belongs.
-// Allows needed strings to passed onto the database. if there is none. class should appear empty.
-
-//Reference to where the file belongs.
-
-namespace App;
-
-//allows the use of Model library
-use Illuminate\Database\Eloquent\Model;
-
-//Class of which should extend Model Library
-class CalendarEvent extends Model
-{
-    //
-}
diff --git a/skolehjem/app/Http/Controllers/AlbumController.php b/skolehjem/app/Http/Controllers/AlbumController.php
deleted file mode 100644
index 191d47b..0000000
--- a/skolehjem/app/Http/Controllers/AlbumController.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Album;
-use Illuminate\Http\Request;
-
-class AlbumController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        //
-    }
-
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function store(Request $request)
-    {
-        //
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\Album  $album
-     * @return \Illuminate\Http\Response
-     */
-    public function show(Album $album)
-    {
-        //
-    }
-
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  \App\Album  $album
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(Album $album)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \App\Album  $album
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, Album $album)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\Album  $album
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(Album $album)
-    {
-        //
-    }
-}
diff --git a/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php b/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php
deleted file mode 100644
index 5a8c158..0000000
--- a/skolehjem/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-//Migrations acts as a version control for the database allowing you to modify the app's database schema
-
-//allows use of necessary libraries
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreatePasswordResetsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('password_resets', function (Blueprint $table) {
-            $table->string('email')->index();
-            $table->string('token');
-            $table->timestamp('created_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('password_resets');
-    }
-}
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 a1d3b14..9ea86c5 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
@@ -20,9 +20,11 @@ class CreateWashingReservations extends Migration
             $table->timestamp("time");
             $table->timestamps();
             $table->unsignedBigInteger('machine_id');
-            $table->foreign("machine_id")->references('id')->on('washing_machines');
+
+            $table->foreignid("machine_id")->constrained("washing_machines", "id");
             $table->unsignedBigInteger('user_id');
-            $table->foreign("user_id")->references('id')->on('users');
+
+            $table->foreignid("user_id")->constrained("users", "id");
             $table->unique(['time', 'machine_id']);
         });
     }
diff --git a/skolehjem/database/migrations/2020_06_08_090042_create_calendar_dates.php b/skolehjem/database/migrations/2020_06_08_090042_create_calendar_dates.php
deleted file mode 100644
index a6abe3b..0000000
--- a/skolehjem/database/migrations/2020_06_08_090042_create_calendar_dates.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-//Migrations acts as a version control for the database allowing you to modify the app's database schema
-
-//allows use of necessary libraries
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateCalendarDates extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('calendar_dates', function (Blueprint $table) {
-            $table->id();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('calendar_dates');
-    }
-}
diff --git a/skolehjem/database/migrations/2020_06_08_090108_create_calendar_events.php b/skolehjem/database/migrations/2020_06_08_090108_create_calendar_events.php
deleted file mode 100644
index 3750d0f..0000000
--- a/skolehjem/database/migrations/2020_06_08_090108_create_calendar_events.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-//Migrations acts as a version control for the database allowing you to modify the app's database schema
-
-//allows use of necessary libraries
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateCalendarEvents extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('calendar_events', function (Blueprint $table) {
-            $table->id();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('calendar_events');
-    }
-}
diff --git a/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php b/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php
deleted file mode 100644
index bd5f02a..0000000
--- a/skolehjem/database/migrations/2020_06_30_065154_create_albums_table.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-//Migrations acts as a version control for the database allowing you to modify the app's database schema
-
-//allows use of necessary libraries
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateAlbumsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('albums', function (Blueprint $table) {
-            $table->id();
-            $table->timestamps();
-            $table->foreignId('user_id')->constrained();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('albums');
-    }
-}
diff --git a/skolehjem/database/migrations/2020_07_01_062112_create_resource_extension.php b/skolehjem/database/migrations/2020_07_01_062112_create_resource_extension.php
index da3fa6c..92d68e9 100644
--- a/skolehjem/database/migrations/2020_07_01_062112_create_resource_extension.php
+++ b/skolehjem/database/migrations/2020_07_01_062112_create_resource_extension.php
@@ -22,7 +22,7 @@ class CreateResourceExtension extends Migration
             $table->unsignedInteger("resource_category_id");
             $table->timestamps();
 
-            $table->foreign("resource_category_id")->references("id")->on("resource_categories");
+            $table->foreignid("resource_category_id")->constrained("resource_categories", "id");
         });
     }
 
diff --git a/skolehjem/database/migrations/2020_07_01_062544_create_resource.php b/skolehjem/database/migrations/2020_07_01_062544_create_resource.php
index acdef5a..9fc57a5 100644
--- a/skolehjem/database/migrations/2020_07_01_062544_create_resource.php
+++ b/skolehjem/database/migrations/2020_07_01_062544_create_resource.php
@@ -21,7 +21,7 @@ class CreateResource extends Migration
             $table->unsignedInteger("extension_id");
             $table->timestamps();
 
-            $table->foreign("extension_id")->references("id")->on("resource_extensions");
+            $table->foreignid("extension_id")->constrained("resource_extensions", "id");
         });
     }
 
diff --git a/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php
index 39bef20..f2a10e3 100644
--- a/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php
+++ b/skolehjem/database/migrations/2020_07_28_061420_create_user_events_table.php
@@ -20,8 +20,8 @@ class CreateUserEventsTable extends Migration
 
             $table->timestamps();
 
-            $table->foreign("user_id")->references("id")->on("users");
-            $table->foreign("event_id")->references("id")->on("events");
+            $table->foreignid("user_id")->constrained("users", "id");
+            $table->foreignid("event_id")->constrained("events", "id");
         });
     }