diff --git a/.eslintrc.js b/.eslintrc.js index bf19e29..a236a54 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -43,6 +43,7 @@ module.exports = { 'import/no-extraneous-dependencies': 'off', 'import/prefer-default-export': 'off', 'prefer-promise-reject-errors': 'off', + 'max-len': 'off', // allow console.log during development only 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', diff --git a/quasar.conf.js b/quasar.conf.js index 54005e9..ac954c4 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -64,6 +64,14 @@ module.exports = function (ctx) { 'QSeparator', 'QChip', 'QTooltip', + 'QBar', + 'QSpace', + // table + 'QTable', + 'QTh', + 'QTr', + 'QTd', + 'QExpansionItem', ], directives: ['Ripple'], @@ -73,8 +81,8 @@ module.exports = function (ctx) { config: { loadingBar: { color: 'purple', - size: '10px', - position: 'top', + size: '5px', + position: 'bottom', skipHijack: true, }, }, diff --git a/src-electron/main-process/electron-main.js b/src-electron/main-process/electron-main.js index 6717238..a1112a1 100644 --- a/src-electron/main-process/electron-main.js +++ b/src-electron/main-process/electron-main.js @@ -22,6 +22,7 @@ function createWindow() { width: 1000, height: 600, useContentSize: true, + frame: false, webPreferences: { nodeIntegration: true, webSecurity: false, diff --git a/src/components/scrollWarp.vue b/src/components/scrollWarp.vue new file mode 100644 index 0000000..a5eb622 --- /dev/null +++ b/src/components/scrollWarp.vue @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/src/components/viewArea.vue b/src/components/viewArea.vue new file mode 100644 index 0000000..952c763 --- /dev/null +++ b/src/components/viewArea.vue @@ -0,0 +1,41 @@ + + + + + + + + + diff --git a/src/layouts/Home.vue b/src/layouts/Home.vue index 8b268ac..ebd87c0 100644 --- a/src/layouts/Home.vue +++ b/src/layouts/Home.vue @@ -7,6 +7,43 @@ elevated class="bg-primary text-white" > + + H + H-PLAYER + + + + + + + + + + - - H - + @@ -288,6 +319,29 @@ export default { this.$electronStore.clear(); this.$router.replace('/import'); }, + minimize() { + if (process.env.MODE === 'electron') { + this.$q.electron.remote.BrowserWindow.getFocusedWindow().minimize(); + } + }, + + maximize() { + if (process.env.MODE === 'electron') { + const win = this.$q.electron.remote.BrowserWindow.getFocusedWindow(); + + if (win.isMaximized()) { + win.unmaximize(); + } else { + win.maximize(); + } + } + }, + + closeApp() { + if (process.env.MODE === 'electron') { + this.$q.electron.remote.BrowserWindow.getFocusedWindow().close(); + } + }, }, computed: { ...mapGetters(['currentSite']), @@ -317,15 +371,14 @@ export default { diff --git a/src/layouts/Import.vue b/src/layouts/Import.vue index eaefe62..85d2aaf 100644 --- a/src/layouts/Import.vue +++ b/src/layouts/Import.vue @@ -2,15 +2,42 @@ - - - H - - + + H + H-PLAYER + + + + + + + + + @@ -80,6 +107,29 @@ export default { this.$router.push('/'); } }, + minimize() { + if (process.env.MODE === 'electron') { + this.$q.electron.remote.BrowserWindow.getFocusedWindow().minimize(); + } + }, + + maximize() { + if (process.env.MODE === 'electron') { + const win = this.$q.electron.remote.BrowserWindow.getFocusedWindow(); + + if (win.isMaximized()) { + win.unmaximize(); + } else { + win.maximize(); + } + } + }, + + closeApp() { + if (process.env.MODE === 'electron') { + this.$q.electron.remote.BrowserWindow.getFocusedWindow().close(); + } + }, }, }; diff --git a/src/pages/Video.vue b/src/pages/Video.vue index 394ac87..acfa1ea 100644 --- a/src/pages/Video.vue +++ b/src/pages/Video.vue @@ -1,41 +1,107 @@ - - - - - - - + + + + + + + + + 演员: {{currentVideo.actor}} + 地区: {{currentVideo.area}} + 简介: {{currentVideo.des}} + 导演: {{currentVideo.director}} + 语言: {{currentVideo.lang}} + 时间: {{currentVideo.last}} + 备注: {{currentVideo.note}} + + 图片: + + + 评分: {{currentVideo.state}} + 类型: {{currentVideo.type}} + 年份: {{currentVideo.year}} + + + + + + 正在播放 + + + + + + + + + + + diff --git a/src/pages/VideoList.vue b/src/pages/VideoList.vue index b485cca..ec3c4d7 100644 --- a/src/pages/VideoList.vue +++ b/src/pages/VideoList.vue @@ -1,71 +1,77 @@ - - - - - + + + + - {{video.name}} - - - Cannot load image - {{video.name}} + + {{video.name}} + + + Cannot load image + {{video.name}} + + + + + + {{video.name}} + {{video.name}} - - - - - {{video.name}} - {{video.name}} - - {{video.type}} - {{video.last}} - - - - - - - - - - + {{video.type}} + {{video.last}} + + + + + + + + + + +