dan/Nertivia-Client
1
0
Fork 0
mirror of https://github.com/danbulant/Nertivia-Client synced 2026-05-19 04:08:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed some bugs with members list

Browse source
This commit is contained in:
supertiger1234 2020-03-04 14:34:58 +00:00
parent fc19d47e42
commit 3d53a78d79
2 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/components/app/MessagePanel.vue
View file

@ -15,27 +15,30 @@
selectedChannelID ? channelName : `Welcome back, ${user.username}!`
"
/>
<div class="loading" v-if="selectedChannelID && !selectedChannelMessages">
<spinner />
</div>
<message-logs
v-else-if="selectedChannelID && selectedChannelMessages"
:key="selectedChannelID"
/>
<div class="no-channel-selected" v-if="!selectedChannelID">
<div class="material-icons">
{{ type === 0 ? "forum" : type === 1 ? "dns" : "question" }}
<transition name="fade" mode="out-in">
<div class="loading" v-if="selectedChannelID && !selectedChannelMessages">
<spinner />
</div>
<div class="message">
{{
type === 0
? "Select a person to message!"
: type === 1
? "Select a server!"
: "wot"
}}
<message-logs
v-else-if="selectedChannelID && selectedChannelMessages"
:key="selectedChannelID"
/>
<div class="no-channel-selected" v-if="!selectedChannelID">
<div class="material-icons">
{{ type === 0 ? "forum" : type === 1 ? "dns" : "question" }}
</div>
<div class="message">
{{
type === 0
? "Select a person to message!"
: type === 1
? "Select a server!"
: "wot"
}}
</div>
</div>
</div>
</transition>
<div class="chat-input-area" v-if="selectedChannelID">
<div class="typing-outer">
<typing-status
@ -1143,6 +1146,13 @@ export default {
}
}
.fade-enter-active,
.fade-leave-active {
transition: opacity 0.1s;
}
.fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
opacity: 0;
}
.emojis-button {
font-size: 20px;
color: #a5bec4;

26
src/components/app/Tabs/ServerAndDMTab.vue
View file

@ -9,7 +9,6 @@
v-show="($mq === 'mobile' && showLeftPanel) || $mq !== 'mobile'"
v-click-outside="hideLeftPanel"
>
<div class="inner">
<navigation />
<div class="wrapper">
@ -25,17 +24,20 @@
</transition>
<message-panel :type="currentTab === 1 ? 0 : currentTab === 2 ? 1 : null" />
<transition :name="$mq !== 'desktop' ? 'slide-right' : 'none'">
<members-list
v-if="
selectedServerID &&
currentTab === 2 &&
((($mq === 'members_panel' || $mq === 'mobile') &&
showMembersPanel) ||
$mq === 'desktop')
"
v-click-outside="hideMembersPanel"
class="members-panel"
/>
<transition name="fade" mode="out-in">
<members-list
v-if="
selectedServerID &&
currentTab === 2 &&
((($mq === 'members_panel' || $mq === 'mobile') &&
showMembersPanel) ||
$mq === 'desktop')
"
:key="selectedServerID"
v-click-outside="hideMembersPanel"
class="members-panel"
/>
</transition>
</transition>
</div>
</template>