diff --git a/package.json b/package.json index 2d714e1..8e978db 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "filenamify": "^2.1.0", "helmet": "^3.15.0", "jquery": "^3.3.1", - "slugify": "^1.3.4", + "snarkdown": "^1.2.2", "socket.io": "^2.2.0", "socket.io-client": "^2.2.0", "unused-filename": "^1.0.0" diff --git a/public/js/little-library.js b/public/js/little-library.js index a5aa418..66cc445 100644 --- a/public/js/little-library.js +++ b/public/js/little-library.js @@ -1,8 +1,13 @@ $(document).ready(function() { var socket = io(); - $('.modal-background, .modal-close').click(function() { - $(this).parent('.modal').removeClass('is-active'); + $('.modal-background, .modal-close, .modal-card-head .delete, .modal-card-foot .close').click(function() { + $(this).closest('.modal').removeClass('is-active'); + }); + + $('.modal-button').click(function() { + var modal = $(this).data('modal'); + $('#' + modal).addClass('is-active'); }); $('#book').change(function() { @@ -16,9 +21,4 @@ $(document).ready(function() { } $('#bookFileName').text(fileName ? fileName : 'None Selected'); }); - - $('.book').click(function() { - var modal = $(this).data('modal'); - $('#' + modal).addClass('is-active'); - }); }); \ No newline at end of file diff --git a/server.js b/server.js index d234a06..7935097 100644 --- a/server.js +++ b/server.js @@ -8,6 +8,7 @@ const bodyParser = require('body-parser'); const fileUpload = require('express-fileupload'); const filenamify = require('filenamify'); const unusedFilename = require('unused-filename'); +const snarkdown = require('snarkdown'); const settings = require('./settings.json'); @@ -44,21 +45,7 @@ function Server () { this.server.use('/css', express.static(path.join(__dirname, './public/css/'))); this.server.get('/', (req, res) => { - const files = fs.readdirSync(this.fileLocation).filter(fileName => fileName.includes('.json')); - const books = files.map(fileName => { - const bookData = JSON.parse(fs.readFileSync(path.resolve(this.fileLocation, fileName), 'utf8')); - const id = fileName.replace('.json', ''); - const content = '