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

removed loading bar, testing without hlscider

Browse source
This commit is contained in:
booploops 2022-07-22 03:15:31 -07:00
parent b7036da44d
commit dbe98fe5e3
2 changed files with 116 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/renderer/views/components/animatedartwork-view.ejs
View file

@ -43,7 +43,7 @@
this.hls.detachMedia(); this.hls.detachMedia();
} else { } else {
this.hls = new CiderHls(config); this.hls = new Hls(config);
} }
// bind them together // bind them together
if (this.$refs.video) { if (this.$refs.video) {
@ -59,7 +59,7 @@
} }
this.hls.attachMedia(this.$refs.video); this.hls.attachMedia(this.$refs.video);
this.hls.loadSource(this.video); this.hls.loadSource(this.video, p);
let u = this.hls; let u = this.hls;
var quality = app.cfg.visual.animated_artwork_qualityLevel; var quality = app.cfg.visual.animated_artwork_qualityLevel;
setTimeout(() => { setTimeout(() => {

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

@ -2,123 +2,133 @@
<html lang="en"> <html lang="en">
<head> <head>
<link rel="preconnect" href="https://amp-api.music.apple.com/" crossorigin/> <link rel="preconnect" href="https://amp-api.music.apple.com/" crossorigin />
<link rel="preconnect" href="https://api.music.apple.com/" crossorigin/> <link rel="preconnect" href="https://api.music.apple.com/" crossorigin />
<link rel="preconnect" href="https://is1-ssl.mzstatic.com/" crossorigin/> <link rel="preconnect" href="https://is1-ssl.mzstatic.com/" crossorigin />
<link rel="preconnect" href="https://is2-ssl.mzstatic.com/" crossorigin/> <link rel="preconnect" href="https://is2-ssl.mzstatic.com/" crossorigin />
<link rel="preconnect" href="https://is3-ssl.mzstatic.com/" crossorigin/> <link rel="preconnect" href="https://is3-ssl.mzstatic.com/" crossorigin />
<link rel="preconnect" href="https://is4-ssl.mzstatic.com/" crossorigin/> <link rel="preconnect" href="https://is4-ssl.mzstatic.com/" crossorigin />
<link rel="preconnect" href="https://is5-ssl.mzstatic.com/" crossorigin/> <link rel="preconnect" href="https://is5-ssl.mzstatic.com/" crossorigin />
<link rel="preconnect" href="https://play.itunes.apple.com/" crossorigin/> <link rel="preconnect" href="https://play.itunes.apple.com/" crossorigin />
<link rel="preconnect" href="https://aod-ssl.itunes.apple.com/" crossorigin/> <link rel="preconnect" href="https://aod-ssl.itunes.apple.com/" crossorigin />
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, viewport-fit=cover">
<title>Cider</title> <title>Cider</title>
<link rel="<%- (env.dev ? "stylesheet" : "stylesheet/less") %>" type="text/css" href="style.<%- (env.dev ? "css" : "less") %>"/> <link rel="<%- (env.dev ? " stylesheet" : "stylesheet/less" ) %>" type="text/css" href="style.<%- (env.dev ? "css"
<!-- <link rel="stylesheet/less" type="text/css" id="userTheme" href="themes/default.less"/>--> : "less" ) %>"/>
<script src="./lib/less.js"></script> <!-- <link rel="stylesheet/less" type="text/css" id="userTheme" href="themes/default.less"/>-->
<script src="<%- (env.dev ? " ./lib/vue.js" : "./lib/vue.dev.js") %>"></script> <script src="./lib/less.js"></script>
<script src="./lib/smoothscroll.js"></script> <script src="<%- (env.dev ? " ./lib/vue.js" : "./lib/vue.dev.js" ) %>"></script>
<link rel="manifest" href="./manifest.json?v=2"> <script src="./lib/smoothscroll.js"></script>
<script src="https://js-cdn.music.apple.com/hls.js/2.141.0/hls.js/hls.js"></script> <link rel="manifest" href="./manifest.json?v=2">
<script src="hlscider.js"></script> <script src="https://js-cdn.music.apple.com/hls.js/2.141.0/hls.js/hls.js"></script>
<script src="./lib/jquery-3.2.1.slim.min.js"></script> <!-- <script src="hlscider.js"></script> -->
<script src="./lib/popper.min.js"></script> <script src="./lib/jquery-3.2.1.slim.min.js"></script>
<script src="./lib/bootstrap.min.js"></script> <script src="./lib/popper.min.js"></script>
<script src="./lib/bootbox.min.js"></script> <script src="./lib/bootstrap.min.js"></script>
<script src="./lib/notyf.min.js"></script> <script src="./lib/bootbox.min.js"></script>
<script src="./lib/marked.js"></script> <script src="./lib/notyf.min.js"></script>
<script src="./lib/velocity.min.js"></script> <script src="./lib/marked.js"></script>
<script src="./lib/fast-plural-rules.js"></script> <script src="./lib/velocity.min.js"></script>
<script src="./lib/resonance-audio.min.js"></script> <script src="./lib/fast-plural-rules.js"></script>
<script src="./lib/stackblur.min.js"></script> <script src="./lib/resonance-audio.min.js"></script>
<script src="./lib/stackblur.min.js"></script>
<style> <style>
#LOADER {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: #1E1E1E;
z-index: 99999;
display: flex;
justify-content: center;
align-items: center;
}
#LOADER > svg {
width: 128px;
}
@media (prefers-color-scheme: light) {
#LOADER { #LOADER {
background-color: #eee; position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: #1E1E1E;
z-index: 99999;
display: flex;
justify-content: center;
align-items: center;
} }
}
</style> #LOADER>svg {
width: 128px;
}
@media (prefers-color-scheme: light) {
#LOADER {
background-color: #eee;
}
}
</style>
</head> </head>
<body class="notransparency" oncontextmenu="return false;" loading="1" os-release="<%= parseInt(env.osRelease) %>" <body class="notransparency" oncontextmenu="return false;" loading="1" os-release="<%= parseInt(env.osRelease) %>"
platform="<%= env.platform %>"> platform="<%= env.platform %>">
<script src="<%- (env.dev ? " ./lib/vue.js" : "./lib/vue.dev.js") %>"></script> <script src="<%- (env.dev ? " ./lib/vue.js" : "./lib/vue.dev.js" ) %>"></script>
<script src="./lib/vue-horizontal.js"></script> <script src="./lib/vue-horizontal.js"></script>
<script src="./lib/bootstrap-vue.min.js"></script> <script src="./lib/bootstrap-vue.min.js"></script>
<script src="./lib/vuex.min.js"></script> <script src="./lib/vuex.min.js"></script>
<script src="./lib/sortable.min.js"></script> <script src="./lib/sortable.min.js"></script>
<script src="./lib/vue-observe-visibility.min.js"></script> <script src="./lib/vue-observe-visibility.min.js"></script>
<script src="./lib/vuedraggable.umd.min.js"></script> <script src="./lib/vuedraggable.umd.min.js"></script>
<script src="./lib/quasar/quasar.umd.min.js"></script> <script>
<script type="module" src="./main/app.js"></script> window.quasarConfig = {
brand: {
primary: '#fc3c44'
},
config: {
dark: true
},
loadingBar: { skipHijack: true }
}
</script>
<script src="./lib/quasar/quasar.umd.min.js"></script>
<script type="module" src="./main/app.js"></script>
<div id="LOADER"> <div id="LOADER">
<%- include("../assets/cider-round.svg") %> <%- include("../assets/cider-round.svg") %>
</div> </div>
<div id="app" :class="getAppClasses()" <div id="app" :class="getAppClasses()" v-if="appVisible" :window-state="chrome.windowState" :style="getAppStyle()"
v-if="appVisible" :library-visible="(chrome.sidebarCollapsed ? 0 : 1)" :window-style="cfg.visual.directives.windowLayout">
:window-state="chrome.windowState" <transition name="fsModeSwitch">
:style="getAppStyle()" :library-visible="(chrome.sidebarCollapsed ? 0 : 1)" <div id="app-main" v-show="appMode == 'player'">
:window-style="cfg.visual.directives.windowLayout"> <%- include('app/chrome-top'); %>
<transition name="fsModeSwitch"> <%- include('app/app-navigation'); %>
<div id="app-main" v-show="appMode == 'player'"> <%- include('app/chrome-bottom'); %>
<%- include('app/chrome-top'); %> </div>
<%- include('app/app-navigation'); %> </transition>
<%- include('app/chrome-bottom'); %> <transition name="fsModeSwitch">
</div> <div class="fullscreen-view-container" v-if="appMode == 'fullscreen'">
</transition> <fullscreen-view :image="currentArtUrlRaw" :time="mk.currentPlaybackTime - lyricOffset" :lyrics="lyrics"
<transition name="fsModeSwitch"> :richlyrics="richlyrics"></fullscreen-view>
<div class="fullscreen-view-container" v-if="appMode == 'fullscreen'"> </div>
<fullscreen-view :image="currentArtUrlRaw" :time="mk.currentPlaybackTime - lyricOffset" :lyrics="lyrics" </transition>
:richlyrics="richlyrics"></fullscreen-view> <transition name="fsModeSwitch">
</div> <div class="fullscreen-view-container" v-if="appMode == 'mini'">
</transition> <mini-view :image="currentArtUrlRaw" :time="mk.currentPlaybackTime - lyricOffset" :lyrics="lyrics"
<transition name="fsModeSwitch"> :richlyrics="richlyrics">
<div class="fullscreen-view-container" v-if="appMode == 'mini'"> </mini-view>
<mini-view :image="currentArtUrlRaw" :time="mk.currentPlaybackTime - lyricOffset" :lyrics="lyrics" :richlyrics="richlyrics"> </div>
</mini-view> </transition>
</div> <transition name="fsModeSwitch">
</transition> <div class="fullscreen-view-container oobe" v-if="appMode == 'oobe'">
<transition name="fsModeSwitch"> <cider-oobe></cider-oobe>
<div class="fullscreen-view-container oobe" v-if="appMode == 'oobe'"> </div>
<cider-oobe></cider-oobe> </transition>
</div> <%- include('app/panels'); %>
</transition> <div class="cursor" v-if="chrome.showCursor"></div>
<%- include('app/panels'); %> </div>
<div class="cursor" v-if="chrome.showCursor"></div>
</div>
<% for(var i = 0; i < Object.keys(env.components).length ; i++) { %> <% for(var i=0; i < Object.keys(env.components).length ; i++) { %>
<%- include(env.components[i]); %> <%- include(env.components[i]); %>
<% } %> <% } %>
<script async <script async
src="<%- (env.useV3 ? 'https://js-cdn.music.apple.com/musickit/v3/amp/musickit.js' : 'https://api.cider.sh/musickit.js') %>" src="<%- (env.useV3 ? 'https://js-cdn.music.apple.com/musickit/v3/amp/musickit.js' : 'https://api.cider.sh/musickit.js') %>"
data-web-components> data-web-components>
</script> </script>
<script src="index.js?v=1"></script> <script src="index.js?v=1"></script>
<script type="text/x-template" id="am-musiccovershelf"> <script type="text/x-template" id="am-musiccovershelf">
<h1>{{ component.attributes.title.stringForDisplay }}</h1> <h1>{{ component.attributes.title.stringForDisplay }}</h1>
</script> </script>