Skip to content

Add ability to set guest name in lobby #3133

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.

Sign up for GitHub

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

Merged
nickvergessen merged 3 commits into from
Mar 24, 2020
Merged

Add ability to set guest name in lobby #3133

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9a9b7d
Generalise guest rename logic into SetGuestUsername component for reuse
marcoambrosini Mar 23, 2020
f6b2b1b
Add guest username setting to lobby
marcoambrosini Mar 23, 2020
b3a9650
Show renaming form only if current user is guest
marcoambrosini Mar 24, 2020
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
Prev Previous commit
Next Next commit
Add guest username setting to lobby 
Signed-off-by: Marco Ambrosini <[email protected]>
  • Loading branch information
@marcoambrosini
marcoambrosini committed Mar 23, 2020
commit f6b2b1b54eef28319cfbab5f4c443aaf1768532c
25 changes: 21 additions & 4 deletions src/components/LobbyScreen.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,28 @@
-->

<template>
<div class="lobby emptycontent">
<div class="icon icon-lobby" />
<h2>{{ currentConversationName }}</h2>
<p>{{ message }}</p>
<div class="lobby">
<div class="lobby emptycontent">
<div class="icon icon-lobby" />
<h2>{{ currentConversationName }}</h2>
<p>{{ message }}</p>
</div>
<SetGuestUsername />
</div>
</template>

<script>
import moment from '@nextcloud/moment'
import SetGuestUsername from './SetGuestUsername'

export default {

name: 'LobbyScreen',

components: {
SetGuestUsername,
},

computed: {

token() {
Expand Down Expand Up @@ -64,3 +72,12 @@ export default {

}
</script>

<style lang="scss" scoped>

.lobby {
display: flex;
flex-direction: column;
}

</style>
3 changes: 2 additions & 1 deletion src/components/SetGuestUsername.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ export default {
/** Username form for guest users */
.username-form {
padding: 0 12px;
margin:auto;
& .icon-rename {
margin-left: 8px;
padding-left: 36px;
Expand All @@ -125,7 +126,7 @@ export default {
}
&__input {
padding-right: var(--clickable-area);
width: 300px;
width: 230px;
}
&__button {
margin-left: -44px;
Expand Down