Fix activity bug

Author: yxlau

.gitignore

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

client/README.md

@@ -0,0 +1,21 @@
+# ☑︎ Djello
+![](https://user-images.githubusercontent.com/22121223/33110355-3769d06c-cf82-11e7-827f-249ee6fb7258.png)
+
+## Live Demo of Djello
+Live demo of Djello, a simple, clean, [Trello](http://trello.com) clone.
+
+Give Djello a whirl at [http://yxlau.github.io/project_djello_react](http://yxlau.github.io/project_djello_react). 
+
+### Logging In
+Sign in with any of the following email addresses: `[email protected]`, `[email protected]`, `[email protected]`
+
+Password: `password!`
+
+### Signing Up
+Alternatively, you can create your own account at the site.
+
+## About
+Visit the main repo at [https://github.com/yxlau/project_djello](https://github.com/yxlau/project_djello) to find out more.
+
+## Authors
+- yxlau ([https://github.com/yxlau](https://github.com/yxlau))

client/dist/bundle.js

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

client/src/actions/cardActions.js

@@ -47,6 +47,7 @@ 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 => {

client/src/components/ListCard.js

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

client/src/helpers/actionHelpers.js

@@ -1,9 +1,3 @@
-// updated card
-//  object: list, title, description, card, membership
-// verb: update, create, destroy
-// value: ...
-// user: name
-
 export function activitySentence(name, verb, object, value) {
 
 
@@ -13,8 +7,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: {

client/src/helpers/activityHelpers.js

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

client/src/reducers/authReducer.js

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

client/src/reducers/boardReducer.js

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

client/src/reducers/cardReducer.js

@@ -13,13 +13,15 @@ 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: null,
-        ...action.data
+        error: {},
       }
     case Actions.GET_USER_FAILURE:
+    case Actions.CREATE_USER_FAILURE:
+
       return {
         ...state,
         isFetching: false,
@@ -37,25 +39,13 @@ 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
   }