diff --git a/Backend/Controllers/FileHandler/GetGameData.php b/Backend/Controllers/FileHandler/GetGameData.php index 01445c6..b58f35c 100644 --- a/Backend/Controllers/FileHandler/GetGameData.php +++ b/Backend/Controllers/FileHandler/GetGameData.php @@ -17,4 +17,4 @@ if(isset($_GET['gameDataId'])){ 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); \ No newline at end of file +echo json_encode(array('data' => $openGameDataStream->jsonSerialize())); \ No newline at end of file diff --git a/Backend/Controllers/GameJam/GetGameJam.php b/Backend/Controllers/GameJam/GetGameJam.php index d0e8cfe..29b6bbd 100644 --- a/Backend/Controllers/GameJam/GetGameJam.php +++ b/Backend/Controllers/GameJam/GetGameJam.php @@ -13,7 +13,6 @@ 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())); //var_dump(headers_list()); \ No newline at end of file diff --git a/Backend/Controllers/Group/GetGroup.php b/Backend/Controllers/Group/GetGroup.php index 1b1203d..e4dee59 100644 --- a/Backend/Controllers/Group/GetGroup.php +++ b/Backend/Controllers/Group/GetGroup.php @@ -15,4 +15,4 @@ else{ 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); \ No newline at end of file +echo json_encode(array('data' => $groups->jsonSerialize())); \ No newline at end of file diff --git a/Backend/Controllers/Polls/GetVote.php b/Backend/Controllers/Polls/GetVote.php index 162b1f5..78ca37a 100644 --- a/Backend/Controllers/Polls/GetVote.php +++ b/Backend/Controllers/Polls/GetVote.php @@ -5,7 +5,7 @@ require_once "../Group/Group.php"; if(isLogin()){ header('Content-Type: application/json;charset=UTF-8'); - echo Vote::where('group_id',groupViaToken($_SESSION['token'])->id)->get()->toJson(JSON_PRETTY_PRINT); + echo json_encode(array('data' => Vote::where('group_id',groupViaToken($_SESSION['token'])->id)->get()->jsonSerialize())); }else{ echo http_response_code(401); diff --git a/Backend/Controllers/Polls/GetWinner.php b/Backend/Controllers/Polls/GetWinner.php index 5fbf44d..06fa051 100644 --- a/Backend/Controllers/Polls/GetWinner.php +++ b/Backend/Controllers/Polls/GetWinner.php @@ -25,7 +25,7 @@ if(isAdmin() && isset($_GET['gameJamId'])){ 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); + echo json_encode(array('data' => $winningGroups->jsonSerialize())); }else{ diff --git a/Backend/Controllers/keyWord/GetKeyWinner.php b/Backend/Controllers/keyWord/GetKeyWinner.php index ed3e80a..b009a63 100644 --- a/Backend/Controllers/keyWord/GetKeyWinner.php +++ b/Backend/Controllers/keyWord/GetKeyWinner.php @@ -23,7 +23,7 @@ if (!isAdmin()){ 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); + echo json_encode(array('data' => $find_all_keywords->jsonSerialize())); }else{ echo http_response_code(400); }