Rooba
/
synclounge
mirror of https://github.com/synclounge/synclounge.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Webroot changes within invites

This commit is contained in:
samcm 2018-01-01 17:01:25 +11:00
parent 31f44563c4
commit 7c59791a2d
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/join.vue
View File

@ -3,7 +3,6 @@
<v-flex xs12 md8 offset-md2>
<v-card style="background: rgba(0,0,0,0.3)">
<h4 class="white--text center-text pa-1"> Welcome to SyncLounge!</h4>
</div>
<div class="center-text">
<h6><span style="font-weight:900">{{ owner }}</span> has invited you to join the room <span
style="font-weight:900">{{ room }}</span></h6>
@ -13,7 +12,6 @@
<v-btn class="center" style="background-color: #E5A00D" v-on:click.native="letsGo()">Accept Invite</v-btn>
</v-flex>
</v-layout>
</div>
<p style="opacity:0.7" class="center-text">
SyncLounge is a tool to sync Plex content with your family and friends. For more info click <a target="_blank" href="https://github.com/samcm/synclounge"> here </a>
</p>
@ -29,9 +27,9 @@ export default {
mounted: function () {
var that = this
console.log('Hello from join...')
this.password = this.$route.query.ptpassword
this.room = this.$route.query.ptroom
this.server = this.$route.query.ptserver
this.password = this.$route.query.password
this.room = this.$route.query.room
this.server = this.$route.query.server
this.owner = this.$route.query.owner
if (this.room && this.server) {
@ -54,7 +52,7 @@ export default {
},
computed: {
logo: function () {
return 'ptweb/logo-small-light.png'
return this.$store.getters.logos.light.short
}
},
methods: {

10
src/store/modules/synclounge.js
View File

@ -113,7 +113,6 @@ export default {
socketConnect ({state, commit, rootState}, data) {
return new Promise((resolve, reject) => {
let address = data.address
let callback = data.callback
if (state._socket) {
state._socket.disconnect()
}
@ -164,15 +163,14 @@ export default {
console.log('generating our invite link')
console.log(state)
let webapp_socket = rootState.webapp_socket
let url = window.location.origin
let urlOrigin = window.location.origin
let data = {
urlOrigin: urlOrigin,
owner: rootState.plex.user.username,
ptserver: state.server,
ptroom: state.room,
ptpassword: state.password
server: state.server,
room: state.room,
password: state.password
}
var that = this
@ -441,7 +439,7 @@ export default {
})
}
},
transferHost ({state, commit, rootState}, username) {
transferHost ({state}, username) {
if (state._socket.connected) {
state._socket.emit('transfer_host', {
username: username