Fixing proposal functionality issues (#553)

Author: AuraOfDivinity

src/actions/eventAction.js

@@ -47,7 +47,7 @@ export const createEvent = (eventInfo, history) => async (dispatch) => {
 }
 
 // GET ALL EVENTS 
-export const getAllEvents = (pagination = 10, page = 1) => async (dispatch) => {
+export const getAllEvents = (pagination = 6, page = 1) => async (dispatch) => {
   try {
     const res = await axios.get(`${BASE_URL}/event/all?pagination=${pagination}&page=${page}`)
     dispatch(setRequestStatus(false))

src/actions/notificationAction.js

@@ -52,7 +52,7 @@ export const getProposalNotifications = () => async (dispatch) => {
     dispatch(setRequestStatus(false));
     if (res.status === 200) {
       dispatch(setRequestStatus(true));
-      console.log("Proposal notification ", res.data.notifications);
+      console.log("Proposal notification ", res.data?.notifications);
       dispatch({
         type: GET_PROPOSAL_NOTIFICATIONS,
         payload: res.data.notifications,

src/actions/projectAction.js

@@ -20,7 +20,7 @@ export const createProject = (projectInfo) => async (dispatch) => {
 }
 
 // GET ALL PROJECTS 
-export const getAllProjects = (pagination = 10, page = 1) => async (dispatch) => {
+export const getAllProjects = (pagination = 6, page = 1) => async (dispatch) => {
   try {
     const res = await axios.get(`${BASE_URL}/project/?pagination=${pagination}&page=${page}`)
     dispatch(setRequestStatus(false))

src/actions/usersAction.js

@@ -170,7 +170,7 @@ export const getPostsCreatedByUser = (pagination = 10, page = 1) => async (dispa
 // GET INVITE LINK 
 export const getInviteLink = (role) => async (dispatch) => {
   try {
-    const res = await axios.get(`${BASE_URL}/user/invite?role=${role}`)
+    const res = await axios.get(`${BASE_URL}/user/link/invite?role=${role}`)
     dispatch(setRequestStatus(false));
     if(res.status === 200) {
       dispatch(setRequestStatus(true));

src/user/events/events.js

@@ -10,6 +10,7 @@ import { connect } from 'react-redux'
 import { getAllEvents } from '../../actions/eventAction'
 import { checkDeleteRights } from '../dashboard/utils/checkDeleteRights'
 import { getOrgProfile } from '../../actions/orgAction'
+import { Pagination } from 'antd'
 import Moment from 'react-moment'
 import { canEditCheck } from '../projects/Utils/CanEdit'
 
@@ -32,7 +33,7 @@ class Events extends Component {
 
   componentDidMount() {
     setTimeout(() => {
-      this.props.getAllEvents()
+      this.props.getAllEvents() // by default 6 events per page
       this.props.getOrgProfile()
     })
   }
@@ -50,6 +51,16 @@ class Events extends Component {
     })
   }
 
+  onShowSizeChange = (currentPage, pageSize) => {
+    console.log('currentPage pageSize ', currentPage, pageSize)
+    this.props.getAllEvents(pageSize, currentPage)
+  }
+
+  handlePagination = (pageNumber) => {
+    console.log('page number ', pageNumber);
+    this.props.getAllEvents(6, pageNumber)
+  }
+
 
   render() {
     const { allEvents, editingLimit } = this.state
@@ -266,6 +277,15 @@ class Events extends Component {
               {Events}
             </Grid>
           </div>
+          <div className="event__pagination__container">
+            <Pagination
+              showSizeChanger
+              onShowSizeChange={this.onShowSizeChange}
+              defaultCurrent={1}
+              total={100}
+              onChange={this.handlePagination}
+            />
+          </div>
         </div>
         <Popups
           option={this.state.option}

src/user/events/events.scss

@@ -4,7 +4,7 @@
   height: auto;
   font-family: Muli, sans-serif;
   .events {
-      margin-top: 2vh;
+      margin-top: 1vh;
       .container {
         .event_header {
           font-family: Inter;
@@ -22,6 +22,13 @@
           height: 42vh;
         }
       }
+      .event__pagination__container {
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+        padding-top: 29px;
+      }
   }
 } 
 

src/user/projects/projects.js

@@ -6,6 +6,7 @@ import { Button } from "react-bootstrap";
 import { connect } from 'react-redux'
 import { createProject, getAllProjects } from '../../actions/projectAction'
 import projectImage from '../../images/project.png'
+import { Pagination } from 'antd'
 import { withRouter } from "react-router-dom";
 
 class Projects extends Component {
@@ -19,7 +20,7 @@ class Projects extends Component {
   }
   componentDidMount() {
     setTimeout(() => {
-      this.props.getAllProjects();
+      this.props.getAllProjects(); // by default 6 projects per page
     })
   }
 
@@ -31,6 +32,16 @@ class Projects extends Component {
     })
   }
 
+  onShowSizeChange = (currentPage, pageSize) => {
+    console.log('currentPage pageSize ', currentPage, pageSize)
+    this.props.getAllProjects(pageSize, currentPage)
+  }
+
+  handlePagination = (pageNumber) => {
+    console.log('page number ', pageNumber);
+    this.props.getAllProjects(6, pageNumber)
+  }
+
   render() {
     const { allProjects } = this.state
     const useStyles = makeStyles((theme) => ({
@@ -94,6 +105,15 @@ class Projects extends Component {
               {Projects}
             </Grid>
           </div>
+          <div className="project__pagination__container">
+            <Pagination
+              showSizeChanger
+              onShowSizeChange={this.onShowSizeChange}
+              defaultCurrent={1}
+              total={100}
+              onChange={this.handlePagination}
+            />
+          </div>
         </div>
       </div>
     );

src/user/projects/projects.scss

@@ -8,7 +8,7 @@
     }
 
     .projects {
-        margin-top: 5vh;
+        margin-top: 1vh;
         margin-left: 4vw;
         margin-right: 6vw;
         p {
@@ -70,5 +70,13 @@
         -webkit-box-orient: vertical;
       }
 
+      .project__pagination__container {
+        display: flex;
+        padding-top: 20px;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+      }
+
     }
   }  

src/user/proposals/ProposalEditor/EditorContent/DropZone.js

@@ -36,29 +36,23 @@ function StyledDropzone(props) {
   const [proposalId, setProposalId] = useState(props.idContent);
 
   const onDrop = useCallback((acceptedFiles) => {
-    if (proposalId === "new") {
-      toast.error(
-        "Please save the proposal as a draft before attaching images"
-      );
-    } else {
-      let formData = new FormData();
-      formData.append("file", acceptedFiles[0]);
-      const URL = `http://localhost:5000/proposal/attach/${props.idContent}`;
+    let formData = new FormData();
+    formData.append("file", acceptedFiles[0]);
+    const URL = `http://localhost:5000/proposal/attach/${props.idContent}`;
 
-      fetch(URL, {
-        method: "POST",
-        body: formData,
-        headers: {
-          Authorization: localStorage.getItem("jwtToken"),
-        },
+    fetch(URL, {
+      method: "POST",
+      body: formData,
+      headers: {
+        Authorization: localStorage.getItem("jwtToken"),
+      },
+    })
+      .then((res) => {
+        toast.success("Image successfully attached to proposal!");
       })
-        .then((res) => {
-          toast.success("Image successfully attached to proposal!");
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    }
+      .catch((err) => {
+        console.log(err);
+      });
   }, []);
 
   const {

src/user/proposals/ProposalEditor/EditorContent/EditorContent.js

@@ -50,7 +50,7 @@ class EditorContent extends Component {
         proposalStatus: fetchedProposal.proposalStatus,
       });
     }
-    if (Object.keys(createProposal).length !== 0) {
+    if (Object.keys(createdProposal).length !== 0) {
       this.setState(
         {
           isSaving: false,