Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SA 57 : Simply copy over the messages and media components to servers. #49

Merged
merged 5 commits into from
Jul 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion layouts/server/Server.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
id="statusbar"
:server="{ name: 'Test Server', address: '0x0', desc: 'Just a test server' }"
:user="$mock.users[0]"/>
<Nuxt id="server" ref="server" />
<TailoredCoreMedia />
<Nuxt id="server" ref="server" class="hidden-scroll"/>
<TailoredCoreChatbar />
</div>
</div>
Expand Down
103 changes: 103 additions & 0 deletions layouts/server/Server.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
@sidebar-size: 250px;
@servers-size: 60px;

#app-wrap {
#app.mobile-app {
height: calc(100vh - @mobile-nav-size);
transition: height @animation-speed;
}
#mobile-nav {
transition: bottom @animation-speed;
}

&.is-collapsed {
#app.mobile-app {
height: 100vh;
}
#mobile-nav {
bottom: -@mobile-nav-size;
}
}
}

#app {
display: flex;
background-color: @darker;
user-select: none;
height: 100vh;
.dynamic-content {
background-color: @darker;
user-select: text;
display: flex;
flex-direction: column;
position: relative;

.file-preview {
transition: @transition-all;
}

#statusbar {
max-height: @statusbar-height;
}

#server {
width: 100%;
flex: 1;
transition: flex 0.3s;
overflow-x: hidden;
}

#chatbar {
height: @chatbar-size;
width: 100%;
min-width: 0;
justify-content: flex-end;
transition: height 0.3s;
}

#mediastream {
transition: flex 0.3s;
}
&.fullscreen-media {
#server {
height: 0;
flex: 0;
}
#chatbar {
height: 0;
margin-top: 0;
}
#mediastream {
flex: 1;
}
}
}

#sidebar,
#servers-vertical-list,
.dynamic-content,
#sidebar .toggle-sidebar,
#statusbar {
transition: @transition-all;
}

&.is-collapsed {
.file-preview {
width: calc(100% - 2rem) !important;
}
#sidebar,
#servers-vertical-list {
transform: translateX(calc(-@sidebar-size + -@servers-size));
}
.dynamic-content {
margin-left: calc(-@sidebar-size + -@servers-size);
}
#sidebar .toggle-sidebar {
right: -2rem;
z-index: @base-z-index;
}
#statusbar {
padding-left: 3rem;
}
}
}
3 changes: 3 additions & 0 deletions pages/server/chat/Chat.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div id="server-direct">
<TailoredMessagingConversation :messages="$mock.messages" :loading="loading" />
</div>
11 changes: 11 additions & 0 deletions pages/server/chat/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,16 @@ import Vue from 'vue'
export default Vue.extend({
name: 'ServerChat',
layout: 'server',
data() {
return {
loading: true,
}
},
mounted() {
setTimeout(() => {
this.$data.loading = false
}, 3000)
this.$store.dispatch('fetchFriends')
},
})
</script>