Skip to content

Commit

Permalink
remove unused files, fix checklist scoring and start adding support f…
Browse files Browse the repository at this point in the history
…or groups tasks
  • Loading branch information
paglias committed Aug 4, 2017
1 parent 7f474df commit 75fd9f9
Show file tree
Hide file tree
Showing 14 changed files with 6 additions and 76 deletions.
6 changes: 4 additions & 2 deletions website/client/components/tasks/task.vue
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,10 @@ export default {
},
},
methods: {
...mapActions({updateTask: 'tasks:updateDirectly'}),
...mapActions({scoreChecklistItem: 'tasks:scoreChecklistItem'}),
toggleChecklistItem (item) {
item.completed = !item.completed;
this.updateTask(this.task);
this.scoreChecklistItem({taskId: this.task._id, itemId: item.id});
},
edit (e, task) {
// Prevent clicking on a link from opening the edit modal
Expand All @@ -349,6 +349,8 @@ export default {
return;
}
if (task.group.approval.required) task.group.approval.requested = true;
const response = await axios.post(`/api/v3/tasks/${task._id}/score/${direction}`);
const tmp = response.data.data._tmp || {}; // used to notify drops, critical hits and other bonuses
const crit = tmp.crit;
Expand Down
Binary file removed website/client/merch/stickermule-logo.png
Binary file not shown.
1 change: 0 additions & 1 deletion website/client/merch/stickermule-logo.svg

This file was deleted.

Binary file removed website/client/merch/stickermule.png
Binary file not shown.
Binary file removed website/client/merch/teespring-eu-logo.png
Binary file not shown.
Binary file removed website/client/merch/teespring-eu.png
Binary file not shown.
Binary file removed website/client/merch/teespring-logo.png
Binary file not shown.
63 changes: 0 additions & 63 deletions website/client/merch/teespring-logo.svg

This file was deleted.

Binary file removed website/client/merch/teespring-mug-eu-logo.png
Binary file not shown.
Binary file removed website/client/merch/teespring-mug-eu.png
Binary file not shown.
Binary file removed website/client/merch/teespring-mug-logo.png
Binary file not shown.
Binary file removed website/client/merch/teespring-mug.png
Binary file not shown.
Binary file removed website/client/merch/teespring.png
Binary file not shown.
12 changes: 2 additions & 10 deletions website/client/store/actions/tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,8 @@ export async function save (store, editedTask) {
if (originalTask) Object.assign(originalTask, response.data.data);
}

// Used to send a local task data directly to the server and not an edited copy
// For example when a checklist item is checked
export async function updateDirectly (store, localTask) {
const taskId = localTask._id;

sanitizeChecklist(localTask);

const taskDataToSend = omit(localTask, ['history']);
const response = await axios.put(`/api/v3/tasks/${taskId}`, taskDataToSend);
Object.assign(localTask, response.data.data);
export async function scoreChecklistItem (store, {taskId, itemId}) {
await axios.post(`/api/v3/tasks/${taskId}/checklist/${itemId}/score`);
}

export async function destroy (store, task) {
Expand Down

0 comments on commit 75fd9f9

Please sign in to comment.