mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-16 22:27:26 +01:00
* WIP(a11y): task modal updates * fix(tasks): borders in modal * fix(tasks): circley locks * fix(task-modal): placeholders * WIP(task-modal): disabled states, hide empty options, +/- restyle * fix(task-modal): box shadows instead of borders, habit control pointer * fix(task-modal): button states? * fix(modal): tighten up layout, new spacing utils * fix(tasks): more stylin * fix(tasks): habit hovers * fix(css): checklist labels, a11y colors * fix(css): one more missed hover issue * fix(css): lock Challenges, label fixes * fix(css): scope input/textarea changes * fix(style): task tweakies * fix(style): more button fixage * WIP(component): start select list story * working example of a templated selectList * fix(style): more button corrections * fix(lint): EOL * fix(buttons): factor btn-secondary to better override Bootstrap * fix(styles): standardize more buttons * wip: difficulty select - style fixes * selectDifficulty works! 🎉 - fix styles * change the dropdown-item sizes only for the selectList ones * selectTranslatedArray * changed many label margins * more correct dropdown style * fix(modals): button corrections * input-group styling + datetime picker without today button * Style/margins for "repeat every" - extract selectTag.vue * working tag-selection / update - cleanup * fix stories * fix svg color on create modal (purple) * fix task modal bottom padding * correct dropdown shadow * update dropdown-toggle caret size / color * fixed checklist style * sync checked state * selectTag padding * fix spacing between positive/negative streak inputs * toggle-checkbox + fix some spacings * disable repeat-on when its a groupTask * fix new checklist-item * fix toggle-checkbox style - fix difficulty style * fix checklist ui * add tags label , when there arent any tags selected * WORKING select-tag component 🎉 * fix taglist story * show max 5 items in tag dropdown + "X more" label * fix datetime clear button * replace m-b-xs to mb-1 (bootstrap) - fix input-group-text style * fix styles of advanced settings * fix delete task styles * always show grippy on hover of the item * extract modal-text-input mixin + fix the borders/dropshadow * fix(spacing): revert most to Bootstrap * feat(checklists): make local copy of master checklist non-editable also aggressively update checklists because they weren't syncing?? * fix(checklists): handle add/remove options better * feat(teams): manager notes field * fix select/dropdown styles * input border + icon colors * delete task underline color * fix checklist "delete icon" vertical position * selectTag fixes - normal open/close toggle working again - remove icon color * fixing icons: Trash can - Delete Little X - Remove Big X - Close Block - Block * fix taglist margins / icon sizes * wip margin overview (in storybook) * fix routerlink * remove unused method * new selectTag style + add markdown inside tagList + scrollable tag selection * fix selectTag / selectList active border * fix difficulty select (svg default color) * fix input padding-left + fix reset habit streak fullwidth / padding + "repeat every" gray text (no border) * feat(teams): improved approval request > approve > reward flow * fix(tests): address failures * fix(lint): oops only * fix(tasks): short-circuit group related logic * fix(tasks): more short circuiting * fix(tasks): more lines, less lint * fix(tasks): how do i keep missing these * feat(teams): provide assigning user summary * fix(teams): don't attempt to record assiging user if not supplied * fix advanced-settings styling / margin * fix merge + hide advanced streak settings when none enabled * fix styles * set Roboto font for advanced settings * Add Challenge flag to the tag list * add tag with enter, when no other tag is found * fix styles + tag cancel button * refactor footer / margin * split repeat fields into option mt-3 groups * button all the things * fix(tasks): style updates * no hover state for non-editable tasks on team board * keep assign/claim footer on task after requesting approval * disable more fields on user copy of team task, and remove hover states for them * fix(tasks): functional revisions * "Claim Rewards" instead of "x" in task approved notif * Remove default transition supplied by Bootstrap, apply individually to some elements * Delete individual tasks and related notifications when master task deleted from team board * Manager notes now save when supplied at task initial creation * Can no longer dismiss rewards from approved task by hitting Dismiss All * fix(tasks): clean tasksOrder also adjust related test expectation * fix(tests): adjust integration expectations * fix(test): ratzen fratzen only * fix(teams): checklist, notes * fix(teams): improve disabled states * fix(teams): more style fixage * BREAKING(teams): return 202 instead of 401 for approval request * fix(teams): better taskboard sync also re-re-fix checklist borders * fix(tests): update expectations for breaking change * refactor(task-modal): lockable label component * refactor(teams): move task scoring to mixin * fix(teams): style corrections * fix(tasks): spacing and wording corrections * fix(teams): don't bork manager notes * fix(teams): assignment fix and more approval flow revisions * WIP(teams): use tag dropdown control for assignment * refactor(tasks): better spacing, generic multi select * fix(tasks): various visual and behavior updates * fix(tasks): incidental style tweaks * fix(teams): standardize approval request response * refactor(teams): correct test, use res.respond message param * fix(storybook): renamed component * fix(teams): age approval-required To Do's Fixes #8730 * fix(teams): sync personal data as well as team on mixin sync * fix(teams): hide unclaim button, not whole footer; fix switch focus * fix(achievements): unrevert width fix Co-authored-by: Sabe Jones <sabrecat@gmail.com>
351 lines
9.4 KiB
Vue
351 lines
9.4 KiB
Vue
<template>
|
|
<div class="standard-page">
|
|
<group-plan-overview-modal />
|
|
<task-modal
|
|
ref="taskModal"
|
|
:task="workingTask"
|
|
:purpose="taskFormPurpose"
|
|
:group-id="groupId"
|
|
@cancel="cancelTaskModal()"
|
|
@taskCreated="taskCreated"
|
|
@taskEdited="taskEdited"
|
|
@taskDestroyed="taskDestroyed"
|
|
/>
|
|
<div class="row tasks-navigation">
|
|
<div class="col-12 col-md-4">
|
|
<h1>{{ $t('groupTasksTitle') }}</h1>
|
|
</div>
|
|
<!-- @TODO: Abstract to component!-->
|
|
<div class="col-12 col-md-4">
|
|
<input
|
|
v-model="searchText"
|
|
class="form-control input-search"
|
|
type="text"
|
|
:placeholder="$t('search')"
|
|
>
|
|
</div>
|
|
<div
|
|
v-if="canCreateTasks"
|
|
class="create-task-area d-flex"
|
|
>
|
|
<transition name="slide-tasks-btns">
|
|
<div
|
|
v-if="openCreateBtn"
|
|
class="d-flex"
|
|
>
|
|
<div
|
|
v-for="type in columns"
|
|
:key="type"
|
|
v-b-tooltip.hover.bottom="$t(type)"
|
|
class="create-task-btn diamond-btn"
|
|
@click="createTask(type)"
|
|
>
|
|
<div
|
|
class="svg-icon"
|
|
:class="`icon-${type}`"
|
|
v-html="icons[type]"
|
|
></div>
|
|
</div>
|
|
</div>
|
|
</transition>
|
|
<div
|
|
id="create-task-btn"
|
|
class="create-btn diamond-btn btn btn-success"
|
|
:class="{open: openCreateBtn}"
|
|
@click="openCreateBtn = !openCreateBtn"
|
|
>
|
|
<div
|
|
class="svg-icon"
|
|
v-html="icons.positive"
|
|
></div>
|
|
</div>
|
|
<b-tooltip
|
|
v-if="!openCreateBtn"
|
|
target="create-task-btn"
|
|
placement="bottom"
|
|
>
|
|
{{ $t('addTaskToGroupPlan') }}
|
|
</b-tooltip>
|
|
</div>
|
|
</div>
|
|
<div class="row">
|
|
<task-column
|
|
v-for="column in columns"
|
|
:key="column"
|
|
class="col-12 col-md-3"
|
|
:type="column"
|
|
:task-list-override="tasksByType[column]"
|
|
:group="group"
|
|
:search-text="searchText"
|
|
@editTask="editTask"
|
|
@loadGroupCompletedTodos="loadGroupCompletedTodos"
|
|
@taskDestroyed="taskDestroyed"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<style lang="scss" scoped>
|
|
@import '~@/assets/scss/colors.scss';
|
|
@import '~@/assets/scss/create-task.scss';
|
|
|
|
.tasks-navigation {
|
|
margin-bottom: 40px;
|
|
}
|
|
|
|
.positive {
|
|
display: inline-block;
|
|
width: 10px;
|
|
color: $green-500;
|
|
margin-right: 8px;
|
|
padding-top: 6px;
|
|
}
|
|
</style>
|
|
|
|
<script>
|
|
import Vue from 'vue';
|
|
import cloneDeep from 'lodash/cloneDeep';
|
|
import findIndex from 'lodash/findIndex';
|
|
import groupBy from 'lodash/groupBy';
|
|
import taskDefaults from '@/../../common/script/libs/taskDefaults';
|
|
import TaskColumn from '../tasks/column';
|
|
import TaskModal from '../tasks/taskModal';
|
|
import GroupPlanOverviewModal from './groupPlanOverviewModal';
|
|
|
|
import positiveIcon from '@/assets/svg/positive.svg';
|
|
import filterIcon from '@/assets/svg/filter.svg';
|
|
import deleteIcon from '@/assets/svg/delete.svg';
|
|
import habitIcon from '@/assets/svg/habit.svg';
|
|
import dailyIcon from '@/assets/svg/daily.svg';
|
|
import todoIcon from '@/assets/svg/todo.svg';
|
|
import rewardIcon from '@/assets/svg/reward.svg';
|
|
|
|
import { mapState } from '@/libs/store';
|
|
|
|
export default {
|
|
components: {
|
|
TaskColumn,
|
|
TaskModal,
|
|
GroupPlanOverviewModal,
|
|
},
|
|
props: ['groupId'],
|
|
data () {
|
|
return {
|
|
openCreateBtn: false,
|
|
searchId: '',
|
|
columns: ['habit', 'daily', 'todo', 'reward'],
|
|
tasksByType: {
|
|
habit: [],
|
|
daily: [],
|
|
todo: [],
|
|
reward: [],
|
|
},
|
|
editingTask: {},
|
|
creatingTask: {},
|
|
workingTask: {},
|
|
taskFormPurpose: 'create',
|
|
// @TODO: Separate component?
|
|
searchText: '',
|
|
selectedTags: [],
|
|
temporarilySelectedTags: [],
|
|
isFilterPanelOpen: false,
|
|
icons: Object.freeze({
|
|
positive: positiveIcon,
|
|
filter: filterIcon,
|
|
destroy: deleteIcon,
|
|
habit: habitIcon,
|
|
daily: dailyIcon,
|
|
todo: todoIcon,
|
|
reward: rewardIcon,
|
|
}),
|
|
editingTags: false,
|
|
group: {},
|
|
};
|
|
},
|
|
computed: {
|
|
...mapState({ user: 'user.data' }),
|
|
tagsByType () {
|
|
const userTags = this.user.tags;
|
|
const tagsByType = {
|
|
challenges: {
|
|
key: 'challenges',
|
|
tags: [],
|
|
},
|
|
groups: {
|
|
key: 'groups',
|
|
tags: [],
|
|
},
|
|
user: {
|
|
key: 'tags',
|
|
tags: [],
|
|
},
|
|
};
|
|
|
|
userTags.forEach(t => {
|
|
if (t.group) {
|
|
tagsByType.groups.tags.push(t);
|
|
} else if (t.challenge) {
|
|
tagsByType.challenges.tags.push(t);
|
|
} else {
|
|
tagsByType.user.tags.push(t);
|
|
}
|
|
});
|
|
|
|
return tagsByType;
|
|
},
|
|
canCreateTasks () {
|
|
if (!this.group) return false;
|
|
return (this.group.leader && this.group.leader._id === this.user._id)
|
|
|| (this.group.managers && Boolean(this.group.managers[this.user._id]));
|
|
},
|
|
},
|
|
watch: {
|
|
// call again the method if the route changes (when this route is already active)
|
|
$route: 'load',
|
|
},
|
|
beforeRouteUpdate (to, from, next) {
|
|
this.$set(this, 'searchId', to.params.groupId);
|
|
next();
|
|
},
|
|
mounted () {
|
|
if (!this.searchId) this.searchId = this.groupId;
|
|
this.load();
|
|
|
|
if (this.$route.query.showGroupOverview) {
|
|
this.$root.$emit('bv::show::modal', 'group-plan-overview');
|
|
}
|
|
|
|
this.$root.$on('habitica:team-sync', () => {
|
|
this.loadTasks();
|
|
});
|
|
},
|
|
methods: {
|
|
async load () {
|
|
this.group = await this.$store.dispatch('guilds:getGroup', {
|
|
groupId: this.searchId,
|
|
});
|
|
|
|
const members = await this.$store.dispatch('members:getGroupMembers', { groupId: this.searchId });
|
|
this.group.members = members;
|
|
|
|
this.loadTasks();
|
|
},
|
|
async loadTasks () {
|
|
this.tasksByType = {
|
|
habit: [],
|
|
daily: [],
|
|
todo: [],
|
|
reward: [],
|
|
};
|
|
|
|
const tasks = await this.$store.dispatch('tasks:getGroupTasks', {
|
|
groupId: this.searchId,
|
|
});
|
|
|
|
const groupedApprovals = await this.loadApprovals();
|
|
|
|
tasks.forEach(task => {
|
|
if (
|
|
groupedApprovals[task._id]
|
|
&& groupedApprovals[task._id].length > 0
|
|
) task.approvals = groupedApprovals[task._id];
|
|
this.tasksByType[task.type].push(task);
|
|
});
|
|
},
|
|
async loadApprovals () {
|
|
const approvalRequests = await this.$store.dispatch('tasks:getGroupApprovals', {
|
|
groupId: this.searchId,
|
|
});
|
|
|
|
return groupBy(approvalRequests, 'group.taskId');
|
|
},
|
|
editTask (task) {
|
|
this.taskFormPurpose = 'edit';
|
|
this.editingTask = cloneDeep(task);
|
|
this.workingTask = this.editingTask;
|
|
// Necessary otherwise the first time the modal is not rendered
|
|
Vue.nextTick(() => {
|
|
this.$root.$emit('bv::show::modal', 'task-modal');
|
|
});
|
|
},
|
|
async loadGroupCompletedTodos () {
|
|
const completedTodos = await this.$store.dispatch('tasks:getCompletedGroupTasks', {
|
|
groupId: this.searchId,
|
|
});
|
|
|
|
completedTodos.forEach(task => {
|
|
const existingTaskIndex = findIndex(this.tasksByType.todo, todo => todo._id === task._id);
|
|
if (existingTaskIndex === -1) {
|
|
this.tasksByType.todo.push(task);
|
|
}
|
|
});
|
|
},
|
|
createTask (type) {
|
|
this.openCreateBtn = false;
|
|
this.taskFormPurpose = 'create';
|
|
this.creatingTask = taskDefaults({ type, text: '' }, this.user);
|
|
this.workingTask = this.creatingTask;
|
|
// Necessary otherwise the first time the modal is not rendered
|
|
Vue.nextTick(() => {
|
|
this.$root.$emit('bv::show::modal', 'task-modal');
|
|
});
|
|
},
|
|
taskCreated (task) {
|
|
task.group.id = this.group._id;
|
|
this.tasksByType[task.type].push(task);
|
|
},
|
|
taskEdited (task) {
|
|
const index = findIndex(this.tasksByType[task.type], taskItem => taskItem._id === task._id);
|
|
this.tasksByType[task.type].splice(index, 1, task);
|
|
},
|
|
taskDestroyed (task) {
|
|
const index = findIndex(this.tasksByType[task.type], taskItem => taskItem._id === task._id);
|
|
this.tasksByType[task.type].splice(index, 1);
|
|
},
|
|
cancelTaskModal () {
|
|
this.editingTask = null;
|
|
this.creatingTask = null;
|
|
this.workingTask = {};
|
|
},
|
|
toggleFilterPanel () {
|
|
if (this.isFilterPanelOpen === true) {
|
|
this.closeFilterPanel();
|
|
} else {
|
|
this.openFilterPanel();
|
|
}
|
|
},
|
|
openFilterPanel () {
|
|
this.isFilterPanelOpen = true;
|
|
this.temporarilySelectedTags = this.selectedTags.slice();
|
|
},
|
|
closeFilterPanel () {
|
|
this.temporarilySelectedTags = [];
|
|
this.isFilterPanelOpen = false;
|
|
},
|
|
resetFilters () {
|
|
this.selectedTags = [];
|
|
this.closeFilterPanel();
|
|
},
|
|
applyFilters () {
|
|
const { temporarilySelectedTags } = this;
|
|
this.selectedTags = temporarilySelectedTags.slice();
|
|
this.closeFilterPanel();
|
|
},
|
|
toggleTag (tag) {
|
|
const { temporarilySelectedTags } = this;
|
|
const tagI = temporarilySelectedTags.indexOf(tag.id);
|
|
if (tagI === -1) {
|
|
temporarilySelectedTags.push(tag.id);
|
|
} else {
|
|
temporarilySelectedTags.splice(tagI, 1);
|
|
}
|
|
},
|
|
isTagSelected (tag) {
|
|
const tagId = tag.id;
|
|
if (this.temporarilySelectedTags.indexOf(tagId) !== -1) return true;
|
|
return false;
|
|
},
|
|
},
|
|
};
|
|
</script>
|