Merge pull request #658 from lazycipher/bugs-fix

Force merge

Author: vaibhavdaren

src/App.js

@@ -4,15 +4,17 @@ import "./App.css";
 import { Provider } from "react-redux";
 import store from "./store";
 import jwt_decode from "jwt-decode";
-import { setAuthToken } from "./utils/setAuthToken";
+import { allowCredentialsInHeader } from "./utils/allowCredentialsInHeader";
 import { setCurrentUser, logoutUser } from "./actions/authAction";
 import "./css/main.scss";
 import ReactGA from "react-ga";
 
+allowCredentialsInHeader()
+
 function App() {
   useEffect(() => {
     ReactGA.initialize("UA-173245995-1");
-    setAuthToken()
+    
   });
   return (
     <Provider store={store}>

src/actions/adminAction.js

@@ -2,7 +2,6 @@ import axios from 'axios'
 import { errorHandler } from '../utils/errorHandler'
 import { setRequestStatus } from '../utils/setRequestStatus'
 import { SET_ADMIN, GET_ADMIN } from './types'
-import { setAuthToken } from '../utils/setAuthToken'
 import jwt_decode from 'jwt-decode';
 import { setCurrentUser } from './authAction'
 import { BASE_URL } from './baseApi'
@@ -27,31 +26,27 @@ export const createAdmin = (adminInfo) => async (dispatch) => {
 export const loginAdmin = (adminInfo, history) => async (dispatch) => {
   try {
     const res = await axios.post(`${BASE_URL}/auth/login/`, adminInfo)
-   dispatch(setRequestStatus(false));
-   if (res.status === 200) {
+    dispatch(setRequestStatus(false));
+    if (res.status === 200) {
+      dispatch(setRequestStatus(true));
 
-     const token = res.data.token;
-     dispatch(setRequestStatus(true));
+      // update state with user
+      localStorage.setItem('userId', res.data.user)
+      dispatch(setCurrentUser(res.data.user._id));
 
-     localStorage.setItem("jwtToken", (token));
-     setAuthToken(token);
+      // update localStorage with admin status 
+      localStorage.setItem('username', `${res.data.user.name.firstName} ${res.data.user.name.lastName}`)
+      localStorage.setItem('admin', res.data.user.isAdmin)
+      localStorage.setItem('ticketModerator', res.data.user.isTicketsModerator)
+      localStorage.setItem('orgId', res.data.user.orgId);
 
-     // update state with user
-     const decodedData = await jwt_decode(token);
-     localStorage.setItem('userId', decodedData._id)
-     dispatch(setCurrentUser(decodedData));
-
-     // update localStorage with admin status 
-     localStorage.setItem('admin', true)
-
-     dispatch({
-       type: SET_ADMIN,
-       payload: true
-     })
-     
-     history.push("/dashboard");
+      dispatch({
+        type: SET_ADMIN,
+        payload: res.data.user.isAdmin
+      })
+    history.push("/dashboard");
    }
   } catch (error) {
     dispatch(errorHandler(error))
   }
-}
+}

src/actions/authAction.js

@@ -1,6 +1,5 @@
 import { SET_CURRENT_USER, GET_USER_PROFILE, PASSWORD_SUCCESSFULLY_CHANGED, PASSWORD_CHANGE_REQUEST_SUCCESS, SET_ADMIN } from './types';
 import axios from 'axios';
-import { setAuthToken } from '../utils/setAuthToken';
 import { errorHandler } from '../utils/errorHandler';
 import { setRequestStatus } from '../utils/setRequestStatus';
 import { BASE_URL } from './baseApi';
@@ -146,8 +145,6 @@ export const logoutUser = () => async (dispatch) => {
       const orgId = localStorage.getItem('orgId');
       localStorage.clear()
       localStorage.setItem('orgId', orgId)
-      // delete authorization from the header 
-      setAuthToken(false);
       // set user to {}
       setCurrentUser({});
       // move to home 

src/css/components/_modals.scss

@@ -35,12 +35,10 @@
         padding-top: 5px;
       }
       .search_btn {
-        width: 6vw;
-        height: 5vh;
         background: rgb(250, 251, 252);
         border-radius: 100px;
         color: #1a73e8;
-        padding: 0.3em;
+        padding: 0 1rem;
         margin-left: 1em;
       }
       .edit__post__option {

src/user/dashboard/Community/components/Toggle/ToggleSwitch.js

@@ -21,6 +21,7 @@ function ToggleSwitch(props) {
 
   let handleClose = () => {
     console.log('close clicked!')
+    setCheck(!checked)
     setModalShow(false)
   }
 
@@ -99,4 +100,4 @@ const mapStateToProps = (state) => ({
   error: state.error
 })
 
-export default connect(mapStateToProps)(withRouter(ToggleSwitch));
+export default connect(mapStateToProps)(withRouter(ToggleSwitch));

src/user/dashboard/news-feed/popups/AddEventModal.js

@@ -103,7 +103,7 @@ const AddEventModal = (props) => {
             >
               <Form.Label className="modal__label">Date</Form.Label>
               <Form.Control 
-                type="text" 
+                type="date" 
                 placeholder="YYYY/MM/DD"
                 onChange={onEventDate}
               />
@@ -116,7 +116,7 @@ const AddEventModal = (props) => {
             >
               <Form.Label className="modal__label">Time</Form.Label>
               <Form.Control 
-                type="text"
+                type="time"
                 placeholder="10:00 AM"
                 onChange={onEventTime}
               />

src/user/organization/popups/Admins.js

@@ -56,7 +56,7 @@ class Admins extends Component {
 
    mapHelper = (allAdmins) => {
      let adminInfo = []
-     if (allAdmins.length > 0) {
+     if (allAdmins && allAdmins.length > 0) {
       allAdmins.forEach((admin) => {
         adminInfo.push({ name: admin.name.firstName + ' ' + admin.name.lastName, desc: admin.info.about?.designation, _id: admin._id, isRemoved: admin?.isRemoved || false })
       })
@@ -100,6 +100,15 @@ class Admins extends Component {
     const { onHide, show } = this.props
     const { inviteLink, whoCanSendInvite } = this.state
     const adminList = [...this.state.admins] 
+  
+    const handleModalHide = () => {
+      this.setState({
+        query: ''
+      }, () => {
+        onHide()
+      })
+    }
+
     let admins = adminList.map((item) => (
       <Row className="modal__member" id="p1" key={item._id}>
         <div className="member__image">
@@ -123,7 +132,7 @@ class Admins extends Component {
     )); 
     return (
       <Modal
-        onHide={onHide}
+        onHide={handleModalHide}
         show={show}
         size="md"
         aria-labelledby="contained-modal-title-vcenter"
@@ -213,4 +222,4 @@ const mapStateToProps = (state) => ({
   org: state.org
 })
 
-export default connect(mapStateToProps, { removeAdmin, getMember, getInviteLink, getOrgProfile })(Admins)
+export default connect(mapStateToProps, { removeAdmin, getMember, getInviteLink, getOrgProfile })(Admins)

src/user/organization/popups/Members.js

@@ -83,7 +83,7 @@ class Members extends Component {
 
   mapHelper = (allMembers) => {
     let membersInfo = [] 
-    if(allMembers.length > 0) {
+    if(allMembers && allMembers.length > 0) {
       allMembers.forEach((member) => {
         membersInfo.push({ 
           name: member.name.firstName + ' ' + member.name.lastName,
@@ -113,6 +113,15 @@ class Members extends Component {
     const { onHide, show } = this.props
     const { isAdmin, inviteLink, whoCanSendInvite } = this.state
     const membersList = [ ...this.state.members] 
+
+    const handleModalHide = () => {
+      this.setState({
+        query: ''
+      }, () => {
+        onHide()
+      })
+    }
+
     let members = membersList.map((item) => (
       <Row className="modal__member" id="p1" key={item._id}>
         <div className="member__image">
@@ -142,7 +151,7 @@ class Members extends Component {
     )); 
     return (
       <Modal
-        onHide={onHide}
+        onHide={handleModalHide}
         show={show}
         size="md"
         aria-labelledby="contained-modal-title-vcenter"
@@ -239,4 +248,4 @@ export default connect(mapStateToProps, {
   getMember, 
   getInviteLink, 
   getOrgProfile, 
- })(Members);
+ })(Members);

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

@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback, useState } from "react";
+import React, { useMemo, useCallback, useState, useEffect } from "react";
 import { useDropzone } from "react-dropzone";
 import { toast, ToastContainer } from "react-toastify";
 import "react-toastify/dist/ReactToastify.css";
@@ -33,7 +33,11 @@ const rejectStyle = {
 };
 
 function StyledDropzone(props) {
-  const [proposalId, setProposalId] = useState(props.idContent);
+  const [proposalId, setProposalId] = useState(null);
+
+  useEffect(() => {
+    setProposalId(props.idContent)
+  }, [props.idContent])
 
   const onDrop = useCallback((acceptedFiles) => {
     let formData = new FormData();
@@ -53,7 +57,7 @@ function StyledDropzone(props) {
       .catch((err) => {
         console.log(err);
       });
-  }, []);
+  }, [proposalId]);
 
   const {
     getRootProps,

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

@@ -268,7 +268,7 @@ class EditorContent extends Component {
             <div>
               {!this.state.newProposal ? (
                 <StyledDropzone
-                  idContent={this.props.location.state.proposalId}
+                  idContent={this.state.proposalId}
                 />
               ) : (
                 <div></div>