فهرست منبع

- changed XMLRequest to jQuery AJAX

Ksawery Kuklinski 8 سال پیش
والد
کامیت
79bfc6188d
7فایلهای تغییر یافته به همراه211 افزوده شده و 292 حذف شده
  1. 120 158
      web/bundle.js
  2. 13 27
      webSource/index.js
  3. 3 7
      webSource/server.vue
  4. 9 18
      webSource/serverDetails.vue
  5. 3 8
      webSource/serverList.vue
  6. 6 12
      webSource/serveredit.vue
  7. 57 62
      webSource/servergraph.vue

+ 120 - 158
web/bundle.js

@@ -50624,7 +50624,7 @@ exports = module.exports = __webpack_require__(4)();
 
 
 // module
-exports.push([module.i, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", ""]);
+exports.push([module.i, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", ""]);
 
 // exports
 
@@ -51035,19 +51035,15 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
         confirmButtonText: 'Yes, delete it!'
       }).then(function () {
         var req = new XMLHttpRequest();
-        req.open('GET', '/api/servers/remove/'+ id);
-        req.send(null);
-        req.onreadystatechange = function () {
-          if (req.readyState == XMLHttpRequest.DONE &&
-            req.status === 200) {
+        __WEBPACK_IMPORTED_MODULE_1_jquery___default.a.getJSON('/api/servers/remove/'+ id)
+          .done(function (res) {
             self.update();
             var el = __WEBPACK_IMPORTED_MODULE_1_jquery___default()(self.$el);
             el.css("opacity", 0.5);
             var actions = el.find("#actions");
             actions.children().hide();
             actions.append('<img src="svg/loading.svg"></img>');
-          }
-        };
+          });
       }, function () {
       }).catch(console.log);
     }
@@ -51063,6 +51059,8 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_sweetalert2__ = __webpack_require__(3);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_sweetalert2___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_sweetalert2__);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_jquery__ = __webpack_require__(2);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_jquery___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_jquery__);
 //
 //
 //
@@ -51105,6 +51103,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 
 
 
+
 /* harmony default export */ __webpack_exports__["default"] = {
   created: function () {
     this.update();
@@ -51130,15 +51129,10 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
         this.server = this.$root.servers[parseInt(this.$root.serversId[this.$route.params.id])];
       }
       var self = this;
-      var req = new XMLHttpRequest();
-      req.open('GET', '/api/servers/get/'+this.$route.params.id);
-      req.send(null);
-      req.onreadystatechange = function () {
-        if (req.readyState == XMLHttpRequest.DONE &&
-          req.status === 200) {
-          self.details = JSON.parse(req.response);
-        }
-      };
+      __WEBPACK_IMPORTED_MODULE_1_jquery___default.a.getJSON('/api/servers/get/'+this.$route.params.id)
+        .done(function (details) {
+          self.details = details;
+        });
     },
     remove: function (id) {
       var self = this;
@@ -51151,16 +51145,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
         cancelButtonColor: '#d33',
         confirmButtonText: 'Yes, delete it!'
       }).then(function () {
-        var req = new XMLHttpRequest();
-        req.open('GET', '/api/servers/remove/'+ id);
-        req.send(null);
-        req.onreadystatechange = function () {
-          if (req.readyState == XMLHttpRequest.DONE &&
-            req.status === 200) {
-          }
-        };
+        __WEBPACK_IMPORTED_MODULE_1_jquery___default.a.getJSON('/api/servers/remove/'+ id)
+          .done(function (res) {
+
+          });
         self.$router.push("/");
-      }, function () {
       }).catch(console.log);
     }
   }
@@ -51172,7 +51161,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
+/* WEBPACK VAR INJECTION */(function($) {Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 //
 //
 //
@@ -51214,12 +51203,8 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
   methods: {
     update: function () {
       var self = this;
-      var req = new XMLHttpRequest();
-      req.open('GET', '/api/details');
-      req.send(null);
-      req.onreadystatechange = function () {
-        if (req.readyState == XMLHttpRequest.DONE &&
-          req.status === 200) {
+      $.getJSON('/api/details')
+        .done(function () {
           self.servers = JSON.parse(req.response);
           var a;
           self.$root.servers = self.servers;
@@ -51231,12 +51216,12 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
             var obj = self.servers[a];
             self.$root.serversId[obj.id] = a;
           }
-        }
-      };
+        });
     }
   }
 };
 
+/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(2)))
 
 /***/ }),
 /* 179 */
@@ -51355,18 +51340,12 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
             return;
           }
           // Request
-          var req_add = new XMLHttpRequest();
-          req_add.open('POST', '/api/servers/add');
-          req_add.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-          req_add.onreadystatechange = function () {
-            if (req_add.readyState == XMLHttpRequest.DONE &&
-              req_add.status === 200) {
-                self.$router.push("/");
-                form.find("input, select").val("");
-                self.onSubmit();
-            }
-          };
-          req_add.send(form.serialize());
+          __WEBPACK_IMPORTED_MODULE_1_jquery___default.a.post('/api/servers/add', form.serialize())
+            .done(function () {
+              self.$router.push("/");
+              form.find("input, select").val("");
+              self.onSubmit();
+            });
       });
     }
   }
@@ -51378,7 +51357,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
+/* WEBPACK VAR INJECTION */(function($) {Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_chart_js__ = __webpack_require__(125);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_chart_js___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_chart_js__);
 //
@@ -51514,7 +51493,6 @@ var generateTemplate = function(){
           return -1;
         }
         var self = this;
-        var req = new XMLHttpRequest();
         var date = new Date();
         var year = date.getUTCFullYear();
         var month = date.getUTCMonth() + 1;
@@ -51529,73 +51507,70 @@ var generateTemplate = function(){
         url += year;
         url += "/day";
         // console.log(url);
-        req.open('GET', url);
-        req.onreadystatechange = function () {
-          if (req.readyState == XMLHttpRequest.DONE &&
-            req.status === 200) {
-              var obj = JSON.parse(req.response);
-              if(obj.length <= 0){
-                return -1;
+        $.getJSON(url)
+          .done(function (obj) {
+            if(obj.length <= 0){
+              return -1;
+            }
+            self.graphdata.datasets[0].data = [];
+            self.graphdata.datasets = [];
+            var firstStamp = new Date(obj[0].createdAt);
+            self.stamp = firstStamp;
+            var dataset = {
+              label: "Traffic",
+              data: [],
+              labels: []
+            };
+            // console.log(dataset);
+            dataset = Object.assign({}, generateTemplate(), dataset)
+            var lastStamp = firstStamp/1000;
+            var gap = firstStamp/1000 - new Date(obj[1].createdAt)/1000;
+            gap = Math.abs(Math.floor(gap));
+            obj.forEach(function (el) {
+              var stamp = new Date(el.createdAt) - firstStamp;
+              stamp /= 1000;
+              // console.log("Gap: ", gap);
+              // console.log("Stamp: ", stamp);
+              // console.log("lastStamp: ", lastStamp);
+              // console.log(stamp-lastStamp);
+              if(stamp-lastStamp >  2*gap){
+                // console.log("Dataset ", dataset);
+                self.graphdata.datasets.push(dataset);
+                dataset = {
+                  label: "Traffic",
+                  data: [],
+                  labels: []
+                };
+                dataset = Object.assign({}, generateTemplate(), dataset)
               }
-              self.graphdata.datasets[0].data = [];
-              self.graphdata.datasets = [];
-              var firstStamp = new Date(obj[0].createdAt);
-              self.stamp = firstStamp;
-              var dataset = {
-                label: "Traffic",
-                data: [],
-                labels: []
-              };
-              // console.log(dataset);
-              dataset = Object.assign({}, generateTemplate(), dataset)
-              var lastStamp = firstStamp/1000;
-              var gap = firstStamp/1000 - new Date(obj[1].createdAt)/1000;
-              gap = Math.abs(Math.floor(gap));
-              obj.forEach(function (el) {
-                var stamp = new Date(el.createdAt) - firstStamp;
-                stamp /= 1000;
-                // console.log("Gap: ", gap);
-                // console.log("Stamp: ", stamp);
-                // console.log("lastStamp: ", lastStamp);
-                // console.log(stamp-lastStamp);
-                if(stamp-lastStamp >  2*gap){
-                  // console.log("Dataset ", dataset);
-                  self.graphdata.datasets.push(dataset);
-                  dataset = {
-                    label: "Traffic",
-                    data: [],
-                    labels: []
-                  };
-                  dataset = Object.assign({}, generateTemplate(), dataset)
-                }
-                lastStamp = stamp;
-                stamp /= 60;
-                stamp = Math.floor(stamp);
-                stamp = new Date(el.createdAt);
-                dataset.data.push({
-                  x: stamp,
-                  y: el.players
-                });
-                // self.graphdata.datasets[0].data.push({
-                //   x: stamp,
-                //   y: el.players
-                // });
-                // dataset.labels.push(new Date(el.createdAt).toLocaleTimeString());
-                self.labels[stamp] = new Date(el.createdAt).toLocaleTimeString();
+              lastStamp = stamp;
+              stamp /= 60;
+              stamp = Math.floor(stamp);
+              stamp = new Date(el.createdAt);
+              dataset.data.push({
+                x: stamp,
+                y: el.players
               });
-              // console.log("Dataset ", dataset);
-              // self.graphdata.datasets.push(dataset);
-              self.graphdata.datasets.push(dataset);
-              self.graphdata = JSON.parse(JSON.stringify(self.graphdata));
-              // console.log("Graphdata ", self.graphdata);
-              self.update();
-          }
-        };
-        req.send(null);
+              // self.graphdata.datasets[0].data.push({
+              //   x: stamp,
+              //   y: el.players
+              // });
+              // dataset.labels.push(new Date(el.createdAt).toLocaleTimeString());
+              self.labels[stamp] = new Date(el.createdAt).toLocaleTimeString();
+            });
+            // console.log("Dataset ", dataset);
+            // self.graphdata.datasets.push(dataset);
+            self.graphdata.datasets.push(dataset);
+            self.graphdata = JSON.parse(JSON.stringify(self.graphdata));
+            // console.log("Graphdata ", self.graphdata);
+            self.update();
+
+          });
       }
     }
   };
 
+/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(2)))
 
 /***/ }),
 /* 181 */
@@ -52105,7 +52080,7 @@ module.exports = function(module) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function($) {Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
+Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_bootstrap_dist_css_bootstrap_css__ = __webpack_require__(115);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_bootstrap_dist_css_bootstrap_css___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_bootstrap_dist_css_bootstrap_css__);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_sweetalert2_dist_sweetalert2_css__ = __webpack_require__(116);
@@ -52114,18 +52089,20 @@ module.exports = function(module) {
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_vue__);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_vue_router__ = __webpack_require__(123);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_vue_router___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_vue_router__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__config_vue__ = __webpack_require__(117);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__config_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4__config_vue__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__serverList_vue__ = __webpack_require__(120);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__serverList_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5__serverList_vue__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__serverDetails_vue__ = __webpack_require__(119);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__serverDetails_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6__serverDetails_vue__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__server_vue__ = __webpack_require__(118);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__server_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7__server_vue__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__serveredit_vue__ = __webpack_require__(121);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__serveredit_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8__serveredit_vue__);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__servergraph_vue__ = __webpack_require__(122);
-/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__servergraph_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_9__servergraph_vue__);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_jquery__ = __webpack_require__(2);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_jquery___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_jquery__);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__config_vue__ = __webpack_require__(117);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__config_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5__config_vue__);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__serverList_vue__ = __webpack_require__(120);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__serverList_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_6__serverList_vue__);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__serverDetails_vue__ = __webpack_require__(119);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__serverDetails_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_7__serverDetails_vue__);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__server_vue__ = __webpack_require__(118);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__server_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_8__server_vue__);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__serveredit_vue__ = __webpack_require__(121);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__serveredit_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_9__serveredit_vue__);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__servergraph_vue__ = __webpack_require__(122);
+/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__servergraph_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_10__servergraph_vue__);
 // import $ from "jquery";
 // import "bootstrap/dist/js/bootstrap.js";
 
@@ -52133,6 +52110,7 @@ module.exports = function(module) {
 
 
 
+
 __WEBPACK_IMPORTED_MODULE_2_vue___default.a.use(__WEBPACK_IMPORTED_MODULE_3_vue_router___default.a);
 
 // Debug mode
@@ -52151,14 +52129,14 @@ __WEBPACK_IMPORTED_MODULE_2_vue___default.a.config.silent = false;
 
 
 
-__WEBPACK_IMPORTED_MODULE_2_vue___default.a.component('server', __WEBPACK_IMPORTED_MODULE_7__server_vue___default.a);
-__WEBPACK_IMPORTED_MODULE_2_vue___default.a.component('serveredit', __WEBPACK_IMPORTED_MODULE_8__serveredit_vue___default.a);
-__WEBPACK_IMPORTED_MODULE_2_vue___default.a.component('servergraph', __WEBPACK_IMPORTED_MODULE_9__servergraph_vue___default.a);
+__WEBPACK_IMPORTED_MODULE_2_vue___default.a.component('server', __WEBPACK_IMPORTED_MODULE_8__server_vue___default.a);
+__WEBPACK_IMPORTED_MODULE_2_vue___default.a.component('serveredit', __WEBPACK_IMPORTED_MODULE_9__serveredit_vue___default.a);
+__WEBPACK_IMPORTED_MODULE_2_vue___default.a.component('servergraph', __WEBPACK_IMPORTED_MODULE_10__servergraph_vue___default.a);
 
 var routes = [
-  { path: "/", component:  __WEBPACK_IMPORTED_MODULE_5__serverList_vue___default.a },
-  { path: "/server/:id", component:  __WEBPACK_IMPORTED_MODULE_6__serverDetails_vue___default.a },
-  { path: "/config", component:  __WEBPACK_IMPORTED_MODULE_4__config_vue___default.a }
+  { path: "/", component:  __WEBPACK_IMPORTED_MODULE_6__serverList_vue___default.a },
+  { path: "/server/:id", component:  __WEBPACK_IMPORTED_MODULE_7__serverDetails_vue___default.a },
+  { path: "/config", component:  __WEBPACK_IMPORTED_MODULE_5__config_vue___default.a }
 ];
 
 const router = new __WEBPACK_IMPORTED_MODULE_3_vue_router___default.a({
@@ -52166,7 +52144,7 @@ const router = new __WEBPACK_IMPORTED_MODULE_3_vue_router___default.a({
   mode: 'history'
 });
 
-$(function () {
+__WEBPACK_IMPORTED_MODULE_4_jquery___default()(function () {
   var app = new __WEBPACK_IMPORTED_MODULE_2_vue___default.a({
     router: router,
     el: "#statsApp",
@@ -52177,22 +52155,13 @@ $(function () {
     },
     created: function(){
       var self = this;
-      var types = new XMLHttpRequest();
-      types.open('GET', '/api/types');
-      types.send(null);
-      types.onreadystatechange = function () {
-        if (types.readyState == XMLHttpRequest.DONE &&
-          types.status === 200) {
-          self.types = JSON.parse(types.response);
-        }
-      };
-      var serverCache = new XMLHttpRequest();
-      serverCache.open('GET', '/api/details/cached');
-      serverCache.send(null);
-      serverCache.onreadystatechange = function () {
-        if (serverCache.readyState == XMLHttpRequest.DONE &&
-          serverCache.status === 200) {
-          self.$root.servers = JSON.parse(serverCache.response);
+      __WEBPACK_IMPORTED_MODULE_4_jquery___default.a.getJSON('/api/types')
+        .done(function (types) {
+          self.types = types;
+        });
+      __WEBPACK_IMPORTED_MODULE_4_jquery___default.a.getJSON('/api/details/cached')
+        .done(function (res) {
+          self.$root.servers = res;
           self.$root.serversId = {};
           for (var a in self.servers) {
             if (!self.servers.hasOwnProperty(a)) {
@@ -52201,16 +52170,11 @@ $(function () {
             var obj = self.servers[a];
             self.$root.serversId[obj.id] = a;
           }
-        }
-      };
+        });
       if(this.$route.path !== "/"){
-        var server = new XMLHttpRequest();
-        server.open('GET', '/api/details');
-        server.send(null);
-        server.onreadystatechange = function () {
-          if (server.readyState == XMLHttpRequest.DONE &&
-            server.status === 200) {
-            self.$root.servers = JSON.parse(server.response);
+        __WEBPACK_IMPORTED_MODULE_4_jquery___default.a.getJSON('/api/details')
+          .done(function (details) {
+            self.$root.servers = details;
             self.$root.serversId = {};
             for (var a in self.servers) {
               if (!self.servers.hasOwnProperty(a)) {
@@ -52219,14 +52183,12 @@ $(function () {
               var obj = self.servers[a];
               self.$root.serversId[obj.id] = a;
             }
-          }
-        };
+          });
       }
     }
   });//.$mount("#statsApp");
 });
 
-/* WEBPACK VAR INJECTION */}.call(__webpack_exports__, __webpack_require__(2)))
 
 /***/ })
 /******/ ]);

+ 13 - 27
webSource/index.js

@@ -4,6 +4,7 @@ import "bootstrap/dist/css/bootstrap.css";
 import "sweetalert2/dist/sweetalert2.css";
 import Vue from "vue";
 import VueRouter from "vue-router";
+import $ from "jquery";
 
 Vue.use(VueRouter);
 
@@ -49,22 +50,13 @@ $(function () {
     },
     created: function(){
       var self = this;
-      var types = new XMLHttpRequest();
-      types.open('GET', '/api/types');
-      types.send(null);
-      types.onreadystatechange = function () {
-        if (types.readyState == XMLHttpRequest.DONE &&
-          types.status === 200) {
-          self.types = JSON.parse(types.response);
-        }
-      };
-      var serverCache = new XMLHttpRequest();
-      serverCache.open('GET', '/api/details/cached');
-      serverCache.send(null);
-      serverCache.onreadystatechange = function () {
-        if (serverCache.readyState == XMLHttpRequest.DONE &&
-          serverCache.status === 200) {
-          self.$root.servers = JSON.parse(serverCache.response);
+      $.getJSON('/api/types')
+        .done(function (types) {
+          self.types = types;
+        });
+      $.getJSON('/api/details/cached')
+        .done(function (res) {
+          self.$root.servers = res;
           self.$root.serversId = {};
           for (var a in self.servers) {
             if (!self.servers.hasOwnProperty(a)) {
@@ -73,16 +65,11 @@ $(function () {
             var obj = self.servers[a];
             self.$root.serversId[obj.id] = a;
           }
-        }
-      };
+        });
       if(this.$route.path !== "/"){
-        var server = new XMLHttpRequest();
-        server.open('GET', '/api/details');
-        server.send(null);
-        server.onreadystatechange = function () {
-          if (server.readyState == XMLHttpRequest.DONE &&
-            server.status === 200) {
-            self.$root.servers = JSON.parse(server.response);
+        $.getJSON('/api/details')
+          .done(function (details) {
+            self.$root.servers = details;
             self.$root.serversId = {};
             for (var a in self.servers) {
               if (!self.servers.hasOwnProperty(a)) {
@@ -91,8 +78,7 @@ $(function () {
               var obj = self.servers[a];
               self.$root.serversId[obj.id] = a;
             }
-          }
-        };
+          });
       }
     }
   });//.$mount("#statsApp");

+ 3 - 7
webSource/server.vue

@@ -58,19 +58,15 @@ export default {
         confirmButtonText: 'Yes, delete it!'
       }).then(function () {
         var req = new XMLHttpRequest();
-        req.open('GET', '/api/servers/remove/'+ id);
-        req.send(null);
-        req.onreadystatechange = function () {
-          if (req.readyState == XMLHttpRequest.DONE &&
-            req.status === 200) {
+        $.getJSON('/api/servers/remove/'+ id)
+          .done(function (res) {
             self.update();
             var el = $(self.$el);
             el.css("opacity", 0.5);
             var actions = el.find("#actions");
             actions.children().hide();
             actions.append('<img src="svg/loading.svg"></img>');
-          }
-        };
+          });
       }, function () {
       }).catch(console.log);
     }

+ 9 - 18
webSource/serverDetails.vue

@@ -39,6 +39,7 @@
 </template>
 <script>
 import swal from "sweetalert2";
+import $ from "jquery";
 
 export default {
   created: function () {
@@ -65,15 +66,10 @@ export default {
         this.server = this.$root.servers[parseInt(this.$root.serversId[this.$route.params.id])];
       }
       var self = this;
-      var req = new XMLHttpRequest();
-      req.open('GET', '/api/servers/get/'+this.$route.params.id);
-      req.send(null);
-      req.onreadystatechange = function () {
-        if (req.readyState == XMLHttpRequest.DONE &&
-          req.status === 200) {
-          self.details = JSON.parse(req.response);
-        }
-      };
+      $.getJSON('/api/servers/get/'+this.$route.params.id)
+        .done(function (details) {
+          self.details = details;
+        });
     },
     remove: function (id) {
       var self = this;
@@ -86,16 +82,11 @@ export default {
         cancelButtonColor: '#d33',
         confirmButtonText: 'Yes, delete it!'
       }).then(function () {
-        var req = new XMLHttpRequest();
-        req.open('GET', '/api/servers/remove/'+ id);
-        req.send(null);
-        req.onreadystatechange = function () {
-          if (req.readyState == XMLHttpRequest.DONE &&
-            req.status === 200) {
-          }
-        };
+        $.getJSON('/api/servers/remove/'+ id)
+          .done(function (res) {
+
+          });
         self.$router.push("/");
-      }, function () {
       }).catch(console.log);
     }
   }

+ 3 - 8
webSource/serverList.vue

@@ -39,12 +39,8 @@ export default {
   methods: {
     update: function () {
       var self = this;
-      var req = new XMLHttpRequest();
-      req.open('GET', '/api/details');
-      req.send(null);
-      req.onreadystatechange = function () {
-        if (req.readyState == XMLHttpRequest.DONE &&
-          req.status === 200) {
+      $.getJSON('/api/details')
+        .done(function () {
           self.servers = JSON.parse(req.response);
           var a;
           self.$root.servers = self.servers;
@@ -56,8 +52,7 @@ export default {
             var obj = self.servers[a];
             self.$root.serversId[obj.id] = a;
           }
-        }
-      };
+        });
     }
   }
 }

+ 6 - 12
webSource/serveredit.vue

@@ -105,18 +105,12 @@ export default {
             return;
           }
           // Request
-          var req_add = new XMLHttpRequest();
-          req_add.open('POST', '/api/servers/add');
-          req_add.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-          req_add.onreadystatechange = function () {
-            if (req_add.readyState == XMLHttpRequest.DONE &&
-              req_add.status === 200) {
-                self.$router.push("/");
-                form.find("input, select").val("");
-                self.onSubmit();
-            }
-          };
-          req_add.send(form.serialize());
+          $.post('/api/servers/add', form.serialize())
+            .done(function () {
+              self.$router.push("/");
+              form.find("input, select").val("");
+              self.onSubmit();
+            });
       });
     }
   }

+ 57 - 62
webSource/servergraph.vue

@@ -131,7 +131,6 @@ var generateTemplate = function(){
           return -1;
         }
         var self = this;
-        var req = new XMLHttpRequest();
         var date = new Date();
         var year = date.getUTCFullYear();
         var month = date.getUTCMonth() + 1;
@@ -146,69 +145,65 @@ var generateTemplate = function(){
         url += year;
         url += "/day";
         // console.log(url);
-        req.open('GET', url);
-        req.onreadystatechange = function () {
-          if (req.readyState == XMLHttpRequest.DONE &&
-            req.status === 200) {
-              var obj = JSON.parse(req.response);
-              if(obj.length <= 0){
-                return -1;
+        $.getJSON(url)
+          .done(function (obj) {
+            if(obj.length <= 0){
+              return -1;
+            }
+            self.graphdata.datasets[0].data = [];
+            self.graphdata.datasets = [];
+            var firstStamp = new Date(obj[0].createdAt);
+            self.stamp = firstStamp;
+            var dataset = {
+              label: "Traffic",
+              data: [],
+              labels: []
+            };
+            // console.log(dataset);
+            dataset = Object.assign({}, generateTemplate(), dataset)
+            var lastStamp = firstStamp/1000;
+            var gap = firstStamp/1000 - new Date(obj[1].createdAt)/1000;
+            gap = Math.abs(Math.floor(gap));
+            obj.forEach(function (el) {
+              var stamp = new Date(el.createdAt) - firstStamp;
+              stamp /= 1000;
+              // console.log("Gap: ", gap);
+              // console.log("Stamp: ", stamp);
+              // console.log("lastStamp: ", lastStamp);
+              // console.log(stamp-lastStamp);
+              if(stamp-lastStamp >  2*gap){
+                // console.log("Dataset ", dataset);
+                self.graphdata.datasets.push(dataset);
+                dataset = {
+                  label: "Traffic",
+                  data: [],
+                  labels: []
+                };
+                dataset = Object.assign({}, generateTemplate(), dataset)
               }
-              self.graphdata.datasets[0].data = [];
-              self.graphdata.datasets = [];
-              var firstStamp = new Date(obj[0].createdAt);
-              self.stamp = firstStamp;
-              var dataset = {
-                label: "Traffic",
-                data: [],
-                labels: []
-              };
-              // console.log(dataset);
-              dataset = Object.assign({}, generateTemplate(), dataset)
-              var lastStamp = firstStamp/1000;
-              var gap = firstStamp/1000 - new Date(obj[1].createdAt)/1000;
-              gap = Math.abs(Math.floor(gap));
-              obj.forEach(function (el) {
-                var stamp = new Date(el.createdAt) - firstStamp;
-                stamp /= 1000;
-                // console.log("Gap: ", gap);
-                // console.log("Stamp: ", stamp);
-                // console.log("lastStamp: ", lastStamp);
-                // console.log(stamp-lastStamp);
-                if(stamp-lastStamp >  2*gap){
-                  // console.log("Dataset ", dataset);
-                  self.graphdata.datasets.push(dataset);
-                  dataset = {
-                    label: "Traffic",
-                    data: [],
-                    labels: []
-                  };
-                  dataset = Object.assign({}, generateTemplate(), dataset)
-                }
-                lastStamp = stamp;
-                stamp /= 60;
-                stamp = Math.floor(stamp);
-                stamp = new Date(el.createdAt);
-                dataset.data.push({
-                  x: stamp,
-                  y: el.players
-                });
-                // self.graphdata.datasets[0].data.push({
-                //   x: stamp,
-                //   y: el.players
-                // });
-                // dataset.labels.push(new Date(el.createdAt).toLocaleTimeString());
-                self.labels[stamp] = new Date(el.createdAt).toLocaleTimeString();
+              lastStamp = stamp;
+              stamp /= 60;
+              stamp = Math.floor(stamp);
+              stamp = new Date(el.createdAt);
+              dataset.data.push({
+                x: stamp,
+                y: el.players
               });
-              // console.log("Dataset ", dataset);
-              // self.graphdata.datasets.push(dataset);
-              self.graphdata.datasets.push(dataset);
-              self.graphdata = JSON.parse(JSON.stringify(self.graphdata));
-              // console.log("Graphdata ", self.graphdata);
-              self.update();
-          }
-        };
-        req.send(null);
+              // self.graphdata.datasets[0].data.push({
+              //   x: stamp,
+              //   y: el.players
+              // });
+              // dataset.labels.push(new Date(el.createdAt).toLocaleTimeString());
+              self.labels[stamp] = new Date(el.createdAt).toLocaleTimeString();
+            });
+            // console.log("Dataset ", dataset);
+            // self.graphdata.datasets.push(dataset);
+            self.graphdata.datasets.push(dataset);
+            self.graphdata = JSON.parse(JSON.stringify(self.graphdata));
+            // console.log("Graphdata ", self.graphdata);
+            self.update();
+
+          });
       }
     }
   }