news add modal ui (fixes: #342)

api/src/controllers/newsController.js

@@ -44,11 +44,11 @@ const addNews = (req, res) => {
   if (req.file) {
     filename = req.file.filename
   }
+
   const {
     title, message, docType, readTime, language, creator, textDetail, imageDetail, videoDetail, category
   } = req.body
   db.News.create({
-    // _attachments: 'uploads/' + req.file.filename,
     _attachments: 'news/' + filename,
     title,
     message,
@@ -62,7 +62,7 @@ const addNews = (req, res) => {
     category,
     communityId: req.params.id
   })
-    .then(() => res.json({ message: 'News Created !!!' }).status(200))
+    .then((data) => res.json({ data }).status(200))
     .catch((err) => res.json({ error: err.message }).status(400))
 }
 
@@ -140,7 +140,17 @@ const getNewsById = (req, res) => {
       model: db.Community,
       attributes: [],
       where: { id: req.params.id }
-    }]
+    }, 
+    {
+      model: db.Text,
+    }, 
+    {
+      model: db.Photo,
+    }, 
+    {
+      model: db.Video,
+    }
+  ]
   })
     .then(news => {
       if (news) {

api/src/controllers/photoController.js

@@ -54,30 +54,33 @@ const addphoto = async (req, res) => {
   })
 }
 
-const deletePhoto = async (req, res) => {
-  const { id } = req.params
-  const photo = await db.Photo.destroy({ where: { id } })
-  if (!photo) {
-    throw new NotFoundError()
+const updatePhoto = async (req, res) => {
+  let lessonImg = ''
+
+  const singlePhoto = await db.Photo.findOne({where: {id: req.params.id}});
+  if (req.file) {
+    lessonImg = req.file.filename
+  } else {
+    lessonImg = singlePhoto.dataValues.lessonImg
   }
-  res.status(202).json({
+
+  const photo = await db.Photo.update({ ...req.body, lessonImg }, {where: {id: req.params.id}})
+  res.status(201).json({
     status: true,
-    message: 'Lesson photo deleted successfully',
+    message: 'photo updated successfully',
     data: photo
   })
 }
 
-const updatePhoto = async (req, res) => {
+const deletePhoto = async (req, res) => {
   const { id } = req.params
-  const photo = await db.Photo.update(req.body, {
-    where: { id }
-  })
+  const photo = await db.Photo.destroy({ where: { id } })
   if (!photo) {
     throw new NotFoundError()
   }
   res.status(202).json({
     status: true,
-    message: 'Lesson photo updated successfully',
+    message: 'Lesson photo deleted successfully',
     data: photo
   })
 }

api/src/controllers/textController.js

@@ -37,14 +37,10 @@ const addText = async (req, res) => {
 
 const deleteText = async (req, res) => {
   const { id } = req.params
-  const text = await db.Text.destroy({ where: { id } })
-  if (!text) {
-    throw new NotFoundError()
-  }
+  await db.Text.destroy({ where: { id } })
   res.status(202).json({
     status: true,
     message: 'Lesson text deleted successfully',
-    data: text
   })
 }
 

api/src/controllers/videoController.js

@@ -52,7 +52,7 @@ const addVideo = async (req, res) => {
       videoResource = req.files.videoResource[0].filename
     }
   }
-  // console.log(req)
+
   const video = await db.Video.create({
     ...req.body,
     videoCover,
@@ -78,13 +78,30 @@ const deleteVideo = async (req, res) => {
 
 const updateVideo = async (req, res) => {
   const { id } = req.params
-  const video = await db.Video.update(req.body, {
+  const video = await db.Video.findOne({
     where: { id }
   })
+
+  let videoCover = ''
+  let videoResource = ''
+
+  if(req.files.videoCover === undefined) {
+    videoCover = video.dataValues.videoCover
+    videoResource = video.dataValues.videoResource
+  } else {
+    if (req.files.videoCover) {
+      videoCover = req.files.videoCover[0].filename
+    }
+    if (req.files.videoResource) {
+      videoResource = req.files.videoResource[0].filename
+    }
+  }
+
+  await db.Video.update({...req.body, videoCover, videoResource}, {where: {id}})
+
   res.status(202).json({
     status: true,
     message: 'Video updated successfully',
-    data: video
   })
 }
 

api/src/helpers/filehelpers.js

@@ -53,38 +53,42 @@ const resizeImage = (req, res, next) => {
   const { format, height, width } = { format: 'webp', ...req.body }
   try {
     // user might not send image sometimes
-    if (!req.file) return next()
+    if (!req.file) {
+      return next()
 
-    const filename = path
-      .basename(req.file.path)
-      .split('.')
-      .slice(0, -1)
-      .join('.')
-    let dir = path.join(
-      path.dirname(__dirname),
-      '..',
-      'files',
-      `${req.file.fieldname}`,
-      filename
-    )
-    let newImage = sharp(req.file.path)
-    if (width) {
-      newImage = newImage.resize(parseInt(width))
-      dir = dir + '-' + width + 'x' + height
     }
-    if (req.body.render) {
-      newImage.toBuffer().then((data) => {
-        // To display the image
-        res.writeHead(200, {
-          'Content-Type': 'image/webp',
-          'Content-Length': data.length
+    else {
+      const filename = path
+        .basename(req.file.path)
+        .split('.')
+        .slice(0, -1)
+        .join('.')
+      let dir = path.join(
+        path.dirname(__dirname),
+        '..',
+        'files',
+        `${req.file.fieldname}`,
+        filename
+      )
+      let newImage = sharp(req.file.path)
+      if (width) {
+        newImage = newImage.resize(parseInt(width))
+        dir = dir + '-' + width + 'x' + height
+      }
+      if (req.body.render) {
+        newImage.toBuffer().then((data) => {
+          // To display the image
+          res.writeHead(200, {
+            'Content-Type': 'image/webp',
+            'Content-Length': data.length
+          })
+          return res.end(data)
         })
-        return res.end(data)
-      })
-    } else {
-      const savePath = dir + '.' + format
-      newImage = newImage.toFile(savePath)
-      return next(null, true)
+      } else {
+        const savePath = dir + '.' + format
+        newImage = newImage.toFile(savePath)
+        return next(null, true)
+      }
     }
   } catch (error) {
     throw error

api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js

@@ -0,0 +1,33 @@
+'use strict'
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.addColumn('photos', 'newsId', {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'news',
+        key: 'id'
+      }
+    })
+    await queryInterface.addColumn('videos', 'newsId', {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'news',
+        key: 'id'
+      }
+    })
+    await queryInterface.addColumn('texts', 'newsId', {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'news',
+        key: 'id'
+      }
+    })
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    await queryInterface.removeColumn('photos', 'newsId')
+    await queryInterface.removeColumn('videos', 'newsId')
+    await queryInterface.removeColumn('texts', 'newsId')
+  }
+}

api/src/models/newsModel.js

@@ -53,6 +53,9 @@ module.exports = (sequelize, DataTypes) => {
   // association
   News.associate = (models) => {
     News.belongsTo(models.Community, { foreignKey: 'communityId' })
+    News.hasMany(models.Video, { foreignKey: 'newsId' })
+    News.hasMany(models.Text, { foreignKey: 'newsId' })
+    News.hasMany(models.Photo, { foreignKey: 'newsId' })
   }
   return News
 }

api/src/models/photoModel.js

@@ -14,6 +14,9 @@ module.exports = (sequelize, DataTypes) => {
     isImgDesc: {
       type: DataTypes.BOOLEAN
     },
+    newsId: {
+      type: DataTypes.INTEGER
+    },
     createdAt: {
       type: DataTypes.DATE
     },
@@ -24,6 +27,7 @@ module.exports = (sequelize, DataTypes) => {
   { timestamps: true })
   Photo.associate = (models) => {
     Photo.belongsTo(models.Lesson, { constraints: true, foreignKey: 'lessonId' })
+    Photo.belongsTo(models.News, { constraints: true, foreignKey: 'newsId' })
   }
   return Photo
 }

api/src/models/textModel.js

@@ -13,6 +13,9 @@ module.exports = (sequelize, DataTypes) => {
       textDescription: {
         type: DataTypes.TEXT
       },
+      newsId: {
+        type: DataTypes.INTEGER
+      },
       createdAt: {
         type: DataTypes.DATE
       },
@@ -27,6 +30,10 @@ module.exports = (sequelize, DataTypes) => {
       constraints: true,
       foreignKey: 'lessonId'
     })
+    Text.belongsTo(models.News, {
+      constraints: true,
+      foreignKey: 'newsId'
+    })
   }
   return Text
 }

api/src/models/videoModel.js

@@ -20,6 +20,9 @@ module.exports = (sequelize, DataTypes) => {
     videoResource: {
       type: DataTypes.STRING
     },
+    newsId: {
+      type: DataTypes.INTEGER
+    },
     createdAt: {
       type: DataTypes.DATE
     },
@@ -30,6 +33,7 @@ module.exports = (sequelize, DataTypes) => {
   { timestamps: true })
   Video.associate = (models) => {
     Video.belongsTo(models.Lesson, { constraints: true, foreignKey: 'lessonId' })
+    Video.belongsTo(models.News, { constraints: true, foreignKey: 'newsId' })
   }
 
   return Video

api/src/routes/photoRouter.js

@@ -12,7 +12,7 @@ const {
 } = require('../controllers/photoController')
 
 router.route('/').get(getPhotos)
-router.route('/add').post(upload.single('lessonImg'), resizeImage, addphoto)
-router.route('/:id').get(getPhotoById).delete(deletePhoto).put(updatePhoto)
+router.route('/add').post(upload.single('img'), resizeImage, addphoto)
+router.route('/:id').get(getPhotoById).delete(deletePhoto).put(upload.single('img'), resizeImage, updatePhoto)
 
 module.exports = router

api/src/routes/videoRouter.js

@@ -13,8 +13,13 @@ const {
 
 // get image file middleware
 const fileChanger = (req, _res, next) => {
-  req.file = req.files.videoCover[0]
-  next()
+  if(req.files.videoCover === undefined) {
+    req.file = ''
+    next()
+  } else {
+    req.file = req.files.videoCover[0]
+    next()
+  }
 }
 
 router.route('/').get(getVideos)
@@ -26,6 +31,10 @@ router
     resizeImage,
     addVideo
   )
-router.route('/:id').get(getVideosById).delete(deleteVideo).put(updateVideo)
+router.route('/:id').get(getVideosById).delete(deleteVideo).put( 
+    upload.fields([{ name: 'videoCover' }, { name: 'videoResource' }]),
+    fileChanger,
+    resizeImage,
+    updateVideo)
 
 module.exports = router

api/src/server.js

@@ -56,8 +56,8 @@ app.use('/api/groups-users', groupUsersRoutes)
 app.use('/api/enterprises-users', enterpriseUsersRoutes)
 app.use('/api/resizer', resizerRoutes)
 app.use('/api/videos', videoRouter)
-app.use('/api/lesson-photos', photoRouter)
-app.use('/api/lesson-text', textRouter)
+app.use('/api/photos', photoRouter)
+app.use('/api/texts', textRouter)
 app.use('/api/materials', materialRouter)
 app.use('/api/tests', testRouter)
 app.use('/api/questions', questionRouter)

src/App.jsx

@@ -74,8 +74,9 @@ function App () {
             <PrivateRoute component={Messenger} exact path='/messenger' />
             <PrivateRoute component={MobileMessage} path='/messenger/:id' exact />
             <PrivateRoute component={CommunityPagenews} exact path='/community-page-news/:id' />
-            <PrivateRoute component={NewsAdd} path='/community-page-news/:title/:category' exact />
-            <PrivateRoute component={CommunityNewsViewPage} path='/community-page-news-view' exact />
+            <PrivateRoute component={NewsAdd} path='/community-news/:title' exact />
+            <PrivateRoute component={NewsAdd} path='/community-news/edit/:id' exact />
+            <PrivateRoute component={CommunityNewsViewPage} path='/community-news-view-page/:id' exact />
             <PrivateRoute component={AllCommunitiesCard} path='/community-switching' exact />
             <PrivateRoute component={CommunityMembers} path='/community-members/:id' exact />
             <PrivateRoute component={CommunityMembersProfile} path='/community-members-profile/:id' exact />

src/actions/lessonActions.js

@@ -49,13 +49,15 @@ export const createLesson =
         const lessonId = data?.data?.id
         for (let i = 0; i < lessonData.length; i++) {
           if (lessonData[i]?.videoLink || lessonData[i]?.videoResource) {
-            await addVideo({ lessonData: lessonData[i], lessonId, dispatch })
+            await addVideo({ data: lessonData[i], lessonId, dispatch })
           }
           if (lessonData[i]?.lessonImg) {
-            await addImage({ lessonData: lessonData[i], lessonId, dispatch })
+            console.log('hi')
+            await addImage({ data: lessonData[i], lessonId, dispatch })
           }
           if (lessonData[i]?.textHeading || lessonData[i]?.textDescription) {
-            await addText({ lessonData: lessonData[i], lessonId, dispatch })
+            console.log('hello')
+            await addText({ data: lessonData[i], lessonId, dispatch })
           }
         }
         for (let i = 0; i < material.length; i++) {