diff --git a/website/client/components/chat/chatCard.vue b/website/client/components/chat/chatCard.vue
index ca1152c646..7e14eeba47 100644
--- a/website/client/components/chat/chatCard.vue
+++ b/website/client/components/chat/chatCard.vue
@@ -11,7 +11,7 @@ div
v-if="msg.user"
)
| {{msg.user}}
- .svg-icon(v-html="tierIcon", v-if='showShowTierStyle')
+ .svg-icon(v-html="tierIcon")
p.time
span.mr-1(v-if="msg.username") @{{ msg.username }}
span.mr-1(v-if="msg.username") •
@@ -101,6 +101,8 @@ div
font-size: 14px;
color: #4e4a57;
text-align: left !important;
+ min-height: 0rem;
+ margin-bottom: -0.5rem;
}
}
@@ -227,12 +229,6 @@ export default {
}
return likeCount;
},
- showShowTierStyle () {
- const message = this.msg;
- const isContributor = Boolean(message.contributor && message.contributor.level);
- const isNPC = Boolean(message.backer && message.backer.npc);
- return isContributor || isNPC;
- },
tierIcon () {
const message = this.msg;
const isNPC = Boolean(message.backer && message.backer.npc);
diff --git a/website/client/components/memberDetails.vue b/website/client/components/memberDetails.vue
index 7ddf3de069..253c033c33 100644
--- a/website/client/components/memberDetails.vue
+++ b/website/client/components/memberDetails.vue
@@ -19,7 +19,10 @@
| {{member.profile.name}}
.is-buffed(v-if="isBuffed", v-b-tooltip.hover.bottom="$t('buffed')")
.svg-icon(v-html="icons.buff")
- span.small-text.character-level {{ characterLevel }}
+ .small-text.character-level
+ span.mr-1(v-if="member.auth && member.auth.local && member.auth.local.username") @{{ member.auth.local.username }}
+ span.mr-1(v-if="member.auth && member.auth.local && member.auth.local.username") •
+ span {{ characterLevel }}
.progress-container(v-b-tooltip.hover.bottom="$t('health')")
.svg-icon(v-html="icons.health")
.progress
diff --git a/website/client/components/userMenu/inbox.vue b/website/client/components/userMenu/inbox.vue
index d342ee14ee..b877d8ed2c 100644
--- a/website/client/components/userMenu/inbox.vue
+++ b/website/client/components/userMenu/inbox.vue
@@ -30,8 +30,11 @@
.conversation(v-for='conversation in filtersConversations', @click='selectConversation(conversation.key)',
:class="{active: selectedConversation.key === conversation.key}")
div
- span(:class="userLevelStyle(conversation)") {{conversation.name}}
- span.timeago {{conversation.date | timeAgo}}
+ h3(:class="userLevelStyle(conversation)") {{ conversation.name }}
+ .svg-icon(v-html="tierIcon(conversation)")
+ .time
+ span.mr-1 @{{ conversation.username }} •
+ span {{ conversation.date | timeAgo }}
div {{conversation.lastMessageText ? conversation.lastMessageText.substring(0, 30) : ''}}
.col-8.messages.d-flex.flex-column.justify-content-between
.empty-messages.text-center(v-if='!selectedConversation.key')
@@ -41,7 +44,7 @@
.empty-messages.text-center(v-if='selectedConversation.key && selectedConversationMessages.length === 0')
p {{ $t('beginningOfConversation', {userName: selectedConversation.name})}}
chat-messages.message-scroll(
- v-if="selectedConversation.messages && selectedConversationMessages.length > 0",
+ v-if="selectedConversation.messages && selectedConversationMessages.length > 0",
:chat='selectedConversationMessages',
:inbox='true',
@message-removed='messageRemoved',
@@ -63,6 +66,7 @@
diff --git a/website/client/components/userMenu/profile.vue b/website/client/components/userMenu/profile.vue
index f3d1e65ea6..2237d1af9b 100644
--- a/website/client/components/userMenu/profile.vue
+++ b/website/client/components/userMenu/profile.vue
@@ -40,11 +40,12 @@ div
#userProfile.standard-page(v-show='selectedPage === "profile"', v-if='user.profile')
.row
.col-12.col-md-8
- .header
+ .header.mb-3
h1 {{user.profile.name}}
- h4
- strong {{ $t('userId') }}:
- | {{user._id}}
+ div
+ strong(v-if='user.auth && user.auth.local && user.auth.local.username') @{{ user.auth.local.username }}
+ div
+ strong(v-if='this.userLoggedIn.contributor.admin') {{ user._id }}
.col-12.col-md-4
button.btn.btn-secondary(v-if='user._id === userLoggedIn._id', @click='editing = !editing') {{ $t('edit') }}
.row(v-if='!editing')
@@ -146,7 +147,7 @@ div
#profile {
.member-details {
.character-name, small, .small-text {
- color: #878190
+ color: #878190;
}
}
@@ -193,7 +194,7 @@ div
.gift-icon {
width: 14px;
margin: auto;
- color: #686274;
+ color: $gray-100;
}
.gift-icon {
@@ -201,13 +202,13 @@ div
}
.remove-icon {
- width:16px;
- color: #686274;
+ width: 16px;
+ color: $gray-100;
}
.positive-icon {
width: 14px;
- color: #686274;
+ color: $gray-100;
}
.photo img {
@@ -216,11 +217,12 @@ div
.header {
h1 {
- color: #4f2a93;
+ color: $purple-200;
+ margin-bottom: 0rem;
}
h4 {
- color: #686274;
+ color: $gray-100;
}
}
diff --git a/website/server/models/user/index.js b/website/server/models/user/index.js
index 5521f21290..4866a1eef3 100644
--- a/website/server/models/user/index.js
+++ b/website/server/models/user/index.js
@@ -8,7 +8,7 @@ require('./methods');
// A list of publicly accessible fields (not everything from preferences because there are also a lot of settings tha should remain private)
export let publicFields = `preferences.size preferences.hair preferences.skin preferences.shirt
preferences.chair preferences.costume preferences.sleep preferences.background preferences.tasks preferences.disableClasses profile stats
- achievements party backer contributor auth.timestamps items inbox.optOut loginIncentives flags.classSelected`;
+ achievements party backer contributor auth.timestamps items inbox.optOut loginIncentives flags.classSelected auth.local.username`;
// The minimum amount of data needed when populating multiple users
export let nameFields = 'profile.name';