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

Merge branch 'upcoming' of https://github.com/ciderapp/Cider into upcoming

Browse source
This commit is contained in:
booploops 2022-01-21 19:35:52 -08:00
commit 3aad38c8d5
6 changed files with 97 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/renderer/views/components/qrcode-modal.ejs Normal file
View file

@ -0,0 +1,34 @@
<script type="text/x-template" id="qrcode-modal">
<div class="modal-fullscreen spatialproperties-panel">
<div class="modal-window" >
<div class="modal-header">
<div class="modal-title">Web Remote QR</div>
<button class="close-btn" @click="close()"></button>
</div>
<div class="modal-content">
<img class="qrimg" :src="src"/>
</div>
</div>
</div>
</script>
<script>
Vue.component('qrcode-modal', {
template: '#qrcode-modal',
data: function () {
return {
app: this.$root,
}
},
props: ["src"],
mounted() {
},
methods: {
close() {
app.resetState()
},
}
});
</script>

15
src/renderer/views/main.ejs
View file

@ -232,6 +232,13 @@
<transition name="wpfade">
<div class="usermenu-container" v-if="chrome.menuOpened">
<div class="usermenu-body">
<button class="usermenu-item" @click="showWebRemoteQR()">
<div class="row nopadding">
<div class="col nopadding">
Show Web Remote QR
</div>
</div>
</button>
<button class="usermenu-item" @click="toggleHideUserInfo()">
<div class="row nopadding">
<div class="col nopadding">
@ -602,6 +609,9 @@
<transition name="modal">
<spatial-properties v-if="modals.spatialProperties"></spatial-properties>
</transition>
<transition name="modal">
<qrcode-modal v-if="modals.qrcode" :src="webremoteqr"></qrcode-modal>
</transition>
<div id="apple-music-video-container">
<div id="apple-music-video-player-controls">
<div id="player-exit" title="Close" @click="exitMV()">
@ -705,7 +715,10 @@
<%- include('components/sidebar-playlist')
%>
<!-- Spatial Properties -->
<%- include('components/spatial-properties')
<%- include('components/spatial-properties')
%>
<!-- QRCode Modal -->
<%- include('components/qrcode-modal')
%>
<!-- Add to playlist -->
<%- include('components/add-to-playlist')