style: prettier code

xiaozhu188 · Mar 18, 2021 · 4d7e388 · 4d7e388
1 parent b1a00d2
commit 4d7e388
Show file tree

Hide file tree

Showing 47 changed files with 149 additions and 179 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -1,2 +1,3 @@
 > 1%
 last 2 versions
+not dead
diff --git a/.editorconfig b/.editorconfig
@@ -1,5 +1,5 @@
 [*.{js,jsx,ts,tsx,vue}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -3,25 +3,23 @@ module.exports = {
     env: {
         node: true,
     },
-    extends: ["plugin:vue/essential", "@vue/standard"],
-    rules: {
-        "no-console": "off",
-        "space-in-parens": "off",
-        "no-debugger": "off",
-        "no-mixed-operators": "off",
-        eqeqeq: "off",
-        "no-unused-vars": "off",
-        camelcase: "off",
-        "arrow-parens": "off",
-        "generator-star-spacing": "off",
-        "object-curly-even-spacing": "on",
-        "one-var": "off",
-        indent: "off",
-        "vue/no-unused-components": "off",
-        "no-unneeded-ternary": "off",
-        semicolon: "on",
-    },
+    extends: ["plugin:vue/essential", "eslint:recommended", "@vue/prettier"],
     parserOptions: {
         parser: "babel-eslint",
     },
+    rules: {
+        "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
+        "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+    },
+    overrides: [
+        {
+            files: [
+                "**/__tests__/*.{j,t}s?(x)",
+                "**/tests/unit/**/*.spec.{j,t}s?(x)",
+            ],
+            env: {
+                jest: true,
+            },
+        },
+    ],
 };
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,10 @@
 node_modules
 /dist
 
+/tests/e2e/videos/
+/tests/e2e/screenshots/
+
+
 # local env files
 .env.local
 .env.*.local
@@ -10,6 +14,7 @@ node_modules
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
 
 # Editor directories and files
 .idea
@@ -21,4 +26,4 @@ yarn-error.log*
 *.sw?
 
 #Electron-builder output
-/dist_electron
+/dist_electron
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.prettierignore b/.prettierignore
@@ -3,5 +3,6 @@ coverage
 dist
 docs
 node_modules
+tests
 .idea
 .github
diff --git a/.prettierrc b/.prettierrc
@@ -9,5 +9,6 @@
     "arrowParens": "always",
     "endOfLine": "lf",
     "bracketSpacing": true,
+    "proseWrap": "preserve",
     "htmlWhitespaceSensitivity": "strict"
 }
diff --git a/docs/.nojekyll b/docs/.nojekyll
diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1,4 @@
+# electron-vue-cloud-music
+
+> Electron+Vue+Ant Design Vue仿网易云音乐windows客户端实战项目
+
diff --git a/docs/_coverpage.md b/docs/_coverpage.md
@@ -0,0 +1,8 @@
+![logo](images/logo.png)
+
+# electron仿网易云音乐
+> Electron+Vue+Ant Design Vue仿网易云音乐windows客户端实战项目
+
+
+[GitHub](https://github.com/xiaozhu188/electron-vue-cloud-music)
+[Get Started](#electron-vue-cloud-music)
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
@@ -0,0 +1 @@
+* [首页](#electron-vue-cloud-music)
diff --git a/docs/images/logo.png b/docs/images/logo.png
diff --git a/docs/index.html b/docs/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>electron-vue-cloud-music - electron网易云音乐</title>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+  <meta name="description" content="electron网易云音乐">
+  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+  <link rel="stylesheet" href="//unpkg.com/docsify/lib/themes/vue.css">
+  <style>
+    img[alt="logo"] {
+      width: 100px;
+    }
+  </style>
+</head>
+<body>
+  <div id="app"></div>
+  <script>
+    window.$docsify = {
+      name: 'electron-vue-cloud-music',
+      loadSidebar: true,
+      coverpage: true,
+      repo: ''
+    }
+  </script>
+  <script src="//unpkg.com/docsify/lib/docsify.min.js"></script>
+</body>
+</html>
diff --git a/package.json b/package.json
@@ -17,7 +17,8 @@
     "major": "npm version major && git push origin master && git push origin --tags",
     "release": "vue-cli-service electron:build --publish always",
     "lint": "vue-cli-service lint",
-    "prettier": "npx prettier --write ./src ./test"
+    "prettier": "npx prettier --write ./src ./test",
+    "doc": "docsify serve docs"
   },
   "appId": "com.xiaozhu.cloudmusic",
   "main": "background.js",

diff --git a/src/main/main.js b/src/main/main.js
@@ -99,7 +99,7 @@ async function createWindow() {
         frame: process.platform !== "win32",
         show: true,
         backgroundColor: "#2e2c29",
-        hasShadow: process.platform === "darwin" ? false : true,
+        hasShadow: process.platform !== "darwin",
         webPreferences: {
             webSecurity: false,
             nodeIntegration: true,
@@ -114,11 +114,9 @@ async function createWindow() {
         // 去除原生顶部菜单栏
         mainWindow.setMenu(null);
         // 如果是windows系统模拟托盘菜单
-        if (process.platform === "win32") {
-            global.tray = createTray(Tray);
-            let trayBounds = global.tray.getBounds();
-            global.trayWindow = createTrayWindow(BrowserWindow, trayBounds);
-        }
+        global.tray = createTray(Tray);
+        let trayBounds = global.tray.getBounds();
+        global.trayWindow = createTrayWindow(BrowserWindow, trayBounds);
     }
 
     if (process.env.WEBPACK_DEV_SERVER_URL) {

diff --git a/src/main/modules/ipcEvent.js b/src/main/modules/ipcEvent.js
@@ -2,7 +2,6 @@ import { ipcMain, dialog, app, BrowserWindow, shell } from "electron";
 import path from "path";
 import createMiniWindow from "../windows/miniWindow";
 import createUpdateWindow from "./../windows/updateWindow";
-import { defaultDownloadFolder } from "../../renderer/config/downloadSettings";
 let { download } = require("electron-dl");
 let downloads = {};
 let updateWindow;
@@ -138,21 +137,18 @@ export default function () {
         }
     });
 
-    ipcMain.on("open-directory-dialog", (event) => {
-        dialog.showOpenDialog(
+    ipcMain.on("open-directory-dialog", async (event) => {
+        let res = await dialog.showOpenDialog(
             {
-                defaultPath: defaultDownloadFolder,
                 properties: ["openDirectory", "multiSelections"],
                 // filters: [
                 //   { name: 'Audio', extensions: ['mp3', 'wma'] }
                 // ]
-            },
-            function (files) {
-                if (files) {
-                    event.sender.send("selectedItem", files);
-                }
             }
         );
+        if (res.filePaths) {
+          event.sender.send("selectedItem", res.filePaths);
+        }
     });
 
     ipcMain.on("ondragstart", (event, e) => {

diff --git a/src/main/windows/miniWindow.js b/src/main/windows/miniWindow.js
@@ -20,6 +20,7 @@ const createMiniWindow = function (BrowserWindow) {
         closable: false,
         resizable: process.env.NODE_ENV === "development",
         // transparent: process.platform !== "linux",
+        hasShadow: process.platform !== "darwin",
         alwaysOnTop: true,
         webPreferences: {
             webSecurity: false,

diff --git a/src/renderer/components/BasicHeader/FrameActions.vue b/src/renderer/components/BasicHeader/FrameActions.vue
@@ -53,7 +53,6 @@ export default {
                 case "mini":
                     this.$electron.ipcRenderer.send("toggle-mini", {
                         value: true,
-                        storeState: this.$store.state,
                     });
                     break;
             }

diff --git a/src/renderer/components/BasicHeader/SeachBox.vue b/src/renderer/components/BasicHeader/SeachBox.vue
@@ -69,7 +69,7 @@
 import { getSearchHot, getSearchSuggest } from "@/api/search";
 import { debounce } from "@/utils/dom";
 import { normalSong } from "@/utils/song";
-import { mapGetters } from "vuex";
+import { mapGetters, mapState } from "vuex";
 import playMixin from "@/mixins/Play.js";
 
 export default {
@@ -92,7 +92,7 @@ export default {
         };
     },
     computed: {
-        ...mapGetters("Search", ["searchHistory"]),
+        ...mapState("Search", ["searchHistory"]),
         ...mapGetters("play", ["current_song"]),
         overlayStyle() {
             return this.keyword && this.suggests

diff --git a/src/renderer/components/BasicHeader/ThemeSetting.vue b/src/renderer/components/BasicHeader/ThemeSetting.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapState } from "vuex";
 import ZIcon from "@/components/ZIcon";
 import { colorList } from "@/config/config";
 import config from "@/config/defaultSettings";
@@ -50,7 +50,7 @@ export default {
         ZIcon,
     },
     computed: {
-        ...mapGetters("App", ["primaryColor"]),
+        ...mapState("App", ["primaryColor"]),
     },
     created() {
         console.log("__dirname", __dirname);

diff --git a/src/renderer/components/BasicHeader/index.vue b/src/renderer/components/BasicHeader/index.vue
@@ -50,8 +50,7 @@ export default {
         FrameActions,
     },
     computed: {
-        ...mapState("App", ["platform"]),
-        ...mapGetters("App", ["primaryColor"]),
+        ...mapState("App", ["platform", "primaryColor"]),
         ...mapGetters("User", ["userId"]),
         ...mapGetters("play", [
             "current_song",

diff --git a/src/renderer/components/BasicSider/index.vue b/src/renderer/components/BasicSider/index.vue
@@ -88,7 +88,7 @@ export default {
     watch: {
         userId(newVal) {
             if (newVal !== "") {
-                if (this.$store.state.App.isOnliline) {
+                if (this.$store.state.App.isOnline) {
                     this._getUserPlaylist(newVal);
                     this.$store.dispatch("User/getUserLikedSongs");
                 }
@@ -98,7 +98,7 @@ export default {
         },
     },
     created() {
-        if (this.userId && this.$store.state.App.isOnliline) {
+        if (this.userId && this.$store.state.App.isOnline) {
             this._getUserPlaylist(this.userId);
         }
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,6 @@ coverage @@
     dist
     docs
     node_modules
+    tests
     .idea
     .github
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@
		# electron-vue-cloud-music

		> Electron+Vue+Ant Design Vue仿网易云音乐windows客户端实战项目