From 7740770ace036206352e06e2f17db3870c1ac7d9 Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Fri, 30 Apr 2021 23:21:00 +0300
Subject: [PATCH] try to add parameter for localPath

---
 charts.html           |  4 ++--
 server.js             | 12 ++++++------
 src/auth.js           | 13 +++++++------
 src/setup_const.js    |  3 ++-
 views/accontrol.ejs   |  6 +++---
 views/chart.ejs       |  6 +++---
 views/chartGarden.ejs | 20 ++++++++++----------
 views/login.ejs       |  2 +-
 views/nav.ejs         |  8 ++++----
 9 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/charts.html b/charts.html
index fd0b879..894ef0f 100644
--- a/charts.html
+++ b/charts.html
@@ -113,7 +113,7 @@
 				}
 				chart.render();
 
-				$.getJSON("/n/dht", function(data){
+				$.getJSON(localPath + "/dht", function(data){
 					if(data && data.dht){
 						chart.title.set("text", "A23 Currently is " + data.dht.temp + "°C, " + data.dht.hum +"% RH" );
 					}else {
@@ -122,7 +122,7 @@
 				});
 			}
 
-			$.getJSON("/n/dht/A23_DHT", addData);
+			$.getJSON(localPath+ "/dht/A23_DHT", addData);
 
 		}
 	</script>
diff --git a/server.js b/server.js
index 45f7147..062a023 100644
--- a/server.js
+++ b/server.js
@@ -76,22 +76,22 @@ app.get('/login',
   });
 
 app.post('/login',
-  passport.authenticate('local', { failureRedirect: '/n/login' }),
+  passport.authenticate('local', { failureRedirect: config.localPath+ '/login' }),
   function(req, res) {
-    res.redirect('/n/');
+    res.redirect(config.localPath+ '/');
   });
 
 app.get('/logout',
   function(req, res){
     req.logout();
-    res.redirect('/n/');
+    res.redirect(config.localPath+ '/');
   });
 
 app.get('/accontrol',
   // passport.authenticate('local', { 
-  //   failureRedirect: '/n/login' ,
-  //   successRedirect: '/n/accontrol'}),
-  require('connect-ensure-login').ensureLoggedIn('/n/login'),
+  //   failureRedirect: config.localPath+ '/login' ,
+  //   successRedirect: config.localPath+ '/accontrol'}),
+  require('connect-ensure-login').ensureLoggedIn(config.localPath+ '/login'),
   function(req, res){
     res.render('accontrol', { user: req.user });
   });
diff --git a/src/auth.js b/src/auth.js
index 7f8356a..69035d4 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -7,6 +7,7 @@ const util = require('util');
 var app = require('express')();
 
 var db = require('./db');
+var config = require('./setup_const');
 var passport = require('passport');
 var Strategy = require('passport-local').Strategy;
 var CookieStrategy = require('passport-cookie').Strategy;
@@ -14,13 +15,13 @@ var CookieStrategy = require('passport-cookie').Strategy;
 var session = require('express-session');
 const cookierParser = require('cookie-parser');
 
-var ensureLoggedIn = require("connect-ensure-login").ensureLoggedIn("/n/login");
+var ensureLoggedIn = require("connect-ensure-login").ensureLoggedIn(config.localPath + "/login");
 
 module.exports = {
   ensureLoggedIn_Orig: ensureLoggedIn,
   ensureLoggedIn_P: function (req, res, next){passport.authenticate('local', {
-    successRedirect: '/n/accontrol', 
-    failureRedirect: '/n/login' })},
+    successRedirect: config.localPath + '/accontrol', 
+    failureRedirect: config.localPath + '/login' })},
   passport: passport,
   ensureLoggedIn_New: function (req, res, next) {
     if (req.isAuthenticated()) {
@@ -122,8 +123,8 @@ module.exports = {
 
     app.post('/login',
       passport.authenticate('local', {
-        successRedirect: '/n/accontrol',
-        failureRedirect: '/n/login' }),
+        successRedirect: config.localPath + '/accontrol',
+        failureRedirect: config.localPath + '/login' }),
       // authenticated user.
       function(req, res) {
         console.log("logged in. session:" + req.session);
@@ -133,7 +134,7 @@ module.exports = {
 
     app.get('/logout', function(req, res){
         req.logout();
-        res.redirect('/n/login');
+        res.redirect(config.localPath + '/login');
     });
 
     return app;
diff --git a/src/setup_const.js b/src/setup_const.js
index 29a3119..6005448 100644
--- a/src/setup_const.js
+++ b/src/setup_const.js
@@ -2,13 +2,14 @@ var GardenIP = '192.168.0.18';
 var AcIP = '192.168.1.143';
 var HouseDhtIP = '192.168.1.126';
 var HomeControllerMQTT = '192.168.0.10'; //GW02
-
+var localPath = "/n";
 
 module.exports = {
     GardenIP:  '192.168.0.18',
      AcIP : '192.168.1.143',
  HouseDhtIP : '192.168.1.126',
  HomeControllerMQTT : '192.168.0.10',
+ localPath : "/n",
     foo: function () {
       // whatever
     },
diff --git a/views/accontrol.ejs b/views/accontrol.ejs
index bd04595..8ddea5a 100644
--- a/views/accontrol.ejs
+++ b/views/accontrol.ejs
@@ -1,7 +1,7 @@
 <h2>AC Control for <% if (model.user) {model.user.username; } %></h2>
 <h4 id="current">Retrieving current conditions...</h4>
 <!-- class="form-inline"  -->
-<form id="accontrol" action="/n/accontrol" method="POST"> 
+<form id="accontrol" action= config.localPath + "/accontrol" method="POST"> 
     <div class="form-group ">
         <input type='checkbox' name='power' <%= model.data.power|true ? "checked" : "" %> data-toggle='toggle'
             data-style='android' data-on='ON' data-off='Off' />
@@ -34,7 +34,7 @@ INFO:
 <%- contentFor('head') %>
 <script>
 
-    const url = 'wss://iot.d-popov.com/n/ws'
+    const url = 'wss://iot.d-popov.com' + config.localPath + '/ws'
     const connection = new WebSocket(url)
     connection.onopen = (d) => {
         console.log(`WebSocket error: ${d}`)
@@ -57,7 +57,7 @@ INFO:
     <script>
     
     window.onload = function () {
-         $.getJSON("/n/dht?e=now", function(data){
+         $.getJSON(config.localPath + "/dht?e=now", function(data){
         if(data && data.dht){
             $('#current').text( "A23 Currently is " + data.dht.temp + "°C, " + data.dht.hum +"% RH.  Dew point : " + data.dht.dew + "°C" );
         }else {
diff --git a/views/chart.ejs b/views/chart.ejs
index 73cec6b..86035b9 100644
--- a/views/chart.ejs
+++ b/views/chart.ejs
@@ -145,7 +145,7 @@
             }
             chart.render();
 
-            $.getJSON("/n/dht?e=now", function(data){
+            $.getJSON(config.localPath + "/dht?e=now", function(data){
                 if(data && data.dht){
                     chart.title.set("text", "A23 Currently is " + data.dht.temp + "°C, " + data.dht.hum +"% RH" );
                 }else {
@@ -154,8 +154,8 @@
             });
         }
         
-        $.getJSON("/n/device/A23_DHT/7", addData);
-        $.getJSON("/n/device/A23_Garden_Humidity/7", addData);
+        $.getJSON(config.localPath + "/device/A23_DHT/7", addData);
+        $.getJSON(config.localPath + "/device/A23_Garden_Humidity/7", addData);
 
     }
 </script>
diff --git a/views/chartGarden.ejs b/views/chartGarden.ejs
index 74819b1..70b3573 100644
--- a/views/chartGarden.ejs
+++ b/views/chartGarden.ejs
@@ -20,11 +20,11 @@
           Period
         </button>
         <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
-            <a class="dropdown-item" href="/n/garden/1">Day</a>
-            <a class="dropdown-item" href="/n/garden/2">2 Days</a>
-            <a class="dropdown-item" href="/n/garden/7">Week</a>
-            <a class="dropdown-item" href="/n/garden/30">Month</a>
-            <a class="dropdown-item" href="/n/garden/91">Quarter</a>
+            <a class="dropdown-item" href=config.localPath + "/garden/1">Day</a>
+            <a class="dropdown-item" href=config.localPath + "/garden/2">2 Days</a>
+            <a class="dropdown-item" href=config.localPath + "/garden/7">Week</a>
+            <a class="dropdown-item" href=config.localPath + "/garden/30">Month</a>
+            <a class="dropdown-item" href=config.localPath + "/garden/91">Quarter</a>
         </div>
       </div>
 </div>
@@ -224,10 +224,10 @@
             chart.render();
         }
         
-        $.getJSON("/n/device/A23_DHT/<%= model.days ? model.days : '7' %>", addData);
-        $.getJSON("/n/device/A23_Garden_dht/<%= model.days ? model.days : '7' %>", addData);
+        $.getJSON(config.localPath + "/device/A23_DHT/<%= model.days ? model.days : '7' %>", addData);
+        $.getJSON(config.localPath + "/device/A23_Garden_dht/<%= model.days ? model.days : '7' %>", addData);
         setTimeout(function(){
-        $.getJSON("/n/dht?e=now", function(data){
+        $.getJSON(config.localPath + "/dht?e=now", function(data){
             if(data && data.dht){
                 $("#now").text("In A23 currently is " + data.dht.temp + "°C, " + data.dht.hum +"% RH" );
             }else {
@@ -236,7 +236,7 @@
         });
         },5000);
 
-        $("#water").on("click", function(){$.ajax({url:"/n/water?t="+$("#waterTime").val()});});
-        $("#waterStop").on("click", function(){$.ajax({url:"/n/waterStop"});});
+        $("#water").on("click", function(){$.ajax({url:config.localPath + "/water?t="+$("#waterTime").val()});});
+        $("#waterStop").on("click", function(){$.ajax({url:config.localPath + "/waterStop"});});
     }
 </script>
\ No newline at end of file
diff --git a/views/login.ejs b/views/login.ejs
index 54f53fe..311a11e 100644
--- a/views/login.ejs
+++ b/views/login.ejs
@@ -1,4 +1,4 @@
-<form action="/n/login" method="post">
+<form action=config.localPath+ "/login" method="post">
     <div class="form-group">
         <label>Username:</label>
         <input type="text" name="username" class="form-control" />
diff --git a/views/nav.ejs b/views/nav.ejs
index ee92125..d9e3df0 100644
--- a/views/nav.ejs
+++ b/views/nav.ejs
@@ -1,6 +1,6 @@
 
     
-    <a href="/n/accontrol" >control</a>
-    <a href="/n/logout" >log out</a>
-    <a href="/n/chart"> chart</a>
-    <a href="/n/garden"> garden</a>
\ No newline at end of file
+    <a href=config.localPath + "/accontrol" >control</a>
+    <a href=config.localPath + "/logout" >log out</a>
+    <a href=config.localPath + "/chart"> chart</a>
+    <a href=config.localPath + "/garden"> garden</a>
\ No newline at end of file