Game-jam-Devs/Game-Jaming
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Minik Gaarde Lambrecht
2021-04-07 08:20:13 +02:00
parent 21fa9ac043 ee32bf4e5a
commit 8552b6098e
1281 changed files with 439 additions and 84561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Backend/Controllers/GameJam/GetGameJam.php
+5 -2
View File
@@ -1,4 +1,9 @@
<?php
header("Access-Control-Allow-Origin: *");
header("Access-Control-Allow-Credentials: true");
header("Access-Control-Max-Age: 1000");
header("Access-Control-Allow-Headers: X-Requested-With, Content-Type, Origin, Cache-Control, Pragma, Authorization, Accept, Accept-Encoding");
header("Access-Control-Allow-Methods: PUT, POST, GET, OPTIONS, DELETE");
require_once (realpath(dirname(__FILE__) ."/../../../bootstrap.php"));
use Backend\Models\GameJam;
@@ -9,8 +14,6 @@ if(isset($_GET['gameJamId'])){
$dbValue = GameJam::all();
}
header("Access-Control-Allow-Methods: GET");
header("Access-Control-Allow-Headers: X-Requested-With, Content-Type, Accept");
header('Content-Type: application/json;charset=UTF-8');
echo json_encode(array('data' => $dbValue->jsonSerialize()));
Backend/test.php
+2 -2
View File
@@ -4,5 +4,5 @@ use Backend\Models\AdminUser;
require_once ('Database/databaseMigration.php');
AdminUser::firstOrCreate([
'user_name' => 'admin', 'password' => password_hash('admin123',PASSWORD_DEFAULT)
]);
'user_name' => '', 'password' => password_hash('',PASSWORD_DEFAULT)
]);