Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-07-27 13:09:56 +02:00
commit a59c36ab1a
15 changed files with 23 additions and 2 deletions

View File

@ -1,7 +1,7 @@
<?php <?php
//The Model to a certain Controller, should contain a class with Controller name to which it belongs. //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. // Allows needed strings to passed onto the database. if there is none needed. the class should appear empty.
//Reference to where the file belongs. //Reference to where the file belongs.
namespace App; namespace App;
@ -12,6 +12,7 @@ use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library //Class of which should extend Model Library
class Album extends Model class Album extends Model
{ {
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [ protected $fillable = [
'name' 'name'
]; ];

View File

@ -9,6 +9,7 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class CalendarDate extends Model class CalendarDate extends Model
{ {
// //

View File

@ -10,6 +10,7 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class CalendarEvent extends Model class CalendarEvent extends Model
{ {
// //

View File

@ -10,8 +10,10 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class Contact extends Model class Contact extends Model
{ {
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [ protected $fillable = [
'name_first', "name_last", 'email', 'phone' 'name_first', "name_last", 'email', 'phone'
]; ];

View File

@ -10,6 +10,7 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class Event extends Model class Event extends Model
{ {
/** /**
@ -17,6 +18,7 @@ class Event extends Model
* *
* @var array * @var array
*/ */
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [ protected $fillable = [
"name", "description", "date" "name", "description", "date"
]; ];

View File

@ -10,6 +10,7 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class ExternalLink extends Model class ExternalLink extends Model
{ {
/** /**
@ -17,6 +18,7 @@ class ExternalLink extends Model
* *
* @var array * @var array
*/ */
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [ protected $fillable = [
'name', "link" 'name', "link"
]; ];

View File

@ -10,6 +10,7 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class Feedbacks extends Model class Feedbacks extends Model
{ {
protected $fillable = [ protected $fillable = [

View File

@ -10,8 +10,10 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class MenuPlan extends Model class MenuPlan extends Model
{ {
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [ protected $fillable = [
'week', 'monday', "tuesday", 'wednesday', 'thursday' 'week', 'monday', "tuesday", 'wednesday', 'thursday'
]; ];

View File

@ -9,6 +9,7 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class Resource extends Model class Resource extends Model
{ {
public function resourceExtension() { public function resourceExtension() {

View File

@ -9,6 +9,7 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class ResourceCategory extends Model class ResourceCategory extends Model
{ {
public function resourceExtensions() { public function resourceExtensions() {

View File

@ -9,6 +9,7 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class ResourceExtension extends Model class ResourceExtension extends Model
{ {
public function resources() { public function resources() {

View File

@ -15,6 +15,7 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Spatie\Permission\Traits\HasRoles; use Spatie\Permission\Traits\HasRoles;
//Class of which should extend Model Library
class User extends Authenticatable class User extends Authenticatable
{ {
use Notifiable; use Notifiable;
@ -25,6 +26,7 @@ class User extends Authenticatable
* *
* @var array * @var array
*/ */
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [ protected $fillable = [
'name_first', "name_last", 'email', 'password', "phone" 'name_first', "name_last", 'email', 'password', "phone"
]; ];

View File

@ -9,8 +9,10 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class WashingMachine extends Model class WashingMachine extends Model
{ {
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [ protected $fillable = [
'name' 'name'
]; ];

View File

@ -9,8 +9,10 @@ namespace App;
//allows the use of Model library //allows the use of Model library
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
//Class of which should extend Model Library
class WashingReservation extends Model class WashingReservation extends Model
{ {
//protected variable which contains name of database field(s) to be filled.
protected $fillable = [ protected $fillable = [
'time', 'machine' 'time', 'machine'
]; ];

View File

@ -19,7 +19,7 @@ class UserSeeder extends Seeder
// } catch (Exception $e) { // } catch (Exception $e) {
// } // }
Log::debug("YEET");
/*if(User::where("name_first", "admin")) /*if(User::where("name_first", "admin"))