integrated forgot password, get invite link and fix some inconsistencies

Rupeshiya · Rupeshiya · commit 473dc3eb0192 · 2020-07-02T12:44:47.000+05:30
diff --git a/src/actions/orgAction.js b/src/actions/orgAction.js
@@ -68,10 +68,11 @@ export const updateOrgProfile = (updatedInfo) => async (dispatch) => {
     if(res.status === 200) {
       dispatch(setRequestStatus(true))
       console.log('org profile updated!', res.data)
-      dispatch({
-        type: UPDATE_ORG_PROFILE,
-        payload: res.data.organization
-      })
+      dispatch(getOrgProfile());
+      // dispatch({
+      //   type: UPDATE_ORG_PROFILE,
+      //   payload: res.data.organization
+      // })
     }
   } catch(error) {
     dispatch(errorHandler(error))
diff --git a/src/actions/types.js b/src/actions/types.js
@@ -33,4 +33,6 @@ export const GET_ADMIN = "GET_ADMIN";
 export const GET_COMMENTS_OF_A_POST = "GET_COMMENTS_OF_A_POST";
 export const GET_SINGLE_PROJECT = "GET_SINGLE_PROJECT";
 export const PASSWORD_CHANGE_REQUEST_SUCCESS = "PASSWORD_CHANGE_REQUEST_SUCCESS";
-export const PASSWORD_SUCCESSFULLY_CHANGED = "PASSWORD_SUCCESSFULLY_CHANGED";
+export const PASSWORD_SUCCESSFULLY_CHANGED = "PASSWORD_SUCCESSFULLY_CHANGED";
+export const GET_INVITE_LINK = "GET_INVITE_LINK";
+export const PROCESS_INVITE_LINK = "PROCESS_INVITE_LINK";
diff --git a/src/actions/usersAction.js b/src/actions/usersAction.js
@@ -1,4 +1,4 @@
-import { GET_USER_PROFILE, GET_ALL_MEMBERS, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS } from './types'
+import { GET_USER_PROFILE, GET_ALL_MEMBERS, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS, GET_INVITE_LINK, PROCESS_INVITE_LINK } from './types'
 import { errorHandler } from '../utils/errorHandler'
 import axios from 'axios'
 import { setRequestStatus } from '../utils/setRequestStatus'
@@ -158,3 +158,39 @@ export const getPostsCreatedByUser = (pagination = 10, page = 1) => async (dispa
     dispatch(errorHandler(error))
   }
 }
+
+// GET INVITE LINK 
+export const getInviteLink = () => async (dispatch) => {
+  try {
+    const res = await axios.get('/user/invite')
+    dispatch(setRequestStatus(false));
+    if(res.status === 200) {
+      dispatch(setRequestStatus(true));
+      console.log('Fetching invite link ', res.data.inviteLink)
+      dispatch({
+        type: GET_INVITE_LINK,
+        payload: res.data.inviteLink
+      })
+    }
+  } catch (error) {
+    dispatch(errorHandler(error))
+  }
+}
+
+// PROCESS INVITE LINK 
+export const processInviteToken = (token) => async (dispatch) => {
+  try {
+    const res = await axios.get(`/user/invite/${token}`)
+    dispatch(setRequestStatus(false));
+    if(res.status === 200) {
+      dispatch(setRequestStatus(true))
+      console.log('Processing the invite link ', res.data);
+      dispatch({
+        type: PROCESS_INVITE_LINK,
+        payload: res.data.success || res.data.msg
+      })
+    }
+  } catch(error) {
+    dispatch(errorHandler(error));
+  }
+}
diff --git a/src/reducers/userReducer.js b/src/reducers/userReducer.js
@@ -1,9 +1,10 @@
-import { GET_USER_PROFILE, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS } from '../actions/types'
+import { GET_USER_PROFILE, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS, GET_INVITE_LINK } from '../actions/types'
 const initialState = {
   userProfile: {},
   userEvents: [],
   userProjects: [],
-  userPosts: []
+  userPosts: [],
+  inviteLink: ''
 }
 
 export default (state = initialState, action) => {
@@ -38,6 +39,12 @@ export default (state = initialState, action) => {
         userProfile: action.payload
       }
     }
+    case GET_INVITE_LINK: {
+      return {
+        ...state,
+        inviteLink: action.payload
+      }
+    }
     default: {
       return state
     }
diff --git a/src/user/dashboard/Community/components/OrgAuth.js b/src/user/dashboard/Community/components/OrgAuth.js
@@ -33,6 +33,7 @@ class OrgAuth extends Component {
         gitlab
       }
     }
+    console.log('updating auth settings ', info);
     this.props.updateSettings(info)
   }
 
@@ -45,15 +46,17 @@ class OrgAuth extends Component {
     const { authentication } = nextProps.org.org.options;
     console.log("authentication ", authentication);
     const { email, google, github, gitlab } = authentication;
-    this.setState({ email, google, github, gitlab }, () => {
+    this.setState({
+          email,
+          google,
+          github,
+          gitlab,
+          error: nextProps.error.msg
+        }, () => {
       console.log("updated state", this.state);
     });
-    this.setState({ error: nextProps.error.msg }, () => {
-      console.log('state ', this.state)
-    })
   }
 
-
   render() {
     const { 
       email, 
diff --git a/src/user/dashboard/Community/components/OrgPermission.js b/src/user/dashboard/Community/components/OrgPermission.js
@@ -63,15 +63,15 @@ class OrgPermission extends Component {
     const { 
       canChangeEmail, 
       canChangeName, 
-      // sendInvite, 
-      // canCreateManage, 
+      sendInvite, 
+      canCreateManage, 
       // error
      } = this.state
     return (
       <div className="container">
         <div className="permission_content">
           <div className="container">
-             <p className="org_permission_text">Organization Permission</p>
+            <p className="org_permission_text">Organization Permission</p>
             <Form className="form">
               <Form.Group>
                 <Form.Label htmlFor="header_text" className="header_text">
@@ -82,14 +82,19 @@ class OrgPermission extends Component {
                 <Form.Label htmlFor="label_text" className="sub_header_text">
                   Are invitations required for joining the organization?
                 </Form.Label>
-                <Form.Control 
-                  as = "select"
-                  className = "select_option"
-                  name = "sendInvite" 
+                <Form.Control
+                  as="select"
+                  className="select_option"
+                  name="sendInvite"
+                  value={sendInvite}
                   onChange={this.onChange}
                 >
-                  <option value="BOTH">Yes. Admins and Members can send invitations</option>
-                  <option value="ADMINS">Yes. Only Admins can send invitations</option>
+                  <option value="BOTH">
+                    Yes. Admins and Members can send invitations
+                  </option>
+                  <option value="ADMINS">
+                    Yes. Only Admins can send invitations
+                  </option>
                   <option value="NONE">No one can send invitations</option>
                 </Form.Control>
               </Form.Group>
@@ -143,10 +148,30 @@ class OrgPermission extends Component {
                 >
                   Who can create and manage user groups
                 </Form.Label>
-                <Form.Control as="select" name="canCreateManage" className="select_option" onChange={this.onChange}>
-                  <option value="BOTH">Admins and Members </option>
-                  <option value="ADMINS">Only Admins</option>
-                  <option value="MEMBERS">Only Members </option>
+                <Form.Control
+                  as="select"
+                  name="canCreateManage"
+                  className="select_option"
+                  onChange={this.onChange}
+                >
+                  <option
+                    value="BOTH"
+                    selected={canCreateManage === "BOTH"}
+                  >
+                    BOTH
+                  </option>
+                  <option
+                    value="ADMINS"
+                    selected={canCreateManage === "ADMINS"}
+                  >
+                    Only Admins
+                  </option>
+                  <option
+                    value="MEMBERS"
+                    selected={canCreateManage === "MEMBERS"}
+                  >
+                    Only Members
+                  </option>
                 </Form.Control>
               </Form.Group>
               <Form.Group>
diff --git a/src/user/dashboard/Community/components/OrgSettings.js b/src/user/dashboard/Community/components/OrgSettings.js
@@ -13,7 +13,8 @@ class OrgSettings extends Component {
       enableEmail: true,
       language: "",
       time: "",
-      error: ''
+      error: '',
+      editingTime: ''
     };
   }
 
@@ -35,9 +36,10 @@ class OrgSettings extends Component {
       settings: {
         enableEmail,
         language,
-        time
-      }
+        timeFormat: time
+      },
     };
+    console.log('updating settings ', info);
     this.props.updateSettings(info)
   }
 
@@ -61,8 +63,10 @@ class OrgSettings extends Component {
   render() {
     const { 
       enableEmail, 
-      // language, 
-      // time, 
+      language, 
+      time, 
+      editingTime,
+      // editing
       // error
      } = this.state;
     return (
@@ -79,6 +83,7 @@ class OrgSettings extends Component {
                   as="select"
                   className="select_option"
                   name="editing"
+                  value={editingTime}
                   onChange={this.onChange}
                 >
                   <option value="10">Upto 10 min after posting</option>
@@ -145,11 +150,27 @@ class OrgSettings extends Component {
                   as="select"
                   name="language"
                   className="select_option"
+                  value={language}
                   onChange={this.onChange}
                 >
-                  <option value="English">English</option>
-                  <option value="French">French</option>
-                  <option value="German">German</option>
+                  <option
+                    value="English"
+                    selected={language === "English"}
+                  >
+                    English
+                  </option>
+                  <option
+                    value="French"
+                    selected={language === "French"}
+                  >
+                    French
+                  </option>
+                  <option
+                    value="German"
+                    selected={language === "German"}
+                  >
+                    German
+                  </option>
                 </Form.Control>
               </Form.Group>
               <Form.Group>
@@ -163,10 +184,19 @@ class OrgSettings extends Component {
                   as="select"
                   name="time"
                   className="select_option"
+                  value={time}
                   onChange={this.onChange}
                 >
-                  <option value="12">12 hr clock (05:00 PM)</option>
-                  <option value="24">24 hr clock (13:00)</option>
+                  <option 
+                    value="12"
+                    selected={time === "12" }
+                    >12 hr clock (05:00 PM)
+                  </option>
+                  <option 
+                    value="24"
+                    selected={time === "24" }
+                  >24 hr clock (13:00)
+                  </option>
                 </Form.Control>
               </Form.Group>
               <Form.Group>
diff --git a/src/user/dashboard/Community/components/permission.scss b/src/user/dashboard/Community/components/permission.scss
@@ -17,6 +17,9 @@
         border: 0.75px solid #90949C;
         background: #FFFFFF;
         box-sizing: border-box;
+        .hide {
+          display: none;
+        }
       }
       .placeholder_text {
         color: #C9C9C9;
diff --git a/src/user/dashboard/Community/components/settings.scss b/src/user/dashboard/Community/components/settings.scss
@@ -17,6 +17,9 @@
         border: 0.75px solid #90949C;
         background: #FFFFFF;
         box-sizing: border-box;
+        .hide {
+          display: none;
+        }
       }
       .placeholder_text {
         color: #C9C9C9;
diff --git a/src/user/dashboard/news-feed/popups/AddPostModal.js b/src/user/dashboard/news-feed/popups/AddPostModal.js
@@ -60,7 +60,7 @@ const AddPostModal = (props) => {
         </Form>
       </Modal.Body>
       <div className="modal__buttons">
-        <Button Button onClick = {createPostClick.bind(this, content)} className = "modal__save" >
+        <Button onClick = {createPostClick.bind(this, content)} className = "modal__save" >
           <span className="modal__buttontext">Post</span>
         </Button>
         <Button onClick={props.onHide} className="modal__cancel">
diff --git a/src/user/dashboard/news-feed/popups/AddProjectModal.js b/src/user/dashboard/news-feed/popups/AddProjectModal.js
@@ -10,6 +10,7 @@ const AddProjectModal = (props) => {
   const [long, setLongDescription] = useState("")
   const [githubLink, setGithubLink] = useState("")
   const [bitbucketLink, setBitbucketLink] = useState("")
+  const [stacks, setTechStacks] = useState("")
 
   const onProjectName = (event) => {
     setProjectName(event.target.value)
@@ -27,19 +28,28 @@ const AddProjectModal = (props) => {
     setBitbucketLink(event.target.value)
   }
 
+  const onTechStacks = (event) => {
+    const stacks = event.target.value;
+    console.log('stacks ', stacks);
+    setTechStacks(stacks)
+  }
+
   const onCreateProjectClick = () => {
+    const techStacks = stacks.split(',');
     const projectInfo = {
       projectName,
       description : {
         short,
         long
       },
+      techStacks,
       links: [{ githubLink: githubLink }, {bitbucketLink: bitbucketLink}]
     }
     console.log('creating project!', projectInfo)
     props.createProject(projectInfo)
     props.handleClose()
   }
+
   return (
     <Modal
       show={props.show}
@@ -130,6 +140,20 @@ const AddProjectModal = (props) => {
               />
             </Form.Group>
           </Form.Row>
+          <Form.Row className="modal__row">
+            <Form.Group
+              as={Col}
+              controlId="formGridEmail"
+              className="modal__group"
+            >
+              <Form.Label className="modal__label">Tech stacks</Form.Label>
+              <Form.Control 
+                type="text" 
+                placeholder="Input tech stacks separated by comma.."
+                onChange={onTechStacks}
+              />
+            </Form.Group>
+          </Form.Row>
         </Form>
       </Modal.Body>
       <div className="modal__buttons">
diff --git a/src/user/organization/popups/Members.js b/src/user/organization/popups/Members.js
diff --git a/src/user/profile/popups/Followers.js b/src/user/profile/popups/Followers.js
diff --git a/src/user/projects/proj-info/proj-info.js b/src/user/projects/proj-info/proj-info.js

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`		`-import { GET_USER_PROFILE, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS } from '../actions/types'`
	`1`	`+import { GET_USER_PROFILE, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS, GET_INVITE_LINK } from '../actions/types'`
`2`	`2`	`const initialState = {`
`3`	`3`	`userProfile: {},`
`4`	`4`	`userEvents: [],`
`5`	`5`	`userProjects: [],`
`6`		`- userPosts: []`
	`6`	`+ userPosts: [],`
	`7`	`+ inviteLink: ''`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`export default (state = initialState, action) => {`
`@@ -38,6 +39,12 @@ export default (state = initialState, action) => {`
`38`	`39`	`userProfile: action.payload`
`39`	`40`	`}`
`40`	`41`	`}`
	`42`	`+ case GET_INVITE_LINK: {`
	`43`	`+ return {`
	`44`	`+ ...state,`
	`45`	`+ inviteLink: action.payload`
	`46`	`+ }`
	`47`	`+ }`
`41`	`48`	`default: {`
`42`	`49`	`return state`
`43`	`50`	`}`