diff --git a/resources/sandbox/sandbox.js b/resources/sandbox/sandbox.js
index 759879c..b533423 100644
--- a/resources/sandbox/sandbox.js
+++ b/resources/sandbox/sandbox.js
@@ -5,29 +5,59 @@ https://www.youtube.com/watch?v=h0ZUpPiV1ac
window.onload = function(){
const serverPath = "https://server.figytuna.com:8080/ali/hello/";
- const pages = [
- "World",
- "Data",
- "Players",
- "Location"
- ]
+ const pages = {
+ "unsafe": [
+ "World",
+ "Data",
+ "Post"
+ ],
+ "html":[
+ "Location",
+ "Players",
+ ]
+ }
//Generate HTML table
- for (const pagePath of pages){
- //Adds new table row based on the data request
- const $newTableRow = $("
"
- + "Hello " + pagePath + " | "
- + " | "
- + "
");
+ for (const pageType in pages){
+ for (const pagePath of pages[pageType]){
+ //Adds new table row based on the data request
+ const $newTableRow = $(""
+ + "Hello " + pagePath + " | "
+ + " | "
+ + "
");
- //Appends new table row to table
- $("#hello-table").after($newTableRow);
+ console.log(pagePath + " added");
+ //Appends new table row to table
+ $("#hello-table").append($newTableRow);
+ }
}
- //Gets Table data from server
- for (const pagePath of pages){
- $.get(serverPath + pagePath.toLowerCase(), function(data){
- console.log(pagePath + "|" + data);
- document.getElementById("hello-" + pagePath.toLowerCase()).innerHTML = data;
+ dataRequest = function(pagePath, pageType, requestType){
+ $.ajax({
+ type: requestType,
+ url: serverPath + pagePath.toLowerCase(),
+ timeout: 2000,
+ beforeSend: function(data){
+ $("#hello-" + pagePath.toLowerCase()).html("Loading...");
+ },
+ success: function(data){
+ $element = $("#hello-" + pagePath.toLowerCase())
+ if (pageType == "html"){
+ $element.html($data);
+ }else{
+ $element.text($data);
+ }
+ },
+ error: function(e){
+ $("#hello-" + pagePath.toLowerCase()).html("Error " + e.status + " " + e.statusText + "");
+ }
});
}
+ //Gets Table data from server
+ for (const pagePath of pages["html"]){
+ dataRequest(pagePath, "safe", "GET");
+ }
+
+ for (const pagePath of pages["unsafe"]){
+ dataRequest(pagePath, "unsafe", "GET");
+ }
}