okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[connect] theme still not working, but app no crash on startup

Browse source
This commit is contained in:
child_duckling 2022-04-21 22:04:34 -07:00
parent 186e6986ef
commit 1eb70568af
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/base/store.ts
View file

@ -155,7 +155,10 @@ export class Store {
"AudioContext": false, "AudioContext": false,
"experiments": [], "experiments": [],
"playlistTrackMapping": true "playlistTrackMapping": true
} },
"connectUser": {
"auth": null,
},
} }
private migrations: any = { private migrations: any = {
'>=1.4.3': (store: ElectronStore) => { '>=1.4.3': (store: ElectronStore) => {

4
src/renderer/less/pages.less
View file

@ -1149,6 +1149,10 @@
font-size : 2em; font-size : 2em;
} }
.settings-option-body-webview {
height: 100%;
width: 100%;
}
.settings-option-body { .settings-option-body {
margin: 16px; margin: 16px;
} }

8
src/renderer/views/pages/settings.ejs
View file

@ -982,8 +982,8 @@
<div class="md-option-header"> <div class="md-option-header">
<span>{{$root.getLz('settings.header.connect')}}</span> <span>{{$root.getLz('settings.header.connect')}}</span>
</div> </div>
<div class="settings-option-body"> <div class="settings-option-body-webview">
<div class="md-option-line update-check"> <div class="md-option-line update-check" v-if="app.cfg.connectUser == null">
<div class="md-option-segment"> <div class="md-option-segment">
{{$root.getLz('settings.option.connect.link_account')}} {{$root.getLz('settings.option.connect.link_account')}}
<small>{{$root.getLz('settings.option.connect.link_account.description')}}</small> <small>{{$root.getLz('settings.option.connect.link_account.description')}}</small>
@ -996,9 +996,11 @@
</button> </button>
</div> </div>
</div> </div>
<div v-if="app.cfg.connectUser != null" style="display:inline-flex; width:100%;height: 100%">
<iframe :src="`https://connect.cidercollective.dev/setSession/` + encodeURI(JSON.stringify(app.cfg.connectUser))" sandbox="allow-scripts allow-top-navigation allow-same-origin" width="100%" height="100%" frameborder="0"></iframe>
</div>
</div> </div>
</div> </div>
</div>
</b-tab> </b-tab>
</b-tabs> </b-tabs>
</div> </div>