diff --git a/website/client/src/assets/scss/task.scss b/website/client/src/assets/scss/task.scss index 4ff3a77810..58fe728643 100644 --- a/website/client/src/assets/scss/task.scss +++ b/website/client/src/assets/scss/task.scss @@ -30,7 +30,7 @@ &-bg { background: $maroon-100 !important; .habit-control:not(.task-not-scoreable):hover { background: rgba($black, 0.5) !important; } - .daily-todo-control:hover { background: rgba($white, 0.75) !important; } + .daily-todo-control:not(.task-not-scoreable):hover { background: rgba($white, 0.75) !important; } } &-bg-noninteractive { background: $maroon-100 !important; } &-inner-habit { background: rgba($black, 0.25) !important; } @@ -61,7 +61,7 @@ &-bg { background: $red-100 !important; .habit-control:not(.task-not-scoreable):hover { background: rgba($black, 0.5) !important; } - .daily-todo-control:hover { background: rgba($white, 0.75) !important; } + .daily-todo-control:not(.task-not-scoreable):hover { background: rgba($white, 0.75) !important; } } &-bg-noninteractive { background: $red-100 !important; } &-inner-habit { background: rgba($black, 0.25) !important; } @@ -92,7 +92,7 @@ &-bg { background: $orange-100 !important; .habit-control:not(.task-not-scoreable):hover { background: rgba($orange-1, 0.5) !important; } - .daily-todo-control:hover { background: rgba($white, 0.75) !important; } + .daily-todo-control:not(.task-not-scoreable):hover { background: rgba($white, 0.75) !important; } } &-bg-noninteractive { background: $orange-100 !important; } &-inner-habit { background: rgba($orange-1, 0.25) !important; } @@ -123,7 +123,7 @@ &-bg { background: $yellow-100 !important; .habit-control:not(.task-not-scoreable):hover { background: rgba($yellow-1, 0.5) !important; } - .daily-todo-control:hover { background: rgba($white, 0.75) !important; } + .daily-todo-control:not(.task-not-scoreable):hover { background: rgba($white, 0.75) !important; } } &-bg-noninteractive { background: $yellow-100 !important; } &-inner-habit { background: rgba($yellow-1, 0.25) !important; } @@ -154,7 +154,7 @@ &-bg { background: $green-100 !important; .habit-control:not(.task-not-scoreable):hover { background: rgba($black, 0.5) !important; } - .daily-todo-control:hover { background: rgba($white, 0.75) !important; } + .daily-todo-control:not(.task-not-scoreable):hover { background: rgba($white, 0.75) !important; } } &-bg-noninteractive { background: $green-100 !important; } &-inner-habit { background: rgba($black, 0.25) !important; } @@ -186,7 +186,7 @@ &-bg { background: $teal-100 !important; .habit-control:not(.task-not-scoreable):hover { background: rgba($black, 0.5) !important; } - .daily-todo-control:hover { background: rgba($white, 0.75) !important; } + .daily-todo-control:not(.task-not-scoreable):hover { background: rgba($white, 0.75) !important; } } &-bg-noninteractive { background: $teal-100 !important; } &-inner-habit { background: rgba($black, 0.25) !important; } @@ -217,7 +217,7 @@ &-bg { background: $blue-100 !important; .habit-control:not(.task-not-scoreable):hover { background: rgba($black, 0.5) !important; } - .daily-todo-control:hover { background: rgba($white, 0.75) !important; } + .daily-todo-control:not(.task-not-scoreable):hover { background: rgba($white, 0.75) !important; } } &-bg-noninteractive { background: $blue-100 !important; } &-inner-habit { background: rgba($black, 0.25) !important; } @@ -249,7 +249,7 @@ &-bg { background: $purple-task !important; .habit-control:not(.task-not-scoreable):hover { background: rgba($black, 0.5) !important; } - .daily-todo-control:hover { background: rgba($white, 0.75) !important; } + .daily-todo-control:not(.task-not-scoreable):hover { background: rgba($white, 0.75) !important; } } &-inner-habit { background: rgba($black, 0.25) !important; } &-inner-daily-todo { background: rgba($white, 0.5) !important; } @@ -312,7 +312,7 @@ &-control { &-bg { background: $gray-200 !important; - .daily-todo-control:hover { background: rgba($white, 0.75) !important; } + .daily-todo-control:not(.task-not-scoreable):hover { background: rgba($white, 0.75) !important; } } &-bg-noninteractive { background: $gray-200 !important; diff --git a/website/client/src/components/tasks/column.vue b/website/client/src/components/tasks/column.vue index bc373ecc3c..c8232dd574 100644 --- a/website/client/src/components/tasks/column.vue +++ b/website/client/src/components/tasks/column.vue @@ -347,6 +347,9 @@ import throttle from 'lodash/throttle'; import isEmpty from 'lodash/isEmpty'; import draggable from 'vuedraggable'; +import { shouldDo } from '@/../../common/script/cron'; +import inAppRewards from '@/../../common/script/libs/inAppRewards'; +import taskDefaults from '@/../../common/script/libs/taskDefaults'; import Task from './task'; import ClearCompletedTodos from './clearCompletedTodos'; import buyMixin from '@/mixins/buy'; @@ -357,9 +360,6 @@ import BuyQuestModal from '@/components/shops/quests/buyQuestModal.vue'; import PinBadge from '@/components/ui/pinBadge'; import notifications from '@/mixins/notifications'; -import { shouldDo } from '@/../../common/script/cron'; -import inAppRewards from '@/../../common/script/libs/inAppRewards'; -import taskDefaults from '@/../../common/script/libs/taskDefaults'; import { getTypeLabel, @@ -576,18 +576,25 @@ export default { }, async moveTo (task, where) { // where is 'top' or 'bottom' const taskIdToMove = task._id; - const list = this.getUnfilteredTaskList(this.type); + const list = this.taskListOverride || this.getUnfilteredTaskList(this.type); const oldPosition = list.findIndex(t => t._id === taskIdToMove); const moved = list.splice(oldPosition, 1); const newPosition = where === 'top' ? 0 : list.length; list.splice(newPosition, 0, moved[0]); - const newOrder = await this.$store.dispatch('tasks:move', { - taskId: taskIdToMove, - position: newPosition, - }); - this.user.tasksOrder[`${this.type}s`] = newOrder; + if (!this.isUser) { + await this.$store.dispatch('tasks:moveGroupTask', { + taskId: taskIdToMove, + position: newPosition, + }); + } else { + const newOrder = await this.$store.dispatch('tasks:move', { + taskId: taskIdToMove, + position: newPosition, + }); + this.user.tasksOrder[`${this.type}s`] = newOrder; + } }, async rewardSorted (data) { const rewardsList = this.inAppRewards; diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue index 76eedd531b..4f98c775a5 100644 --- a/website/client/src/components/tasks/task.vue +++ b/website/client/src/components/tasks/task.vue @@ -56,7 +56,10 @@ >