Merge branch 'development' into feature-tickets

Author: ksraj123

README.md

@@ -53,6 +53,7 @@ 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 GET_WIKIS = "GET_WIKIS";
 export const CLEAR_INVITE_LINK = "CLEAR_INVITE_LINK";
 export const GET_LOGIN_OPTIONS = "GET_LOGIN_OPTIONS";
 export const GET_TICKETs = "GET_TICKETs";

package-lock.json

@@ -216,7 +216,7 @@ export const activateDeactivateToggler = () => async (dispatch) => {
     const res = await axios.patch(`${BASE_URL}/user/deactivate/toggler`)
     if (res.status === 200) {
       console.log('Deactivation toggler', res.data);
-      dispatch(getProfile());
+      dispatch(getProfile(userId));
     }
   } catch (error) {
     dispatch(errorHandler(error))

src/actions/types.js

@@ -0,0 +1,16 @@
+import axios from "axios";
+import { GET_WIKIS } from "./types";
+import { BASE_URL } from "./baseApi";
+import { errorHandler } from "../utils/errorHandler";
+
+export const getWikis = () => async (dispatch) => {
+  try {
+    const res = await axios.get(`${BASE_URL}/wikis`);
+    dispatch({
+      type: GET_WIKIS,
+      payload: res.data.wikis,
+    });
+  } catch (error) {
+    dispatch(errorHandler(error));
+  }
+};

src/actions/usersAction.js

@@ -5,7 +5,7 @@ import { MdVerifiedUser } from 'react-icons/md';
 import { FaUserSlash } from 'react-icons/fa';
 import { connect } from 'react-redux';
 import { forgotPassword, changePassword } from '../actions/authAction';
-import { activateDeactivateToggler } from '../actions/usersAction';
+import { activateDeactivateToggler, updateProfile } from '../actions/usersAction';
 import { ToastContainer, toast } from "react-toastify";
 import "react-toastify/dist/ReactToastify.css";
 
@@ -415,5 +415,6 @@ const mapStateToProps = (state) => {
 export default connect( mapStateToProps, { 
   forgotPassword, 
   changePassword, 
+  updateProfile,
   activateDeactivateToggler
  })(Popups);

src/actions/wikisAction.js

@@ -15,6 +15,7 @@ import adminReducers from "./adminReducers";
 import commentReducer from "./commentReducer";
 import analyticsReducer from './analyticsReducer';
 import ticketReducer from './ticketReducer';
+import wikisReducer from './wikisReducer';
 
 const rootReducer = combineReducers({
   auth: authReducers,
@@ -23,6 +24,7 @@ const rootReducer = combineReducers({
   notification: notificationReducer,
   error: errorReducer,
   dashboard: dashboardReducer,
+  wikis: wikisReducer,
   insight: insightReducer,
   org: orgReducer,
   event: eventReducer,

src/common/Popups.js

@@ -0,0 +1,20 @@
+import { GET_WIKIS } from "../actions/types";
+const initialState = {
+  wikis: "",
+};
+
+export default (state = initialState, action) => {
+  switch (action.type) {
+    case GET_WIKIS: {
+      console.log(`Action Recieved in reducer! ${action.type}`);
+      console.log(action.payload);
+      return {
+        ...state,
+        wikis: action.payload,
+      };
+    }
+    default: {
+      return state;
+    }
+  }
+};

src/reducers/index.js

@@ -5,6 +5,7 @@ import Dashboard from "./user/dashboard/dashboard";
 import PinnedPosts from "./user/pinned-posts/pinned-posts";
 import Profile from "./user/profile/profile";
 import Organization from "./user/organization/organization";
+import Wikis from "./user/wikis/Wikis";
 import NotFound from "./404/notFound";
 import Settings from "./user/dashboard/settings/Settings";
 import Projects from "./user/projects/projects";
@@ -36,6 +37,7 @@ const Router = () => (
       <PrivateRoute exact path="/profile/:id" component={Profile} />
       <PrivateRoute exact path="/:id/proj-info" component={ProjInfo} />
       <PrivateRoute exact path="/organization" component={Organization} />
+      <PrivateRoute exact path="/wikis" component={Wikis} />
       <PrivateRoute exact path="/settings" component={Settings} />
       <PrivateRoute exact path="/projects" component={Projects} />
       <PrivateRoute exact path="/events" component={Events} />

src/reducers/wikisReducer.js

@@ -105,7 +105,11 @@ class Navigation extends Component {
               className={this.props.org ? "active" : "inactive"}
               link="/organization"
             />
-
+            <ListItem
+              name="Wikis"
+              className={this.props.wikis ? "active" : "inactive"}
+              link="/wikis"
+            />
             <ListItem
               name="Events"
               className={this.props.event ? "active" : "inactive"}
@@ -205,7 +209,12 @@ class Navigation extends Component {
               link="/organization"
               isMobile="true"
             />
-
+            <ListItem
+              name="Wikis"
+              className={this.props.wikis ? "active" : "inactive"}
+              link="/wikis"
+              isMobile="true"
+            />
             <ListItem
               name="Events"
               className={this.props.event ? "active" : "inactive"}