integrated follow/unfollow remove user/admin

Rupeshiya · vaibhavdaren · commit f3d98cffe0cc · 2020-06-22T14:54:46.000Z
diff --git a/src/actions/orgAction.js b/src/actions/orgAction.js
@@ -9,6 +9,22 @@ export const registerCommunity  = (orgInfo) => async (dispatch) => {
     dispatch(setRequestStatus(false))
     if (res.status === 201) {
       dispatch(setRequestStatus(true))
+      localStorage.setItem('orgId', JSON.stringify(res.data.org._id))
+    }
+  } catch (error) {
+    dispatch(errorHandler(error))
+  }
+}
+
+// REMOVE ADMIN
+export const removeAdmin = (userId) => async (dispatch) => {
+  try {
+    let orgId = localStorage.getItem('orgId')
+    const res = await axios.patch(`/org/remove/${orgId}/${userId}`)
+    dispatch(setRequestStatus(false))
+    if (res.status === 200) {
+      dispatch(setRequestStatus(true))
+      console.log('admin removed ', userId)
     }
   } catch (error) {
     dispatch(errorHandler(error))
diff --git a/src/actions/usersAction.js b/src/actions/usersAction.js
@@ -18,4 +18,59 @@ export const getProfile = () => async (dispatch)=> {
   } catch(error) {
     dispatch(errorHandler(error))
   }
+}
+
+export const followUser = (userId) => async (dispatch) => {
+  try {
+    let followObj = {
+      followId: userId
+    }
+    console.log('followObj ', followObj)
+    const res = await axios.patch('/user/follow', followObj)
+    dispatch(setRequestStatus(false))
+    if (res.status === 200) {
+      dispatch(setRequestStatus(true))
+      console.log('started following ', followObj)
+      // dispatch({
+      //   type: GET_USER_PROFILE,
+      //   payload: res.data.user,
+      // });
+    }
+  } catch(error) {
+    dispatch(errorHandler(error))
+  }
+}
+
+export const unFollowUser = (userId) => async (dispatch) => {
+  try {
+    let unFollowObj = {
+      followId: userId
+    }
+    console.log('unfollowObj ', unFollowObj)
+    const res = await axios.patch('/user/unfollow', unFollowObj)
+    dispatch(setRequestStatus(false))
+    if (res.status === 200) {
+      dispatch(setRequestStatus(true))
+      console.log('unfollowed ', unFollowObj)
+      // dispatch({
+      //   type: GET_USER_PROFILE,
+      //   payload: res.data.user,
+      // });
+    }
+  } catch(error) {
+    dispatch(errorHandler(error))
+  }
+}
+
+export const removeUser = (userId) => async (dispatch) => {
+  try {
+    const res = await axios.patch(`/user/remove/${userId}`)
+    dispatch(setRequestStatus(false))
+    if(res.status === 200) {
+      dispatch(setRequestStatus(true))
+      console.log('user removed ', userId)
+    }
+  } catch (error) {
+    dispatch(errorHandler(error))
+  }
 }
diff --git a/src/auth/login-form/login-form.js b/src/auth/login-form/login-form.js
@@ -21,9 +21,7 @@ class LoginForm extends Component {
     };
   }
   componentWillReceiveProps(nextProps) {
-    if (nextProps.error?.msg.length > 0) {
-      this.setState({ error: true });
-    }
+    console.log('nextProps ', nextProps)
   }
 
   onSubmit = (e) => {
diff --git a/src/css/components/_modals.scss b/src/css/components/_modals.scss
@@ -168,6 +168,15 @@
         text-align: center;
         padding: 0px;
       }
+      .modal__unFollowButton {
+        background: #007bff;
+        box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
+        border-radius: 34px;
+        width: 83px;
+        height: 4.5vh;
+        text-align: center;
+        padding: 0px;
+      }
       .modal__followText {
         font-family: $font-family-Inter;
         font-style: normal;
@@ -177,6 +186,15 @@
 
         color: #1a73e8;
       }
+       .modal__unFollowText {
+        font-family: $font-family-Inter;
+        font-style: normal;
+        font-weight: $font-weight-normal;
+        font-size: 12px;
+        line-height: 15px;
+
+        color: #ffff;
+      }
     }
     .modal__member {
       display: flex;
@@ -246,6 +264,26 @@
           color: #eb5757;
         }
       }
+      .modal__removed__followButton {
+        border: 1px solid #eb5757;
+        box-sizing: border-box;
+        box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.1);
+        border-radius: 34px;
+        background: #eb5757;
+        width: 83px;
+        height: 4.5vh;
+        text-align: center;
+        padding: 0px;
+
+        .remove_followText {
+          font-family: Inter;
+          font-style: normal;
+          font-weight: 500;
+          font-size: 12px;
+          line-height: 15px;
+          color: #ffff;
+        }
+      }
     }
     .add__member {
       .add__member__form {
diff --git a/src/user/dashboard/portfolio/portfolio.js b/src/user/dashboard/portfolio/portfolio.js
@@ -5,7 +5,7 @@ import Followers from "../../profile/popups/Followers";
 import Admins from "../../organization/popups/Admins";
 import { connect } from 'react-redux'
 import { getMembers, getPersonalOverview } from '../../../actions/insightAction'
-import { getProfile } from '../../../actions/usersAction'
+import { getProfile, followUser, unFollowUser } from '../../../actions/usersAction'
 
 class Portfolio extends Component {
   constructor(props) {
@@ -41,7 +41,9 @@ class Portfolio extends Component {
     let info = insight.personalOverview
     let followers = user.userProfile.followers
     let followings = user.userProfile.followings;
-    this.setState({ members: members, admins: admins, personalInfo: info, followers: followers, followings: followings })
+    this.setState({ members: members, admins: admins, personalInfo: info, followers: followers, followings: followings }, () => {
+      console.log('state ', this.state);
+    })
   }
 
   showMembers = () => {
@@ -83,7 +85,7 @@ class Portfolio extends Component {
             <h1><b>{followers?.length || 0}</b></h1>
             <h3>Followers</h3>
           </div>
-          <Followers show={this.state.followersList} onHide={this.closeFollowersList} followers={followers}/>
+          <Followers show={this.state.followersList} onHide={this.closeFollowersList} followers={followers} followings={followings} />
           <div className="item">
             <h1><b>{personalInfo.events || 0}</b></h1>
             <h3>Events Organized</h3>
diff --git a/src/user/organization/popups/Admins.js b/src/user/organization/popups/Admins.js
@@ -1,6 +1,8 @@
 /* eslint-disable no-unused-expressions */
 import React, { Component } from "react";
 import { Modal, Button, Row, Col, Image, Form } from "react-bootstrap";
+import { connect } from 'react-redux'
+import { removeAdmin } from '../../../actions/orgAction'
 import logo from "../../../svgs/logo-image.jpg";
 
 class Admins extends Component {
@@ -11,9 +13,10 @@ class Admins extends Component {
       admins: []
     }
   }
-  onRemoveClick = (index) => {
-    console.log('Removing admin!', index);
+  onRemoveClick = (userId) => {
+    console.log('Removing admin!', userId);
     // SEND REQUEST TO REMOVE USER WITH ID = INDEX FROM ADMINISTRATORs LIST
+    this.props.removeAdmin(userId)
   }
 
   componentWillReceiveProps(nextProps) {
@@ -88,4 +91,12 @@ class Admins extends Component {
     );
   }
 }
-export default Admins;
+
+// map state to props 
+const mapStateToProps = (state) => ({
+  auth: state.auth,
+  error: state.error,
+  status: state.status
+})
+
+export default connect(mapStateToProps, { removeAdmin })(Admins)
diff --git a/src/user/organization/popups/Members.js b/src/user/organization/popups/Members.js
@@ -1,5 +1,7 @@
 import React, { Component } from "react";
 import { Modal, Button, Row, Col, Image, Form } from "react-bootstrap";
+import { connect } from 'react-redux';
+import { removeUser } from '../../../actions/usersAction'
 import logo from "../../../svgs/logo-image.jpg";
 
 class Members extends Component {
@@ -11,17 +13,20 @@ class Members extends Component {
     }
   }
 
-  onRemoveClick = (index) => {
-    console.log('Blocking !', index);
+  onRemoveClick = (userId) => {
+    console.log('Removing !', userId);
     // SEND REQUEST TO REMOVE USER WITH ID = INDEX
+    this.props.removeUser(userId)
   }
 
   componentWillReceiveProps(nextProps) {
     let membersInfo = [] 
     nextProps.members.forEach((member) => {
-      membersInfo.push({ name: member.name.firstName + ' ' + member.name.lastName, desc: member.info.about.designation || 'UI/UX' , _id: member._id })
+      membersInfo.push({ name: member.name.firstName + ' ' + member.name.lastName, desc: member.info.about.designation || 'UI/UX' , _id: member._id, isRemoved: member?.isRemoved || false })
+    })
+    this.setState({ members: membersInfo }, () => {
+      console.log('members ', this.state)
     })
-    this.setState({ members: membersInfo })
   }
 
   render() {
@@ -37,10 +42,15 @@ class Members extends Component {
         </div>
         <div className="member__btn__container">
           <Button
-            className="btn-danger modal__remove__followButton"
+            className = {
+              Boolean(item.isRemoved === true) ? 'modal__removed__followButton' :
+              'modal__remove__followButton'
+            }
             onClick={this.onRemoveClick.bind(this, item._id)}
           >
-            <span className="remove_followText">Remove</span>
+            <span className="remove_followText">
+              {Boolean(item.isRemoved === true) ? (<span>Removed</span>) : (<span>Remove</span>)}
+            </span>
           </Button>
         </div>
       </Row>
@@ -88,4 +98,12 @@ class Members extends Component {
     );
   }
 }
-export default Members;
+// map state to props 
+const mapStateToProps = (state) => ({
+  auth: state.auth,
+  error: state.error,
+  user: state.user,
+  status: state.status
+})
+
+export default connect(mapStateToProps, { removeUser })(Members);
diff --git a/src/user/profile/popups/Followers.js b/src/user/profile/popups/Followers.js
diff --git a/src/user/profile/popups/Logout.js b/src/user/profile/popups/Logout.js

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,7 @@ class LoginForm extends Component {`
`21`	`21`	`};`
`22`	`22`	`}`
`23`	`23`	`componentWillReceiveProps(nextProps) {`
`24`		`- if (nextProps.error?.msg.length > 0) {`
`25`		`- this.setState({ error: true });`
`26`		`- }`
	`24`	`+ console.log('nextProps ', nextProps)`
`27`	`25`	`}`
`28`	`26`
`29`	`27`	`onSubmit = (e) => {`