Merge in iteration by Just5Coders

client/App.jsx

@@ -30,15 +30,23 @@ class App extends Component {
     const { isLoggedIn } = this.props;
     if (!isLoggedIn) {
       return (
-        <div id="landing">
+        <div className="flex-container" id="login-page">
+          <div>
+            <img src="image/logo2.png" alt="" />
+          </div>
+          {/* Github Oauth Login Button */}
           <form id="login-form" method="GET" action="/login/oauth">
-            <img id="logo" src="logo2.png" alt="" />
-            <button
-              className="btn btn-outline-primary btn-lg"
-              id="github-login"
-              type="submit"
-            >
-              GitHub Login
+            <button className="btn btn-outline-secondary btn-lg btn-login" type="submit">
+              <div className="flex-container">
+                <div id="github-logo" className="flex-container">
+                  <svg id="i-github" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="24" height="24">
+                    <path strokeWidth="0" fill="currentColor" d="M32 0 C14 0 0 14 0 32 0 53 19 62 22 62 24 62 24 61 24 60 L24 55 C17 57 14 53 13 50 13 50 13 49 11 47 10 46 6 44 10 44 13 44 15 48 15 48 18 52 22 51 24 50 24 48 26 46 26 46 18 45 12 42 12 31 12 27 13 24 15 22 15 22 13 18 15 13 15 13 20 13 24 17 27 15 37 15 40 17 44 13 49 13 49 13 51 20 49 22 49 22 51 24 52 27 52 31 52 42 45 45 38 46 39 47 40 49 40 52 L40 60 C40 61 40 62 42 62 45 62 64 53 64 32 64 14 50 0 32 0 Z" />
+                  </svg>
+                </div>
+                <div id="github-login">
+                  GitHub Login
+                </div>
+              </div>
             </button>
           </form>
         </div>

client/actions/leaderActions.js

@@ -0,0 +1,34 @@
+/**
+ * ************************************
+ *
+ * @module  leaderActions.js
+ * @author Kritika & Aris
+ * @date 02/26/2020
+ * @description Action Creators for leaderReducer
+ *
+ * ************************************
+ */
+
+// import actionType constants
+import axios from "axios";
+import * as types from "../constants/actionTypes";
+
+
+// CHECK BACK ON THIS - NOT QUITE DONE YET**
+export const getLeaderBoard = () => dispatch =>
+    axios
+        .get("/api/leaderboard")
+        .then(({ data }) => {
+            if (!data.isLoggedIn) {
+              dispatch({
+                type: types.USER_LOGOUT,
+                payload: data,
+              })
+            }
+            else {
+                dispatch({
+                    type: types.LEADER_BY_TOPIC,
+                    payload: data
+                })
+            }
+        })

client/actions/ticketActions.js

@@ -10,17 +10,43 @@
  */
 
 // import actionType constants
-import axios from 'axios';
-import * as types from '../constants/actionTypes';
+import axios from "axios";
+import * as types from "../constants/actionTypes";
 
-export const postTicket = () => (dispatch, getState) =>
+
+export const updateMessage = event => ({
+  type: types.UPDATE_MESSAGE,
+  payload: event.target.value
+});
+
+export const chooseTopic = event => ({
+  type: types.CHOOSE_TOPIC,
+  payload: event.target.value
+});
+
+export const updateRating = value => ({
+  type: types.UPDATE_RATING,
+  payload: value,
+});
+
+export const toggleModal = messageInfo => ({
+  type: types.TOGGLE_MODAL,
+  payload: messageInfo
+});
+
+export const updateFeedback = event => ({
+  type: types.UPDATE_FEEDBACK,
+  payload: event.target.value
+});
+
+export const updateFinalRating = value => ({
+  type: types.UPDATE_FINAL_RATING,
+  payload: value,
+});
+
+export const getTickets = () => dispatch => {
   axios
-    .post('/api/tickets', {
-      mentee_id: getState().user.userId,
-      message: getState().tickets.messageInput,
-      status: 'active',
-      snaps_given: getState().tickets.messageRating,
-    })
+    .get('/api/tickets')
     .then(({ data }) => {
       if (!data.isLoggedIn) {
         dispatch({
@@ -30,45 +56,92 @@ export const postTicket = () => (dispatch, getState) =>
       }
       else {
         dispatch({
-          type: types.POST_TICKET,
-          payload: data,
+          type: types.GET_TICKETS,
+          payload: data.activeTickets || [],
         })
-      }     
+      }
     })
+}
 
-export const getTickets = () => dispatch =>
+
+export const postTicket = () => (dispatch, getState) => {
   axios
-    .get('/api/tickets')
+    .post("/api/tickets", {
+      mentee_id: getState().user.userId,
+      message: getState().tickets.messageInput,
+      status: "active",
+      snaps_given: getState().tickets.messageRating,
+      topic: getState().tickets.topic,
+    })
     .then(({ data }) => {
       if (!data.isLoggedIn) {
         dispatch({
           type: types.USER_LOGOUT,
+          payload: data
+        });
+      } else {
+        dispatch({
+          type: types.POST_TICKET,
+
           payload: data,
         })
       }
-      else {
+    })
+}
+
+export const deleteTicket = id => (dispatch, getState) => {
+  axios
+    .put("/api/tickets/delete", {
+      ticketId: id,
+      status: "deleted"
+    })
+    .then(({ data }) => {
+      if (!data.isLoggedIn) {
         dispatch({
-          type: types.GET_TICKETS,
-          payload: data.activeTickets || [],
+          type: types.USER_LOGOUT,
+          payload: data
+        });
+      } else {
+        dispatch({
+          type: types.DELETE_TICKET,
+          payload: id,
         })
-      }     
+      }
     })
+}
 
-export const updateMessage = event => ({
-  type: types.UPDATE_MESSAGE,
-  payload: event.target.value,
-});
 
-export const updateRating = event => ({
-  type: types.UPDATE_RATING,
-  payload: event.target.value,
-});
+export const resolveTicket = id => (dispatch, getState) => {
+  axios
+  .put('/api/tickets/resolved', {
+    messageId : id,
+    status: 'resolved',
+    messageRating: getState().tickets.resolveModal.finalSnaps,
+    feedback: getState().tickets.resolveModal.feedback,
+  })
+  .then(({data}) => {
+    if(!data.isLoggedIn) {
+      dispatch({
+        type: types.USER_LOGOUT,
+        payload: data,
+      })
+    } 
+    else {
+      dispatch({
+        type: types.RESOLVE_TICKET,
+        payload: id,
+      })
+    }
+  })
+}
 
-export const deleteTicket = id => (dispatch, getState) =>
+
+export const acceptTicket = id => (dispatch, getState) => {
   axios
-    .put('/api/tickets/delete', {
+    .put('/api/tickets/accept', {
       ticketId: id,
-      status: 'deleted',
+      status: 'pending',
+      mentorId: getState().user.userId
     })
     .then(({ data }) => {
       if (!data.isLoggedIn) {
@@ -79,31 +152,38 @@ export const deleteTicket = id => (dispatch, getState) =>
       }
       else {
         dispatch({
-          type: types.DELETE_TICKET,
-          payload: id,
+          type: types.ACCEPT_TICKET,
+          payload: {
+            id,
+            mentorId: getState().user.userId,
+          }
         })
-      }     
+      }
     })
+};
 
-export const resolveTicket = id => ({
-  type: types.RESOLVE_TICKET,
-  payload: id,
-})
-
-export const acceptTicket = id => ({
-  type: types.ACCEPT_TICKET,
-  payload: id,
-})
-
-export const cancelAccept = id => ({
-  type: types.CANCEL_ACCEPT,
-  payload: id,
-})
-
-// export const acceptTicket = event => (dispatch, getState) => {
-//   event.preventDefault();
-//   dispatch({
-//     type: types.ACCEPT_TICKET,
-//     payload: ticket,
-//   })
-// }
+export const cancelAccept = id => (dispatch, getState) => {
+  axios
+    .put('/api/tickets/accept', {
+      ticketId: id,
+      status: 'active',
+      mentorId: getState().user.userId
+    })
+    .then(({ data }) => {
+      if (!data.isLoggedIn) {
+        dispatch({
+          type: types.USER_LOGOUT,
+          payload: data,
+        })
+      } else {
+        dispatch({
+          type: types.CANCEL_ACCEPT,
+          payload: {
+            ticketId: id,
+            status: 'active',
+            mentorId: null
+          }
+        })
+      }
+    })
+};