pagination, login control, name control

Rupeshiya · Rupeshiya · commit b73a9060d306 · 2020-08-11T11:54:26.000+05:30
diff --git a/src/actions/eventAction.js b/src/actions/eventAction.js
@@ -3,18 +3,20 @@ import { errorHandler } from '../utils/errorHandler';
 import { setRequestStatus } from '../utils/setRequestStatus';
 import { GET_ALL_EVENTS, GET_EVENT_BY_ID } from './types';
 import { BASE_URL } from './baseApi'
+import { customErrorHandler } from '../utils/customErrorHandler';
 
 // DELETE EVENT REQUEST 
 export const deleteEvent = (eventId) => async (dispatch) => {
   try {
     const res = await axios.delete(`${BASE_URL}/event/${eventId}`)
-    dispatch(setRequestStatus(false));
     if(res.status === 200){
-      dispatch(setRequestStatus(true));
       dispatch(getAllEvents())
     }
   } catch(error) {
-    dispatch(errorHandler(error))
+    const msg = {
+      error: error?.response?.msg
+    }
+    dispatch(customErrorHandler(msg))
   }
 }
 
diff --git a/src/actions/orgAction.js b/src/actions/orgAction.js
@@ -6,7 +6,8 @@ import {
   UPDATE_ORG_PROFILE, 
   DEACTIVATE_ORG, 
   GET_ALL_MEMBERS, 
-  TRIGGER_MAINTENANCE
+  TRIGGER_MAINTENANCE,
+  GET_LOGIN_OPTIONS
  } from './types'
 
 import { BASE_URL } from './baseApi'
@@ -149,4 +150,20 @@ export const TriggerMaintenance = () => async (dispatch) => {
   } catch (error) {
     dispatch(errorHandler(error))
   }
+}
+
+// GET LOGIN OPTIONS 
+export const getLoginOptions = () => async (dispatch) => {
+  try {
+    const res = await axios.get(`${BASE_URL}/org/login/options`)
+    if(res.status === 200) {
+      console.log('fetched login options ', res.data)
+      dispatch({
+        type: GET_LOGIN_OPTIONS,
+        payload: res.data.methods
+      })
+    }
+  } catch(error) {
+    dispatch(errorHandler(error))
+  }
 }
diff --git a/src/actions/types.js b/src/actions/types.js
@@ -51,4 +51,5 @@ export const GET_DEVICE_ANALYTICS ="GET_DEVICE_ANALYTICS"
 export const GET_MOSTVIEWED_ANALYTICS ="GET_MOSTVIEWED_ANALYTICS"
 export const GET_PROPOSALVIEW_ANALYTICS="GET_PROPOSALVIEW_ANALYTICS"
 export const ACTIVATE_DEACTIVATE_ACCOUNT_TOGGLER = "ACTIVATE_DEACTIVATE_ACCOUNT_TOGGLER";
-export const CLEAR_INVITE_LINK = "CLEAR_INVITE_LINK"
+export const CLEAR_INVITE_LINK = "CLEAR_INVITE_LINK";
+export const GET_LOGIN_OPTIONS = "GET_LOGIN_OPTIONS";
diff --git a/src/actions/usersAction.js b/src/actions/usersAction.js
@@ -31,15 +31,12 @@ export const getProfile = (id) => async (dispatch)=> {
 // FOLLOW USER
 export const followUser = (userId) => async (dispatch) => {
   try {
-    let followObj = {
-      followId: userId
-    }
-    console.log('followObj ', followObj)
-    const res = await axios.patch(`${BASE_URL}/user/follow`, followObj)
+    console.log('followuser ', userId)
+    const res = await axios.patch(`${BASE_URL}/user/follow/${userId}`)
     dispatch(setRequestStatus(false))
     if (res.status === 200) {
       dispatch(setRequestStatus(true))
-      console.log('started following ', followObj)
+      console.log('started following ', userId)
       dispatch({
         type: GET_USER_PROFILE,
         payload: res.data.user,
@@ -53,15 +50,12 @@ export const followUser = (userId) => async (dispatch) => {
 // UnFOLLOW USER
 export const unFollowUser = (userId) => async (dispatch) => {
   try {
-    let unFollowObj = {
-      followId: userId
-    }
-    console.log('unfollowObj ', unFollowObj)
-    const res = await axios.patch(`${BASE_URL}/user/unfollow`, unFollowObj)
+    console.log('unfollowObj ', userId)
+    const res = await axios.patch(`${BASE_URL}/user/unfollow/${userId}`)
     dispatch(setRequestStatus(false))
     if (res.status === 200) {
       dispatch(setRequestStatus(true))
-      console.log('unfollowed ', unFollowObj)
+      console.log('unfollowed ', userId)
       dispatch({
         type: GET_USER_PROFILE,
         payload: res.data.user,
diff --git a/src/reducers/orgReducer.js b/src/reducers/orgReducer.js
@@ -1,8 +1,9 @@
-import { GET_ORG_PROFILE, UPDATE_ORG_PROFILE, DEACTIVATE_ORG, TRIGGER_MAINTENANCE } from '../actions/types'
+import { GET_ORG_PROFILE, UPDATE_ORG_PROFILE, DEACTIVATE_ORG, TRIGGER_MAINTENANCE, GET_LOGIN_OPTIONS } from '../actions/types'
 const initialState = {
   isDeactivated: false,
   isMaintenance: false,
-  org: {}
+  org: {},
+  loginOptions: {}
 }
 
 export default (state = initialState, action) => {
@@ -31,6 +32,12 @@ export default (state = initialState, action) => {
         isDeactivated: action.payload
       }
     }
+    case GET_LOGIN_OPTIONS: {
+      return {
+        ...state,
+        loginOptions: action.payload
+      }
+    }
     default: {
       return state
     }
diff --git a/src/user/Activity/Users.js b/src/user/Activity/Users.js
@@ -7,6 +7,7 @@ import { connect } from 'react-redux';
 import Moment from 'react-moment'
 import { Pagination } from 'antd'
 import { withRouter } from 'react-router-dom'
+import Img from '../../assets/images/userIcon2.jpg'
 
 class Users extends Component {
   constructor(props) {
@@ -55,13 +56,18 @@ class Users extends Component {
                 key={index}
                 onClick={() => this.props.history.push(`/activity/${user._id}`)}
               >
-                <p className="activity__link">
-                  {user.name.firstName + " " + user.name.lastName}
-                </p>
-                <p className="joined__on">
-                  Joined on:{" "}
-                  <Moment format="DD MMM YYYY">{user.createdAt}</Moment>
-                </p>
+                <div className="user__wrapper">
+                  <img src={Img} alt="user_image" className="user__image mr-2"/>
+                  <div className="name_wrapper">
+                    <p className="activity__link">
+                      {user.name.firstName + " " + user.name.lastName}
+                    </p>
+                    <p className="joined__on">
+                      Joined on:{" "}
+                      <Moment format="DD MMM YYYY">{user.createdAt}</Moment>
+                    </p>
+                  </div>
+                </div>
               </Timeline.Item>
             ))}
           </Timeline>
diff --git a/src/user/Activity/users.scss b/src/user/Activity/users.scss
@@ -29,21 +29,37 @@
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  .activity__link {
-    color: #1a73ed;
-    font-family: "Inter";
-    font-size: 14px;
-    cursor: pointer;
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-  .joined__on {
-    margin-top: -14px;
-    color: #cccccc;
-  }
   .pagination__container {
     position: fixed;
     margin-top: 78vh;
   }
+  .user__wrapper {
+    display: flex;
+    flex-direction: row;
+    max-height: 52px;
+    .user__image {
+      border-radius: 50%;
+      height: 37px;
+      width: 36px;
+    }
+    .name_wrapper {
+      .activity__link {
+        color: #1a73ed;
+        font-family: "Inter";
+        font-size: 14px;
+        cursor: pointer;
+
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+      .joined__on {
+        color: #cccccc;
+        margin-top: -15px;
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+  }
 }
diff --git a/src/user/auth/login/login.js b/src/user/auth/login/login.js
@@ -6,22 +6,40 @@ import { DonutTitle } from "../../../donutTitle/donutTitle";
 import multipleDonuts from "../../../assets/images/extra-donuts.png";
 import GoogleLogin from "../../../assets/images/icons8-google-48.png";
 import { FaGithub } from 'react-icons/fa'
+import { connect } from 'react-redux';
+import { getLoginOptions } from '../../../actions/orgAction'
 import "./login.scss";
 
 class Login extends Component {
   constructor(props) {
     super(props);
     this.state = {
       activeForm: "login",
+      loginOptions: {}
     };
   }
+
+  // get login options 
+  componentDidMount() {
+    this.props.getLoginOptions()
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if(prevState.loginOptions != this.props.org?.loginOptions){
+      this.setState({
+        loginOptions: this.props.org?.loginOptions
+      })
+    }
+  }
+
   handleSelectorClick = (formItem) => {
     this.setState({
       activeForm: formItem,
     });
   };
 
   render() {
+    const { loginOptions } = this.state
     return (
       <div className="login-page">
         <div className="welcome-text">
@@ -58,7 +76,8 @@ class Login extends Component {
                 : "Or SignUp with"}
             </p>
             <Row>
-              <Col className = "button-column">
+              {Boolean(loginOptions?.google === true) ? (
+                <Col className = "button-column">
                 <a
                   href="http://localhost:5000/auth/google"
                   style={{ padding: "1vh" }}
@@ -76,7 +95,9 @@ class Login extends Component {
                   </Button>
                 </a>
               </Col>
-              <Col className="button-column" >
+              ) : null }
+              {Boolean(loginOptions?.github === true) ? (
+                <Col className="button-column" >
                 <a
                   href="http://localhost:5000/auth/google"
                   style={{ padding: "1vh" }}
@@ -94,6 +115,7 @@ class Login extends Component {
                   </Button>
                 </a>
               </Col>
+              ) : null }
             </Row>
             <p className="login-text-selector">
               {this.state.activeForm === "login"
@@ -123,4 +145,9 @@ class Login extends Component {
   }
 }
 
-export default Login;
+// map state to props 
+const mapStateToProps = (state) => ({
+  org: state.org
+})
+
+export default connect(mapStateToProps, { getLoginOptions })(Login);
diff --git a/src/user/dashboard/Community/CommunitySetting.js b/src/user/dashboard/Community/CommunitySetting.js
@@ -40,7 +40,7 @@ class CommunitySetting extends Component {
     return (
       <div className="overall_container">
         <div className="main_navigation">
-          <Navigation orgSettings={this.state.org} />
+          <Navigation orgSettings={this.state.org} user={this.props.user} />
         </div>
         <div className="org_settings_view">
           <div className="main_section">
@@ -71,6 +71,7 @@ class CommunitySetting extends Component {
 const mapStateToProps = (state) => ({
   auth: state.auth,
   error: state.error,
+  user: state.user,
   org: state.org
 })
 export default connect(mapStateToProps)(CommunitySetting);
diff --git a/src/user/dashboard/Community/components/OrgPermission.js b/src/user/dashboard/Community/components/OrgPermission.js
@@ -24,7 +24,7 @@ class OrgPermission extends Component {
   }
 
   toggleRadio = (e) => {
-    this.setState({ [e.target.name]: e.target.checked }, () => {
+    this.setState({ [e.target.name]: !e.target.checked }, () => {
       console.log("state ", this.state);
     });
   };
@@ -124,7 +124,7 @@ class OrgPermission extends Component {
                 <Form.Check
                   type="checkbox"
                   label="Prevent users from changing their name"
-                  checked={canChangeName}
+                  checked={canChangeName === false}
                   name="canChangeName"
                   onChange={this.toggleRadio}
                 />
@@ -133,7 +133,7 @@ class OrgPermission extends Component {
                 <Form.Check
                   type="checkbox"
                   label="Prevent users from changing their email address "
-                  checked={canChangeEmail}
+                  checked={canChangeEmail === false}
                   name="canChangeEmail"
                   onChange={this.toggleRadio}
                 />
diff --git a/src/user/dashboard/navigation/navigation.js b/src/user/dashboard/navigation/navigation.js
@@ -28,6 +28,8 @@ class Navigation extends Component {
      userId: nextProps.user.userProfile?._id
    })
  }
+
+ 
   render() {
     const ListItem = (props) => {
       const item = props.isMobile ? (
@@ -108,7 +110,7 @@ class Navigation extends Component {
             <ListItem
               name="Account"
               className={this.props.profile ? "active" : "inactive"}
-              link={`/profile/${this.state.userId}`}
+              link={`/profile/${this.state.userId || this.props.user.userProfile._id}`}
             />
             <ListItem
               name="Settings"
diff --git a/src/user/events/popups/DeleteEvent.js b/src/user/events/popups/DeleteEvent.js

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`		`-import { GET_ORG_PROFILE, UPDATE_ORG_PROFILE, DEACTIVATE_ORG, TRIGGER_MAINTENANCE } from '../actions/types'`
	`1`	`+import { GET_ORG_PROFILE, UPDATE_ORG_PROFILE, DEACTIVATE_ORG, TRIGGER_MAINTENANCE, GET_LOGIN_OPTIONS } from '../actions/types'`
`2`	`2`	`const initialState = {`
`3`	`3`	`isDeactivated: false,`
`4`	`4`	`isMaintenance: false,`
`5`		`- org: {}`
	`5`	`+ org: {},`
	`6`	`+ loginOptions: {}`
`6`	`7`	`}`
`7`	`8`
`8`	`9`	`export default (state = initialState, action) => {`
`@@ -31,6 +32,12 @@ export default (state = initialState, action) => {`
`31`	`32`	`isDeactivated: action.payload`
`32`	`33`	`}`
`33`	`34`	`}`
	`35`	`+ case GET_LOGIN_OPTIONS: {`
	`36`	`+ return {`
	`37`	`+ ...state,`
	`38`	`+ loginOptions: action.payload`
	`39`	`+ }`
	`40`	`+ }`
`34`	`41`	`default: {`
`35`	`42`	`return state`
`36`	`43`	`}`