Replace loggedIn with id_user

Now, when we have the id_user variable, the value loggedIn is not
needed anymore, because its value corresponds to whether the id_user
is set or not.

diff --git a/templates/main.js b/templates/main.js
index daca42ca24abaf2aa0201af60a5ad168d956c292..23f1992309f997e2c16a732ea29595347e095b7c 100644 (file)
--- a/templates/main.js
+++ b/templates/main.js
@@ -3,7 +3,6 @@ var flask = "{{ url_for('hello', _external=True) }}"
 // State variables
 
 var updateRemote = undefined;   // defined iff remote server accessible
-var loggedIn = false;           // true after swiping the cards
 var timeToLogout = undefined;   // defined during logout countdown
 var logoutTimer;
 var reloadTimer = undefined;
@@ -53,7 +52,7 @@ function updateUI()
     } else {
         document.getElementById("local").style.display = "none";
 
-        if (loggedIn) {
+        if (id_user !== undefined) {
             document.getElementById("nextStep").innerHTML = "Now select a beverage on the coffee machine…";
         } else {
             document.getElementById("nextStep").innerHTML = "Enjoy your " + flavorChosen + "!";
@@ -156,7 +155,6 @@ function ajax(method, route, data, id) {
 
 function login(id) {
     ajax("POST", "login", id, "user");
-    loggedIn = true;
     id_user = id;
     clearTimeout(logoutTimer);
     timeToLogout = undefined;
@@ -165,7 +163,6 @@ function login(id) {
 function logout() {
     sendReset();
     ajax("GET", "logout", "", "user");
-    loggedIn = false;
     id_user = undefined;
     timeToLogout = undefined;
 }
@@ -201,10 +198,9 @@ function addCoffee(flavor) {
         flavor: flavor,
         uid: id_user
     });
-    if (loggedIn) {
+    if (id_user) {
         ajax("POST", "coffee/add", data, "user");
         flavorChosen = flavor;
-        loggedIn = false;
         id_user = undefined;
         countingTimeLogout(10); //mean 10 seconds
     }