Fixed jukebox to match style

This commit is contained in:
Ben Arc
2021-06-30 13:38:10 +01:00
parent eac125a28e
commit 55c564fe21
5 changed files with 29 additions and 29 deletions

View File

@@ -111,7 +111,6 @@ new Vue({
mixins: [windowMixin], mixins: [windowMixin],
data: function () { data: function () {
return { return {
user: LNbits.map.user(window.user), user: LNbits.map.user(window.user),
receive: { receive: {
show: false, show: false,
@@ -623,7 +622,6 @@ new Vue({
} }
}, },
created: function () { created: function () {
this.fetchBalance() this.fetchBalance()
this.fetchPayments() this.fetchPayments()
@@ -637,7 +635,6 @@ new Vue({
}) })
}, },
mounted: function () { mounted: function () {
// show disclaimer // show disclaimer
if ( if (
this.$refs.disclaimer && this.$refs.disclaimer &&

View File

@@ -6,7 +6,7 @@
<q-card-section> <q-card-section>
<q-btn <q-btn
unelevated unelevated
color="green-7" color="primary"
class="q-ma-lg" class="q-ma-lg"
@click="openNewDialog()" @click="openNewDialog()"
>Add Spotify Jukebox</q-btn >Add Spotify Jukebox</q-btn
@@ -108,8 +108,8 @@
<q-card class="q-pa-md q-pt-lg q-mt-md" style="width: 100%"> <q-card class="q-pa-md q-pt-lg q-mt-md" style="width: 100%">
<q-stepper <q-stepper
v-model="step" v-model="step"
active-color="green-7" active-color="primary"
inactive-color="green-10" inactive-color="secondary"
vertical vertical
animated animated
> >
@@ -149,15 +149,15 @@
<div class="col-4"> <div class="col-4">
<q-btn <q-btn
v-if="jukeboxDialog.data.title != null && jukeboxDialog.data.price != null && jukeboxDialog.data.wallet != null" v-if="jukeboxDialog.data.title != null && jukeboxDialog.data.price != null && jukeboxDialog.data.wallet != null"
color="green-7" color="primary"
@click="step = 2" @click="step = 2"
>Continue</q-btn >Continue</q-btn
> >
<q-btn v-else color="green-7" disable>Continue</q-btn> <q-btn v-else color="primary" disable>Continue</q-btn>
</div> </div>
<div class="col-8"> <div class="col-8">
<q-btn <q-btn
color="green-7" color="primary"
class="float-right" class="float-right"
@click="closeFormDialog" @click="closeFormDialog"
>Cancel</q-btn >Cancel</q-btn
@@ -208,17 +208,17 @@
<div class="col-4"> <div class="col-4">
<q-btn <q-btn
v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched" v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
color="green-7" color="primary"
@click="submitSpotifyKeys" @click="submitSpotifyKeys"
>Submit keys</q-btn >Submit keys</q-btn
> >
<q-btn v-else color="green-7" disable color="green-7" <q-btn v-else color="primary" disable color="primary"
>Submit keys</q-btn >Submit keys</q-btn
> >
</div> </div>
<div class="col-8"> <div class="col-8">
<q-btn <q-btn
color="green-7" color="primary"
class="float-right" class="float-right"
@click="closeFormDialog" @click="closeFormDialog"
>Cancel</q-btn >Cancel</q-btn
@@ -237,7 +237,7 @@
dense dense
outline outline
unelevated unelevated
color="green-7" color="primary"
size="xs" size="xs"
@click="copyText(locationcb + jukeboxDialog.data.sp_id, 'Link copied to clipboard!')" @click="copyText(locationcb + jukeboxDialog.data.sp_id, 'Link copied to clipboard!')"
>{% raw %}{{ locationcb }}{{ jukeboxDialog.data.sp_id }}{% endraw >{% raw %}{{ locationcb }}{{ jukeboxDialog.data.sp_id }}{% endraw
@@ -256,17 +256,17 @@
<div class="col-4"> <div class="col-4">
<q-btn <q-btn
v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched" v-if="jukeboxDialog.data.sp_secret != null && jukeboxDialog.data.sp_user != null && tokenFetched"
color="green-7" color="primary"
@click="authAccess" @click="authAccess"
>Authorise access</q-btn >Authorise access</q-btn
> >
<q-btn v-else color="green-7" disable color="green-7" <q-btn v-else color="primary" disable color="primary"
>Authorise access</q-btn >Authorise access</q-btn
> >
</div> </div>
<div class="col-8"> <div class="col-8">
<q-btn <q-btn
color="green-7" color="primary"
class="float-right" class="float-right"
@click="closeFormDialog" @click="closeFormDialog"
>Cancel</q-btn >Cancel</q-btn
@@ -281,7 +281,7 @@
:name="4" :name="4"
title="Select playlists" title="Select playlists"
icon="queue_music" icon="queue_music"
active-color="green-8" active-color="primary"
:done="step > 4" :done="step > 4"
> >
<q-select <q-select
@@ -307,15 +307,15 @@
<div class="col-5"> <div class="col-5">
<q-btn <q-btn
v-if="jukeboxDialog.data.sp_device != null && jukeboxDialog.data.sp_playlists != null" v-if="jukeboxDialog.data.sp_device != null && jukeboxDialog.data.sp_playlists != null"
color="green-7" color="primary"
@click="createJukebox" @click="createJukebox"
>Create Jukebox</q-btn >Create Jukebox</q-btn
> >
<q-btn v-else color="green-7" disable>Create Jukebox</q-btn> <q-btn v-else color="primary" disable>Create Jukebox</q-btn>
</div> </div>
<div class="col-7"> <div class="col-7">
<q-btn <q-btn
color="green-7" color="primary"
class="float-right" class="float-right"
@click="closeFormDialog" @click="closeFormDialog"
>Cancel</q-btn >Cancel</q-btn

View File

@@ -123,7 +123,7 @@
<q-tabs <q-tabs
v-model="confirmationMethod" v-model="confirmationMethod"
no-caps no-caps
class="bg-purple text-white shadow-2" class="bg-dark text-white shadow-2"
> >
<q-tab name="wordlist" label="Wordlist"></q-tab> <q-tab name="wordlist" label="Wordlist"></q-tab>
<q-tab name="totp" label="TOTP (Google Authenticator)"></q-tab> <q-tab name="totp" label="TOTP (Google Authenticator)"></q-tab>

View File

@@ -307,8 +307,7 @@ window.windowMixin = {
extensions: [], extensions: [],
user: null, user: null,
wallet: null, wallet: null,
payments: [], payments: []
} }
} }
}, },
@@ -337,7 +336,10 @@ window.windowMixin = {
created: function () { created: function () {
this.$q.dark.set(this.$q.localStorage.getItem('lnbits.darkMode')) this.$q.dark.set(this.$q.localStorage.getItem('lnbits.darkMode'))
if (this.$q.localStorage.getItem('lnbits.theme')) { if (this.$q.localStorage.getItem('lnbits.theme')) {
document.body.setAttribute('data-theme', this.$q.localStorage.getItem('lnbits.theme')) document.body.setAttribute(
'data-theme',
this.$q.localStorage.getItem('lnbits.theme')
)
} }
if (window.user) { if (window.user) {
this.g.user = Object.freeze(window.LNbits.map.user(window.user)) this.g.user = Object.freeze(window.LNbits.map.user(window.user))

View File

@@ -25,7 +25,7 @@ $themes: (
), ),
'flamingo': ( 'flamingo': (
primary: #c64242, primary: #c64242,
secondary: #ff7474, secondary: #cf5656,
dark: #e75480, dark: #e75480,
info: #ec7599, info: #ec7599,
marginal-bg: #e75480, marginal-bg: #e75480,
@@ -55,7 +55,8 @@ $themes: (
} }
} }
@if $name == 'info' { @if $name == 'info' {
[data-theme='#{$theme}'] .q-card--dark { [data-theme='#{$theme}'] .q-card--dark,
[data-theme='#{$theme}'] .q-stepper--dark {
background: $color !important; background: $color !important;
} }
} }