Skip to content

Commit

Permalink
feat(chat): wip added typing status
Browse files Browse the repository at this point in the history
  • Loading branch information
josephmcg committed Sep 13, 2022
1 parent 93f2c2b commit 412329d
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 7 deletions.
7 changes: 5 additions & 2 deletions components/views/chat/UserList.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<template>
<div class="user-list hover-scroll">
<TypographyText>Members - {{ userDetails.length }}</TypographyText>
<TypographyText>
{{ $t('pages.chat.members', { count: userDetails.length }) }}
</TypographyText>
<div v-for="user in userDetails" :key="user.did" class="user">
<UiUserState :user="user" />
<UiUserState :user="user" :conversation-id="conversationId" />
<TypographyText class="ellipsis">
{{ user.name }}
</TypographyText>
Expand Down Expand Up @@ -49,6 +51,7 @@ export default Vue.extend({
overflow-y: auto;
background: @foreground-gradient;
box-shadow: @ui-shadow;
user-select: none;
.user {
display: flex;
Expand Down
1 change: 1 addition & 0 deletions locales/en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,7 @@ export default {
no_more: 'No more messages.',
},
add_reaction: 'Add reaction',
members: 'Members - {count}',
},
newMessage: {
new_message: 'New Message',
Expand Down
8 changes: 5 additions & 3 deletions pages/chat/Chat.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
:max-viewable-users="10"
:fullscreen-max-viewable-users="20"
/>
<div class="conversation-wrapper">
<Conversation />
<div class="outer-wrapper">
<div class="inner-wrapper">
<Conversation />
<Chatbar />
</div>
<UserList v-if="isGroup">asdasd</UserList>
</div>
<Chatbar />
</div>
11 changes: 9 additions & 2 deletions pages/chat/_id.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,17 @@ export default Vue.extend({
padding: 16px 0 16px 16px;
min-width: 0;
.conversation-wrapper {
.outer-wrapper {
display: flex;
overflow: hidden;
flex: 1;
flex-grow: 1;
gap: 8px;
.inner-wrapper {
display: flex;
flex-direction: column;
flex-grow: 1;
}
}
}
</style>

0 comments on commit 412329d

Please sign in to comment.