mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 06:37:23 +01:00
Sept 21 fixes (#9061)
* Fixed analytics when party is not defined: * Waited to set Stripe * Added popovers to danger zone * Added date format to next cron * Redirect user back to home for static * Removed old settings * Fixed show bailey * Fixed close button on inbox * Fixed sending blank message * Changed input to text area in inbox * Fixed deleting messages in inbox * Allowed user to delete other user message in inbox * Fixed joined date * Fixed count styling * Fixed display of pet and mount * Removed white box when using base_0 items * Fixed your profile to show when clicking from menu * Prevented user from pinning already purchased backgroud * Added user last log in * Added date refresh for yesterdailies modal * Updatd eyewear * Fixed start a quest button * Fixed styles on home page footer * Added checklist sorting * Added support for if card type is missing computed field * Fixed linting
This commit is contained in:
@@ -11,6 +11,8 @@
|
||||
// @TODO: Implement this after we fix username bug
|
||||
// .col-2.offset-1
|
||||
// button.btn.btn-secondary(@click='toggleClick()') +
|
||||
.col-4.offset-4
|
||||
.svg-icon.close(v-html="icons.svgClose", @click='close()')
|
||||
// .col-8.to-form(v-if='displayCreate')
|
||||
// strong To:
|
||||
// b-form-input
|
||||
@@ -39,7 +41,7 @@
|
||||
// @TODO: Implement new message header here when we fix the above
|
||||
|
||||
.new-message-row(v-if='selectedConversation')
|
||||
input(v-model='newMessage')
|
||||
textarea(v-model='newMessage')
|
||||
button.btn.btn-secondary(@click='sendPrivateMessage()') Send
|
||||
</template>
|
||||
|
||||
@@ -51,6 +53,11 @@
|
||||
margin-top: 1em;
|
||||
}
|
||||
|
||||
.close {
|
||||
margin-top: .5em;
|
||||
width: 15px;
|
||||
}
|
||||
|
||||
h2 {
|
||||
margin-top: .5em;
|
||||
}
|
||||
@@ -107,12 +114,16 @@
|
||||
width: 100%;
|
||||
padding: 1em;
|
||||
|
||||
input {
|
||||
textarea {
|
||||
height: 80%;
|
||||
display: inline-block;
|
||||
vertical-align: bottom;
|
||||
width: 80%;
|
||||
}
|
||||
|
||||
button {
|
||||
vertical-align: bottom;
|
||||
display: inline-block;
|
||||
box-shadow: none;
|
||||
margin-left: 1em;
|
||||
}
|
||||
@@ -155,6 +166,7 @@ import bFormInput from 'bootstrap-vue/lib/components/form-input';
|
||||
|
||||
import messageIcon from 'assets/svg/message.svg';
|
||||
import chatMessage from '../chat/chatMessages';
|
||||
import svgClose from 'assets/svg/close.svg';
|
||||
|
||||
export default {
|
||||
mixins: [styleHelper],
|
||||
@@ -167,6 +179,7 @@ export default {
|
||||
return {
|
||||
icons: Object.freeze({
|
||||
messageIcon,
|
||||
svgClose,
|
||||
}),
|
||||
displayCreate: true,
|
||||
selectedConversation: '',
|
||||
@@ -201,6 +214,7 @@ export default {
|
||||
timestamp: message.timestamp,
|
||||
user: message.user,
|
||||
uuid: message.uuid,
|
||||
id: message.id,
|
||||
};
|
||||
|
||||
if (message.sent) {
|
||||
@@ -256,6 +270,8 @@ export default {
|
||||
});
|
||||
},
|
||||
sendPrivateMessage () {
|
||||
if (!this.newMessage) return;
|
||||
|
||||
let convoFound = this.conversations.find((conversation) => {
|
||||
return conversation.key === this.selectedConversation;
|
||||
});
|
||||
@@ -284,6 +300,9 @@ export default {
|
||||
chatscroll.scrollTop = chatscroll.scrollHeight;
|
||||
});
|
||||
},
|
||||
close () {
|
||||
this.$root.$emit('hide::modal', 'inbox-modal');
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user