mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 22:57:21 +01:00
commit3aba0abeddAuthor: SabreCat <sabe@habitica.com> Date: Mon Oct 2 20:51:20 2023 -0500 fix(router): use state to pass modal launch info commit541eadd319Merge:c0bb56c8c289fff49d02Author: SabreCat <sabe@habitica.com> Date: Mon Oct 2 20:12:40 2023 -0500 Merge branch 'release' into report-profile-modal commitc0bb56c8c2Author: SabreCat <sabe@habitica.com> Date: Wed Sep 27 16:15:28 2023 -0500 test(profiles): add integrations commit9b644e9ad8Author: SabreCat <sabe@habitica.com> Date: Tue Sep 26 17:17:22 2023 -0500 fix(profile): adjust margin commitbfefe5dfa9Author: SabreCat <sabe@habitica.com> Date: Tue Sep 26 17:12:24 2023 -0500 fix(profiles): moar layout fixes commit8f211ee3e2Author: SabreCat <sabe@habitica.com> Date: Mon Sep 25 17:32:04 2023 -0500 fix(profile): fix admin actions Correct "user is banned" banner Fix bouncing modal Add "Days" smart plural Fix leaky CSS on Market page Refactor some redundant functions commitb1d23ec88bMerge:ee9709a9e1a63cc84779Author: SabreCat <sabe@habitica.com> Date: Mon Sep 25 15:37:54 2023 -0500 Merge branch 'release' into report-profile-modal commitee9709a9e1Author: CuriousMagpie <eilatan@gmail.com> Date: Mon Sep 18 16:30:30 2023 -0400 WIP(profile): add banned banner, toggle switches now toggle, add "days" to Next Login Reward commitf80928a895Author: CuriousMagpie <eilatan@gmail.com> Date: Mon Sep 18 13:43:34 2023 -0400 update(node): update node modules commit1d552f7e80Author: SabreCat <sabe@habitica.com> Date: Fri Sep 15 16:52:22 2023 -0500 fix(import): remove empty import commitf55d74a95dAuthor: SabreCat <sabe@habitica.com> Date: Fri Sep 15 16:39:50 2023 -0500 refactor(profiles): remove email feature also still more visual cleanup of profile modal commit311c743284Author: SabreCat <sabe@habitica.com> Date: Fri Sep 15 15:44:56 2023 -0500 refactor(profile): remove page view commitf8632bf50dMerge:ec85159c659e25360102Author: SabreCat <sabe@habitica.com> Date: Fri Sep 15 15:23:21 2023 -0500 Merge branch 'release' into report-profile-modal commitec85159c65Author: SabreCat <sabe@habitica.com> Date: Mon Sep 11 22:53:14 2023 -0500 feat(profiles): load modal instead of page? commit9986082914Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Sep 8 14:49:57 2023 -0400 WIP(profile): fixed a comment, woohoo commit6262a9ba0cMerge:ae2b614df2ea2b007b1aAuthor: CuriousMagpie <eilatan@gmail.com> Date: Fri Sep 8 13:40:23 2023 -0400 Merge remote-tracking branch 'origin/report-profile-modal' into report-profile-modal commitea2b007b1aAuthor: SabreCat <sabe@habitica.com> Date: Thu Sep 7 16:54:19 2023 -0500 fix(profile): focus behavior commitae2b614df2Author: CuriousMagpie <eilatan@gmail.com> Date: Thu Sep 7 17:47:08 2023 -0400 WIP(profile): styling updates commit2e0723f1b9Author: SabreCat <sabe@habitica.com> Date: Thu Sep 7 15:37:59 2023 -0500 feat(moderation): unflag profile Also a few stylistic tweaks commitedcf8113deAuthor: SabreCat <sabe@habitica.com> Date: Wed Sep 6 16:39:02 2023 -0500 WIP(profile): dropdown draft commit0691483d63Author: CuriousMagpie <eilatan@gmail.com> Date: Wed Sep 6 16:33:30 2023 -0400 WIP(profile): Styling and string updates commit7e9d57d10aAuthor: SabreCat <sabe@habitica.com> Date: Wed Sep 6 11:40:31 2023 -0500 feat(profile): functional dropdown buttons commita2989b2833Merge:af6575e40ce072d7c09cAuthor: SabreCat <sabe@habitica.com> Date: Wed Sep 6 10:04:57 2023 -0500 Merge branch 'release' into report-profile-modal commitaf6575e40cAuthor: CuriousMagpie <eilatan@gmail.com> Date: Wed Sep 6 11:01:05 2023 -0400 WIP(profile): comment cleanup commit7b1de37202Author: CuriousMagpie <eilatan@gmail.com> Date: Tue Sep 5 17:22:14 2023 -0400 WIP(profile): remove shadowban tooltip commitd1177c32b9Merge:321a01b08131f821021bAuthor: CuriousMagpie <eilatan@gmail.com> Date: Tue Sep 5 17:02:40 2023 -0400 Merge branch 'sabrecat/report-profile' into report-profile-modal commit321a01b081Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Sep 1 16:14:36 2023 -0400 WIP(profile): close button finally workinating commite143d36d28Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Sep 1 15:52:38 2023 -0400 WIP(profile): close icon moved to profile.vue commit31f821021bMerge:a8f5e25d388957c5c009Author: SabreCat <sabe@habitica.com> Date: Fri Sep 1 14:52:31 2023 -0500 Merge branch 'report-profile-modal' into sabrecat/report-profile commit8957c5c009Merge:d340f06a220aec3866a4Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Sep 1 15:38:12 2023 -0400 Merge remote-tracking branch 'origin/report-profile-modal' into report-profile-modal commitd340f06a22Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Sep 1 15:37:57 2023 -0400 WIP(profile): fixed user not found error commit0aec3866a4Merge:b01f323b14ac7c8e0eb6Author: Natalie <78037386+CuriousMagpie@users.noreply.github.com> Date: Fri Sep 1 15:28:58 2023 -0400 Merge branch 'HabitRPG:develop' into report-profile-modal commita8f5e25d38Author: SabreCat <sabe@habitica.com> Date: Thu Aug 31 17:02:07 2023 -0500 feat(community): basic "report profile" commitb01f323b14Author: CuriousMagpie <eilatan@gmail.com> Date: Thu Aug 31 17:42:12 2023 -0400 WIP(profile): removed refactoring crud, located where close icon should be (profileModal.vue) commitce7d51a20cMerge:010f2299f0ac7c8e0eb6Author: SabreCat <sabe@habitica.com> Date: Thu Aug 31 14:20:37 2023 -0500 Merge branch 'release' into sabrecat/report-profile commit18b41acd94Author: CuriousMagpie <eilatan@gmail.com> Date: Thu Aug 31 12:23:41 2023 -0400 WIP(profile): moar buttonz commit9387b3a6bcAuthor: CuriousMagpie <eilatan@gmail.com> Date: Wed Aug 30 17:21:36 2023 -0400 WIP(profile): buttons commitb3ea48c4f5Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Aug 25 15:52:41 2023 -0400 WIP(profile): work on achievement component commita1ceb2ea75Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Aug 25 14:39:12 2023 -0400 WIP(profile): create achievements component commit4a24d9b80bMerge:8fe263a3771e05297e96Author: CuriousMagpie <eilatan@gmail.com> Date: Wed Aug 23 13:14:39 2023 -0400 Merge branch 'develop' into report-profile-modal commit1e05297e96Author: CuriousMagpie <eilatan@gmail.com> Date: Wed Aug 23 13:12:52 2023 -0400 package updates commit8fe263a377Author: CuriousMagpie <eilatan@gmail.com> Date: Wed Aug 23 12:12:36 2023 -0400 update(dependencies): ran npm install to update dependencies commit190fe048a1Merge:3ea48ab5cbfa83d1a9cfAuthor: CuriousMagpie <eilatan@gmail.com> Date: Wed Aug 23 11:52:08 2023 -0400 Merge branch 'develop' into report-profile-modal commit3ea48ab5cbAuthor: CuriousMagpie <eilatan@gmail.com> Date: Fri Aug 11 17:12:31 2023 -0400 WIP(user profile): dropdown menu and toggles and colors oh my commitc301a2b460Merge:1da6af11b5647b27c55fAuthor: CuriousMagpie <eilatan@gmail.com> Date: Fri Aug 11 12:40:07 2023 -0400 Merge branch 'develop' into report-profile-modal commit1da6af11b5Author: CuriousMagpie <eilatan@gmail.com> Date: Thu Aug 10 16:50:07 2023 -0400 WIP(user profile): moved some CSS classes out of unscoped and into the scoped section, started on toggle buttons commitdd55cbc928Author: CuriousMagpie <eilatan@gmail.com> Date: Wed Aug 9 15:38:46 2023 -0400 WIP(user profile): workin on the hamburger (kebab?) menu commit3834093207Author: CuriousMagpie <eilatan@gmail.com> Date: Tue Aug 8 14:14:40 2023 -0400 WIP(user profiles): working on the drop down menu commitf2be588195Author: CuriousMagpie <eilatan@gmail.com> Date: Mon Aug 7 16:10:30 2023 -0400 WIP(user profile): options menu commit010f2299f0Author: SabreCat <sabe@habitica.com> Date: Mon Aug 7 11:49:04 2023 -0500 fix(lint): eof and const commit4551dbf4b3Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Aug 4 15:34:05 2023 -0400 WIP(user profile): styling the top portion of the modal commit19a9fe3644Author: CuriousMagpie <eilatan@gmail.com> Date: Thu Aug 3 15:06:51 2023 -0400 WIP(user profile): adding buttons commitdfdb305b1cAuthor: CuriousMagpie <eilatan@gmail.com> Date: Wed Aug 2 14:41:20 2023 -0400 WIP(user profile): layout commitded4eee693Author: CuriousMagpie <eilatan@gmail.com> Date: Wed Aug 2 12:04:02 2023 -0400 WIP(user profile): start flex grid & tidy up CSS commitaaca48be32Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Jul 28 16:44:06 2023 -0400 WIP(user profile): mostly css updates commite531985b87Author: CuriousMagpie <eilatan@gmail.com> Date: Thu Jul 27 16:49:44 2023 -0400 WIP(user profile): one infinitesimal change that's hardly worth the electricity it's made from commiteb4021fcc7Author: CuriousMagpie <eilatan@gmail.com> Date: Wed Jul 26 16:33:05 2023 -0400 feat(content): upgrade profile page commit1b25394f3eMerge:c50cee0d888558dcc3a8Author: CuriousMagpie <eilatan@gmail.com> Date: Wed Jul 26 11:50:12 2023 -0400 Merge branch 'develop' into report-profile-modal commitc50cee0d88Author: SabreCat <sabe@habitica.com> Date: Wed Jul 12 16:32:25 2023 -0500 fix(flagging): debug params issue Also add and document the "source" body param commit55848c58beAuthor: SabreCat <sabe@habitica.com> Date: Mon Jul 10 16:24:20 2023 -0500 WIP(members): basic report a user API commitdda6180792Author: SabreCat <sabe@habitica.com> Date: Thu Jul 6 10:05:07 2023 -0500 fix(lint): remove console.info
288 lines
7.5 KiB
Vue
288 lines
7.5 KiB
Vue
<template>
|
|
<div>
|
|
<invite-modal
|
|
:group="inviteModalGroup"
|
|
:group-type="inviteModalGroupType"
|
|
/>
|
|
<create-party-modal />
|
|
<div
|
|
id="app-header"
|
|
class="row"
|
|
:class="{'hide-header': hideHeader}"
|
|
>
|
|
<members-modal :hide-badge="true" />
|
|
<member-details
|
|
:member="user"
|
|
:class-badge-position="'next-to-name'"
|
|
:is-header="true"
|
|
:disable-name-styling="true"
|
|
class="mr-3"
|
|
/>
|
|
<div
|
|
v-if="hasParty"
|
|
class="view-party d-none d-md-flex align-items-center"
|
|
>
|
|
<button
|
|
class="btn btn-primary"
|
|
@click="showPartyMembers()"
|
|
>
|
|
{{ $t('viewParty') }}
|
|
</button>
|
|
</div>
|
|
<div
|
|
v-if="hasParty"
|
|
ref="partyMembersDiv"
|
|
v-resize="1500"
|
|
class="party-members d-none d-md-flex "
|
|
@resized="setPartyMembersWidth($event)"
|
|
>
|
|
<!-- eslint-disable vue/no-use-v-if-with-v-for -->
|
|
<member-details
|
|
v-for="(member, $index) in sortedPartyMembers"
|
|
v-if="member._id !== user._id && $index < membersToShow"
|
|
:key="member._id"
|
|
:member="member"
|
|
condensed="condensed"
|
|
:expanded="member._id === expandedMember"
|
|
:is-header="true"
|
|
:class-badge-position="'hidden'"
|
|
@onHover="expandMember(member._id)"
|
|
/>
|
|
<!-- eslint-enable vue/no-use-v-if-with-v-for -->
|
|
</div>
|
|
<div
|
|
v-else
|
|
class="no-party d-none d-md-flex justify-content-center text-center mr-4"
|
|
>
|
|
<div class="align-self-center">
|
|
<h3>{{ user.party._id ? $t('questWithOthers') : $t('battleWithFriends') }}</h3>
|
|
<span
|
|
class="small-text"
|
|
v-html="user.party._id ? $t('inviteFriendsParty') : $t('startPartyDetail')"
|
|
></span>
|
|
<br>
|
|
<button
|
|
class="btn btn-primary"
|
|
@click="createOrInviteParty()"
|
|
>
|
|
{{ user.party._id ? $t('findPartyMembers') : $t('getStarted') }}
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<style lang="scss" scoped>
|
|
@import '~@/assets/scss/colors.scss';
|
|
|
|
#app-header {
|
|
padding-left: 24px;
|
|
padding-top: 9px;
|
|
padding-bottom: 8px;
|
|
background: $purple-50;
|
|
color: $header-color;
|
|
flex-wrap: nowrap;
|
|
position: relative;
|
|
}
|
|
|
|
.hide-header {
|
|
display: none;
|
|
}
|
|
|
|
.no-party, .party-members {
|
|
flex-grow: 1;
|
|
}
|
|
|
|
.view-party {
|
|
position: absolute;
|
|
z-index: 10;
|
|
right: 0;
|
|
padding-right: 40px;
|
|
padding-left: 10px;
|
|
height: calc(100% - 9px);
|
|
background-image: linear-gradient(to right, rgba($purple-50, 0), $purple-50);
|
|
}
|
|
|
|
.no-party {
|
|
.small-text {
|
|
color: $header-color;
|
|
flex-wrap: nowrap;
|
|
}
|
|
|
|
h3 {
|
|
color: $white;
|
|
margin-bottom: 4px;
|
|
}
|
|
|
|
.btn {
|
|
margin-top: 16px;
|
|
}
|
|
}
|
|
</style>
|
|
|
|
<script>
|
|
import orderBy from 'lodash/orderBy';
|
|
import * as Analytics from '@/libs/analytics';
|
|
import { mapGetters, mapActions } from '@/libs/store';
|
|
import MemberDetails from '../memberDetails';
|
|
import createPartyModal from '../groups/createPartyModal';
|
|
import inviteModal from '../groups/inviteModal';
|
|
import membersModal from '../groups/membersModal';
|
|
import ResizeDirective from '@/directives/resize.directive';
|
|
|
|
export default {
|
|
directives: {
|
|
resize: ResizeDirective,
|
|
},
|
|
components: {
|
|
MemberDetails,
|
|
createPartyModal,
|
|
inviteModal,
|
|
membersModal,
|
|
},
|
|
data () {
|
|
return {
|
|
expandedMember: null,
|
|
currentWidth: 0,
|
|
inviteModalGroup: undefined,
|
|
inviteModalGroupType: undefined,
|
|
group: {},
|
|
members: [],
|
|
membersLoaded: false,
|
|
};
|
|
},
|
|
computed: {
|
|
...mapGetters({
|
|
user: 'user:data',
|
|
partyMembers: 'party:members',
|
|
}),
|
|
showHeader () {
|
|
if (this.$store.state.hideHeader) return false;
|
|
return true;
|
|
},
|
|
hasParty () {
|
|
return this.user.party && this.user.party._id
|
|
&& this.partyMembers && this.partyMembers.length > 1;
|
|
},
|
|
membersToShow () {
|
|
return Math.floor(this.currentWidth / 140) + 1;
|
|
},
|
|
sortedPartyMembers () {
|
|
let sortedMembers = this.partyMembers.slice(); // shallow clone to avoid infinite loop
|
|
const { order, orderAscending } = this.user.party;
|
|
|
|
if (order === 'profile.name') {
|
|
// If members are to be sorted by name, use localeCompare for case-
|
|
// insensitive sort
|
|
sortedMembers.sort(
|
|
(a, b) => {
|
|
if (orderAscending === 'desc') {
|
|
return b.profile.name.localeCompare(a.profile.name);
|
|
}
|
|
|
|
return a.profile.name.localeCompare(b.profile.name);
|
|
},
|
|
);
|
|
} else {
|
|
sortedMembers = orderBy(
|
|
sortedMembers,
|
|
[order],
|
|
[orderAscending],
|
|
);
|
|
}
|
|
|
|
return sortedMembers;
|
|
},
|
|
hideHeader () {
|
|
return ['groupPlan', 'privateMessages'].includes(this.$route.name);
|
|
},
|
|
},
|
|
watch: {
|
|
hideHeader () {
|
|
this.$nextTick(() => {
|
|
if (this.$refs.partyMembersDiv) {
|
|
this.setPartyMembersWidth({ width: this.$refs.partyMembersDiv.clientWidth });
|
|
}
|
|
});
|
|
},
|
|
},
|
|
created () {
|
|
if (this.user.party && this.user.party._id) {
|
|
this.$store.state.memberModalOptions.groupId = this.user.party._id;
|
|
this.getPartyMembers();
|
|
}
|
|
},
|
|
mounted () {
|
|
this.$root.$on('inviteModal::inviteToGroup', group => {
|
|
this.inviteModalGroup = group;
|
|
this.inviteModalGroupType = group.type === 'guild' ? 'Guild' : 'Party';
|
|
this.$root.$emit('bv::show::modal', 'invite-modal');
|
|
});
|
|
},
|
|
beforeDestroy () {
|
|
this.$root.$off('inviteModal::inviteToGroup');
|
|
},
|
|
methods: {
|
|
...mapActions({
|
|
getPartyMembers: 'party:getMembers',
|
|
}),
|
|
expandMember (memberId) {
|
|
if (this.expandedMember === memberId) {
|
|
this.expandedMember = null;
|
|
} else {
|
|
this.expandedMember = memberId;
|
|
}
|
|
},
|
|
async createOrInviteParty () {
|
|
if (this.user.party._id) {
|
|
await Analytics.track({
|
|
eventName: 'Header Party CTA',
|
|
eventAction: 'Header Party CTA',
|
|
eventCategory: 'behavior',
|
|
hitType: 'event',
|
|
state: 'Find Party Members',
|
|
});
|
|
this.$router.push('/looking-for-party');
|
|
} else {
|
|
await Analytics.track({
|
|
eventName: 'Header Party CTA',
|
|
eventAction: 'Header Party CTA',
|
|
eventCategory: 'behavior',
|
|
hitType: 'event',
|
|
state: 'Get Started',
|
|
});
|
|
this.$root.$emit('bv::show::modal', 'create-party-modal');
|
|
}
|
|
},
|
|
loadMembers (payload = null) {
|
|
// Remove unnecessary data
|
|
if (payload && payload.challengeId) {
|
|
delete payload.challengeId;
|
|
}
|
|
|
|
return this.$store.dispatch('members:getGroupMembers', payload);
|
|
},
|
|
async showPartyMembers () {
|
|
this.group = await this.$store.dispatch('party:getParty');
|
|
this.group = this.$store.state.party.data;
|
|
this.membersLoaded = true;
|
|
this.members = this.partyMembers;
|
|
this.$store.state.memberModalOptions.loading = false;
|
|
this.$root.$emit('habitica:show-member-modal', {
|
|
groupId: this.group._id,
|
|
group: this.group,
|
|
memberCount: this.group.memberCount,
|
|
viewingMembers: this.members,
|
|
fetchMoreMembers: this.loadMembers,
|
|
});
|
|
},
|
|
setPartyMembersWidth ($event) {
|
|
if (this.currentWidth !== $event.width) {
|
|
this.currentWidth = $event.width;
|
|
}
|
|
},
|
|
},
|
|
};
|
|
</script>
|