/stats implemented
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
var express = require('express');
|
var express = require('express');
|
||||||
var page = require('./src/page');
|
var view = require('./src/view');
|
||||||
var storage = require('./src/storage');
|
var storage = require('./src/storage');
|
||||||
var md5 = require('md5');
|
var md5 = require('md5');
|
||||||
var LRU = require("lru-cache")
|
var LRU = require("lru-cache")
|
||||||
@@ -20,7 +20,7 @@ var getTimeStamp = () => {
|
|||||||
app.use(express.static(__dirname + '/resources/public'));
|
app.use(express.static(__dirname + '/resources/public'));
|
||||||
|
|
||||||
app.get('/new', function (req, res) {
|
app.get('/new', function (req, res) {
|
||||||
res.send(page.newNotePage(getTimeStamp() + md5(Math.random())));
|
res.send(view.newNotePage(getTimeStamp() + md5(Math.random())));
|
||||||
});
|
});
|
||||||
|
|
||||||
app.post('/note', function (req, res) {
|
app.post('/note', function (req, res) {
|
||||||
@@ -53,28 +53,41 @@ app.get("/:year/:month/:day/:title", function (req, res) {
|
|||||||
|
|
||||||
app.get(/\/([a-z0-9]+\/edit)/, function (req, res) {
|
app.get(/\/([a-z0-9]+\/edit)/, function (req, res) {
|
||||||
var link = req.params["0"].replace("/edit", "");
|
var link = req.params["0"].replace("/edit", "");
|
||||||
storage.getNote(link).then(note =>
|
storage.getNote(link).then(note => res.send(note
|
||||||
res.send(page.editNotePage(getTimeStamp() + md5(Math.random()), note)));
|
? view.editNotePage(getTimeStamp() + md5(Math.random()), note)
|
||||||
|
: notFound(res)));
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get(/\/([a-z0-9]+\/export)/, function (req, res) {
|
app.get(/\/([a-z0-9]+\/export)/, function (req, res) {
|
||||||
var link = req.params["0"].replace("/export", "");
|
var link = req.params["0"].replace("/export", "");
|
||||||
res.set({ 'Content-Type': 'text/plain', 'Charset': 'utf-8' });
|
res.set({ 'Content-Type': 'text/plain', 'Charset': 'utf-8' });
|
||||||
storage.getNote(link).then(note => res.send(note.text));
|
storage.getNote(link).then(note => note
|
||||||
|
? res.send(note.text)
|
||||||
|
: notFound(res));
|
||||||
|
});
|
||||||
|
|
||||||
|
app.get(/\/([a-z0-9]+\/stats)/, function (req, res) {
|
||||||
|
var link = req.params["0"].replace("/stats", "");
|
||||||
|
storage.getNote(link).then(note => note
|
||||||
|
? res.send(view.buildStats(note))
|
||||||
|
: notFound(res));
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get(/\/([a-z0-9]+)/, function (req, res) {
|
app.get(/\/([a-z0-9]+)/, function (req, res) {
|
||||||
var link = req.params["0"];
|
var link = req.params["0"];
|
||||||
if (CACHE.has(link)) res.send(CACHE.get(link));
|
if (CACHE.has(link)) res.send(CACHE.get(link));
|
||||||
else storage.getNote(link).then(note => {
|
else storage.getNote(link).then(note => {
|
||||||
var content = page.buildNote(note);
|
if (!note) return notFound(res);
|
||||||
|
var content = view.buildNote(note);
|
||||||
CACHE.set(link, content);
|
CACHE.set(link, content);
|
||||||
res.send(content);
|
res.send(content);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
var sendResponse = (res, code, message) =>
|
var sendResponse = (res, code, message) =>
|
||||||
res.status(code).send(page.buildPage(message, "<h1>" + message + "</h1>", ""));
|
res.status(code).send(view.buildPage(message, "<h1>" + message + "</h1>", ""));
|
||||||
|
|
||||||
|
var notFound = res => sendResponse(res, 404, "Not found");
|
||||||
|
|
||||||
var server = app.listen(3000, function () {
|
var server = app.listen(3000, function () {
|
||||||
console.log('NoteHub server listening on port %s', server.address().port);
|
console.log('NoteHub server listening on port %s', server.address().port);
|
||||||
|
|||||||
@@ -4,6 +4,11 @@ var fs = require("fs");
|
|||||||
var pageTemplate = fs.readFileSync("resources/template.html", "utf-8");
|
var pageTemplate = fs.readFileSync("resources/template.html", "utf-8");
|
||||||
var footerTemplate = fs.readFileSync("resources/footer.html", "utf-8");
|
var footerTemplate = fs.readFileSync("resources/footer.html", "utf-8");
|
||||||
var editTemplate = fs.readFileSync("resources/edit.html", "utf-8");
|
var editTemplate = fs.readFileSync("resources/edit.html", "utf-8");
|
||||||
|
|
||||||
|
var deriveTitle = text => text
|
||||||
|
.split(/[\n\r]/)[0].slice(0,25)
|
||||||
|
.replace(/[^a-zA-Z0-9\s]/g, "");
|
||||||
|
|
||||||
var buildPage = (title, content, footer) => pageTemplate
|
var buildPage = (title, content, footer) => pageTemplate
|
||||||
.replace("%TITLE%", title)
|
.replace("%TITLE%", title)
|
||||||
.replace("%CONTENT%", content)
|
.replace("%CONTENT%", content)
|
||||||
@@ -11,7 +16,16 @@ var buildPage = (title, content, footer) => pageTemplate
|
|||||||
|
|
||||||
module.exports.buildPage = buildPage;
|
module.exports.buildPage = buildPage;
|
||||||
|
|
||||||
module.exports.buildNote = note => buildPage(note.title,
|
module.exports.buildStats = note => buildPage(deriveTitle(note.text),
|
||||||
|
`<h2>Statistics</h2>
|
||||||
|
<table>
|
||||||
|
<tr><td>Published</td><td>${note.published}</td></tr>
|
||||||
|
<tr><td>Edited</td><td>${note.edited || "N/A"}</td></tr>
|
||||||
|
<tr><td>Views</td><td>${note.views}</td></tr>
|
||||||
|
</table>`,
|
||||||
|
"");
|
||||||
|
|
||||||
|
module.exports.buildNote = note => buildPage(deriveTitle(note.text),
|
||||||
marked(note.text),
|
marked(note.text),
|
||||||
footerTemplate.replace(/%LINK%/g, note.id));
|
footerTemplate.replace(/%LINK%/g, note.id));
|
||||||
|
|
||||||
Reference in New Issue
Block a user