From 086bf17b18fe93ebd05d2336bb6c10316619a0d7 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Mon, 18 Sep 2017 21:39:59 +0800
Subject: [PATCH 01/25] hope

---
 views/djRoom.hbs | 9 +++++++--
 views/home.hbs   | 8 ++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 17b0ac6..72e3607 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -145,6 +145,7 @@ else {
       socket.emit('specialClose', {"roomName": roomName, "roomId": roomId, spotifyId: localStorage.getItem('spotifyId')});
       localStorage.setItem("closing", "true");
     }
+    localStorage.setItem('active', 'false');
     clearInterval(clearId);
   });
 }
@@ -154,6 +155,9 @@ else {
 socket.on('connect', function(){
 
   //console.log('Connected!');
+  if(localStorage.getItem('active') === 'true'){
+    window.location.href = '/multipleTabs';
+  }
 
   clearId = setInterval(function () {
     socket.emit("toRefresh", localStorage.getItem("refreshToken"));
@@ -162,15 +166,16 @@ socket.on('connect', function(){
   if(localStorage.getItem('closing') === "true"){
     window.location.href = '/';
   }
-
   else{
-    socket.emit('active',localStorage.getItem('spotifyId'))
+    socket.emit('active',localStorage.getItem('spotifyId'));
+    localStorage.setItem('active', 'true');
     var djObject = {
       roomName: roomName,
       accessToken: localStorage.getItem('accessToken')
     }
     socket.emit('createRoom', djObject);
   }
+
 })
 
 /* sets new access token after refresh */
diff --git a/views/home.hbs b/views/home.hbs
index 76d91be..da16310 100644
--- a/views/home.hbs
+++ b/views/home.hbs
@@ -189,11 +189,15 @@ and (max-device-width : 480px) {
       localStorage.setItem("spotifyId", spotifyId);
       localStorage.setItem("imageURL", imageURL);
       localStorage.setItem("username", username);
-      localStorage.setItem('closing', "false");
-      localStorage.setItem('leaving', "false");
       localStorage.setItem('accessToken', accessToken);
       localStorage.setItem('refreshToken', refreshToken);
+      var a = localStorage.getItem('active');
+      if((a && a === 'false') || !localStorage.getItem('closing'))localStorage.setItem('closing', 'false');
+
+      localStorage.setItem('leaving', "false");
+
       getPlayback();
+
       $(document).on('click','#songTest' ,function() {
 
         $.ajax({

From 0475aba6fc35a619bddb9d4b2ec8de436bcc183e Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Mon, 18 Sep 2017 22:00:05 +0800
Subject: [PATCH 02/25] this works ?

---
 views/djRoom.hbs | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 72e3607..45db704 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -100,6 +100,7 @@ var socket = io();
 var clearId = -1;
 var isDJ = true;
 var userDJSpotifyId = '';
+var unload = 0; // set to 1 when refresh or duplicated tab is closing so that specialClose does not happen...
 new Clipboard('#shareable');
 
 
@@ -141,12 +142,12 @@ else {
 
   /* after refresh or close tab*/
   $(window).on("unload", function(){
-    if(localStorage.getItem('closing') === 'false'){
+    if(localStorage.getItem('closing') === 'false' && unload === 0){
       socket.emit('specialClose', {"roomName": roomName, "roomId": roomId, spotifyId: localStorage.getItem('spotifyId')});
       localStorage.setItem("closing", "true");
+      localStorage.setItem('active', 'false');
+      clearInterval(clearId);
     }
-    localStorage.setItem('active', 'false');
-    clearInterval(clearId);
   });
 }
 
@@ -156,24 +157,27 @@ socket.on('connect', function(){
 
   //console.log('Connected!');
   if(localStorage.getItem('active') === 'true'){
+    unload = 1;
     window.location.href = '/multipleTabs';
   }
+  else {
+    clearId = setInterval(function () {
+      socket.emit("toRefresh", localStorage.getItem("refreshToken"));
+    }, 20*60000);
 
-  clearId = setInterval(function () {
-    socket.emit("toRefresh", localStorage.getItem("refreshToken"));
-  }, 20*60000);
-
-  if(localStorage.getItem('closing') === "true"){
-    window.location.href = '/';
-  }
-  else{
-    socket.emit('active',localStorage.getItem('spotifyId'));
-    localStorage.setItem('active', 'true');
-    var djObject = {
-      roomName: roomName,
-      accessToken: localStorage.getItem('accessToken')
+    if(localStorage.getItem('closing') === 'true'){
+      unload = 1;
+      window.location.href = '/';
+    }
+    else{
+      socket.emit('active',localStorage.getItem('spotifyId'));
+      localStorage.setItem('active', 'true');
+      var djObject = {
+        roomName: roomName,
+        accessToken: localStorage.getItem('accessToken')
+      }
+      socket.emit('createRoom', djObject);
     }
-    socket.emit('createRoom', djObject);
   }
 
 })
@@ -336,6 +340,8 @@ $('#djtalkform').on('submit', function(e) {
 $('#closeRoom').on('click', function(event){
   console.log("reached front end destination");
   localStorage.setItem('closing', 'true');
+  localStorage.setItem('active', 'false');
+  clearInterval(clearId);
   socket.emit('closingRoom', {"roomName": roomName, "roomId": roomId, spotifyId: localStorage.getItem('spotifyId')});
   $(window).unbind('beforeunload');
   window.location = $(this).attr('data-url');

From ff121dc7a09164b1a2bfe8ed94c447452ca66f76 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Mon, 18 Sep 2017 22:06:37 +0800
Subject: [PATCH 03/25] er

---
 views/createRoom.hbs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/views/createRoom.hbs b/views/createRoom.hbs
index 025294b..cbcf862 100644
--- a/views/createRoom.hbs
+++ b/views/createRoom.hbs
@@ -32,11 +32,16 @@ and (max-device-width : 480px) {
 <script type="text/javascript">
 
 
+
 $.ajax({
   url:'/isActive?spotifyId='+localStorage.getItem('spotifyId'),
   success: function(response){
     console.log("reached here", response.active);
     if(response.active === true)window.location.href = '/multipleTabs';
+    else{
+      var a = localStorage.getItem('active');
+      if((a && a === 'false') || !localStorage.getItem('closing'))localStorage.setItem('closing', 'false');
+    }
   },
   error: function(response){
     console.log(response);

From e13521da9079fe8e28064307c0972c41dc4e4f88 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Mon, 18 Sep 2017 22:37:51 +0800
Subject: [PATCH 04/25] here

---
 views/getRooms.hbs |  3 ++
 views/home.hbs     |  3 +-
 views/userRoom.hbs | 86 ++++++++++++++++++++++++++--------------------
 3 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/views/getRooms.hbs b/views/getRooms.hbs
index 2d3e290..2c2abae 100644
--- a/views/getRooms.hbs
+++ b/views/getRooms.hbs
@@ -68,6 +68,9 @@ $.ajax({
   success: function(response){
     console.log("reached here", response);
     if(response.active === true)window.location.href = '/multipleTabs';
+    else {
+      if((a && a === 'false') || !localStorage.getItem('leaving'))localStorage.setItem('leaving', "false");
+    }
   }
 })
 
diff --git a/views/home.hbs b/views/home.hbs
index da16310..46bbe98 100644
--- a/views/home.hbs
+++ b/views/home.hbs
@@ -192,9 +192,10 @@ and (max-device-width : 480px) {
       localStorage.setItem('accessToken', accessToken);
       localStorage.setItem('refreshToken', refreshToken);
       var a = localStorage.getItem('active');
+
       if((a && a === 'false') || !localStorage.getItem('closing'))localStorage.setItem('closing', 'false');
 
-      localStorage.setItem('leaving', "false");
+      if((a && a === 'false') || !localStorage.getItem('leaving'))localStorage.setItem('leaving', "false");
 
       getPlayback();
 
diff --git a/views/userRoom.hbs b/views/userRoom.hbs
index 7b68fec..0ba716e 100644
--- a/views/userRoom.hbs
+++ b/views/userRoom.hbs
@@ -76,7 +76,6 @@ and (max-device-width : 480px) {
 
 <div class="center" id="flames"></div>
 
-
 <div class="modal fade topLevel" id="inRoom" tabindex="-1" role="dialog" aria-labelledby="exampleModalLongTitle" data-backdrop="static" aria-hidden="true">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
@@ -102,7 +101,8 @@ var roomId = '{{room._id}}';
 var socket = io();
 var clearId = -1;
 var isDJ = false;
-var djName = '{{room.djName}}'
+var djName = '{{room.djName}}';
+var unload = 0; // set to 1 to avoid multiple unloading
 new Clipboard('#shareable');
 
 
@@ -151,8 +151,8 @@ if(isSafari){
                 //  console.log(hash)
             if (hash === '') {
               //console.log("unloading safari");
-                  var userObject = {roomId: roomId, spotifyId:localStorage.getItem("spotifyId"), isDJ:isDJ};
-                socket.emit('specialLeave', userObject);
+              var userObject = {roomId: roomId, spotifyId:localStorage.getItem("spotifyId"), isDJ:isDJ};
+              socket.emit('specialLeave', userObject);
               localStorage.setItem("disconnectTime", new Date().getTime());
               clearInterval(clearId);
               socket.emit('leaveRoom', userObject.spotifyId);
@@ -169,12 +169,13 @@ if(isSafari){
 
 /* happens on refresh and close tab */
 $(window).on("unload", function(){
-  if(localStorage.getItem('leaving') === "false"){
+  if(localStorage.getItem('leaving') === "false" && unload === 0){
     var userObject = {roomId: roomId, spotifyId:localStorage.getItem("spotifyId"), isDJ:isDJ};
     socket.emit('specialLeave', userObject);
     localStorage.setItem("disconnectTime", new Date().getTime());
+    localStorage.setItem('active', 'false');
+    clearInterval(clearId);
   }
-  clearInterval(clearId);
 });
 
 /* user sends request */
@@ -210,6 +211,8 @@ $('#shareable').on('click', function() {
 if he is dj, passes aux back to host */
 $('#userLeave').on('click', function(event){
   localStorage.setItem('leaving', 'true');
+  localStorage.setItem('active', 'false');
+  clearInterval(clearId);
   if(isDJ){
     socket.emit('userDJLeaving', roomName);
   }
@@ -258,40 +261,49 @@ socket.on('takeBack', function(){
 /* Checking connnection to socket */
 socket.on('connect', function() {
 
-  socket.emit("toRefresh", localStorage.getItem("refreshToken"));
-  clearId = setInterval(function () {
+  if(localStorage.getItem('active') === 'true'){
+    unload = 1;
+    window.location.href = '/multipleTabs';
+  }else {
+
     socket.emit("toRefresh", localStorage.getItem("refreshToken"));
-  }, 30*60000 );
-
-  var userObject = {
-    roomId: roomId,
-    roomName: roomName,
-    spotifyId: localStorage.getItem('spotifyId'),
-    imageURL: localStorage.getItem('imageURL'),
-    username: localStorage.getItem('username')
-  }
 
-  if(localStorage.getItem("disconnectTime") && (new Date().getTime() - localStorage.getItem("disconnectTime") < 3000)){
-      //console.log("this was a refresh");
-      //console.log("userObject", userObject);
-      socket.emit("userRefreshed", userObject);
-      socket.emit('active', localStorage.getItem('spotifyId'));
-      localStorage.removeItem("disconnectTime");
-  }
-  else{
-    //console.log("new room joined without refresh");
-    socket.emit('isInRoom', {spotifyId:localStorage.getItem('spotifyId'),roomName: roomName});
-    socket.on('isInRoom', function(data){
-      if(data){
-        socket.emit('joinRoom', userObject);
-        /* tells db that user is active to prevent multiple tabs */
+    clearId = setInterval(function () {
+      socket.emit("toRefresh", localStorage.getItem("refreshToken"));
+    }, 30*60000 );
+
+    var userObject = {
+      roomId: roomId,
+      roomName: roomName,
+      spotifyId: localStorage.getItem('spotifyId'),
+      imageURL: localStorage.getItem('imageURL'),
+      username: localStorage.getItem('username')
+    }
+
+    if(localStorage.getItem("disconnectTime") && (new Date().getTime() - localStorage.getItem("disconnectTime") < 3000)){
+        //console.log("this was a refresh");
+        //console.log("userObject", userObject);
+        socket.emit("userRefreshed", userObject);
         socket.emit('active', localStorage.getItem('spotifyId'));
-        socket.emit('getflames');
-      }
-      else {
-        $('#inRoom').modal('show');
-      }
-    })
+        localStorage.setItem('active', 'true');
+        localStorage.removeItem("disconnectTime");
+    }
+    else{
+      //console.log("new room joined without refresh");
+      socket.emit('isInRoom', {spotifyId:localStorage.getItem('spotifyId'),roomName: roomName});
+      socket.on('isInRoom', function(data){
+        if(data){
+          socket.emit('joinRoom', userObject);
+          /* tells db that user is active to prevent multiple tabs */
+          socket.emit('active', localStorage.getItem('spotifyId'));
+          localStorage.setItem('active', 'true');
+          socket.emit('getflames');
+        }
+        else {
+          $('#inRoom').modal('show');
+        }
+      })
+    }
   }
 });
 

From fd72ba3c2d2ffc7979cc2ba566a14cde896932c7 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Mon, 18 Sep 2017 22:46:07 +0800
Subject: [PATCH 05/25] here

---
 routes/index.js    | 2 +-
 views/getRooms.hbs | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/routes/index.js b/routes/index.js
index 3dbac2f..7ec24c5 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -143,7 +143,7 @@ module.exports = function() {
       var euser = room.usersInRoom.find(function(user){
         return user.spotifyId === req.user.spotifyId;
       })
-      if(euser)return;
+      if(euser)res.redirect('/error');
       else {
         var userObject = {
           spotifyId: req.user.spotifyId,
diff --git a/views/getRooms.hbs b/views/getRooms.hbs
index 2c2abae..7151225 100644
--- a/views/getRooms.hbs
+++ b/views/getRooms.hbs
@@ -69,7 +69,10 @@ $.ajax({
     console.log("reached here", response);
     if(response.active === true)window.location.href = '/multipleTabs';
     else {
-      if((a && a === 'false') || !localStorage.getItem('leaving'))localStorage.setItem('leaving', "false");
+      var a = localStorage.getIte('active');
+      if((a && a === 'false') || !localStorage.getItem('leaving')){
+        localStorage.setItem('leaving', "false");
+      }
     }
   }
 })

From 6fedaa6af7302f94619bfb0606266e16397d92ef Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Thu, 21 Sep 2017 14:42:57 +0800
Subject: [PATCH 06/25] before this is good

---
 routes/socketPath.js | 2 +-
 views/djRoom.hbs     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/routes/socketPath.js b/routes/socketPath.js
index 6ce6aae..8b80c2c 100644
--- a/routes/socketPath.js
+++ b/routes/socketPath.js
@@ -185,7 +185,7 @@ module.exports = function(io) {
 
     /* called on disconnect, does not do anything */
     socket.on('disconnect', function() {
-      console.log('user disconnected');
+      console.log('########user disconnected');
     });
 
     ///////////////// USER //////////////////////
diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 45db704..3fa7160 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -182,6 +182,11 @@ socket.on('connect', function(){
 
 })
 
+socket.on('disconnect', function(){
+  console.log("herrererereerere");
+  window.location.href = '/error';
+})
+
 /* sets new access token after refresh */
 socket.on('setNewAccessToken', function(accessToken){
   localStorage.setItem('accessToken', accessToken);
@@ -302,6 +307,7 @@ socket.on('DJTakeBack', function(){
 })
 
 /////////////////////
+
 $('#shareable').on('click', function() {
   $('#shareable').text('Copied!');
   var link = window.location.href;
@@ -314,6 +320,7 @@ $('#shareable').on('click', function() {
 
 
  /* sends message of dj to room */
+
 $('#djtalk').on('click', function() {
   var djTalk = $('#djtalkval').val();
   $('#djtalkval').val('');

From 4a96702efa98a407c1ab8938804c50b98304ff60 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Thu, 21 Sep 2017 15:33:28 +0800
Subject: [PATCH 07/25] here

---
 routes/socketPath.js | 9 +++++----
 views/userRoom.hbs   | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/routes/socketPath.js b/routes/socketPath.js
index 8b80c2c..1ac57bf 100644
--- a/routes/socketPath.js
+++ b/routes/socketPath.js
@@ -150,7 +150,7 @@ module.exports = function(io) {
       .then( user => {
         user.active = true;
         user.save(function(err, user){
-          console.log("changed user active status", user);
+          console.log("changed user active status");
         });
       })
       .catch( err => {
@@ -325,9 +325,10 @@ module.exports = function(io) {
         } else {
           console.log("this room no longer exists");
           Room.remove({'roomName': roomName})
-          .then(() => {
-            console.log("***********Ben - room successfully removed****************************");
-          }).catch((error) => {
+          .then(room => {
+            console.log("*********** room successfully removed ****************************", room);
+          })
+          .catch((error) => {
             console.log("error", error);
           });
           clearInterval(clearID);
diff --git a/views/userRoom.hbs b/views/userRoom.hbs
index 0ba716e..fd1b8c2 100644
--- a/views/userRoom.hbs
+++ b/views/userRoom.hbs
@@ -307,6 +307,7 @@ socket.on('connect', function() {
   }
 });
 
+
 socket.on('getflames', function(count) {
     $('#laflamecount').text(count);
 })

From c02d8fff1299c7d9e8650eb611600286aa145bc1 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Thu, 21 Sep 2017 15:49:45 +0800
Subject: [PATCH 08/25] try 1

---
 routes/socketPath.js | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/routes/socketPath.js b/routes/socketPath.js
index 1ac57bf..32bd36e 100644
--- a/routes/socketPath.js
+++ b/routes/socketPath.js
@@ -92,6 +92,21 @@ module.exports = function(io) {
       })
     }
 
+    function clearRoom(roomName){
+      console.log("clearing room and turning all members inactive");
+      Room.findOne({"roomName":roomName})
+      .then(room => {
+        inActive(room.djSpotifyId);
+        for(var i = 0;i<room.usersInRoom.length;i++){
+          inActive(room.usersInRoom[i].spotifyId);
+        };
+        room.remove();
+      })
+      .catch(err => {
+        console.log(err);
+      })
+    }
+
     ///////////////////// PASS DJ ////////////////////////
 
     /* finds the right user from db. sets accestoken of user to dj token */
@@ -324,13 +339,14 @@ module.exports = function(io) {
           return getDJData(io.sockets.adapter.rooms[roomName].DJToken, roomName);
         } else {
           console.log("this room no longer exists");
-          Room.remove({'roomName': roomName})
-          .then(room => {
-            console.log("*********** room successfully removed ****************************", room);
-          })
-          .catch((error) => {
-            console.log("error", error);
-          });
+          // Room.remove({'roomName': roomName})
+          // .then(room => {
+          //   console.log("*********** room successfully removed ****************************");
+          // })
+          // .catch((error) => {
+          //   console.log("error", error);
+          // });
+          clearRoom(roomName);
           clearInterval(clearID);
         }
       }, 5000);

From 78e34eca16853a102011b33a670c6da9c7f449b2 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Thu, 21 Sep 2017 15:52:48 +0800
Subject: [PATCH 09/25] here

---
 routes/socketPath.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/routes/socketPath.js b/routes/socketPath.js
index 32bd36e..ce4f2e7 100644
--- a/routes/socketPath.js
+++ b/routes/socketPath.js
@@ -96,11 +96,13 @@ module.exports = function(io) {
       console.log("clearing room and turning all members inactive");
       Room.findOne({"roomName":roomName})
       .then(room => {
-        inActive(room.djSpotifyId);
-        for(var i = 0;i<room.usersInRoom.length;i++){
-          inActive(room.usersInRoom[i].spotifyId);
-        };
-        room.remove();
+        if(room){
+          inActive(room.djSpotifyId);
+          for(var i = 0;i<room.usersInRoom.length;i++){
+            inActive(room.usersInRoom[i].spotifyId);
+          };
+          room.remove();
+        }
       })
       .catch(err => {
         console.log(err);

From 977f71a93c0865f9645b055f0890e840ba3190d9 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Thu, 21 Sep 2017 17:42:35 +0800
Subject: [PATCH 10/25] here

---
 routes/socketPath.js | 22 ++++++++++++++++++++++
 views/djRoom.hbs     |  1 -
 views/userRoom.hbs   |  9 ++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/routes/socketPath.js b/routes/socketPath.js
index ce4f2e7..40acf02 100644
--- a/routes/socketPath.js
+++ b/routes/socketPath.js
@@ -392,11 +392,33 @@ module.exports = function(io) {
       socket.to(socket.room).emit('sendgrace');
     })
 
+    /* mantains flame count */
     socket.on('getflames', function() {
       if(socket.room)socket.emit('getflames', io.sockets.adapter.rooms[socket.room].laflame)
 
     })
 
+    socket.on('startPinging', function(spotifyId){
+
+      var flag = true;
+
+      var id = setInterval(function(){
+        flag  = false;
+        socket.emit('ping');
+      }, 30*60000);
+
+      socket.on('pong', function(){
+        flag = true;
+      })
+
+      var id2 = setInterval(function(){
+        if(!flag){
+          console.log("THIS IS AMAZING");
+        }
+      }, 35*60000);
+
+    })
+
     //////////////////// DJ ENDS ///////////////////
   })
 
diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 3fa7160..3a289ad 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -183,7 +183,6 @@ socket.on('connect', function(){
 })
 
 socket.on('disconnect', function(){
-  console.log("herrererereerere");
   window.location.href = '/error';
 })
 
diff --git a/views/userRoom.hbs b/views/userRoom.hbs
index fd1b8c2..4d7b9a9 100644
--- a/views/userRoom.hbs
+++ b/views/userRoom.hbs
@@ -264,7 +264,7 @@ socket.on('connect', function() {
   if(localStorage.getItem('active') === 'true'){
     unload = 1;
     window.location.href = '/multipleTabs';
-  }else {
+  } else {
 
     socket.emit("toRefresh", localStorage.getItem("refreshToken"));
 
@@ -305,6 +305,7 @@ socket.on('connect', function() {
       })
     }
   }
+
 });
 
 
@@ -447,4 +448,10 @@ socket.on('laflame', function(count) {
 
 })
 
+socket.emit('startPinging', localStorage.getItem('spotifyId'));
+
+socket.on('ping', function(){
+  socket.emit('pong');
+})
+
 </script>

From de0e09390f4a3a61f9b5d35fe158eded6b6edba2 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Thu, 21 Sep 2017 17:44:31 +0800
Subject: [PATCH 11/25] here

---
 routes/socketPath.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/routes/socketPath.js b/routes/socketPath.js
index 40acf02..b7f784d 100644
--- a/routes/socketPath.js
+++ b/routes/socketPath.js
@@ -405,9 +405,10 @@ module.exports = function(io) {
       var id = setInterval(function(){
         flag  = false;
         socket.emit('ping');
-      }, 30*60000);
+      }, 7000);
 
       socket.on('pong', function(){
+        console.log("pong recieved");
         flag = true;
       })
 
@@ -415,7 +416,7 @@ module.exports = function(io) {
         if(!flag){
           console.log("THIS IS AMAZING");
         }
-      }, 35*60000);
+      }, 9000);
 
     })
 

From f755994df3f53233ec491977100b8c77ec82ed2b Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Thu, 21 Sep 2017 18:02:17 +0800
Subject: [PATCH 12/25] here

---
 routes/socketPath.js | 3 ++-
 views/userRoom.hbs   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/routes/socketPath.js b/routes/socketPath.js
index b7f784d..7346361 100644
--- a/routes/socketPath.js
+++ b/routes/socketPath.js
@@ -410,9 +410,10 @@ module.exports = function(io) {
       socket.on('pong', function(){
         console.log("pong recieved");
         flag = true;
-      })
+      });
 
       var id2 = setInterval(function(){
+        console.log("flag", flag);
         if(!flag){
           console.log("THIS IS AMAZING");
         }
diff --git a/views/userRoom.hbs b/views/userRoom.hbs
index 4d7b9a9..bc14c1d 100644
--- a/views/userRoom.hbs
+++ b/views/userRoom.hbs
@@ -451,6 +451,7 @@ socket.on('laflame', function(count) {
 socket.emit('startPinging', localStorage.getItem('spotifyId'));
 
 socket.on('ping', function(){
+  console.log("reached here");
   socket.emit('pong');
 })
 

From dcef5cee129d5b972602af92c45fa0a5ee33ca35 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Fri, 22 Sep 2017 14:22:57 +0800
Subject: [PATCH 13/25] here

---
 routes/index.js      |  5 +++--
 routes/socketPath.js | 49 ++++++++++++++++++++++++++------------------
 views/djRoom.hbs     |  6 +++---
 views/userRoom.hbs   | 14 +++++++++----
 4 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/routes/index.js b/routes/index.js
index 7ec24c5..0cb9397 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -107,10 +107,11 @@ module.exports = function() {
       djSpotifyId: req.user.spotifyId,
       imageURL: req.user.imageURL,
       djName: req.user.username
-    })
+    });
+
     newRoom.save(function(err, newRoom) {
       if (err) {
-        res.redirect('/error')
+        res.redirect('/error');
       } else {
         res.redirect('/djRoom/' + newRoom._id);
       }
diff --git a/routes/socketPath.js b/routes/socketPath.js
index 7346361..6a2d0de 100644
--- a/routes/socketPath.js
+++ b/routes/socketPath.js
@@ -322,6 +322,13 @@ module.exports = function(io) {
       }
     });
 
+    socket.on('ping', function(data){
+      if(Date.now() - data > 20*1000){
+        console.log("DISCONNECT SOCKET");
+      }
+      else socket.emit('pong', Date.now());
+    });
+
     ////////////////// USER ENDS //////////////////
 
     /////////////////// DJ ///////////////////////
@@ -398,28 +405,30 @@ module.exports = function(io) {
 
     })
 
-    socket.on('startPinging', function(spotifyId){
+    // socket.on('startPinging', function(spotifyId){
+    //
+    //   socket.flag = true;
+    //   socket.spotifyId = spotifyId;
+    //
+    //   var id = setInterval(function(){
+    //     socket.flag  = false;
+    //     socket.emit('ping');
+    //   }, 7000);
+    //
+    //   var id2 = setInterval(function(){
+    //     console.log("flag", socket.flag);
+    //     if(!socket.flag){
+    //       console.log("THIS IS AMAZING");
+    //     }
+    //   }, 9000);
+    //
+    // })
+    //
+    // socket.on('pong', function(){
+    //   socket.flag = true;
+    // })
 
-      var flag = true;
 
-      var id = setInterval(function(){
-        flag  = false;
-        socket.emit('ping');
-      }, 7000);
-
-      socket.on('pong', function(){
-        console.log("pong recieved");
-        flag = true;
-      });
-
-      var id2 = setInterval(function(){
-        console.log("flag", flag);
-        if(!flag){
-          console.log("THIS IS AMAZING");
-        }
-      }, 9000);
-
-    })
 
     //////////////////// DJ ENDS ///////////////////
   })
diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 3a289ad..6dc28a1 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -182,9 +182,9 @@ socket.on('connect', function(){
 
 })
 
-socket.on('disconnect', function(){
-  window.location.href = '/error';
-})
+// socket.on('disconnect', function(){
+//   window.location.href = '/error';
+// })
 
 /* sets new access token after refresh */
 socket.on('setNewAccessToken', function(accessToken){
diff --git a/views/userRoom.hbs b/views/userRoom.hbs
index bc14c1d..f120d35 100644
--- a/views/userRoom.hbs
+++ b/views/userRoom.hbs
@@ -448,11 +448,17 @@ socket.on('laflame', function(count) {
 
 })
 
-socket.emit('startPinging', localStorage.getItem('spotifyId'));
+// socket.emit('startPinging', localStorage.getItem('spotifyId'));
+//
+// socket.on('ping', function(){
+//   console.log("reached here");
+//   socket.emit('pong');
+// })
 
-socket.on('ping', function(){
-  console.log("reached here");
-  socket.emit('pong');
+socket.emit('ping');
+
+socket.on('pong', function(data){
+  socket.emit('ping', data)
 })
 
 </script>

From c33c7c731f2f41cbb3bb84efa0970df14101a892 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Fri, 22 Sep 2017 14:32:45 +0800
Subject: [PATCH 14/25] here

---
 views/djRoom.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 6dc28a1..3c8dc86 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -145,7 +145,7 @@ else {
     if(localStorage.getItem('closing') === 'false' && unload === 0){
       socket.emit('specialClose', {"roomName": roomName, "roomId": roomId, spotifyId: localStorage.getItem('spotifyId')});
       localStorage.setItem("closing", "true");
-      localStorage.setItem('active', 'false');
+      localStorage.setItem('active', 'false'); // changed this
       clearInterval(clearId);
     }
   });

From 1141cc0ab3954cc177d8a03761615fe033083707 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Fri, 22 Sep 2017 14:45:14 +0800
Subject: [PATCH 15/25] here

---
 views/djRoom.hbs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 3c8dc86..903c444 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -123,11 +123,12 @@ if(isSafari){
             socket.emit('specialClose', {"roomName": roomName, "roomId": roomId, spotifyId:localStorage.getItem('spotifyId')});
             clearInterval(clearId);
             localStorage.setItem("closing", "true");
+            localStorage.setItem('active', 'false');
             window.location.href = '/';
           }
         }
       });
-    window.history.pushState('forward', null, './#forward');
+      window.history.pushState('forward', null, './#forward');
     }
   });
 }

From 14dd65315615ade88d56fa7eac90096b07e0cc5c Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Fri, 22 Sep 2017 14:46:50 +0800
Subject: [PATCH 16/25] here

---
 views/createRoom.hbs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/createRoom.hbs b/views/createRoom.hbs
index cbcf862..062475f 100644
--- a/views/createRoom.hbs
+++ b/views/createRoom.hbs
@@ -54,6 +54,7 @@ $('#startRoom').on('click', function() {
 })
 
 var existingRoomNames = '{{existingRoomNames}}';
+existingRoomNames = existingRoomNames.split(" ");
 console.log("existingRoomNames", existingRoomNames);
 
 $('#roomSubmit').on('submit', function (event) {

From a89a28a6629e9cb2cdfdc07f193576c56808301c Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Fri, 22 Sep 2017 14:50:51 +0800
Subject: [PATCH 17/25] here

---
 routes/socketPath.js | 2 +-
 views/userRoom.hbs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/routes/socketPath.js b/routes/socketPath.js
index 6a2d0de..235999e 100644
--- a/routes/socketPath.js
+++ b/routes/socketPath.js
@@ -323,7 +323,7 @@ module.exports = function(io) {
     });
 
     socket.on('ping', function(data){
-      if(Date.now() - data > 20*1000){
+      if(Date.now() - data > 10*1000){
         console.log("DISCONNECT SOCKET");
       }
       else socket.emit('pong', Date.now());
diff --git a/views/userRoom.hbs b/views/userRoom.hbs
index f120d35..8e847ce 100644
--- a/views/userRoom.hbs
+++ b/views/userRoom.hbs
@@ -455,7 +455,7 @@ socket.on('laflame', function(count) {
 //   socket.emit('pong');
 // })
 
-socket.emit('ping');
+socket.emit('ping', Date.now());
 
 socket.on('pong', function(data){
   socket.emit('ping', data)

From 250c80af2f45bd75343f246f2e109ddd57d2a5da Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhannevatia@Yashvardhans-MacBook-Pro.local>
Date: Fri, 22 Sep 2017 19:39:30 +0800
Subject: [PATCH 18/25] testing

---
 routes/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/routes/index.js b/routes/index.js
index 0cb9397..706c4fd 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -6,6 +6,8 @@ var User = models.User;
 var Room = models.Room;
 var existingRoomNames = [];
 
+// testing
+
 module.exports = function() {
 
   /* Check login page. */

From 0772b8f236dd35600d18cc07236eb6e47864c995 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yashvardhan.nevatia@invbots.com>
Date: Sun, 8 Oct 2017 10:38:55 +0800
Subject: [PATCH 19/25] here

---
 app.js               |  2 +-
 routes/auth.js       |  4 ++--
 routes/index.js      |  6 ------
 views/createRoom.hbs |  5 +----
 views/djRoom.hbs     | 25 +++++++++++--------------
 views/getRooms.hbs   |  2 +-
 views/home.hbs       |  6 +++---
 views/userRoom.hbs   |  2 --
 8 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/app.js b/app.js
index 0325962..f71f49d 100644
--- a/app.js
+++ b/app.js
@@ -44,7 +44,7 @@ app.use('/static', express.static(path.join(__dirname, 'public')));
 
 //passport stuff
 
-var session=require('express-session');
+var session = require('express-session');
 app.use(session({ secret: 'auxen production' })); //changed key.
 
 passport.serializeUser(function(user, done) {
diff --git a/routes/auth.js b/routes/auth.js
index 7bc5267..43dd461 100644
--- a/routes/auth.js
+++ b/routes/auth.js
@@ -11,9 +11,9 @@ module.exports = function(passport) {
     res.render('login');
   })
 
-  router.get('/auth/spotify', 
+  router.get('/auth/spotify',
     passport.authenticate('spotify', {
-      scope: ['user-read-email', 'user-read-private', 'user-modify-playback-state', 'user-read-playback-state'] 
+      scope: ['user-read-email', 'user-read-private', 'user-modify-playback-state', 'user-read-playback-state']
     }
   ));
 
diff --git a/routes/index.js b/routes/index.js
index 706c4fd..a4884f1 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -25,15 +25,9 @@ module.exports = function() {
   function ifRedirected(req, res, next){
     if(req.user){
        if(req.user.premium === 'premium'){
-          //   User.findOne({spotifyId:req.user.spotifyId})
-          //   .then(user => {
-          //     if(!user.active)next()
-          //     else res.redirect('/multipleTabs')
-          //   })
           next();
        }
        else res.redirect('/notPremium');
-
     }
     else{
       if(req.session){
diff --git a/views/createRoom.hbs b/views/createRoom.hbs
index 062475f..95c1f57 100644
--- a/views/createRoom.hbs
+++ b/views/createRoom.hbs
@@ -31,8 +31,6 @@ and (max-device-width : 480px) {
 
 <script type="text/javascript">
 
-
-
 $.ajax({
   url:'/isActive?spotifyId='+localStorage.getItem('spotifyId'),
   success: function(response){
@@ -48,13 +46,12 @@ $.ajax({
   }
 })
 
-
 $('#startRoom').on('click', function() {
   $('#roomSubmit').submit();
 })
 
 var existingRoomNames = '{{existingRoomNames}}';
-existingRoomNames = existingRoomNames.split(" ");
+existingRoomNames = existingRoomNames.split(' ');
 console.log("existingRoomNames", existingRoomNames);
 
 $('#roomSubmit').on('submit', function (event) {
diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 903c444..fa368d6 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -145,7 +145,7 @@ else {
   $(window).on("unload", function(){
     if(localStorage.getItem('closing') === 'false' && unload === 0){
       socket.emit('specialClose', {"roomName": roomName, "roomId": roomId, spotifyId: localStorage.getItem('spotifyId')});
-      localStorage.setItem("closing", "true");
+      localStorage.setItem('closing', 'true');
       localStorage.setItem('active', 'false'); // changed this
       clearInterval(clearId);
     }
@@ -161,24 +161,21 @@ socket.on('connect', function(){
     unload = 1;
     window.location.href = '/multipleTabs';
   }
+  if(localStorage.getItem('closing') === 'true'){
+    unload = 1;
+    window.location.href = '/';
+  }
   else {
     clearId = setInterval(function () {
       socket.emit("toRefresh", localStorage.getItem("refreshToken"));
     }, 20*60000);
-
-    if(localStorage.getItem('closing') === 'true'){
-      unload = 1;
-      window.location.href = '/';
-    }
-    else{
-      socket.emit('active',localStorage.getItem('spotifyId'));
-      localStorage.setItem('active', 'true');
-      var djObject = {
-        roomName: roomName,
-        accessToken: localStorage.getItem('accessToken')
-      }
-      socket.emit('createRoom', djObject);
+    socket.emit('active',localStorage.getItem('spotifyId'));
+    localStorage.setItem('active', 'true');
+    var djObject = {
+      roomName: roomName,
+      accessToken: localStorage.getItem('accessToken')
     }
+    socket.emit('createRoom', djObject);
   }
 
 })
diff --git a/views/getRooms.hbs b/views/getRooms.hbs
index 7151225..75158c8 100644
--- a/views/getRooms.hbs
+++ b/views/getRooms.hbs
@@ -69,7 +69,7 @@ $.ajax({
     console.log("reached here", response);
     if(response.active === true)window.location.href = '/multipleTabs';
     else {
-      var a = localStorage.getIte('active');
+      var a = localStorage.getItem('active');
       if((a && a === 'false') || !localStorage.getItem('leaving')){
         localStorage.setItem('leaving', "false");
       }
diff --git a/views/home.hbs b/views/home.hbs
index 46bbe98..30727d3 100644
--- a/views/home.hbs
+++ b/views/home.hbs
@@ -186,9 +186,9 @@ and (max-device-width : 480px) {
       var username = '{{username}}';
       var accessToken = '{{{accessToken}}}';
       var refreshToken = '{{{refreshToken}}}';
-      localStorage.setItem("spotifyId", spotifyId);
-      localStorage.setItem("imageURL", imageURL);
-      localStorage.setItem("username", username);
+      localStorage.setItem('spotifyId', spotifyId);
+      localStorage.setItem('imageURL', imageURL);
+      localStorage.setItem('username', username);
       localStorage.setItem('accessToken', accessToken);
       localStorage.setItem('refreshToken', refreshToken);
       var a = localStorage.getItem('active');
diff --git a/views/userRoom.hbs b/views/userRoom.hbs
index 8e847ce..87fffd5 100644
--- a/views/userRoom.hbs
+++ b/views/userRoom.hbs
@@ -105,8 +105,6 @@ var djName = '{{room.djName}}';
 var unload = 0; // set to 1 to avoid multiple unloading
 new Clipboard('#shareable');
 
-
-
 $(document).on('click', '#joinThisRoom', function(e){
   window.location.href = '/joinRoom?roomId=' + roomId;
 })

From 1f94875c53359650c4717280bff9be1cebcf0f75 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yash1997@hku.hk>
Date: Sun, 8 Oct 2017 11:01:49 +0800
Subject: [PATCH 20/25] her

---
 views/djRoom.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index fa368d6..416c7b9 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -141,7 +141,7 @@ else {
     // return "Are you sure you want to leave? This will take you to home page";
   });
 
-  /* after refresh or close tab*/
+  /* after refresh or close tab */
   $(window).on("unload", function(){
     if(localStorage.getItem('closing') === 'false' && unload === 0){
       socket.emit('specialClose', {"roomName": roomName, "roomId": roomId, spotifyId: localStorage.getItem('spotifyId')});

From 7d678638ce0bcd7a574aecd7c6c5cc8c185399e2 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yash1997@hku.hk>
Date: Sun, 8 Oct 2017 11:02:35 +0800
Subject: [PATCH 21/25] her

---
 views/djRoom.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 416c7b9..f5eedd6 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -151,7 +151,7 @@ else {
     }
   });
 }
-
+// testing
 
 /* Checking connnection to socket */
 socket.on('connect', function(){

From 6e1e386e6ad603c2a71f0db974e2ba46535342b1 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yash1997@hku.hk>
Date: Sun, 8 Oct 2017 11:27:07 +0800
Subject: [PATCH 22/25] her

---
 routes/index.js      | 2 +-
 views/createRoom.hbs | 5 ++++-
 views/djRoom.hbs     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/routes/index.js b/routes/index.js
index a4884f1..22da43a 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -80,7 +80,7 @@ module.exports = function() {
   })
 
   /* Get list of available rooms. */
-  router.get('/getRooms', ifRedirected,function(req, res, next) {
+  router.get('/getRooms', ifRedirected, function(req, res, next) {
     Room.find(function(err, rooms) {
       var roomNameArray = [];
       roomNameArray = rooms.map(function(room) {
diff --git a/views/createRoom.hbs b/views/createRoom.hbs
index 95c1f57..65051af 100644
--- a/views/createRoom.hbs
+++ b/views/createRoom.hbs
@@ -38,7 +38,10 @@ $.ajax({
     if(response.active === true)window.location.href = '/multipleTabs';
     else{
       var a = localStorage.getItem('active');
-      if((a && a === 'false') || !localStorage.getItem('closing'))localStorage.setItem('closing', 'false');
+      if((a && a === 'false') || !localStorage.getItem('closing')){
+        localStorage.setItem('closing', 'false');
+        localStorage.setItem('active', 'false');
+      }
     }
   },
   error: function(response){
diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index f5eedd6..9a73e01 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -164,7 +164,7 @@ socket.on('connect', function(){
   if(localStorage.getItem('closing') === 'true'){
     unload = 1;
     window.location.href = '/';
-  }
+  // }
   else {
     clearId = setInterval(function () {
       socket.emit("toRefresh", localStorage.getItem("refreshToken"));

From f48bae65a6aa38846bdd214d627c2b9d6f57fe3d Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yash1997@hku.hk>
Date: Sun, 8 Oct 2017 11:33:01 +0800
Subject: [PATCH 23/25] here

---
 views/djRoom.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/djRoom.hbs b/views/djRoom.hbs
index 9a73e01..f5eedd6 100644
--- a/views/djRoom.hbs
+++ b/views/djRoom.hbs
@@ -164,7 +164,7 @@ socket.on('connect', function(){
   if(localStorage.getItem('closing') === 'true'){
     unload = 1;
     window.location.href = '/';
-  // }
+  }
   else {
     clearId = setInterval(function () {
       socket.emit("toRefresh", localStorage.getItem("refreshToken"));

From 084545dff411b9652d36a010fb5548ce527d27e8 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yash1997@hku.hk>
Date: Sun, 8 Oct 2017 11:41:51 +0800
Subject: [PATCH 24/25] here

---
 views/createRoom.hbs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/views/createRoom.hbs b/views/createRoom.hbs
index 65051af..de61d19 100644
--- a/views/createRoom.hbs
+++ b/views/createRoom.hbs
@@ -37,11 +37,13 @@ $.ajax({
     console.log("reached here", response.active);
     if(response.active === true)window.location.href = '/multipleTabs';
     else{
-      var a = localStorage.getItem('active');
-      if((a && a === 'false') || !localStorage.getItem('closing')){
-        localStorage.setItem('closing', 'false');
-        localStorage.setItem('active', 'false');
-      }
+      localStorage.setItem('closing', 'false');
+      localStorage.setItem('active', 'false');
+      // var a = localStorage.getItem('active');
+      // if((a && a === 'false') || !localStorage.getItem('closing')){
+      //   localStorage.setItem('closing', 'false');
+      //   localStorage.setItem('active', 'false');
+      // }
     }
   },
   error: function(response){

From 4df1f4dd357041643340a6d4036335e514fd26d8 Mon Sep 17 00:00:00 2001
From: Yashvardhan Nevatia <yash1997@hku.hk>
Date: Mon, 16 Oct 2017 16:18:10 +0800
Subject: [PATCH 25/25] life is a bit fucked

---
 routes/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/index.js b/routes/index.js
index 22da43a..b807dab 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -107,6 +107,7 @@ module.exports = function() {
 
     newRoom.save(function(err, newRoom) {
       if (err) {
+        console.log("fuck this");
         res.redirect('/error');
       } else {
         res.redirect('/djRoom/' + newRoom._id);