removed settimeout redirects

futurice · Mar 20, 2019 · 94cfcbf · 94cfcbf
1 parent dedc4b7
commit 94cfcbf
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/OodiUI/__init__.py b/OodiUI/__init__.py
@@ -26,9 +26,12 @@ def start_screen():
 
     @app.route('/main', methods=['POST', 'GET'])
     def search_screen():
-        config = Path("/Users/nulm/Desktop/OodiMir/OodiUI/static/direction.txt")
-        if config.is_file():
-            os.remove("/Users/nulm/Desktop/OodiMir/OodiUI/static/direction.txt")
+        #config = Path("/Users/nulm/Desktop/OodiMir/OodiUI/static/direction.txt")
+        #if config.is_file():
+        #    os.remove("/Users/nulm/Desktop/OodiMir/OodiUI/static/direction.txt")
+        #config2 = Path("/Users/nulm/Desktop/OodiMir/OodiUI/static/home.txt")
+        #if config2.is_file():
+        #    os.remove("/Users/nulm/Desktop/OodiMir/OodiUI/static/home.txt")
         #if request.method == 'POST':
             #searchterm = request.form['searchfield']
             #error = None
@@ -121,10 +124,10 @@ def mission_finished():
     def go_home():
         msg = "-"
         #look for a file and if the file contains "home" then redirect to the start page
-        config = Path("/Users/nulm/Desktop/OodiMir/OodiUI/static/home.txt")
+        config = Path("/Users/nulm/Desktop/OodiMir/OodiUI/static/direction.txt")
         if config.is_file():
             print("file exists")
-            f = open("/Users/nulm/Desktop/OodiMir/OodiUI/static/home.txt", "r")
+            f = open("/Users/nulm/Desktop/OodiMir/OodiUI/static/direction.txt", "r")
             msg = f.read()
             msg = msg.rstrip('\n')
             return msg

diff --git a/OodiUI/static/arrow.js b/OodiUI/static/arrow.js
@@ -17,20 +17,23 @@ $(document).ready(function(){
           $("#leftarrow").show();
           $("#lookleft").show();
           console.log("look to your left");
-          setTimeout(redirect, 5000);
+          //setTimeout(redirect, 5000);
         }
         else if (data == "r") {
           $("#rightarrow").show();
           $("#lookright").show();
-          setTimeout(redirect, 5000);
+          //setTimeout(redirect, 5000);
           console.log("you will be directed to right");
         }
         else if (data == "lr") {
           $("#leftrightarrow").show();
           $("#lookboth").show();
-          setTimeout(redirect, 5000);
+          //setTimeout(redirect, 5000);
           console.log("look at both sides");
         }
+        else if (data == "home") {
+          window.location.replace("/going_home");
+        }
       }
 
     });

diff --git a/OodiUI/static/direction.txt b/OodiUI/static/direction.txt
@@ -1 +1 @@
-l
+home2
diff --git a/OodiUI/static/home.js b/OodiUI/static/home.js
@@ -9,9 +9,11 @@ $(document).ready(function(){
         if (data == "-") {
           console.log("Home far away");
         }
-        else if (data == "home") {
+        else if (data == "home2") {
           console.log("Back home yay");
-          setTimeout(redirect_home, 5000);
+          window.location.replace("/");
+        //setTimeout(redirect_home, 5000);
+
         }
       }