Merge pull request #639 from ksraj123/feature-tickets

Feature tickets

Author: vaibhavdaren

package-lock.json

@@ -29,6 +29,7 @@
     "react-chartjs-2": "^2.9.0",
     "react-content-loader": "^5.0.4",
     "react-cookies": "^0.1.1",
+    "react-data-table-component": "^6.11.0",
     "react-datepicker": "^3.1.3",
     "react-dom": "^16.12.0",
     "react-dropzone": "^11.0.1",
@@ -38,6 +39,7 @@
     "react-loading-overlay": "^1.0.1",
     "react-lottie": "^1.2.3",
     "react-markdown": "^4.3.1",
+    "react-markdown-editor-lite": "^1.1.4",
     "react-mde": "^10.2.1",
     "react-moment": "^0.9.7",
     "react-redux": "^7.2.0",

package.json

@@ -47,12 +47,20 @@ export const loginUser = (userInfo, history) => async (dispatch) => {
 
       // update state with user
       const decodedData = await jwt_decode(token);
-      localStorage.setItem('userId', decodedData._id)
+      console.log("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! PRINTING RES.DATA.USER !!!!!!!!!!!!!!1");
+      console.log(res.data.user);
+      localStorage.setItem('userId', res.data.user._id)
       dispatch(setCurrentUser(decodedData));
 
+      // Update user name in localStorage
+      localStorage.setItem('username', `${res.data.user.name.firstName} ${res.data.user.name.lastName}`)
+
       // update user role in localStorage
       localStorage.setItem('admin', res.data.user.isAdmin)
 
+      // update user role in localStorage
+      localStorage.setItem('ticketModerator', res.data.user.isTicketsModerator)
+
       // store orgId in localStorage
       localStorage.setItem('orgId', res.data.user.orgId);
 

src/actions/authAction.js

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

src/actions/ticketAction.js

@@ -56,3 +56,4 @@ export const ACTIVATE_DEACTIVATE_ACCOUNT_TOGGLER = "ACTIVATE_DEACTIVATE_ACCOUNT_
 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";

src/actions/types.js

@@ -14,6 +14,7 @@ import proposalReducer from "./proposalReducer";
 import adminReducers from "./adminReducers";
 import commentReducer from "./commentReducer";
 import analyticsReducer from './analyticsReducer';
+import ticketReducer from './ticketReducer';
 import wikisReducer from './wikisReducer';
 
 const rootReducer = combineReducers({
@@ -32,7 +33,8 @@ const rootReducer = combineReducers({
   proposal: proposalReducer,
   admin: adminReducers,
   comment: commentReducer,
-  analytics: analyticsReducer
+  analytics: analyticsReducer,
+  tickets: ticketReducer
 });
 
 export default rootReducer;

src/reducers/index.js

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

src/reducers/ticketReducer.js

@@ -24,6 +24,7 @@ import AdminRoute from "./common/AdminRoute";
 import Activity from "./user/Activity/Activity";
 import IntegrationsPage from "./user/integrations/IntegrationsPage/IntegrationsPage";
 import UserIntegrations from "./user/integrations/UserIntegrations/UserIntegrations";
+import TicketDashboard from "../src/user/Admin/Tickets/TicketDashboard";
 
 const Router = () => (
   <BrowserRouter>
@@ -58,6 +59,7 @@ const Router = () => (
         path="/userintegrations"
         component={UserIntegrations}
       />
+      <PrivateRoute exact path="/tickets" component={TicketDashboard} />
       <Route component={NotFound} />
     </Switch>
   </BrowserRouter>