Skip to content

Fix issue #247 clean code #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gerald1614 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix issue #247 clean code #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cb1660
fix deletion and update of comment refresh issue
Nov 22, 2018
00f6569
changed method to update newContent with store instead of fetching
Nov 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .env.example
View file
Open in desktop

This file was deleted.

11 changes: 4 additions & 7 deletions components/Comments/Comment.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
class="button is-hidden-mobile"
color="light"
:disabled="isLoading"
@click="cancelEdit">
@click.prevent="cancelEdit">
{{ $t('button.cancel') }}
</hc-button>
<hc-button
Expand Down Expand Up @@ -140,7 +140,8 @@
computed: {
...mapGetters({
showComment: 'comments/showComment',
user: 'auth/user'
user: 'auth/user',
fetchById: 'comments/fetchById',
}),
getText () {
return (this.fullContentShown && this.content)
Expand All @@ -166,7 +167,6 @@
},
methods: {
...mapActions({
fetchById: 'comments/fetchById',
remove: 'comments/remove',
patch: 'comments/patch'
}),
Expand All @@ -185,12 +185,9 @@
})
},
startEdit () {
this.fetchById(this.comment._id)
.then((res) => {
this.newContent = res.content
this.newContent = this.fetchById(this.comment._id).contentExcerpt
this.edit = true
this.fullContentShown = false;
})
},
cancelEdit () {
this.edit = false
Expand Down
26 changes: 21 additions & 5 deletions store/comments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ export const mutations = {
},
setContributionId (state, contributionId) {
state.contributionId = contributionId
},
updateComment (state, data) {
state.comments[state.comments.findIndex(comment => comment._id === data._id)].contentExcerpt = data.content
},
removeComment (state, id) {
const cmt = state.comments[state.comments.findIndex(comment => comment._id === id)]
cmt.deleted = true
}
}

Expand All @@ -43,6 +50,9 @@ export const getters = {
},
count (state) {
return state.commentCount
},
fetchById: (state) => (id) => {
return state.comments.find(comment => comment._id === id)
}
}

Expand Down Expand Up @@ -96,9 +106,9 @@ export const actions = {
commit('isLoading', false)
})
},
fetchById ({commit}, id) {
return this.app.$api.service('comments').get(id)
},
// fetchById ({commit}, id) {
// return this.app.$api.service('comments').get(id)
// },
upvote ({dispatch}, comment) {
return this.app.$api.service('comments').patch(comment._id, {
$inc: {
Expand All @@ -111,10 +121,16 @@ export const actions = {
create ({dispatch}, data) {
return this.app.$api.service('comments').create(data)
},
patch ({dispatch}, data) {
patch ({commit}, data) {
return this.app.$api.service('comments').patch(data._id, data)
.then(() => {
commit('updateComment', data)
})
},
remove ({dispatch}, id) {
remove ({commit}, id) {
return this.app.$api.service('comments').remove(id)
.then(() => {
commit('removeComment', id)
})
}
}