updated files

Author: joyagbo

data/feedback.json

@@ -1,6 +1,6 @@
 [
   {
-    "name": "Frank",
+    "name": "John",
     "email": "[email protected]",
     "title": "Best Meetup Ever",
     "message": "I really love this meetup. Please don't let it end."

package-lock.json

@@ -11,9 +11,12 @@
   "author": "Daniel Khan",
   "license": "MIT",
   "dependencies": {
+    "body-parser": "^1.20.2",
     "cookie-session": "^2.0.0",
     "ejs": "^3.1.9",
-    "express": "^4.18.2"
+    "express": "^4.18.2",
+    "express-validator": "^7.0.1",
+    "http-errors": "^2.0.0"
   },
   "devDependencies": {
     "eslint": "^8.48.0",

package.json

@@ -1,15 +1,64 @@
 const express = require('express');
-
+const { check, validationResult } = require('express-validator');
 const router = express.Router();
 module.exports = (params) => {
   const { feedbackService } = params;
 
-  router.get('/', async (req, res) => {
-    const feedback = await feedbackService.getList();
-    return res.json(feedback);
+  router.get('/', async (req, res, next) => {
+    try {
+      const feedback = await feedbackService.getList();
+      
+      const errors =req.session.feedback? req.session.feedback.errors:false
+
+      return res.render('layout', {
+        pageTitle: 'Feedback',
+        template: 'feedback',
+        feedback,
+      });
+    } catch (error) {
+      return next(error);
+    }
   });
 
-  router.post('/', (req, res) => res.send('Feeback form posted'));
+  router.post(
+    '/',
+    [
+      check('name')
+    .trim()
+    .isLength({ min: 3 })
+    .escape()
+    .withMessage('A name is required'),
+    check('email')
+        .trim()
+        .isEmail()
+        .normalizeEmail()
+        .withMessage('A valid email address is required'),
+      check('title')
+        .trim()
+        .isLength({ min: 3 })
+        .escape()
+        .withMessage('A title is required'),
+      check('message')
+        .trim()
+        .isLength({ min: 5 })
+        .escape()
+        .withMessage('A message is required')
+  ],
+    (req, res) => {
+      const errors = validationResult(req)
+
+      if(!errors.isEmpty()){
+        req.session.feedback ={
+          errors: errors.array(),
+        }
+        return res.redirect('/feedback')
+      }
+      
+      res.send('Feedback form posted');
+    }
+  );
 
   return router;
 };
+// const feedback = await feedbackService.getList();
+// return res.json(feedback);

routes/feedback.js

@@ -7,10 +7,19 @@ const router = express.Router();
 module.exports = (params) => {
   const { speakerService } = params;
 
-  router.get('/', async (req, res) => {
+  router.get('/', async (req, res, next) => {
+    try{
     const artwork = await speakerService.getAllArtwork();
     const topSpeakers = await speakerService.getList();
-    res.render('layout', { pageTitle: 'Welcome', template: 'index', topSpeakers, artwork });
+    return res.render('layout', 
+    { pageTitle: 'Welcome', 
+    template: 'index', 
+    topSpeakers, 
+    artwork });
+  }catch(error){
+    return next(error)
+  }
+    
   });
   router.use('/speakers', speakersRoute(params));
   router.use('/feedback', feedbackRoute(params));

routes/index.js

@@ -4,16 +4,34 @@ const router = express.Router();
 module.exports = (params) => {
   const { speakerService } = params;
 
-  router.get('/', async (req, res) => {
-    const speakers = await speakerService.getList();
-    const artwork = await speakerService.getAllArtwork();
-    res.render('layout', { pageTitle: 'Speakers', template: 'speakers', speakers, artwork });
+  router.get('/', async (req, res, next) => {
+    try {
+      const speakers = await speakerService.getList();
+      const artwork = await speakerService.getAllArtwork();
+      return res.render('layout', { 
+        pageTitle: 'Speakers', 
+        template: 'speakers', 
+        speakers, 
+        artwork });
+    } catch (error) {
+      return next(error)
+    } 
   });
 
-  router.get('/:shortname', async (req, res) => {
-    const speaker = await speakerService.getSpeaker(req.params.shortname);
-    const artwork = await speakerService.getArtworkForSpeaker(req.params.shortname);
-    res.render('layout', { pageTitle: 'Speakers', template: 'speakers-detail', speaker, artwork });
+  router.get('/:shortname', async (req, res, next) => {
+    try {
+      const speaker = await speakerService.getSpeaker(req.params.shortname);
+      const artwork = await speakerService.getArtworkForSpeaker(req.params.shortname);
+      return res.render('layout', { 
+        pageTitle: 'Speakers', 
+        template: 'speakers-detail', 
+        speaker, 
+        artwork 
+      });
+    } catch (error) {
+      return next(error)
+    }
+    
   });
   return router;
 };

routes/speakers.js

@@ -1,8 +1,9 @@
 const express = require('express');
 const path = require('path');
 const cookieSession = require('cookie-session');
+const createError = require('http-errors')
 const routes = require('./routes');
-
+const bodyParser = require('body-parser')
 const FeedbackService = require('./services/FeedbackService');
 const SpeakerService = require('./services/SpeakerService');
 
@@ -19,12 +20,15 @@ app.use(cookieSession({
   keys: ['Ghjkl12345','rgdfggdffssffggfffssss']
 }));
 
+app.use(bodyParser.urlencoded({ extended: true }))
+
 app.set('view engine', 'ejs');
 app.set('views', path.join(__dirname, './views'));
 app.locals.siteName ='ROUX Meetups'
 app.use(express.static(path.join(__dirname,'./static')));
-app.use(async(req, res, next)=>{
 
+
+app.use(async(req, res, next)=>{
   try {
   const names = await speakerService.getNames()
 res.locals.speakerNames = names
@@ -42,7 +46,18 @@ app.use('/',routes({
 })
 );
 
+app.use((req,res, next)=>{
+return next(createError(404,"Page not found"))
+})
 
+app.use((err, req, res, next)=>{
+  res.locals.message= err.message
+  console.error(err)
+  const status = err.status || 500
+  res.locals.status = status
+  res.status(status)
+  res.render('error')
+})
 
 app.listen(port, () => {   
   console.log(`Server running on port${port}`);