Merge pull request #78 from gnehs/dev

Dev
gnehs · Sep 30, 2018 · 29391b9 · 29391b9
2 parents 8bba695 + 76b0299
commit 29391b9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/checkConnection.js b/checkConnection.js
@@ -7,6 +7,10 @@ const fs = require("fs-extra");
 
 router.use(bodyParser.json());
 
+// 首頁
+router.get("/", (req, res) => {
+    res.send("PokaPlayer Install API");
+});
 router.post("/netease2", async(req, res) => {
     async function netease2(config) {
         const options = (url, qs = {}) => ({

diff --git a/index.js b/index.js
@@ -79,7 +79,7 @@ server.listen(3000, () => {
 });
 
 //安裝頁面
-if (!config) app.get("/install", (req, res) => res.render("install", { version: package.version }));
+if (!config || config.PokaPlayer.debug) app.get("/install", (req, res) => res.render("install", { version: package.version }));
 
 // 隨機圖圖
 app.get("/og/og.png", (req, res) => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pokaplayer",
-    "version": "0.12.0",
+    "version": "0.12.1",
     "description": "",
     "main": "index.js",
     "scripts": {

diff --git a/public/css/style.css b/public/css/style.css
@@ -200,6 +200,13 @@ header.mdui-appbar.mdui-appbar-fixed {
 }
 
 
+/* fab fix*/
+
+.mdui-fab-wrapper {
+    bottom: 84px;
+}
+
+
 /* 專輯頁面檢視 */
 
 .poka.cards {