Implemented trigger maintenance mode, integrated RSVP for event, fixing inconsistencies

package.json

@@ -23,7 +23,7 @@
     "react-cookies": "^0.1.1",
     "react-dom": "^16.12.0",
     "react-dropzone": "^11.0.1",
-    "react-icons": "^3.9.0",
+    "react-icons": "^3.10.0",
     "react-images": "^1.1.7",
     "react-lottie": "^1.2.3",
     "react-markdown-editor-lite": "^1.1.4",
@@ -32,6 +32,7 @@
     "react-router-dom": "^5.1.2",
     "react-scripts": "^3.4.0",
     "react-spinners": "^0.8.3",
+    "react-switch": "^5.0.1",
     "react-toastify": "^6.0.5",
     "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",

src/actions/adminAction.js

@@ -40,6 +40,9 @@ export const loginAdmin = (adminInfo, history) => async (dispatch) => {
      localStorage.setItem('userId', decodedData._id)
      dispatch(setCurrentUser(decodedData));
 
+     // update localStorage with admin status 
+     localStorage.setItem('admin', true)
+
      dispatch({
        type: SET_ADMIN,
        payload: true

src/actions/authAction.js

@@ -1,4 +1,4 @@
-import { SET_CURRENT_USER, GET_USER_PROFILE, PASSWORD_SUCCESSFULLY_CHANGED, PASSWORD_CHANGE_REQUEST_SUCCESS } from './types';
+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 jwt_decode from 'jwt-decode';
@@ -46,8 +46,19 @@ export const loginUser = (userInfo, history) => async (dispatch) => {
       const decodedData = await jwt_decode(token);
       localStorage.setItem('userId', decodedData._id)
       dispatch(setCurrentUser(decodedData));
-      history.push("/dashboard");
 
+      // update user role in localStorage
+      localStorage.setItem('admin', res.data.user.isAdmin)
+
+      // store orgId in localStorage
+      localStorage.setItem('orgId', res.data.user.orgId);
+
+      // if user is admin update admin in store 
+      dispatch({
+        type: SET_ADMIN,
+        payload: res.data.user.isAdmin
+      })
+      history.push("/dashboard");
     }
   } catch(error) {
       dispatch(errorHandler(error));
@@ -104,10 +115,10 @@ export const logoutUser = () => async (dispatch) => {
      // clear token from backend 
      const res = await axios.post('/user/logout')
      if (res.status === 200) {
-      // remove token from the localStorage 
-      localStorage.removeItem('jwtToken');
-      // remove userID 
-      localStorage.removeItem('userId')
+      // remove all keys from the localStorage except the orgId
+      const orgId = localStorage.getItem('orgId');
+      localStorage.clear()
+      localStorage.setItem('orgId', orgId)
       // delete authorization from the header 
       setAuthToken(false);
       // set user to {}

src/actions/eventAction.js

@@ -80,4 +80,19 @@ export const getEventById = (eventId) => async (dispatch) => {
   } catch(error) {
     dispatch(errorHandler(error))
   }
+}
+
+// RSVP FOR EVENT SECTION
+export const rsvpYes = (eventId, info) => async (dispatch) => {
+  try {
+    const res = await axios.patch(`/event/rsvp/${eventId}`, info);
+    dispatch(setRequestStatus(false))
+    if(res.status === 200) {
+      dispatch(setRequestStatus(true));
+      console.log('Doing rsvp for the event', res.data);
+      dispatch(getAllEvents());
+    }
+  } catch (error) {
+    dispatch(errorHandler(error))
+  }
 }

src/actions/orgAction.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import { setRequestStatus } from '../utils/setRequestStatus'
 import { errorHandler } from '../utils/errorHandler'
-import { GET_ORG_PROFILE, UPDATE_ORG_PROFILE, DEACTIVATE_ORG, GET_ALL_MEMBERS } from './types'
+import { GET_ORG_PROFILE, UPDATE_ORG_PROFILE, DEACTIVATE_ORG, GET_ALL_MEMBERS, TRIGGER_MAINTENANCE } from './types'
 
 // CREATE COMMUNITY
 export const registerCommunity  = (orgInfo) => async (dispatch) => {
@@ -120,4 +120,24 @@ export const deactivateOrg = () => async (dispatch) => {
   } catch(error) {
     dispatch(errorHandler(error))
   }
+}
+
+// TRIGGER MAINTENANCE MODE
+export const TriggerMaintenance = () => async (dispatch) => {
+  try {
+    const orgId = localStorage.getItem('orgId')
+    const res = await axios.patch(`/org/${orgId}/maintenance`);
+    dispatch(setRequestStatus(false))
+    if(res.status === 200) {
+      dispatch(setRequestStatus(true))
+      // set maintenance to true in localStorage 
+      localStorage.setItem('isMaintenance', res.data.maintenance);
+      dispatch({
+        type: TRIGGER_MAINTENANCE,
+        payload: res.data.maintenance
+      })
+    }
+  } catch (error) {
+    dispatch(errorHandler(error))
+  }
 }

src/actions/postAction.js

@@ -37,4 +37,19 @@ export const getAllPinnedPosts = (pagination = 10, page = 1) => async (dispatch)
   } catch(error) {
     dispatch(errorHandler(error))
   }
-}
+}
+
+// UPVOTE POST
+export const upVotePost = (postId) => async (dispatch) => {
+  try {
+    const res = await axios.patch(`/post/upvote/${postId}`)
+    dispatch(setRequestStatus(false));
+    if(res.status === 200) {
+      dispatch(setRequestStatus(true));
+      console.log('successfully upvoted post ', res.data)
+      dispatch(getAllPosts());
+    }
+  } catch (error) {
+    dispatch(errorHandler(error))
+  }
+}

src/actions/types.js

@@ -39,8 +39,8 @@ export const GET_EVENT_BY_ID = "GET_EVENT_BY_ID";
 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_CHANGE_REQUEST_SUCCESS = "PASSWORD_CHANGE_REQUEST_SUCCESS";
 export const PASSWORD_SUCCESSFULLY_CHANGED = "PASSWORD_SUCCESSFULLY_CHANGED";
 export const GET_INVITE_LINK = "GET_INVITE_LINK";
 export const PROCESS_INVITE_LINK = "PROCESS_INVITE_LINK";
+export const TRIGGER_MAINTENANCE = "TRIGGER_MAINTENANCE";

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 } 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 } from './types'
 import { errorHandler } from '../utils/errorHandler'
 import axios from 'axios'
 import { setRequestStatus } from '../utils/setRequestStatus'
@@ -15,6 +15,13 @@ export const getProfile = () => async (dispatch)=> {
         type: GET_USER_PROFILE,
         payload: res.data.user
       })
+      // if user is admin
+      if(res.data.user.isAdmin === true) {
+        dispatch({
+          type: SET_ADMIN,
+          payload: true
+        })
+      }
     }
   } catch(error) {
     dispatch(errorHandler(error))
@@ -160,9 +167,9 @@ export const getPostsCreatedByUser = (pagination = 10, page = 1) => async (dispa
 }
 
 // GET INVITE LINK 
-export const getInviteLink = () => async (dispatch) => {
+export const getInviteLink = (role) => async (dispatch) => {
   try {
-    const res = await axios.get('/user/invite')
+    const res = await axios.get(`/user/invite?role=${role}`)
     dispatch(setRequestStatus(false));
     if(res.status === 200) {
       dispatch(setRequestStatus(true));
@@ -187,7 +194,7 @@ export const processInviteToken = (token) => async (dispatch) => {
       console.log('Processing the invite link ', res.data);
       dispatch({
         type: PROCESS_INVITE_LINK,
-        payload: res.data.success || res.data.msg
+        payload: res.data.redirectTo || res.data.msg
       })
     }
   } catch(error) {

src/auth/login-form/login-form.scss

@@ -2,7 +2,8 @@
   padding: 15px 0;
   .form-group {
     label {
-      color: #00abff;
+      color: #1a73e8;
+      font-family: Inter;
     }
   }
   .cta-login {
@@ -11,8 +12,9 @@
     justify-content: center;
     margin-top: 30px;
     button {
-      padding: 8px 10px;
-      border-radius: 30px;
+      width: 104px;
+      background-color: #1a73e8;
+      // border-radius: 30px;
     }
   }
 }
@@ -22,6 +24,7 @@
   align-items: center;
   justify-content: center;
   margin-top: 10px;
+  color: #1a73e8;
 }
 #validation_msg {
   color: rgb(247, 134, 134);
@@ -30,7 +33,7 @@
 
 .loginbtn {
   border: 1px solid rgb(211, 220, 228);
-  border-radius: 3px;
+  // border-radius: 3px;
   width: 45%;
 }
 

src/auth/login/login.js

@@ -4,6 +4,8 @@ import LoginForm from "../login-form/login-form";
 import SignUpForm from "../signup-form/signup-form";
 import { DonutTitle } from "../../donutTitle/donutTitle";
 import multipleDonuts from "../../images/extra-donuts.png";
+import GoogleLogin from '../../images/icons8-google-48.png'
+import { FaGoogle, FaGithub } from 'react-icons/fa'
 import "./login.scss";
 
 class Login extends Component {
@@ -55,40 +57,24 @@ class Login extends Component {
                 ? "Or Sign In with"
                 : "Or SignUp with"}
             </p>
-            <Row>
-              <Col className="button-column">
+            <div className="login__options">
+              <div className="">
                 <a
-                  href="http://localhost:4000/auth/google"
+                  href="http://localhost:5000/auth/google"
                   style={{ padding: "1vh" }}
                 >
-                  <Button
-                    className="selectorbtn"
-                    type="submit"
-                    variant="primary"
-                    color="primary"
-                    size="sm"
-                  >
-                    <span className="selectorbtn-content">Google</span>
-                  </Button>
+                  <img src={GoogleLogin} alt="Google" className="google__login"/>
                 </a>
-              </Col>
-              <Col className="button-column">
+              </div>
+              <div className="" >
                 <a
-                  href="http://localhost:4000/auth/github"
+                  href="http://localhost:5000/auth/github"
                   style={{ padding: "1vh" }}
                 >
-                  <Button
-                    className="selectorbtn"
-                    type="submit"
-                    variant="primary"
-                    color="primary"
-                    size="sm"
-                  >
-                    <span className="selectorbtn-content">Github</span>
-                  </Button>
+                  <FaGithub color="#24292e" className="github__login"/>
                 </a>
-              </Col>
-            </Row>
+              </div>
+            </div>
             <p className="login-text-selector">
               {this.state.activeForm === "login"
                 ? "Don't have an account? "