diff --git a/index.js b/index.js index 694ab63df71a1054e645ac4fb6d3e7a1ce2cba62..5399b28b9ea23e07be32bc6291ad880c5378619c 100644 --- a/index.js +++ b/index.js @@ -7,7 +7,8 @@ const photoCounter = require('./middleware/photocount'); app.set('view engine', 'ejs'); app.get('/', renderer('chatscreen')); -app.get('/photocount', photoCounter()); +app.get('/photocount', photoCounter('./static/pictures')); +app.get('/activitycount', photoCounter('./static/activity_images')); app.use(express.static('static')); const server_port = 3000; diff --git a/middleware/photocount.js b/middleware/photocount.js index 1eed98aa769dd4344d0e4cee623f6f672a652571..325974329b300375d3d8215ef81e68cf043d97b2 100644 --- a/middleware/photocount.js +++ b/middleware/photocount.js @@ -1,9 +1,8 @@ const fs = require('fs'); -const dir = './static/pictures'; -module.exports = function () { +module.exports = function (folder) { return function (req, res, next) { - return fs.readdir(dir, (err, files) => { + return fs.readdir(folder, (err, files) => { res.status(200).send({ count: files.length }); }); } diff --git a/static/activity_images/1.jpg b/static/activity_images/1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..28a8d84eea0bc8ca82dab3ae4b6f7f91955d68cb Binary files /dev/null and b/static/activity_images/1.jpg differ diff --git a/static/activity_images/2.jpg b/static/activity_images/2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ce3668602fbba46baa42c92f2761e57acff3f55d Binary files /dev/null and b/static/activity_images/2.jpg differ diff --git a/static/chat.js b/static/chat.js index 5e5d11cac7ec0984bb30bf66520cd5f1363e4e99..2cd3a78eb6d49080f220f72a8e83eed48eecd4f1 100644 --- a/static/chat.js +++ b/static/chat.js @@ -22,6 +22,8 @@ function tellWhatDoing() { '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/16.jpg"></div>', '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/17.jpg"></div>', '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/pictures/18.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/1.jpg"></div>', + '<div class="message catmessage" style="padding: 0"><img class="previewpic" src="/activity_images/2.jpg"></div>', ]; resolve(activities[Math.floor(Math.random() * activities.length)]); });