habitica-self-host/website/client/components/tasks/column.vue

671 lines
19 KiB
Vue
Raw Normal View History

<template lang="pug">
.tasks-column(:class='type')
b-modal(ref="editTaskModal")
buy-quest-modal(:item="selectedItemToBuy || {}",
:priceType="selectedItemToBuy ? selectedItemToBuy.currency : ''",
:withPin="true",
@change="resetItemToBuy($event)"
v-if='type === "reward"')
.d-flex.align-items-center
h2.column-title {{ $t(typeLabel) }}
.badge.badge-pill.badge-purple.column-badge.mx-1(v-if="badgeCount > 0") {{ badgeCount }}
.filters.d-flex.justify-content-end
.filter.small-text(
v-for="filter in typeFilters",
:class="{active: activeFilter.label === filter}",
@click="activateFilter(type, filter)",
) {{ $t(filter) }}
.tasks-list(ref="tasksWrapper")
textarea.quick-add(
:rows="quickAddRows",
v-if="isUser", :placeholder="quickAddPlaceholder",
v-model="quickAddText", @keypress.enter="quickAdd",
ref="quickAdd",
@focus="quickAddFocused = true", @blur="quickAddFocused = false",
)
transition(name="quick-add-tip-slide")
.quick-add-tip.small-text(v-show="quickAddFocused", v-html="$t('addMultipleTip', {taskType: $t(typeLabel)})")
clear-completed-todos(v-if="activeFilter.label === 'complete2' && isUser === true")
.column-background(
v-if="isUser === true",
:class="{'initial-description': initialColumnDescription}",
ref="columnBackground",
)
.svg-icon(v-html="icons[type]", :class="`icon-${type}`", v-once)
h3(v-once) {{$t('theseAreYourTasks', {taskType: $t(typeLabel)})}}
.small-text {{$t(`${type}sDesc`)}}
draggable.sortable-tasks(
ref="tasksList",
Feature/sortable reward area (#9930) * Client POC We need to wrap each draggable region it its own div or else the "draggable" element will conflict with each other. This screws up the styling but that is totally fixable * Ah that ref was being used after all, changing back * Scaffold out a new callback for when we drag these things Next is going to be the hard part: I need to save the sort order for these to the database. I don't even know if there is a schema but hey this is the best place to start * Firefox caching is the problem: don't actually need the wrapper div So I guess I should try this in chrome and see how it works then come back to firefox and figure out what the heck is going on * Scaffolding out our API call to save the sort order The endpoint doesn't exist yet so we will need to add that * Ok we are now calling our API endpoint to reorder these things Of course it doesn't exist yet so you get a 404 when you try, but that is ok * Defining api endpoint, a work in progress In particular I really had ought to use _id for these too, it appears that the primary way we detect order doesn't even use "key" at all. * Switching to using the pinned item UUID This has much better results, but of course the server and client logic don't match now. Will have to keep working on my splice to make sure that they are the same * I thought this would fix our server/client mismatch but it is not it Something is really wrong with my logic somewhere, maybe I need to update the db step? * Moving this logic to the "user" rather than "tasks" and key off path Path is unique and is less finiky than dealing with string comparisons with ids. Unfortunately everything is still not working... I suppose user.update() doesn't care about the position? * This client code caused quite a lot of problems if you dragged fast We don't really need it it seems, so off it goes * Updating markup and CSS so it actually looks good. Everything is working horray!! I did just notice the following bug: the popover text sometimes makes it very annoying to drag because you can't drop over it@ * Cleaning up my comments in the API section user.js I had a lot of TODOS that are mostly done now * Fixing a spacing code standards thing * Turns out we never use type, so we should remove this from the API call * Adding pinnedItemsOrder into the user schema And disabling my call in the frontend before I do any more damage * Halfway to using pinnedItemsOrder This isn't working yet but it is not going to break it horribly like it was before. * Hooking up inAppRewards to always produce sorted information It is suspicially working right now even though I have not added the seasonal stuff logic yet... * Updating the comments in user.js in movedPinnedItem It turns out that my bandaid fix to just get the ball rolling perfectly does what I need it to do when we have a length discrepancy. So we are getting much closer to the final product, just need lots of testing * Cleaning up code standards kinds of things * Yay, this fixes the popover issue I hope this is the right "vue" way to do things, because I tried a bunch of other things that definately were not the right way to do it. And this appears to work too * ** Partial Work ** Starting tests on api call for draggable items Doesn't work, doesn't compile so don't include in PR! * Test failing still... This is worth a save. The api call grabs the seasonal items too, so we can't get away from using the common functions and calls here to get the actual list of items * Okay have the first test passing Need to clean up my linter problems though * Planning out the next two tests and fixing my format problems * 2nd Test case written, this time with the "more" odd case * Making sure that we didn't mess with pinned items * Huh... this test doesn't give me the expected result Drat, I guess I found a bug * Throw an error when we put garbage in our api call. Well, before we got user.pinnedItemsOrder filled with a bunch of "null" entries which is not ideal. it still worked, but isn't this confusing enough already? * Cleaning up the multitude of linting problems thanks gulp :) * Writing tests for inAppRewards.js, but something is wrong * Fixing my linting errors in inAppRewards tests These tests still do not run though, so they may fail and I would not know * Applying Negue's fixes to inAppRewards.js test It never occured to me that we shouldn't try to reach the database while in the common tests. Well, we shouldn't do that, we should use the common.helpers instead. Thanks!
2018-04-13 13:22:06 +00:00
@update='taskSorted',
:options='{disabled: activeFilter.label === "scheduled"}',
Feature/sortable reward area (#9930) * Client POC We need to wrap each draggable region it its own div or else the "draggable" element will conflict with each other. This screws up the styling but that is totally fixable * Ah that ref was being used after all, changing back * Scaffold out a new callback for when we drag these things Next is going to be the hard part: I need to save the sort order for these to the database. I don't even know if there is a schema but hey this is the best place to start * Firefox caching is the problem: don't actually need the wrapper div So I guess I should try this in chrome and see how it works then come back to firefox and figure out what the heck is going on * Scaffolding out our API call to save the sort order The endpoint doesn't exist yet so we will need to add that * Ok we are now calling our API endpoint to reorder these things Of course it doesn't exist yet so you get a 404 when you try, but that is ok * Defining api endpoint, a work in progress In particular I really had ought to use _id for these too, it appears that the primary way we detect order doesn't even use "key" at all. * Switching to using the pinned item UUID This has much better results, but of course the server and client logic don't match now. Will have to keep working on my splice to make sure that they are the same * I thought this would fix our server/client mismatch but it is not it Something is really wrong with my logic somewhere, maybe I need to update the db step? * Moving this logic to the "user" rather than "tasks" and key off path Path is unique and is less finiky than dealing with string comparisons with ids. Unfortunately everything is still not working... I suppose user.update() doesn't care about the position? * This client code caused quite a lot of problems if you dragged fast We don't really need it it seems, so off it goes * Updating markup and CSS so it actually looks good. Everything is working horray!! I did just notice the following bug: the popover text sometimes makes it very annoying to drag because you can't drop over it@ * Cleaning up my comments in the API section user.js I had a lot of TODOS that are mostly done now * Fixing a spacing code standards thing * Turns out we never use type, so we should remove this from the API call * Adding pinnedItemsOrder into the user schema And disabling my call in the frontend before I do any more damage * Halfway to using pinnedItemsOrder This isn't working yet but it is not going to break it horribly like it was before. * Hooking up inAppRewards to always produce sorted information It is suspicially working right now even though I have not added the seasonal stuff logic yet... * Updating the comments in user.js in movedPinnedItem It turns out that my bandaid fix to just get the ball rolling perfectly does what I need it to do when we have a length discrepancy. So we are getting much closer to the final product, just need lots of testing * Cleaning up code standards kinds of things * Yay, this fixes the popover issue I hope this is the right "vue" way to do things, because I tried a bunch of other things that definately were not the right way to do it. And this appears to work too * ** Partial Work ** Starting tests on api call for draggable items Doesn't work, doesn't compile so don't include in PR! * Test failing still... This is worth a save. The api call grabs the seasonal items too, so we can't get away from using the common functions and calls here to get the actual list of items * Okay have the first test passing Need to clean up my linter problems though * Planning out the next two tests and fixing my format problems * 2nd Test case written, this time with the "more" odd case * Making sure that we didn't mess with pinned items * Huh... this test doesn't give me the expected result Drat, I guess I found a bug * Throw an error when we put garbage in our api call. Well, before we got user.pinnedItemsOrder filled with a bunch of "null" entries which is not ideal. it still worked, but isn't this confusing enough already? * Cleaning up the multitude of linting problems thanks gulp :) * Writing tests for inAppRewards.js, but something is wrong * Fixing my linting errors in inAppRewards tests These tests still do not run though, so they may fail and I would not know * Applying Negue's fixes to inAppRewards.js test It never occured to me that we shouldn't try to reach the database while in the common tests. Well, we shouldn't do that, we should use the common.helpers instead. Thanks!
2018-04-13 13:22:06 +00:00
class="sortable-tasks"
)
task(
v-for="task in taskList",
:key="task.id", :task="task",
:isUser="isUser",
@editTask="editTask",
@moveTo="moveTo",
:group='group',
)
template(v-if="hasRewardsList")
Feature/sortable reward area (#9930) * Client POC We need to wrap each draggable region it its own div or else the "draggable" element will conflict with each other. This screws up the styling but that is totally fixable * Ah that ref was being used after all, changing back * Scaffold out a new callback for when we drag these things Next is going to be the hard part: I need to save the sort order for these to the database. I don't even know if there is a schema but hey this is the best place to start * Firefox caching is the problem: don't actually need the wrapper div So I guess I should try this in chrome and see how it works then come back to firefox and figure out what the heck is going on * Scaffolding out our API call to save the sort order The endpoint doesn't exist yet so we will need to add that * Ok we are now calling our API endpoint to reorder these things Of course it doesn't exist yet so you get a 404 when you try, but that is ok * Defining api endpoint, a work in progress In particular I really had ought to use _id for these too, it appears that the primary way we detect order doesn't even use "key" at all. * Switching to using the pinned item UUID This has much better results, but of course the server and client logic don't match now. Will have to keep working on my splice to make sure that they are the same * I thought this would fix our server/client mismatch but it is not it Something is really wrong with my logic somewhere, maybe I need to update the db step? * Moving this logic to the "user" rather than "tasks" and key off path Path is unique and is less finiky than dealing with string comparisons with ids. Unfortunately everything is still not working... I suppose user.update() doesn't care about the position? * This client code caused quite a lot of problems if you dragged fast We don't really need it it seems, so off it goes * Updating markup and CSS so it actually looks good. Everything is working horray!! I did just notice the following bug: the popover text sometimes makes it very annoying to drag because you can't drop over it@ * Cleaning up my comments in the API section user.js I had a lot of TODOS that are mostly done now * Fixing a spacing code standards thing * Turns out we never use type, so we should remove this from the API call * Adding pinnedItemsOrder into the user schema And disabling my call in the frontend before I do any more damage * Halfway to using pinnedItemsOrder This isn't working yet but it is not going to break it horribly like it was before. * Hooking up inAppRewards to always produce sorted information It is suspicially working right now even though I have not added the seasonal stuff logic yet... * Updating the comments in user.js in movedPinnedItem It turns out that my bandaid fix to just get the ball rolling perfectly does what I need it to do when we have a length discrepancy. So we are getting much closer to the final product, just need lots of testing * Cleaning up code standards kinds of things * Yay, this fixes the popover issue I hope this is the right "vue" way to do things, because I tried a bunch of other things that definately were not the right way to do it. And this appears to work too * ** Partial Work ** Starting tests on api call for draggable items Doesn't work, doesn't compile so don't include in PR! * Test failing still... This is worth a save. The api call grabs the seasonal items too, so we can't get away from using the common functions and calls here to get the actual list of items * Okay have the first test passing Need to clean up my linter problems though * Planning out the next two tests and fixing my format problems * 2nd Test case written, this time with the "more" odd case * Making sure that we didn't mess with pinned items * Huh... this test doesn't give me the expected result Drat, I guess I found a bug * Throw an error when we put garbage in our api call. Well, before we got user.pinnedItemsOrder filled with a bunch of "null" entries which is not ideal. it still worked, but isn't this confusing enough already? * Cleaning up the multitude of linting problems thanks gulp :) * Writing tests for inAppRewards.js, but something is wrong * Fixing my linting errors in inAppRewards tests These tests still do not run though, so they may fail and I would not know * Applying Negue's fixes to inAppRewards.js test It never occured to me that we shouldn't try to reach the database while in the common tests. Well, we shouldn't do that, we should use the common.helpers instead. Thanks!
2018-04-13 13:22:06 +00:00
draggable(
ref="rewardsList",
@update="rewardSorted",
@start="rewardDragStart",
@end="rewardDragEnd",
class="reward-items",
)
shopItem(
v-for="reward in inAppRewards",
:item="reward",
:key="reward.key",
:highlightBorder="reward.isSuggested",
Feature/sortable reward area (#9930) * Client POC We need to wrap each draggable region it its own div or else the "draggable" element will conflict with each other. This screws up the styling but that is totally fixable * Ah that ref was being used after all, changing back * Scaffold out a new callback for when we drag these things Next is going to be the hard part: I need to save the sort order for these to the database. I don't even know if there is a schema but hey this is the best place to start * Firefox caching is the problem: don't actually need the wrapper div So I guess I should try this in chrome and see how it works then come back to firefox and figure out what the heck is going on * Scaffolding out our API call to save the sort order The endpoint doesn't exist yet so we will need to add that * Ok we are now calling our API endpoint to reorder these things Of course it doesn't exist yet so you get a 404 when you try, but that is ok * Defining api endpoint, a work in progress In particular I really had ought to use _id for these too, it appears that the primary way we detect order doesn't even use "key" at all. * Switching to using the pinned item UUID This has much better results, but of course the server and client logic don't match now. Will have to keep working on my splice to make sure that they are the same * I thought this would fix our server/client mismatch but it is not it Something is really wrong with my logic somewhere, maybe I need to update the db step? * Moving this logic to the "user" rather than "tasks" and key off path Path is unique and is less finiky than dealing with string comparisons with ids. Unfortunately everything is still not working... I suppose user.update() doesn't care about the position? * This client code caused quite a lot of problems if you dragged fast We don't really need it it seems, so off it goes * Updating markup and CSS so it actually looks good. Everything is working horray!! I did just notice the following bug: the popover text sometimes makes it very annoying to drag because you can't drop over it@ * Cleaning up my comments in the API section user.js I had a lot of TODOS that are mostly done now * Fixing a spacing code standards thing * Turns out we never use type, so we should remove this from the API call * Adding pinnedItemsOrder into the user schema And disabling my call in the frontend before I do any more damage * Halfway to using pinnedItemsOrder This isn't working yet but it is not going to break it horribly like it was before. * Hooking up inAppRewards to always produce sorted information It is suspicially working right now even though I have not added the seasonal stuff logic yet... * Updating the comments in user.js in movedPinnedItem It turns out that my bandaid fix to just get the ball rolling perfectly does what I need it to do when we have a length discrepancy. So we are getting much closer to the final product, just need lots of testing * Cleaning up code standards kinds of things * Yay, this fixes the popover issue I hope this is the right "vue" way to do things, because I tried a bunch of other things that definately were not the right way to do it. And this appears to work too * ** Partial Work ** Starting tests on api call for draggable items Doesn't work, doesn't compile so don't include in PR! * Test failing still... This is worth a save. The api call grabs the seasonal items too, so we can't get away from using the common functions and calls here to get the actual list of items * Okay have the first test passing Need to clean up my linter problems though * Planning out the next two tests and fixing my format problems * 2nd Test case written, this time with the "more" odd case * Making sure that we didn't mess with pinned items * Huh... this test doesn't give me the expected result Drat, I guess I found a bug * Throw an error when we put garbage in our api call. Well, before we got user.pinnedItemsOrder filled with a bunch of "null" entries which is not ideal. it still worked, but isn't this confusing enough already? * Cleaning up the multitude of linting problems thanks gulp :) * Writing tests for inAppRewards.js, but something is wrong * Fixing my linting errors in inAppRewards tests These tests still do not run though, so they may fail and I would not know * Applying Negue's fixes to inAppRewards.js test It never occured to me that we shouldn't try to reach the database while in the common tests. Well, we shouldn't do that, we should use the common.helpers instead. Thanks!
2018-04-13 13:22:06 +00:00
:showPopover="showPopovers"
@click="openBuyDialog(reward)",
:popoverPosition="'left'"
)
template(slot="itemBadge", slot-scope="ctx")
span.badge.badge-pill.badge-item.badge-svg(
:class="{'item-selected-badge': ctx.item.pinned, 'hide': !ctx.highlightBorder}",
@click.prevent.stop="togglePinned(ctx.item)"
)
span.svg-icon.inline.icon-12.color(v-html="icons.pin")
</template>
<style lang="scss" scoped>
@import '~client/assets/scss/colors.scss';
.tasks-column {
min-height: 556px;
}
.sortable-tasks {
word-break: break-word;
}
.sortable-tasks + .reward-items {
2017-08-28 18:00:06 +00:00
margin-top: 16px;
}
.reward-items {
@supports (display: grid) {
display: grid;
justify-content: center;
grid-column-gap: 16px;
grid-row-gap: 4px;
grid-template-columns: repeat(auto-fill, 94px);
}
@supports not (display: grid) {
display: flex;
flex-wrap: wrap;
& > div {
margin: 0 16px 4px 0;
}
}
}
.tasks-list {
border-radius: 4px;
background: $gray-600;
padding: 8px;
position: relative; // needed for the .bottom-gradient to be position: absolute
height: calc(100% - 56px);
padding-bottom: 30px;
}
.quick-add {
border-radius: 2px;
background-color: rgba($black, 0.06);
width: 100%;
margin-bottom: 3px;
padding: 12px 16px;
border-color: transparent;
transition: background 0.15s ease-in;
resize: none;
&:hover {
background-color: rgba($black, 0.1);
border-color: transparent;
}
&:active, &:focus {
background: $white;
border-color: $purple-500;
color: $gray-50;
margin-bottom: 0px;
}
&::placeholder {
font-weight: bold;
}
}
.quick-add-tip {
font-style: normal;
padding: 16px;
text-align: center;
overflow-y: hidden;
max-height: 65px; // approximate max height
}
.quick-add-tip-slide-enter-active {
transition: all 0.5s cubic-bezier(0, 1, 0.5, 1);
}
.quick-add-tip-slide-leave-active {
transition: all 0.5s cubic-bezier(0, 1, 0.5, 1);
}
.quick-add-tip-slide-enter, .quick-add-tip-slide-leave-to {
max-height: 0;
padding: 0 16px;
}
.column-title {
margin-bottom: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.column-badge {
position: static;
}
.filters {
margin-left: auto;
}
.filter {
font-weight: bold;
color: $gray-100;
font-style: normal;
padding: 8px;
cursor: pointer;
white-space: nowrap;
&:hover {
color: $purple-200;
}
&.active {
color: $purple-200;
border-bottom: 2px solid $purple-200;
padding-bottom: 6px;
}
}
.column-background {
position: absolute;
bottom: 32px;
&.initial-description {
top: 30%;
}
.svg-icon {
margin: 0 auto;
margin-bottom: 12px;
}
h3, .small-text {
color: $gray-300;
text-align: center;
}
h3 {
font-weight: normal;
margin-bottom: 4px;
}
.small-text {
font-style: normal;
padding-left: 24px;
padding-right: 24px;
}
}
.icon-habit {
width: 30px;
height: 20px;
color: $gray-300;
}
.icon-daily {
width: 30px;
height: 20px;
color: $gray-300;
}
.icon-todo {
width: 20px;
height: 20px;
color: $gray-300;
}
.icon-reward {
width: 26px;
height: 20px;
color: $gray-300;
}
</style>
<script>
import Task from './task';
2018-01-22 15:28:42 +00:00
import ClearCompletedTodos from './clearCompletedTodos';
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
import throttle from 'lodash/throttle';
import isEmpty from 'lodash/isEmpty';
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
import buyMixin from 'client/mixins/buy';
import { mapState, mapActions, mapGetters } from 'client/libs/store';
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
import shopItem from '../shops/shopItem';
import BuyQuestModal from 'client/components/shops/quests/buyQuestModal.vue';
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
import notifications from 'client/mixins/notifications';
import { shouldDo } from 'common/script/cron';
import inAppRewards from 'common/script/libs/inAppRewards';
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
import spells from 'common/script/content/spells';
import taskDefaults from 'common/script/libs/taskDefaults';
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
import {
getTypeLabel,
getFilterLabels,
getActiveFilter,
} from 'client/libs/store/helpers/filterTasks.js';
import svgPin from 'assets/svg/pin.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 draggable from 'vuedraggable';
export default {
mixins: [buyMixin, notifications],
components: {
Task,
2018-01-22 15:28:42 +00:00
ClearCompletedTodos,
BuyQuestModal,
shopItem,
draggable,
},
// Set default values for props
// allows for better control of props values
// allows for better control of where this component is called
props: {
type: {},
isUser: {
type: Boolean,
default: false,
},
searchText: {},
selectedTags: {},
taskListOverride: {},
group: {},
}, // @TODO: maybe we should store the group on state?
data () {
const icons = Object.freeze({
habit: habitIcon,
daily: dailyIcon,
todo: todoIcon,
reward: rewardIcon,
pin: svgPin,
});
let typeLabel = '';
let typeFilters = [];
let activeFilter = {};
return {
typeLabel,
typeFilters,
activeFilter,
icons,
openedCompletedTodos: false,
[WIP] new client - seasonal-shop (#9018) * extract seasonal-shop config - use summer season items (to work on) * add suggested border to shopItems * refactor getOfficialPinnedItems (now includes the seasonal gear) * refactor shops.getSeasonalShop - add featured items to result - add the set to special equipment items * feat(content): Fall 2017 seasonal gear Also adds set keys for all prior seasonal gear. * show item limited time (buyModal & shopItem) * select seasonal fall sets * WIP(seasonal-shop): placeholder Fall 2017 items * fix lint * sprites * styling + fix purchase of seasonal spells * compile sprites * fixes: check isPinned with officialItems * enable purchase of seasonal items for testing * fix shop apis * add featuredItems to market * quest shop: add featuredItems to api * tiem travelers shop: add featuredItems to api * fix gear types filter * feat(content): Fall 2017 compleat * chore(sprites): compile * show opened shop state (npc+background) * add opened seasonal npc * current seasonal users class set = purchase by gold - lock other sets of the current season * hide event badge in seasonal shop - dot only for suggested items - cursor: pointer on shopItems * refresh rewards column list (seasonal gear won't refresh it on purchase) * fix duplicate seasonal gear -> remove special items from the old reward gear (which is used to reset the pinned gears) * every current season gear is purchased by gold - prevent buyModal on locked items * use the current event date range * list seasonal sets by event date * use custom method instead of updateStore to list the pinnable gear * change daterange to 10-31 * fix start quest modal from items - disable invite quest button if a quest is already active * toggle pin in buy-dialogs * check if the item is not undefined/null - renamed the watch function
2017-09-21 00:28:11 +00:00
forceRefresh: new Date(),
quickAddText: '',
quickAddFocused: false,
quickAddRows: 1,
Feature/sortable reward area (#9930) * Client POC We need to wrap each draggable region it its own div or else the "draggable" element will conflict with each other. This screws up the styling but that is totally fixable * Ah that ref was being used after all, changing back * Scaffold out a new callback for when we drag these things Next is going to be the hard part: I need to save the sort order for these to the database. I don't even know if there is a schema but hey this is the best place to start * Firefox caching is the problem: don't actually need the wrapper div So I guess I should try this in chrome and see how it works then come back to firefox and figure out what the heck is going on * Scaffolding out our API call to save the sort order The endpoint doesn't exist yet so we will need to add that * Ok we are now calling our API endpoint to reorder these things Of course it doesn't exist yet so you get a 404 when you try, but that is ok * Defining api endpoint, a work in progress In particular I really had ought to use _id for these too, it appears that the primary way we detect order doesn't even use "key" at all. * Switching to using the pinned item UUID This has much better results, but of course the server and client logic don't match now. Will have to keep working on my splice to make sure that they are the same * I thought this would fix our server/client mismatch but it is not it Something is really wrong with my logic somewhere, maybe I need to update the db step? * Moving this logic to the "user" rather than "tasks" and key off path Path is unique and is less finiky than dealing with string comparisons with ids. Unfortunately everything is still not working... I suppose user.update() doesn't care about the position? * This client code caused quite a lot of problems if you dragged fast We don't really need it it seems, so off it goes * Updating markup and CSS so it actually looks good. Everything is working horray!! I did just notice the following bug: the popover text sometimes makes it very annoying to drag because you can't drop over it@ * Cleaning up my comments in the API section user.js I had a lot of TODOS that are mostly done now * Fixing a spacing code standards thing * Turns out we never use type, so we should remove this from the API call * Adding pinnedItemsOrder into the user schema And disabling my call in the frontend before I do any more damage * Halfway to using pinnedItemsOrder This isn't working yet but it is not going to break it horribly like it was before. * Hooking up inAppRewards to always produce sorted information It is suspicially working right now even though I have not added the seasonal stuff logic yet... * Updating the comments in user.js in movedPinnedItem It turns out that my bandaid fix to just get the ball rolling perfectly does what I need it to do when we have a length discrepancy. So we are getting much closer to the final product, just need lots of testing * Cleaning up code standards kinds of things * Yay, this fixes the popover issue I hope this is the right "vue" way to do things, because I tried a bunch of other things that definately were not the right way to do it. And this appears to work too * ** Partial Work ** Starting tests on api call for draggable items Doesn't work, doesn't compile so don't include in PR! * Test failing still... This is worth a save. The api call grabs the seasonal items too, so we can't get away from using the common functions and calls here to get the actual list of items * Okay have the first test passing Need to clean up my linter problems though * Planning out the next two tests and fixing my format problems * 2nd Test case written, this time with the "more" odd case * Making sure that we didn't mess with pinned items * Huh... this test doesn't give me the expected result Drat, I guess I found a bug * Throw an error when we put garbage in our api call. Well, before we got user.pinnedItemsOrder filled with a bunch of "null" entries which is not ideal. it still worked, but isn't this confusing enough already? * Cleaning up the multitude of linting problems thanks gulp :) * Writing tests for inAppRewards.js, but something is wrong * Fixing my linting errors in inAppRewards tests These tests still do not run though, so they may fail and I would not know * Applying Negue's fixes to inAppRewards.js test It never occured to me that we shouldn't try to reach the database while in the common tests. Well, we shouldn't do that, we should use the common.helpers instead. Thanks!
2018-04-13 13:22:06 +00:00
showPopovers: true,
selectedItemToBuy: {},
};
},
created () {
// Set Task Column Label
this.typeLabel = getTypeLabel(this.type);
// Get Category Filter Labels
this.typeFilters = getFilterLabels(this.type);
// Set default filter for task column
this.activateFilter(this.type);
},
computed: {
...mapState({
user: 'user.data',
}),
...mapGetters({
getFilteredTaskList: 'tasks:getFilteredTaskList',
getUnfilteredTaskList: 'tasks:getUnfilteredTaskList',
getUserPreferences: 'user:preferences',
getUserBuffs: 'user:buffs',
}),
taskList () {
// @TODO: This should not default to user's tasks. It should require that you pass options in
let filteredTaskList = this.isUser ?
this.getFilteredTaskList({
type: this.type,
filterType: this.activeFilter.label,
}) :
this.taskListOverride;
let taggedList = this.filterByTagList(filteredTaskList, this.selectedTags);
let searchedList = this.filterBySearchText(taggedList, this.searchText);
return searchedList;
},
inAppRewards () {
[WIP] new client - seasonal-shop (#9018) * extract seasonal-shop config - use summer season items (to work on) * add suggested border to shopItems * refactor getOfficialPinnedItems (now includes the seasonal gear) * refactor shops.getSeasonalShop - add featured items to result - add the set to special equipment items * feat(content): Fall 2017 seasonal gear Also adds set keys for all prior seasonal gear. * show item limited time (buyModal & shopItem) * select seasonal fall sets * WIP(seasonal-shop): placeholder Fall 2017 items * fix lint * sprites * styling + fix purchase of seasonal spells * compile sprites * fixes: check isPinned with officialItems * enable purchase of seasonal items for testing * fix shop apis * add featuredItems to market * quest shop: add featuredItems to api * tiem travelers shop: add featuredItems to api * fix gear types filter * feat(content): Fall 2017 compleat * chore(sprites): compile * show opened shop state (npc+background) * add opened seasonal npc * current seasonal users class set = purchase by gold - lock other sets of the current season * hide event badge in seasonal shop - dot only for suggested items - cursor: pointer on shopItems * refresh rewards column list (seasonal gear won't refresh it on purchase) * fix duplicate seasonal gear -> remove special items from the old reward gear (which is used to reset the pinned gears) * every current season gear is purchased by gold - prevent buyModal on locked items * use the current event date range * list seasonal sets by event date * use custom method instead of updateStore to list the pinnable gear * change daterange to 10-31 * fix start quest modal from items - disable invite quest button if a quest is already active * toggle pin in buy-dialogs * check if the item is not undefined/null - renamed the watch function
2017-09-21 00:28:11 +00:00
let watchRefresh = this.forceRefresh; // eslint-disable-line
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
let rewards = inAppRewards(this.user);
// Add season rewards if user is affected
// @TODO: Add buff conditional
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
const seasonalSkills = {
snowball: 'salt',
spookySparkles: 'opaquePotion',
shinySeed: 'petalFreePotion',
seafoam: 'sand',
};
for (let key in seasonalSkills) {
if (this.getUserBuffs(key)) {
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
let debuff = seasonalSkills[key];
let item = Object.assign({}, spells.special[debuff]);
item.text = item.text();
item.notes = item.notes();
item.class = `shop_${key}`;
rewards.push(item);
}
}
[WIP] new client - seasonal-shop (#9018) * extract seasonal-shop config - use summer season items (to work on) * add suggested border to shopItems * refactor getOfficialPinnedItems (now includes the seasonal gear) * refactor shops.getSeasonalShop - add featured items to result - add the set to special equipment items * feat(content): Fall 2017 seasonal gear Also adds set keys for all prior seasonal gear. * show item limited time (buyModal & shopItem) * select seasonal fall sets * WIP(seasonal-shop): placeholder Fall 2017 items * fix lint * sprites * styling + fix purchase of seasonal spells * compile sprites * fixes: check isPinned with officialItems * enable purchase of seasonal items for testing * fix shop apis * add featuredItems to market * quest shop: add featuredItems to api * tiem travelers shop: add featuredItems to api * fix gear types filter * feat(content): Fall 2017 compleat * chore(sprites): compile * show opened shop state (npc+background) * add opened seasonal npc * current seasonal users class set = purchase by gold - lock other sets of the current season * hide event badge in seasonal shop - dot only for suggested items - cursor: pointer on shopItems * refresh rewards column list (seasonal gear won't refresh it on purchase) * fix duplicate seasonal gear -> remove special items from the old reward gear (which is used to reset the pinned gears) * every current season gear is purchased by gold - prevent buyModal on locked items * use the current event date range * list seasonal sets by event date * use custom method instead of updateStore to list the pinnable gear * change daterange to 10-31 * fix start quest modal from items - disable invite quest button if a quest is already active * toggle pin in buy-dialogs * check if the item is not undefined/null - renamed the watch function
2017-09-21 00:28:11 +00:00
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
return rewards;
},
hasRewardsList () {
return this.isUser === true && this.type === 'reward' && this.activeFilter.label !== 'custom';
},
initialColumnDescription () {
// Show the column description in the middle only if there are no elements (tasks or in app items)
if (this.hasRewardsList) {
if (this.inAppRewards && this.inAppRewards.length >= 0) return false;
}
return this.taskList.length === 0;
},
quickAddPlaceholder () {
const type = this.$t(this.type);
return this.$t('addATask', {type});
},
badgeCount () {
// 0 means the badge will not be shown
// It is shown for the all and due views of dailies
// and for the active and scheduled views of todos.
if (this.type === 'todo' && this.activeFilter.label !== 'complete2') {
return this.taskList.length;
} else if (this.type === 'daily') {
if (this.activeFilter.label === 'due') {
return this.taskList.length;
} else if (this.activeFilter.label === 'all') {
return this.taskList.reduce((count, t) => {
return !t.completed && shouldDo(new Date(), t, this.getUserPreferences) ? count + 1 : count;
}, 0);
}
}
return 0;
},
},
watch: {
taskList: {
handler: throttle(function setColumnBackgroundVisibility () {
this.setColumnBackgroundVisibility();
}, 250),
deep: true,
},
quickAddFocused (newValue) {
if (newValue) this.quickAddRows = this.quickAddText.split('\n').length;
if (!newValue) this.quickAddRows = 1;
},
},
mounted () {
this.setColumnBackgroundVisibility();
[WIP] new client - seasonal-shop (#9018) * extract seasonal-shop config - use summer season items (to work on) * add suggested border to shopItems * refactor getOfficialPinnedItems (now includes the seasonal gear) * refactor shops.getSeasonalShop - add featured items to result - add the set to special equipment items * feat(content): Fall 2017 seasonal gear Also adds set keys for all prior seasonal gear. * show item limited time (buyModal & shopItem) * select seasonal fall sets * WIP(seasonal-shop): placeholder Fall 2017 items * fix lint * sprites * styling + fix purchase of seasonal spells * compile sprites * fixes: check isPinned with officialItems * enable purchase of seasonal items for testing * fix shop apis * add featuredItems to market * quest shop: add featuredItems to api * tiem travelers shop: add featuredItems to api * fix gear types filter * feat(content): Fall 2017 compleat * chore(sprites): compile * show opened shop state (npc+background) * add opened seasonal npc * current seasonal users class set = purchase by gold - lock other sets of the current season * hide event badge in seasonal shop - dot only for suggested items - cursor: pointer on shopItems * refresh rewards column list (seasonal gear won't refresh it on purchase) * fix duplicate seasonal gear -> remove special items from the old reward gear (which is used to reset the pinned gears) * every current season gear is purchased by gold - prevent buyModal on locked items * use the current event date range * list seasonal sets by event date * use custom method instead of updateStore to list the pinnable gear * change daterange to 10-31 * fix start quest modal from items - disable invite quest button if a quest is already active * toggle pin in buy-dialogs * check if the item is not undefined/null - renamed the watch function
2017-09-21 00:28:11 +00:00
this.$root.$on('buyModal::boughtItem', () => {
this.forceRefresh = new Date();
});
if (this.type !== 'todo') return;
this.$root.$on('habitica::resync-requested', () => {
if (this.activeFilter.label !== 'complete2') return;
this.loadCompletedTodos(true);
});
},
destroyed () {
this.$root.$off('buyModal::boughtItem');
if (this.type !== 'todo') return;
this.$root.$off('habitica::resync-requested');
},
methods: {
...mapActions({
loadCompletedTodos: 'tasks:fetchCompletedTodos',
createTask: 'tasks:create',
}),
Feature/sortable reward area (#9930) * Client POC We need to wrap each draggable region it its own div or else the "draggable" element will conflict with each other. This screws up the styling but that is totally fixable * Ah that ref was being used after all, changing back * Scaffold out a new callback for when we drag these things Next is going to be the hard part: I need to save the sort order for these to the database. I don't even know if there is a schema but hey this is the best place to start * Firefox caching is the problem: don't actually need the wrapper div So I guess I should try this in chrome and see how it works then come back to firefox and figure out what the heck is going on * Scaffolding out our API call to save the sort order The endpoint doesn't exist yet so we will need to add that * Ok we are now calling our API endpoint to reorder these things Of course it doesn't exist yet so you get a 404 when you try, but that is ok * Defining api endpoint, a work in progress In particular I really had ought to use _id for these too, it appears that the primary way we detect order doesn't even use "key" at all. * Switching to using the pinned item UUID This has much better results, but of course the server and client logic don't match now. Will have to keep working on my splice to make sure that they are the same * I thought this would fix our server/client mismatch but it is not it Something is really wrong with my logic somewhere, maybe I need to update the db step? * Moving this logic to the "user" rather than "tasks" and key off path Path is unique and is less finiky than dealing with string comparisons with ids. Unfortunately everything is still not working... I suppose user.update() doesn't care about the position? * This client code caused quite a lot of problems if you dragged fast We don't really need it it seems, so off it goes * Updating markup and CSS so it actually looks good. Everything is working horray!! I did just notice the following bug: the popover text sometimes makes it very annoying to drag because you can't drop over it@ * Cleaning up my comments in the API section user.js I had a lot of TODOS that are mostly done now * Fixing a spacing code standards thing * Turns out we never use type, so we should remove this from the API call * Adding pinnedItemsOrder into the user schema And disabling my call in the frontend before I do any more damage * Halfway to using pinnedItemsOrder This isn't working yet but it is not going to break it horribly like it was before. * Hooking up inAppRewards to always produce sorted information It is suspicially working right now even though I have not added the seasonal stuff logic yet... * Updating the comments in user.js in movedPinnedItem It turns out that my bandaid fix to just get the ball rolling perfectly does what I need it to do when we have a length discrepancy. So we are getting much closer to the final product, just need lots of testing * Cleaning up code standards kinds of things * Yay, this fixes the popover issue I hope this is the right "vue" way to do things, because I tried a bunch of other things that definately were not the right way to do it. And this appears to work too * ** Partial Work ** Starting tests on api call for draggable items Doesn't work, doesn't compile so don't include in PR! * Test failing still... This is worth a save. The api call grabs the seasonal items too, so we can't get away from using the common functions and calls here to get the actual list of items * Okay have the first test passing Need to clean up my linter problems though * Planning out the next two tests and fixing my format problems * 2nd Test case written, this time with the "more" odd case * Making sure that we didn't mess with pinned items * Huh... this test doesn't give me the expected result Drat, I guess I found a bug * Throw an error when we put garbage in our api call. Well, before we got user.pinnedItemsOrder filled with a bunch of "null" entries which is not ideal. it still worked, but isn't this confusing enough already? * Cleaning up the multitude of linting problems thanks gulp :) * Writing tests for inAppRewards.js, but something is wrong * Fixing my linting errors in inAppRewards tests These tests still do not run though, so they may fail and I would not know * Applying Negue's fixes to inAppRewards.js test It never occured to me that we shouldn't try to reach the database while in the common tests. Well, we shouldn't do that, we should use the common.helpers instead. Thanks!
2018-04-13 13:22:06 +00:00
async taskSorted (data) {
const filteredList = this.taskList;
const taskToMove = filteredList[data.oldIndex];
const taskIdToMove = taskToMove._id;
let originTasks = this.getUnfilteredTaskList(this.type);
if (this.taskListOverride) originTasks = this.taskListOverride;
// Server
const taskIdToReplace = filteredList[data.newIndex];
const newIndexOnServer = originTasks.findIndex(taskId => taskId === taskIdToReplace);
let newOrder;
if (taskToMove.group.id) {
newOrder = await this.$store.dispatch('tasks:moveGroupTask', {
taskId: taskIdToMove,
position: newIndexOnServer,
});
} else {
newOrder = await this.$store.dispatch('tasks:move', {
taskId: taskIdToMove,
position: newIndexOnServer,
});
}
if (!this.taskListOverride) this.user.tasksOrder[`${this.type}s`] = newOrder;
// Client
const deleted = originTasks.splice(data.oldIndex, 1);
originTasks.splice(data.newIndex, 0, deleted[0]);
},
async moveTo (task, where) { // where is 'top' or 'bottom'
const taskIdToMove = task._id;
const list = 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]);
let newOrder = await this.$store.dispatch('tasks:move', {
taskId: taskIdToMove,
position: newPosition,
});
this.user.tasksOrder[`${this.type}s`] = newOrder;
},
Feature/sortable reward area (#9930) * Client POC We need to wrap each draggable region it its own div or else the "draggable" element will conflict with each other. This screws up the styling but that is totally fixable * Ah that ref was being used after all, changing back * Scaffold out a new callback for when we drag these things Next is going to be the hard part: I need to save the sort order for these to the database. I don't even know if there is a schema but hey this is the best place to start * Firefox caching is the problem: don't actually need the wrapper div So I guess I should try this in chrome and see how it works then come back to firefox and figure out what the heck is going on * Scaffolding out our API call to save the sort order The endpoint doesn't exist yet so we will need to add that * Ok we are now calling our API endpoint to reorder these things Of course it doesn't exist yet so you get a 404 when you try, but that is ok * Defining api endpoint, a work in progress In particular I really had ought to use _id for these too, it appears that the primary way we detect order doesn't even use "key" at all. * Switching to using the pinned item UUID This has much better results, but of course the server and client logic don't match now. Will have to keep working on my splice to make sure that they are the same * I thought this would fix our server/client mismatch but it is not it Something is really wrong with my logic somewhere, maybe I need to update the db step? * Moving this logic to the "user" rather than "tasks" and key off path Path is unique and is less finiky than dealing with string comparisons with ids. Unfortunately everything is still not working... I suppose user.update() doesn't care about the position? * This client code caused quite a lot of problems if you dragged fast We don't really need it it seems, so off it goes * Updating markup and CSS so it actually looks good. Everything is working horray!! I did just notice the following bug: the popover text sometimes makes it very annoying to drag because you can't drop over it@ * Cleaning up my comments in the API section user.js I had a lot of TODOS that are mostly done now * Fixing a spacing code standards thing * Turns out we never use type, so we should remove this from the API call * Adding pinnedItemsOrder into the user schema And disabling my call in the frontend before I do any more damage * Halfway to using pinnedItemsOrder This isn't working yet but it is not going to break it horribly like it was before. * Hooking up inAppRewards to always produce sorted information It is suspicially working right now even though I have not added the seasonal stuff logic yet... * Updating the comments in user.js in movedPinnedItem It turns out that my bandaid fix to just get the ball rolling perfectly does what I need it to do when we have a length discrepancy. So we are getting much closer to the final product, just need lots of testing * Cleaning up code standards kinds of things * Yay, this fixes the popover issue I hope this is the right "vue" way to do things, because I tried a bunch of other things that definately were not the right way to do it. And this appears to work too * ** Partial Work ** Starting tests on api call for draggable items Doesn't work, doesn't compile so don't include in PR! * Test failing still... This is worth a save. The api call grabs the seasonal items too, so we can't get away from using the common functions and calls here to get the actual list of items * Okay have the first test passing Need to clean up my linter problems though * Planning out the next two tests and fixing my format problems * 2nd Test case written, this time with the "more" odd case * Making sure that we didn't mess with pinned items * Huh... this test doesn't give me the expected result Drat, I guess I found a bug * Throw an error when we put garbage in our api call. Well, before we got user.pinnedItemsOrder filled with a bunch of "null" entries which is not ideal. it still worked, but isn't this confusing enough already? * Cleaning up the multitude of linting problems thanks gulp :) * Writing tests for inAppRewards.js, but something is wrong * Fixing my linting errors in inAppRewards tests These tests still do not run though, so they may fail and I would not know * Applying Negue's fixes to inAppRewards.js test It never occured to me that we shouldn't try to reach the database while in the common tests. Well, we shouldn't do that, we should use the common.helpers instead. Thanks!
2018-04-13 13:22:06 +00:00
async rewardSorted (data) {
const rewardsList = this.inAppRewards;
const rewardToMove = rewardsList[data.oldIndex];
let newOrder = await this.$store.dispatch('user:movePinnedItem', {
path: rewardToMove.path,
position: data.newIndex,
});
this.user.pinnedItemsOrder = newOrder;
},
rewardDragStart () {
// We need to stop popovers from interfering with our dragging
this.showPopovers = false;
},
rewardDragEnd () {
this.showPopovers = true;
},
quickAdd (ev) {
// Add a new line if Shift+Enter Pressed
if (ev.shiftKey) {
this.quickAddRows++;
return true;
}
// Do not add new line is added if only Enter is pressed
ev.preventDefault();
const text = this.quickAddText;
if (!text) return false;
const tasks = text.split('\n').reverse().filter(taskText => {
return taskText ? true : false;
}).map(taskText => {
const task = taskDefaults({type: this.type, text: taskText});
task.tags = this.selectedTags;
return task;
});
2018-03-17 20:13:12 +00:00
this.quickAddText = '';
this.quickAddRows = 1;
this.createTask(tasks);
this.$refs.quickAdd.blur();
},
editTask (task) {
this.$emit('editTask', task);
},
activateFilter (type, filter = '') {
// Needs a separate API call as this data may not reside in store
if (type === 'todo' && filter === 'complete2') {
this.loadCompletedTodos();
}
// the only time activateFilter is called with filter==='' is when the component is first created
// this can be used to check If the user has set 'due' as default filter for daily
// and set the filter as 'due' only when the component first loads and not on subsequent reloads.
if (type === 'daily' && filter === '' && this.user.preferences.dailyDueDefaultView) {
filter = 'due';
}
this.activeFilter = getActiveFilter(type, filter);
},
setColumnBackgroundVisibility () {
this.$nextTick(() => {
if (!this.$refs.columnBackground) return;
const tasksWrapperEl = this.$refs.tasksWrapper;
const tasksWrapperHeight = tasksWrapperEl.offsetHeight;
const quickAddHeight = this.$refs.quickAdd ? this.$refs.quickAdd.offsetHeight : 0;
const tasksListHeight = this.$refs.tasksList.$el.offsetHeight;
let combinedTasksHeights = tasksListHeight + quickAddHeight;
const rewardsList = tasksWrapperEl.getElementsByClassName('reward-items')[0];
if (rewardsList) {
combinedTasksHeights += rewardsList.offsetHeight;
}
const columnBackgroundStyle = this.$refs.columnBackground.style;
if (tasksWrapperHeight - combinedTasksHeights < 150) {
columnBackgroundStyle.display = 'none';
} else {
columnBackgroundStyle.display = 'block';
}
});
},
filterByTagList (taskList, tagList = []) {
let filteredTaskList = taskList;
// filter requested tasks by tags
if (!isEmpty(tagList)) {
filteredTaskList = taskList.filter(
task => tagList.every(tag => task.tags.indexOf(tag) !== -1)
);
}
return filteredTaskList;
},
filterBySearchText (taskList, searchText = '') {
let filteredTaskList = taskList;
// filter requested tasks by search text
if (searchText) {
// to ensure broadest case insensitive search matching
let searchTextLowerCase = searchText.toLowerCase();
filteredTaskList = taskList.filter(
task => {
// eslint rule disabled for block to allow nested binary expression
/* eslint-disable no-extra-parens */
return (
task.text.toLowerCase().indexOf(searchTextLowerCase) > -1 ||
(task.notes && task.notes.toLowerCase().indexOf(searchTextLowerCase) > -1) ||
(task.checklist && task.checklist.length > 0 &&
task.checklist.some(checkItem => checkItem.text.toLowerCase().indexOf(searchTextLowerCase) > -1))
);
/* eslint-enable no-extra-parens */
});
}
return filteredTaskList;
},
openBuyDialog (rewardItem) {
if (rewardItem.locked) return;
Merge develop into release (#9154) * Client: fix Apidoc and move email files (#9139) * fix apidoc * move emails files * quest leader can start/end quest; admins can edit challenges/guilds; reverse chat works; remove static/videos link; etc (#9140) * enable link to markdown info on group and challenge edit screen * allow admin (moderators and staff) to edit challenges * allow admin (moderators and staff) to edit guilds Also add some unrelated TODO comments. * allow any party member (not just leader) to start quest from party page * allow quest owner to cancel, begin, abort quest Previously only the party leader could see those buttons. The leader still can. This also hides those buttons from all other party members. * enable reverse chat in guilds and party * remove outdated videos from press kit * adjust various wordings * Be consistent with capitalization of Check-In. (#9118) * limit for inlined svg images and make home leaner by not bundling it with the rest of static pages * sep 27 fixes (#9088) * fix item paddings / drawer width * expand the width of item-rows by the margin of an item * fix hatchedPet-dialog * fix hatching-modal * remove min-height * Oct 3 fixes (#9148) * Only show level after yesterdailies modal * Fixed zindex * Added spcial spells to rewards column * Added single click buy for health and armoire * Prevented task scoring when casting a spell * Renamed generic purchase method * Updated nav for small screen * Hide checklist while casting * fix some text describing menu items (#9145)
2017-10-04 02:15:00 +00:00
// Buy armoire and health potions immediately
let itemsToPurchaseImmediately = ['potion', 'armoire'];
if (itemsToPurchaseImmediately.indexOf(rewardItem.key) !== -1) {
this.makeGenericPurchase(rewardItem);
this.$emit('buyPressed', rewardItem);
return;
}
if (rewardItem.purchaseType === 'quests') {
this.selectedItemToBuy = rewardItem;
this.$root.$emit('bv::show::modal', 'buy-quest-modal');
return;
}
if (rewardItem.purchaseType !== 'gear' || !rewardItem.locked) {
this.$emit('openBuyDialog', rewardItem);
}
},
resetItemToBuy ($event) {
if (!$event) {
this.selectedItemToBuy = null;
}
},
togglePinned (item) {
if (!item.pinType) {
this.error(this.$t('errorTemporaryItem'));
return;
}
try {
if (!this.$store.dispatch('user:togglePinnedItem', {type: item.pinType, path: item.path})) {
this.text(this.$t('unpinnedItem', {item: item.text}));
}
} catch (e) {
this.error(e.message);
}
},
},
};
</script>