diff --git a/Backend/Controllers/Admin/AdminLogin.php b/Backend/Controllers/Admin/AdminLogin.php index e14862f..813b3dd 100644 --- a/Backend/Controllers/Admin/AdminLogin.php +++ b/Backend/Controllers/Admin/AdminLogin.php @@ -19,18 +19,18 @@ if(isset($_POST['aLogin'])){ $_SESSION['userName'] = $userName; $_SESSION['admin'] = true; $_SESSION['success'] = "You are now logged in"; - echo http_response_code(200); + http_response_code(200); }else{ session_destroy(); - echo "Fail to verify password"; - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "wrong password"]); } }else{ session_destroy(); - echo "No user"; - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "admin don't exist"]); } }else{ - echo http_response_code(400); + http_response_code(400); } \ No newline at end of file diff --git a/Backend/Controllers/Admin/AdminSignup.php b/Backend/Controllers/Admin/AdminSignup.php index 64ce674..f63eab9 100644 --- a/Backend/Controllers/Admin/AdminSignup.php +++ b/Backend/Controllers/Admin/AdminSignup.php @@ -10,13 +10,14 @@ if (isAdmin()){ $admin->user_name = $_POST["newUsername"]; $admin->password = $_POST["newPassword"]; if ($admin->save()){ - echo http_response_code(201); + http_response_code(201); }else{ - echo http_response_code(500); + http_response_code(500); } }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "is not admin"]); } \ No newline at end of file diff --git a/Backend/Controllers/FileHandler/FileHandler.php b/Backend/Controllers/FileHandler/FileHandler.php index 2271e61..5cbb8eb 100644 --- a/Backend/Controllers/FileHandler/FileHandler.php +++ b/Backend/Controllers/FileHandler/FileHandler.php @@ -15,14 +15,14 @@ function ZipFileHandler(string $gameFileName, string $gameFileTmp){ if(in_array($headerType,$headerTypeMatch)){ $gameFileNewName = uniqid("", true). "." . $fileActualExtGame; if(empty($gameFileName)){ - echo http_response_code(400); + http_response_code(400); exit(); } rename($gameFileTmp,"../../Games/".$gameFileNewName); return $gameFileNewName; }else{ - echo "Wrong file type"; - echo http_response_code(400); + http_response_code(400); + echo json_encode(["message" => "Wrong file type gameFile"]); exit(); } return NULL; @@ -43,14 +43,14 @@ function imagesFileHandler(string $thumbnailFileName, string $thumbnailFileTmp){ if(in_array($headerType,$headerTypeMatch)){ $thumbnailFileNewName = uniqid("", true). "." . $fileActualExtThumb; if(empty($thumbnailFileName)){ - echo http_response_code(400); + http_response_code(400); exit(); } rename($thumbnailFileTmp,"../../../Frontend/images/".$thumbnailFileNewName); return $thumbnailFileNewName; }else{ - echo "Wrong file type"; - echo http_response_code(400); + http_response_code(400); + echo json_encode(["message" => "Wrong file type thumbnailFile"]); exit(); } return NULL; diff --git a/Backend/Controllers/FileHandler/updateFiles.php b/Backend/Controllers/FileHandler/updateFiles.php index 4ec66a9..b903190 100644 --- a/Backend/Controllers/FileHandler/updateFiles.php +++ b/Backend/Controllers/FileHandler/updateFiles.php @@ -37,14 +37,15 @@ if(isLogin()){ } $gameData->is_web_Based = $isWebBased; if(!$gameData->save()){ - echo http_response_code(500); + http_response_code(500); }else{ - echo http_response_code(201); + http_response_code(201); } }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "is not login"]); } \ No newline at end of file diff --git a/Backend/Controllers/FileHandler/upload.php b/Backend/Controllers/FileHandler/upload.php index a3eb7e3..c6cad0c 100644 --- a/Backend/Controllers/FileHandler/upload.php +++ b/Backend/Controllers/FileHandler/upload.php @@ -53,23 +53,26 @@ if(isLogin()){ $gameData->save(); $group->gameData()->associate($gameData); if(! $group->save()){ - echo http_response_code(500); + http_response_code(500); }else{ - echo http_response_code(201); + http_response_code(201); } + }else{ + http_response_code(500); } }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo "Can only upload one file"; - echo http_response_code(400); + http_response_code(400); + echo json_encode(["message" => "Can only upload one file"]); } }else{ - echo "Can only upload when the game jam has started"; - echo http_response_code(400); + http_response_code(400); + echo json_encode(["message" => "Can only upload when the game jam has started"]); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "is not login"]); } \ No newline at end of file diff --git a/Backend/Controllers/GameJam/NewGameJam.php b/Backend/Controllers/GameJam/NewGameJam.php index 059dc65..11e09ba 100644 --- a/Backend/Controllers/GameJam/NewGameJam.php +++ b/Backend/Controllers/GameJam/NewGameJam.php @@ -17,14 +17,15 @@ if(isAdmin()){ $gameJam->description = $_POST["description"]; if($gameJam->save()){ - echo http_response_code(201); + http_response_code(201); } else{ - echo http_response_code(500); + http_response_code(500); } }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "is not admin"]); } \ No newline at end of file diff --git a/Backend/Controllers/GameJam/UpdateGameJam.php b/Backend/Controllers/GameJam/UpdateGameJam.php index 8aa59b2..6fb62ce 100644 --- a/Backend/Controllers/GameJam/UpdateGameJam.php +++ b/Backend/Controllers/GameJam/UpdateGameJam.php @@ -22,14 +22,18 @@ if(isAdmin()){ $gameJam->description = $_POST['description']; if ($gameJam->save()) { - echo http_response_code(201); + http_response_code(201); }else{ - echo http_response_code(500); + http_response_code(500); } + }else{ + http_response_code(400); + echo json_encode(["message" => "game jam not found"]); } }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "is not admin"]); } diff --git a/Backend/Controllers/Group/Login.php b/Backend/Controllers/Group/Login.php index 9ec078c..6bbb384 100644 --- a/Backend/Controllers/Group/Login.php +++ b/Backend/Controllers/Group/Login.php @@ -27,26 +27,26 @@ if(isset($_POST['login'])){ $_SESSION['success'] = "You are now logged in"; //header('location: ../../../Frontend/index.php?login=success'); //exit(); - echo http_response_code(200); + http_response_code(200); } else{ session_destroy(); - echo http_response_code(500); + http_response_code(500); } }else{ session_destroy(); - echo "Wrong password"; - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "Wrong password"]); } }else{ session_destroy(); - echo "group was not found"; - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "group was not found"]); } }else{ - echo http_response_code(400); + http_response_code(400); } diff --git a/Backend/Controllers/Group/ResetPassword.php b/Backend/Controllers/Group/ResetPassword.php index 8ccdf47..3fa3e8e 100644 --- a/Backend/Controllers/Group/ResetPassword.php +++ b/Backend/Controllers/Group/ResetPassword.php @@ -12,17 +12,19 @@ if(isAdmin()){ $password->password = password_hash($_POST['newPassword'], PASSWORD_DEFAULT); echo $password; if(!$password->save()){ - echo http_response_code(500); + http_response_code(500); }else{ - echo http_response_code(201); + http_response_code(201); } }else{ - echo http_response_code(400); + http_response_code(400); + echo json_encode(["message" => "group not found"]); } }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "is not admin"]); } \ No newline at end of file diff --git a/Backend/Controllers/Group/SigningUp.php b/Backend/Controllers/Group/SigningUp.php index f968b96..ff2599b 100644 --- a/Backend/Controllers/Group/SigningUp.php +++ b/Backend/Controllers/Group/SigningUp.php @@ -24,8 +24,10 @@ if(isset($_POST['regGroup'])){ $group->group_amount = $_POST['groupAmount']; if(!$group->save()){ - return; + http_response_code(500); + exit(); } + $password = New Password(); $password->group()->associate($group); @@ -37,18 +39,20 @@ if(isset($_POST['regGroup'])){ $password->remember_token = $token; if(!$password->save()){ - echo http_response_code(500); - }else{ - echo http_response_code(201); + http_response_code(500); + exit(); } $_SESSION['groupName'] = $groupName; $_SESSION['token'] = $token; $_SESSION['success'] = "You are now logged in"; + http_response_code(201); + echo json_encode(["message" => "you are login"]); }else{ - echo http_response_code(400); + http_response_code(400); + echo json_encode(["message" => "password not valid"]); } }else{ - echo http_response_code(400); + http_response_code(400); } diff --git a/Backend/Controllers/Group/UpdateGruop.php b/Backend/Controllers/Group/UpdateGruop.php index a87053f..0c2dc5f 100644 --- a/Backend/Controllers/Group/UpdateGruop.php +++ b/Backend/Controllers/Group/UpdateGruop.php @@ -11,16 +11,21 @@ if(isLogin()){ $group->group_amount = $_POST['groupAmount']; $group->game_jam_id = $_POST['gameJamId']; if(!$group->save()){ - echo http_response_code(500); + http_response_code(500); }else{ - echo http_response_code(201); + http_response_code(201); } } + else{ + http_response_code(400); + echo json_encode(["message" => "group not found"]); + } }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "is not login"]); } diff --git a/Backend/Controllers/Group/UpdatePassword.php b/Backend/Controllers/Group/UpdatePassword.php index 2e0b67e..ea686f2 100644 --- a/Backend/Controllers/Group/UpdatePassword.php +++ b/Backend/Controllers/Group/UpdatePassword.php @@ -9,15 +9,20 @@ if(isLogin()){ if(passwordValidate($pass = $_POST['password'])){ $password->password = password_hash($pass,PASSWORD_DEFAULT); if(!$password->save()){ - echo http_response_code(500); + http_response_code(500); }else{ - echo http_response_code(201); + http_response_code(201); } } + else{ + http_response_code(400); + echo json_encode(["message" => "password not valid"]); + } }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "is not login"]); } diff --git a/Backend/Controllers/Polls/1vote.php b/Backend/Controllers/Polls/1vote.php index f9b3fc7..f718230 100644 --- a/Backend/Controllers/Polls/1vote.php +++ b/Backend/Controllers/Polls/1vote.php @@ -20,9 +20,13 @@ if(isset($_POST['1Vote'])){ }else{ http_response_code(201); } + } else{ + http_response_code(403); + echo json_encode(["message" => "you have already voted"]); } }else{ - echo http_response_code(400); + http_response_code(400); + echo json_encode(["message" => "you have already voted"]); } diff --git a/Backend/Controllers/Polls/GetVote.php b/Backend/Controllers/Polls/GetVote.php index 78ca37a..f44593f 100644 --- a/Backend/Controllers/Polls/GetVote.php +++ b/Backend/Controllers/Polls/GetVote.php @@ -8,5 +8,6 @@ if(isLogin()){ echo json_encode(array('data' => Vote::where('group_id',groupViaToken($_SESSION['token'])->id)->get()->jsonSerialize())); }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "not login"]); } diff --git a/Backend/Controllers/Polls/GetWinner.php b/Backend/Controllers/Polls/GetWinner.php index 06fa051..28f597d 100644 --- a/Backend/Controllers/Polls/GetWinner.php +++ b/Backend/Controllers/Polls/GetWinner.php @@ -5,30 +5,39 @@ use Backend\Models\Group; use Backend\Models\Vote; use \Illuminate\Support\Collection; -if(isAdmin() && isset($_GET['gameJamId'])){ - $groups = Group::where('game_jam_id',$_GET['gameJamId'])->get(); - $winningGroups = new Collection(); - $i = -1; - foreach ($groups as $group){ - $x = Vote::where('group_id', $group->id)->count(); - if($x>$i){ +if(isAdmin()){ + if(isset($_GET['gameJamId'])) { + $groups = Group::where('game_jam_id', $_GET['gameJamId'])->get(); + if($groups) { $winningGroups = new Collection(); - $winningGroups->push($group); + $i = -1; + foreach ($groups as $group) { + $x = Vote::where('group_id', $group->id)->count(); + if ($x > $i) { + $winningGroups = new Collection(); + $winningGroups->push($group); - $i = $x; + $i = $x; + } elseif ($i === $x) { + $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 json_encode(array('data' => $winningGroups->jsonSerialize())); } - elseif ($i === $x){ - $winningGroups->push($group); + else{ + http_response_code(400); + echo json_encode(["message" => "game jam not found"]); } + }else{ + http_response_code(400); } - 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' => $winningGroups->jsonSerialize())); - - }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "not admin"]); } diff --git a/Backend/Controllers/keyWord/GetKeyWinner.php b/Backend/Controllers/keyWord/GetKeyWinner.php index b009a63..3290ed5 100644 --- a/Backend/Controllers/keyWord/GetKeyWinner.php +++ b/Backend/Controllers/keyWord/GetKeyWinner.php @@ -25,8 +25,9 @@ if (!isAdmin()){ header('Content-Type: application/json;charset=UTF-8'); echo json_encode(array('data' => $find_all_keywords->jsonSerialize())); }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "is not admin"]); } \ No newline at end of file diff --git a/Backend/Controllers/keyWord/NewKeyWord.php b/Backend/Controllers/keyWord/NewKeyWord.php index 6bcb3ae..26aeb7f 100644 --- a/Backend/Controllers/keyWord/NewKeyWord.php +++ b/Backend/Controllers/keyWord/NewKeyWord.php @@ -25,19 +25,20 @@ if (isLogin()) { //Try to save it if(!$keyword->save()){ - echo http_response_code(500); + http_response_code(500); }else{ - echo http_response_code(201); + http_response_code(201); } }else{ - echo "limited upload reached"; - echo http_response_code(400); + http_response_code(400); + echo json_encode(["message" => "limited upload reached"]); } }else{ - echo http_response_code(400); + http_response_code(400); } }else{ - echo http_response_code(401); + http_response_code(401); + echo json_encode(["message" => "not login"]); }