From 307391da4d23486c5f7b3d9aca9a190b31560327 Mon Sep 17 00:00:00 2001
From: hunlongyu <hunlongyu@gmail.com>
Date: Sat, 18 Apr 2020 11:13:47 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9A=20Mini=20=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0,=E5=BE=85=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                 |  2 --
 src/App.vue                  | 38 ++++++++++++++++++++++++-
 src/background.js            | 41 +++++++++++++++------------
 src/main.js                  |  2 --
 src/{views => mini}/Mini.vue |  0
 src/mini/main.js             |  8 ++++++
 src/router/index.js          | 25 -----------------
 src/views/Home.vue           | 54 ------------------------------------
 vue.config.js                |  4 +++
 yarn.lock                    |  7 +----
 10 files changed, 73 insertions(+), 108 deletions(-)
 rename src/{views => mini}/Mini.vue (100%)
 create mode 100644 src/mini/main.js
 delete mode 100644 src/router/index.js
 delete mode 100644 src/views/Home.vue

diff --git a/package.json b/package.json
index 3e3f320..308bb05 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
     "qrcode.vue": "^1.7.0",
     "vue": "^2.6.11",
     "vue-i18n": "^8.17.0",
-    "vue-router": "^3.1.6",
     "vuex": "^3.1.3",
     "xgplayer": "^2.6.14",
     "xgplayer-hls.js": "^2.1.6"
@@ -32,7 +31,6 @@
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.3.0",
     "@vue/cli-plugin-eslint": "~4.3.0",
-    "@vue/cli-plugin-router": "~4.3.0",
     "@vue/cli-plugin-vuex": "~4.3.0",
     "@vue/cli-service": "~4.3.0",
     "@vue/eslint-config-standard": "^5.1.2",
diff --git a/src/App.vue b/src/App.vue
index 72499a4..6aa1f3e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,19 @@
 <template>
   <div id="app" :class="appTheme">
-    <router-view/>
+    <Aside />
+    <div class="body">
+      <Frame />
+      <Film v-show="view === 'Film'" />
+      <Play v-show="view === 'Play'" />
+      <Star v-show="view === 'Star'" />
+      <Setting v-show="view === 'Setting'" />
+    </div>
+    <transition name="slide">
+      <Detail v-if="detail.show"/>
+    </transition>
+    <transition name="slide">
+      <Share v-if="share.show"/>
+    </transition>
   </div>
 </template>
 <script>
@@ -12,6 +25,15 @@ export default {
     }
   },
   computed: {
+    view () {
+      return this.$store.getters.getView
+    },
+    detail () {
+      return this.$store.getters.getDetail
+    },
+    share () {
+      return this.$store.getters.getShare
+    },
     theme () {
       return this.$store.getters.getTheme
     }
@@ -39,6 +61,20 @@ html, body, #app{
   font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', SimSun, sans-serif;
   -webkit-font-smoothing: antialiased;
   -webkit-tap-highlight-color: transparent;
+  width: 100%;
+  height: 100%;
   overflow: hidden;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  .body{
+    flex: 1;
+    height: 100%;
+    display: flex;
+    justify-content: flex-start;
+    align-items: flex-start;
+    flex-direction: column;
+    padding: 0 20px 20px;
+  }
 }
 </style>
diff --git a/src/background.js b/src/background.js
index 1816604..2a61a65 100644
--- a/src/background.js
+++ b/src/background.js
@@ -16,7 +16,6 @@ let mini
 protocol.registerSchemesAsPrivileged([{ scheme: 'app', privileges: { secure: true, standard: true } }])
 
 function createWindow () {
-  // Create the browser window.
   win = new BrowserWindow({
     width: 1680,
     height: 720,
@@ -30,12 +29,9 @@ function createWindow () {
   })
 
   if (process.env.WEBPACK_DEV_SERVER_URL) {
-    // Load the url of the dev server if in development mode
     win.loadURL(process.env.WEBPACK_DEV_SERVER_URL)
     if (!process.env.IS_TEST) win.webContents.openDevTools()
   } else {
-    createProtocol('app')
-    // Load the index.html when not in development
     win.loadURL('app://./index.html')
   }
 
@@ -46,24 +42,26 @@ function createWindow () {
 
 function createMini () {
   mini = new BrowserWindow({
-    // width: 540,
-    // height: 360,
-    width: 980,
-    height: 720,
-    frame: true,
+    width: 1140,
+    height: 360,
+    frame: false,
     resizable: true,
     transparent: false,
     webPreferences: {
-      webSecurity: false
-    },
-    parent: win,
-    modal: true,
-    show: false
+      webSecurity: false,
+      nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION
+    }
   })
-  mini.loadURL('http://localhost:8080/#/mini')
-  // mini.show()
-  mini.once('ready-to-show', () => {
-    mini.show()
+
+  if (process.env.WEBPACK_DEV_SERVER_URL) {
+    mini.loadURL(process.env.WEBPACK_DEV_SERVER_URL + 'mini')
+    if (!process.env.IS_TEST) mini.webContents.openDevTools()
+  } else {
+    mini.loadURL('app://./mini.html')
+  }
+
+  mini.on('closed', () => {
+    mini = null
   })
 }
 
@@ -79,6 +77,9 @@ app.on('activate', () => {
   if (win === null) {
     createWindow()
   }
+  if (mini === null) {
+    createMini()
+  }
 })
 
 ipcMain.on('min', () => {
@@ -109,7 +110,11 @@ ipcMain.on('mini', () => {
 })
 
 app.on('ready', async () => {
+  if (!process.env.WEBPACK_DEV_SERVER_URL) {
+    createProtocol('app')
+  }
   createWindow()
+  createMini()
 })
 
 // Exit cleanly on request from parent process in development mode.
diff --git a/src/main.js b/src/main.js
index 33648a6..7770682 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,5 @@
 import Vue from 'vue'
 import App from './App.vue'
-import router from './router'
 import store from './store'
 import 'modern-normalize'
 import Register from './components/register'
@@ -21,7 +20,6 @@ const i18n = new VueI18n({
 })
 
 new Vue({
-  router,
   store,
   i18n,
   render: h => h(App)
diff --git a/src/views/Mini.vue b/src/mini/Mini.vue
similarity index 100%
rename from src/views/Mini.vue
rename to src/mini/Mini.vue
diff --git a/src/mini/main.js b/src/mini/main.js
new file mode 100644
index 0000000..3c40040
--- /dev/null
+++ b/src/mini/main.js
@@ -0,0 +1,8 @@
+import Vue from 'vue'
+import Mini from './Mini'
+
+Vue.config.productionTip = false
+
+new Vue({
+  render: h => h(Mini)
+}).$mount('#app')
diff --git a/src/router/index.js b/src/router/index.js
deleted file mode 100644
index d9bc723..0000000
--- a/src/router/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
-import Home from '../views/Home.vue'
-import Mini from '../views/Mini.vue'
-
-Vue.use(VueRouter)
-
-const routes = [
-  {
-    path: '/',
-    name: 'Home',
-    component: Home
-  },
-  {
-    path: '/mini',
-    name: 'Mini',
-    component: Mini
-  }
-]
-
-const router = new VueRouter({
-  routes
-})
-
-export default router
diff --git a/src/views/Home.vue b/src/views/Home.vue
deleted file mode 100644
index 5a424e9..0000000
--- a/src/views/Home.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-  <div class="home">
-    <Aside />
-    <div class="body">
-      <Frame />
-      <Film v-show="view === 'Film'" />
-      <Play v-show="view === 'Play'" />
-      <Star v-show="view === 'Star'" />
-      <Setting v-show="view === 'Setting'" />
-    </div>
-    <transition name="slide">
-      <Detail v-if="detail.show"/>
-    </transition>
-    <transition name="slide">
-      <Share v-if="share.show"/>
-    </transition>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Home',
-  computed: {
-    view () {
-      return this.$store.getters.getView
-    },
-    detail () {
-      return this.$store.getters.getDetail
-    },
-    share () {
-      return this.$store.getters.getShare
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.home{
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  .body{
-    flex: 1;
-    height: 100%;
-    display: flex;
-    justify-content: flex-start;
-    align-items: flex-start;
-    flex-direction: column;
-    padding: 0 20px 20px;
-  }
-}
-</style>
diff --git a/vue.config.js b/vue.config.js
index b382d83..8e718e8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,8 @@
 module.exports = {
+  pages: {
+    index: 'src/main.js',
+    mini: 'src/mini/main.js'
+  },
   pluginOptions: {
     electronBuilder: {
       nodeIntegration: true
diff --git a/yarn.lock b/yarn.lock
index bef0a2c..6783723 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1174,7 +1174,7 @@
     webpack "^4.0.0"
     yorkie "^2.0.0"
 
-"@vue/cli-plugin-router@^4.3.1", "@vue/cli-plugin-router@~4.3.0":
+"@vue/cli-plugin-router@^4.3.1":
   version "4.3.1"
   resolved "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.3.1.tgz#0ba589f4e9a1f3e64a8ff6ccd92f7ce2845586bf"
   integrity sha512-m0ntr5R6q62oNMODgoyHAVAd/sDtsH15GdBrScZsPNeyHxmzmNBDlsNM38yYGGY064zDRRWif15d1yaTREybrA==
@@ -9689,11 +9689,6 @@ vue-loader@^15.9.1:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
-vue-router@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz#45f5a3a3843e31702c061dd829393554e4328f89"
-  integrity sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA==
-
 vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
   version "4.1.2"
   resolved "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"