krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Party / Group Sidebar / Quest states (#12793)

Browse Source 
* move groups/sidebar to groupSidebar.vue

* lint files

* extract group/party sidebar to rightSidebar.vue

* wip stories with example data

* update stories - wip sidebar re-styling

* message party / group leader + move items to the menu

* update paddings /place for quest section

* invite to party / guild

* update labels (* Party / Guild )

* guild-background to group-background

* correct menu order + missing a label based on the group type

* no quest - styles / layout applied

* quest owner / not started - styles applied   + extracted questActions from questDetailsModal.vue to a mixin

* no challenge style

* hover with underlines

* quest-pending area layout / margins

* "Collection Quest/Quest Owner Participating" Styling Done

* group sidebar menu with icons / background

* remove most participate button styles

* fix quest-invite panel

* move "Start Quest" + add "Leave Quest"

* Not Participating + Boss + Rage Quests restyling

* party quest changes - invitedToQuest + button styles + no-items style + view details

* fix icons + rage value + colors

* fix duplicate key

* hide items label if 0 items found + hide pending damage if there is none + sidebar section margin + fix percent calculation 0 => 0%

* combine quest abandon / cancel to one call + hide begin if quest has already started + close modal if quest was canceled

* remove unused translate string

* allow leaving an accepted but inactive quest + disable leave when user is quest leader

* update "are you sure" questions - remove "doubleSureAbort" - add "sureLeaveInactive"

* sidebar margins + menu icon color

* refactored css rules

* improve some styles

* fix button spacing

* fix dropmenu with icon hover

* hide leave quest for leaders + fix quest buttons spacing

* add pending items label

* remove "X items found" label

* first round of fixes

* last v-once

* Update Quest Dialogs (#13112)

* new quest rewards panel + extract questPopover and itemWithLabel

* WIP: questInfo still not applying the row-height..

* split up start-quest-modal into select and detail modal - also rename the current quest-details to be the group-quest-details modal

* remove start-quest-modal from modal-scss

* update package-lock

* WIP before using the quest sidebar branch as a base

* move quest detail actions to the "new" details dialog

* quest details layout for owner / participant

* fix quest rewards - open details modal from sidebar

* apply quest-details dialog styles to the buyQuestModal one

* fix quest reward icons / popover / texts

* WIP back to quest selection

* fix lint

* merge selectQuestModal.vue with questDetailModal.vue + UI for the select quest

* fix margins / layout / labels

* fix quest detail + wip invitationListModal.vue / participantListModal.vue

* fix questmodal user label centered

* fix centered reward items + grouping items and adding a count-badge

* sort quests by AZ or quantity

* invitations modal

* remove console.info

* complete participantListModal.vue + extracted getClassName

* missed a file for getClassName extraction

* fix invitations

* select the actual quest on details

* fix margins on invite to party / start quest buttons

* replace buyQuestModal close button and title

* fix recursion due to the same name

* missing import

* sort quantity by highest first

* fix "Can't find a Quest to start" styles

* fix "your balance" padding

* fix quest collections / drop items

* fix member details in participants list

* fix quest info

* remove nullable because the build doesn't like it (on this file..)

* add questCompleted to the stories + fix getDropName

* replace quest-rewards in questCompleted.vue

* fix questCompleted.vue style

* delete obsolete components

* add missing spritesheets to storebook

* requested pr changes

* refactored fetchMember

* revert optional chaining

* fix merge conflicts

* fix rightSidebar hover colors - $scss var to css var

* overflow auto instead of scroll

* prevent wrapping of quest collections

* rollback to multi line quest items

* use min-width for the quest popover
This commit is contained in:
negue
2021-05-28 23:11:43 +02:00
committed by GitHub
parent 33e7a378f7
commit a8b58815b4
69 changed files with 3967 additions and 1327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
website/client/src/components/shops/quests/questDialogContent.vue
View File

@@ -4,9 +4,18 @@
class="quest-image"
:class="'quest_' + item.key"
></div>
<h4 class="title">
<h3 class="text-center">
{{ itemText }}
</h4>
</h3>
<div
v-if="group && leader"
class="leader-label"
>
<span v-once>
{{ $t('questOwner') }}:
</span>
<user-label :user="leader" />
</div>
<div
class="text"
v-html="itemNotes"
@@ -23,6 +32,11 @@
<style lang="scss" scoped>
@import '~@/assets/scss/colors.scss';
h3 {
color: $gray-10;
margin-bottom: 0.25rem;
}
.quest-image {
margin: 0 auto;
margin-bottom: 1em;
@@ -30,29 +44,67 @@
}
.text {
margin-bottom: 8px;
overflow-y: scroll;
margin-bottom: 1rem;
overflow-y: auto;
text-overflow: ellipsis;
}
.leader-label {
font-size: 14px;
font-weight: bold;
line-height: 1.71;
color: $gray-50;
text-align: center;
margin-bottom: 0.5rem;
::v-deep .user-label {
font-size: 14px;
}
}
.questInfo {
width: 70%;
width: 160px;
margin: 0 auto;
margin-bottom: 10px;
display: flex;
justify-content: center;
}
</style>
<script>
import QuestInfo from './questInfo.vue';
import UserLabel from '../../userLabel';
export default {
components: {
UserLabel,
QuestInfo,
},
data () {
return {
leader: null,
};
},
props: {
item: {
type: Object,
},
group: {
type: Object,
},
},
async created () {
if (this.group && this.group.quest && this.group.quest.active) {
try {
const fetchMemberResult = await this.$store.dispatch('members:fetchMember', {
memberId: this.group.quest.leader,
});
this.leader = fetchMemberResult;
} catch {
this.leader = null;
}
}
},
computed: {
itemText () {