From 4fb217aa0f97a709fd18c233119ba903a0f8b12a Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Thu, 29 Jul 2021 17:46:59 +0545
Subject: [PATCH 01/27] news add modal ui

---
 .../newsCreateModal/NewsCreateModal.scss           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/newsCreateModal/NewsCreateModal.scss b/src/components/newsCreateModal/NewsCreateModal.scss
index c02af3aaf..5d5c6c2e6 100644
--- a/src/components/newsCreateModal/NewsCreateModal.scss
+++ b/src/components/newsCreateModal/NewsCreateModal.scss
@@ -184,7 +184,7 @@
       top: 50%;
       left: 50%;
       transform: translate(-50%, -50%);
-      background-color: var(--primary-black);
+      background-color: var(--cards);
       border-radius: 0.4em;
 
       @media (max-width: 768px) {
@@ -201,8 +201,8 @@
       }
       .input-container {
         .block {
-          border: 1px solid var(--primary-grey);
-          background-color: var(--popups);
+          border: 1px solid var(--dropdowns);
+          background-color: var(--cards);
           .label {
             width: 100%;
             margin-left: 2.5em;
@@ -219,9 +219,9 @@
       }
       .textarea {
         margin-bottom: 1.5em;
-        border: 1px solid var(--primary-grey);
+        border: 1px solid var(--dropdowns);
         outline: none;
-        background-color: var(--popups);
+        background-color: var(--cards);
         color: #ffff;
         font-size: 1.05em;
         font-family: inherit;
@@ -282,9 +282,9 @@
     }
     .video-row-3 {
       input {
-        border: 1px solid var(--primary-grey);
+        border: 1px solid var(--dropdowns);
         outline: none;
-        background-color: var(--popups);
+        background-color: var(--cards);
         color: #ffff;
         font-size: 1.05em;
         font-family: inherit;

From 975df155b68dd28ec8063a8e45f2ab84ad521d7d Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Thu, 29 Jul 2021 17:56:11 +0545
Subject: [PATCH 02/27] scss lint fix

---
 .../newsCreateModal/NewsCreateModal.scss      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/components/newsCreateModal/NewsCreateModal.scss b/src/components/newsCreateModal/NewsCreateModal.scss
index 5d5c6c2e6..54d794048 100644
--- a/src/components/newsCreateModal/NewsCreateModal.scss
+++ b/src/components/newsCreateModal/NewsCreateModal.scss
@@ -54,6 +54,7 @@
 .last-input-variation {
   width: 45%;
 }
+
 .full {
   width: 100% !important;
 }
@@ -87,11 +88,13 @@
   font-size: 11px;
   width: 50%;
 }
+
 .errorMsg {
   color: var(--secondary-red);
   margin: 0.5em 0 1em 0;
   font-size: 1em;
 }
+
 .error {
   border-color: var(--secondary-red);
   &:focus {
@@ -107,7 +110,6 @@
   padding: 1.4em 1em;
   border: 0.5px solid var(--primary-white);
   background: var(--background-color-light);
-  outline: none;
   cursor: pointer;
   position: relative;
 
@@ -119,14 +121,17 @@
   img.avatar {
     display: none;
   }
+
   img.drag-drop-close {
     right: 0;
     top: 0;
   }
+
   .videoName {
     color: #fff;
     z-index: 1;
   }
+
   .drag-drop-icon-container {
     width: 100%;
     height: 100%;
@@ -151,6 +156,7 @@
     }
   }
 }
+
 .videoUploadBtn::-webkit-file-upload-button {
   display: none;
 }
@@ -160,6 +166,7 @@
     flex-wrap: wrap;
     text-align: center;
   }
+
   .video-row-3 > input,
   span {
     width: 100% !important;
@@ -195,6 +202,7 @@
         .toggle-container {
           background: var(--cards);
         }
+
         .active + .toggle-container {
           background: var(--primary-color);
         }
@@ -203,10 +211,12 @@
         .block {
           border: 1px solid var(--dropdowns);
           background-color: var(--cards);
+
           .label {
             width: 100%;
             margin-left: 2.5em;
           }
+
           .inputField {
             padding: 1.2em 0;
             color: #fff;
@@ -217,6 +227,7 @@
           }
         }
       }
+
       .textarea {
         margin-bottom: 1.5em;
         border: 1px solid var(--dropdowns);
@@ -242,6 +253,7 @@
         }
       }
     }
+
     .drag-drop-container {
       width: 100%;
       height: 15em;
@@ -252,6 +264,7 @@
       position: relative;
       overflow: hidden;
     }
+
     .drag-drop {
       height: 100%;
       border: none;
@@ -280,6 +293,7 @@
         margin-bottom: 1.5em;
       }
     }
+
     .video-row-3 {
       input {
         border: 1px solid var(--dropdowns);
@@ -302,14 +316,17 @@
           margin: 0;
         }
       }
+
       .dragDropText {
         color: #ffff;
         height: auto;
       }
+
       @media (max-width: 768px) {
         span {
           margin: 0.8em 0;
         }
+
         .videoUploadBtn {
           width: 100% !important;
 
@@ -320,6 +337,7 @@
       }
     }
   }
+
   &__text {
     .input-container {
       margin-bottom: 1.5em;

From 0195fb227d2fc4ec921c123a072e407ccf2dc5e4 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Thu, 29 Jul 2021 18:09:41 +0545
Subject: [PATCH 03/27] scss fix part 2

---
 src/components/newsCreateModal/NewsCreateModal.scss | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/newsCreateModal/NewsCreateModal.scss b/src/components/newsCreateModal/NewsCreateModal.scss
index 54d794048..3b1744aa2 100644
--- a/src/components/newsCreateModal/NewsCreateModal.scss
+++ b/src/components/newsCreateModal/NewsCreateModal.scss
@@ -97,6 +97,7 @@
 
 .error {
   border-color: var(--secondary-red);
+
   &:focus {
     border-color: var(--secondary-red) !important;
   }
@@ -207,6 +208,7 @@
           background: var(--primary-color);
         }
       }
+
       .input-container {
         .block {
           border: 1px solid var(--dropdowns);
@@ -239,18 +241,19 @@
 
         &__error {
           border-color: var(--secondary-red);
+
           &:focus {
             border-color: var(--secondary-red) !important;
           }
         }
 
-        &:focus {
-          border-color: var(--primary-color);
-        }
-
         &::-webkit-input-placeholder {
           color: var(--primary-grey);
         }
+
+        &:focus {
+          border-color: var(--primary-color);
+        }
       }
     }
 

From 0ca05c00242ca24c3a7ebdc4dd4b4d0f582f3937 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Mon, 2 Aug 2021 17:53:59 +0545
Subject: [PATCH 04/27] news modal: same component for course and news

---
 src/App.jsx                                   |   2 +-
 .../btnCollection/BtnCollection.jsx           |  40 +++
 .../btnCollection/BtnCollection.scss          |   0
 src/components/newAddModal/NewsAddModal.jsx   |  17 +-
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 333 +++++++++++-------
 .../courseManager/addLesson/AddContent.jsx    |  31 +-
 6 files changed, 271 insertions(+), 152 deletions(-)
 create mode 100644 src/components/btnCollection/BtnCollection.jsx
 create mode 100644 src/components/btnCollection/BtnCollection.scss

diff --git a/src/App.jsx b/src/App.jsx
index 2e71c6150..f85b20d67 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -73,7 +73,7 @@ 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={NewsAdd} path='/community-news/:title' exact />
             <PrivateRoute component={CommunityNewsViewPage} path='/community-page-news-view' exact />
             <PrivateRoute component={AllCommunitiesCard} path='/community-switching' exact />
             <PrivateRoute component={CommunityMembers} path='/community-members/:id' exact />
diff --git a/src/components/btnCollection/BtnCollection.jsx b/src/components/btnCollection/BtnCollection.jsx
new file mode 100644
index 000000000..ff335273e
--- /dev/null
+++ b/src/components/btnCollection/BtnCollection.jsx
@@ -0,0 +1,40 @@
+import React from 'react'
+import Text from '../../screens/courseManager/addLesson/Text'
+import Image from '../lessonImage/Image'
+import Video from '../videoPlayer/Video'
+
+const BtnCollection = ({data, setVideoModal, setImageModal, setTextModal}) => {
+    return (
+        <>
+            {data.length &&
+        data.map((vid, index) => (
+          <div key={index}>
+            <Video
+              title={vid.videoTitle}
+              description={vid.videoDescription}
+              url={vid.videoLink || vid.videoResource?.preview}
+              thumbnail={vid.videoCover?.preview}
+            />
+            <Image src={vid.lessonImg?.preview} desc={vid.photoDescription} />
+            <Text heading={vid.textHeading} desc={vid.textDescription} />
+          </div>
+        ))}
+      <div className='admin-lesson-create-btn-wrapper'>
+        <button className='secondary-btn' onClick={() => setVideoModal(true)}>
+          <img src='/img/video-outline.svg' alt='video icon' />{' '}
+          <span>Add video</span>
+        </button>
+        <button className='secondary-btn' onClick={() => setImageModal(true)}>
+          <img src='/img/image-outline.svg' alt='image_icon' />
+          <span>Add image</span>
+        </button>
+        <button className='secondary-btn' onClick={() => setTextModal(true)}>
+          <img src='/img/text-outline.svg' alt='text icon' />{' '}
+          <span>Add text</span>
+        </button>
+      </div>
+        </>
+    )
+}
+
+export default BtnCollection
diff --git a/src/components/btnCollection/BtnCollection.scss b/src/components/btnCollection/BtnCollection.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/newAddModal/NewsAddModal.jsx b/src/components/newAddModal/NewsAddModal.jsx
index c81e0b48d..24575aac0 100644
--- a/src/components/newAddModal/NewsAddModal.jsx
+++ b/src/components/newAddModal/NewsAddModal.jsx
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import './NewsAddModal.scss'
-import { Link } from 'react-router-dom'
+import { Link, useHistory } from 'react-router-dom'
 import { useDispatch } from 'react-redux'
 import { newsUpdate } from '../../actions/newsActions'
 
@@ -11,6 +11,8 @@ const NewsAddModal = ({ setAddModal, editData, setEditData }) => {
   const [titleError, setTitleError] = useState()
   const [categoryError, setCategoryError] = useState()
 
+  const history = useHistory();
+
   const dispatch = useDispatch()
   const titleChange = (e) => {
     setTitle(e.target.value)
@@ -50,11 +52,16 @@ const NewsAddModal = ({ setAddModal, editData, setEditData }) => {
             <option>Business</option>
           </select>
         </div>
-        {editData
+        {
+          editData
           ? <button className='default-btn-btn btn-variation' onClick={editNewsTitle}>Update</button>
-          : <Link className='nav-link' to={`/community-page-news/${title}/${category}`}>
-            <button className='default-btn-btn btn-variation'>Continue</button>
-          </Link>}
+          : <button className='default-btn-btn btn-variation' onClick = {() => history.push({
+              pathname: `/community-news/${title}`,
+              state: {
+                category
+              }
+            })}>Continue</button>
+        }
       </div>
     </div>
   )
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index e62dff06e..4766043b2 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useLayoutEffect, useState } from 'react'
 import NewsCreateModal from '../../../components/newsCreateModal/NewsCreateModal'
 import DashboardLayout from '../../../layout/dashboardLayout/DashboardLayout'
 import { useParams, useHistory } from 'react-router-dom'
@@ -7,6 +7,12 @@ import BackButton from '../../../components/backButton/BackButton'
 import CommunityNewsViewPage from '../../communityNewsView/CommunityNewsView'
 import { useDispatch, useSelector } from 'react-redux'
 import { createNews } from '../../../actions/newsActions'
+import AddContent from '../../courseManager/addLesson/AddContent'
+import { useForm } from 'react-hook-form'
+import { useEffect } from 'react'
+import { useLocation } from 'react-router-dom/cjs/react-router-dom.min'
+import { ErrorText, TextArea } from '../../../components/formUI/FormUI'
+import BtnCollection from '../../../components/btnCollection/BtnCollection'
 
 const NewsAdd = () => {
   const { currentCommunity } = useSelector(state => state.activeCommunity)
@@ -16,152 +22,243 @@ const NewsAdd = () => {
   const [videoActive, setVideoActive] = useState(true)
   const [imageActive, setImageActive] = useState(true)
   const [textActive, setTextActive] = useState(true)
+  const [newsData, setNewsData] = useState([])
+
   const news = useSelector((state) => (state.addNewNews !== {} ? state.addNewNews : ''))
+  const { register, errors, handleSubmit } = useForm()
+
+  const { title} = useParams()
+
+  const dispatch = useDispatch();
 
-  const { title, category } = useParams()
+  // fetching category from route
+  const {state} = useLocation();
+  const {category} = state;
+
+  useEffect(() => {
+    setNewsData([{title, category}])
+  }, [])
+
+    const submitNewsForm = ({ title }) => {
+      console.log(newsData);
+    // const order = fetchLesson.length + 1
+    // dispatch(
+    //   createLesson({
+    //     title,
+    //     category,
+    //     coverImg,
+    //   })
+    // )
+  }
 
   return (
     <>
-      {createVideoModal && <NewsCreateModal type='video' videoActive={videoActive} setVideoActive={setVideoActive} />}
-      {createImageModal && <NewsCreateModal type='image' imageActive={imageActive} setImageActive={setImageActive} />}
-      {createTextModal && <NewsCreateModal type='text' textActive={textActive} setTextActive={setTextActive} />}
+      {createVideoModal && <NewsCreateModal type='video' videoActive={videoActive} setVideoActive={setVideoActive} lessonData={newsData} setLessonData={setNewsData} />}
+      {createImageModal && <NewsCreateModal type='image' imageActive={imageActive} setImageActive={setImageActive} lessonData={newsData} setLessonData={setNewsData} />}
+      {createTextModal && <NewsCreateModal type='text' textActive={textActive} setTextActive={setTextActive} lessonData={newsData} setLessonData={setNewsData} />}
       <DashboardLayout title='Add News'>
         <BackButton location={`/community-page-news/${currentCommunity.slug}`} />
-        <NewsAddMainContainer
-          setCreateVideoModal={setCreateVideoModal}
-          setCreateImageModal={setCreateImageModal}
-          news={news}
-          title={title}
-          category={category}
-          setCreateTextModal={setCreateTextModal}
-          setTextActive={setTextActive}
-          setImageActive={setImageActive}
-          setVideoActive={setVideoActive}
+        <AddNewsContent
+          setVideoModal = {setCreateVideoModal}
+          setImageModal = {setCreateImageModal}
+          setTextModal = {setCreateTextModal}
+          register={register}
+          errors={errors}
+          setNewsData = {setNewsData}
+          newsData = {newsData}
+        />
 
+        <NewsSaveModal
+          onClick={handleSubmit(submitNewsForm)}
         />
+
       </DashboardLayout>
     </>
   )
 }
 
-function NewsAddMainContainer ({
-  setCreateVideoModal,
-  setCreateImageModal,
-  setCreateTextModal,
-  setVideoActive,
-  setImageActive,
-  setTextActive,
-  news,
-  title,
-  category
-
-}) {
-  function createVideo () {
-    setCreateVideoModal(true)
-    setCreateImageModal(false)
-    setCreateTextModal(false)
-    setVideoActive(true)
-  }
-
-  function createImage () {
-    setCreateVideoModal(false)
-    setCreateImageModal(true)
-    setCreateTextModal(false)
-    setImageActive(true)
-  }
+const AddNewsContent = ({
+  errors,
+  newsData,
+  setVideoModal,
+  setImageModal,
+  setTextModal,
+  register
+}) => {
 
-  function createText () {
-    setCreateVideoModal(false)
-    setCreateImageModal(false)
-    setCreateTextModal(true)
-    setTextActive(true)
-  }
+  const [title, setTitle] = useState('');
+  
+  useEffect(() => {
+    if(newsData.length) {
+      setTitle(newsData[0].title)
+    }
+  }, [newsData])
 
-  return (
-    <div className='news-add-main-container'>
-      <NewsAddContainer
-        title={title}
-        news={news}
-        createVideo={createVideo}
-        createImage={createImage}
-        createText={createText}
+  return  <div className='admin-lesson-create-container'>
+      <ErrorText
+        className='errorMsg'
+        message={errors.title && errors.title.message}
       />
-      <div>{Object.entries(news).length !== 0 && <PopUp news={news} title={title} category={category} />}</div>
+      <input
+        type='text'
+        placeholder='Write Title Here'
+        name='title'
+        defaultValue={title}
+        ref={register({
+          required: {
+            value: true,
+            message: 'You must enter news title'
+          }
+        })}
+      />
+
+      <BtnCollection data={newsData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
     </div>
-  )
 }
 
-function NewsAddContainer ({ createVideo, createImage, createText, title, news }) {
+const NewsSaveModal = ({ pathId, onClick }) => {
+  const history = useHistory()
   return (
-    <div className='news-add-container'>
-      <NewContent title={title} news={news} />
-      <div className='news-add-inner-container'>
-        <button onClick={() => createVideo()} className='add-btn'>
-          <img src='/img/video-outline.svg' alt='Add video' /> <span>Add video</span>
-        </button>
-        <button onClick={() => createImage()} className='add-btn'>
-          <img src='/img/camera-outline.svg' alt='Add new img' /> <span>Add image</span>
+    <div className='save-lesson-modal'>
+      <h4>Do you want to save News?</h4>
+      <div>
+        <button
+          className='secondary-btn'
+          id='lesson-cancel-btn'
+          onClick={() => history.push(`/dashboard`)}
+        >
+          Cancel
         </button>
-        <button onClick={() => createText()} className='add-btn'>
-          <img src='/img/file-text-outline.svg' alt='Add text' />
-          <span>Add text</span>
+        <button
+          className='primary-btn secondary-btn'
+          id='lesson-save-btn'
+          onClick={onClick}
+        >
+          Save News
         </button>
       </div>
     </div>
   )
 }
 
-function NewContent ({ title, news }) {
-  return (
-    <>
-      <div className='new-title-container'>
-        <h2>{title}</h2>
-        {news && <CommunityNewsViewPage newNews={news} />}
-      </div>
-    </>
-  )
-}
+// function NewsAddMainContainer ({
+//   setCreateVideoModal,
+//   setCreateImageModal,
+//   setCreateTextModal,
+//   setVideoActive,
+//   setImageActive,
+//   setTextActive,
+//   news,
+//   title,
+//   category
 
-function PopUp ({ news, title, category }) {
-  const { file } = news.imageDetail ? news.imageDetail.file && news.imageDetail : {}
-  const newNews = { ...news, title, category, file }
-  const [activePopup, setActivePopup] = useState(true)
-  const { currentCommunity } = useSelector(state => state.activeCommunity)
-  const dispatch = useDispatch()
-  const history = useHistory()
-  const handleOnSaveClick = (e) => {
-    if (file) {
-      dispatch(createNews(newNews))
-      setActivePopup(false)
-      history.push(`/community-page-news/${currentCommunity.slug}`)
-    } else {
-      dispatch(createNews(newNews))
-      setActivePopup(false)
-      history.push(`/community-page-news/${currentCommunity.slug}`)
-    }
-  }
+// }) {
+//   function createVideo () {
+//     setCreateVideoModal(true)
+//     setCreateImageModal(false)
+//     setCreateTextModal(false)
+//     setVideoActive(true)
+//   }
 
-  const handleOnCancelClick = (e) => {
-    setActivePopup(false)
-    history.push(`/community-page-news/${currentCommunity.slug}`)
-  }
-  return (
-    <>
-      {activePopup && (
-        <div className='popup-box'>
-          <h4>Do you want to save?</h4>
-          <div className='popup-btn-wrapper'>
-            <button onClick={handleOnCancelClick} className='secondary-btn popup-btn'>
-              Cancel
-            </button>
-            <button onClick={handleOnSaveClick} className='default-btn popup-btn'>
-              Save
-            </button>
-          </div>
-        </div>
-      )}
-    </>
-  )
-}
+//   function createImage () {
+//     setCreateVideoModal(false)
+//     setCreateImageModal(true)
+//     setCreateTextModal(false)
+//     setImageActive(true)
+//   }
+
+//   function createText () {
+//     setCreateVideoModal(false)
+//     setCreateImageModal(false)
+//     setCreateTextModal(true)
+//     setTextActive(true)
+//   }
+
+//   return (
+//     <div className='news-add-main-container'>
+//       <NewsAddContainer
+//         title={title}
+//         news={news}
+//         createVideo={createVideo}
+//         createImage={createImage}
+//         createText={createText}
+//       />
+//       <div>{Object.entries(news).length !== 0 && <PopUp news={news} title={title} category={category} />}</div>
+//     </div>
+//   )
+// }
+
+// function NewsAddContainer ({ createVideo, createImage, createText, title, news }) {
+//   return (
+//     <div className='news-add-container'>
+//       <NewContent title={title} news={news} />
+//       <div className='news-add-inner-container'>
+//         <button onClick={() => createVideo()} className='add-btn'>
+//           <img src='/img/video-outline.svg' alt='Add video' /> <span>Add video</span>
+//         </button>
+//         <button onClick={() => createImage()} className='add-btn'>
+//           <img src='/img/camera-outline.svg' alt='Add new img' /> <span>Add image</span>
+//         </button>
+//         <button onClick={() => createText()} className='add-btn'>
+//           <img src='/img/file-text-outline.svg' alt='Add text' />
+//           <span>Add text</span>
+//         </button>
+//       </div>
+//     </div>
+//   )
+// }
+
+// function NewContent ({ title, news }) {
+//   return (
+//     <>
+//       <div className='new-title-container'>
+//         <h2>{title}</h2>
+//         {news && <CommunityNewsViewPage newNews={news} />}
+//       </div>
+//     </>
+//   )
+// }
+
+// function PopUp ({ news, title, category }) {
+//   const { file } = news.imageDetail ? news.imageDetail.file && news.imageDetail : {}
+//   const newNews = { ...news, title, category, file }
+//   const [activePopup, setActivePopup] = useState(true)
+//   const { currentCommunity } = useSelector(state => state.activeCommunity)
+//   const dispatch = useDispatch()
+//   const history = useHistory()
+//   const handleOnSaveClick = (e) => {
+//     if (file) {
+//       dispatch(createNews(newNews))
+//       setActivePopup(false)
+//       history.push(`/community-page-news/${currentCommunity.slug}`)
+//     } else {
+//       dispatch(createNews(newNews))
+//       setActivePopup(false)
+//       history.push(`/community-page-news/${currentCommunity.slug}`)
+//     }
+//   }
+
+//   const handleOnCancelClick = (e) => {
+//     setActivePopup(false)
+//     history.push(`/community-page-news/${currentCommunity.slug}`)
+//   }
+//   return (
+//     <>
+//       {activePopup && (
+//         <div className='popup-box'>
+//           <h4>Do you want to save?</h4>
+//           <div className='popup-btn-wrapper'>
+//             <button onClick={handleOnCancelClick} className='secondary-btn popup-btn'>
+//               Cancel
+//             </button>
+//             <button onClick={handleOnSaveClick} className='default-btn popup-btn'>
+//               Save
+//             </button>
+//           </div>
+//         </div>
+//       )}
+//     </>
+//   )
+// }
 
 export default NewsAdd
diff --git a/src/screens/courseManager/addLesson/AddContent.jsx b/src/screens/courseManager/addLesson/AddContent.jsx
index 177a1b3b8..687588009 100644
--- a/src/screens/courseManager/addLesson/AddContent.jsx
+++ b/src/screens/courseManager/addLesson/AddContent.jsx
@@ -1,8 +1,10 @@
+import React, { useEffect, useLayoutEffect, useState } from 'react'
 import DragDrop from '../../../components/dragDrop/DragDrop'
 import { ErrorText, TextArea } from '../../../components/formUI/FormUI'
 import Video from '../../../components/videoPlayer/Video'
 import Image from '../../../components/lessonImage/Image'
 import Text from './Text'
+import BtnCollection from '../../../components/btnCollection/BtnCollection'
 
 const AddContent = ({
   setVideoModal,
@@ -41,34 +43,7 @@ const AddContent = ({
       />
 
       <DragDrop onChange={(img) => setLessonCover(img)} />
-
-      {lessonData &&
-        lessonData.map((vid, index) => (
-          <div key={index}>
-            <Video
-              title={vid.videoTitle}
-              description={vid.videoDescription}
-              url={vid.videoLink || vid.videoResource?.preview}
-              thumbnail={vid.videoCover?.preview}
-            />
-            <Image src={vid.lessonImg?.preview} desc={vid.photoDescription} />
-            <Text heading={vid.textHeading} desc={vid.textDescription} />
-          </div>
-        ))}
-      <div className='admin-lesson-create-btn-wrapper'>
-        <button className='secondary-btn' onClick={() => setVideoModal(true)}>
-          <img src='/img/video-outline.svg' alt='video icon' />{' '}
-          <span>Add video</span>
-        </button>
-        <button className='secondary-btn' onClick={() => setImageModal(true)}>
-          <img src='/img/image-outline.svg' alt='image_icon' />
-          <span>Add image</span>
-        </button>
-        <button className='secondary-btn' onClick={() => setTextModal(true)}>
-          <img src='/img/text-outline.svg' alt='text icon' />{' '}
-          <span>Add text</span>
-        </button>
-      </div>
+      <BtnCollection data={lessonData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
     </div>
   )
 }

From c1298f18a3418ed0b7231a496095b9536d3df6c7 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Tue, 3 Aug 2021 13:00:57 +0545
Subject: [PATCH 05/27] video feature added in news

---
 api/src/controllers/newsController.js         | 17 ++++++++++++-----
 ...10803053107-alter-news-table-video-desc.js | 19 +++++++++++++++++++
 api/src/models/newsModel.js                   |  7 ++++++-
 api/src/routes/newsRouter.js                  | 10 +++++++++-
 4 files changed, 46 insertions(+), 7 deletions(-)
 create mode 100644 api/src/migrations/20210803053107-alter-news-table-video-desc.js

diff --git a/api/src/controllers/newsController.js b/api/src/controllers/newsController.js
index ace3a6066..99ab77502 100644
--- a/api/src/controllers/newsController.js
+++ b/api/src/controllers/newsController.js
@@ -40,16 +40,23 @@ const getNews = (req, res) => {
 // @route POST /api/news/add/community/:id
 // @access  Public
 const addNews = (req, res) => {
-  let filename = ''
-  if (req.file) {
-    filename = req.file.filename
+  let imageFilename = ''
+  let videoFilename = ''
+  if (req.files) {
+    imageFilename = req.files['newsImage'][0].filename
+    videoFilename = req.files['newsVideo'][0].filename
   }
+
   const {
-    title, message, docType, readTime, language, creator, textDetail, imageDetail, videoDetail, category
+    title, message, docType, readTime, language, creator, textDetail, imageDetail, videoDetail, category, videoTitle, videoDescription, videoLink
   } = req.body
   db.News.create({
     // _attachments: 'uploads/' + req.file.filename,
-    _attachments: 'news/' + filename,
+    _attachments: 'news/' + imageFilename,
+    videoCover: videoFilename,
+    videoTitle,
+    videoDescription,
+    videoLink,
     title,
     message,
     docType,
diff --git a/api/src/migrations/20210803053107-alter-news-table-video-desc.js b/api/src/migrations/20210803053107-alter-news-table-video-desc.js
new file mode 100644
index 000000000..bd2c24aac
--- /dev/null
+++ b/api/src/migrations/20210803053107-alter-news-table-video-desc.js
@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    queryInterface.addColumn('news', 'videoTitle', Sequelize.STRING)
+    queryInterface.addColumn('news', 'videoDescription', Sequelize.STRING)
+    queryInterface.addColumn('news', 'videoCover', Sequelize.STRING)
+    queryInterface.addColumn('news', 'videoLink', Sequelize.STRING)
+    queryInterface.addColumn('news', 'videoResource', Sequelize.STRING) 
+  },
+
+  down: async (queryInterface, Sequelize) => {
+    queryInterface.removeColumn('news', 'videoTitle')
+    queryInterface.removeColumn('news', 'videoDescription')
+    queryInterface.removeColumn('news', 'videoCover')
+    queryInterface.removeColumn('news', 'videoLink')
+    queryInterface.removeColumn('news', 'videoResource') 
+  }
+};
diff --git a/api/src/models/newsModel.js b/api/src/models/newsModel.js
index 16ab72926..5309c5d15 100644
--- a/api/src/models/newsModel.js
+++ b/api/src/models/newsModel.js
@@ -45,7 +45,12 @@ module.exports = (sequelize, DataTypes) => {
     deleted: {
       type: DataTypes.BOOLEAN,
       defaultValue: false
-    }
+    },
+    videoTitle: DataTypes.STRING,
+    videoDescription: DataTypes.STRING,
+    videoCover: DataTypes.STRING,
+    videoLink: DataTypes.STRING,
+    videoResource: DataTypes.STRING
   },
   { timestamps: true }
   )
diff --git a/api/src/routes/newsRouter.js b/api/src/routes/newsRouter.js
index d93246632..068c75954 100644
--- a/api/src/routes/newsRouter.js
+++ b/api/src/routes/newsRouter.js
@@ -6,8 +6,16 @@ const checkCommunity = require('../middleware/checkCommunity')
 const { addNews, getNews, updateNews, getNewsById, deleteNews, searchNewsTitle } = require('../controllers/newsController')
 const { upload, resizeImage } = require('../helpers/filehelpers')
 
+// uploading multiple files
+const cpUpload = upload.fields([{ name: 'newsImage', maxCount: 1 }, { name: 'newsVideo', maxCount: 1 }])
+// attaching single file to req.file for converting it
+const fileChanger = (req, _res, next) => {
+  req.file = req.files.newsImage[0]
+  next()
+}
+
 router.route('/community/:id').get(checkCommunity, getNews)
-router.route('/add/community/:id').post(checkCommunity, upload.single('news'), resizeImage, addNews)
+router.route('/add/community/:id').post(checkCommunity, cpUpload, fileChanger, resizeImage, addNews)
 router.route('/community/:id/search').get(checkCommunity, searchNewsTitle)
 router
   .route('/:newsId/community/:id')

From a99c995f2495845145fbde6a39018c21e6d2d5b8 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Tue, 3 Aug 2021 14:17:53 +0545
Subject: [PATCH 06/27] video feature added in the news add

---
 src/actions/newsActions.js                    | 17 ++++++++--
 .../ContentAdd.jsx}                           |  4 +--
 .../ContentAdd.scss}                          |  0
 src/components/newsCard/NewsCard.jsx          |  2 +-
 .../newsCreateModal/NewsCreateVideo.jsx       |  1 +
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 33 +++++++++++--------
 .../courseManager/addLesson/AddContent.jsx    |  9 ++---
 7 files changed, 41 insertions(+), 25 deletions(-)
 rename src/components/{btnCollection/BtnCollection.jsx => contentAdd/ContentAdd.jsx} (92%)
 rename src/components/{btnCollection/BtnCollection.scss => contentAdd/ContentAdd.scss} (100%)

diff --git a/src/actions/newsActions.js b/src/actions/newsActions.js
index 8a4293cbf..2ce1a3eaf 100644
--- a/src/actions/newsActions.js
+++ b/src/actions/newsActions.js
@@ -69,14 +69,25 @@ export const searchNews = (search) => async (dispatch) => {
 
 export const createNews = (newNews) => async (dispatch, getState) => {
   const formData = new FormData()
-  formData.append('news', newNews.file)
+  formData.append('newsImage', newNews.lessonImg)
+  formData.append('newsVideo', newNews.videoCover)
   formData.append('title', newNews.title)
   formData.append('category', newNews.category)
-  formData.append('imageDetail', newNews.imageDetail)
+  formData.append('videoTitle', newNews.videoTitle)
+  formData.append('videoDescription', newNews.videoDescription)
+  formData.append('videoLink', newNews.videoLink)
   try {
+    const configFunc = () => {
+        const userdata = window.localStorage.getItem('userInfo')
+        const token = JSON.parse(userdata).token
+        const headers = { 'Content-Type': 'multipart/form-data' }
+        headers.Authorization = token && `Bearer ${token}`
+        return { headers }
+    }
+
     dispatch({ type: NEWS_CREATE_REQUEST })
     const { userLogin: { userInfo } } = getState()
-    const { data } = await axios.post(`${process.env.REACT_APP_API_BASE_URL}/api/news/add/community/${currentCommunity.id}`, formData, configFunc())
+    const { data } = await axios.post(`${process.env.REACT_APP_API_BASE_URL}/api/news/add/community/${currentCommunity.id}`, formData, configFunc)
     dispatch({ type: NEWS_CREATE_SUCCESS, payload: data })
     dispatch({ type: NEWS_CLEAR, payload: data })
   } catch (error) {
diff --git a/src/components/btnCollection/BtnCollection.jsx b/src/components/contentAdd/ContentAdd.jsx
similarity index 92%
rename from src/components/btnCollection/BtnCollection.jsx
rename to src/components/contentAdd/ContentAdd.jsx
index ff335273e..b56734705 100644
--- a/src/components/btnCollection/BtnCollection.jsx
+++ b/src/components/contentAdd/ContentAdd.jsx
@@ -3,7 +3,7 @@ import Text from '../../screens/courseManager/addLesson/Text'
 import Image from '../lessonImage/Image'
 import Video from '../videoPlayer/Video'
 
-const BtnCollection = ({data, setVideoModal, setImageModal, setTextModal}) => {
+const ContentAdd = ({data, setVideoModal, setImageModal, setTextModal}) => {
     return (
         <>
             {data.length &&
@@ -37,4 +37,4 @@ const BtnCollection = ({data, setVideoModal, setImageModal, setTextModal}) => {
     )
 }
 
-export default BtnCollection
+export default ContentAdd
diff --git a/src/components/btnCollection/BtnCollection.scss b/src/components/contentAdd/ContentAdd.scss
similarity index 100%
rename from src/components/btnCollection/BtnCollection.scss
rename to src/components/contentAdd/ContentAdd.scss
diff --git a/src/components/newsCard/NewsCard.jsx b/src/components/newsCard/NewsCard.jsx
index adffd07d0..2265fbd42 100644
--- a/src/components/newsCard/NewsCard.jsx
+++ b/src/components/newsCard/NewsCard.jsx
@@ -31,7 +31,7 @@ const NewsSingleCard = ({ news, editCard }) => {
     setDropDown(false)
   }
   return (
-    <Background tag='/news/' image={news._attachments}>
+    <Background tag='/newsImage/' image={news._attachments}>
       <div className='news-card'>
         <div className='news-card-header'>
           <div className='news-show-date'>{moment(news.createdAt).fromNow()}</div>
diff --git a/src/components/newsCreateModal/NewsCreateVideo.jsx b/src/components/newsCreateModal/NewsCreateVideo.jsx
index a4d234745..2adbca853 100644
--- a/src/components/newsCreateModal/NewsCreateVideo.jsx
+++ b/src/components/newsCreateModal/NewsCreateVideo.jsx
@@ -36,6 +36,7 @@ const CreateVideo = ({
     setLessonData(vData)
     setVideoActive(false)
   }
+  
   return (
     <>
       {videoActive && (
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 4766043b2..9eff1117c 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -12,7 +12,7 @@ import { useForm } from 'react-hook-form'
 import { useEffect } from 'react'
 import { useLocation } from 'react-router-dom/cjs/react-router-dom.min'
 import { ErrorText, TextArea } from '../../../components/formUI/FormUI'
-import BtnCollection from '../../../components/btnCollection/BtnCollection'
+import ContentAdd from '../../../components/contentAdd/ContentAdd'
 
 const NewsAdd = () => {
   const { currentCommunity } = useSelector(state => state.activeCommunity)
@@ -39,16 +39,23 @@ const NewsAdd = () => {
     setNewsData([{title, category}])
   }, [])
 
-    const submitNewsForm = ({ title }) => {
-      console.log(newsData);
-    // const order = fetchLesson.length + 1
-    // dispatch(
-    //   createLesson({
-    //     title,
-    //     category,
-    //     coverImg,
-    //   })
-    // )
+  const submitNewsForm = ({ title }) => {
+    const newData = convertArrToObject(newsData)
+    newData.title = title
+    newData.category = category;
+    dispatch(createNews(newData));
+  }
+
+  // converting the arrray into object for submission
+
+  function convertArrToObject (arr) {
+    let newData = {};
+    arr.map(item => {
+      let prop = Object.getOwnPropertyNames(item);
+      prop.forEach(el => newData[el] = item[el])
+    })
+
+    return newData;
   }
 
   return (
@@ -112,7 +119,7 @@ const AddNewsContent = ({
         })}
       />
 
-      <BtnCollection data={newsData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
+      <ContentAdd data={newsData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
     </div>
 }
 
@@ -125,7 +132,7 @@ const NewsSaveModal = ({ pathId, onClick }) => {
         <button
           className='secondary-btn'
           id='lesson-cancel-btn'
-          onClick={() => history.push(`/dashboard`)}
+          onClick={() => history.goBack()}
         >
           Cancel
         </button>
diff --git a/src/screens/courseManager/addLesson/AddContent.jsx b/src/screens/courseManager/addLesson/AddContent.jsx
index 687588009..bb615af6f 100644
--- a/src/screens/courseManager/addLesson/AddContent.jsx
+++ b/src/screens/courseManager/addLesson/AddContent.jsx
@@ -1,10 +1,7 @@
-import React, { useEffect, useLayoutEffect, useState } from 'react'
+import React from 'react'
 import DragDrop from '../../../components/dragDrop/DragDrop'
 import { ErrorText, TextArea } from '../../../components/formUI/FormUI'
-import Video from '../../../components/videoPlayer/Video'
-import Image from '../../../components/lessonImage/Image'
-import Text from './Text'
-import BtnCollection from '../../../components/btnCollection/BtnCollection'
+import ContentAdd from '../../../components/contentAdd/ContentAdd'
 
 const AddContent = ({
   setVideoModal,
@@ -43,7 +40,7 @@ const AddContent = ({
       />
 
       <DragDrop onChange={(img) => setLessonCover(img)} />
-      <BtnCollection data={lessonData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
+      <ContentAdd data={lessonData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
     </div>
   )
 }

From 49e04dc6b6429cf3772f0d4183b2e6cb7d3080c6 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Tue, 3 Aug 2021 14:34:43 +0545
Subject: [PATCH 07/27] js lint fix in content

---
 src/components/contentAdd/ContentAdd.jsx | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/contentAdd/ContentAdd.jsx b/src/components/contentAdd/ContentAdd.jsx
index b56734705..38971116f 100644
--- a/src/components/contentAdd/ContentAdd.jsx
+++ b/src/components/contentAdd/ContentAdd.jsx
@@ -4,21 +4,23 @@ import Image from '../lessonImage/Image'
 import Video from '../videoPlayer/Video'
 
 const ContentAdd = ({data, setVideoModal, setImageModal, setTextModal}) => {
-    return (
-        <>
-            {data.length &&
-        data.map((vid, index) => (
-          <div key={index}>
-            <Video
+  return (
+    <>
+      {
+        data.length &&
+          data.map((vid, index) => (
+            <div key={index}>
+              <Video
               title={vid.videoTitle}
               description={vid.videoDescription}
               url={vid.videoLink || vid.videoResource?.preview}
               thumbnail={vid.videoCover?.preview}
-            />
-            <Image src={vid.lessonImg?.preview} desc={vid.photoDescription} />
-            <Text heading={vid.textHeading} desc={vid.textDescription} />
+              />
+              <Image src={vid.lessonImg?.preview} desc={vid.photoDescription} />
+              <Text heading={vid.textHeading} desc={vid.textDescription} />
           </div>
-        ))}
+        ))
+      }
       <div className='admin-lesson-create-btn-wrapper'>
         <button className='secondary-btn' onClick={() => setVideoModal(true)}>
           <img src='/img/video-outline.svg' alt='video icon' />{' '}
@@ -33,7 +35,7 @@ const ContentAdd = ({data, setVideoModal, setImageModal, setTextModal}) => {
           <span>Add text</span>
         </button>
       </div>
-        </>
+    </>
     )
 }
 

From c6f4c1d1ec2e7cdc8d68a572ac18cdebc43a2bea Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Thu, 5 Aug 2021 11:39:11 +0545
Subject: [PATCH 08/27] news table linked to photos, videos and texts table

---
 api/src/controllers/newsController.js         | 15 +++------
 ...10803053107-alter-news-table-video-desc.js | 19 -----------
 ...03-alter-videos-texts-photos-tbl-newsId.js | 33 +++++++++++++++++++
 api/src/models/newsModel.js                   |  8 ++---
 api/src/models/photoModel.js                  |  4 +++
 api/src/models/textModel.js                   |  7 ++++
 api/src/models/videoModel.js                  |  4 +++
 api/src/routes/newsRouter.js                  | 10 +-----
 8 files changed, 56 insertions(+), 44 deletions(-)
 delete mode 100644 api/src/migrations/20210803053107-alter-news-table-video-desc.js
 create mode 100644 api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js

diff --git a/api/src/controllers/newsController.js b/api/src/controllers/newsController.js
index 99ab77502..af9e0a6ad 100644
--- a/api/src/controllers/newsController.js
+++ b/api/src/controllers/newsController.js
@@ -40,23 +40,16 @@ const getNews = (req, res) => {
 // @route POST /api/news/add/community/:id
 // @access  Public
 const addNews = (req, res) => {
-  let imageFilename = ''
-  let videoFilename = ''
-  if (req.files) {
-    imageFilename = req.files['newsImage'][0].filename
-    videoFilename = req.files['newsVideo'][0].filename
+  let filename = ''
+  if (req.file) {
+    filename = req.file.filename
   }
 
   const {
     title, message, docType, readTime, language, creator, textDetail, imageDetail, videoDetail, category, videoTitle, videoDescription, videoLink
   } = req.body
   db.News.create({
-    // _attachments: 'uploads/' + req.file.filename,
-    _attachments: 'news/' + imageFilename,
-    videoCover: videoFilename,
-    videoTitle,
-    videoDescription,
-    videoLink,
+    _attachments: 'news/' + filename,
     title,
     message,
     docType,
diff --git a/api/src/migrations/20210803053107-alter-news-table-video-desc.js b/api/src/migrations/20210803053107-alter-news-table-video-desc.js
deleted file mode 100644
index bd2c24aac..000000000
--- a/api/src/migrations/20210803053107-alter-news-table-video-desc.js
+++ /dev/null
@@ -1,19 +0,0 @@
-'use strict';
-
-module.exports = {
-  up: async (queryInterface, Sequelize) => {
-    queryInterface.addColumn('news', 'videoTitle', Sequelize.STRING)
-    queryInterface.addColumn('news', 'videoDescription', Sequelize.STRING)
-    queryInterface.addColumn('news', 'videoCover', Sequelize.STRING)
-    queryInterface.addColumn('news', 'videoLink', Sequelize.STRING)
-    queryInterface.addColumn('news', 'videoResource', Sequelize.STRING) 
-  },
-
-  down: async (queryInterface, Sequelize) => {
-    queryInterface.removeColumn('news', 'videoTitle')
-    queryInterface.removeColumn('news', 'videoDescription')
-    queryInterface.removeColumn('news', 'videoCover')
-    queryInterface.removeColumn('news', 'videoLink')
-    queryInterface.removeColumn('news', 'videoResource') 
-  }
-};
diff --git a/api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js b/api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js
new file mode 100644
index 000000000..7d4de2ea7
--- /dev/null
+++ b/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')
+  }
+};
diff --git a/api/src/models/newsModel.js b/api/src/models/newsModel.js
index 5309c5d15..45d5fe437 100644
--- a/api/src/models/newsModel.js
+++ b/api/src/models/newsModel.js
@@ -46,11 +46,6 @@ module.exports = (sequelize, DataTypes) => {
       type: DataTypes.BOOLEAN,
       defaultValue: false
     },
-    videoTitle: DataTypes.STRING,
-    videoDescription: DataTypes.STRING,
-    videoCover: DataTypes.STRING,
-    videoLink: DataTypes.STRING,
-    videoResource: DataTypes.STRING
   },
   { timestamps: true }
   )
@@ -58,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
 }
diff --git a/api/src/models/photoModel.js b/api/src/models/photoModel.js
index 3d0fadce1..9fe964df9 100644
--- a/api/src/models/photoModel.js
+++ b/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
 }
diff --git a/api/src/models/textModel.js b/api/src/models/textModel.js
index ae81de3ea..7c1d831bb 100644
--- a/api/src/models/textModel.js
+++ b/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
 }
diff --git a/api/src/models/videoModel.js b/api/src/models/videoModel.js
index 7902736d9..6be13b684 100644
--- a/api/src/models/videoModel.js
+++ b/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
diff --git a/api/src/routes/newsRouter.js b/api/src/routes/newsRouter.js
index 068c75954..d93246632 100644
--- a/api/src/routes/newsRouter.js
+++ b/api/src/routes/newsRouter.js
@@ -6,16 +6,8 @@ const checkCommunity = require('../middleware/checkCommunity')
 const { addNews, getNews, updateNews, getNewsById, deleteNews, searchNewsTitle } = require('../controllers/newsController')
 const { upload, resizeImage } = require('../helpers/filehelpers')
 
-// uploading multiple files
-const cpUpload = upload.fields([{ name: 'newsImage', maxCount: 1 }, { name: 'newsVideo', maxCount: 1 }])
-// attaching single file to req.file for converting it
-const fileChanger = (req, _res, next) => {
-  req.file = req.files.newsImage[0]
-  next()
-}
-
 router.route('/community/:id').get(checkCommunity, getNews)
-router.route('/add/community/:id').post(checkCommunity, cpUpload, fileChanger, resizeImage, addNews)
+router.route('/add/community/:id').post(checkCommunity, upload.single('news'), resizeImage, addNews)
 router.route('/community/:id/search').get(checkCommunity, searchNewsTitle)
 router
   .route('/:newsId/community/:id')

From 08e719238e9816945639661fdb304c7f0ca2a90c Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Thu, 5 Aug 2021 11:41:32 +0545
Subject: [PATCH 09/27] js lint fix of api

---
 ...20210805052503-alter-videos-texts-photos-tbl-newsId.js | 4 ++--
 api/src/models/newsModel.js                               | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js b/api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js
index 7d4de2ea7..1b1e5aaf9 100644
--- a/api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js
+++ b/api/src/migrations/20210805052503-alter-videos-texts-photos-tbl-newsId.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 
 module.exports = {
   up: async (queryInterface, Sequelize) => {
@@ -30,4 +30,4 @@ module.exports = {
     await queryInterface.removeColumn('videos', 'newsId')
     await queryInterface.removeColumn('texts', 'newsId')
   }
-};
+}
diff --git a/api/src/models/newsModel.js b/api/src/models/newsModel.js
index 45d5fe437..8d401df14 100644
--- a/api/src/models/newsModel.js
+++ b/api/src/models/newsModel.js
@@ -45,7 +45,7 @@ module.exports = (sequelize, DataTypes) => {
     deleted: {
       type: DataTypes.BOOLEAN,
       defaultValue: false
-    },
+    }
   },
   { timestamps: true }
   )
@@ -53,9 +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'})
+    News.hasMany(models.Video, { foreignKey: 'newsId' })
+    News.hasMany(models.Text, { foreignKey: 'newsId' })
+    News.hasMany(models.Photo, { foreignKey: 'newsId' })
   }
   return News
 }

From 0885ea57543a14884b98ac9f460acf0b1ad73722 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Thu, 5 Aug 2021 17:52:25 +0545
Subject: [PATCH 10/27] news view and news create

---
 api/src/controllers/newsController.js         | 16 +++-
 api/src/controllers/videoController.js        |  2 +-
 src/App.jsx                                   |  2 +-
 src/actions/lessonActions.js                  |  6 +-
 src/actions/newsActions.js                    | 29 ++++--
 src/actions/photoActions.js                   |  5 +-
 src/actions/textActions.js                    |  4 +-
 src/actions/videoActions.js                   |  5 +-
 src/components/lessonImage/Image.scss         |  1 +
 src/components/newsCard/NewsCard.jsx          |  4 +-
 src/components/videoPlayer/Video.jsx          |  1 +
 src/components/videoPlayer/Video.scss         |  2 +
 src/screens/communityNews/newsAdd/NewsAdd.jsx |  3 +-
 .../communityNewsView/CommunityNewsView.jsx   | 90 ++++++++++++++-----
 src/screens/courseManager/addLesson/Text.scss |  1 +
 .../courseManager/addLesson/addImage.js       | 10 +--
 .../courseManager/addLesson/addText.js        |  8 +-
 .../courseManager/addLesson/addVideo.js       | 16 ++--
 18 files changed, 139 insertions(+), 66 deletions(-)

diff --git a/api/src/controllers/newsController.js b/api/src/controllers/newsController.js
index af9e0a6ad..7cbe0d0eb 100644
--- a/api/src/controllers/newsController.js
+++ b/api/src/controllers/newsController.js
@@ -46,7 +46,7 @@ const addNews = (req, res) => {
   }
 
   const {
-    title, message, docType, readTime, language, creator, textDetail, imageDetail, videoDetail, category, videoTitle, videoDescription, videoLink
+    title, message, docType, readTime, language, creator, textDetail, imageDetail, videoDetail, category
   } = req.body
   db.News.create({
     _attachments: 'news/' + filename,
@@ -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) {
diff --git a/api/src/controllers/videoController.js b/api/src/controllers/videoController.js
index 5be669be9..4f6451789 100644
--- a/api/src/controllers/videoController.js
+++ b/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,
diff --git a/src/App.jsx b/src/App.jsx
index f85b20d67..40119de29 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -74,7 +74,7 @@ function App () {
             <PrivateRoute component={MobileMessage} path='/messenger/:id' exact />
             <PrivateRoute component={CommunityPagenews} exact path='/community-page-news/:id' />
             <PrivateRoute component={NewsAdd} path='/community-news/:title' exact />
-            <PrivateRoute component={CommunityNewsViewPage} path='/community-page-news-view' 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 />
diff --git a/src/actions/lessonActions.js b/src/actions/lessonActions.js
index 7e70bb74a..a83620ca9 100644
--- a/src/actions/lessonActions.js
+++ b/src/actions/lessonActions.js
@@ -43,13 +43,13 @@ 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 })
+            await addImage({ data: lessonData[i], lessonId, dispatch })
           }
           if (lessonData[i]?.textHeading || lessonData[i]?.textDescription) {
-            await addText({ lessonData: lessonData[i], lessonId, dispatch })
+            await addText({ data: lessonData[i], lessonId, dispatch })
           }
         }
         for (let i = 0; i < material.length; i++) {
diff --git a/src/actions/newsActions.js b/src/actions/newsActions.js
index 2ce1a3eaf..bb975aca8 100644
--- a/src/actions/newsActions.js
+++ b/src/actions/newsActions.js
@@ -23,6 +23,9 @@ import {
 } from '../constants/newsConstants'
 
 import { logout } from './userAction'
+import { addVideo } from '../screens/courseManager/addLesson/addVideo'
+import { addImage } from '../screens/courseManager/addLesson/addImage'
+import { addText } from '../screens/courseManager/addLesson/addText'
 
 // fetching current community
 const currentCommunity = localStorage.getItem('currentCommunity')
@@ -67,15 +70,11 @@ export const searchNews = (search) => async (dispatch) => {
   }
 }
 
-export const createNews = (newNews) => async (dispatch, getState) => {
+export const createNews = (newNews, news) => async (dispatch, getState) => {
   const formData = new FormData()
-  formData.append('newsImage', newNews.lessonImg)
-  formData.append('newsVideo', newNews.videoCover)
-  formData.append('title', newNews.title)
-  formData.append('category', newNews.category)
-  formData.append('videoTitle', newNews.videoTitle)
-  formData.append('videoDescription', newNews.videoDescription)
-  formData.append('videoLink', newNews.videoLink)
+  formData.append('title', news.title)
+  formData.append('category', news.category)
+  formData.append('news', news.lessonImg)
   try {
     const configFunc = () => {
         const userdata = window.localStorage.getItem('userInfo')
@@ -89,6 +88,20 @@ export const createNews = (newNews) => async (dispatch, getState) => {
     const { userLogin: { userInfo } } = getState()
     const { data } = await axios.post(`${process.env.REACT_APP_API_BASE_URL}/api/news/add/community/${currentCommunity.id}`, formData, configFunc)
     dispatch({ type: NEWS_CREATE_SUCCESS, payload: data })
+    
+    const newsId = data?.data?.id
+        for (let i = 0; i < newNews.length; i++) {
+          if (newNews[i]?.videoLink || newNews[i]?.videoResource) {
+            await addVideo({ data: newNews[i], lessonId: null, newsId, dispatch })
+          }
+          if (newNews[i]?.lessonImg) {
+            await addImage({ data: newNews[i], lessonId: null, newsId, dispatch })
+          }
+          if (newNews[i]?.textHeading || newNews[i]?.textDescription) {
+            await addText({ data: newNews[i], lessonId: null, newsId, dispatch })
+          }
+        }
+      
     dispatch({ type: NEWS_CLEAR, payload: data })
   } catch (error) {
     const message =
diff --git a/src/actions/photoActions.js b/src/actions/photoActions.js
index a9e19bd3d..de42ed4be 100644
--- a/src/actions/photoActions.js
+++ b/src/actions/photoActions.js
@@ -5,14 +5,15 @@ import {
   LESSSON_PHOTO_CREATE_SUCCESS,
   LESSSON_PHOTO_CREATE_FAIL
 } from '../constants/photoConstants'
+import axios from 'axios'
 
 export const createLessonImg =
-  (lessonImg, photoDescription, isImgDesc, lessonId) => async (dispatch) => {
+  (lessonImg, photoDescription, isImgDesc, lessonId, newsId) => async (dispatch) => {
     const lessonImgData = new FormData()
     lessonImgData.append('lessonImg', lessonImg)
     lessonImgData.append('photoDescription', photoDescription)
     lessonImgData.append('isImgDesc', isImgDesc)
-    lessonImgData.append('lessonId', lessonId)
+    newsId ? lessonImgData.append('newsId', newsId) : lessonImgData.append('lessonId', lessonId)
 
     try {
       dispatch({ type: LESSSON_PHOTO_CREATE_REQUEST })
diff --git a/src/actions/textActions.js b/src/actions/textActions.js
index 96a46d3a5..f1fd99e3f 100644
--- a/src/actions/textActions.js
+++ b/src/actions/textActions.js
@@ -7,8 +7,8 @@ import {
 } from '../constants/textConstants'
 
 export const createText =
-  (textHeading, textDescription, lessonId) => async (dispatch) => {
-    const textData = { textHeading, textDescription, lessonId }
+  (textHeading, textDescription, lessonId, newsId) => async (dispatch) => {
+    const textData = { textHeading, textDescription, lessonId, newsId }
 
     try {
       dispatch({ type: LESSSON_TEXT_CREATE_REQUEST })
diff --git a/src/actions/videoActions.js b/src/actions/videoActions.js
index e057e25c3..0ac435e30 100644
--- a/src/actions/videoActions.js
+++ b/src/actions/videoActions.js
@@ -13,7 +13,8 @@ export const createVideo =
     videoDescription,
     videoLink,
     videoResource,
-    lessonId
+    lessonId,
+    newsId,
   ) =>
     async (dispatch) => {
       const videoData = new FormData()
@@ -22,7 +23,7 @@ export const createVideo =
       videoData.append('videoDescription', videoDescription)
       videoData.append('videoLink', videoLink)
       videoData.append('videoResource', videoResource)
-      videoData.append('lessonId', lessonId)
+      newsId ? videoData.append('newsId', newsId) : videoData.append('lessonId', lessonId)
 
       try {
         dispatch({ type: VIDEO_CREATE_REQUEST })
diff --git a/src/components/lessonImage/Image.scss b/src/components/lessonImage/Image.scss
index e5b06da4b..9b1c86f20 100644
--- a/src/components/lessonImage/Image.scss
+++ b/src/components/lessonImage/Image.scss
@@ -4,6 +4,7 @@
   align-items: center;
   flex-direction: column;
   margin: 2em 0;
+  color: var(--primary-white);
 
   img {
     width: 100%;
diff --git a/src/components/newsCard/NewsCard.jsx b/src/components/newsCard/NewsCard.jsx
index 2265fbd42..1987ea6e2 100644
--- a/src/components/newsCard/NewsCard.jsx
+++ b/src/components/newsCard/NewsCard.jsx
@@ -31,7 +31,7 @@ const NewsSingleCard = ({ news, editCard }) => {
     setDropDown(false)
   }
   return (
-    <Background tag='/newsImage/' image={news._attachments}>
+    <Background tag='/news/' image={news._attachments}>
       <div className='news-card'>
         <div className='news-card-header'>
           <div className='news-show-date'>{moment(news.createdAt).fromNow()}</div>
@@ -53,7 +53,7 @@ const NewsSingleCard = ({ news, editCard }) => {
             </div>
           </div>
         </div>
-        <Link to={{ pathname: '/community-page-news-view', state: { news } }}>
+        <Link to={{ pathname: `/community-news-view-page/${news.id}`, state: { news } }}>
           <div key={news.id}>
             <div className='newsCard-group'>
               <div className='frame-text'>
diff --git a/src/components/videoPlayer/Video.jsx b/src/components/videoPlayer/Video.jsx
index 8d7f858ef..287d1df1f 100644
--- a/src/components/videoPlayer/Video.jsx
+++ b/src/components/videoPlayer/Video.jsx
@@ -6,6 +6,7 @@ import './Video.scss'
 
 const Video = ({ title, description, url, thumbnail }) => {
   const [showInfo, setShowInfo] = useState(false)
+console.log(url);
   return (
     <>
       {url ? (
diff --git a/src/components/videoPlayer/Video.scss b/src/components/videoPlayer/Video.scss
index bef19509b..7a264f2c1 100644
--- a/src/components/videoPlayer/Video.scss
+++ b/src/components/videoPlayer/Video.scss
@@ -29,6 +29,7 @@
       line-height: 2em;
       margin-bottom: 0.5em;
       font-weight: 600;
+      color: var(--primary-white);
 
       &::first-letter {
         text-transform: uppercase;
@@ -38,6 +39,7 @@
       font-size: 1em;
       line-height: 1.5em;
       width: 80%;
+      color: var(--primary-white);
 
       &::first-letter {
         text-transform: uppercase;
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 9eff1117c..b505cbb33 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -40,10 +40,11 @@ const NewsAdd = () => {
   }, [])
 
   const submitNewsForm = ({ title }) => {
+    
     const newData = convertArrToObject(newsData)
     newData.title = title
     newData.category = category;
-    dispatch(createNews(newData));
+    dispatch(createNews(newsData, newData));
   }
 
   // converting the arrray into object for submission
diff --git a/src/screens/communityNewsView/CommunityNewsView.jsx b/src/screens/communityNewsView/CommunityNewsView.jsx
index 0e5aacfe0..6155e5089 100644
--- a/src/screens/communityNewsView/CommunityNewsView.jsx
+++ b/src/screens/communityNewsView/CommunityNewsView.jsx
@@ -3,24 +3,46 @@ import './CommunityNewsView.scss'
 import DashboardLayout from '../../layout/dashboardLayout/DashboardLayout'
 import BackButton from '../../components/backButton/BackButton'
 import { useLocation } from 'react-router-dom'
+import { useParams } from 'react-router-dom/cjs/react-router-dom.min'
+import { getApi } from '../../utils/apiFunc'
+import { useDispatch } from 'react-redux'
+import Text from '../courseManager/addLesson/Text'
+import Video from '../../components/videoPlayer/Video'
+import { GET_VIDEO, LESSON_IMG, VIDEO_COVER } from '../../utils/urlConstants'
+import Image from '../../components/lessonImage/Image'
 
-function CommunityNewsViewPage ({ newNews }) {
+function CommunityNewsViewPage () {
   const [news, setNews] = useState({})
-  const val = useLocation()?.state?.news
+  // const val = useLocation()?.state?.news
+  
+  // fetching current community
+const currentCommunity = localStorage.getItem('currentCommunity')
+  ? JSON.parse(localStorage.getItem('currentCommunity'))
+  : null
+  const dispatch = useDispatch();
+  const {id} = useParams();
+
   useEffect(() => {
-    setNews(newNews || val)
-  }, [newNews, val])
+    getSingleNews(id);
+  }, [])
+
+  async function getSingleNews (id) {
+    const { data } = await getApi(
+      dispatch,
+      `${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`
+    )
+    setNews(data)
+  }
+
+  console.log(news)
 
   return (
     <>
-      {newNews ? (
-        <NewsSingleView news={news} />
-      ) : (
         <DashboardLayout>
           <div className='x03-1-0-news-page'>
             <div className='flex-col-2'>
-              <BackButton location='/community-page-news' />
-              <NewsSingleView news={news} />
+              <BackButton location='/community-page-news' location={`/community-page-news/${currentCommunity.slug}`} />
+              {news && <NewsSingleView news={news} />}
               <div className='button-row-3'>
                 <div className='button-secondary-default border-0-5px-quarter-spanish-white'>
                   <img className='f1' src='/img/facebook-share-icon.svg' alt='facebook-icon' />
@@ -38,7 +60,6 @@ function CommunityNewsViewPage ({ newNews }) {
             </div>
           </div>
         </DashboardLayout>
-      )}
     </>
   )
 }
@@ -56,20 +77,41 @@ const NewsSingleView = ({ news }) => {
           {news?.readTime}
         </div>
       </div>
-      <div className='news-add-img-wrapper'>
-        <img src='/img/newsbg-image.png' alt='community-single-article' />
-      </div>
-      <div className='text-container'>
-        <p>{news?.textDetail?.collectionTitle}</p>
-        <p>{news?.textDetail?.collectionDescription}</p>
-      </div>
-      <div className='text-container'>
-        <p>{news?.imageDetail?.imageDescription}</p>
-      </div>
-      <div className='text-container'>
-        <p>{news?.videoDetail?.videoTitle}</p>
-        <p>{news?.videoDetail?.videoDescription}</p>
-      </div>
+
+    {
+        news?.photos && news?.photos.map(item => {
+          return <Image
+          src={`${LESSON_IMG}${item?.lessonImg}`}
+          desc={
+            item?.isImgDesc === true && item?.photoDescription
+          }
+        />
+        })
+      }
+
+      {
+        news?.texts && news?.texts.map(item => {
+          return <Text
+          heading={item?.textHeading}
+          desc={item?.textDescription}
+        />
+        })
+      }
+
+      {
+        news?.videos && news?.videos.map(item => {
+          return <Video
+            title={item?.videoTitle}
+            description={item?.videoDescription}
+            url={
+              item?.videoLink === 'undefined'
+                ? `${GET_VIDEO}${item?.videoResource}`
+                : item?.videoLink
+              }
+            thumbnail={`${VIDEO_COVER}${item?.videoCover}`}
+          />
+        })
+      }
     </>
   )
 }
diff --git a/src/screens/courseManager/addLesson/Text.scss b/src/screens/courseManager/addLesson/Text.scss
index e0c1ad92c..51c25bff3 100644
--- a/src/screens/courseManager/addLesson/Text.scss
+++ b/src/screens/courseManager/addLesson/Text.scss
@@ -1,5 +1,6 @@
 .text {
   margin: 2em 0;
+  color: var(--primary-white);
 
   h1 {
     font-weight: 600;
diff --git a/src/screens/courseManager/addLesson/addImage.js b/src/screens/courseManager/addLesson/addImage.js
index 0246860a9..f51d42f93 100644
--- a/src/screens/courseManager/addLesson/addImage.js
+++ b/src/screens/courseManager/addLesson/addImage.js
@@ -1,10 +1,10 @@
 import { createLessonImg } from '../../../actions/photoActions'
 
-export const addImage = function ({ lessonData, lessonId, dispatch }) {
-  const lessonImg = lessonData.lessonImg
-  const photoDescription = lessonData.photoDescription
-  const isImgDesc = lessonData.isImgDesc
+export const addImage = function ({ data, lessonId, newsId, dispatch }) {
+  const lessonImg = data.lessonImg
+  const photoDescription = data.photoDescription
+  const isImgDesc = data.isImgDesc
   return dispatch(
-    createLessonImg(lessonImg, photoDescription, isImgDesc, lessonId)
+    createLessonImg(lessonImg, photoDescription, isImgDesc, lessonId, newsId)
   )
 }
diff --git a/src/screens/courseManager/addLesson/addText.js b/src/screens/courseManager/addLesson/addText.js
index a878e5717..05381f10a 100644
--- a/src/screens/courseManager/addLesson/addText.js
+++ b/src/screens/courseManager/addLesson/addText.js
@@ -1,8 +1,8 @@
 import { createText } from '../../../actions/textActions'
 
-export const addText = function ({ lessonData, lessonId, dispatch }) {
-  const textHeading = lessonData.textHeading
-  const textDescription = lessonData.textDescription
+export const addText = function ({ data, lessonId, newsId, dispatch }) {
+  const textHeading = data.textHeading
+  const textDescription = data.textDescription
 
-  return dispatch(createText(textHeading, textDescription, lessonId))
+  return dispatch(createText(textHeading, textDescription, lessonId, newsId))
 }
diff --git a/src/screens/courseManager/addLesson/addVideo.js b/src/screens/courseManager/addLesson/addVideo.js
index 66cd28908..a26cd74dc 100644
--- a/src/screens/courseManager/addLesson/addVideo.js
+++ b/src/screens/courseManager/addLesson/addVideo.js
@@ -1,12 +1,11 @@
 import { createVideo } from '../../../actions/videoActions'
 
-export const addVideo = function ({ lessonData, lessonId, dispatch }) {
-  const videoCover = lessonData.videoCover
-  const videoTitle = lessonData.videoTitle
-  const videoDescription = lessonData.videoDescription
-  const videoLink = lessonData.videoLink
-  const videoResource = lessonData.videoResource
-
+export const addVideo = function ({ data, lessonId, newsId, dispatch }) {
+  const videoCover = data.videoCover
+  const videoTitle = data.videoTitle
+  const videoDescription = data.videoDescription
+  const videoLink = data.videoLink
+  const videoResource = data.videoResource
   return dispatch(
     createVideo(
       videoCover,
@@ -14,7 +13,8 @@ export const addVideo = function ({ lessonData, lessonId, dispatch }) {
       videoDescription,
       videoLink,
       videoResource,
-      lessonId
+      lessonId,
+      newsId
     )
   )
 }

From 8e2b7acef9d3b765541463d76cf413558666c2df Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Fri, 6 Aug 2021 12:05:33 +0545
Subject: [PATCH 11/27] news edit and delete feature

---
 src/App.jsx                                   |   1 +
 src/components/newsCard/NewsCard.jsx          |  13 +--
 src/components/videoPlayer/Video.jsx          |   2 +-
 src/screens/communityNews/CommunityNews.jsx   |  45 ++++++--
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 103 +++++++++++++++---
 5 files changed, 130 insertions(+), 34 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 40119de29..fcd6c98de 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -74,6 +74,7 @@ function App () {
             <PrivateRoute component={MobileMessage} path='/messenger/:id' exact />
             <PrivateRoute component={CommunityPagenews} exact path='/community-page-news/:id' />
             <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 />
diff --git a/src/components/newsCard/NewsCard.jsx b/src/components/newsCard/NewsCard.jsx
index 1987ea6e2..24357fc5d 100644
--- a/src/components/newsCard/NewsCard.jsx
+++ b/src/components/newsCard/NewsCard.jsx
@@ -6,26 +6,21 @@ import { deleteNews } from '../../actions/newsActions'
 import Background from '../background/Background'
 import { useState } from 'react'
 
-function NewsCard ({ news, editCard }) {
+function NewsCard ({ news, editCard, deleteNewsCard }) {
   return (
     <>
       {news && news.map((news) => {
         return (
-          <NewsSingleCard news={news} editCard={editCard} />
+          <NewsSingleCard news={news} editCard={editCard} deleteNewsCard={deleteNewsCard} />
         )
       })}
     </>
   )
 }
 
-const NewsSingleCard = ({ news, editCard }) => {
+const NewsSingleCard = ({ news, editCard, deleteNewsCard }) => {
   const [dropDown, setDropDown] = useState(false)
-  const dispatch = useDispatch()
-
-  const deleteNewsCard = (id) => {
-    dispatch(deleteNews(id))
-    setDropDown(false)
-  }
+  
   const editNewsCard = (id) => {
     editCard(id)
     setDropDown(false)
diff --git a/src/components/videoPlayer/Video.jsx b/src/components/videoPlayer/Video.jsx
index 287d1df1f..a04927211 100644
--- a/src/components/videoPlayer/Video.jsx
+++ b/src/components/videoPlayer/Video.jsx
@@ -6,7 +6,7 @@ import './Video.scss'
 
 const Video = ({ title, description, url, thumbnail }) => {
   const [showInfo, setShowInfo] = useState(false)
-console.log(url);
+
   return (
     <>
       {url ? (
diff --git a/src/screens/communityNews/CommunityNews.jsx b/src/screens/communityNews/CommunityNews.jsx
index 315be0b0e..a8172d0a7 100644
--- a/src/screens/communityNews/CommunityNews.jsx
+++ b/src/screens/communityNews/CommunityNews.jsx
@@ -8,7 +8,7 @@ import NewsAddModal from '../../components/newAddModal/NewsAddModal'
 import Filter from '../../components/filter/Filter'
 import useSizeFinder from '../../utils/sizeFinder'
 import { useDispatch, useSelector } from 'react-redux'
-import { searchNews, listNews } from '../../actions/newsActions'
+import { searchNews, listNews, deleteNews } from '../../actions/newsActions'
 import Pagination from '../../components/pagination/Pagination'
 import axios from 'axios'
 
@@ -19,20 +19,50 @@ function CommunityNews () {
 
   const [addModal, setAddModal] = useState(false)
   const [editData, setEditData] = useState(null)
+  const [deleteModal, setDeleteModal] = useState(false)
+  const [deleteId, setDeleteId] = useState(null)
+
+  const dispatch = useDispatch();
+  const history = useHistory();
+
+   const deleteNewsCard = (id) => {
+    setDeleteId(id)
+    setDeleteModal(true);
+  }
+
+  const confirmDelete = () => {
+    dispatch(deleteNews(deleteId))
+    setDeleteModal(false);
+  }
 
   const editCard = async (id) => {
-    const { data } = await axios.get(`${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`)
-    setEditData(data)
-    setAddModal(true)
+    // const { data } = await axios.get(`${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`)
+    // setEditData(data)
+    // setAddModal(true)
+    history.push(`/community-news/edit/${id}`)
   }
   return (
+    <>
+    {deleteModal && <div className='simple-modal-container'>
+        <div className='simple-modal-inner-container'>
+          <div>
+            <h4>Are you sure you want to delete?</h4>
+            {/* <button onClick={() => confirmDelete}><img src='/img/close-outline.svg' alt='close-outline' /></button> */}
+          </div>
+          <div>
+            <button className='secondary-btn' onClick={confirmDelete}>Confirm</button>
+            <button className='secondary-btn' onClick={() => setDeleteModal(false)}>Cancel</button>
+          </div>
+        </div>
+      </div>}
     <DashboardLayout title='Ragrarians News'>{addModal && <NewsAddModal
       setAddModal={setAddModal}
       editData={editData}
       setEditData={setEditData}
                                                           />}
-      <CommunityPagenews {...CommunityPageNewsData} setAddModal={setAddModal} editCard={editCard} />
+      <CommunityPagenews {...CommunityPageNewsData} setAddModal={setAddModal} editCard={editCard} deleteNewsCard={deleteNewsCard}/>
     </DashboardLayout>
+    </>
   )
 }
 
@@ -68,7 +98,8 @@ function CommunityPagenews (props) {
     carsIndustry,
     mediaNews,
     seeAllTopics,
-    setAddModal
+    setAddModal,
+    deleteNewsCard
   } = props
 
   const windowWidth = useSizeFinder()
@@ -105,7 +136,7 @@ function CommunityPagenews (props) {
         </div>
         <div className='community-page-news-section'>
           <div className='community-news-cards'>
-            <NewsCard news={news} editCard={props.editCard} />
+            <NewsCard news={news} editCard={props.editCard} deleteNewsCard={deleteNewsCard} />
             <Pagination pageNumber={pageNumber} setPageNumber={setPageNumber} resourceList={newsList} />
           </div>
           {(windowWidth < 1200)
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index b505cbb33..4e513d5dd 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -13,9 +13,18 @@ import { useEffect } from 'react'
 import { useLocation } from 'react-router-dom/cjs/react-router-dom.min'
 import { ErrorText, TextArea } from '../../../components/formUI/FormUI'
 import ContentAdd from '../../../components/contentAdd/ContentAdd'
+import { getApi } from '../../../utils/apiFunc'
+import DragDrop from '../../../components/dragDrop/DragDrop'
+import Image from '../../../components/lessonImage/Image'
+import Text from '../../courseManager/addLesson/Text'
+import Video from '../../../components/videoPlayer/Video'
+import { GET_VIDEO, LESSON_IMG, VIDEO_COVER } from '../../../utils/urlConstants'
 
 const NewsAdd = () => {
   const { currentCommunity } = useSelector(state => state.activeCommunity)
+  // fetching category from route
+  const {state} = useLocation();
+
   const [createVideoModal, setCreateVideoModal] = useState(false)
   const [createImageModal, setCreateImageModal] = useState(false)
   const [createTextModal, setCreateTextModal] = useState(false)
@@ -23,24 +32,31 @@ const NewsAdd = () => {
   const [imageActive, setImageActive] = useState(true)
   const [textActive, setTextActive] = useState(true)
   const [newsData, setNewsData] = useState([])
+  const [newsSingleData, setNewsSingleData] = useState([])
+  const [category, setCategory] = useState(state?.category || null)
+  const [newsCover, setNewsCover] = useState(null);
 
   const news = useSelector((state) => (state.addNewNews !== {} ? state.addNewNews : ''))
   const { register, errors, handleSubmit } = useForm()
 
-  const { title} = useParams()
+  const { title, id} = useParams()
 
   const dispatch = useDispatch();
 
-  // fetching category from route
-  const {state} = useLocation();
-  const {category} = state;
-
   useEffect(() => {
-    setNewsData([{title, category}])
+    if(id) {
+      getSingleNews()
+    } else {
+      setNewsData([{title, category}])
+    }
   }, [])
 
+  async function getSingleNews () {
+    const { data } = await getApi(dispatch, `${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`)
+    setNewsSingleData(data)
+  }
+
   const submitNewsForm = ({ title }) => {
-    
     const newData = convertArrToObject(newsData)
     newData.title = title
     newData.category = category;
@@ -48,7 +64,6 @@ const NewsAdd = () => {
   }
 
   // converting the arrray into object for submission
-
   function convertArrToObject (arr) {
     let newData = {};
     arr.map(item => {
@@ -59,12 +74,16 @@ const NewsAdd = () => {
     return newData;
   }
 
+  const editNewsForm = () => {
+    console.log(newsCover)
+  }
+
   return (
     <>
       {createVideoModal && <NewsCreateModal type='video' videoActive={videoActive} setVideoActive={setVideoActive} lessonData={newsData} setLessonData={setNewsData} />}
       {createImageModal && <NewsCreateModal type='image' imageActive={imageActive} setImageActive={setImageActive} lessonData={newsData} setLessonData={setNewsData} />}
       {createTextModal && <NewsCreateModal type='text' textActive={textActive} setTextActive={setTextActive} lessonData={newsData} setLessonData={setNewsData} />}
-      <DashboardLayout title='Add News'>
+      <DashboardLayout title={newsSingleData ? 'Edit News' : 'Add News'}>
         <BackButton location={`/community-page-news/${currentCommunity.slug}`} />
         <AddNewsContent
           setVideoModal = {setCreateVideoModal}
@@ -74,11 +93,15 @@ const NewsAdd = () => {
           errors={errors}
           setNewsData = {setNewsData}
           newsData = {newsData}
+          newsSingleData = {newsSingleData}
+          setNewsCover={setNewsCover}
         />
 
-        <NewsSaveModal
-          onClick={handleSubmit(submitNewsForm)}
-        />
+        {
+          newsSingleData 
+          ? <NewsSaveModal onClick={handleSubmit(editNewsForm)}  name="Edit" />
+          : <NewsSaveModal onClick={handleSubmit(submitNewsForm)} name="Save" />
+        }
 
       </DashboardLayout>
     </>
@@ -91,7 +114,9 @@ const AddNewsContent = ({
   setVideoModal,
   setImageModal,
   setTextModal,
-  register
+  register,
+  newsSingleData,
+  setNewsCover
 }) => {
 
   const [title, setTitle] = useState('');
@@ -100,8 +125,13 @@ const AddNewsContent = ({
     if(newsData.length) {
       setTitle(newsData[0].title)
     }
-  }, [newsData])
 
+    if(newsSingleData) {
+      setTitle(newsSingleData.title)
+    }
+  }, [newsData, newsSingleData])
+
+console.log(newsSingleData);
   return  <div className='admin-lesson-create-container'>
       <ErrorText
         className='errorMsg'
@@ -119,16 +149,55 @@ const AddNewsContent = ({
           }
         })}
       />
+    
+      {/* Edit component for news */}
+      {newsSingleData && <>
+       {
+        newsSingleData?.photos && newsSingleData?.photos.map(item => {
+          return <Image
+                  src={`${LESSON_IMG}${item?.lessonImg}`}
+                  desc={
+                  item?.isImgDesc === true && item?.photoDescription
+                     }
+                 />
+        })
+      }
+
+      {
+        newsSingleData?.texts && newsSingleData?.texts.map(item => {
+          return <Text
+          heading={item?.textHeading}
+          desc={item?.textDescription}
+        />
+        })
+      }
+
+      {
+        newsSingleData?.videos && newsSingleData?.videos.map(item => {
+          return <Video
+            title={item?.videoTitle}
+            description={item?.videoDescription}
+            url={
+              item?.videoLink === 'undefined'
+                ? `${GET_VIDEO}${item?.videoResource}`
+                : item?.videoLink
+              }
+            thumbnail={`${VIDEO_COVER}${item?.videoCover}`}
+          />
+        })
+      }
+      </>
+      }
 
       <ContentAdd data={newsData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
     </div>
 }
 
-const NewsSaveModal = ({ pathId, onClick }) => {
+const NewsSaveModal = ({ pathId, onClick, name}) => {
   const history = useHistory()
   return (
     <div className='save-lesson-modal'>
-      <h4>Do you want to save News?</h4>
+      <h4>Do you want to {name} News?</h4>
       <div>
         <button
           className='secondary-btn'
@@ -142,7 +211,7 @@ const NewsSaveModal = ({ pathId, onClick }) => {
           id='lesson-save-btn'
           onClick={onClick}
         >
-          Save News
+          {name} News
         </button>
       </div>
     </div>

From 1cb7e0d69575f4701acbc0e00c704747c301a5ea Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Fri, 6 Aug 2021 12:55:40 +0545
Subject: [PATCH 12/27] edit content component added

---
 src/components/editContent/EditContent.jsx    | 90 +++++++++++++++++++
 src/screens/communityNews/newsAdd/NewsAdd.jsx |  5 ++
 2 files changed, 95 insertions(+)
 create mode 100644 src/components/editContent/EditContent.jsx

diff --git a/src/components/editContent/EditContent.jsx b/src/components/editContent/EditContent.jsx
new file mode 100644
index 000000000..d8827de89
--- /dev/null
+++ b/src/components/editContent/EditContent.jsx
@@ -0,0 +1,90 @@
+import { useState, useEffect } from 'react'
+import { GET_VIDEO, VIDEO_COVER, LESSON_IMG } from '../../../utils/urlConstants'
+import Image from '../../../components/lessonImage/Image'
+import Video from '../../../components/videoPlayer/Video'
+import Text from '../addLesson/Text'
+
+const EditContent = ({
+  data,
+  newLessonData,
+  setEditTextModel,
+  setEditPhotoModel,
+  setEditVideoModel,
+  modelPopUp,
+  removeTextItem,
+  removePhoto,
+  removeVideo,
+  removeLocalData
+}) => {
+  const [allLessonData, setAllLessonData] = useState([])
+
+  useEffect(() => {
+    setAllLessonData(data, newLessonData)
+  }, [data, newLessonData])
+
+  function video (data) {
+    if (typeof data?.videoResource === 'string') {
+      return `${GET_VIDEO}${data?.videoResource}`
+    } else {
+      return data?.videoResource?.preview
+    }
+  }
+  return (
+    <>
+      {data
+        .sort((a, b) => (a.createdAt > b.createdAt ? 1 : -1))
+        .map((data, index) => (
+          <div key={index}>
+            <Text
+              heading={data?.textHeading}
+              desc={data?.textDescription}
+              isEditable
+              setEditTextModel={setEditTextModel}
+              modelPopUp={modelPopUp}
+              id={data?.id || data?.itemId}
+              onRemove={data?.id ? removeTextItem : removeLocalData}
+            />
+            <Video
+              title={data?.videoTitle}
+              description={data?.videoDescription}
+              url={
+                data?.videoLink === '' || data?.videoLink === undefined
+                  ? video(data)
+                  : data?.videoLink
+              }
+              thumbnail={
+                typeof data?.videoCover === 'string'
+                  ? `${VIDEO_COVER}${data?.videoCover}`
+                  : data?.videoCover?.preview
+              }
+              setEditVideoModel={setEditVideoModel}
+              isEditable
+              id={data?.id || data?.itemId}
+              modelPopUp={modelPopUp}
+              onRemove={data?.id ? removeVideo : removeLocalData}
+            />
+
+            {data?.lessonImg === undefined ? (
+              ''
+            ) : (
+              <Image
+                src={
+                  typeof data?.lessonImg === 'string'
+                    ? `${LESSON_IMG}${data?.lessonImg}`
+                    : data?.lessonImg.preview
+                }
+                id={data?.id || data?.itemId}
+                modelPopUp={modelPopUp}
+                setEditPhotoModel={setEditPhotoModel}
+                isEditable
+                desc={data?.isImgDesc === true && data?.photoDescription}
+                onRemove={data?.id ? removePhoto : removeLocalData}
+              />
+            )}
+          </div>
+        ))}
+    </>
+  )
+}
+
+export default EditContent
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 4e513d5dd..3305239d8 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -19,6 +19,7 @@ import Image from '../../../components/lessonImage/Image'
 import Text from '../../courseManager/addLesson/Text'
 import Video from '../../../components/videoPlayer/Video'
 import { GET_VIDEO, LESSON_IMG, VIDEO_COVER } from '../../../utils/urlConstants'
+import EditContent from '../../../components/editContent/EditContent'
 
 const NewsAdd = () => {
   const { currentCommunity } = useSelector(state => state.activeCommunity)
@@ -189,6 +190,10 @@ console.log(newsSingleData);
       </>
       }
 
+      {
+        newsSingleData && <EditContent data={newsSingleData}/>
+      }
+
       <ContentAdd data={newsData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
     </div>
 }

From 2f4d815c0587d6f3089190ea93e9c19e7944d4d3 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Fri, 6 Aug 2021 14:12:57 +0545
Subject: [PATCH 13/27] importing necessary files

---
 src/components/editContent/EditContent.jsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/editContent/EditContent.jsx b/src/components/editContent/EditContent.jsx
index d8827de89..b4201028d 100644
--- a/src/components/editContent/EditContent.jsx
+++ b/src/components/editContent/EditContent.jsx
@@ -1,8 +1,11 @@
 import { useState, useEffect } from 'react'
 import { GET_VIDEO, VIDEO_COVER, LESSON_IMG } from '../../../utils/urlConstants'
-import Image from '../../../components/lessonImage/Image'
-import Video from '../../../components/videoPlayer/Video'
-import Text from '../addLesson/Text'
+import Text from '../../screens/courseManager/addLesson/Text'
+import Image from '../lessonImage/Image'
+import Video from '../videoPlayer/Video'
+// import Image from '../../../components/lessonImage/Image'
+// import Video from '../../../components/videoPlayer/Video'
+// import Text from '../addLesson/Text'
 
 const EditContent = ({
   data,

From 01a405f63040affd805fe99b883688fa10188d11 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Fri, 6 Aug 2021 14:24:28 +0545
Subject: [PATCH 14/27] changes to the text, video and image

---
 src/components/lessonImage/Image.jsx         | 19 ++++++++++-
 src/components/videoPlayer/Video.jsx         | 31 +++++++++++++++---
 src/screens/courseManager/addLesson/Text.jsx | 34 ++++++++++++++++++--
 3 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/src/components/lessonImage/Image.jsx b/src/components/lessonImage/Image.jsx
index e784c51c4..fe7af0064 100644
--- a/src/components/lessonImage/Image.jsx
+++ b/src/components/lessonImage/Image.jsx
@@ -1,12 +1,29 @@
+import Actions from '../../screens/courseManager/addLesson/Actions'
 import './Image.scss'
 
-const Image = ({ src, desc }) => {
+const Image = ({
+  src,
+  desc,
+  onRemove,
+  id,
+  modelPopUp,
+  setEditPhotoModel,
+  isEditable
+}) => {
+  const poopUp = () => {
+    modelPopUp(setEditPhotoModel(true), id)
+  }
   return (
     <>
       {src ? (
         <div className='imgPreview'>
           <img src={src} alt={`lesson_${src}_img`} />
           <p>{desc && `"${desc}"`}</p>
+          {isEditable ? (
+            <Actions onRemove={onRemove} id={id} poopUp={poopUp} />
+          ) : (
+            ''
+          )}
         </div>
       ) : (
         ''
diff --git a/src/components/videoPlayer/Video.jsx b/src/components/videoPlayer/Video.jsx
index a04927211..bad294978 100644
--- a/src/components/videoPlayer/Video.jsx
+++ b/src/components/videoPlayer/Video.jsx
@@ -1,12 +1,27 @@
 import { useState } from 'react'
 import ReactPlayer from 'react-player'
+
+import Actions from '../../screens/courseManager/addLesson/Actions'
 import { ReactComponent as Play } from '../../assets/images/play.svg'
 import { ReactComponent as BookMark } from '../../assets/images/book-outlined.svg'
 import './Video.scss'
 
-const Video = ({ title, description, url, thumbnail }) => {
+const Video = ({
+  title,
+  description,
+  url,
+  thumbnail,
+  itemId,
+  isEditable,
+  onRemove,
+  id,
+  setEditVideoModel,
+  modelPopUp
+}) => {
   const [showInfo, setShowInfo] = useState(false)
-
+  const poopUp = () => {
+    modelPopUp(setEditVideoModel(true), id)
+  }
   return (
     <>
       {url ? (
@@ -14,10 +29,15 @@ const Video = ({ title, description, url, thumbnail }) => {
           <div className={showInfo ? 'info hide' : 'info'}>
             <h1 className='videoTitle'>{title}</h1>
             <p className='videoDesc'>{description}</p>
+            <p className='videoDesc'>{itemId}</p>
           </div>
-          <div className='addToLibrary'>
-            <BookMark />
-          </div>
+          {isEditable ? (
+            <Actions onRemove={onRemove} id={id} poopUp={poopUp} />
+          ) : (
+            <div className='addToLibrary'>
+              <BookMark />
+            </div>
+          )}
 
           <ReactPlayer
             className='video'
@@ -39,3 +59,4 @@ const Video = ({ title, description, url, thumbnail }) => {
 }
 
 export default Video
+
diff --git a/src/screens/courseManager/addLesson/Text.jsx b/src/screens/courseManager/addLesson/Text.jsx
index 8700bdbe4..88447b85e 100644
--- a/src/screens/courseManager/addLesson/Text.jsx
+++ b/src/screens/courseManager/addLesson/Text.jsx
@@ -1,11 +1,39 @@
+import Actions from './Actions'
+
 import './Text.scss'
-const Text = ({ heading, desc }) => {
+const Text = ({
+  heading,
+  desc,
+  onRemove,
+  id,
+  setEditTextModel,
+  modelPopUp,
+  isEditable,
+  refetch
+}) => {
+  const poopUp = () => {
+    modelPopUp(setEditTextModel(true), id)
+  }
   return (
     <>
       {heading || desc ? (
         <div className='text'>
-          <h1>{heading}</h1>
-          <p>{desc}</p>
+          <div className='block'>
+            <h1>{heading}</h1>
+            <p>
+              {desc} {id}
+            </p>
+          </div>
+          {isEditable ? (
+            <Actions
+              onRemove={onRemove}
+              id={id}
+              poopUp={poopUp}
+              refetch={refetch}
+            />
+          ) : (
+            ''
+          )}
         </div>
       ) : (
         ''

From aeddcce9d55245b35563b8e5f5b104770989d7e3 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Fri, 6 Aug 2021 14:27:24 +0545
Subject: [PATCH 15/27] Action file created

---
 .../courseManager/addLesson/Actions.jsx       | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/screens/courseManager/addLesson/Actions.jsx

diff --git a/src/screens/courseManager/addLesson/Actions.jsx b/src/screens/courseManager/addLesson/Actions.jsx
new file mode 100644
index 000000000..48b00a38e
--- /dev/null
+++ b/src/screens/courseManager/addLesson/Actions.jsx
@@ -0,0 +1,35 @@
+import React, { useState } from 'react'
+import useHideOnClick from '../../../utils/useHideOnClick'
+const LessonActions = ({ id, onRemove = () => {}, poopUp, refetch }) => {
+  const [actionActive, setActionActive] = useState(false)
+
+  const domNode = useHideOnClick(() => {
+    setActionActive(false)
+  })
+
+  return (
+    <div className='actions lessonAction' ref={domNode}>
+      <button
+        className='secondary-btn lesson-btn'
+        onClick={() => setActionActive(!actionActive)}
+      >
+        <img src='/img/more-horizontal.svg' alt='horizontal icon' />
+      </button>
+      {actionActive && (
+        <ul className={actionActive ? 'actionBtn show' : 'hide'}>
+          <li
+            onClick={() => {
+              poopUp()
+              setActionActive(!actionActive)
+            }}
+          >
+            Edit
+          </li>
+          <li onClick={() => onRemove(id)}>Delete</li>
+        </ul>
+      )}
+    </div>
+  )
+}
+
+export default LessonActions

From 3eae3924d50a4989935cc368ed53282fc630e757 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Fri, 6 Aug 2021 14:46:59 +0545
Subject: [PATCH 16/27] changes to edit content

---
 src/components/editContent/EditContent.jsx    | 94 ++++++++++---------
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 39 +-------
 src/utils/urlConstants.js                     | 26 ++---
 3 files changed, 65 insertions(+), 94 deletions(-)

diff --git a/src/components/editContent/EditContent.jsx b/src/components/editContent/EditContent.jsx
index b4201028d..0fdcb259e 100644
--- a/src/components/editContent/EditContent.jsx
+++ b/src/components/editContent/EditContent.jsx
@@ -1,11 +1,8 @@
 import { useState, useEffect } from 'react'
-import { GET_VIDEO, VIDEO_COVER, LESSON_IMG } from '../../../utils/urlConstants'
+import { GET_VIDEO, VIDEO_COVER, LESSON_IMG } from '../../utils/urlConstants'
 import Text from '../../screens/courseManager/addLesson/Text'
 import Image from '../lessonImage/Image'
 import Video from '../videoPlayer/Video'
-// import Image from '../../../components/lessonImage/Image'
-// import Video from '../../../components/videoPlayer/Video'
-// import Text from '../addLesson/Text'
 
 const EditContent = ({
   data,
@@ -32,60 +29,67 @@ const EditContent = ({
       return data?.videoResource?.preview
     }
   }
+  console.log(data);
   return (
-    <>
-      {data
-        .sort((a, b) => (a.createdAt > b.createdAt ? 1 : -1))
-        .map((data, index) => (
-          <div key={index}>
-            <Text
-              heading={data?.textHeading}
-              desc={data?.textDescription}
+    <>{
+      data && <>
+       {
+        data?.photos && data?.photos.map(item => {
+          return  <Image
+                src={
+                  typeof item?.lessonImg === 'string'
+                    ? `${LESSON_IMG}${item?.lessonImg}`
+                    : item?.lessonImg.preview
+                }
+                id={item?.id || item?.itemId}
+                modelPopUp={modelPopUp}
+                setEditPhotoModel={setEditPhotoModel}
+                isEditable
+                desc={item?.isImgDesc === true && item?.photoDescription}
+                onRemove={item?.id ? removePhoto : removeLocalData}
+              />
+        })
+      }
+
+      {
+        data?.texts && data?.texts.map(item => {
+          return  <Text
+              heading={item?.textHeading}
+              desc={item?.textDescription}
               isEditable
               setEditTextModel={setEditTextModel}
               modelPopUp={modelPopUp}
-              id={data?.id || data?.itemId}
-              onRemove={data?.id ? removeTextItem : removeLocalData}
+              id={item?.id || item?.itemId}
+              onRemove={item?.id ? removeTextItem : removeLocalData}
             />
-            <Video
-              title={data?.videoTitle}
-              description={data?.videoDescription}
+        })
+      }
+
+      {
+        data?.videos && data?.videos.map(item => {
+          return  <Video
+              title={item?.videoTitle}
+              description={item?.videoDescription}
               url={
-                data?.videoLink === '' || data?.videoLink === undefined
-                  ? video(data)
-                  : data?.videoLink
+                item?.videoLink === '' || item?.videoLink === undefined
+                  ? video(item)
+                  : item?.videoLink
               }
               thumbnail={
-                typeof data?.videoCover === 'string'
-                  ? `${VIDEO_COVER}${data?.videoCover}`
-                  : data?.videoCover?.preview
+                typeof item?.videoCover === 'string'
+                  ? `${VIDEO_COVER}${item?.videoCover}`
+                  : item?.videoCover?.preview
               }
               setEditVideoModel={setEditVideoModel}
               isEditable
-              id={data?.id || data?.itemId}
+              id={item?.id || item?.itemId}
               modelPopUp={modelPopUp}
-              onRemove={data?.id ? removeVideo : removeLocalData}
+              onRemove={item?.id ? removeVideo : removeLocalData}
             />
-
-            {data?.lessonImg === undefined ? (
-              ''
-            ) : (
-              <Image
-                src={
-                  typeof data?.lessonImg === 'string'
-                    ? `${LESSON_IMG}${data?.lessonImg}`
-                    : data?.lessonImg.preview
-                }
-                id={data?.id || data?.itemId}
-                modelPopUp={modelPopUp}
-                setEditPhotoModel={setEditPhotoModel}
-                isEditable
-                desc={data?.isImgDesc === true && data?.photoDescription}
-                onRemove={data?.id ? removePhoto : removeLocalData}
-              />
-            )}
-          </div>
-        ))}
+        })
+      }
+      </>
+    }
     </>
   )
 }
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 3305239d8..70a750673 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -152,44 +152,7 @@ console.log(newsSingleData);
       />
     
       {/* Edit component for news */}
-      {newsSingleData && <>
-       {
-        newsSingleData?.photos && newsSingleData?.photos.map(item => {
-          return <Image
-                  src={`${LESSON_IMG}${item?.lessonImg}`}
-                  desc={
-                  item?.isImgDesc === true && item?.photoDescription
-                     }
-                 />
-        })
-      }
-
-      {
-        newsSingleData?.texts && newsSingleData?.texts.map(item => {
-          return <Text
-          heading={item?.textHeading}
-          desc={item?.textDescription}
-        />
-        })
-      }
-
-      {
-        newsSingleData?.videos && newsSingleData?.videos.map(item => {
-          return <Video
-            title={item?.videoTitle}
-            description={item?.videoDescription}
-            url={
-              item?.videoLink === 'undefined'
-                ? `${GET_VIDEO}${item?.videoResource}`
-                : item?.videoLink
-              }
-            thumbnail={`${VIDEO_COVER}${item?.videoCover}`}
-          />
-        })
-      }
-      </>
-      }
-
+     
       {
         newsSingleData && <EditContent data={newsSingleData}/>
       }
diff --git a/src/utils/urlConstants.js b/src/utils/urlConstants.js
index 610313d00..db9b04fc2 100644
--- a/src/utils/urlConstants.js
+++ b/src/utils/urlConstants.js
@@ -8,31 +8,35 @@ export const Axios = axios.create({
 })
 
 // categories
-export const CATEGORY = 'categories'
+export const CATEGORY = BASE_URL + 'categories'
 
 // course
-export const GET_COURSE = 'courses'
-export const ADD_COURSE = 'courses/add'
+export const GET_COURSE = BASE_URL + 'courses'
+export const ADD_COURSE = BASE_URL + 'courses/add'
 
 // lesson
-export const GET_LESSONS = 'lessons'
-export const ADD_LESSONS = 'lessons/add'
+export const GET_LESSONS = BASE_URL + 'lessons'
+export const ADD_LESSONS = BASE_URL + 'lessons/add'
 
 // videos
-export const ADD_VIDEOS = 'videos/add'
+export const GET_VIDEOS = BASE_URL + 'videos'
+export const ADD_VIDEOS = BASE_URL + 'videos/add'
 
 // lesson photos
-export const ADD_LESSON_PHOTO = 'lesson-photos/add'
+export const GET_LESSON_PHOTO = BASE_URL + 'lesson-photos'
+export const ADD_LESSON_PHOTO = BASE_URL + 'lesson-photos/add'
 
 // lesson Text
-export const ADD_LESSON_TEXT = 'lesson-text/add'
+export const GET_LESSON_TEXT = BASE_URL + 'lesson-text'
+export const ADD_LESSON_TEXT = BASE_URL + 'lesson-text/add'
 
 // lesson material
-export const ADD_MATERIAL = 'materials/add'
+export const GET_MATERIAL = BASE_URL + 'materials'
+export const ADD_MATERIAL = BASE_URL + 'materials/add'
 
 // enroll
-export const GET_ENROLL = 'enrolls'
-export const ADD_ENROLL = 'enrolls/add'
+export const GET_ENROLL = BASE_URL + 'enrolls'
+export const ADD_ENROLL = BASE_URL + 'enrolls/add'
 
 // get files
 export const GET_THUMBNAIL = CDN_URL + '/thumbnail/'

From 9d05d4e5ead2c3bf5b3ae511ff76da612e1da011 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Fri, 6 Aug 2021 14:51:34 +0545
Subject: [PATCH 17/27] styling Image, Text and Video

---
 src/components/lessonImage/Image.scss         |  9 +++-
 src/components/videoPlayer/Video.scss         |  9 +++-
 src/screens/courseManager/addLesson/Text.scss | 48 +++++++++++++------
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/components/lessonImage/Image.scss b/src/components/lessonImage/Image.scss
index 9b1c86f20..883e2ec03 100644
--- a/src/components/lessonImage/Image.scss
+++ b/src/components/lessonImage/Image.scss
@@ -4,7 +4,7 @@
   align-items: center;
   flex-direction: column;
   margin: 2em 0;
-  color: var(--primary-white);
+  position: relative;
 
   img {
     width: 100%;
@@ -14,4 +14,11 @@
     font-size: 1em;
     font-style: italic;
   }
+  .actions {
+    position: absolute;
+    z-index: 5;
+    top: 1%;
+    right: 1%;
+    background: var(--background-color-image);
+  }
 }
diff --git a/src/components/videoPlayer/Video.scss b/src/components/videoPlayer/Video.scss
index 7a264f2c1..aa4fd8676 100644
--- a/src/components/videoPlayer/Video.scss
+++ b/src/components/videoPlayer/Video.scss
@@ -29,7 +29,6 @@
       line-height: 2em;
       margin-bottom: 0.5em;
       font-weight: 600;
-      color: var(--primary-white);
 
       &::first-letter {
         text-transform: uppercase;
@@ -39,7 +38,6 @@
       font-size: 1em;
       line-height: 1.5em;
       width: 80%;
-      color: var(--primary-white);
 
       &::first-letter {
         text-transform: uppercase;
@@ -111,6 +109,13 @@
       }
     }
   }
+  .actions {
+    position: absolute;
+    z-index: 5;
+    top: 1%;
+    right: 1%;
+    background: var(--background-color-image);
+  }
 }
 .react-player__preview::before {
   content: '';
diff --git a/src/screens/courseManager/addLesson/Text.scss b/src/screens/courseManager/addLesson/Text.scss
index 51c25bff3..172dcf6fb 100644
--- a/src/screens/courseManager/addLesson/Text.scss
+++ b/src/screens/courseManager/addLesson/Text.scss
@@ -1,23 +1,41 @@
 .text {
+  display: flex;
+  justify-content: space-between;
   margin: 2em 0;
-  color: var(--primary-white);
+  position: relative;
+  .block {
+    width: 93%;
+    h1 {
+      font-weight: 600;
+      text-transform: uppercase;
+      font-size: 1.25em;
+      line-height: 1.5em;
+      font-family: inherit;
+      margin: 0.5em 0;
+    }
+    p {
+      font-weight: 400;
+      font-size: 1em;
+      line-height: 1.5em;
+      font-family: inherit;
 
-  h1 {
-    font-weight: 600;
-    text-transform: uppercase;
-    font-size: 1.25em;
-    line-height: 1.5em;
-    font-family: inherit;
-    margin: 0.5em 0;
+      &::first-letter {
+        text-transform: uppercase;
+      }
+    }
   }
-  p {
-    font-weight: 400;
-    font-size: 1em;
-    line-height: 1.5em;
-    font-family: inherit;
+  .lessonAction {
+    width: 6%;
+    margin-left: 1%;
 
-    &::first-letter {
-      text-transform: uppercase;
+    button {
+      width: 100%;
+    }
+
+    @media (max-width: 850px) {
+      position: relative;
+      top: 0;
+      left: 0;
     }
   }
 }

From 723caf22bcd56c3c6ca0d6f17002bdb1cb1883a9 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Fri, 6 Aug 2021 17:40:49 +0545
Subject: [PATCH 18/27] delete individual text, image and video in news

---
 api/src/controllers/textController.js         |   6 +-
 src/components/contentAdd/ContentAdd.jsx      |   2 +-
 src/components/editContent/EditContent.jsx    |  14 +-
 src/components/formUI/FormUI.jsx              |   3 +-
 src/components/lessonImage/Image.jsx          |   4 +-
 .../newsCreateModal/NewsCreateImage.jsx       |  13 +-
 .../newsCreateModal/NewsCreateModal.jsx       |   8 +-
 .../newsCreateModal/NewsCreateVideo.jsx       |   8 +-
 .../newsCreateModal/NewsTextModel.jsx         |   6 +-
 src/components/videoPlayer/Video.jsx          |   3 +-
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 121 ++++++++++++++++--
 .../courseManager/addLesson/Actions.jsx       |  10 +-
 src/screens/courseManager/addLesson/Text.jsx  |   3 +-
 .../adminCoursePage/AdminCoursePage.scss      |   2 +-
 14 files changed, 168 insertions(+), 35 deletions(-)

diff --git a/api/src/controllers/textController.js b/api/src/controllers/textController.js
index c70a0cde8..c4e05a122 100644
--- a/api/src/controllers/textController.js
+++ b/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
   })
 }
 
diff --git a/src/components/contentAdd/ContentAdd.jsx b/src/components/contentAdd/ContentAdd.jsx
index 38971116f..8f07a31dd 100644
--- a/src/components/contentAdd/ContentAdd.jsx
+++ b/src/components/contentAdd/ContentAdd.jsx
@@ -7,7 +7,7 @@ const ContentAdd = ({data, setVideoModal, setImageModal, setTextModal}) => {
   return (
     <>
       {
-        data.length &&
+        data.length > 0 &&
           data.map((vid, index) => (
             <div key={index}>
               <Video
diff --git a/src/components/editContent/EditContent.jsx b/src/components/editContent/EditContent.jsx
index 0fdcb259e..50f2791d7 100644
--- a/src/components/editContent/EditContent.jsx
+++ b/src/components/editContent/EditContent.jsx
@@ -10,11 +10,13 @@ const EditContent = ({
   setEditTextModel,
   setEditPhotoModel,
   setEditVideoModel,
-  modelPopUp,
   removeTextItem,
   removePhoto,
   removeVideo,
-  removeLocalData
+  removeLocalData,
+  editImageFunc,
+  editVideoFunc,
+  editTextFunc
 }) => {
   const [allLessonData, setAllLessonData] = useState([])
 
@@ -29,7 +31,7 @@ const EditContent = ({
       return data?.videoResource?.preview
     }
   }
-  console.log(data);
+
   return (
     <>{
       data && <>
@@ -42,7 +44,7 @@ const EditContent = ({
                     : item?.lessonImg.preview
                 }
                 id={item?.id || item?.itemId}
-                modelPopUp={modelPopUp}
+                modelPopUp={editImageFunc}
                 setEditPhotoModel={setEditPhotoModel}
                 isEditable
                 desc={item?.isImgDesc === true && item?.photoDescription}
@@ -58,7 +60,7 @@ const EditContent = ({
               desc={item?.textDescription}
               isEditable
               setEditTextModel={setEditTextModel}
-              modelPopUp={modelPopUp}
+              modelPopUp={editTextFunc}
               id={item?.id || item?.itemId}
               onRemove={item?.id ? removeTextItem : removeLocalData}
             />
@@ -83,7 +85,7 @@ const EditContent = ({
               setEditVideoModel={setEditVideoModel}
               isEditable
               id={item?.id || item?.itemId}
-              modelPopUp={modelPopUp}
+              modelPopUp={editVideoFunc}
               onRemove={item?.id ? removeVideo : removeLocalData}
             />
         })
diff --git a/src/components/formUI/FormUI.jsx b/src/components/formUI/FormUI.jsx
index dc3c8944d..64276f6b4 100644
--- a/src/components/formUI/FormUI.jsx
+++ b/src/components/formUI/FormUI.jsx
@@ -86,10 +86,11 @@ export const SubmitButton = (props) => {
 }
 
 export const TextArea = React.forwardRef(
-  ({ className, placeholder, name, rows, cols, onChange, disabled }, ref) => {
+  ({ className, placeholder, name, rows, cols, onChange, disabled, defaultValue }, ref) => {
     return (
       <>
         <textarea
+          defaultValue={defaultValue}
           className={className}
           placeholder={placeholder}
           cols={cols}
diff --git a/src/components/lessonImage/Image.jsx b/src/components/lessonImage/Image.jsx
index fe7af0064..57902d20a 100644
--- a/src/components/lessonImage/Image.jsx
+++ b/src/components/lessonImage/Image.jsx
@@ -11,8 +11,10 @@ const Image = ({
   isEditable
 }) => {
   const poopUp = () => {
-    modelPopUp(setEditPhotoModel(true), id)
+    modelPopUp(id)
+    setEditPhotoModel(true)
   }
+  console.log(src);
   return (
     <>
       {src ? (
diff --git a/src/components/newsCreateModal/NewsCreateImage.jsx b/src/components/newsCreateModal/NewsCreateImage.jsx
index d51d412e4..35478ec6e 100644
--- a/src/components/newsCreateModal/NewsCreateImage.jsx
+++ b/src/components/newsCreateModal/NewsCreateImage.jsx
@@ -8,12 +8,15 @@ import { TextArea } from '../formUI/FormUI'
 
 import './NewsCreateModal.scss'
 import ToggleSwitch from '../toggleSwitch/ToggleSwitch'
+import { LESSON_IMG } from '../../utils/urlConstants'
+import { useEffect } from 'react'
 
 const CreateImage = ({
   imageActive,
   setImageActive,
   lessonData,
-  setLessonData
+  setLessonData,
+  data = []
 }) => {
   const [isImgDesc, setIsImgDesc] = useState(true)
   const [lessonImg, setLessonImg] = useState(null)
@@ -32,6 +35,12 @@ const CreateImage = ({
     setLessonData(imgData)
     setImageActive(false)
   }
+
+  useEffect(() => {
+    if(data.length > 0) {
+      setIsImgDesc(data[0].isImgDesc)
+    }
+  }, [])
   return (
     <>
       {imageActive && (
@@ -45,6 +54,7 @@ const CreateImage = ({
               <DragDrop
                 onChange={(img) => setLessonImg(img)}
                 text='Drag & Drop photo in this area or Click Here to attach'
+                dataImg={data.length > 0 && `${LESSON_IMG}${data[0].lessonImg}`}
               />
               <div className='description'>
                 <label>Add photo description ?</label>{' '}
@@ -56,6 +66,7 @@ const CreateImage = ({
               {isImgDesc && (
                 <div className='photo-input-container'>
                   <TextArea
+                    defaultValue={data.length > 0 && data[0].photoDescription}
                     placeholder='Photo Description (Optional)'
                     className='default-input-variation text-area-variation textarea'
                     cols='3'
diff --git a/src/components/newsCreateModal/NewsCreateModal.jsx b/src/components/newsCreateModal/NewsCreateModal.jsx
index ab9a92149..1b86c2d4c 100644
--- a/src/components/newsCreateModal/NewsCreateModal.jsx
+++ b/src/components/newsCreateModal/NewsCreateModal.jsx
@@ -22,7 +22,10 @@ const NewsCreateModal = ({
   setGroupEditActive,
   addVideoData,
   lessonData,
-  setLessonData
+  setLessonData,
+  imageData,
+  textData,
+  videoData
 }) => {
   const [files, setFiles] = useState(null)
 
@@ -37,6 +40,7 @@ const NewsCreateModal = ({
           setVideoActive={setVideoActive}
           lessonData={lessonData}
           setLessonData={setLessonData}
+          data={videoData}
         />
       )
 
@@ -68,6 +72,7 @@ const NewsCreateModal = ({
           setImageActive={setImageActive}
           lessonData={lessonData}
           setLessonData={setLessonData}
+          data={imageData}
         />
       )
 
@@ -79,6 +84,7 @@ const NewsCreateModal = ({
           setTextActive={setTextActive}
           lessonData={lessonData}
           setLessonData={setLessonData}
+          data={textData}
         />
       )
 
diff --git a/src/components/newsCreateModal/NewsCreateVideo.jsx b/src/components/newsCreateModal/NewsCreateVideo.jsx
index 2adbca853..220e2b612 100644
--- a/src/components/newsCreateModal/NewsCreateVideo.jsx
+++ b/src/components/newsCreateModal/NewsCreateVideo.jsx
@@ -6,6 +6,7 @@ import DragDrop from '../dragDrop/DragDrop'
 import CollectionModalHeader from './CollectionModalHeader'
 import { InputFields, ErrorText, TextArea } from '../formUI/FormUI'
 import './NewsCreateModal.scss'
+import { LESSON_IMG, VIDEO_COVER } from '../../utils/urlConstants'
 
 const CreateVideo = ({
   getRootProps,
@@ -14,7 +15,8 @@ const CreateVideo = ({
   videoActive,
   setVideoActive,
   lessonData,
-  setLessonData
+  setLessonData,
+  data
 }) => {
   const { register, errors, handleSubmit } = useForm()
   const [videoCover, setVideoCover] = useState(null)
@@ -52,6 +54,7 @@ const CreateVideo = ({
                 getRootProps={getRootProps}
                 files={files}
                 text='Drag & Drop photo in this area or Click Here to attach Video Cover'
+                dataImg={data.length > 0 && `${VIDEO_COVER}${data[0]?.videoCover}`}
                 onChange={(img) => setVideoCover(img)}
               />
               <div className='video-input-container'>
@@ -60,6 +63,7 @@ const CreateVideo = ({
                   placeholder='Video Title (Optional)'
                   name='videoTitle'
                   ref={register}
+                  defaultValue={data.length > 0 && data[0].videoTitle}
                 />
 
                 <TextArea
@@ -69,6 +73,7 @@ const CreateVideo = ({
                   rows='4'
                   name='videoDescription'
                   ref={register}
+                  defaultValue={data.length > 0 && data[0].videoDescription}
                 />
                 <div className='video-row-3'>
                   {!video && (
@@ -84,6 +89,7 @@ const CreateVideo = ({
                         }
                         placeholder='Video Link'
                         name='videoLink'
+                        defaultValue={data.length > 0 && data[0].videoLink}
                         ref={register({
                           required: {
                             value: true,
diff --git a/src/components/newsCreateModal/NewsTextModel.jsx b/src/components/newsCreateModal/NewsTextModel.jsx
index 522c259f8..db7d757bd 100644
--- a/src/components/newsCreateModal/NewsTextModel.jsx
+++ b/src/components/newsCreateModal/NewsTextModel.jsx
@@ -9,7 +9,8 @@ const CreateText = ({
   textActive,
   setTextActive,
   lessonData,
-  setLessonData
+  setLessonData,
+  data
 }) => {
   const { register, errors, handleSubmit } = useForm()
 
@@ -26,6 +27,7 @@ const CreateText = ({
     }
     setTextActive(false)
   }
+  
   return (
     <>
       {textActive && (
@@ -43,6 +45,7 @@ const CreateText = ({
                   placeholder='Text Heading (Optional)'
                   name='textHeading'
                   ref={register}
+                  defaultValue={data.length > 0 && data[0].textHeading}
                 />
                 <TextArea
                   className={`default-input-variation text-area-variation ${
@@ -54,6 +57,7 @@ const CreateText = ({
                   cols='3'
                   rows='7'
                   name='textDescription'
+                  defaultValue={data.length > 0 && data[0].textDescription}
                   ref={register({
                     required: {
                       value: true,
diff --git a/src/components/videoPlayer/Video.jsx b/src/components/videoPlayer/Video.jsx
index bad294978..c75b8c495 100644
--- a/src/components/videoPlayer/Video.jsx
+++ b/src/components/videoPlayer/Video.jsx
@@ -20,7 +20,8 @@ const Video = ({
 }) => {
   const [showInfo, setShowInfo] = useState(false)
   const poopUp = () => {
-    modelPopUp(setEditVideoModel(true), id)
+    modelPopUp(id)
+    setEditVideoModel(true)
   }
   return (
     <>
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 70a750673..ebfea1cda 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -13,13 +13,14 @@ import { useEffect } from 'react'
 import { useLocation } from 'react-router-dom/cjs/react-router-dom.min'
 import { ErrorText, TextArea } from '../../../components/formUI/FormUI'
 import ContentAdd from '../../../components/contentAdd/ContentAdd'
-import { getApi } from '../../../utils/apiFunc'
+import { configFunc, getApi } from '../../../utils/apiFunc'
 import DragDrop from '../../../components/dragDrop/DragDrop'
 import Image from '../../../components/lessonImage/Image'
 import Text from '../../courseManager/addLesson/Text'
 import Video from '../../../components/videoPlayer/Video'
 import { GET_VIDEO, LESSON_IMG, VIDEO_COVER } from '../../../utils/urlConstants'
 import EditContent from '../../../components/editContent/EditContent'
+import axios from 'axios'
 
 const NewsAdd = () => {
   const { currentCommunity } = useSelector(state => state.activeCommunity)
@@ -29,6 +30,12 @@ const NewsAdd = () => {
   const [createVideoModal, setCreateVideoModal] = useState(false)
   const [createImageModal, setCreateImageModal] = useState(false)
   const [createTextModal, setCreateTextModal] = useState(false)
+  const [deleteVideoModal, setDeleteVideoModal] = useState(false)
+  const [deleteImageModal, setDeleteImageModal] = useState(false)
+  const [deleteTextModal, setDeleteTextModal] = useState(false)
+  const [videoId, setVideoId] = useState(null)
+  const [imageId, setImageId] = useState(null)
+  const [textId, setTextId] = useState(null)
   const [videoActive, setVideoActive] = useState(true)
   const [imageActive, setImageActive] = useState(true)
   const [textActive, setTextActive] = useState(true)
@@ -36,6 +43,9 @@ const NewsAdd = () => {
   const [newsSingleData, setNewsSingleData] = useState([])
   const [category, setCategory] = useState(state?.category || null)
   const [newsCover, setNewsCover] = useState(null);
+  const [imageData, setImageData] = useState(null)
+  const [videoData, setVideoData] = useState(null)
+  const [textData, setTextData] = useState(null)
 
   const news = useSelector((state) => (state.addNewNews !== {} ? state.addNewNews : ''))
   const { register, errors, handleSubmit } = useForm()
@@ -79,11 +89,67 @@ const NewsAdd = () => {
     console.log(newsCover)
   }
 
+  async function editImageFunc (id) {
+    if(newsSingleData?.photos) {
+      let photo = newsSingleData.photos.filter(el => el.id === id);
+      setImageData(photo)
+    }
+  }
+
+  console.log(newsSingleData)
+
+  async function editTextFunc (id) {
+    if(newsSingleData?.texts) {
+      let text = newsSingleData.texts.filter(el => el.id === id);
+      setTextData(text)
+    }
+  }
+
+  async function editVideoFunc (id) {
+    if(newsSingleData?.videos) {
+      let video = newsSingleData.videos.filter(el => el.id === id);
+      setVideoData(video)
+    }
+  }
+
+  function deleteImageModalFunc (id) {
+    setDeleteImageModal(true)
+    setImageId(id)
+  }
+
+  async function deleteImageConfirm () {
+    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/lesson-photos/${imageId}`)
+    setDeleteImageModal(false)
+  }
+
+  function deleteVideoModalFunc (id) {
+    setDeleteVideoModal(true)
+    setVideoId(id)
+  }
+
+  async function deleteVideoConfirm () {
+    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/videos/${videoId}`)
+    setDeleteVideoModal(false)
+  }
+
+  function deleteTextModalFunc (id) {
+    setDeleteTextModal(true)
+    setTextId(id)
+  }
+
+  async function deleteTextConfirm () {
+    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/lesson-text/${textId}`)
+    setDeleteTextModal(false)
+  }
+
   return (
     <>
-      {createVideoModal && <NewsCreateModal type='video' videoActive={videoActive} setVideoActive={setVideoActive} lessonData={newsData} setLessonData={setNewsData} />}
-      {createImageModal && <NewsCreateModal type='image' imageActive={imageActive} setImageActive={setImageActive} lessonData={newsData} setLessonData={setNewsData} />}
-      {createTextModal && <NewsCreateModal type='text' textActive={textActive} setTextActive={setTextActive} lessonData={newsData} setLessonData={setNewsData} />}
+      {createVideoModal && <NewsCreateModal type='video' videoActive={videoActive} setVideoActive={setVideoActive} lessonData={newsData} setLessonData={setNewsData} videoData={videoData} />}
+      {createImageModal && <NewsCreateModal type='image' imageActive={imageActive} setImageActive={setImageActive} lessonData={newsData} setLessonData={setNewsData} imageData={imageData} />}
+      {createTextModal && <NewsCreateModal type='text' textActive={textActive} setTextActive={setTextActive} lessonData={newsData} setLessonData={setNewsData} textData={textData} />}
+      {deleteVideoModal && <DeleteContent setDeleteModal={setDeleteVideoModal} confirmDelete={deleteVideoConfirm} />}
+      {deleteImageModal && <DeleteContent setDeleteModal={setDeleteImageModal} confirmDelete={deleteImageConfirm} />}
+      {deleteTextModal && <DeleteContent setDeleteModal={setDeleteTextModal} confirmDelete={deleteTextConfirm} />}
       <DashboardLayout title={newsSingleData ? 'Edit News' : 'Add News'}>
         <BackButton location={`/community-page-news/${currentCommunity.slug}`} />
         <AddNewsContent
@@ -96,6 +162,12 @@ const NewsAdd = () => {
           newsData = {newsData}
           newsSingleData = {newsSingleData}
           setNewsCover={setNewsCover}
+          editVideoFunc={editVideoFunc}
+          editImageFunc={editImageFunc}
+          editTextFunc={editTextFunc}
+          setDeleteVideoModal={deleteVideoModalFunc}
+          setDeleteImageModal={deleteImageModalFunc}
+          setDeleteTextModal={deleteTextModalFunc}
         />
 
         {
@@ -109,6 +181,21 @@ const NewsAdd = () => {
   )
 }
 
+const DeleteContent = ({confirmDelete, setDeleteModal}) => {
+  return <div className='simple-modal-container'>
+        <div className='simple-modal-inner-container'>
+          <div>
+            <h4>Are you sure you want to delete?</h4>
+            {/* <button onClick={() => confirmDelete}><img src='/img/close-outline.svg' alt='close-outline' /></button> */}
+          </div>
+          <div>
+            <button className='secondary-btn' onClick={confirmDelete}>Confirm</button>
+            <button className='secondary-btn' onClick={() => setDeleteModal(false)}>Cancel</button>
+          </div>
+        </div>
+      </div>
+}
+
 const AddNewsContent = ({
   errors,
   newsData,
@@ -117,7 +204,13 @@ const AddNewsContent = ({
   setTextModal,
   register,
   newsSingleData,
-  setNewsCover
+  setNewsCover,
+  editImageFunc,
+  editVideoFunc,
+  editTextFunc,
+  setDeleteVideoModal,
+  setDeleteImageModal,
+  setDeleteTextModal
 }) => {
 
   const [title, setTitle] = useState('');
@@ -132,7 +225,6 @@ const AddNewsContent = ({
     }
   }, [newsData, newsSingleData])
 
-console.log(newsSingleData);
   return  <div className='admin-lesson-create-container'>
       <ErrorText
         className='errorMsg'
@@ -150,11 +242,20 @@ console.log(newsSingleData);
           }
         })}
       />
-    
-      {/* Edit component for news */}
-     
+
       {
-        newsSingleData && <EditContent data={newsSingleData}/>
+        newsSingleData && <EditContent 
+        data={newsSingleData}
+        setEditPhotoModel={setImageModal}
+        setEditTextModel={setTextModal}
+        setEditVideoModel={setVideoModal}
+        editVideoFunc={editVideoFunc}
+        editImageFunc={editImageFunc}
+        editTextFunc={editTextFunc}
+        removeTextItem={setDeleteTextModal}
+        removePhoto={setDeleteImageModal}
+        removeVideo={setDeleteVideoModal}
+        />
       }
 
       <ContentAdd data={newsData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
diff --git a/src/screens/courseManager/addLesson/Actions.jsx b/src/screens/courseManager/addLesson/Actions.jsx
index 48b00a38e..1887cbc07 100644
--- a/src/screens/courseManager/addLesson/Actions.jsx
+++ b/src/screens/courseManager/addLesson/Actions.jsx
@@ -7,6 +7,11 @@ const LessonActions = ({ id, onRemove = () => {}, poopUp, refetch }) => {
     setActionActive(false)
   })
 
+  const openCloseModal = () => {
+    poopUp()
+    setActionActive(!actionActive)
+  }
+
   return (
     <div className='actions lessonAction' ref={domNode}>
       <button
@@ -18,10 +23,7 @@ const LessonActions = ({ id, onRemove = () => {}, poopUp, refetch }) => {
       {actionActive && (
         <ul className={actionActive ? 'actionBtn show' : 'hide'}>
           <li
-            onClick={() => {
-              poopUp()
-              setActionActive(!actionActive)
-            }}
+            onClick={openCloseModal}
           >
             Edit
           </li>
diff --git a/src/screens/courseManager/addLesson/Text.jsx b/src/screens/courseManager/addLesson/Text.jsx
index 88447b85e..e3b02e09a 100644
--- a/src/screens/courseManager/addLesson/Text.jsx
+++ b/src/screens/courseManager/addLesson/Text.jsx
@@ -12,7 +12,8 @@ const Text = ({
   refetch
 }) => {
   const poopUp = () => {
-    modelPopUp(setEditTextModel(true), id)
+    modelPopUp(id)
+    setEditTextModel(true)
   }
   return (
     <>
diff --git a/src/screens/courseManager/adminCoursePage/AdminCoursePage.scss b/src/screens/courseManager/adminCoursePage/AdminCoursePage.scss
index cdff60644..da964e5dd 100644
--- a/src/screens/courseManager/adminCoursePage/AdminCoursePage.scss
+++ b/src/screens/courseManager/adminCoursePage/AdminCoursePage.scss
@@ -239,7 +239,7 @@
     color: var(--primary-white);
     border: 0.5px solid var(--primary-white);
     padding: 0.5em 1em;
-    z-index: 99999;
+    z-index: 500;
     border-radius: 0.2em;
 
     li {

From ad2a34ecc35a52ed9c4dfed31fc78d7b79178a73 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Fri, 6 Aug 2021 17:58:51 +0545
Subject: [PATCH 19/27] news add configuration

---
 src/components/lessonImage/Image.jsx               |  2 +-
 src/components/newsCreateModal/NewsCreateVideo.jsx |  4 ++--
 src/screens/communityNews/newsAdd/NewsAdd.jsx      | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/lessonImage/Image.jsx b/src/components/lessonImage/Image.jsx
index 57902d20a..e9aa24f91 100644
--- a/src/components/lessonImage/Image.jsx
+++ b/src/components/lessonImage/Image.jsx
@@ -14,7 +14,7 @@ const Image = ({
     modelPopUp(id)
     setEditPhotoModel(true)
   }
-  console.log(src);
+  
   return (
     <>
       {src ? (
diff --git a/src/components/newsCreateModal/NewsCreateVideo.jsx b/src/components/newsCreateModal/NewsCreateVideo.jsx
index 220e2b612..35dd9485f 100644
--- a/src/components/newsCreateModal/NewsCreateVideo.jsx
+++ b/src/components/newsCreateModal/NewsCreateVideo.jsx
@@ -16,7 +16,7 @@ const CreateVideo = ({
   setVideoActive,
   lessonData,
   setLessonData,
-  data
+  data = []
 }) => {
   const { register, errors, handleSubmit } = useForm()
   const [videoCover, setVideoCover] = useState(null)
@@ -54,7 +54,7 @@ const CreateVideo = ({
                 getRootProps={getRootProps}
                 files={files}
                 text='Drag & Drop photo in this area or Click Here to attach Video Cover'
-                dataImg={data.length > 0 && `${VIDEO_COVER}${data[0]?.videoCover}`}
+                dataImg={data.length > 0 ? `${VIDEO_COVER}${data[0]?.videoCover}` : ''}
                 onChange={(img) => setVideoCover(img)}
               />
               <div className='video-input-container'>
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index ebfea1cda..8536eae81 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -96,8 +96,7 @@ const NewsAdd = () => {
     }
   }
 
-  console.log(newsSingleData)
-
+console.log(newsData)
   async function editTextFunc (id) {
     if(newsSingleData?.texts) {
       let text = newsSingleData.texts.filter(el => el.id === id);
@@ -215,15 +214,21 @@ const AddNewsContent = ({
 
   const [title, setTitle] = useState('');
   
+  // for creation
   useEffect(() => {
-    if(newsData.length) {
+    if(newsData.length > 0) {
       setTitle(newsData[0].title)
+      console.log(newsData[0].title)
     }
+  }, [newsData])
 
+  // for Edit
+  useEffect(() => {
     if(newsSingleData) {
       setTitle(newsSingleData.title)
     }
-  }, [newsData, newsSingleData])
+  }, [newsSingleData])
+  
 
   return  <div className='admin-lesson-create-container'>
       <ErrorText

From 3adba5a6a13b9f0c3c9cd1ffc797d7b06cb5fe01 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Mon, 9 Aug 2021 10:52:36 +0545
Subject: [PATCH 20/27] adding cover image functionality to the news-component

---
 src/actions/newsActions.js                    |  9 ++---
 src/components/lessonImage/Image.scss         |  1 +
 .../newsCreateModal/NewsCreateImage.jsx       | 18 ++++++----
 .../newsCreateModal/NewsCreateModal.jsx       | 13 ++++---
 .../newsCreateModal/NewsCreateVideo.jsx       | 26 ++++++++------
 .../newsCreateModal/NewsTextModel.jsx         | 21 ++++++++----
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 34 ++++++++++++++-----
 .../communityNewsView/CommunityNewsView.jsx   |  4 +++
 src/screens/courseManager/addLesson/Text.scss |  2 ++
 9 files changed, 85 insertions(+), 43 deletions(-)

diff --git a/src/actions/newsActions.js b/src/actions/newsActions.js
index bb975aca8..122805054 100644
--- a/src/actions/newsActions.js
+++ b/src/actions/newsActions.js
@@ -70,12 +70,13 @@ export const searchNews = (search) => async (dispatch) => {
   }
 }
 
-export const createNews = (newNews, news) => async (dispatch, getState) => {
+export const createNews = (newNews, newsCover) => async (dispatch, getState) => {
   const formData = new FormData()
-  formData.append('title', news.title)
-  formData.append('category', news.category)
-  formData.append('news', news.lessonImg)
+  formData.append('title', newNews[0].title)
+  formData.append('category', newNews[0].category)
+  formData.append('news', newsCover)
   try {
+
     const configFunc = () => {
         const userdata = window.localStorage.getItem('userInfo')
         const token = JSON.parse(userdata).token
diff --git a/src/components/lessonImage/Image.scss b/src/components/lessonImage/Image.scss
index 883e2ec03..5a6b92275 100644
--- a/src/components/lessonImage/Image.scss
+++ b/src/components/lessonImage/Image.scss
@@ -5,6 +5,7 @@
   flex-direction: column;
   margin: 2em 0;
   position: relative;
+  color: var(--primary-white);
 
   img {
     width: 100%;
diff --git a/src/components/newsCreateModal/NewsCreateImage.jsx b/src/components/newsCreateModal/NewsCreateImage.jsx
index 35478ec6e..195fd91c0 100644
--- a/src/components/newsCreateModal/NewsCreateImage.jsx
+++ b/src/components/newsCreateModal/NewsCreateImage.jsx
@@ -66,7 +66,7 @@ const CreateImage = ({
               {isImgDesc && (
                 <div className='photo-input-container'>
                   <TextArea
-                    defaultValue={data.length > 0 && data[0].photoDescription}
+                    defaultValue={data.length > 0 ? data[0].photoDescription : ''}
                     placeholder='Photo Description (Optional)'
                     className='default-input-variation text-area-variation textarea'
                     cols='3'
@@ -77,11 +77,17 @@ const CreateImage = ({
                 </div>
               )}
 
-              <Button
-                name='Add Photo Block'
-                onClick={handleSubmit(submitLessonImg)}
-                className='add'
-              />
+              {
+                data.length > 0 
+                ? <Button
+                    className='add'
+                    name='Edit Photo Block'
+                    onClick={handleSubmit(submitLessonImg)} />
+                : <Button
+                    className='add'
+                    name='Add Video Block'
+                    onClick={handleSubmit(submitLessonImg)} />
+              }
             </div>
           </div>
         </div>
diff --git a/src/components/newsCreateModal/NewsCreateModal.jsx b/src/components/newsCreateModal/NewsCreateModal.jsx
index 1b86c2d4c..ad1c4e7ac 100644
--- a/src/components/newsCreateModal/NewsCreateModal.jsx
+++ b/src/components/newsCreateModal/NewsCreateModal.jsx
@@ -23,12 +23,11 @@ const NewsCreateModal = ({
   addVideoData,
   lessonData,
   setLessonData,
-  imageData,
-  textData,
-  videoData
+  imageData = [],
+  textData = [],
+  videoData = []
 }) => {
   const [files, setFiles] = useState(null)
-
   switch (type) {
     case 'video':
       return (
@@ -40,7 +39,7 @@ const NewsCreateModal = ({
           setVideoActive={setVideoActive}
           lessonData={lessonData}
           setLessonData={setLessonData}
-          data={videoData}
+          data={videoData || []}
         />
       )
 
@@ -72,7 +71,7 @@ const NewsCreateModal = ({
           setImageActive={setImageActive}
           lessonData={lessonData}
           setLessonData={setLessonData}
-          data={imageData}
+          data={imageData || []}
         />
       )
 
@@ -84,7 +83,7 @@ const NewsCreateModal = ({
           setTextActive={setTextActive}
           lessonData={lessonData}
           setLessonData={setLessonData}
-          data={textData}
+          data={textData || []}
         />
       )
 
diff --git a/src/components/newsCreateModal/NewsCreateVideo.jsx b/src/components/newsCreateModal/NewsCreateVideo.jsx
index 35dd9485f..52cd478c0 100644
--- a/src/components/newsCreateModal/NewsCreateVideo.jsx
+++ b/src/components/newsCreateModal/NewsCreateVideo.jsx
@@ -38,7 +38,7 @@ const CreateVideo = ({
     setLessonData(vData)
     setVideoActive(false)
   }
-  
+
   return (
     <>
       {videoActive && (
@@ -54,7 +54,7 @@ const CreateVideo = ({
                 getRootProps={getRootProps}
                 files={files}
                 text='Drag & Drop photo in this area or Click Here to attach Video Cover'
-                dataImg={data.length > 0 ? `${VIDEO_COVER}${data[0]?.videoCover}` : ''}
+                dataImg={data.length > 0 && `${VIDEO_COVER}${data[0]?.videoCover}`}
                 onChange={(img) => setVideoCover(img)}
               />
               <div className='video-input-container'>
@@ -63,7 +63,7 @@ const CreateVideo = ({
                   placeholder='Video Title (Optional)'
                   name='videoTitle'
                   ref={register}
-                  defaultValue={data.length > 0 && data[0].videoTitle}
+                  defaultValue={data.length > 0 ? data[0].videoTitle : ''}
                 />
 
                 <TextArea
@@ -73,7 +73,7 @@ const CreateVideo = ({
                   rows='4'
                   name='videoDescription'
                   ref={register}
-                  defaultValue={data.length > 0 && data[0].videoDescription}
+                  defaultValue={data.length > 0 ? data[0].videoDescription : ''}
                 />
                 <div className='video-row-3'>
                   {!video && (
@@ -89,7 +89,7 @@ const CreateVideo = ({
                         }
                         placeholder='Video Link'
                         name='videoLink'
-                        defaultValue={data.length > 0 && data[0].videoLink}
+                        defaultValue={data.length > 0 ? data[0].videoLink : ""}
                         ref={register({
                           required: {
                             value: true,
@@ -122,11 +122,17 @@ const CreateVideo = ({
                   message={errors.videoLink && errors.videoLink.message}
                 />
               </div>
-              <Button
-                className='add'
-                name='Add Video Block'
-                onClick={handleSubmit(addVideo)}
-              />
+              {
+                data.length > 0 
+                ? <Button
+                    className='add'
+                    name='Edit Video Block'
+                    onClick={handleSubmit(addVideo)} />
+                : <Button
+                    className='add'
+                    name='Add Video Block'
+                    onClick={handleSubmit(addVideo)} />
+              }
             </div>
           </div>
         </div>
diff --git a/src/components/newsCreateModal/NewsTextModel.jsx b/src/components/newsCreateModal/NewsTextModel.jsx
index db7d757bd..2a73ba03a 100644
--- a/src/components/newsCreateModal/NewsTextModel.jsx
+++ b/src/components/newsCreateModal/NewsTextModel.jsx
@@ -45,7 +45,7 @@ const CreateText = ({
                   placeholder='Text Heading (Optional)'
                   name='textHeading'
                   ref={register}
-                  defaultValue={data.length > 0 && data[0].textHeading}
+                  defaultValue={data.length > 0 ? data[0].textHeading : ''}
                 />
                 <TextArea
                   className={`default-input-variation text-area-variation ${
@@ -57,7 +57,7 @@ const CreateText = ({
                   cols='3'
                   rows='7'
                   name='textDescription'
-                  defaultValue={data.length > 0 && data[0].textDescription}
+                  defaultValue={data.length > 0 ? data[0].textDescription : ''}
                   ref={register({
                     required: {
                       value: true,
@@ -72,11 +72,18 @@ const CreateText = ({
                   }
                 />
               </div>
-              <Button
-                className='add'
-                name='Add Text Block'
-                onClick={handleSubmit(addText)}
-              />
+              
+              {
+                data.length > 0 
+                ? <Button
+                    className='add'
+                    name='Edit Text Block'
+                    onClick={handleSubmit(addText)} />
+                : <Button
+                    className='add'
+                    name='Add Video Block'
+                    onClick={handleSubmit(addText)} />
+              }
             </div>
           </div>
         </div>
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 8536eae81..42a95a181 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -54,11 +54,15 @@ const NewsAdd = () => {
 
   const dispatch = useDispatch();
 
+  useEffect(() => {
+    if(title) {
+      setNewsData([{title, category}])
+    }
+  }, [])
+
   useEffect(() => {
     if(id) {
       getSingleNews()
-    } else {
-      setNewsData([{title, category}])
     }
   }, [])
 
@@ -67,11 +71,16 @@ const NewsAdd = () => {
     setNewsSingleData(data)
   }
 
+  console.log(id, title)
+  console.log('news single data' + newsSingleData)
+
   const submitNewsForm = ({ title }) => {
-    const newData = convertArrToObject(newsData)
-    newData.title = title
-    newData.category = category;
-    dispatch(createNews(newsData, newData));
+    // const newData = convertArrToObject(newsData)
+    // newData.title = title
+    // newData.category = category;
+    newsData[0].title = title
+    newsData[0].category = category;
+    dispatch(createNews(newsData, newsCover));
   }
 
   // converting the arrray into object for submission
@@ -96,7 +105,7 @@ const NewsAdd = () => {
     }
   }
 
-console.log(newsData)
+// console.log(newsData)
   async function editTextFunc (id) {
     if(newsSingleData?.texts) {
       let text = newsSingleData.texts.filter(el => el.id === id);
@@ -149,7 +158,7 @@ console.log(newsData)
       {deleteVideoModal && <DeleteContent setDeleteModal={setDeleteVideoModal} confirmDelete={deleteVideoConfirm} />}
       {deleteImageModal && <DeleteContent setDeleteModal={setDeleteImageModal} confirmDelete={deleteImageConfirm} />}
       {deleteTextModal && <DeleteContent setDeleteModal={setDeleteTextModal} confirmDelete={deleteTextConfirm} />}
-      <DashboardLayout title={newsSingleData ? 'Edit News' : 'Add News'}>
+      <DashboardLayout title={newsSingleData.length > 0 ? 'Edit News' : 'Add News'}>
         <BackButton location={`/community-page-news/${currentCommunity.slug}`} />
         <AddNewsContent
           setVideoModal = {setCreateVideoModal}
@@ -170,7 +179,7 @@ console.log(newsData)
         />
 
         {
-          newsSingleData 
+          newsSingleData.length > 0 
           ? <NewsSaveModal onClick={handleSubmit(editNewsForm)}  name="Edit" />
           : <NewsSaveModal onClick={handleSubmit(submitNewsForm)} name="Save" />
         }
@@ -229,6 +238,7 @@ const AddNewsContent = ({
     }
   }, [newsSingleData])
   
+  console.log(newsSingleData);
 
   return  <div className='admin-lesson-create-container'>
       <ErrorText
@@ -248,6 +258,12 @@ const AddNewsContent = ({
         })}
       />
 
+      <DragDrop
+        onChange={(img) => setNewsCover(img)}
+        text='Drag & Drop photo in this area or Click Here to attach'
+        dataImg={newsSingleData?._attachments ? `${process.env.REACT_APP_CDN_BASE_URL}/news/${newsSingleData?._attachments}` : ''}
+      />
+
       {
         newsSingleData && <EditContent 
         data={newsSingleData}
diff --git a/src/screens/communityNewsView/CommunityNewsView.jsx b/src/screens/communityNewsView/CommunityNewsView.jsx
index 6155e5089..aa5c779f7 100644
--- a/src/screens/communityNewsView/CommunityNewsView.jsx
+++ b/src/screens/communityNewsView/CommunityNewsView.jsx
@@ -78,6 +78,10 @@ const NewsSingleView = ({ news }) => {
         </div>
       </div>
 
+      <Image
+          src={`${process.env.REACT_APP_CDN_BASE_URL}/news/${news?._attachments}`}
+        />
+
     {
         news?.photos && news?.photos.map(item => {
           return <Image
diff --git a/src/screens/courseManager/addLesson/Text.scss b/src/screens/courseManager/addLesson/Text.scss
index 172dcf6fb..17813e81e 100644
--- a/src/screens/courseManager/addLesson/Text.scss
+++ b/src/screens/courseManager/addLesson/Text.scss
@@ -3,6 +3,8 @@
   justify-content: space-between;
   margin: 2em 0;
   position: relative;
+  color: var(--primary-white);
+  
   .block {
     width: 93%;
     h1 {

From 5430f84e8500f4be16a2b2fb62978adcb38734f4 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Mon, 9 Aug 2021 10:59:11 +0545
Subject: [PATCH 21/27] video actions

---
 src/actions/videoActions.js | 76 ++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 6 deletions(-)

diff --git a/src/actions/videoActions.js b/src/actions/videoActions.js
index 0ac435e30..f9078c34b 100644
--- a/src/actions/videoActions.js
+++ b/src/actions/videoActions.js
@@ -1,9 +1,16 @@
-import { Axios, ADD_VIDEOS } from '../utils/urlConstants'
+import { Axios, ADD_VIDEOS, GET_VIDEOS } from '../utils/urlConstants'
+import { postApi } from '../utils/apiFunc'
 
 import {
   VIDEO_CREATE_REQUEST,
   VIDEO_CREATE_SUCCESS,
-  VIDEO_CREATE_FAIL
+  VIDEO_CREATE_FAIL,
+  VIDEO_UPDATE_REQUEST,
+  VIDEO_UPDATE_SUCCESS,
+  VIDEO_UPDATE_FAIL,
+  VIDEO_DELETE_REQUEST,
+  VIDEO_DELETE_SUCCESS,
+  VIDEO_DELETE_FAIL
 } from '../constants/videoConstants'
 
 export const createVideo =
@@ -13,8 +20,7 @@ export const createVideo =
     videoDescription,
     videoLink,
     videoResource,
-    lessonId,
-    newsId,
+    lessonId
   ) =>
     async (dispatch) => {
       const videoData = new FormData()
@@ -23,7 +29,7 @@ export const createVideo =
       videoData.append('videoDescription', videoDescription)
       videoData.append('videoLink', videoLink)
       videoData.append('videoResource', videoResource)
-      newsId ? videoData.append('newsId', newsId) : videoData.append('lessonId', lessonId)
+      videoData.append('lessonId', lessonId)
 
       try {
         dispatch({ type: VIDEO_CREATE_REQUEST })
@@ -32,7 +38,7 @@ export const createVideo =
             'Content-Type': 'multipart/form-data'
           }
         }
-        const { data } = await Axios.post(ADD_VIDEOS, videoData, config)
+        const { data } = await postApi(dispatch, ADD_VIDEOS, videoData, config)
         dispatch({ type: VIDEO_CREATE_SUCCESS, payload: data })
       } catch (error) {
         dispatch({
@@ -44,3 +50,61 @@ export const createVideo =
         })
       }
     }
+
+export const updateVideo =
+  (
+    id,
+    videoCover,
+    videoTitle,
+    videoDescription,
+    videoLink,
+    videoResource,
+    setEditVideoModel,
+    refetch
+  ) =>
+    async (dispatch) => {
+      const videoData = new FormData()
+      videoData.append('videoCover', videoCover)
+      videoData.append('videoTitle', videoTitle)
+      videoData.append('videoDescription', videoDescription)
+      videoData.append('videoLink', videoLink)
+      videoData.append('videoResource', videoResource)
+
+      try {
+        dispatch({ type: VIDEO_UPDATE_REQUEST })
+        const config = {
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        }
+        const { data } = await Axios.put(GET_VIDEOS + `/${id}`, videoData, config)
+        dispatch({ type: VIDEO_UPDATE_SUCCESS, payload: data })
+        refetch()
+        setEditVideoModel(false)
+      } catch (error) {
+        dispatch({
+          type: VIDEO_UPDATE_FAIL,
+          payload:
+          error.response && error.response.data.message
+            ? error.response.data.message
+            : error.message
+        })
+      }
+    }
+
+export const deleteVideo = (id, refetch) => async (dispatch) => {
+  try {
+    dispatch({ type: VIDEO_DELETE_REQUEST })
+    const { data } = await Axios.delete(GET_VIDEOS + `/${id}`)
+    dispatch({ type: VIDEO_DELETE_SUCCESS, payload: data })
+    refetch()
+  } catch (error) {
+    dispatch({
+      type: VIDEO_DELETE_FAIL,
+      payload:
+        error.response && error.response.data.message
+          ? error.response.data.message
+          : error.message
+    })
+  }
+}

From d4a2fa3c0ec474bfcb94c665e37faa2e736893d9 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Mon, 9 Aug 2021 11:08:52 +0545
Subject: [PATCH 22/27] photo action and text action added

---
 src/actions/photoActions.js | 78 ++++++++++++++++++++++++++++++++++---
 src/actions/textActions.js  | 74 ++++++++++++++++++++++++++++++-----
 2 files changed, 136 insertions(+), 16 deletions(-)

diff --git a/src/actions/photoActions.js b/src/actions/photoActions.js
index de42ed4be..f99005ca3 100644
--- a/src/actions/photoActions.js
+++ b/src/actions/photoActions.js
@@ -1,19 +1,29 @@
-import { Axios, ADD_LESSON_PHOTO } from '../utils/urlConstants'
+import {
+  Axios,
+  ADD_LESSON_PHOTO,
+  GET_LESSON_PHOTO
+} from '../utils/urlConstants'
+import { postApi } from '../utils/apiFunc'
 
 import {
   LESSSON_PHOTO_CREATE_REQUEST,
   LESSSON_PHOTO_CREATE_SUCCESS,
-  LESSSON_PHOTO_CREATE_FAIL
+  LESSSON_PHOTO_CREATE_FAIL,
+  LESSSON_PHOTO_UPDATE_REQUEST,
+  LESSSON_PHOTO_UPDATE_SUCCESS,
+  LESSSON_PHOTO_UPDATE_FAIL,
+  LESSSON_PHOTO_DELETE_REQUEST,
+  LESSSON_PHOTO_DELETE_SUCCESS,
+  LESSSON_PHOTO_DELETE_FAIL
 } from '../constants/photoConstants'
-import axios from 'axios'
 
 export const createLessonImg =
-  (lessonImg, photoDescription, isImgDesc, lessonId, newsId) => async (dispatch) => {
+  (lessonImg, photoDescription, isImgDesc, lessonId) => async (dispatch) => {
     const lessonImgData = new FormData()
     lessonImgData.append('lessonImg', lessonImg)
     lessonImgData.append('photoDescription', photoDescription)
     lessonImgData.append('isImgDesc', isImgDesc)
-    newsId ? lessonImgData.append('newsId', newsId) : lessonImgData.append('lessonId', lessonId)
+    lessonImgData.append('lessonId', lessonId)
 
     try {
       dispatch({ type: LESSSON_PHOTO_CREATE_REQUEST })
@@ -22,7 +32,12 @@ export const createLessonImg =
           'Content-Type': 'multipart/form-data'
         }
       }
-      const { data } = await Axios.post(ADD_LESSON_PHOTO, lessonImgData, config)
+      const { data } = await postApi(
+        dispatch,
+        ADD_LESSON_PHOTO,
+        lessonImgData,
+        config
+      )
       dispatch({ type: LESSSON_PHOTO_CREATE_SUCCESS, payload: data })
     } catch (error) {
       dispatch({
@@ -34,3 +49,54 @@ export const createLessonImg =
       })
     }
   }
+
+export const updatePhoto =
+  (id, lessonImg, photoDescription, isImgDesc, setEditPhotoModel, refetch) =>
+    async (dispatch) => {
+      const lessonImgData = new FormData()
+      lessonImgData.append('lessonImg', lessonImg)
+      lessonImgData.append('photoDescription', photoDescription)
+      lessonImgData.append('isImgDesc', isImgDesc)
+
+      try {
+        dispatch({ type: LESSSON_PHOTO_UPDATE_REQUEST })
+        const config = {
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        }
+        const { data } = await Axios.put(
+          GET_LESSON_PHOTO + `/${id}`,
+          lessonImgData,
+          config
+        )
+        dispatch({ type: LESSSON_PHOTO_UPDATE_SUCCESS, payload: data })
+        refetch()
+        setEditPhotoModel(false)
+      } catch (error) {
+        dispatch({
+          type: LESSSON_PHOTO_UPDATE_FAIL,
+          payload:
+          error.response && error.response.data.message
+            ? error.response.data.message
+            : error.message
+        })
+      }
+    }
+
+export const deletePhoto = (id, refetch) => async (dispatch) => {
+  try {
+    dispatch({ type: LESSSON_PHOTO_DELETE_REQUEST })
+    const { data } = await Axios.delete(GET_LESSON_PHOTO + `/${id}`)
+    dispatch({ type: LESSSON_PHOTO_DELETE_SUCCESS, payload: data })
+    refetch()
+  } catch (error) {
+    dispatch({
+      type: LESSSON_PHOTO_DELETE_FAIL,
+      payload:
+        error.response && error.response.data.message
+          ? error.response.data.message
+          : error.message
+    })
+  }
+}
diff --git a/src/actions/textActions.js b/src/actions/textActions.js
index f1fd99e3f..548ab498d 100644
--- a/src/actions/textActions.js
+++ b/src/actions/textActions.js
@@ -1,23 +1,29 @@
-import { Axios, ADD_LESSON_TEXT } from '../utils/urlConstants'
+import { Axios, GET_LESSON_TEXT, ADD_LESSON_TEXT } from '../utils/urlConstants'
+import { postApi } from '../utils/apiFunc'
 
 import {
   LESSSON_TEXT_CREATE_REQUEST,
   LESSSON_TEXT_CREATE_SUCCESS,
-  LESSSON_TEXT_CREATE_FAIL
+  LESSSON_TEXT_CREATE_FAIL,
+  LESSSON_TEXT_UPDATE_REQUEST,
+  LESSSON_TEXT_UPDATE_SUCCESS,
+  LESSSON_TEXT_UPDATE_FAIL,
+  LESSSON_TEXT_DELETE_REQUEST,
+  LESSSON_TEXT_DELETE_SUCCESS,
+  LESSSON_TEXT_DELETE_FAIL
 } from '../constants/textConstants'
 
 export const createText =
-  (textHeading, textDescription, lessonId, newsId) => async (dispatch) => {
-    const textData = { textHeading, textDescription, lessonId, newsId }
+  (textHeading, textDescription, lessonId) => async (dispatch) => {
+    const textData = { textHeading, textDescription, lessonId }
 
     try {
       dispatch({ type: LESSSON_TEXT_CREATE_REQUEST })
-      const config = {
-        headers: {
-          'Content-Type': 'application/json'
-        }
-      }
-      const { data } = await Axios.post(ADD_LESSON_TEXT, textData, config)
+      const { data } = await postApi(
+        dispatch,
+        ADD_LESSON_TEXT,
+        textData
+      )
       dispatch({ type: LESSSON_TEXT_CREATE_SUCCESS, payload: data })
     } catch (error) {
       dispatch({
@@ -29,3 +35,51 @@ export const createText =
       })
     }
   }
+
+export const updateText =
+  (textId, textHeading, textDescription, setEditTextModel, refetch) =>
+    async (dispatch) => {
+      const textData = { textHeading, textDescription }
+
+      try {
+        dispatch({ type: LESSSON_TEXT_UPDATE_REQUEST })
+        const config = {
+          headers: {
+            'Content-Type': 'application/json'
+          }
+        }
+        const { data } = await Axios.put(
+          GET_LESSON_TEXT + `/${textId}`,
+          textData,
+          config
+        )
+        dispatch({ type: LESSSON_TEXT_UPDATE_SUCCESS, payload: data })
+        refetch()
+        setEditTextModel(false)
+      } catch (error) {
+        dispatch({
+          type: LESSSON_TEXT_UPDATE_FAIL,
+          payload:
+          error.response && error.response.data.message
+            ? error.response.data.message
+            : error.message
+        })
+      }
+    }
+
+export const deleteText = (id, refetch) => async (dispatch) => {
+  try {
+    dispatch({ type: LESSSON_TEXT_DELETE_REQUEST })
+    const { data } = await Axios.delete(GET_LESSON_TEXT + `/${id}`)
+    dispatch({ type: LESSSON_TEXT_DELETE_SUCCESS, payload: data })
+    refetch()
+  } catch (error) {
+    dispatch({
+      type: LESSSON_TEXT_DELETE_FAIL,
+      payload:
+        error.response && error.response.data.message
+          ? error.response.data.message
+          : error.message
+    })
+  }
+}

From c860b6281fb11636ec8ecb7144136757a551a58c Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Mon, 9 Aug 2021 11:22:59 +0545
Subject: [PATCH 23/27] video actions is generic

---
 api/src/routes/photoRouter.js                 | 2 +-
 api/src/server.js                             | 4 ++--
 src/actions/videoActions.js                   | 7 ++++---
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 7 ++-----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/api/src/routes/photoRouter.js b/api/src/routes/photoRouter.js
index 1f7251346..1e99e981b 100644
--- a/api/src/routes/photoRouter.js
+++ b/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('/add').post(upload.single('img'), resizeImage, addphoto)
 router.route('/:id').get(getPhotoById).delete(deletePhoto).put(updatePhoto)
 
 module.exports = router
diff --git a/api/src/server.js b/api/src/server.js
index 0533ab081..d4aba7d2f 100644
--- a/api/src/server.js
+++ b/api/src/server.js
@@ -55,8 +55,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)
diff --git a/src/actions/videoActions.js b/src/actions/videoActions.js
index f9078c34b..cd1d837c7 100644
--- a/src/actions/videoActions.js
+++ b/src/actions/videoActions.js
@@ -20,7 +20,8 @@ export const createVideo =
     videoDescription,
     videoLink,
     videoResource,
-    lessonId
+    lessonId,
+    newsId
   ) =>
     async (dispatch) => {
       const videoData = new FormData()
@@ -29,7 +30,7 @@ export const createVideo =
       videoData.append('videoDescription', videoDescription)
       videoData.append('videoLink', videoLink)
       videoData.append('videoResource', videoResource)
-      videoData.append('lessonId', lessonId)
+      newsId ? videoData.append('newsId', newsId) : videoData.append('lessonId', lessonId)
 
       try {
         dispatch({ type: VIDEO_CREATE_REQUEST })
@@ -38,7 +39,7 @@ export const createVideo =
             'Content-Type': 'multipart/form-data'
           }
         }
-        const { data } = await postApi(dispatch, ADD_VIDEOS, videoData, config)
+        const { data } = await Axios.post(ADD_VIDEOS, videoData, config)
         dispatch({ type: VIDEO_CREATE_SUCCESS, payload: data })
       } catch (error) {
         dispatch({
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 42a95a181..134497079 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -71,9 +71,6 @@ const NewsAdd = () => {
     setNewsSingleData(data)
   }
 
-  console.log(id, title)
-  console.log('news single data' + newsSingleData)
-
   const submitNewsForm = ({ title }) => {
     // const newData = convertArrToObject(newsData)
     // newData.title = title
@@ -126,7 +123,7 @@ const NewsAdd = () => {
   }
 
   async function deleteImageConfirm () {
-    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/lesson-photos/${imageId}`)
+    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/photos/${imageId}`)
     setDeleteImageModal(false)
   }
 
@@ -146,7 +143,7 @@ const NewsAdd = () => {
   }
 
   async function deleteTextConfirm () {
-    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/lesson-text/${textId}`)
+    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/texts/${textId}`)
     setDeleteTextModal(false)
   }
 

From 956ab9179f1b08b9b8b4f655a02fd73aefc45af0 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Mon, 9 Aug 2021 13:01:47 +0545
Subject: [PATCH 24/27] updated photo of the news

---
 api/src/controllers/photoController.js        | 27 +++++----
 src/actions/lessonActions.js                  |  2 +
 src/actions/newsActions.js                    |  1 +
 src/actions/photoActions.js                   | 32 +++++------
 src/actions/textActions.js                    | 19 ++++---
 .../newsCreateModal/NewsCreateImage.jsx       | 17 +++++-
 .../newsCreateModal/NewsCreateModal.jsx       |  6 +-
 .../newsCreateModal/NewsTextModel.jsx         | 20 ++++++-
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 56 ++++++++++++++++---
 src/utils/urlConstants.js                     | 10 ++--
 10 files changed, 134 insertions(+), 56 deletions(-)

diff --git a/api/src/controllers/photoController.js b/api/src/controllers/photoController.js
index 2e81b0513..1f17cd71e 100644
--- a/api/src/controllers/photoController.js
+++ b/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}});
+  console.log(...req.body);
+  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
   })
 }
diff --git a/src/actions/lessonActions.js b/src/actions/lessonActions.js
index a83620ca9..b159c3445 100644
--- a/src/actions/lessonActions.js
+++ b/src/actions/lessonActions.js
@@ -46,9 +46,11 @@ export const createLesson =
             await addVideo({ data: lessonData[i], lessonId, dispatch })
           }
           if (lessonData[i]?.lessonImg) {
+            console.log('hi')
             await addImage({ data: lessonData[i], lessonId, dispatch })
           }
           if (lessonData[i]?.textHeading || lessonData[i]?.textDescription) {
+            console.log('hello')
             await addText({ data: lessonData[i], lessonId, dispatch })
           }
         }
diff --git a/src/actions/newsActions.js b/src/actions/newsActions.js
index 122805054..3fe800be8 100644
--- a/src/actions/newsActions.js
+++ b/src/actions/newsActions.js
@@ -104,6 +104,7 @@ export const createNews = (newNews, newsCover) => async (dispatch, getState) =>
         }
       
     dispatch({ type: NEWS_CLEAR, payload: data })
+    document.location.href = `/community-page-news/${currentCommunity.slug}`
   } catch (error) {
     const message =
       error.response && error.response.data.message
diff --git a/src/actions/photoActions.js b/src/actions/photoActions.js
index f99005ca3..79b2ccedc 100644
--- a/src/actions/photoActions.js
+++ b/src/actions/photoActions.js
@@ -18,12 +18,12 @@ import {
 } from '../constants/photoConstants'
 
 export const createLessonImg =
-  (lessonImg, photoDescription, isImgDesc, lessonId) => async (dispatch) => {
+  (lessonImg, photoDescription, isImgDesc, lessonId, newsId) => async (dispatch) => {
     const lessonImgData = new FormData()
-    lessonImgData.append('lessonImg', lessonImg)
+    lessonImgData.append('img', lessonImg)
     lessonImgData.append('photoDescription', photoDescription)
     lessonImgData.append('isImgDesc', isImgDesc)
-    lessonImgData.append('lessonId', lessonId)
+    newsId ? lessonImgData.append('newsId', newsId) : lessonImgData.append('lessonId', lessonId)
 
     try {
       dispatch({ type: LESSSON_PHOTO_CREATE_REQUEST })
@@ -32,12 +32,7 @@ export const createLessonImg =
           'Content-Type': 'multipart/form-data'
         }
       }
-      const { data } = await postApi(
-        dispatch,
-        ADD_LESSON_PHOTO,
-        lessonImgData,
-        config
-      )
+      const { data } = await Axios.post(ADD_LESSON_PHOTO, lessonImgData, config)
       dispatch({ type: LESSSON_PHOTO_CREATE_SUCCESS, payload: data })
     } catch (error) {
       dispatch({
@@ -51,12 +46,18 @@ export const createLessonImg =
   }
 
 export const updatePhoto =
-  (id, lessonImg, photoDescription, isImgDesc, setEditPhotoModel, refetch) =>
+  (id, lessonImg, photoDescription, isImgDesc, setEditPhotoModel) =>
     async (dispatch) => {
-      const lessonImgData = new FormData()
-      lessonImgData.append('lessonImg', lessonImg)
-      lessonImgData.append('photoDescription', photoDescription)
-      lessonImgData.append('isImgDesc', isImgDesc)
+      let lessonImgData;
+
+      if(lessonImg) {
+        lessonImgData = new FormData()
+        lessonImgData.append('img', lessonImg)
+        lessonImgData.append('photoDescription', photoDescription)
+        lessonImgData.append('isImgDesc', isImgDesc)
+      }
+
+      lessonImgData = {photoDescription, isImgDesc}
 
       try {
         dispatch({ type: LESSSON_PHOTO_UPDATE_REQUEST })
@@ -71,8 +72,7 @@ export const updatePhoto =
           config
         )
         dispatch({ type: LESSSON_PHOTO_UPDATE_SUCCESS, payload: data })
-        refetch()
-        setEditPhotoModel(false)
+        // setEditPhotoModel(false)
       } catch (error) {
         dispatch({
           type: LESSSON_PHOTO_UPDATE_FAIL,
diff --git a/src/actions/textActions.js b/src/actions/textActions.js
index 548ab498d..c626c9e3a 100644
--- a/src/actions/textActions.js
+++ b/src/actions/textActions.js
@@ -14,16 +14,17 @@ import {
 } from '../constants/textConstants'
 
 export const createText =
-  (textHeading, textDescription, lessonId) => async (dispatch) => {
-    const textData = { textHeading, textDescription, lessonId }
+  (textHeading, textDescription, lessonId, newsId) => async (dispatch) => {
+    const textData = { textHeading, textDescription, lessonId, newsId }
 
     try {
       dispatch({ type: LESSSON_TEXT_CREATE_REQUEST })
-      const { data } = await postApi(
-        dispatch,
-        ADD_LESSON_TEXT,
-        textData
-      )
+      const config = {
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }
+      const { data } = await Axios.post(ADD_LESSON_TEXT, textData, config)
       dispatch({ type: LESSSON_TEXT_CREATE_SUCCESS, payload: data })
     } catch (error) {
       dispatch({
@@ -37,7 +38,7 @@ export const createText =
   }
 
 export const updateText =
-  (textId, textHeading, textDescription, setEditTextModel, refetch) =>
+  (textId, textHeading, textDescription, setEditTextModel) =>
     async (dispatch) => {
       const textData = { textHeading, textDescription }
 
@@ -54,7 +55,7 @@ export const updateText =
           config
         )
         dispatch({ type: LESSSON_TEXT_UPDATE_SUCCESS, payload: data })
-        refetch()
+        // refetch()
         setEditTextModel(false)
       } catch (error) {
         dispatch({
diff --git a/src/components/newsCreateModal/NewsCreateImage.jsx b/src/components/newsCreateModal/NewsCreateImage.jsx
index 195fd91c0..2a0ef79ce 100644
--- a/src/components/newsCreateModal/NewsCreateImage.jsx
+++ b/src/components/newsCreateModal/NewsCreateImage.jsx
@@ -16,7 +16,8 @@ const CreateImage = ({
   setImageActive,
   lessonData,
   setLessonData,
-  data = []
+  data = [],
+  editFunc
 }) => {
   const [isImgDesc, setIsImgDesc] = useState(true)
   const [lessonImg, setLessonImg] = useState(null)
@@ -36,6 +37,18 @@ const CreateImage = ({
     setImageActive(false)
   }
 
+  const editNewsImg = ({ photoDescription }) => {
+    const imgData = [
+      ...lessonData,
+      {
+        lessonImg,
+        photoDescription,
+        isImgDesc
+      }
+    ]
+    editFunc({id: data[0].id, lessonImg, photoDescription, isImgDesc})
+  }
+
   useEffect(() => {
     if(data.length > 0) {
       setIsImgDesc(data[0].isImgDesc)
@@ -82,7 +95,7 @@ const CreateImage = ({
                 ? <Button
                     className='add'
                     name='Edit Photo Block'
-                    onClick={handleSubmit(submitLessonImg)} />
+                    onClick={handleSubmit(editNewsImg)} />
                 : <Button
                     className='add'
                     name='Add Video Block'
diff --git a/src/components/newsCreateModal/NewsCreateModal.jsx b/src/components/newsCreateModal/NewsCreateModal.jsx
index ad1c4e7ac..5d6742161 100644
--- a/src/components/newsCreateModal/NewsCreateModal.jsx
+++ b/src/components/newsCreateModal/NewsCreateModal.jsx
@@ -25,7 +25,9 @@ const NewsCreateModal = ({
   setLessonData,
   imageData = [],
   textData = [],
-  videoData = []
+  videoData = [],
+  editTextConfirm,
+  editImageConfirm
 }) => {
   const [files, setFiles] = useState(null)
   switch (type) {
@@ -72,6 +74,7 @@ const NewsCreateModal = ({
           lessonData={lessonData}
           setLessonData={setLessonData}
           data={imageData || []}
+          editFunc={editImageConfirm}
         />
       )
 
@@ -84,6 +87,7 @@ const NewsCreateModal = ({
           lessonData={lessonData}
           setLessonData={setLessonData}
           data={textData || []}
+          editFunc={editTextConfirm}
         />
       )
 
diff --git a/src/components/newsCreateModal/NewsTextModel.jsx b/src/components/newsCreateModal/NewsTextModel.jsx
index 2a73ba03a..e13f80ef9 100644
--- a/src/components/newsCreateModal/NewsTextModel.jsx
+++ b/src/components/newsCreateModal/NewsTextModel.jsx
@@ -10,7 +10,8 @@ const CreateText = ({
   setTextActive,
   lessonData,
   setLessonData,
-  data
+  data,
+  editFunc
 }) => {
   const { register, errors, handleSubmit } = useForm()
 
@@ -27,6 +28,21 @@ const CreateText = ({
     }
     setTextActive(false)
   }
+
+  const editText = ({textHeading, textDescription}) => {
+    if (textHeading.length !== 0 || textDescription.length !== 0) {
+    editFunc({textHeading, textDescription, id: data[0].id})
+    // const textData = [
+    //     ...lessonData,
+    //     {
+    //       textHeading,
+    //       textDescription,
+    //       id: data[0].id
+    //     }
+    //   ]
+    //   setLessonData(textData)
+    }
+  }
   
   return (
     <>
@@ -78,7 +94,7 @@ const CreateText = ({
                 ? <Button
                     className='add'
                     name='Edit Text Block'
-                    onClick={handleSubmit(addText)} />
+                    onClick={handleSubmit(editText)} />
                 : <Button
                     className='add'
                     name='Add Video Block'
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 134497079..8f094758d 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -21,6 +21,8 @@ import Video from '../../../components/videoPlayer/Video'
 import { GET_VIDEO, LESSON_IMG, VIDEO_COVER } from '../../../utils/urlConstants'
 import EditContent from '../../../components/editContent/EditContent'
 import axios from 'axios'
+import { updateText } from '../../../actions/textActions'
+import { updatePhoto } from '../../../actions/photoActions'
 
 const NewsAdd = () => {
   const { currentCommunity } = useSelector(state => state.activeCommunity)
@@ -58,13 +60,13 @@ const NewsAdd = () => {
     if(title) {
       setNewsData([{title, category}])
     }
-  }, [])
+  }, [dispatch])
 
   useEffect(() => {
     if(id) {
       getSingleNews()
     }
-  }, [])
+  }, [dispatch])
 
   async function getSingleNews () {
     const { data } = await getApi(dispatch, `${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`)
@@ -72,9 +74,6 @@ const NewsAdd = () => {
   }
 
   const submitNewsForm = ({ title }) => {
-    // const newData = convertArrToObject(newsData)
-    // newData.title = title
-    // newData.category = category;
     newsData[0].title = title
     newsData[0].category = category;
     dispatch(createNews(newsData, newsCover));
@@ -102,7 +101,12 @@ const NewsAdd = () => {
     }
   }
 
-// console.log(newsData)
+  function editImageConfirm (data) {
+    console.log(data);
+    const {id, isImgDesc, lessonImg, photoDescription} = data;
+    dispatch(updatePhoto(id, lessonImg, photoDescription, isImgDesc, setCreateImageModal ))
+  }
+
   async function editTextFunc (id) {
     if(newsSingleData?.texts) {
       let text = newsSingleData.texts.filter(el => el.id === id);
@@ -110,6 +114,11 @@ const NewsAdd = () => {
     }
   }
 
+  function editTextConfirm (data) {
+    const {id, textHeading, textDescription} = data;
+    dispatch(updateText(id, textHeading, textDescription, setCreateTextModal))
+  }
+
   async function editVideoFunc (id) {
     if(newsSingleData?.videos) {
       let video = newsSingleData.videos.filter(el => el.id === id);
@@ -149,9 +158,38 @@ const NewsAdd = () => {
 
   return (
     <>
-      {createVideoModal && <NewsCreateModal type='video' videoActive={videoActive} setVideoActive={setVideoActive} lessonData={newsData} setLessonData={setNewsData} videoData={videoData} />}
-      {createImageModal && <NewsCreateModal type='image' imageActive={imageActive} setImageActive={setImageActive} lessonData={newsData} setLessonData={setNewsData} imageData={imageData} />}
-      {createTextModal && <NewsCreateModal type='text' textActive={textActive} setTextActive={setTextActive} lessonData={newsData} setLessonData={setNewsData} textData={textData} />}
+      {
+        createVideoModal && <NewsCreateModal 
+          type='video' 
+          videoActive={videoActive} 
+          setVideoActive={setVideoActive} 
+          lessonData={newsData} 
+          setLessonData={setNewsData} 
+          videoData={videoData} 
+          />
+      }
+      {
+        createImageModal && <NewsCreateModal 
+          type='image' 
+          imageActive={imageActive} 
+          setImageActive={setImageActive} 
+          lessonData={newsData} 
+          setLessonData={setNewsData} 
+          imageData={imageData}
+          editImageConfirm={editImageConfirm}
+          />
+      }
+      {
+        createTextModal && <NewsCreateModal 
+          type='text' 
+          textActive={textActive} 
+          setTextActive={setTextActive} 
+          lessonData={newsData} 
+          setLessonData={setNewsData} 
+          textData={textData}
+          editTextConfirm={editTextConfirm}
+      />
+      }
       {deleteVideoModal && <DeleteContent setDeleteModal={setDeleteVideoModal} confirmDelete={deleteVideoConfirm} />}
       {deleteImageModal && <DeleteContent setDeleteModal={setDeleteImageModal} confirmDelete={deleteImageConfirm} />}
       {deleteTextModal && <DeleteContent setDeleteModal={setDeleteTextModal} confirmDelete={deleteTextConfirm} />}
diff --git a/src/utils/urlConstants.js b/src/utils/urlConstants.js
index db9b04fc2..56a2ea8c2 100644
--- a/src/utils/urlConstants.js
+++ b/src/utils/urlConstants.js
@@ -23,12 +23,12 @@ export const GET_VIDEOS = BASE_URL + 'videos'
 export const ADD_VIDEOS = BASE_URL + 'videos/add'
 
 // lesson photos
-export const GET_LESSON_PHOTO = BASE_URL + 'lesson-photos'
-export const ADD_LESSON_PHOTO = BASE_URL + 'lesson-photos/add'
+export const GET_LESSON_PHOTO = BASE_URL + 'photos'
+export const ADD_LESSON_PHOTO = BASE_URL + 'photos/add'
 
 // lesson Text
-export const GET_LESSON_TEXT = BASE_URL + 'lesson-text'
-export const ADD_LESSON_TEXT = BASE_URL + 'lesson-text/add'
+export const GET_LESSON_TEXT = BASE_URL + 'texts'
+export const ADD_LESSON_TEXT = BASE_URL + 'texts/add'
 
 // lesson material
 export const GET_MATERIAL = BASE_URL + 'materials'
@@ -43,5 +43,5 @@ export const GET_THUMBNAIL = CDN_URL + '/thumbnail/'
 export const GET_COVERIMG = CDN_URL + '/coverImg/'
 export const GET_VIDEO = CDN_URL + '/videoResource/'
 export const VIDEO_COVER = CDN_URL + '/videoCover/'
-export const LESSON_IMG = CDN_URL + '/lessonImg/'
+export const LESSON_IMG = CDN_URL + '/img/'
 export const MATERIAL = CDN_URL + '/material/'

From 0bf047c5151e0dac7b3b0fe9fe776009177d897b Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Mon, 9 Aug 2021 14:25:34 +0545
Subject: [PATCH 25/27] photo edit controller configured

---
 api/src/controllers/photoController.js | 2 +-
 api/src/routes/photoRouter.js          | 2 +-
 src/actions/photoActions.js            | 9 ++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/api/src/controllers/photoController.js b/api/src/controllers/photoController.js
index 1f17cd71e..a942b94aa 100644
--- a/api/src/controllers/photoController.js
+++ b/api/src/controllers/photoController.js
@@ -58,12 +58,12 @@ const updatePhoto = async (req, res) => {
   let lessonImg = ''
 
   const singlePhoto = await db.Photo.findOne({where: {id: req.params.id}});
-  console.log(...req.body);
   if (req.file) {
     lessonImg = req.file.filename
   } else {
     lessonImg = singlePhoto.dataValues.lessonImg
   }
+  
   const photo = await db.Photo.update({ ...req.body, lessonImg }, {where: {id: req.params.id}})
   res.status(201).json({
     status: true,
diff --git a/api/src/routes/photoRouter.js b/api/src/routes/photoRouter.js
index 1e99e981b..dd4461dc8 100644
--- a/api/src/routes/photoRouter.js
+++ b/api/src/routes/photoRouter.js
@@ -13,6 +13,6 @@ const {
 
 router.route('/').get(getPhotos)
 router.route('/add').post(upload.single('img'), resizeImage, addphoto)
-router.route('/:id').get(getPhotoById).delete(deletePhoto).put(updatePhoto)
+router.route('/:id').get(getPhotoById).delete(deletePhoto).put(upload.single('img'), resizeImage, updatePhoto)
 
 module.exports = router
diff --git a/src/actions/photoActions.js b/src/actions/photoActions.js
index 79b2ccedc..f6afbafd8 100644
--- a/src/actions/photoActions.js
+++ b/src/actions/photoActions.js
@@ -48,16 +48,11 @@ export const createLessonImg =
 export const updatePhoto =
   (id, lessonImg, photoDescription, isImgDesc, setEditPhotoModel) =>
     async (dispatch) => {
-      let lessonImgData;
+      const lessonImgData = new FormData()
 
-      if(lessonImg) {
-        lessonImgData = new FormData()
         lessonImgData.append('img', lessonImg)
         lessonImgData.append('photoDescription', photoDescription)
         lessonImgData.append('isImgDesc', isImgDesc)
-      }
-
-      lessonImgData = {photoDescription, isImgDesc}
 
       try {
         dispatch({ type: LESSSON_PHOTO_UPDATE_REQUEST })
@@ -72,7 +67,7 @@ export const updatePhoto =
           config
         )
         dispatch({ type: LESSSON_PHOTO_UPDATE_SUCCESS, payload: data })
-        // setEditPhotoModel(false)
+        setEditPhotoModel(false)
       } catch (error) {
         dispatch({
           type: LESSSON_PHOTO_UPDATE_FAIL,

From 6170eac984106422662a2f80c331274085980c1a Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Mon, 9 Aug 2021 17:37:13 +0545
Subject: [PATCH 26/27] photo, video and text refresh on delete and update

---
 api/src/controllers/videoController.js        | 21 ++++-
 api/src/helpers/filehelpers.js                | 67 +++++++--------
 api/src/routes/videoRouter.js                 | 15 +++-
 src/actions/newsActions.js                    | 28 ++++++-
 src/actions/photoActions.js                   | 36 ++++-----
 src/actions/textActions.js                    | 36 ++++-----
 src/actions/videoActions.js                   |  2 -
 src/components/lessonImage/Image.scss         |  1 +
 .../newsCreateModal/NewsCreateImage.jsx       |  1 +
 .../newsCreateModal/NewsCreateModal.jsx       |  4 +-
 .../newsCreateModal/NewsCreateVideo.jsx       | 21 ++++-
 src/constants/photoConstants.js               | 26 +++---
 src/constants/textConstants.js                | 26 +++---
 src/reducers/photoReducer.js                  | 48 +++++++++--
 src/reducers/textReducer.js                   | 48 +++++++++--
 src/reducers/videoReducers.js                 | 34 +++++++-
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 81 +++++++++++--------
 src/store.js                                  | 12 ++-
 18 files changed, 348 insertions(+), 159 deletions(-)

diff --git a/api/src/controllers/videoController.js b/api/src/controllers/videoController.js
index 4f6451789..175d17c62 100644
--- a/api/src/controllers/videoController.js
+++ b/api/src/controllers/videoController.js
@@ -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
   })
 }
 
diff --git a/api/src/helpers/filehelpers.js b/api/src/helpers/filehelpers.js
index 5d055a3e8..840e5d586 100644
--- a/api/src/helpers/filehelpers.js
+++ b/api/src/helpers/filehelpers.js
@@ -52,39 +52,42 @@ const resizeImage = (req, res, next) => {
   const { format, height, width } = { format: 'webp', ...req.body }
   try {
     // user might not send image sometimes
-    if (!req.file) 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
-        })
-        return res.end(data)
-      })
-    } else {
-      const savePath = dir + '.' + format
-      newImage = newImage.toFile(savePath)
-      return next(null, true)
+    if (!req.file) {
+      next()
     }
+      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)
+          })
+        } else {
+          const savePath = dir + '.' + format
+          newImage = newImage.toFile(savePath)
+          return next(null, true)
+        }
+      }
   } catch (error) {
     console.error(error)
   }
diff --git a/api/src/routes/videoRouter.js b/api/src/routes/videoRouter.js
index e4eff0837..7bca6b4f7 100644
--- a/api/src/routes/videoRouter.js
+++ b/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
diff --git a/src/actions/newsActions.js b/src/actions/newsActions.js
index 3fe800be8..dd3240ef9 100644
--- a/src/actions/newsActions.js
+++ b/src/actions/newsActions.js
@@ -156,19 +156,41 @@ export const savevideoDetail = (data) => (dispatch) => {
   })
 }
 
-export const newsUpdate = (newNews) => async (dispatch) => {
+export const newsUpdate = (news, newNews) => async (dispatch) => {
+  const formData = new FormData()
+  formData.append('title', news.title)
+  formData.append('category', news.category)
+  formData.append('news', news.newsCover)
   try {
     dispatch({ type: NEWS_UPDATE_REQUEST })
-    const { id, title, description, category, file } = newNews
+    const { id } = news
     const config = configFunc()
     const data = await axios.put(
       `${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`,
-      { title, description, file, category }, config
+      formData, config
     )
+    
     dispatch({
       type: NEWS_UPDATE_SUCCESS,
       payload: data
     })
+
+    //adding new content
+        for (let i = 0; i < newNews.length; i++) {
+          if (newNews[i]?.videoLink || newNews[i]?.videoResource) {
+            await addVideo({ data: newNews[i], lessonId: null, newsId: id, dispatch })
+          }
+          if (newNews[i]?.lessonImg) {
+            await addImage({ data: newNews[i], lessonId: null, newsId: id, dispatch })
+          }
+          if (newNews[i]?.textHeading || newNews[i]?.textDescription) {
+            await addText({ data: newNews[i], lessonId: null, newsId: id, dispatch })
+          }
+        }
+
+     dispatch({ type: NEWS_CLEAR, payload: data })
+    document.location.href = `/community-page-news/${currentCommunity.slug}`
+
   } catch (error) {
     const message = error.response && error.response.data.message
       ? error.response.data.message
diff --git a/src/actions/photoActions.js b/src/actions/photoActions.js
index f6afbafd8..51fb2873c 100644
--- a/src/actions/photoActions.js
+++ b/src/actions/photoActions.js
@@ -6,15 +6,15 @@ import {
 import { postApi } from '../utils/apiFunc'
 
 import {
-  LESSSON_PHOTO_CREATE_REQUEST,
-  LESSSON_PHOTO_CREATE_SUCCESS,
-  LESSSON_PHOTO_CREATE_FAIL,
-  LESSSON_PHOTO_UPDATE_REQUEST,
-  LESSSON_PHOTO_UPDATE_SUCCESS,
-  LESSSON_PHOTO_UPDATE_FAIL,
-  LESSSON_PHOTO_DELETE_REQUEST,
-  LESSSON_PHOTO_DELETE_SUCCESS,
-  LESSSON_PHOTO_DELETE_FAIL
+  PHOTO_CREATE_REQUEST,
+  PHOTO_CREATE_SUCCESS,
+  PHOTO_CREATE_FAIL,
+  PHOTO_UPDATE_REQUEST,
+  PHOTO_UPDATE_SUCCESS,
+  PHOTO_UPDATE_FAIL,
+  PHOTO_DELETE_REQUEST,
+  PHOTO_DELETE_SUCCESS,
+  PHOTO_DELETE_FAIL
 } from '../constants/photoConstants'
 
 export const createLessonImg =
@@ -26,17 +26,17 @@ export const createLessonImg =
     newsId ? lessonImgData.append('newsId', newsId) : lessonImgData.append('lessonId', lessonId)
 
     try {
-      dispatch({ type: LESSSON_PHOTO_CREATE_REQUEST })
+      dispatch({ type: PHOTO_CREATE_REQUEST })
       const config = {
         headers: {
           'Content-Type': 'multipart/form-data'
         }
       }
       const { data } = await Axios.post(ADD_LESSON_PHOTO, lessonImgData, config)
-      dispatch({ type: LESSSON_PHOTO_CREATE_SUCCESS, payload: data })
+      dispatch({ type: PHOTO_CREATE_SUCCESS, payload: data })
     } catch (error) {
       dispatch({
-        type: LESSSON_PHOTO_CREATE_FAIL,
+        type: PHOTO_CREATE_FAIL,
         payload:
           error.response && error.response.data.message
             ? error.response.data.message
@@ -55,7 +55,7 @@ export const updatePhoto =
         lessonImgData.append('isImgDesc', isImgDesc)
 
       try {
-        dispatch({ type: LESSSON_PHOTO_UPDATE_REQUEST })
+        dispatch({ type: PHOTO_UPDATE_REQUEST })
         const config = {
           headers: {
             'Content-Type': 'multipart/form-data'
@@ -66,11 +66,11 @@ export const updatePhoto =
           lessonImgData,
           config
         )
-        dispatch({ type: LESSSON_PHOTO_UPDATE_SUCCESS, payload: data })
+        dispatch({ type: PHOTO_UPDATE_SUCCESS, payload: data })
         setEditPhotoModel(false)
       } catch (error) {
         dispatch({
-          type: LESSSON_PHOTO_UPDATE_FAIL,
+          type: PHOTO_UPDATE_FAIL,
           payload:
           error.response && error.response.data.message
             ? error.response.data.message
@@ -81,13 +81,13 @@ export const updatePhoto =
 
 export const deletePhoto = (id, refetch) => async (dispatch) => {
   try {
-    dispatch({ type: LESSSON_PHOTO_DELETE_REQUEST })
+    dispatch({ type: PHOTO_DELETE_REQUEST })
     const { data } = await Axios.delete(GET_LESSON_PHOTO + `/${id}`)
-    dispatch({ type: LESSSON_PHOTO_DELETE_SUCCESS, payload: data })
+    dispatch({ type: PHOTO_DELETE_SUCCESS, payload: data })
     refetch()
   } catch (error) {
     dispatch({
-      type: LESSSON_PHOTO_DELETE_FAIL,
+      type: PHOTO_DELETE_FAIL,
       payload:
         error.response && error.response.data.message
           ? error.response.data.message
diff --git a/src/actions/textActions.js b/src/actions/textActions.js
index c626c9e3a..83dea395b 100644
--- a/src/actions/textActions.js
+++ b/src/actions/textActions.js
@@ -2,15 +2,15 @@ import { Axios, GET_LESSON_TEXT, ADD_LESSON_TEXT } from '../utils/urlConstants'
 import { postApi } from '../utils/apiFunc'
 
 import {
-  LESSSON_TEXT_CREATE_REQUEST,
-  LESSSON_TEXT_CREATE_SUCCESS,
-  LESSSON_TEXT_CREATE_FAIL,
-  LESSSON_TEXT_UPDATE_REQUEST,
-  LESSSON_TEXT_UPDATE_SUCCESS,
-  LESSSON_TEXT_UPDATE_FAIL,
-  LESSSON_TEXT_DELETE_REQUEST,
-  LESSSON_TEXT_DELETE_SUCCESS,
-  LESSSON_TEXT_DELETE_FAIL
+  TEXT_CREATE_REQUEST,
+  TEXT_CREATE_SUCCESS,
+  TEXT_CREATE_FAIL,
+  TEXT_UPDATE_REQUEST,
+  TEXT_UPDATE_SUCCESS,
+  TEXT_UPDATE_FAIL,
+  TEXT_DELETE_REQUEST,
+  TEXT_DELETE_SUCCESS,
+  TEXT_DELETE_FAIL
 } from '../constants/textConstants'
 
 export const createText =
@@ -18,17 +18,17 @@ export const createText =
     const textData = { textHeading, textDescription, lessonId, newsId }
 
     try {
-      dispatch({ type: LESSSON_TEXT_CREATE_REQUEST })
+      dispatch({ type: TEXT_CREATE_REQUEST })
       const config = {
         headers: {
           'Content-Type': 'application/json'
         }
       }
       const { data } = await Axios.post(ADD_LESSON_TEXT, textData, config)
-      dispatch({ type: LESSSON_TEXT_CREATE_SUCCESS, payload: data })
+      dispatch({ type: TEXT_CREATE_SUCCESS, payload: data })
     } catch (error) {
       dispatch({
-        type: LESSSON_TEXT_CREATE_FAIL,
+        type: TEXT_CREATE_FAIL,
         payload:
           error.response && error.response.data.message
             ? error.response.data.message
@@ -43,7 +43,7 @@ export const updateText =
       const textData = { textHeading, textDescription }
 
       try {
-        dispatch({ type: LESSSON_TEXT_UPDATE_REQUEST })
+        dispatch({ type: TEXT_UPDATE_REQUEST })
         const config = {
           headers: {
             'Content-Type': 'application/json'
@@ -54,12 +54,12 @@ export const updateText =
           textData,
           config
         )
-        dispatch({ type: LESSSON_TEXT_UPDATE_SUCCESS, payload: data })
+        dispatch({ type: TEXT_UPDATE_SUCCESS, payload: data })
         // refetch()
         setEditTextModel(false)
       } catch (error) {
         dispatch({
-          type: LESSSON_TEXT_UPDATE_FAIL,
+          type: TEXT_UPDATE_FAIL,
           payload:
           error.response && error.response.data.message
             ? error.response.data.message
@@ -70,13 +70,13 @@ export const updateText =
 
 export const deleteText = (id, refetch) => async (dispatch) => {
   try {
-    dispatch({ type: LESSSON_TEXT_DELETE_REQUEST })
+    dispatch({ type: TEXT_DELETE_REQUEST })
     const { data } = await Axios.delete(GET_LESSON_TEXT + `/${id}`)
-    dispatch({ type: LESSSON_TEXT_DELETE_SUCCESS, payload: data })
+    dispatch({ type: TEXT_DELETE_SUCCESS, payload: data })
     refetch()
   } catch (error) {
     dispatch({
-      type: LESSSON_TEXT_DELETE_FAIL,
+      type: TEXT_DELETE_FAIL,
       payload:
         error.response && error.response.data.message
           ? error.response.data.message
diff --git a/src/actions/videoActions.js b/src/actions/videoActions.js
index cd1d837c7..7b1b9cbee 100644
--- a/src/actions/videoActions.js
+++ b/src/actions/videoActions.js
@@ -1,5 +1,4 @@
 import { Axios, ADD_VIDEOS, GET_VIDEOS } from '../utils/urlConstants'
-import { postApi } from '../utils/apiFunc'
 
 import {
   VIDEO_CREATE_REQUEST,
@@ -80,7 +79,6 @@ export const updateVideo =
         }
         const { data } = await Axios.put(GET_VIDEOS + `/${id}`, videoData, config)
         dispatch({ type: VIDEO_UPDATE_SUCCESS, payload: data })
-        refetch()
         setEditVideoModel(false)
       } catch (error) {
         dispatch({
diff --git a/src/components/lessonImage/Image.scss b/src/components/lessonImage/Image.scss
index 5a6b92275..1131c5094 100644
--- a/src/components/lessonImage/Image.scss
+++ b/src/components/lessonImage/Image.scss
@@ -21,5 +21,6 @@
     top: 1%;
     right: 1%;
     background: var(--background-color-image);
+    border-radius: 4px;
   }
 }
diff --git a/src/components/newsCreateModal/NewsCreateImage.jsx b/src/components/newsCreateModal/NewsCreateImage.jsx
index 2a0ef79ce..94672d0f8 100644
--- a/src/components/newsCreateModal/NewsCreateImage.jsx
+++ b/src/components/newsCreateModal/NewsCreateImage.jsx
@@ -68,6 +68,7 @@ const CreateImage = ({
                 onChange={(img) => setLessonImg(img)}
                 text='Drag & Drop photo in this area or Click Here to attach'
                 dataImg={data.length > 0 && `${LESSON_IMG}${data[0].lessonImg}`}
+                onClick={() => setLessonImg(null)}
               />
               <div className='description'>
                 <label>Add photo description ?</label>{' '}
diff --git a/src/components/newsCreateModal/NewsCreateModal.jsx b/src/components/newsCreateModal/NewsCreateModal.jsx
index 5d6742161..b0a04d25d 100644
--- a/src/components/newsCreateModal/NewsCreateModal.jsx
+++ b/src/components/newsCreateModal/NewsCreateModal.jsx
@@ -27,7 +27,8 @@ const NewsCreateModal = ({
   textData = [],
   videoData = [],
   editTextConfirm,
-  editImageConfirm
+  editImageConfirm,
+  editVideoConfirm
 }) => {
   const [files, setFiles] = useState(null)
   switch (type) {
@@ -42,6 +43,7 @@ const NewsCreateModal = ({
           lessonData={lessonData}
           setLessonData={setLessonData}
           data={videoData || []}
+          editFunc={editVideoConfirm}
         />
       )
 
diff --git a/src/components/newsCreateModal/NewsCreateVideo.jsx b/src/components/newsCreateModal/NewsCreateVideo.jsx
index 52cd478c0..e0b2adfed 100644
--- a/src/components/newsCreateModal/NewsCreateVideo.jsx
+++ b/src/components/newsCreateModal/NewsCreateVideo.jsx
@@ -16,7 +16,8 @@ const CreateVideo = ({
   setVideoActive,
   lessonData,
   setLessonData,
-  data = []
+  data = [],
+  editFunc
 }) => {
   const { register, errors, handleSubmit } = useForm()
   const [videoCover, setVideoCover] = useState(null)
@@ -39,6 +40,21 @@ const CreateVideo = ({
     setVideoActive(false)
   }
 
+    const editVideo = ({ videoTitle, videoDescription, videoLink }) => {
+    const videoResource = video
+    const vData = [
+      ...lessonData,
+      {
+        videoCover,
+        videoTitle,
+        videoDescription,
+        videoLink,
+        videoResource
+      }
+    ]
+    editFunc({id: data[0].id, videoTitle, videoDescription, videoLink, videoResource, videoCover : videoCover || 'videoCover'})
+  }
+
   return (
     <>
       {videoActive && (
@@ -56,6 +72,7 @@ const CreateVideo = ({
                 text='Drag & Drop photo in this area or Click Here to attach Video Cover'
                 dataImg={data.length > 0 && `${VIDEO_COVER}${data[0]?.videoCover}`}
                 onChange={(img) => setVideoCover(img)}
+                onClick={() => setVideoCover(null)}
               />
               <div className='video-input-container'>
                 <InputFields
@@ -127,7 +144,7 @@ const CreateVideo = ({
                 ? <Button
                     className='add'
                     name='Edit Video Block'
-                    onClick={handleSubmit(addVideo)} />
+                    onClick={handleSubmit(editVideo)} />
                 : <Button
                     className='add'
                     name='Add Video Block'
diff --git a/src/constants/photoConstants.js b/src/constants/photoConstants.js
index 13457b512..a283782f5 100644
--- a/src/constants/photoConstants.js
+++ b/src/constants/photoConstants.js
@@ -1,16 +1,16 @@
-export const LESSSON_PHOTO_LIST_REQUEST = 'LESSSON_PHOTO_LIST_REQUEST'
-export const LESSSON_PHOTO_LIST_SUCCESS = 'LESSSON_PHOTO_LIST_SUCCESS'
-export const LESSSON_PHOTO_LIST_FAIL = 'LESSSON_PHOTO_LIST_FAIL'
+export const PHOTO_LIST_REQUEST = 'PHOTO_LIST_REQUEST'
+export const PHOTO_LIST_SUCCESS = 'PHOTO_LIST_SUCCESS'
+export const PHOTO_LIST_FAIL = 'PHOTO_LIST_FAIL'
 
-export const LESSSON_PHOTO_CREATE_REQUEST = 'LESSSON_PHOTO_CREATE_REQUEST'
-export const LESSSON_PHOTO_CREATE_SUCCESS = 'LESSSON_PHOTO_CREATE_SUCCESS'
-export const LESSSON_PHOTO_CREATE_FAIL = 'LESSSON_PHOTO_CREATE_FAIL'
-export const LESSSON_PHOTO_CREATE_RESET = 'LESSSON_PHOTO_CREATE_RESET'
+export const PHOTO_CREATE_REQUEST = 'PHOTO_CREATE_REQUEST'
+export const PHOTO_CREATE_SUCCESS = 'PHOTO_CREATE_SUCCESS'
+export const PHOTO_CREATE_FAIL = 'PHOTO_CREATE_FAIL'
+export const PHOTO_CREATE_RESET = 'PHOTO_CREATE_RESET'
 
-export const LESSSON_PHOTO_UPDATE_REQUEST = 'LESSSON_PHOTO_UPDATE_REQUEST'
-export const LESSSON_PHOTO_UPDATE_SUCCESS = 'LESSSON_PHOTO_UPDATE_SUCCESS'
-export const LESSSON_PHOTO_UPDATE_FAIL = 'LESSSON_PHOTO_UPDATE_FAIL'
+export const PHOTO_UPDATE_REQUEST = 'PHOTO_UPDATE_REQUEST'
+export const PHOTO_UPDATE_SUCCESS = 'PHOTO_UPDATE_SUCCESS'
+export const PHOTO_UPDATE_FAIL = 'PHOTO_UPDATE_FAIL'
 
-export const LESSSON_PHOTO_DELETE_REQUEST = 'LESSSON_PHOTO_DELETE_REQUEST'
-export const LESSSON_PHOTO_DELETE_SUCCESS = 'LESSSON_PHOTO_DELETE_SUCCESS'
-export const LESSSON_PHOTO_DELETE_FAIL = 'LESSSON_PHOTO_DELETE_FAIL'
+export const PHOTO_DELETE_REQUEST = 'PHOTO_DELETE_REQUEST'
+export const PHOTO_DELETE_SUCCESS = 'PHOTO_DELETE_SUCCESS'
+export const PHOTO_DELETE_FAIL = 'PHOTO_DELETE_FAIL'
diff --git a/src/constants/textConstants.js b/src/constants/textConstants.js
index b55965562..7899693e4 100644
--- a/src/constants/textConstants.js
+++ b/src/constants/textConstants.js
@@ -1,16 +1,16 @@
-export const LESSSON_TEXT_LIST_REQUEST = 'LESSSON_TEXT_LIST_REQUEST'
-export const LESSSON_TEXT_LIST_SUCCESS = 'LESSSON_TEXT_LIST_SUCCESS'
-export const LESSSON_TEXT_LIST_FAIL = 'LESSSON_TEXT_LIST_FAIL'
+export const LESSSON_TEXT_LIST_REQUEST = 'TEXT_LIST_REQUEST'
+export const TEXT_LIST_SUCCESS = 'TEXT_LIST_SUCCESS'
+export const TEXT_LIST_FAIL = 'TEXT_LIST_FAIL'
 
-export const LESSSON_TEXT_CREATE_REQUEST = 'LESSSON_TEXT_CREATE_REQUEST'
-export const LESSSON_TEXT_CREATE_SUCCESS = 'LESSSON_TEXT_CREATE_SUCCESS'
-export const LESSSON_TEXT_CREATE_FAIL = 'LESSSON_TEXT_CREATE_FAIL'
-export const LESSSON_TEXT_CREATE_RESET = 'LESSSON_TEXT_CREATE_RESET'
+export const TEXT_CREATE_REQUEST = 'TEXT_CREATE_REQUEST'
+export const TEXT_CREATE_SUCCESS = 'TEXT_CREATE_SUCCESS'
+export const TEXT_CREATE_FAIL = 'TEXT_CREATE_FAIL'
+export const TEXT_CREATE_RESET = 'TEXT_CREATE_RESET'
 
-export const LESSSON_TEXT_UPDATE_REQUEST = 'LESSSON_TEXT_UPDATE_REQUEST'
-export const LESSSON_TEXT_UPDATE_SUCCESS = 'LESSSON_TEXT_UPDATE_SUCCESS'
-export const LESSSON_TEXT_UPDATE_FAIL = 'LESSSON_TEXT_UPDATE_FAIL'
+export const TEXT_UPDATE_REQUEST = 'TEXT_UPDATE_REQUEST'
+export const TEXT_UPDATE_SUCCESS = 'TEXT_UPDATE_SUCCESS'
+export const TEXT_UPDATE_FAIL = 'TEXT_UPDATE_FAIL'
 
-export const LESSSON_TEXT_DELETE_REQUEST = 'LESSSON_TEXT_DELETE_REQUEST'
-export const LESSSON_TEXT_DELETE_SUCCESS = 'LESSSON_TEXT_DELETE_SUCCESS'
-export const LESSSON_TEXT_DELETE_FAIL = 'LESSSON_TEXT_DELETE_FAIL'
+export const TEXT_DELETE_REQUEST = 'TEXT_DELETE_REQUEST'
+export const TEXT_DELETE_SUCCESS = 'TEXT_DELETE_SUCCESS'
+export const TEXT_DELETE_FAIL = 'TEXT_DELETE_FAIL'
diff --git a/src/reducers/photoReducer.js b/src/reducers/photoReducer.js
index 92adc8b84..d237621ea 100644
--- a/src/reducers/photoReducer.js
+++ b/src/reducers/photoReducer.js
@@ -1,21 +1,53 @@
 import {
-  LESSSON_PHOTO_CREATE_REQUEST,
-  LESSSON_PHOTO_CREATE_SUCCESS,
-  LESSSON_PHOTO_CREATE_FAIL,
-  LESSSON_PHOTO_CREATE_RESET
+  PHOTO_CREATE_REQUEST,
+  PHOTO_CREATE_SUCCESS,
+  PHOTO_CREATE_FAIL,
+  PHOTO_CREATE_RESET,
+  PHOTO_UPDATE_REQUEST,
+  PHOTO_UPDATE_SUCCESS,
+  PHOTO_UPDATE_FAIL,
+  PHOTO_DELETE_REQUEST,
+  PHOTO_DELETE_SUCCESS,
+  PHOTO_DELETE_FAIL
 } from '../constants/photoConstants'
 
 export const photoCreateReducer = (state = {}, action) => {
   switch (action.type) {
-    case LESSSON_PHOTO_CREATE_REQUEST:
+    case PHOTO_CREATE_REQUEST:
       return { loading: true }
-    case LESSSON_PHOTO_CREATE_SUCCESS:
+    case PHOTO_CREATE_SUCCESS:
       return { loading: false, success: true, course: action.payload }
-    case LESSSON_PHOTO_CREATE_FAIL:
+    case PHOTO_CREATE_FAIL:
       return { loading: false, error: action.payload }
-    case LESSSON_PHOTO_CREATE_RESET:
+    case PHOTO_CREATE_RESET:
       return {}
     default:
       return state
   }
 }
+
+export const photoUpdateReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case PHOTO_UPDATE_REQUEST:
+      return { loading: true }
+    case PHOTO_UPDATE_SUCCESS:
+      return { loading: false, success: true}
+    case PHOTO_UPDATE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
+
+export const photoDeleteReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case PHOTO_DELETE_REQUEST:
+      return { loading: true }
+    case PHOTO_DELETE_SUCCESS:
+      return { loading: false, success: true}
+    case PHOTO_DELETE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
diff --git a/src/reducers/textReducer.js b/src/reducers/textReducer.js
index a25bb0157..46f1469e9 100644
--- a/src/reducers/textReducer.js
+++ b/src/reducers/textReducer.js
@@ -1,21 +1,53 @@
 import {
-  LESSSON_TEXT_CREATE_REQUEST,
-  LESSSON_TEXT_CREATE_SUCCESS,
-  LESSSON_TEXT_CREATE_FAIL,
-  LESSSON_TEXT_CREATE_RESET
+  TEXT_CREATE_REQUEST,
+  TEXT_CREATE_SUCCESS,
+  TEXT_CREATE_FAIL,
+  TEXT_CREATE_RESET,
+  TEXT_UPDATE_REQUEST,
+  TEXT_UPDATE_SUCCESS,
+  TEXT_UPDATE_FAIL,
+  TEXT_DELETE_REQUEST,
+  TEXT_DELETE_SUCCESS,
+  TEXT_DELETE_FAIL
 } from '../constants/textConstants'
 
 export const textCreateReducer = (state = {}, action) => {
   switch (action.type) {
-    case LESSSON_TEXT_CREATE_REQUEST:
+    case TEXT_CREATE_REQUEST:
       return { loading: true }
-    case LESSSON_TEXT_CREATE_SUCCESS:
+    case TEXT_CREATE_SUCCESS:
       return { loading: false, success: true, course: action.payload }
-    case LESSSON_TEXT_CREATE_FAIL:
+    case TEXT_CREATE_FAIL:
       return { loading: false, error: action.payload }
-    case LESSSON_TEXT_CREATE_RESET:
+    case TEXT_CREATE_RESET:
       return {}
     default:
       return state
   }
 }
+
+export const textUpdateReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case TEXT_UPDATE_REQUEST:
+      return { loading: true }
+    case TEXT_UPDATE_SUCCESS:
+      return { loading: false, success: true}
+    case TEXT_UPDATE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
+
+export const textDeleteReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case TEXT_DELETE_REQUEST:
+      return { loading: true }
+    case TEXT_DELETE_SUCCESS:
+      return { loading: false, success: true}
+    case TEXT_DELETE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
diff --git a/src/reducers/videoReducers.js b/src/reducers/videoReducers.js
index 1ea212d58..453be70d5 100644
--- a/src/reducers/videoReducers.js
+++ b/src/reducers/videoReducers.js
@@ -2,7 +2,13 @@ import {
   VIDEO_CREATE_REQUEST,
   VIDEO_CREATE_SUCCESS,
   VIDEO_CREATE_FAIL,
-  VIDEO_CREATE_RESET
+  VIDEO_CREATE_RESET,
+  VIDEO_UPDATE_REQUEST,
+  VIDEO_UPDATE_SUCCESS,
+  VIDEO_UPDATE_FAIL,
+  VIDEO_DELETE_REQUEST,
+  VIDEO_DELETE_SUCCESS,
+  VIDEO_DELETE_FAIL
 } from '../constants/videoConstants'
 
 export const videoCreateReducer = (state = {}, action) => {
@@ -19,3 +25,29 @@ export const videoCreateReducer = (state = {}, action) => {
       return state
   }
 }
+
+export const videoUpdateReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case VIDEO_UPDATE_REQUEST:
+      return { loading: true }
+    case VIDEO_UPDATE_SUCCESS:
+      return { loading: false, success: true}
+    case VIDEO_UPDATE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
+
+export const videoDeleteReducer = (state = {success: false}, action) => {
+  switch (action.type) {
+    case VIDEO_DELETE_REQUEST:
+      return { loading: true }
+    case VIDEO_DELETE_SUCCESS:
+      return { loading: false, success: true}
+    case VIDEO_DELETE_FAIL:
+      return { loading: false, error: action.payload }
+    default:
+      return state
+  }
+}
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 8f094758d..0eaaf60b0 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -1,4 +1,4 @@
-import { useLayoutEffect, useState } from 'react'
+import { useState } from 'react'
 import NewsCreateModal from '../../../components/newsCreateModal/NewsCreateModal'
 import DashboardLayout from '../../../layout/dashboardLayout/DashboardLayout'
 import { useParams, useHistory } from 'react-router-dom'
@@ -6,7 +6,7 @@ import './NewsAdd.scss'
 import BackButton from '../../../components/backButton/BackButton'
 import CommunityNewsViewPage from '../../communityNewsView/CommunityNewsView'
 import { useDispatch, useSelector } from 'react-redux'
-import { createNews } from '../../../actions/newsActions'
+import { createNews, newsUpdate } from '../../../actions/newsActions'
 import AddContent from '../../courseManager/addLesson/AddContent'
 import { useForm } from 'react-hook-form'
 import { useEffect } from 'react'
@@ -21,11 +21,20 @@ import Video from '../../../components/videoPlayer/Video'
 import { GET_VIDEO, LESSON_IMG, VIDEO_COVER } from '../../../utils/urlConstants'
 import EditContent from '../../../components/editContent/EditContent'
 import axios from 'axios'
-import { updateText } from '../../../actions/textActions'
-import { updatePhoto } from '../../../actions/photoActions'
+import { deleteText, updateText } from '../../../actions/textActions'
+import { deletePhoto, updatePhoto } from '../../../actions/photoActions'
+import { deleteVideo, updateVideo } from '../../../actions/videoActions'
 
 const NewsAdd = () => {
   const { currentCommunity } = useSelector(state => state.activeCommunity)
+  const {success:updateVideoSuccess} = useSelector(state => state.updateVideo)
+  const {success:deleteVideoSuccess} = useSelector(state => state.deleteVideo)
+
+  const {success:updateTextSuccess} = useSelector(state => state.updateText)
+  const {success:deleteTextSuccess} = useSelector(state => state.deleteText)
+
+  const {success:updatePhotoSuccess} = useSelector(state => state.updatePhoto)
+  const {success:deletePhotoSuccess} = useSelector(state => state.deletePhoto)
   // fetching category from route
   const {state} = useLocation();
 
@@ -54,19 +63,33 @@ const NewsAdd = () => {
 
   const { title, id} = useParams()
 
+  const {pathname} = useLocation();
+
   const dispatch = useDispatch();
 
+  // for edit
   useEffect(() => {
-    if(title) {
-      setNewsData([{title, category}])
+    if(pathname.split('/')[2] === 'edit') {
+      getSingleNews()
     }
-  }, [dispatch])
-
+  }, [
+    dispatch, 
+    newsData, 
+    updateVideoSuccess, 
+    deleteVideoSuccess, 
+    updateTextSuccess, 
+    deleteTextSuccess,
+    updatePhotoSuccess, 
+    deletePhotoSuccess
+  ])
+
+  // for creating
   useEffect(() => {
-    if(id) {
-      getSingleNews()
+    if(pathname.split('/')[2] !== 'edit') {
+      setNewsData([{title, category}])
     }
-  }, [dispatch])
+  }, [])
+
 
   async function getSingleNews () {
     const { data } = await getApi(dispatch, `${process.env.REACT_APP_API_BASE_URL}/api/news/${id}/community/${currentCommunity.id}`)
@@ -79,19 +102,8 @@ const NewsAdd = () => {
     dispatch(createNews(newsData, newsCover));
   }
 
-  // converting the arrray into object for submission
-  function convertArrToObject (arr) {
-    let newData = {};
-    arr.map(item => {
-      let prop = Object.getOwnPropertyNames(item);
-      prop.forEach(el => newData[el] = item[el])
-    })
-
-    return newData;
-  }
-
-  const editNewsForm = () => {
-    console.log(newsCover)
+  const editNewsForm = ({title}) => {
+    dispatch(newsUpdate({id: newsSingleData.id, title, category: newsSingleData.category, newsCover}, newsData))
   }
 
   async function editImageFunc (id) {
@@ -102,7 +114,6 @@ const NewsAdd = () => {
   }
 
   function editImageConfirm (data) {
-    console.log(data);
     const {id, isImgDesc, lessonImg, photoDescription} = data;
     dispatch(updatePhoto(id, lessonImg, photoDescription, isImgDesc, setCreateImageModal ))
   }
@@ -126,13 +137,18 @@ const NewsAdd = () => {
     }
   }
 
+   function editVideoConfirm (data) {
+    const {id, videoCover, videoTitle, videoDescription, videoLink, videoResource} = data;
+    dispatch(updateVideo(id,  videoCover, videoTitle, videoDescription, videoLink, videoResource, setCreateVideoModal))
+  }
+
   function deleteImageModalFunc (id) {
     setDeleteImageModal(true)
     setImageId(id)
   }
 
   async function deleteImageConfirm () {
-    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/photos/${imageId}`)
+    dispatch(deletePhoto(imageId))
     setDeleteImageModal(false)
   }
 
@@ -142,7 +158,7 @@ const NewsAdd = () => {
   }
 
   async function deleteVideoConfirm () {
-    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/videos/${videoId}`)
+    dispatch(deleteVideo(videoId))
     setDeleteVideoModal(false)
   }
 
@@ -152,7 +168,7 @@ const NewsAdd = () => {
   }
 
   async function deleteTextConfirm () {
-    await axios.delete(`${process.env.REACT_APP_API_BASE_URL}/api/texts/${textId}`)
+    dispatch(deleteText(textId))
     setDeleteTextModal(false)
   }
 
@@ -165,7 +181,8 @@ const NewsAdd = () => {
           setVideoActive={setVideoActive} 
           lessonData={newsData} 
           setLessonData={setNewsData} 
-          videoData={videoData} 
+          videoData={videoData}
+          editVideoConfirm={editVideoConfirm}
           />
       }
       {
@@ -193,7 +210,7 @@ const NewsAdd = () => {
       {deleteVideoModal && <DeleteContent setDeleteModal={setDeleteVideoModal} confirmDelete={deleteVideoConfirm} />}
       {deleteImageModal && <DeleteContent setDeleteModal={setDeleteImageModal} confirmDelete={deleteImageConfirm} />}
       {deleteTextModal && <DeleteContent setDeleteModal={setDeleteTextModal} confirmDelete={deleteTextConfirm} />}
-      <DashboardLayout title={newsSingleData.length > 0 ? 'Edit News' : 'Add News'}>
+      <DashboardLayout title={pathname.split('/')[2] === 'edit' ? 'Edit News' : 'Add News'}>
         <BackButton location={`/community-page-news/${currentCommunity.slug}`} />
         <AddNewsContent
           setVideoModal = {setCreateVideoModal}
@@ -214,7 +231,7 @@ const NewsAdd = () => {
         />
 
         {
-          newsSingleData.length > 0 
+          pathname.split('/')[2] === 'edit'
           ? <NewsSaveModal onClick={handleSubmit(editNewsForm)}  name="Edit" />
           : <NewsSaveModal onClick={handleSubmit(submitNewsForm)} name="Save" />
         }
@@ -273,7 +290,6 @@ const AddNewsContent = ({
     }
   }, [newsSingleData])
   
-  console.log(newsSingleData);
 
   return  <div className='admin-lesson-create-container'>
       <ErrorText
@@ -297,6 +313,7 @@ const AddNewsContent = ({
         onChange={(img) => setNewsCover(img)}
         text='Drag & Drop photo in this area or Click Here to attach'
         dataImg={newsSingleData?._attachments ? `${process.env.REACT_APP_CDN_BASE_URL}/news/${newsSingleData?._attachments}` : ''}
+        onClick={() => setNewsCover(null)}
       />
 
       {
diff --git a/src/store.js b/src/store.js
index 0dd0ca1c6..c3cd77add 100644
--- a/src/store.js
+++ b/src/store.js
@@ -13,9 +13,9 @@ import {
   lessonCreateReducer,
   lessonUpdateReducer
 } from './reducers/lessonReducers'
-import { videoCreateReducer } from './reducers/videoReducers'
-import { photoCreateReducer } from './reducers/photoReducer'
-import { textCreateReducer } from './reducers/textReducer'
+import { videoCreateReducer, videoDeleteReducer, videoUpdateReducer } from './reducers/videoReducers'
+import { photoCreateReducer, photoDeleteReducer, photoUpdateReducer } from './reducers/photoReducer'
+import { textCreateReducer, textDeleteReducer, textUpdateReducer } from './reducers/textReducer'
 import { materialCreateReducer } from './reducers/materiallReducer'
 import { testCreateReducer, testQuestionEditReducer, testQuestionListReducer } from './reducers/testReducers'
 
@@ -93,8 +93,14 @@ const reducer = combineReducers({
   addLesson: lessonCreateReducer,
   updateLesson: lessonUpdateReducer,
   addVideo: videoCreateReducer,
+  updateVideo: videoUpdateReducer,
+  deleteVideo: videoDeleteReducer,
   addPhoto: photoCreateReducer,
+  updatePhoto: photoUpdateReducer,
+  deletePhoto: photoDeleteReducer,
   addText: textCreateReducer,
+  updateText: textUpdateReducer,
+  deleteText: textDeleteReducer,
   addMaterial: materialCreateReducer,
   addTest: testCreateReducer,
   listTestQuestions: testQuestionListReducer,

From 309b35350d5156186385f1228a19e86fbaa70c76 Mon Sep 17 00:00:00 2001
From: Sujal Lama <lsujal41@gmail.com>
Date: Mon, 9 Aug 2021 17:58:48 +0545
Subject: [PATCH 27/27] add modal error fix

---
 src/components/contentAdd/ContentAdd.jsx      |   2 +-
 .../newsCreateModal/NewsCreateImage.jsx       |   2 +-
 .../newsCreateModal/NewsTextModel.jsx         |  11 +-
 src/components/videoPlayer/Video.scss         |   1 +
 src/screens/communityNews/newsAdd/NewsAdd.jsx | 141 ++----------------
 5 files changed, 14 insertions(+), 143 deletions(-)

diff --git a/src/components/contentAdd/ContentAdd.jsx b/src/components/contentAdd/ContentAdd.jsx
index 8f07a31dd..7d4f0813f 100644
--- a/src/components/contentAdd/ContentAdd.jsx
+++ b/src/components/contentAdd/ContentAdd.jsx
@@ -3,7 +3,7 @@ import Text from '../../screens/courseManager/addLesson/Text'
 import Image from '../lessonImage/Image'
 import Video from '../videoPlayer/Video'
 
-const ContentAdd = ({data, setVideoModal, setImageModal, setTextModal}) => {
+const ContentAdd = ({data, setVideoModal, setImageModal, setTextModal, textModal}) => {
   return (
     <>
       {
diff --git a/src/components/newsCreateModal/NewsCreateImage.jsx b/src/components/newsCreateModal/NewsCreateImage.jsx
index 94672d0f8..0d8becb5f 100644
--- a/src/components/newsCreateModal/NewsCreateImage.jsx
+++ b/src/components/newsCreateModal/NewsCreateImage.jsx
@@ -99,7 +99,7 @@ const CreateImage = ({
                     onClick={handleSubmit(editNewsImg)} />
                 : <Button
                     className='add'
-                    name='Add Video Block'
+                    name='Add Photo Block'
                     onClick={handleSubmit(submitLessonImg)} />
               }
             </div>
diff --git a/src/components/newsCreateModal/NewsTextModel.jsx b/src/components/newsCreateModal/NewsTextModel.jsx
index e13f80ef9..9062fa812 100644
--- a/src/components/newsCreateModal/NewsTextModel.jsx
+++ b/src/components/newsCreateModal/NewsTextModel.jsx
@@ -32,15 +32,6 @@ const CreateText = ({
   const editText = ({textHeading, textDescription}) => {
     if (textHeading.length !== 0 || textDescription.length !== 0) {
     editFunc({textHeading, textDescription, id: data[0].id})
-    // const textData = [
-    //     ...lessonData,
-    //     {
-    //       textHeading,
-    //       textDescription,
-    //       id: data[0].id
-    //     }
-    //   ]
-    //   setLessonData(textData)
     }
   }
   
@@ -97,7 +88,7 @@ const CreateText = ({
                     onClick={handleSubmit(editText)} />
                 : <Button
                     className='add'
-                    name='Add Video Block'
+                    name='Add Text Block'
                     onClick={handleSubmit(addText)} />
               }
             </div>
diff --git a/src/components/videoPlayer/Video.scss b/src/components/videoPlayer/Video.scss
index aa4fd8676..bc5eb3192 100644
--- a/src/components/videoPlayer/Video.scss
+++ b/src/components/videoPlayer/Video.scss
@@ -18,6 +18,7 @@
     justify-content: flex-start;
     align-items: flex-start;
     z-index: 1;
+    color: var(--primary-white);
 
     @media (max-width: 778px) {
       width: 80%;
diff --git a/src/screens/communityNews/newsAdd/NewsAdd.jsx b/src/screens/communityNews/newsAdd/NewsAdd.jsx
index 0eaaf60b0..5f3da4afe 100644
--- a/src/screens/communityNews/newsAdd/NewsAdd.jsx
+++ b/src/screens/communityNews/newsAdd/NewsAdd.jsx
@@ -47,9 +47,9 @@ const NewsAdd = () => {
   const [videoId, setVideoId] = useState(null)
   const [imageId, setImageId] = useState(null)
   const [textId, setTextId] = useState(null)
-  const [videoActive, setVideoActive] = useState(true)
-  const [imageActive, setImageActive] = useState(true)
-  const [textActive, setTextActive] = useState(true)
+  // const [videoActive, setVideoActive] = useState(true)
+  // const [imageActive, setImageActive] = useState(true)
+  // const [textActive, setTextActive] = useState(true)
   const [newsData, setNewsData] = useState([])
   const [newsSingleData, setNewsSingleData] = useState([])
   const [category, setCategory] = useState(state?.category || null)
@@ -177,8 +177,8 @@ const NewsAdd = () => {
       {
         createVideoModal && <NewsCreateModal 
           type='video' 
-          videoActive={videoActive} 
-          setVideoActive={setVideoActive} 
+          videoActive={createVideoModal} 
+          setVideoActive={setCreateVideoModal} 
           lessonData={newsData} 
           setLessonData={setNewsData} 
           videoData={videoData}
@@ -188,8 +188,8 @@ const NewsAdd = () => {
       {
         createImageModal && <NewsCreateModal 
           type='image' 
-          imageActive={imageActive} 
-          setImageActive={setImageActive} 
+          imageActive={createImageModal} 
+          setImageActive={setCreateImageModal} 
           lessonData={newsData} 
           setLessonData={setNewsData} 
           imageData={imageData}
@@ -199,8 +199,8 @@ const NewsAdd = () => {
       {
         createTextModal && <NewsCreateModal 
           type='text' 
-          textActive={textActive} 
-          setTextActive={setTextActive} 
+          textActive={createTextModal} 
+          setTextActive={setCreateTextModal} 
           lessonData={newsData} 
           setLessonData={setNewsData} 
           textData={textData}
@@ -279,7 +279,6 @@ const AddNewsContent = ({
   useEffect(() => {
     if(newsData.length > 0) {
       setTitle(newsData[0].title)
-      console.log(newsData[0].title)
     }
   }, [newsData])
 
@@ -331,7 +330,7 @@ const AddNewsContent = ({
         />
       }
 
-      <ContentAdd data={newsData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal}/>
+      <ContentAdd data={newsData}  setVideoModal={setVideoModal} setImageModal={setImageModal} setTextModal={setTextModal} />
     </div>
 }
 
@@ -360,124 +359,4 @@ const NewsSaveModal = ({ pathId, onClick, name}) => {
   )
 }
 
-// function NewsAddMainContainer ({
-//   setCreateVideoModal,
-//   setCreateImageModal,
-//   setCreateTextModal,
-//   setVideoActive,
-//   setImageActive,
-//   setTextActive,
-//   news,
-//   title,
-//   category
-
-// }) {
-//   function createVideo () {
-//     setCreateVideoModal(true)
-//     setCreateImageModal(false)
-//     setCreateTextModal(false)
-//     setVideoActive(true)
-//   }
-
-//   function createImage () {
-//     setCreateVideoModal(false)
-//     setCreateImageModal(true)
-//     setCreateTextModal(false)
-//     setImageActive(true)
-//   }
-
-//   function createText () {
-//     setCreateVideoModal(false)
-//     setCreateImageModal(false)
-//     setCreateTextModal(true)
-//     setTextActive(true)
-//   }
-
-//   return (
-//     <div className='news-add-main-container'>
-//       <NewsAddContainer
-//         title={title}
-//         news={news}
-//         createVideo={createVideo}
-//         createImage={createImage}
-//         createText={createText}
-//       />
-//       <div>{Object.entries(news).length !== 0 && <PopUp news={news} title={title} category={category} />}</div>
-//     </div>
-//   )
-// }
-
-// function NewsAddContainer ({ createVideo, createImage, createText, title, news }) {
-//   return (
-//     <div className='news-add-container'>
-//       <NewContent title={title} news={news} />
-//       <div className='news-add-inner-container'>
-//         <button onClick={() => createVideo()} className='add-btn'>
-//           <img src='/img/video-outline.svg' alt='Add video' /> <span>Add video</span>
-//         </button>
-//         <button onClick={() => createImage()} className='add-btn'>
-//           <img src='/img/camera-outline.svg' alt='Add new img' /> <span>Add image</span>
-//         </button>
-//         <button onClick={() => createText()} className='add-btn'>
-//           <img src='/img/file-text-outline.svg' alt='Add text' />
-//           <span>Add text</span>
-//         </button>
-//       </div>
-//     </div>
-//   )
-// }
-
-// function NewContent ({ title, news }) {
-//   return (
-//     <>
-//       <div className='new-title-container'>
-//         <h2>{title}</h2>
-//         {news && <CommunityNewsViewPage newNews={news} />}
-//       </div>
-//     </>
-//   )
-// }
-
-// function PopUp ({ news, title, category }) {
-//   const { file } = news.imageDetail ? news.imageDetail.file && news.imageDetail : {}
-//   const newNews = { ...news, title, category, file }
-//   const [activePopup, setActivePopup] = useState(true)
-//   const { currentCommunity } = useSelector(state => state.activeCommunity)
-//   const dispatch = useDispatch()
-//   const history = useHistory()
-//   const handleOnSaveClick = (e) => {
-//     if (file) {
-//       dispatch(createNews(newNews))
-//       setActivePopup(false)
-//       history.push(`/community-page-news/${currentCommunity.slug}`)
-//     } else {
-//       dispatch(createNews(newNews))
-//       setActivePopup(false)
-//       history.push(`/community-page-news/${currentCommunity.slug}`)
-//     }
-//   }
-
-//   const handleOnCancelClick = (e) => {
-//     setActivePopup(false)
-//     history.push(`/community-page-news/${currentCommunity.slug}`)
-//   }
-//   return (
-//     <>
-//       {activePopup && (
-//         <div className='popup-box'>
-//           <h4>Do you want to save?</h4>
-//           <div className='popup-btn-wrapper'>
-//             <button onClick={handleOnCancelClick} className='secondary-btn popup-btn'>
-//               Cancel
-//             </button>
-//             <button onClick={handleOnSaveClick} className='default-btn popup-btn'>
-//               Save
-//             </button>
-//           </div>
-//         </div>
-//       )}
-//     </>
-//   )
-// }
-
 export default NewsAdd