feat: 新增 pure 主题 vue + elementUI (#172)

* allow CROS * feat: vue + elementUI * fixed 设置后打开主页白屏的问题 * fixed 设置中获取device_list失败的问题 * Update Theme * Update Theme --------- Co-authored-by: 52fisher <[email protected]> Co-authored-by: fisher <[email protected]>
hanxi · Sep 17, 2024 · bfbd36f · bfbd36f
1 parent c5d6235
commit bfbd36f
Show file tree

Hide file tree

Showing 19 changed files with 191 additions and 99 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,7 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
-
+*_bak/
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.

diff --git a/xiaomusic/httpserver.py b/xiaomusic/httpserver.py
@@ -30,7 +30,6 @@
 config = None
 log = None
 
-
 @asynccontextmanager
 async def app_lifespan(app):
     if xiaomusic is not None:
@@ -75,7 +74,6 @@ def no_verification():
     version=__version__,
 )
 
-
 def reset_http_server():
     log.info(f"disable_httpauth:{config.disable_httpauth}")
     if config.disable_httpauth:

diff --git a/xiaomusic/static/app.js → xiaomusic/static/default/app.js b/xiaomusic/static/app.js → xiaomusic/static/default/app.js
@@ -300,7 +300,4 @@ $(function(){
     var remainingSeconds =Math.floor(seconds % 60);
     return `${minutes.toString().padStart(2, '0')}:${remainingSeconds.toString().padStart(2, '0')}`;
 }
-});
-
-
-
+});
diff --git a/xiaomusic/static/debug.html → xiaomusic/static/default/debug.html b/xiaomusic/static/debug.html → xiaomusic/static/default/debug.html
diff --git a/xiaomusic/static/default/index.html b/xiaomusic/static/default/index.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width">
+    <title>小爱音箱操控面板</title>
+    <script src="./jquery-3.7.1.min.js?version=1726415744"></script>
+    <script src="./app.js?version=1726415744"></script>
+    <link rel="stylesheet" type="text/css" href="./style.css?version=1726415744">
+
+    <!-- Google tag (gtag.js) -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
+    <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments)};
+    gtag('js', new Date());
+    gtag('config', 'G-Z09NC1K7ZW');
+    </script>
+
+    <!--
+<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+<script>
+var vConsole = new window.VConsole();
+</script>
+-->
+
+  </head>
+  <body>
+    <h2>小爱音箱操控面板
+      (<a  id="version" href="https://github.com/hanxi/xiaomusic/blob/main/CHANGELOG.md">
+        版本未知
+      </a>)
+    </h2>
+    <hr>
+
+    <div class="rows">
+      <select id="did">
+      </select>
+    </div>
+
+    <div id="cmds">
+    <a class="button" href="./setting.html">设置</a>
+    </div>
+    <hr>
+
+    <div style="margin: 20px;">
+      <div style="display: flex; align-items: center;">
+        <svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#8e43e7" style="height: 48px; width: 48px;"><path d="M550.826667 154.666667a47.786667 47.786667 0 0 0-19.84 4.48L298.666667 298.666667H186.453333A80 80 0 0 0 106.666667 378.453333v267.093334A80 80 0 0 0 186.453333 725.333333H298.666667l232.32 139.52a47.786667 47.786667 0 0 0 19.84 4.48A46.506667 46.506667 0 0 0 597.333333 822.826667V201.173333a46.506667 46.506667 0 0 0-46.506666-46.506666zM554.666667 822.826667c0 3.413333-3.84 3.84-3.84 3.84L320 688.853333l-9.6-6.186666H186.453333A37.12 37.12 0 0 1 149.333333 645.546667V378.453333A37.12 37.12 0 0 1 186.453333 341.333333h123.946667l10.24-6.186666 229.546667-137.6s3.84 0 3.84 3.84zM667.52 346.026667a21.333333 21.333333 0 0 0 0 30.293333 192 192 0 0 1 0 271.36 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 234.666667 234.666667 0 0 0 0-331.946666 21.333333 21.333333 0 0 0-30.293333 0z"></path><path d="M804.48 219.52a21.333333 21.333333 0 0 0-30.293333 30.293333 370.986667 370.986667 0 0 1 0 524.373334 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 414.08 414.08 0 0 0 0-584.96z"></path></svg>
+        <input id="volume" type="range"></input>
+      </div>
+    </div>
+    <hr>
+    <div class="rows">
+      <datalist id="autocomplete-list"></datalist>
+      <input id="music-name" type="text" placeholder="请输入搜索关键词(如:MV高清版 周杰伦 七里香)" list="autocomplete-list"></input>
+      <input id="music-filename" type="text" placeholder="请输入保存为的文件名称(如:周杰伦七里香)"></input>
+      <div style="display: flex; align-items: center">
+        <progress id="progress" value="0" max="100" style="width: 270px"></progress>
+        <div id="play-time" style="margin-left: 10px">00:00/00:00</div>
+      </div>
+      <div>
+        <button id="play">播放</button>
+        <div id="playering-music" class="text"></div>
+      </div>
+    </div>
+
+    <hr>
+    <div class="rows">
+      <label for="music_list">播放列表:</label>
+      <select id="music_list"></select>
+      <label for="music_name">歌曲:</label>
+      <select id="music_name"></select>
+      <div>
+      <button id="play_music_list">播放列表歌曲</button>
+      <button id="del_music">删除选中歌曲</button>
+      <button id="web_play">网页播放</button>
+      </div>
+      <div class="play_pannel">
+        <audio autoplay controls src=""></audio>
+      </div>
+    </div>
+
+    <hr>
+    <div class="rows">
+      <input id="music-url" type="text" value="https://lhttp.qtfm.cn/live/4915/64k.mp3"></input>
+      <button id="playurl">播放链接</button>
+    </div>
+
+    <footer>
+      <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
+    </footer>
+  </body>
+</html>
diff --git a/xiaomusic/static/jquery-3.7.1.min.js → xiaomusic/static/default/jquery-3.7.1.min.js b/xiaomusic/static/jquery-3.7.1.min.js → xiaomusic/static/default/jquery-3.7.1.min.js
diff --git a/xiaomusic/static/m3u.html → xiaomusic/static/default/m3u.html b/xiaomusic/static/m3u.html → xiaomusic/static/default/m3u.html
diff --git a/xiaomusic/static/qrcode.png → xiaomusic/static/default/qrcode.png b/xiaomusic/static/qrcode.png → xiaomusic/static/default/qrcode.png
diff --git a/xiaomusic/static/setting.html → xiaomusic/static/default/setting.html b/xiaomusic/static/setting.html → xiaomusic/static/default/setting.html
@@ -3,9 +3,9 @@
   <head>
     <meta name="viewport" content="width=device-width">
     <title>小爱音箱操控面板</title>
-    <script src="/static/jquery-3.7.1.min.js?version=1726415744"></script>
-    <script src="/static/setting.js?version=1726415744"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1726415744">
+    <script src="./jquery-3.7.1.min.js?version=1726415744"></script>
+    <script src="./setting.js?version=1726415744"></script>
+    <link rel="stylesheet" type="text/css" href="./style.css?version=1726415744">
 
     <!-- Google tag (gtag.js) -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
@@ -180,15 +180,15 @@ <h2>小爱音箱设置面板
 
     <a class="button" href="/downloadlog" download="xiaomusic.txt">下载日志文件</a>
     <button onclick="location.href='/docs';">查看接口文档</button>
-    <a class="button" href="/static/m3u.html" target="_blank">m3u文件转换</a>
+    <a class="button" href="./m3u.html" target="_blank">m3u文件转换</a>
     <hr>
 
-    <a class="button" href="/static/debug.html" target="_blank">调试工具</a>
+    <a class="button" href="./debug.html" target="_blank">调试工具</a>
     <a class="button" href="https://afdian.com/a/imhanxi" target="_blank">💰 爱发电</a>
     <a class="button" href="https://github.com/hanxi/xiaomusic" target="_blank">点个 Star ⭐</a>
 
     <div class="rows">
-      <img class="qrcode" src="/static/qrcode.png" alt="请涵曦喝奶茶🧋">
+      <img class="qrcode" src="./qrcode.png" alt="请涵曦喝奶茶🧋">
     </div>
     <footer>
       <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>

diff --git a/xiaomusic/static/setting.js → xiaomusic/static/default/setting.js b/xiaomusic/static/setting.js → xiaomusic/static/default/setting.js
diff --git a/xiaomusic/static/style.css → xiaomusic/static/default/style.css b/xiaomusic/static/style.css → xiaomusic/static/default/style.css
diff --git a/xiaomusic/static/index.html b/xiaomusic/static/index.html
@@ -1,90 +1,37 @@
 <!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width">
-    <title>小爱音箱操控面板</title>
-    <script src="/static/jquery-3.7.1.min.js?version=1726415744"></script>
-    <script src="/static/app.js?version=1726415744"></script>
-    <link rel="stylesheet" type="text/css" href="/static/style.css?version=1726415744">
-
-    <!-- Google tag (gtag.js) -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-Z09NC1K7ZW"></script>
-    <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments)};
-    gtag('js', new Date());
-    gtag('config', 'G-Z09NC1K7ZW');
-    </script>
-
-    <!--
-<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
-<script>
-var vConsole = new window.VConsole();
-</script>
--->
-
-  </head>
-  <body>
-    <h2>小爱音箱操控面板
-      (<a  id="version" href="https://github.com/hanxi/xiaomusic/blob/main/CHANGELOG.md">
-        版本未知
-      </a>)
-    </h2>
-    <hr>
-
-    <div class="rows">
-      <select id="did">
-      </select>
-    </div>
-
-    <div id="cmds">
-    <a class="button" href="/static/setting.html">设置</a>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <link rel="icon" href="/favicon.ico">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>小爱音箱操控面板</title>
+</head>
+
+<body>
+  <div class="container_wrapper">
+    <div class="logo">
+      <img src="/static/xiaoai.png" alt="">
     </div>
-    <hr>
-
-    <div style="margin: 20px;">
-      <div style="display: flex; align-items: center;">
-        <svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" fill="#8e43e7" style="height: 48px; width: 48px;"><path d="M550.826667 154.666667a47.786667 47.786667 0 0 0-19.84 4.48L298.666667 298.666667H186.453333A80 80 0 0 0 106.666667 378.453333v267.093334A80 80 0 0 0 186.453333 725.333333H298.666667l232.32 139.52a47.786667 47.786667 0 0 0 19.84 4.48A46.506667 46.506667 0 0 0 597.333333 822.826667V201.173333a46.506667 46.506667 0 0 0-46.506666-46.506666zM554.666667 822.826667c0 3.413333-3.84 3.84-3.84 3.84L320 688.853333l-9.6-6.186666H186.453333A37.12 37.12 0 0 1 149.333333 645.546667V378.453333A37.12 37.12 0 0 1 186.453333 341.333333h123.946667l10.24-6.186666 229.546667-137.6s3.84 0 3.84 3.84zM667.52 346.026667a21.333333 21.333333 0 0 0 0 30.293333 192 192 0 0 1 0 271.36 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 234.666667 234.666667 0 0 0 0-331.946666 21.333333 21.333333 0 0 0-30.293333 0z"></path><path d="M804.48 219.52a21.333333 21.333333 0 0 0-30.293333 30.293333 370.986667 370.986667 0 0 1 0 524.373334 21.333333 21.333333 0 0 0 0 30.293333 21.333333 21.333333 0 0 0 30.293333 0 414.08 414.08 0 0 0 0-584.96z"></path></svg>
-        <input id="volume" type="range"></input>
-      </div>
-    </div>
-    <hr>
-    <div class="rows">
-      <datalist id="autocomplete-list"></datalist>
-      <input id="music-name" type="text" placeholder="请输入搜索关键词(如:MV高清版 周杰伦 七里香)" list="autocomplete-list"></input>
-      <input id="music-filename" type="text" placeholder="请输入保存为的文件名称(如:周杰伦七里香)"></input>
-      <div style="display: flex; align-items: center">
-        <progress id="progress" value="0" max="100" style="width: 270px"></progress>
-        <div id="play-time" style="margin-left: 10px">00:00/00:00</div>
-      </div>
-      <div>
-        <button id="play">播放</button>
-        <div id="playering-music" class="text"></div>
-      </div>
-    </div>
-
-    <hr>
-    <div class="rows">
-      <label for="music_list">播放列表:</label>
-      <select id="music_list"></select>
-      <label for="music_name">歌曲:</label>
-      <select id="music_name"></select>
-      <div>
-      <button id="play_music_list">播放列表歌曲</button>
-      <button id="del_music">删除选中歌曲</button>
-      <button id="web_play">网页播放</button>
-      </div>
-      <audio autoplay></audio>
+    <div class="desc">
+      <h1>谁家灯火夜通明</h1>
+      <p class="call">小爱同学？</p>
+      <p class="answer">哎，我在</p>
     </div>
-
-    <hr>
-    <div class="rows">
-      <input id="music-url" type="text" value="https://lhttp.qtfm.cn/live/4915/64k.mp3"></input>
-      <button id="playurl">播放链接</button>
+    <div class="options">
+      <!-- 选择主题 /static/[theme] -->
+      <a href="/static/default/index.html" class="href">默认主题</a>
+      <a href="/static/pure/index.html" class="href">Pure主题</a>
+      <a href="https://afdian.com/a/imhanxi" target="_blank">爱发电</a>
+      <a href="https://github.com/hanxi/xiaomusic" target="_blank">GitHub</a>
     </div>
-
-    <footer>
-      <p>Powered by <a href="https://github.com/hanxi/xiaomusic" target="_blank">xiaomusic</a></p>
-    </footer>
-  </body>
-</html>
+  </div>
+  <footer>
+    power by <a href="https://github.com/hanxi/xiaomusic">XiaoMusic</a>
+  </footer>
+  <style>
+    @font-face{ font-family: "得意黑 斜体"; font-weight: 400; src: url("//at.alicdn.com/wf/webfont/603VmyqiyGMz/gJk2ny0v51vn.woff2") format("woff2"), url("//at.alicdn.com/wf/webfont/603VmyqiyGMz/e2C1wSBHH86h.woff") format("woff"); font-display: swap;} @font-face{ font-family: "阿里妈妈数黑体 Bold"; font-weight: 700; src: url("//at.alicdn.com/wf/webfont/603VmyqiyGMz/4DWYdFK3dz5J.woff2") format("woff2"), url("//at.alicdn.com/wf/webfont/603VmyqiyGMz/V7EBEKlNSdxC.woff") format("woff"); font-display: swap;} body{ background-color: rgb(47, 44, 67); height: 100%; overflow: hidden;} .container_wrapper{ display: flex; justify-content: center; align-items: center; height: 90vh; cursor: default;} h1{ font-weight: bold; color: #a2a9af; width: 600px; font-family: '得意黑 斜体', 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; font-size: 2.5em; border-bottom: 1px solid #a2a9af;} .container_wrapper .logo img{ width: 140px; height: auto; filter: drop-shadow(10px 10px 10px rgba(0, 0, 0, 0.5));} .desc{ text-align: center; color: #fff; margin: auto 30px; backdrop-filter: blur(5px);} .desc p{ font-size: 1.2em; margin: 0; padding: 0; font-family: '阿里妈妈数黑体 Bold'; font-weight: 800;} p.call{ letter-spacing: 0.4em; font-size: 2.2em; line-height: 1.5; font-style: normal;} p.answer{ letter-spacing: 0.23em; line-height: 1.5; font-style: normal; color: #a2a9af; margin-top: 10px;} .desc p::before, .desc p::after{ font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; font-size: 1.5em; color: #4c5870;} .desc p::before{ content: "“";} .desc p::after{ content: "”";} .options{ display: flex; flex-direction: column;} .options a{ color: #a2a9af; text-decoration: none; font-size: 1.1em; position: relative; display: inline; margin: 10px auto;} .options a::before{ content: ''; position: absolute; bottom: 0; left: 0; right: 0; height: 2px; background-color: #ebedec; transform-origin: bottom right; transform: scaleX(0); transition: transform 0.3s ease;} .options a:hover::before{ transform-origin: bottom left; transform: scaleX(1);} .options a:hover{ color:#ebedec;} footer{ display: flex; justify-content: center; color: #4c5870;} footer a{ color:inherit; text-decoration: none; margin: auto 10px;}
+  </style>
+</body>
+
+</html>
diff --git a/xiaomusic/static/pure/assets/AboutView-C6Dx7pxG.css b/xiaomusic/static/pure/assets/AboutView-C6Dx7pxG.css
@@ -0,0 +1 @@
+@media (min-width: 1024px){.about{min-height:100vh;display:flex;align-items:center}}
diff --git a/xiaomusic/static/pure/assets/AboutView-YnMeWeO4.js b/xiaomusic/static/pure/assets/AboutView-YnMeWeO4.js
diff --git a/xiaomusic/static/pure/assets/index-Bd5dK7Z7.css b/xiaomusic/static/pure/assets/index-Bd5dK7Z7.css
diff --git a/xiaomusic/static/pure/assets/index-SRiaS3ii.js b/xiaomusic/static/pure/assets/index-SRiaS3ii.js
diff --git a/xiaomusic/static/pure/favicon.ico b/xiaomusic/static/pure/favicon.ico
diff --git a/xiaomusic/static/pure/index.html b/xiaomusic/static/pure/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/static/pure/favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>小爱音箱操控面板</title>
+    <script type="module" crossorigin src="/static/pure/assets/index-SRiaS3ii.js"></script>
+    <link rel="stylesheet" crossorigin href="/static/pure/assets/index-Bd5dK7Z7.css">
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>
diff --git a/xiaomusic/static/xiaoai.png b/xiaomusic/static/xiaoai.png