From a04a7d0ba91bbf6b421377fafb35eefacbb0cc26 Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Sat, 20 Jan 2018 23:01:47 -0500 Subject: [PATCH 1/2] minor bugs --- SmearcarDB/server.py | 1 - SmearcarDB/static/index.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/SmearcarDB/server.py b/SmearcarDB/server.py index 65cd0d1..cbba62e 100644 --- a/SmearcarDB/server.py +++ b/SmearcarDB/server.py @@ -12,7 +12,6 @@ app.config.update( try: with open("save.p", "rb") as f: database = pickle.load(f) - print("Loaded", database) except (FileNotFoundError) as e: database = {'languages': [], 'phonemes': [], diff --git a/SmearcarDB/static/index.js b/SmearcarDB/static/index.js index 3825160..a68815e 100644 --- a/SmearcarDB/static/index.js +++ b/SmearcarDB/static/index.js @@ -66,11 +66,10 @@ function getData() { console.log(e); } ); - console.log(data); } function language(language) { - return data.languages.filter(function(element) { + return data.values.filter(function(element) { return element.name === language; }); } From 5818b90a60d6aee4af21e5b441188c0fce9a2b02 Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Sat, 20 Jan 2018 23:07:54 -0500 Subject: [PATCH 2/2] fix serverURL --- SmearcarDB/static/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SmearcarDB/static/index.js b/SmearcarDB/static/index.js index ecbed2b..e74c182 100644 --- a/SmearcarDB/static/index.js +++ b/SmearcarDB/static/index.js @@ -1,5 +1,5 @@ var navSelect = "home"; -var serverURL = "http://localhost:5000"; +var serverURL = window.location.href; var data; var navi = [ // Array containing navigation items in form [Font-Awesome class name, Display Text, Onclick function]. @@ -55,7 +55,7 @@ function updateNav(op) { function getData() { $.ajax({ - url: serverURL + '/server', + url: serverURL + 'server', type: 'GET' }) .then(