Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Minik Gaarde Lambrecht 2021-03-19 14:00:12 +01:00
commit 3347a569a4
11 changed files with 11 additions and 12 deletions

2
.gitignore vendored
View File

@ -111,3 +111,5 @@ composer.phar
/Frontend/images/
/Test/
/Test/
/.vs/
*.sqlite

View File

@ -3,7 +3,7 @@ require_once "../../../bootstrap.php";
use Backend\Models\Group;
if (isset($_GET["groupId"])){
$groups = Group::find($_GET["groupId"]);
$groups = Group::find($_GET["groupId"]);
}
elseif(isset($_GET["gameJameId"])){
$groups = Group::where("game_jam_id",$_GET["gameJameId"])->get();

View File

@ -1,6 +1,6 @@
<?php
require_once "../../bootstrap.php";
require_once realpath(dirname(__FILE__) ."/../../bootstrap.php");
use Illuminate\Database\Capsule\Manager as Capsule;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@ -1,6 +1,6 @@
<?php
//require bootstrap aka our database connection
require_once "../../bootstrap.php";
require_once realpath(dirname(__FILE__) ."/../../bootstrap.php");
use Illuminate\Database\Capsule\Manager as Capsule;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@ -1,6 +1,6 @@
<?php
//require bootstrap aka our database connection
require_once "../../bootstrap.php";
require_once realpath(dirname(__FILE__) ."/../../bootstrap.php");
use Illuminate\Database\Capsule\Manager as Capsule;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@ -1,6 +1,6 @@
<?php
//require bootstrap aka our database connection
require_once "../../bootstrap.php";
require_once realpath(dirname(__FILE__) ."/../../bootstrap.php");
use Illuminate\Database\Capsule\Manager as Capsule;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@ -1,6 +1,6 @@
<?php
//require bootstrap aka our database connection
require_once "../../bootstrap.php";
require_once realpath(dirname(__FILE__) ."/../../bootstrap.php");
use Illuminate\Database\Capsule\Manager as Capsule;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@ -1,6 +1,6 @@
<?php
//require bootstrap aka our database connection
require_once "../../bootstrap.php";
require_once realpath(dirname(__FILE__) ."/../../bootstrap.php");
use Illuminate\Database\Capsule\Manager as Capsule;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@ -1,5 +1,5 @@
<?php
require_once "../../bootstrap.php";
require_once realpath(dirname(__FILE__) ."/../../bootstrap.php");
use Illuminate\Database\Capsule\Manager as Capsule;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

View File

@ -21,6 +21,3 @@ require "KeyWord.php"; //Group has foreign keys to the Group
require "Vote.php";
require "AdminUser.php";
\Backend\Models\AdminUser::firstOrCreate([
'user_name' => 'admin', 'password' => password_hash("Aa123456&",PASSWORD_DEFAULT)
]);

View File

@ -3,7 +3,7 @@ use Backend\Models\GameJam;
use Illuminate\Contracts\Config;
require_once('../bootstrap.php');
" tis is a string'' ";
$gameJam = GameJam::firstOrCreate([
'name' => "First game jam ever!", 'start_time' => "2021-03-03T12:40", 'end_time' => "2021-04-03T12:40", 'description' => "Det her et en beskrivelse"