diff --git a/index.js b/index.js index b453b21..a63b304 100644 --- a/index.js +++ b/index.js @@ -29,8 +29,6 @@ dbInit.init({ seed : process.env.DB_SEED }); -console.log( "exit") - const express = require('express'); const app = express(); @@ -71,7 +69,7 @@ app.post('/*', routes.add); app.get('/*', routes.main); app.patch('/*', routes.main); app.put('/*', routes.main); -app.delete('/*', routes.main); +app.delete('/delete/:id', routes.delete); app.listen(port, () => { diff --git a/public/js/app.js b/public/js/app.js index 5a1a728..7838bd4 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -1,107 +1,128 @@ /* global initData, authorizationToken */ -// List of HTML entities for escaping. -var htmlEscapes = { - '&': '&', - '<': '<', - '>': '>', - '"': '"', - "'": ''', - '/': '/' -}; +$(function(){ + + // List of HTML entities for escaping. + var htmlEscapes = { + '&': '&', + '<': '<', + '>': '>', + '"': '"', + "'": ''', + '/': '/' + }; -// Regex containing the keys listed immediately above. -var htmlEscaper = /[&<>"'\/]/g; + // Regex containing the keys listed immediately above. + var htmlEscaper = /[&<>"'\/]/g; -// Escape a string for HTML interpolation. -escape = function(string) { - return ('' + string).replace(htmlEscaper, function(match) { - return htmlEscapes[match]; - }); -}; -var urlRegex = /(\S+): (https?://[^\s]+)/g; -url = function(string){ - return ''+string.replace(urlRegex, '$1'); -}; -var titleRegex = /^(.*\n)/; -title = function(string){ - return ''+string.replace(titleRegex, '$1'); -}; -var cmdRegex = /```([^`]*?)```/g; -cmd = function(string) { - return ''+string.replace(cmdRegex, '$1'); -}; -date = function(string){ - var D = new Date(string); - return D.toLocaleDateString()+" "+D.toLocaleTimeString(); -}; -mailRegexp = /(.*) <(.+@.+)>/; -mail = function( string ){ - return ''+string.replace(mailRegexp, '$1'); -}; -function updatePage(data){ - - var content = ""; - var item = {}; - var id = ''; - // If the log entry is unique, simulate a search result - if( ! data['hits'] ){ - data = {hits:{hits:[data]}}; - } - $.each(data.hits.hits, (k,v)=>{ - - item = v._source; - id = v._id; - content += ` + // Escape a string for HTML interpolation. + escape = function(string) { + return ('' + string).replace(htmlEscaper, function(match) { + return htmlEscapes[match]; + }); + }; + var urlRegex = /(\S+): (https?://[^\s]+)/g; + url = function(string){ + return ''+string.replace(urlRegex, '$1'); + }; + var titleRegex = /^(.*\n)/; + title = function(string){ + return ''+string.replace(titleRegex, '$1'); + }; + var cmdRegex = /```([^`]*?)```/g; + cmd = function(string) { + return ''+string.replace(cmdRegex, '$1'); + }; + date = function(string){ + var D = new Date(string); + return D.toLocaleDateString()+" "+D.toLocaleTimeString(); + }; + mailRegexp = /(.*) <(.+@.+)>/; + mail = function( string ){ + return ''+string.replace(mailRegexp, `$1`); + }; + function updatePage(data){ -
${cmd(title(url(escape(item.content))))}-
${cmd(title(url(escape(item.content))))}+