Merge3

package.json

@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "webpack --config webpack/webpack.dev.js",
     "build": "webpack --config webpack/webpack.prod.js",
-    "dev-server": "node ./server/server"
+    "dev-server": "nodemon ./server/server"
   },
   "author": "Archana Bansal",
   "contributors": [

server/handler/admin.js → server/controller/admin.js

@@ -1,4 +1,4 @@
-const admin = {
+const adminController = {
   authorize: (req, res, next) => {
     if (req.session.admin) {
       res.redirect('/admin/dashboard')
@@ -15,4 +15,4 @@ const admin = {
   }
 }
 
-module.exports = admin
+module.exports = adminController

server/controller/event.js

@@ -0,0 +1,118 @@
+const uuid = require('uuid/v1')
+const eventModel = require('../model/event')
+const userModel = require('../model/user')
+
+const eventController = {
+  create: (req, res) => {
+    const data = Object.assign(req.file, {destination: '/images/', name: req.file.filename})
+    const obj = Object.assign({}, req.body, {id: uuid(), image: data, attendees: [], comments: []})
+    eventModel.createEvent(obj).then(() => {
+      res.json(obj)
+    })
+  },
+
+  edit: (req, res) => {
+    eventModel.getEvent(req.body.id).then(({selectedEvent, selectedIndex}) => {
+      let image = selectedEvent.image
+      if (req.file) {
+        image = Object.assign(req.file, {destination: '/images/', name: req.file.filename})
+      }
+      const event = Object.assign(selectedEvent, req.body, {image})
+      return eventModel.addEventToIndex(selectedIndex, event)
+    }).then(() => {
+      res.json({id: req.body.id})
+    })
+  },
+
+  eventList: (req, res) => {
+    console.log('called eventList')
+    eventModel.getAllEvent().then((events) => {
+      const obj = events.map((event) => {
+        return JSON.parse(event)
+      })
+      res.json(obj)
+    })
+  },
+
+  eventDetails: (req, res) => {
+    eventModel.getAllEvent().then((events) => {
+      const obj = events.filter((event) => {
+        const eventObj = JSON.parse(event)
+        return eventObj.id === req.params.id
+      }).map((value) => JSON.parse(value))
+      res.json(obj)
+    })
+  },
+
+  attendee: {
+    saveAttendee: (req, res) => {
+      let event, index
+      eventModel.getEvent(req.body.eventId).then(({selectedEvent, selectedIndex}) => {
+        event = selectedEvent
+        index = selectedIndex
+        return req.body.profile
+      }).then((userInfo) => {
+        const attendee = event.attendees.filter(attendee => attendee.email === userInfo.email)[0]
+        if (attendee) {
+          return
+        }
+        event.attendees.push(userInfo)
+        return eventModel.addEventToIndex(index, event)
+      }).then(() => {
+        res.end()
+      }).catch(() => {
+        res.status(500).send()
+      })
+    },
+    deleteAttendee: (req, res) => {
+      eventModel.getEvent(req.body.eventId).then(({selectedEvent, selectedIndex}) => {
+        selectedEvent.attendees = selectedEvent.attendees.filter((attendee) => attendee.email !== req.body.profile.email)
+        return eventModel.addEventToIndex(selectedIndex, selectedEvent)
+      }).then(() => {
+        res.end()
+      }).catch(() => {
+        res.status(500).send()
+      })
+    }
+  },
+
+  comment: {
+    saveComment: (req, res) => {
+      let event, index
+      eventModel.getEvent(req.body.eventId).then(({selectedEvent, selectedIndex}) => {
+        event = selectedEvent
+        index = selectedIndex
+        return userModel.getUserProfile(req.body.email)
+      }).then((userInfo) => {
+        userInfo = JSON.parse(userInfo)
+        const obj = {
+          message: req.body.message,
+          dateTime: Date.now(),
+          commentId: uuid(),
+          ...userInfo
+        }
+        event.comments.unshift(obj)
+        return eventModel.addEventToIndex(index, event)
+      }).then(() => {
+        res.end()
+      }).catch(() => {
+        res.status(500).send()
+      })
+    },
+    deleteComment: (req, res) => {
+      eventModel.getEvent(req.body.eventId).then(({selectedEvent, selectedIndex}) => {
+        selectedEvent.comments = selectedEvent.comments.filter((comment) => comment.commentId !== req.body.commentId)
+        return eventModel.addEventToIndex(selectedIndex, selectedEvent)
+      }).then(() => {
+        res.end()
+      }).catch(() => {
+        res.status(500).send()
+      })
+    }
+  },
+  upload: () => {
+    eventModel.fileUpload()
+  }
+}
+
+module.exports = eventController

server/handler/user.js → server/controller/user.js

@@ -1,8 +1,8 @@
-const util = require('./utils')
+const userModel = require('../model/user')
 
-const user = {
+const userController = {
   login: (req, res) => {
-    util.saveUserInfo(req.body).then(() => {
+    userModel.saveUserInfo(req.body).then(() => {
       res.status(200).send('success')
     })
   },
@@ -22,10 +22,10 @@ const user = {
       req.session.admin = ''
     }
     const email = req.body.email
-    util.getUserProfile(email).then((obj) => {
+    userModel.getUserProfile(email).then((obj) => {
       res.json(JSON.parse(obj))
     })
   }
 }
 
-module.exports = user
+module.exports = userController

server/handler/utils.js → server/model/event.js

@@ -1,6 +1,18 @@
 const Redis = require('../redis')
+const multer = require('multer')
 
-const util = {
+const storage = multer.diskStorage({
+  destination: function (req, file, callback) {
+    callback(null, '../../build/images')
+  },
+  filename: function (req, file, callback) {
+    callback(null, Date.now() + '_' + file.originalname)
+  }
+})
+
+const upload = multer({ storage })
+
+const eventModel = {
   getEvent: (eventId) => {
     let selectedIndex = -1
     let selectedEvent
@@ -20,10 +32,6 @@ const util = {
     return Redis.lset('events', index, JSON.stringify(event))
   },
 
-  getUserProfile: (email) => {
-    return Redis.hget('users', email)
-  },
-
   createEvent: (obj) => {
     return Redis.lpush('events', JSON.stringify(obj))
   },
@@ -32,9 +40,9 @@ const util = {
     return Redis.lrange('events', 0, -1)
   },
 
-  saveUserInfo: ({email, name, id, image, aboutme, display}) => {
-    return Redis.hmset('users', email, JSON.stringify({email, name, id, image, aboutme, display}))
+  fileUpload: () => {
+    return upload.single('file')
   }
 }
 
-module.exports = util
+module.exports = eventModel

server/model/user.js

@@ -0,0 +1,16 @@
+const Redis = require('../redis')
+
+const userModel = {
+  getUserProfile: (email) => {
+    return Redis.hget('users', email)
+  },
+  saveUserInfo: ({ email, name, id, image, aboutme, display }) => {
+    return Redis.hmset(
+      'users',
+      email,
+      JSON.stringify({ email, name, id, image, aboutme, display })
+    )
+  }
+}
+
+module.exports = userModel

server/routes/admin.js

@@ -0,0 +1,12 @@
+const express = require('express')
+const router = express.Router()
+
+const adminController = require('../controller/admin')
+
+router.get('/', adminController.authorize)
+
+router.get('/create', adminController.authenticate)
+
+router.get('/dashboard', adminController.authenticate)
+
+module.exports = router

server/routes/event.js

@@ -0,0 +1,30 @@
+const express = require('express')
+const router = express.Router()
+
+const eventController = require('../controller/event')
+
+// API call to get list of events
+router.get('/', eventController.eventList)
+
+// API call to create an event
+router.post('/', eventController.upload, eventController.create)
+
+// API call to edit an event
+router.put('/', eventController.upload, eventController.edit)
+
+//  API call to get details of a particular event
+router.get('/:id', eventController.eventDetails)
+
+//  API call to save an attendee for a particular event
+router.post('/attendee', eventController.attendee.saveAttendee)
+
+//  API call to remove an attendee for a particular event
+router.post('/attendee/cancel', eventController.attendee.deleteAttendee)
+
+//  API call to save a comment for a particular event
+router.post('/comment', eventController.comment.saveComment)
+
+//  API call to delete a comment for a particular event
+router.delete('/comment', eventController.comment.deleteComment)
+
+module.exports = router