mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 06:37:23 +01:00
Sept 23 fixes (#9074)
* Discover challenges * Fixed hero loading * Moved add task button * Fixed bailey showing * Added logs for bad sub data * Fixed blurb editing * Added confirmation for deleteing message * Reset invite modals on invite * fixed group member sorting * Fixed chat time styles * Fixed hover on liked * Fixed like count * Added reverse * Fixed editing party * Added leader conditions * Added search * Added loading * Reset members when leaving party * Rounded pending * Fixed overflow on collecting quests * Added to invite friends * Hid summary from party * Fixed button styles * Fixed button class * Removed okay button * Fixed renav for profile modal * Added subscription back to menu * Fixed static link * Added daily due setting * Added local auth adding * Fixed centering of text * Removed message locally * Added count for new message * Added style fix for profile pet * Fixed achievement popovers * Fixed white boxes * Added plain color backgrounds * fixed challenge mutability * Fixed challenge editing * Added notation for large numbers * Add color text to guild sizes * Removed membership filters from discover challenges * Added invites to group * Cmd + enter send message * Made leader clickable * Updated group validation * Added cancelling autocomplete * Added mention icon * Added removing member * Removed extra string
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
.filters.d-flex.justify-content-end
|
||||
.filter.small-text(
|
||||
v-for="filter in types[type].filters",
|
||||
:class="{active: activeFilter.label === filter.label}",
|
||||
:class="{active: activeFilters[type].label === filter.label}",
|
||||
@click="activateFilter(type, filter)",
|
||||
) {{ $t(filter.label) }}
|
||||
.tasks-list(ref="taskList", v-sortable='', @onsort='sorted')
|
||||
@@ -226,9 +226,14 @@ export default {
|
||||
reward: rewardIcon,
|
||||
});
|
||||
|
||||
let activeFilters = {};
|
||||
for (let type in types) {
|
||||
activeFilters[type] = types[type].filters.find(f => f.default === true);
|
||||
}
|
||||
|
||||
return {
|
||||
types,
|
||||
activeFilter: types[this.type].filters.find(f => f.default === true),
|
||||
activeFilters,
|
||||
icons,
|
||||
openedCompletedTodos: false,
|
||||
|
||||
@@ -252,7 +257,7 @@ export default {
|
||||
return inAppRewards(this.user);
|
||||
},
|
||||
hasRewardsList () {
|
||||
return this.isUser === true && this.type === 'reward' && this.activeFilter.label !== 'custom';
|
||||
return this.isUser === true && this.type === 'reward' && this.activeFilters[this.type].label !== 'custom';
|
||||
},
|
||||
initialColumnDescription () {
|
||||
// Show the column description in the middle only if there are no elements (tasks or in app items)
|
||||
@@ -262,6 +267,12 @@ export default {
|
||||
|
||||
return this.tasks[`${this.type}s`].length === 0;
|
||||
},
|
||||
dailyDueDefaultView () {
|
||||
if (this.user.preferences.dailyDueDefaultView) {
|
||||
this.activateFilter('daily', this.types.daily.filters[1]);
|
||||
}
|
||||
return this.user.preferences.dailyDueDefaultView;
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
taskList: {
|
||||
@@ -270,6 +281,11 @@ export default {
|
||||
}, 250),
|
||||
deep: true,
|
||||
},
|
||||
dailyDueDefaultView () {
|
||||
if (this.user.preferences.dailyDueDefaultView) {
|
||||
this.activateFilter('daily', this.types.daily.filters[1]);
|
||||
}
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.setColumnBackgroundVisibility();
|
||||
@@ -301,7 +317,7 @@ export default {
|
||||
if (type === 'todo' && filter.label === 'complete2') {
|
||||
this.loadCompletedTodos();
|
||||
}
|
||||
this.activeFilter = filter;
|
||||
this.activeFilters[type] = filter;
|
||||
},
|
||||
setColumnBackgroundVisibility () {
|
||||
this.$nextTick(() => {
|
||||
@@ -330,7 +346,7 @@ export default {
|
||||
},
|
||||
filterTask (task) {
|
||||
// View
|
||||
if (!this.activeFilter.filter(task)) return false;
|
||||
if (!this.activeFilters[task.type].filter(task)) return false;
|
||||
|
||||
// Tags
|
||||
const selectedTags = this.selectedTags;
|
||||
|
||||
Reference in New Issue
Block a user