Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
commit
b805390b6b
|
@ -19,20 +19,18 @@ if(isset($_POST['aLogin'])){
|
|||
$_SESSION['userName'] = $userName;
|
||||
$_SESSION['admin'] = true;
|
||||
$_SESSION['success'] = "You are now logged in";
|
||||
header('location: ../../../Frontend/index.html?login=success');
|
||||
http_response_code(200);
|
||||
}else{
|
||||
session_destroy();
|
||||
header('location: ../../../Frontend/index.html?login=failed?reason=password');
|
||||
exit();
|
||||
echo "Fail to verify password";
|
||||
http_response_code(401);
|
||||
}
|
||||
|
||||
}else{
|
||||
session_destroy();
|
||||
header('location: ../../../Frontend/index.html?login=failed?reason=username');
|
||||
exit();
|
||||
echo "No user";
|
||||
http_response_code(401);
|
||||
}
|
||||
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=NoLogin");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
|
@ -0,0 +1,22 @@
|
|||
<?php
|
||||
require_once "../../../bootstrap.php";
|
||||
require_once "Admin.php";
|
||||
|
||||
use Backend\Models\AdminUser;
|
||||
|
||||
if (isAdmin()){
|
||||
if (isset($_POST["newAdmin"])){
|
||||
$admin = new AdminUser();
|
||||
$admin->user_name = $_POST["newUsername"];
|
||||
$admin->password = $_POST["newPassword"];
|
||||
if ($admin->save()){
|
||||
http_response_code(201);
|
||||
}else{
|
||||
http_response_code(500);
|
||||
}
|
||||
}else{
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
http_response_code(401);
|
||||
}
|
|
@ -15,13 +15,14 @@ function ZipFileHandler(string $gameFileName, string $gameFileTmp){
|
|||
if(in_array($headerType,$headerTypeMatch)){
|
||||
$gameFileNewName = uniqid("", true). "." . $fileActualExtGame;
|
||||
if(empty($gameFileName)){
|
||||
header("location: ../../../Frontend/index.html?error=emptyFile");
|
||||
http_response_code(400);
|
||||
exit();
|
||||
}
|
||||
rename($gameFileTmp,"../../Games/".$gameFileNewName);
|
||||
return $gameFileNewName;
|
||||
}else{
|
||||
header("location: location: ../../../Frontend/index.html?error=Wrong%20File%20Type");
|
||||
echo "Wrong file type";
|
||||
http_response_code(400);
|
||||
exit();
|
||||
}
|
||||
return NULL;
|
||||
|
@ -42,13 +43,14 @@ function imagesFileHandler(string $thumbnailFileName, string $thumbnailFileTmp){
|
|||
if(in_array($headerType,$headerTypeMatch)){
|
||||
$thumbnailFileNewName = uniqid("", true). "." . $fileActualExtThumb;
|
||||
if(empty($thumbnailFileName)){
|
||||
header("location: ../../../Frontend/index.html?error=emptyFile");
|
||||
http_response_code(400);
|
||||
exit();
|
||||
}
|
||||
rename($thumbnailFileTmp,"../../../Frontend/images/".$thumbnailFileNewName);
|
||||
return $thumbnailFileNewName;
|
||||
}else{
|
||||
header("location: location: ../../../Frontend/index.html?error=Wrong%20File%20Type");
|
||||
echo "Wrong file type";
|
||||
http_response_code(400);
|
||||
exit();
|
||||
}
|
||||
return NULL;
|
||||
|
|
|
@ -14,6 +14,7 @@ if(isset($_GET['gameDataId'])){
|
|||
$openGameDataStream = GameData::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 $openGameDataStream->toJson(JSON_PRETTY_PRINT);
|
|
@ -1 +0,0 @@
|
|||
<?php
|
|
@ -36,14 +36,15 @@ if(isLogin()){
|
|||
$gameData->img = imagesFileHandler($thumbnailFileName,$thumbnailFileTmp);
|
||||
}
|
||||
$gameData->is_web_Based = $isWebBased;
|
||||
$gameData->save();
|
||||
header("location: ../../../Frontend/index.html?success=UpdatedFiles");
|
||||
exit();
|
||||
if(!$gameData->save()){
|
||||
http_response_code(500);
|
||||
}else{
|
||||
http_response_code(201);
|
||||
}
|
||||
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=FailedUpload");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=NoLogin");
|
||||
exit();
|
||||
http_response_code(401);
|
||||
}
|
|
@ -52,23 +52,24 @@ if(isLogin()){
|
|||
$gameData->is_web_Based = $isWebBased;
|
||||
$gameData->save();
|
||||
$group->gameData()->associate($gameData);
|
||||
$group->save();
|
||||
header("location: ../../../Frontend/index.html?success=UploadedFile");
|
||||
exit();
|
||||
if(! $group->save()){
|
||||
http_response_code(500);
|
||||
}else{
|
||||
http_response_code(201);
|
||||
}
|
||||
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/group.php?error=UploadFail");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/group.php?error=TooManyUploads");
|
||||
exit();
|
||||
echo "Can only upload one file";
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/group.php?error=GameJamHasNotBegun");
|
||||
exit();
|
||||
echo "Can only upload when the game jam has started";
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Main.php?error=NoLogin");
|
||||
exit();
|
||||
http_response_code(401);
|
||||
}
|
|
@ -15,4 +15,6 @@ if(isset($_GET['gameJamId'])){
|
|||
}
|
||||
|
||||
header('Content-Type: application/json;charset=UTF-8');
|
||||
echo $dbValue->toJson(JSON_PRETTY_PRINT);
|
||||
echo $dbValue->toJson(JSON_PRETTY_PRINT);
|
||||
|
||||
//var_dump(headers_list());
|
|
@ -17,18 +17,14 @@ if(isAdmin()){
|
|||
$gameJam->description = $_POST["description"];
|
||||
|
||||
if($gameJam->save()){
|
||||
header("location: ../../../Frontend/Html/AdminPage.html?success=UploadedFile");
|
||||
exit();
|
||||
http_response_code(201);
|
||||
}
|
||||
else{
|
||||
header("location: ../../../Frontend/Html/AdminPage.html?error=FailToSaveGameJam");
|
||||
exit();
|
||||
http_response_code(500);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/Html/AdminPage.html?error=FailedToMakeGameJam");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=NotAdmin");
|
||||
exit();
|
||||
http_response_code(401);
|
||||
}
|
|
@ -22,16 +22,14 @@ if(isAdmin()){
|
|||
|
||||
$gameJam->description = $_POST['description'];
|
||||
if ($gameJam->save()) {
|
||||
header("location: ../../../Frontend/Html/AdminPage.html?success=UpdatedFile");
|
||||
exit();
|
||||
http_response_code(201);
|
||||
}else{
|
||||
http_response_code(500);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/Html/AdminPage.html?error=FailedToUpdatedGameJam");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=NotAdmin");
|
||||
exit();
|
||||
http_response_code(401);
|
||||
}
|
||||
|
|
|
@ -12,5 +12,7 @@ else{
|
|||
$groups = Group::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 $groups->toJson(JSON_PRETTY_PRINT);
|
|
@ -25,26 +25,23 @@ if(isset($_POST['login'])){
|
|||
$_SESSION['groupName'] = $groupName;
|
||||
$_SESSION['token'] = $token;
|
||||
$_SESSION['success'] = "You are now logged in";
|
||||
header('location: ../../../Frontend/index.php?login=success');
|
||||
exit();
|
||||
//header('location: ../../../Frontend/index.php?login=success');
|
||||
//exit();
|
||||
http_response_code(200);
|
||||
}
|
||||
else{
|
||||
session_destroy();
|
||||
header('location: ../../../Frontend/index.php?login=failed&?reason=token');
|
||||
exit();
|
||||
http_response_code(500);
|
||||
}
|
||||
|
||||
}else{
|
||||
session_destroy();
|
||||
header('location: ../../../Frontend/index.php?login=failed&?reason=password');
|
||||
exit();
|
||||
http_response_code(401);
|
||||
}
|
||||
|
||||
}
|
||||
else{
|
||||
}else{
|
||||
session_destroy();
|
||||
header('location: ../../../Frontend/index.php?login=failed&?reason=group');
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -12,19 +12,17 @@ if(isAdmin()){
|
|||
$password->password = password_hash($_POST['newPassword'], PASSWORD_DEFAULT);
|
||||
echo $password;
|
||||
if(!$password->save()){
|
||||
header("location: ../../../Frontend/Html/AdminPage.html?error=FailedSaveResetPassword");
|
||||
exit();
|
||||
http_response_code(500);
|
||||
}else{
|
||||
http_response_code(201);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/Html/AdminPage.html?success=SavedResetPassword");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
|
||||
}else{
|
||||
header("location: ../../../Frontend/Html/AdminPage.html?error=FailedToResetPassword");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=NotAdmin");
|
||||
exit();
|
||||
http_response_code(401);
|
||||
}
|
|
@ -37,19 +37,18 @@ if(isset($_POST['regGroup'])){
|
|||
$password->remember_token = $token;
|
||||
|
||||
if(!$password->save()){
|
||||
return;
|
||||
http_response_code(500);
|
||||
}else{
|
||||
http_response_code(201);
|
||||
}
|
||||
|
||||
$_SESSION['groupName'] = $groupName;
|
||||
$_SESSION['token'] = $token;
|
||||
$_SESSION['success'] = "You are now logged in";
|
||||
header("location: ../../../Frontend/index.html?success=GroupRegister");
|
||||
exit();
|
||||
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=CouldNotValidatePassword");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=FailedRegister");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
|
|
|
@ -10,17 +10,17 @@ if(isLogin()){
|
|||
$group->group_name = $_POST['groupName'];
|
||||
$group->group_amount = $_POST['groupAmount'];
|
||||
$group->game_jam_id = $_POST['gameJamId'];
|
||||
$group->save();
|
||||
header("location: ../../../Frontend/index.html?success=YouHaveUpdated");
|
||||
exit();
|
||||
if(!$group->save()){
|
||||
http_response_code(500);
|
||||
}else{
|
||||
http_response_code(201);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=CouldNotUpdate");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=NotLogin");
|
||||
exit();
|
||||
http_response_code(401);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -8,16 +8,16 @@ if(isLogin()){
|
|||
$password = Password::firstWhere("group_id", groupViaToken($_SESSION["token"])->id);
|
||||
if(passwordValidate($pass = $_POST['password'])){
|
||||
$password->password = password_hash($pass,PASSWORD_DEFAULT);
|
||||
$password->save();
|
||||
header("location: ../../../Frontend/index.html?success=PasswordUpdated");
|
||||
exit();
|
||||
if(!$password->save()){
|
||||
http_response_code(500);
|
||||
}else{
|
||||
http_response_code(201);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=CouldNotUpdated");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=NotLogin");
|
||||
exit();
|
||||
http_response_code(401);
|
||||
}
|
||||
|
|
|
@ -14,17 +14,15 @@ if(isset($_POST['1Vote'])){
|
|||
$vote->points += 1;
|
||||
if(!empty($_POST['comment'])){
|
||||
$vote->comment = $_POST['comment'];
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=EmptyField");
|
||||
exit();
|
||||
}
|
||||
$vote->save();
|
||||
header("location: ../../../Frontend/index.html?success=YouHaveVoted");
|
||||
exit();
|
||||
if(!$vote->save()){
|
||||
http_response_code(500);
|
||||
}else{
|
||||
http_response_code(201);
|
||||
}
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=YouCantVoted");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -7,4 +7,6 @@ if(isLogin()){
|
|||
header('Content-Type: application/json;charset=UTF-8');
|
||||
echo Vote::where('group_id',groupViaToken($_SESSION['token'])->id)->get()->toJson(JSON_PRETTY_PRINT);
|
||||
|
||||
}else{
|
||||
http_response_code(401);
|
||||
}
|
||||
|
|
|
@ -21,9 +21,14 @@ if(isAdmin() && isset($_GET['gameJamId'])){
|
|||
$winningGroups->push($group);
|
||||
}
|
||||
}
|
||||
|
||||
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 $winningGroups->toJson(JSON_PRETTY_PRINT);
|
||||
|
||||
|
||||
}else{
|
||||
http_response_code(401);
|
||||
}
|
||||
|
||||
|
|
|
@ -8,15 +8,25 @@ use \Backend\Models\GameJam;
|
|||
use \Illuminate\Support\Collection;
|
||||
|
||||
if (!isAdmin()){
|
||||
if(isset($_POST['genKeyWord'])){
|
||||
$gameJamId = $_POST['gameJamId'];
|
||||
if(isset($_GET['genKeyWord'])){
|
||||
$gameJamId = $_GET['gameJamId'];
|
||||
$game_jam = GameJam::find($gameJamId);
|
||||
$all_group_in_game_jam_id = Group::where("game_jam_id", $game_jam->id)->pluck("id")->toArray();
|
||||
$find_all_keywords = KeyWord::whereIn("group_id", $all_group_in_game_jam_id)->inRandomOrder()->get();
|
||||
$game_jam->key_word = $find_all_keywords->first()->key_word;
|
||||
$game_jam->save();
|
||||
if(!$game_jam->save()){
|
||||
http_response_code(500);
|
||||
}else{
|
||||
http_response_code(201);
|
||||
}
|
||||
|
||||
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 $find_all_keywords->pluck("key_word")->toJson(JSON_PRETTY_PRINT);
|
||||
}else{
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
http_response_code(401);
|
||||
}
|
|
@ -25,23 +25,19 @@ if (isLogin()) {
|
|||
|
||||
//Try to save it
|
||||
if(!$keyword->save()){
|
||||
header("location: ../../../Frontend/index.html?error=FailedToSave");
|
||||
exit();
|
||||
http_response_code(500);
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?success=KeyWordSaved");
|
||||
exit();
|
||||
http_response_code(201);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=YouCantSubmitAnyMoreKeyWords");
|
||||
exit();
|
||||
echo "limited upload reached";
|
||||
http_response_code(400);
|
||||
}
|
||||
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=CouldNotSubmitKeyWord");
|
||||
exit();
|
||||
http_response_code(400);
|
||||
}
|
||||
}else{
|
||||
header("location: ../../../Frontend/index.html?error=NotLogin");
|
||||
exit();
|
||||
http_response_code(401);
|
||||
}
|
||||
|
||||
|
|
|
@ -33,6 +33,21 @@ $gameJam = GameJam::firstOrCreate([
|
|||
<input type="submit" name="login" value="login">
|
||||
</form>
|
||||
|
||||
<?php
|
||||
//print_r(headers_list());
|
||||
|
||||
$h = apache_request_headers();
|
||||
|
||||
foreach ($h as $name => $value) {
|
||||
echo "$name: $value <br>";
|
||||
}
|
||||
|
||||
echo "<br>";
|
||||
|
||||
var_dump(headers_list());
|
||||
|
||||
?>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -6,10 +6,14 @@ $(window).on("load", function(){
|
|||
function dataFetch(){
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: "/Game-Jaming/Backend/Controllers/FileHandler/GetGameData.php?gameJamId=1",
|
||||
url: "/Game-Jaming/Backend/controllers/GameJam/GetGameJam.php",
|
||||
success: function(result){
|
||||
console.log(result);
|
||||
console.log(result[0].game_link)
|
||||
console.log(result[0].name);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
//console.log(result.name); ?gameJamId=1
|
||||
//console.log(result[0].name); uden ?gameJamId=1
|
Loading…
Reference in New Issue