Merge

SmearcarDB/static/index.js

@@ -1,5 +1,5 @@
 var navSelect = "home";
-var serverURL = "http://localhost:5000";
+var serverURL = window.location.href;
 var data;
 
 
@@ -63,24 +63,23 @@ function updateNav(op) {
 
 function getData() {
     $.ajax({
-        url: serverURL + '/server',
+            url: serverURL + 'server',
-        type: 'GET'
+            type: 'GET'
-    })
+        })
-    .then(
+        .then(
-        function success(incoming) {
+            function success(incoming) {
-            data = incoming;
+                data = incoming;
-            generateDropOp();
+                generateDropOp();
-            createDrop();
+                createDrop();
-            console.log(data);
+            },
-        },
+            function error(e) {
-        function error(e) {
+                console.log(e);
-            console.log(e);
+            }
-        }
+        );
-    );
 }
 
 function language(language) {
-    return data.languages.filter(function(element) {
+    return data.values.filter(function(element) {
         return element.name === language;
     });
 }