Fix "rememberMe" functionality
This commit is contained in:
parent
ac4af0a53d
commit
aa1ce4ee48
9 changed files with 89 additions and 97 deletions
|
|
@ -120,7 +120,7 @@
|
|||
</v-row>
|
||||
<v-row class="mt-0">
|
||||
<v-col class="py-0">
|
||||
<v-checkbox id="chk-remember-me" class="mt-0" v-model="rememberMe" @change="onRememberMe"
|
||||
<v-checkbox id="chk-remember-me" class="mt-0" v-model="rememberMe"
|
||||
:label="$t('join.remember_me')" />
|
||||
</v-col>
|
||||
</v-row>
|
||||
|
|
|
|||
|
|
@ -57,8 +57,7 @@
|
|||
</v-list-item>
|
||||
</template>
|
||||
</v-select>
|
||||
<v-checkbox id="chk-remember-me" class="mt-0" v-model="rememberMe" :label="$t('join.remember_me')"
|
||||
@change="onRememberMe" />
|
||||
<v-checkbox id="chk-remember-me" class="mt-0" v-model="rememberMe" :label="$t('join.remember_me')" />
|
||||
</v-col>
|
||||
<v-col cols="2" sm="5" class="py-0">
|
||||
<v-avatar @click="showAvatarPicker">
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@
|
|||
id="chk-remember-me"
|
||||
class="mt-0"
|
||||
v-model="rememberMe"
|
||||
@change="onRememberMe"
|
||||
:label="$t('join.remember_me')"
|
||||
/>
|
||||
<v-btn
|
||||
|
|
|
|||
|
|
@ -1,36 +1,17 @@
|
|||
<template>
|
||||
<v-dialog
|
||||
:value="showLogoutPopup"
|
||||
class="ma-0 pa-0"
|
||||
:width="$vuetify.display.smAndUp ? '688px' : '95%'"
|
||||
@click:outside="$emit('onOutsideLogoutPopupClicked')"
|
||||
>
|
||||
<v-dialog :modelValue="showLogoutPopup" class="ma-0 pa-0" :width="$vuetify.display.smAndUp ? '688px' : '95%'"
|
||||
@click:outside="$emit('onOutsideLogoutPopupClicked')">
|
||||
<div class="dialog-content text-center">
|
||||
<template>
|
||||
<h2 class="dialog-title">
|
||||
{{ $t("logout.confirm_text")}}
|
||||
</h2>
|
||||
</template>
|
||||
<h2 class="dialog-title">{{ $t("logout.confirm_text") }}</h2>
|
||||
<v-container fluid>
|
||||
<v-row cols="12">
|
||||
<v-col cols="6">
|
||||
<v-btn
|
||||
variant="flat"
|
||||
block
|
||||
class="text-button"
|
||||
@click.stop="$emit('onCancelLogoutClicked')"
|
||||
>{{ $t("menu.cancel") }}</v-btn
|
||||
>
|
||||
<v-btn variant="flat" block class="text-button" @click.stop="$emit('onCancelLogoutClicked')">{{
|
||||
$t("menu.cancel") }}</v-btn>
|
||||
</v-col>
|
||||
<v-col cols="6" align="center">
|
||||
<v-btn
|
||||
color="red"
|
||||
variant="flat"
|
||||
block
|
||||
class="filled-button"
|
||||
@click.stop="logout"
|
||||
>{{ $t("menu.logout") }}</v-btn
|
||||
>
|
||||
<v-btn color="red" variant="flat" block class="filled-button" @click.stop="logout">{{ $t("menu.logout")
|
||||
}}</v-btn>
|
||||
</v-col>
|
||||
</v-row>
|
||||
</v-container>
|
||||
|
|
@ -46,8 +27,8 @@ export default {
|
|||
props: {
|
||||
showLogoutPopup: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
}
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
{{ currentTime }} / {{ totalTime }}
|
||||
</div>
|
||||
<div style="position:relative;flex: 1 1 100%">
|
||||
<v-slider @change="seeked" :disabled="!info.url" color="currentColor" track-color="#cccccc" class="play-progress" :value="info.playPercent" min="0"
|
||||
<v-slider @update:modelValue="seeked" :disabled="!info.url" color="currentColor" track-color="#cccccc" class="play-progress" :modelValue="info.playPercent" min="0"
|
||||
max="100" />
|
||||
<div style="position:absolute;left:18px;right:18px;top:0;bottom:0;height:100%">
|
||||
<AudioWaveformView :event="event" style="width:100%;height:100%" />
|
||||
|
|
|
|||
|
|
@ -4,9 +4,18 @@ export default {
|
|||
rememberMe: this.$store.state.useLocalStorage
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onRememberMe(val) {
|
||||
this.$store.commit("setUseLocalStorage", val);
|
||||
watch: {
|
||||
rememberMe(val) {
|
||||
if (val != this.$store.state.useLocalStorage) {
|
||||
this.$store.commit("setUseLocalStorage", val);
|
||||
}
|
||||
},
|
||||
"$store.state.useLocalStorage": {
|
||||
handler(val) {
|
||||
if (val != this.rememberMe) {
|
||||
this.rememberMe = val;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
<i18n-t keypath="room_welcome.join_channel" tag="span">
|
||||
<template v-slot:link>
|
||||
<div style="position:relative;display:inline-block">
|
||||
<a @click.stop="copyPublicLink" :href="publicRoomLink" class="text-break">{{ publicRoomLink }}</a>
|
||||
<a @click.stop.prevent="copyPublicLink" :href="publicRoomLink" class="text-break">{{ publicRoomLink }}</a>
|
||||
<v-btn v-if="publicRoomLinkCopied" id="btn-copy-room-link" color="#444444" variant="flat"
|
||||
style="position:absolute;left:0;top:0" class="filled-button link-copied-in-place">{{
|
||||
$t("room_info.link_copied") }}</v-btn>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<i18n-t keypath="room_welcome.join_public" tag="span">
|
||||
<template v-slot:link>
|
||||
<div style="position:relative;display:inline-block">
|
||||
<a @click.stop="copyPublicLink" :href="publicRoomLink" class="text-break">{{ publicRoomLink }}</a>
|
||||
<a @click.stop.prevent="copyPublicLink" :href="publicRoomLink" class="text-break">{{ publicRoomLink }}</a>
|
||||
<v-btn
|
||||
v-if="publicRoomLinkCopied"
|
||||
id="btn-copy-room-link"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue