Moving nodeJS app files to nodeapp subfolder
This commit is contained in:
JayWll
141
nodeapp/app.js
Normal file
141
nodeapp/app.js
Normal file
@@ -0,0 +1,141 @@
|
||||
// Initialize project
|
||||
const express = require('express');
|
||||
const Sequelize = require('sequelize');
|
||||
const Op = Sequelize.Op
|
||||
//const request = require('request'); // TEMPORARY! Used for import function.
|
||||
const app = express();
|
||||
|
||||
// Setup database, using credentials set in .env
|
||||
var sequelize = new Sequelize('database', process.env.DB_USER, process.env.DB_PASS, {
|
||||
host: '0.0.0.0',
|
||||
dialect: 'sqlite',
|
||||
pool: {
|
||||
max: 5,
|
||||
min: 0,
|
||||
idle: 10000
|
||||
},
|
||||
// Security note: the database is saved to the file `database.sqlite` on the local filesystem. It's deliberately placed in the `.data` directory
|
||||
// which doesn't get copied if someone remixes the project.
|
||||
storage: '.data/database.sqlite'
|
||||
});
|
||||
var Readings;
|
||||
|
||||
// Authenticate with the database
|
||||
sequelize.authenticate()
|
||||
.then(function(err) {
|
||||
console.log('Connection has been established successfully.');
|
||||
|
||||
// Define 'readings' table structure
|
||||
Readings = sequelize.define('readings', {
|
||||
timestamp: {
|
||||
type: Sequelize.DATE
|
||||
},
|
||||
reading: {
|
||||
type: Sequelize.INTEGER
|
||||
}
|
||||
});
|
||||
|
||||
// Read data
|
||||
Readings.sync();
|
||||
})
|
||||
.catch(function (err) {
|
||||
console.log('Unable to connect to the database: ', err);
|
||||
});
|
||||
|
||||
// Handle requests for the root page by serving the static index.html from the views folder
|
||||
app.get("/", function(req, res) {
|
||||
res.sendFile(__dirname + "/views/index.html");
|
||||
});
|
||||
|
||||
// Handle requests to /newreading by posting a new reading to the database
|
||||
app.get('/newreading', (req, res) => {
|
||||
// Filter out requests that don't include the secret key, or don't contain the required data
|
||||
if (req.query.s != process.env.SECRET || !RegExp('^\\d*$').test(req.query.v)) return res.status(400).send('Bad Request').end();
|
||||
|
||||
Readings.create({ timestamp: new Date(), reading: req.query.v });
|
||||
res.status(200).send('Reading received: ' + req.query.v).end();
|
||||
});
|
||||
|
||||
// Handle requests for /getdata by returning a JSON object of data for the relevant time period
|
||||
app.get('/getdata', (req, res) => {
|
||||
const iso8601 = /^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?)?)?$/
|
||||
|
||||
if (!req.query.from || !req.query.to || !RegExp(iso8601).test(req.query.from) || !RegExp(iso8601).test(req.query.to)) {
|
||||
res.status(400).send('Bad Request').end();
|
||||
return;
|
||||
}
|
||||
|
||||
Readings.findAll({
|
||||
attributes: ['timestamp', 'reading'],
|
||||
where: {
|
||||
timestamp: {
|
||||
[Op.between]: [new Date(req.query.from), new Date(req.query.to)]
|
||||
}
|
||||
},
|
||||
order: [
|
||||
['timestamp', 'DESC']
|
||||
]
|
||||
}).then((result) => {
|
||||
res.status(200).send(result).end();
|
||||
})
|
||||
});
|
||||
|
||||
// Handle requests to /cleanup by deleting any data older than 90 days from the datastore
|
||||
app.get('/cleanup', (req, res) => {
|
||||
//if (!req.headers['cleanup-key'] || req.headers['cleanup-key'] != process.env.SECRET) {
|
||||
// return res.status(401).send('Authorization header not found').end();
|
||||
//}
|
||||
|
||||
var before = new Date();
|
||||
before.setDate(before.getDate()-91);
|
||||
before.setHours(0);
|
||||
before.setMinutes(0);
|
||||
before.setSeconds(0);
|
||||
|
||||
Readings.destroy({
|
||||
where: {
|
||||
timestamp: {
|
||||
[Op.lt]: before
|
||||
}
|
||||
}
|
||||
}).then((numRows) => {
|
||||
res.status(200).send('Deleted rows: ' + numRows).end();
|
||||
});
|
||||
});
|
||||
|
||||
/*
|
||||
app.get('/import', (req, res) => {
|
||||
request({ url: 'https://www.jasonsplant.ml/extract', json: true }, (error, {body}) => {
|
||||
if (error) return;
|
||||
else {
|
||||
var arr=[];
|
||||
body.forEach((item) => {
|
||||
Readings.create({ timestamp: new Date(item.timestamp), reading: item.reading });
|
||||
})
|
||||
|
||||
res.status(200).send('OK').end();
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
app.get("/data", function (request, response) {
|
||||
var result = [];
|
||||
Readings.findAll().then(function(reading) { // find all entries in the users tables
|
||||
reading.forEach(function(reading) {
|
||||
result.push([reading.timestamp, reading.reading]); // adds their info to the dbUsers value
|
||||
});
|
||||
response.send(result); // sends dbUsers back to the page
|
||||
});
|
||||
});
|
||||
*/
|
||||
|
||||
app.get('/reset', (req, res) => {
|
||||
Readings.sync({ force: true });
|
||||
res.status(200).send('OK').end();
|
||||
})
|
||||
|
||||
|
||||
// listen for requests :)
|
||||
const listener = app.listen(process.env.PORT, function() {
|
||||
console.log("Your app is listening on port " + listener.address().port);
|
||||
});
|
||||
178
nodeapp/views/index.html
Normal file
178
nodeapp/views/index.html
Normal file
@@ -0,0 +1,178 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
|
||||
<title>Jason's Plant</title>
|
||||
<meta name="description" content="Plant moisture levels, in chart form">
|
||||
<meta name="author" content="Jason Williams">
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.0/jquery.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQRangeSliderMouseTouch.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQRangeSliderDraggable.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQRangeSliderHandle.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQRangeSliderBar.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQRangeSliderLabel.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQRangeSlider.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQDateRangeSliderHandle.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQDateRangeSlider.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQEditRangeSliderLabel.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/jQEditRangeSlider.js"></script>
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.13.0/moment.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.min.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var chart = false, slider = false, data = false;
|
||||
var earliest = new Date();
|
||||
var fromdate = new Date();
|
||||
var todate = new Date();
|
||||
|
||||
earliest.setDate(earliest.getDate() - 90);
|
||||
earliest.setHours(0);
|
||||
earliest.setMinutes(0);
|
||||
earliest.setSeconds(0);
|
||||
earliest.setMilliseconds(0);
|
||||
|
||||
fromdate.setDate(fromdate.getDate() - 6);
|
||||
fromdate.setHours(0);
|
||||
fromdate.setMinutes(0);
|
||||
fromdate.setSeconds(0);
|
||||
fromdate.setMilliseconds(0);
|
||||
|
||||
todate.setDate(todate.getDate() + 1);
|
||||
todate.setHours(0);
|
||||
todate.setMinutes(0);
|
||||
todate.setSeconds(0);
|
||||
todate.setMilliseconds(0);
|
||||
|
||||
var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
|
||||
|
||||
$(function() {
|
||||
loader();
|
||||
});
|
||||
|
||||
function loader() {
|
||||
// Load the (empty) chart
|
||||
if (!chart) {
|
||||
var ctx = document.getElementById('myChart').getContext('2d');
|
||||
chart = new Chart(ctx, {
|
||||
// The type of chart we want to create
|
||||
type: 'line',
|
||||
|
||||
// The data for our dataset
|
||||
data: {
|
||||
datasets: [{
|
||||
label: 'Soil Moisture',
|
||||
backgroundColor: 'rgba(35, 87, 137, 0.5)',
|
||||
borderColor: 'rgba(35, 87, 137, 1)',
|
||||
//data: j
|
||||
}]
|
||||
},
|
||||
|
||||
// Configuration options go here
|
||||
options: {
|
||||
title: {display: true, text: 'Jason\'s Plant Moisture Level', fontColor: '#000000'},
|
||||
legend: {display: false},
|
||||
scales: {
|
||||
xAxes: [{type: 'time', time: {unit: 'day', min: fromdate, max: todate}, scaleLabel: {display: true, labelString: 'Date', fontColor: '#999999'}, gridLines: {color: '#CCCCCC'}, ticks: {fontColor: '#666666'}}],
|
||||
yAxes: [{gridLines: {color: '#CCCCCC'}, ticks: {beginAtZero: true, max: 1200, fontColor: '#666666'}}]
|
||||
},
|
||||
maintainAspectRatio: false
|
||||
}
|
||||
});
|
||||
loader();
|
||||
} else if (!slider) {
|
||||
// Load the date range slider
|
||||
$("#slider").dateRangeSlider({
|
||||
arrows: false,
|
||||
bounds: {min: earliest, max: todate},
|
||||
defaultValues: {min: fromdate, max: todate},
|
||||
step: {days: 1},
|
||||
formatter(val) {
|
||||
var days = val.getDate();
|
||||
var month = months[val.getMonth()];
|
||||
return days + ' ' + month;
|
||||
}
|
||||
}).bind('valuesChanged', (e, data) => {
|
||||
loadData(data.values.min, data.values.max);
|
||||
})
|
||||
|
||||
slider = true;
|
||||
loader();
|
||||
} else if (!data) {
|
||||
// Load data
|
||||
loadData(fromdate, todate);
|
||||
}
|
||||
}
|
||||
|
||||
function loadData(from, to) {
|
||||
$('#loading').show();
|
||||
$.getJSON('/getdata?from=' + from.toISOString() + '&to=' + to.toISOString(), function(j) {
|
||||
$(j).each(function() {
|
||||
this.x = new Date(this.timestamp);
|
||||
this.y = this.reading;
|
||||
delete this.timestamp;
|
||||
delete this.reading;
|
||||
});
|
||||
|
||||
chart.data.datasets[0].data = j;
|
||||
chart.config.options.scales.xAxes[0].time.min = from;
|
||||
chart.config.options.scales.xAxes[0].time.max = to;
|
||||
chart.update();
|
||||
$('#loading').hide();
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jQRangeSlider/5.7.2/css/classic.min.css">
|
||||
<style type="text/css">
|
||||
* {margin: 0; border: 0; padding: 0; box-sizing: border-box; font-size: 12px; font-family: Arial, Helvetica, sans-serif;}
|
||||
body, html {height: 100%; min-height: 100%; background-color: #FFFFFF;}
|
||||
#container {width: 100%; height: 100%; padding: 20px;}
|
||||
#slider {position: absolute; width: 30%; top: 30px; right: 43px;}
|
||||
#loading {position: absolute; display: flex; top: 0; width: 100%; height: 100%; background-color: rgba(255, 255, 255, 0.75); align-items: center; justify-content: center;}
|
||||
.loader{position:relative;width:75px;height:100px}
|
||||
.loader__bar{position:absolute;bottom:0;width:10px;height:50%;background:#23575f;-webkit-transform-origin:center bottom;transform-origin:center bottom;box-shadow:1px 1px 0 rgba(0,0,0,.2)}
|
||||
.loader__bar:nth-child(1){left:0;-webkit-transform:scale(1,.2);transform:scale(1,.2);-webkit-animation:barUp1 4s infinite;animation:barUp1 4s infinite}
|
||||
.loader__bar:nth-child(2){left:15px;-webkit-transform:scale(1,.4);transform:scale(1,.4);-webkit-animation:barUp2 4s infinite;animation:barUp2 4s infinite}
|
||||
.loader__bar:nth-child(3){left:30px;-webkit-transform:scale(1,.6);transform:scale(1,.6);-webkit-animation:barUp3 4s infinite;animation:barUp3 4s infinite}
|
||||
.loader__bar:nth-child(4){left:45px;-webkit-transform:scale(1,.8);transform:scale(1,.8);-webkit-animation:barUp4 4s infinite;animation:barUp4 4s infinite}
|
||||
.loader__bar:nth-child(5){left:60px;-webkit-transform:scale(1,1);transform:scale(1,1);-webkit-animation:barUp5 4s infinite;animation:barUp5 4s infinite}
|
||||
.loader__ball{position:absolute;bottom:10px;left:0;width:10px;height:10px;background:#c05746;border-radius:50%;-webkit-animation:ball 4s infinite;animation:ball 4s infinite}
|
||||
@-webkit-keyframes ball{0%{-webkit-transform:translate(0,0);transform:translate(0,0)}5%{-webkit-transform:translate(8px,-14px);transform:translate(8px,-14px)}10%{-webkit-transform:translate(15px,-10px);transform:translate(15px,-10px)}17%{-webkit-transform:translate(23px,-24px);transform:translate(23px,-24px)}20%{-webkit-transform:translate(30px,-20px);transform:translate(30px,-20px)}27%{-webkit-transform:translate(38px,-34px);transform:translate(38px,-34px)}30%{-webkit-transform:translate(45px,-30px);transform:translate(45px,-30px)}37%{-webkit-transform:translate(53px,-44px);transform:translate(53px,-44px)}40%{-webkit-transform:translate(60px,-40px);transform:translate(60px,-40px)}50%{-webkit-transform:translate(60px,0);transform:translate(60px,0)}57%{-webkit-transform:translate(53px,-14px);transform:translate(53px,-14px)}60%{-webkit-transform:translate(45px,-10px);transform:translate(45px,-10px)}67%{-webkit-transform:translate(37px,-24px);transform:translate(37px,-24px)}70%{-webkit-transform:translate(30px,-20px);transform:translate(30px,-20px)}77%{-webkit-transform:translate(22px,-34px);transform:translate(22px,-34px)}80%{-webkit-transform:translate(15px,-30px);transform:translate(15px,-30px)}87%{-webkit-transform:translate(7px,-44px);transform:translate(7px,-44px)}90%{-webkit-transform:translate(0,-40px);transform:translate(0,-40px)}100%{-webkit-transform:translate(0,0);transform:translate(0,0)}}
|
||||
@keyframes ball{0%{-webkit-transform:translate(0,0);transform:translate(0,0)}5%{-webkit-transform:translate(8px,-14px);transform:translate(8px,-14px)}10%{-webkit-transform:translate(15px,-10px);transform:translate(15px,-10px)}17%{-webkit-transform:translate(23px,-24px);transform:translate(23px,-24px)}20%{-webkit-transform:translate(30px,-20px);transform:translate(30px,-20px)}27%{-webkit-transform:translate(38px,-34px);transform:translate(38px,-34px)}30%{-webkit-transform:translate(45px,-30px);transform:translate(45px,-30px)}37%{-webkit-transform:translate(53px,-44px);transform:translate(53px,-44px)}40%{-webkit-transform:translate(60px,-40px);transform:translate(60px,-40px)}50%{-webkit-transform:translate(60px,0);transform:translate(60px,0)}57%{-webkit-transform:translate(53px,-14px);transform:translate(53px,-14px)}60%{-webkit-transform:translate(45px,-10px);transform:translate(45px,-10px)}67%{-webkit-transform:translate(37px,-24px);transform:translate(37px,-24px)}70%{-webkit-transform:translate(30px,-20px);transform:translate(30px,-20px)}77%{-webkit-transform:translate(22px,-34px);transform:translate(22px,-34px)}80%{-webkit-transform:translate(15px,-30px);transform:translate(15px,-30px)}87%{-webkit-transform:translate(7px,-44px);transform:translate(7px,-44px)}90%{-webkit-transform:translate(0,-40px);transform:translate(0,-40px)}100%{-webkit-transform:translate(0,0);transform:translate(0,0)}}
|
||||
@-webkit-keyframes barUp1{0%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}40%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}50%{-webkit-transform:scale(1,1);transform:scale(1,1)}90%{-webkit-transform:scale(1,1);transform:scale(1,1)}100%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}}
|
||||
@keyframes barUp1{0%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}40%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}50%{-webkit-transform:scale(1,1);transform:scale(1,1)}90%{-webkit-transform:scale(1,1);transform:scale(1,1)}100%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}}
|
||||
@-webkit-keyframes barUp2{0%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}40%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}50%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}90%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}100%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}}
|
||||
@keyframes barUp2{0%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}40%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}50%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}90%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}100%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}}
|
||||
@-webkit-keyframes barUp3{0%{-webkit-transform:scale(1,.6);transform:scale(1,.6)}100%{-webkit-transform:scale(1,.6);transform:scale(1,.6)}}
|
||||
@keyframes barUp3{0%{-webkit-transform:scale(1,.6);transform:scale(1,.6)}100%{-webkit-transform:scale(1,.6);transform:scale(1,.6)}}
|
||||
@-webkit-keyframes barUp4{0%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}40%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}50%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}90%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}100%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}}
|
||||
@keyframes barUp4{0%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}40%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}50%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}90%{-webkit-transform:scale(1,.4);transform:scale(1,.4)}100%{-webkit-transform:scale(1,.8);transform:scale(1,.8)}}
|
||||
@-webkit-keyframes barUp5{0%{-webkit-transform:scale(1,1);transform:scale(1,1)}40%{-webkit-transform:scale(1,1);transform:scale(1,1)}50%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}90%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}100%{-webkit-transform:scale(1,1);transform:scale(1,1)}}
|
||||
@keyframes barUp5{0%{-webkit-transform:scale(1,1);transform:scale(1,1)}40%{-webkit-transform:scale(1,1);transform:scale(1,1)}50%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}90%{-webkit-transform:scale(1,.2);transform:scale(1,.2)}100%{-webkit-transform:scale(1,1);transform:scale(1,1)}}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="container">
|
||||
<canvas id="myChart"></canvas>
|
||||
</div>
|
||||
|
||||
<div id="slider"></div>
|
||||
|
||||
<div id="loading">
|
||||
<div class="loader">
|
||||
<div class="loader__bar"></div>
|
||||
<div class="loader__bar"></div>
|
||||
<div class="loader__bar"></div>
|
||||
<div class="loader__bar"></div>
|
||||
<div class="loader__bar"></div>
|
||||
<div class="loader__ball"></div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user