fix issues (#555)

Rupeshiya · web-flow · commit 8b3ac657661c · 2020-08-06T21:52:32.000+05:30
diff --git a/src/actions/authAction.js b/src/actions/authAction.js
@@ -140,4 +140,4 @@ export const setCurrentUser = (decodedData) => {
     type: SET_CURRENT_USER,
     payload: decodedData
   }
-}
+}
diff --git a/src/actions/types.js b/src/actions/types.js
@@ -51,3 +51,4 @@ 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"
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, GET_INVITE_LINK, PROCESS_INVITE_LINK, SET_ADMIN } 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, SET_ADMIN, CLEAR_INVITE_LINK } from './types'
 import { errorHandler } from '../utils/errorHandler'
 import axios from 'axios'
 import { setRequestStatus } from '../utils/setRequestStatus'
@@ -203,6 +203,14 @@ export const processInviteToken = (token) => async (dispatch) => {
   }
 }
 
+// CLEAR INVITE LINK 
+export const clearInviteLink = () => async (dispatch) => {
+  dispatch({
+    type: CLEAR_INVITE_LINK,
+    payload: ''
+  })
+}
+
 // ACTIVATE DEACTIVATE TOGGLER 
 export const activateDeactivateToggler = () => async (dispatch) => {
   try {
diff --git a/src/auth/login-form/login-form.js b/src/auth/login-form/login-form.js
@@ -67,6 +67,15 @@ class LoginForm extends Component {
     this.setState({ isValidForm: isValidEmail });
   };
 
+  // toggle Popups
+  toggle = (toggler) => {
+    this.setState({
+      modalShow: !this.state.modalShow
+    }, () => {
+      console.log('toggler ', this.state);
+    })
+  }
+
   render() {
     const handleToggle = (e) => {
       const targetName = e.target.name;
@@ -122,6 +131,7 @@ class LoginForm extends Component {
           option={this.state.option}
           optionValue={this.state.optionValue}
           modalShow={this.state.modalShow}
+          toggler={this.toggle}
         />
       </div>
     );
diff --git a/src/auth/login/login.scss b/src/auth/login/login.scss
@@ -1,3 +1,6 @@
+body {
+  max-height: 90vh;
+}
 .login-page {
   display: flex;
   flex-direction: row;
@@ -14,7 +17,7 @@
       }
     }
     .extra-donuts {
-      position: absolute;
+      position: fixed;
       bottom: 0;
       left: 0;
       img {
diff --git a/src/reducers/userReducer.js b/src/reducers/userReducer.js
@@ -1,4 +1,4 @@
-import { GET_USER_PROFILE, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS, GET_INVITE_LINK } from '../actions/types'
+import { GET_USER_PROFILE, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS, GET_INVITE_LINK, CLEAR_INVITE_LINK } from '../actions/types'
 const initialState = {
   userProfile: {},
   userEvents: [],
@@ -45,6 +45,12 @@ export default (state = initialState, action) => {
         inviteLink: action.payload
       }
     }
+    case CLEAR_INVITE_LINK: {
+      return {
+        ...state,
+        inviteLink: action.payload
+      }
+    }
     default: {
       return state
     }
diff --git a/src/user/Admin/register.scss b/src/user/Admin/register.scss
@@ -1,4 +1,6 @@
-
+body {
+  max-height: 90vh;
+}
 .main__container {
   left: 0%;
   right: 0%;
@@ -12,6 +14,7 @@
     flex-direction: row;
     flex-wrap: wrap;
     margin: 50px;
+    max-height: 70vh;
     .donut__text__container {
       flex-grow: 1.8;
       flex-shrink: 1;
@@ -358,7 +361,7 @@
   .main__container {
     .main__footer {
       .stick__to__bottom {
-        margin-top: 19vh;
+        margin-top: 17vh;
       }
     }
   }
diff --git a/src/user/dashboard/news-feed/news-feed.js b/src/user/dashboard/news-feed/news-feed.js
@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from "react";
+import { Button, ButtonGroup } from 'react-bootstrap'
 import {
   List,
   Card,
   Paper,
   InputBase,
-  ButtonGroup,
   ListItem,
   ListItemAvatar,
   Avatar,
@@ -14,7 +14,6 @@ import {
   CardMedia,
 } from "@material-ui/core";
 import { makeStyles } from "@material-ui/core/styles";
-import { Button, } from "react-bootstrap";
 import AddEventModal from "./popups/AddEventModal";
 import AddProjectModal from "./popups/AddProjectModal";
 import ArrowDropUpIcon from "@material-ui/icons/ArrowDropUp";
@@ -32,6 +31,7 @@ import eventImg2 from "../../../svgs/event-img-2.svg";
 import parse from "html-react-parser";
 import { withRouter } from 'react-router-dom'
 import { rsvpYes } from '../../../actions/eventAction'
+import Moment from 'react-moment'
 
 const styles = makeStyles((theme) => ({
   root: {
@@ -180,7 +180,9 @@ function NewsFeed(props) {
                 </ListItemAvatar>
                 <ListItemText className="main">
                   <h2>{post?.userId?.name?.firstName + " " + post?.userId?.name?.lastName}</h2>
-                  <small>{post?.createdAt}</small>
+                  <Moment format="DD MMM YYYY">
+                    {post?.createdAt}
+                  </Moment>
                 </ListItemText>
               </ListItem>
               <div className="post-details2">{parse(post?.content)}</div>
@@ -241,7 +243,7 @@ function NewsFeed(props) {
                             </ListItemAvatar>
                             <ListItemText className="main">
                                 <h2>{project?.createdBy?.name?.firstName + " " + project?.createdBy?.name?.lastName}</h2>
-                                <small>{project?.createdAt}</small>
+                                <Moment format="DD MMM YYYY">{project?.createdAt}</Moment>
                             </ListItemText>
                         </ListItem>
                         <div className="post-details2">{project?.description?.short}</div>
@@ -277,14 +279,16 @@ function NewsFeed(props) {
                                 <div className="event-schedule">
                                     <div className="event-date">
                                         <div className="date-content">
-                                            <small>DATE</small>
-                                            <h4>{event?.eventDate}</h4>
+                                            <small>DATE</small><br/>
+                                            <Moment format="DD MMM YYYY">
+                                              {event?.eventDate}
+                                            </Moment>
                                         </div>
                                     </div>
                                     <div className="event-time">
                                         <div className="time-content">
                                             <small>Location</small>
-                                            <h4>{event?.location}</h4>
+                                            <h5>{event?.location}</h5>
                                         </div>
                                     </div>
                                 </div>
@@ -308,7 +312,7 @@ function NewsFeed(props) {
                             </ListItemAvatar>
                             <ListItemText className="main">
                                 <h2>{event?.createdBy?.name?.firstName + " " + event?.createdBy?.name?.lastName}</h2>
-                                <small>{event?.createdAt}</small>
+                                <Moment format="DD MMM YYYY">{event?.createdAt}</Moment>
                             </ListItemText>
                         </ListItem>
                         <div className="post-details2">{event?.description?.shortDescription}</div>
@@ -414,55 +418,6 @@ function NewsFeed(props) {
         </div>
       </div>
     <div className="news__feed__container">
-      {/* <div className="posts">
-        <span className="category">
-          <span className="to-centre">
-            {first === "f" ? (
-              <Button
-                active
-                variant="primary"
-                className="category-btn"
-                onClick={handleClick("All")}
-              >
-                <span className="btn-content">All</span>
-              </Button>
-            ) : (
-              <Button
-                autoFocus
-                variant="primary"
-                className="category-btn"
-                onClick={handleClick("All")}
-              >
-                All
-              </Button>
-            )}
-            <span className="space"></span>
-            <Button
-              variant="primary"
-              className="category-btn"
-              onClick={handleClick("Post")}
-            >
-              <span className="btn-content">Posts</span>
-            </Button>
-            <span className="space"></span>
-            <Button
-              variant="primary"
-              className="category-btn"
-              onClick={handleClick("Event")}
-            >
-              <span className="btn-content">Events</span>
-            </Button>
-            <span className="space"></span>
-            <Button
-              variant="primary"
-              className="category-btn"
-              onClick={handleClick("Project")}
-            >
-              <span className="btn-content">Projects</span>
-            </Button>
-          </span>
-        </span>
-      </div> */}
       <div className="tabs__container">
         <span className="nav__tab container">
           <ul className="nav__list__container">
diff --git a/src/user/dashboard/news-feed/news-feed.scss b/src/user/dashboard/news-feed/news-feed.scss
@@ -129,7 +129,7 @@
                   border-bottom: 1px solid rgba(204, 204, 204, 0.7);
                   border-left: 1px solid rgba(204, 204, 204, 0.7);
                   .time-content {
-                    width: 50%;
+                    width: 90%;
                     margin: 0 auto;
                     small {
                       font-family: Inter;
diff --git a/src/user/dashboard/news-feed/popups/comment.js b/src/user/dashboard/news-feed/popups/comment.js
@@ -65,10 +65,14 @@ class Comment extends Component {
         </Col>
         <Col md={10}>
           <div className="contain">
-            <p className="user">{comment?.userId?.name?.firstName + " " + comment?.userId?.name?.lastName || "User name"}</p>
-            <p className="comment">{comment.content || "Comment content"}
-              {checkDeleteRights(comment.userId?._id) ? (<MdDelete size={20} className="delete__icon" onClick={this.onDelete.bind(this, comment._id)}
-              />) : null}
+            <p className="user">
+              {comment?.userId?.name?.firstName + " " + comment?.userId?.name?.lastName || "User name"}</p>
+            <p className="comment">
+              {comment.content || "Comment content"}
+              {checkDeleteRights(comment.userId?._id) 
+                ? (<MdDelete size={20} className="delete__icon" onClick={this.onDelete.bind(this, comment._id)}
+              />) 
+                : null}
             </p>
           </div>
         </Col>
diff --git a/src/user/dashboard/news-feed/popups/comment.scss b/src/user/dashboard/news-feed/popups/comment.scss
@@ -69,6 +69,7 @@
     .delete__icon {
         color: rgb(82, 82, 82);
         float: right;
+        cursor: pointer;
     }
 }
 
diff --git a/src/user/dashboard/portfolio/portfolio.js b/src/user/dashboard/portfolio/portfolio.js
@@ -5,6 +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 { clearInviteLink } from '../../../actions/usersAction'
 import { getProfile } from '../../../actions/usersAction'
 
 class Portfolio extends Component {
@@ -57,6 +58,7 @@ class Portfolio extends Component {
   }
   closeMembersList = () => {
     this.setState({ membersList: false })
+    this.props.clearInviteLink()
   }
   showFollowersList = () => {
     this.setState({ followersList: true });
@@ -69,6 +71,7 @@ class Portfolio extends Component {
   }
   hideAdminLists = () => {
     this.setState({ adminList: false })
+    this.props.clearInviteLink()
   }
   render() {
     const { members, admins, personalInfo, followers, followings } = this.state
@@ -120,4 +123,9 @@ const mapStateToProps = (state) => ({
   user: state.user
 })
 
-export default connect(mapStateToProps, { getMembers, getPersonalOverview, getProfile })(Portfolio);
+export default connect(mapStateToProps, {
+  getMembers, 
+  getPersonalOverview, 
+  getProfile,
+  clearInviteLink
+})(Portfolio);
diff --git a/src/user/organization/org-info/org-info.js b/src/user/organization/org-info/org-info.js
@@ -5,6 +5,7 @@ import { Avatar } from "@material-ui/core";
 import EditInfo from "../popups/EditInfo";
 import { connect } from 'react-redux';
 import { getOrgProfile } from '../../../actions/orgAction'
+import Moment from 'react-moment'
 
 class OrgInfo extends Component {
   constructor(props) {
@@ -65,7 +66,11 @@ class OrgInfo extends Component {
               Follow
             </Button> */}
           </h1>
-          <p className="profession">Created on: {createdAt || "NA"}</p>
+          <p className="profession mr-3">Created on: 
+            <Moment format="DD MMM YYYY">
+              {createdAt || "NA"}
+            </Moment>
+          </p>
           <p className="desc">
             {description?.shortDescription || "Short description of org "}
           </p>
diff --git a/src/user/organization/popups/Admins.js b/src/user/organization/popups/Admins.js
@@ -87,7 +87,7 @@ class Admins extends Component {
   copyToClipBoard = async (link) => {
     try {
       await navigator.clipboard.writeText(link);
-      if (this.state.inviteLink !== null) {
+      if (link) {
         toast.success('Link copied to clipboard!');
       }
     } catch (error) {
@@ -162,17 +162,20 @@ class Admins extends Component {
                   as="input"
                   defaultValue={inviteLink}
                   readOnly={true}
-                  onClick={this.copyToClipBoard.bind(this, inviteLink)}
                   placeholder="Get invite link"
                 ></Form.Control>
                 <Button
                   className="invite__btn"
-                  onClick={this.onGetInviteLink}
+                  onClick = {
+                    Boolean(inviteLink.length === 0) 
+                    ? this.onGetInviteLink 
+                    : this.copyToClipBoard.bind(this, inviteLink)
+                  }
                   disabled={Boolean(
                     whoCanSendInvite !== "ADMINS" || whoCanSendInvite !== "BOTH"
                   ) ? false : true }
                 >
-                  Get link
+                  {Boolean(inviteLink.length === 0) ? <>Get Link</> : <>Copy</>}
                 </Button>
               </div>
               {/* <div className="share__btn__container">
diff --git a/src/user/organization/popups/Members.js b/src/user/organization/popups/Members.js
diff --git a/src/user/pinned-posts/posts/pinPosts.js b/src/user/pinned-posts/posts/pinPosts.js
diff --git a/src/user/pinned-posts/posts/posts.scss b/src/user/pinned-posts/posts/posts.scss
diff --git a/src/user/profile/profile.js b/src/user/profile/profile.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
`@@ -140,4 +140,4 @@ export const setCurrentUser = (decodedData) => {`
`140`	`140`	`type: SET_CURRENT_USER,`
`141`	`141`	`payload: decodedData`
`142`	`142`	`}`
`143`		`-}`
	`143`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { GET_USER_PROFILE, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS, GET_INVITE_LINK } from '../actions/types'`
	`1`	`+import { GET_USER_PROFILE, UPDATE_USER_PROFILE, GET_USER_EVENTS, GET_USER_PROJECTS, GET_USER_POSTS, GET_INVITE_LINK, CLEAR_INVITE_LINK } from '../actions/types'`
`2`	`2`	`const initialState = {`
`3`	`3`	`userProfile: {},`
`4`	`4`	`userEvents: [],`
`@@ -45,6 +45,12 @@ export default (state = initialState, action) => {`
`45`	`45`	`inviteLink: action.payload`
`46`	`46`	`}`
`47`	`47`	`}`
	`48`	`+ case CLEAR_INVITE_LINK: {`
	`49`	`+ return {`
	`50`	`+ ...state,`
	`51`	`+ inviteLink: action.payload`
	`52`	`+ }`
	`53`	`+ }`
`48`	`54`	`default: {`
`49`	`55`	`return state`
`50`	`56`	`}`