Update query

drifterz28 · Nov 7, 2019 · 841cba0 · 841cba0
1 parent 38870c7
commit 841cba0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -21,9 +21,9 @@ app.set('port', port);
 
 function requireHTTPS(req, res, next) {
   // The 'x-forwarded-proto' check is for Heroku
-  // if (!req.secure && req.get('x-forwarded-proto') !== 'https' && isProduction) {
-  //   return res.redirect('https://' + req.get('host') + req.url);
-  // }
+  if (!req.secure && req.get('x-forwarded-proto') !== 'https' && isProduction) {
+    return res.redirect('https://' + req.get('host') + req.url);
+  }
   next();
 };
 

diff --git a/src/api/api.js b/src/api/api.js
@@ -43,7 +43,7 @@ const getIpAddress = req => {
 }
 
 const getCurrentTemps = async (req, res) => {
-  const roomData = await db.query(`SELECT DISTINCT ON (temps.ip) temps.ip, temp, name, timestamp FROM temps INNER JOIN rooms ON rooms.ip = temps.ip ORDER BY temps.ip DESC`);
+  const roomData = await db.query(`SELECT DISTINCT ON (temps.ip) temps.ip, temp, name, timestamp FROM temps INNER JOIN rooms ON rooms.ip = temps.ip`);
   res.status(200).json(roomData.rows);
 };