voidf1sh/hestia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update web portal to use SQLite

Browse Source
This commit is contained in:
Skylar Grant 2023-01-22 22:42:23 -05:00
parent a7f9a7b6fb
commit 38b767034d
9 changed files with 97 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/config.db
View File

Binary file not shown.

1
hestia.sh
View File

@ -55,7 +55,6 @@ case "$opt" in
clear clear
echo "Launching Hestia Web Portal" echo "Launching Hestia Web Portal"
nohup node main.js > log.txt & nohup node main.js > log.txt &
nohup node modules/_server.js &
;; ;;
2) 2)
# Quit Hestia Web Portal # Quit Hestia Web Portal

3
main.js
View File

@ -3,6 +3,9 @@ const fn = require('./modules/functions.js').functions;
var config = require('./templates/config.json'); var config = require('./templates/config.json');
// Database Functions // Database Functions
const dbfn = require('./modules/database.js'); const dbfn = require('./modules/database.js');
// Web Portal
const portal = require('./modules/_server.js');
portal.start();
dbfn.run(`UPDATE timestamps SET value = ${Date.now()} WHERE key = 'process_start'`).catch(err => console.error(`Error setting process start time: ${err}`)); dbfn.run(`UPDATE timestamps SET value = ${Date.now()} WHERE key = 'process_start'`).catch(err => console.error(`Error setting process start time: ${err}`));

11
modules/_server.js
View File

@ -29,12 +29,13 @@ app.set('view engine', 'html');
// A normal load of the root page // A normal load of the root page
app.get('/', (req, res) => { app.get('/', (req, res) => {
res.render('index', config); if (process.env.DEBUG) console.log(`[${(Date.now() - config.timestamps.procStart)/1000}] I: ${JSON.stringify(config)}`);
res.render('index', { config: JSON.stringify(config) });
}); });
// A POST form submission to the root page // A POST form submission to the root page
app.post('/', (req, res) => { app.post('/', (req, res) => {
res.render('index', config); res.render('index', { config });
if (req.body.start != undefined) { if (req.body.start != undefined) {
fn.commands.startup(); fn.commands.startup();
} }
@ -57,4 +58,8 @@ app.post('/', (req, res) => {
} }
}); });
server.listen(8080, "0.0.0.0"); module.exports = {
start: () => {
server.listen(8080, "0.0.0.0");
}
};

1
www/public/config.db Symbolic link
View File

@ -0,0 +1 @@
./data/config.db

1
www/public/config.json
View File

@ -1 +0,0 @@
../../config.json

1
www/public/log.txt
View File

@ -1 +0,0 @@
../../log.txt

2
www/public/main.js
View File

@ -42,8 +42,6 @@ function refreshData() {
const augerOff = statusTable.rows[1].cells[3]; const augerOff = statusTable.rows[1].cells[3];
const feedRate = statusTable.rows[1].cells[1]; const feedRate = statusTable.rows[1].cells[1];
// Get the config file
const config = readJSON('./config.json');
// console.log(config); // console.log(config);
augerStatus.innerHTML = parseStatus(config.status.auger); augerStatus.innerHTML = parseStatus(config.status.auger);

86
www/views/index.html
View File

@ -10,6 +10,11 @@
<link rel="stylesheet" href="/main.css"> <link rel="stylesheet" href="/main.css">
</head> </head>
<body onload="refreshData()" class="container"> <body onload="refreshData()" class="container">
<script>
// Get the config file
const config = <%- config %>;
console.log(<%- config %>);
</script>
<%- include('trial.html') -%> <%- include('trial.html') -%>
<div id="title" class="text-center mb-4"> <div id="title" class="text-center mb-4">
<a href='./'>Hestia Web Portal</a> <a href='./'>Hestia Web Portal</a>
@ -48,7 +53,7 @@
<!-- Set feed rates --> <!-- Set feed rates -->
<div class="form-group"> <div class="form-group">
<label for="feedRate">Feed Rate: </label> <label for="feedRate">Feed Rate: </label>
<select name="feedRate" class="form-control"> <select name="feedRate" class="form-control" id="feed-rate-select">
<option value="600">Low</option> <option value="600">Low</option>
<option value="800">Medium</option> <option value="800">Medium</option>
<option value="1000">High</option> <option value="1000">High</option>
@ -67,7 +72,84 @@
<input class="btn btn-danger" type="submit" id="quit" value="Quit!!" name="quit" style="visibility: hidden;"> <input class="btn btn-danger" type="submit" id="quit" value="Quit!!" name="quit" style="visibility: hidden;">
</form> </form>
</div> </div>
<script src="./main.js"></script> <!-- <script src="./main.js"></script> -->
<script>
function sleep(ms) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve();
}, ms);
});
}
function readJSON(path) {
var request = new XMLHttpRequest();
request.open("GET", path, false);
request.send(null)
var JSONObj = JSON.parse(request.responseText);
return JSONObj;
}
function parseStatus(data) {
switch (data) {
case "0":
return "Off";
break;
case "1":
return "On";
break
default:
return "Error: " + data;
break;
}
}
function refreshData() {
// const log = document.getElementById('log-area');
// log.contentWindow.location.reload();
// sleep(100).then(() => {
// document.getElementById('log-area').contentWindow.scrollTo(0, 9999999999);
// });
// Get the elements we need to update
const statusTable = document.getElementById('status-table');
const augerStatus = statusTable.rows[0].cells[1];
const augerOn = statusTable.rows[0].cells[3];
const augerOff = statusTable.rows[1].cells[3];
const feedRate = statusTable.rows[1].cells[1];
const feedRateSelect = document.getElementById('feed-rate-select');
// console.log(config);
augerStatus.innerHTML = parseStatus(config.status.auger);
augerOn.innerHTML = config.intervals.augerOn;
augerOff.innerHTML = config.intervals.augerOff;
switch (config.intervals.augerOn) {
case '600':
feedRate.innerHTML = 'Low';
feedRateSelect.selectedIndex = 0;
break;
case '800':
feedRate.innerHTML = 'Medium';
feedRateSelect.selectedIndex = 1;
break;
case '1000':
feedRate.innerHTML = 'High';
feedRateSelect.selectedIndex = 2;
break;
default:
feedRate.innerHTML = 'Unknown';
break;
}
feedRate.value = config.intervals.augerOn;
// Run this again after 2 seconds
sleep(5000).then(() => {
refreshData();
});
};
</script>
</body> </body>
</html> </html>