Revert "Fix activity bug"

This reverts commit f2f8eeb.

Author: yxlau

Diff for: .gitignore

@@ -23,8 +23,6 @@
 client/logs
 client/*.log
 client/npm-debug.log*
-client/.git
-client/.gitignore
 
 # Dependency directories
 client/node_modules/

Diff for: client/README.md

@@ -85,13 +85,11 @@ export function removeCardMember(card_id, user_id) {
         if (!response.ok) {
           throw setError(response)
         }
-        return response.json()
       })
-      .then((json) => {
+      .then(() => {
         dispatch(deleteCardMemberSuccess({
           card_id: card_id,
-          member_id: user_id,
-          activities: json.activities
+          member_id: user_id
         }))
       })
       .catch(error => {
@@ -132,7 +130,8 @@ export function updateCard(data, card_id) {
         }
         return response.json()
       }).then(json => {
-        dispatch(updateCardSuccess(json))
+        const massaged = arrayToObjectByID([json])
+        dispatch(updateCardSuccess(massaged))
       }).catch(error => {
         dispatch(updateCardFailure(error))
       })

Diff for: client/dist/bundle.js

@@ -47,7 +47,6 @@ class ListCard extends Component {
     const { title, member_ids, description, activities, id } = card
     let memberList = ''
 
-    console.log('activities', activities)
 
     if (member_ids) {
       memberList = member_ids.map(member_id => {

Diff for: client/src/actions/cardActions.js

@@ -1,5 +1,4 @@
-// export const baseURL = 'https://nameless-beyond-77500.herokuapp.com'
-export const baseURL = 'http://localhost:3000'
+export const baseURL = 'https://nameless-beyond-77500.herokuapp.com'
 
 export function arrayToObjectByID(data) {
   let massaged = {}

Diff for: client/src/components/ListCard.js

@@ -1,3 +1,9 @@
+// updated card
+//  object: list, title, description, card, membership
+// verb: update, create, destroy
+// value: ...
+// user: name
+
 export function activitySentence(name, verb, object, value) {
 
 
@@ -7,8 +13,8 @@ export function activitySentence(name, verb, object, value) {
       card: `${name} created this card`
     },
     update: {
-      title: `${name} changed the title to '${value}'`,
-      description: `${name} changed the description to '${value}'`,
+      title: `${name} changed the title to ${value}`,
+      description: `${name} changed the description to ${value}`,
       list: `${name} moved the card to ${value}`
     },
     destroy: {

Diff for: client/src/helpers/actionHelpers.js

@@ -37,7 +37,6 @@ function authentication(state = initialState, action) {
       return {
         ...state,
         token: null,
-        isLoggedIn: false,
       }
     case Actions.CREATE_USER_SUCCESS:
       return {

Diff for: client/src/helpers/activityHelpers.js

@@ -20,12 +20,17 @@ export default function board(state = initialState, action) {
       }
     case Actions.GET_BOARD_SUCCESS:
     case Actions.CREATE_BOARD_SUCCESS:
-    case Actions.UPDATE_BOARD_SUCCESS:
       return {
         ...state,
         ...data.board,
         isFetching: false
       }
+    case Actions.UPDATE_BOARD_SUCCESS:
+      return {
+        ...state,
+        isFetching: false,
+        ...data.board,
+      }
     case Actions.GET_BOARD_FAILURE:
     case Actions.UPDATE_BOARD_FAILURE:
     case Actions.CREATE_BOARD_FAILURE:

Diff for: client/src/reducers/authReducer.js

@@ -36,7 +36,7 @@ export default function cards(state = initialState, action) {
     case Actions.UPDATE_CARD_SUCCESS:
       return {
         ...state,
-        error: {},
+        error: null,
         isFetching: false,
         cards: {
           ...state.cards,
@@ -53,30 +53,27 @@ export default function cards(state = initialState, action) {
     case Actions.DELETE_CARD_MEMBER_SUCCESS:
       return {
         ...state,
-        error: {},
+        error: null,
         isFetching: false,
         cards: {
           ...state.cards,
           [data.card_id]: {
             ...state.cards[data.card_id],
             member_ids: state.cards[data.card_id]['member_ids'].filter(member =>
-              member !== data.member_id),
-            activities: data.activities
-
+              member !== data.member_id)
           }
         },
       }
     case Actions.ADD_CARD_MEMBER_SUCCESS:
       return {
         ...state,
-        error: {},
+        error: null,
         isFetching: false,
         cards: {
           ...state.cards,
           [data.card_id]: {
             ...state.cards[data.card_id],
-            member_ids: [...state.cards[data.card_id]['member_ids'], data.member_id],
-            activities: data.activities
+            member_ids: [...state.cards[data.card_id]['member_ids'], data.member_id]
           }
         },
       }

Diff for: client/src/reducers/boardReducer.js

@@ -13,15 +13,13 @@ function user(state = initialState, action) {
   const data = action.data
   switch (action.type) {
     case Actions.GET_USER_REQUEST:
-    case Actions.CREATE_USER_REQUEST:
       return {
         ...state,
         isFetching: true,
-        error: {},
+        error: null,
+        ...action.data
       }
     case Actions.GET_USER_FAILURE:
-    case Actions.CREATE_USER_FAILURE:
-
       return {
         ...state,
         isFetching: false,
@@ -39,13 +37,25 @@ function user(state = initialState, action) {
         ...state,
         users: data.users
       }
+    case Actions.CREATE_USER_REQUEST:
+      return {
+        ...state,
+        isFetching: true,
+        error: {}
+      }
     case Actions.CREATE_USER_SUCCESS:
       return {
         ...state,
         isFetching: false,
         name: action.data.name,
         id: action.data.id
       }
+    case Actions.CREATE_USER_FAILURE:
+      return {
+        ...state,
+        isFetching: false,
+        error: action.data
+      }
     default:
       return state
   }