From 452f4e69fd3d35edc592dc7355599b6634c42019 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 9 Jan 2020 21:07:59 +0700 Subject: [PATCH 001/158] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=D0=B0=20=D0=BE=D1=82?= =?UTF-8?q?=20Element-UI=20=D0=BD=D0=B0=20Quasar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reader/ProgressPage/ProgressPage.vue | 18 ++++++++++++++++-- client/main.js | 1 + client/quasar.js | 19 +++++++++++++++++++ package-lock.json | 5 +++++ package.json | 1 + 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 client/quasar.js diff --git a/client/components/Reader/ProgressPage/ProgressPage.vue b/client/components/Reader/ProgressPage/ProgressPage.vue index 0ac1a0bc..9059422d 100644 --- a/client/components/Reader/ProgressPage/ProgressPage.vue +++ b/client/components/Reader/ProgressPage/ProgressPage.vue @@ -1,7 +1,21 @@ @@ -92,4 +76,8 @@ class HelpPage extends Vue { diff --git a/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue b/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue index 9761bf96..b8b5f3b5 100644 --- a/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue +++ b/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue @@ -62,6 +62,7 @@ class VersionHistoryPage extends Vue { overflow-y: auto; font-size: 120%; line-height: 130%; + position: relative; } h4 { diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue index 1d4e8324..ab7b4549 100644 --- a/client/components/share/Window.vue +++ b/client/components/share/Window.vue @@ -120,6 +120,15 @@ class Window extends Vue { z-index: 50; } +.xyfit { + height: 100%; + width: 100%; +} + +.flexfit { + flex: 1; +} + .window { margin: 10px; background-color: #ffffff; diff --git a/client/quasar.js b/client/quasar.js index 494bc01d..dd5f586b 100644 --- a/client/quasar.js +++ b/client/quasar.js @@ -19,7 +19,7 @@ import {QIcon} from 'quasar/src/components/icon'; import {QSlider} from 'quasar/src/components/slider'; //import {QTabs} from 'quasar/src/components/tabs'; //import {QTab} from 'quasar/src/components/tab'; -import {QTabPanels, QTabPanel} from 'quasar/src/components/tab-panels'; +//import {QTabPanels, QTabPanel} from 'quasar/src/components/tab-panels'; import {QSeparator} from 'quasar/src/components/separator'; import {QList, QItem, QItemSection, QItemLabel} from 'quasar/src/components/item'; import {QTooltip} from 'quasar/src/components/tooltip'; @@ -34,8 +34,7 @@ const components = { QSlider, //QTabs, //QTab - QTabPanels, - QTabPanel, + //QTabPanels, QTabPanel, QSeparator, QList, QItem, QItemSection, QItemLabel, QTooltip, From 2e66134bf8344e19a32687be39dc3316e789ea86 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Mon, 3 Feb 2020 01:10:58 +0700 Subject: [PATCH 036/158] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20quasar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/share/Window.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue index ab7b4549..6999a2e4 100644 --- a/client/components/share/Window.vue +++ b/client/components/share/Window.vue @@ -117,6 +117,7 @@ class Window extends Vue { diff --git a/client/components/Reader/HelpPage/MouseHelpPage/MouseHelpPage.vue b/client/components/Reader/HelpPage/MouseHelpPage/MouseHelpPage.vue index d85abf36..b50597bf 100644 --- a/client/components/Reader/HelpPage/MouseHelpPage/MouseHelpPage.vue +++ b/client/components/Reader/HelpPage/MouseHelpPage/MouseHelpPage.vue @@ -1,6 +1,6 @@ @@ -39,7 +43,9 @@ export default @Component({ }, foundText: function(newValue) { - this.$refs.input.style.paddingRight = (10 + newValue.length*12) + 'px'; + const el = this.$refs.input.$el.querySelector('label div div div input'); + if (el) + el.style.paddingRight = newValue.length*12 + 'px'; }, }, }) @@ -194,17 +200,18 @@ class SearchPage extends Vue { } .button-group { - width: 150px; + width: 120px; margin: 0; padding: 0; + height: 37px; } -.el-button { +.button { padding: 9px 17px 9px 17px; - width: 55px; + width: 60px; } -i { - font-size: 20px; +.icon { + top: -8px; } \ No newline at end of file diff --git a/client/quasar.js b/client/quasar.js index 003cd977..f7e9ae5f 100644 --- a/client/quasar.js +++ b/client/quasar.js @@ -14,6 +14,7 @@ const config = {}; import {QCircularProgress} from 'quasar/src/components/circular-progress'; import {QInput} from 'quasar/src/components/input'; import {QBtn} from 'quasar/src/components/btn'; +import {QBtnGroup} from 'quasar/src/components/btn-group'; import {QBtnToggle} from 'quasar/src/components/btn-toggle'; import {QIcon} from 'quasar/src/components/icon'; import {QSlider} from 'quasar/src/components/slider'; @@ -32,6 +33,7 @@ const components = { QCircularProgress, QInput, QBtn, + QBtnGroup, QBtnToggle, QIcon, QSlider, From b784d277e40fa547f6112086ebad5c41ea3a21e7 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 12:29:54 +0700 Subject: [PATCH 054/158] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D1=88=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/Reader.vue | 10 ++++++++-- .../Reader/RecentBooksPage/RecentBooksPage.vue | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index e7517c96..4772d8d2 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -82,7 +82,7 @@ @stop-text-search="stopTextSearch"> - + @@ -342,7 +342,7 @@ class Reader extends Vue { const showButtonCount = Object.values(this.showToolButton).reduce((a, b) => a + (b ? 1 : 0), 0); if (this.$refs.buttons) this.$refs.buttons.style.minWidth = 65*showButtonCount + 'px'; - (async () => { + (async() => { await utils.sleep(1000); if (this.$refs.header) this.$refs.header.style.overflowX = 'auto'; @@ -682,6 +682,10 @@ class Reader extends Vue { } } + recentBooksClose() { + this.recentBooksActive = false; + } + recentBooksToggle() { this.recentBooksActive = !this.recentBooksActive; if (this.recentBooksActive) { @@ -916,6 +920,8 @@ class Reader extends Vue { return; } + this.closeAllTextPages(); + let url = encodeURI(decodeURI(opts.url)); if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) && diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue index 312f5020..2a6cee37 100644 --- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue +++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue @@ -315,7 +315,7 @@ class RecentBooksPage extends Vue { } close() { - this.$emit('recent-books-toggle'); + this.$emit('recent-books-close'); } keyHook(event) { From 43e27a7e683e7d3c058fca9975f3beafbcc39283 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 13:08:49 +0700 Subject: [PATCH 055/158] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20quasar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/App.vue | 5 ++++ .../components/Reader/TextPage/TextPage.vue | 21 +++++--------- client/components/share/notify.js | 28 +++++++++++++++---- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/client/components/App.vue b/client/components/App.vue index 512f1d2d..f81b9f21 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -257,6 +257,11 @@ body, html, #app { border: 2px solid yellow; } +.icon-rotate { + vertical-align: middle; + animation: rotating 2s linear infinite; +} + @font-face { font-family: 'ReaderDefault'; src: url('fonts/reader-default.woff') format('woff'), diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index 27fff390..7f4e5b1b 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -38,8 +38,9 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import {loadCSS} from 'fg-loadcss'; import _ from 'lodash'; -import {sleep} from '../../../share/utils'; +import * as notify from '../../share/notify'; +import {sleep} from '../../../share/utils'; import bookManager from '../share/bookManager'; import DrawHelper from './DrawHelper'; import rstore from '../../../store/modules/reader'; @@ -281,16 +282,11 @@ class TextPage extends Vue { async loadFonts() { this.fontsLoading = true; - let inst = null; + let close = null; (async() => { await sleep(500); if (this.fontsLoading) - inst = this.$notify({ - title: '', - dangerouslyUseHTMLString: true, - message: 'Загрузка шрифта  ', - duration: 0 - }); + close = notify.info(this, 'Загрузка шрифта  grade'); })(); if (!this.fontsLoaded) @@ -305,15 +301,12 @@ class TextPage extends Vue { try { await this.checkLoadedFonts(); } catch (e) { - this.$notify.error({ - title: 'Ошибка загрузки', - message: 'Некоторые шрифты не удалось загрузить' - }); + notify.error(this, 'Некоторые шрифты не удалось загрузить', 'Ошибка загрузки'); } this.fontsLoading = false; - if (inst) - inst.close(); + if (close) + close(); } getSettings() { diff --git a/client/components/share/notify.js b/client/components/share/notify.js index 869921c0..5b5ff0b7 100644 --- a/client/components/share/notify.js +++ b/client/components/share/notify.js @@ -1,6 +1,6 @@ export function success(vue, message, caption) { - caption = (caption ? `
${caption}

` : ''); - vue.$q.notify({ + caption = (caption ? `
${caption}

` : ''); + return vue.$q.notify({ position: 'top-right', color: 'positive', textColor: 'white', @@ -17,8 +17,8 @@ export function success(vue, message, caption) { } export function error(vue, message, caption) { - caption = (caption ? `
${caption}

` : ''); - vue.$q.notify({ + caption = (caption ? `
${caption}

` : ''); + return vue.$q.notify({ position: 'top-right', color: 'negative', textColor: 'white', @@ -32,4 +32,22 @@ export function error(vue, message, caption) {
${message}
` }); -} \ No newline at end of file +} + +export function info(vue, message, caption) { + caption = (caption ? `
${caption}

` : ''); + return vue.$q.notify({ + position: 'top-right', + color: 'info', + textColor: 'white', + icon: 'o_notifications', + actions: [{icon: 'o_close', color: 'black'}], + html: true, + + message: + `
+ ${caption} +
${message}
+
` + }); +} From 8abe71a0fe395b949682995b482184a502c12480 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 13:30:48 +0700 Subject: [PATCH 056/158] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D0=B7=D0=B0=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D1=88=D1=80=D0=B8=D1=84=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/TextPage/TextPage.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index 7f4e5b1b..857ba7ef 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -273,9 +273,7 @@ class TextPage extends Vue { async checkLoadedFonts() { let loaded = await Promise.all(this.fontList.map(font => document.fonts.check(font))); if (loaded.some(r => !r)) { - loaded = await Promise.all(this.fontList.map(font => document.fonts.load(font))); - if (loaded.some(r => !r.length)) - throw new Error('some font not loaded'); + await Promise.all(this.fontList.map(font => document.fonts.load(font))); } } From 131ddf0355298bc8799fb86d3676ff257ee25022 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 13:37:52 +0700 Subject: [PATCH 057/158] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=86=D0=B2=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/share/Window.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue index 6999a2e4..7ff5e51d 100644 --- a/client/components/share/Window.vue +++ b/client/components/share/Window.vue @@ -147,7 +147,7 @@ class Window extends Vue { .header-text { margin-left: 10px; margin-right: 10px; - color: #E8E8E8; + color: yellow;/*#E8E8E8;*/ text-shadow: 2px 1px 5px black, 2px 2px 5px black; } From 9ea0a0e214636c1da3bbbc077d126fa53b57f30a Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 13:39:46 +0700 Subject: [PATCH 058/158] =?UTF-8?q?=D0=9A=20=D0=BF=D1=80=D0=B5=D0=B4=D1=8B?= =?UTF-8?q?=D0=B4=D1=83=D1=89=D0=B5=D0=BC=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/share/Window.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue index 7ff5e51d..771c9350 100644 --- a/client/components/share/Window.vue +++ b/client/components/share/Window.vue @@ -147,7 +147,7 @@ class Window extends Vue { .header-text { margin-left: 10px; margin-right: 10px; - color: yellow;/*#E8E8E8;*/ + color: yellow; text-shadow: 2px 1px 5px black, 2px 2px 5px black; } From d9ab3543386a37cc269f81f050945b84b90af9f1 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 14:36:45 +0700 Subject: [PATCH 059/158] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D1=88=D0=B0=D1=8F=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/Reader.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 4772d8d2..b97aa182 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -602,7 +602,8 @@ class Reader extends Vue { setPositionToggle() { this.setPositionActive = !this.setPositionActive; - if (this.setPositionActive && this.activePage == 'TextPage' && this.mostRecentBook()) { + const page = this.$refs.page; + if (this.setPositionActive && this.activePage == 'TextPage' && page.parsed) { this.closeAllTextPages(); this.setPositionActive = true; From e388e2a1c77164f3a51b888dc613cb8e01a55229 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 16:16:31 +0700 Subject: [PATCH 060/158] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/CardIndex/CardIndex.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/CardIndex/CardIndex.vue b/client/components/CardIndex/CardIndex.vue index f471e349..264c1c7d 100644 --- a/client/components/CardIndex/CardIndex.vue +++ b/client/components/CardIndex/CardIndex.vue @@ -12,7 +12,7 @@ import Vue from 'vue'; import Component from 'vue-class-component'; import _ from 'lodash'; -const rootRoute = '/cardindex'; +const selfRoute = '/cardindex'; const tab2Route = [ '/cardindex/search', '/cardindex/card', @@ -45,7 +45,7 @@ class CardIndex extends Vue { if (t !== this.selectedTab) this.selectedTab = t.toString(); } else { - if (route == rootRoute && lastActiveTab !== null) + if (route == selfRoute && lastActiveTab !== null) this.setRouteByTab(lastActiveTab); } } From d0891fb65239d30c4f430791eed47c9617ec27de Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 16:29:10 +0700 Subject: [PATCH 061/158] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D0=B2=D1=8B=D1=87?= =?UTF-8?q?=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20rootRoute?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/App.vue | 17 +++++++++++++---- client/components/Reader/Reader.vue | 6 +++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/client/components/App.vue b/client/components/App.vue index f81b9f21..799234d1 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -90,6 +90,18 @@ class App extends Vue { this.uistate = this.$store.state.uistate; this.config = this.$store.state.config; + //root route + let cachedRoute = ''; + let cachedPath = ''; + this.$root.rootRoute = () => { + if (this.$route.path != cachedPath) { + cachedPath = this.$route.path; + const m = cachedPath.match(/^(\/[^/]*).*$/i); + cachedRoute = (m ? m[1] : this.$route.path); + } + return cachedRoute; + } + // set-app-title this.$root.$on('set-app-title', this.setAppTitle); @@ -178,10 +190,7 @@ class App extends Vue { } get rootRoute() { - const m = this.$route.path.match(/^(\/[^/]*).*$/i); - this.$root.rootRoute = (m ? m[1] : this.$route.path); - - return this.$root.rootRoute; + return this.$root.rootRoute(); } setAppTitle(title) { diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index b97aa182..cc2543cc 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -302,8 +302,8 @@ class Reader extends Vue { (async() => { await bookManager.init(this.settings); bookManager.addEventListener(this.bookManagerEvent); - - if (this.$root.rootRoute == '/reader') { + + if (this.$root.rootRoute() == '/reader') { if (this.routeParamUrl) { await this.loadBook({url: this.routeParamUrl, bookPos: this.routeParamPos, force: this.routeParamRefresh}); } else { @@ -1086,7 +1086,7 @@ class Reader extends Vue { } keyHook(event) { - if (this.$root.rootRoute == '/reader') { + if (this.$root.rootRoute() == '/reader') { let handled = false; if (!handled && this.helpActive) handled = this.$refs.helpPage.keyHook(event); From 9774fc4f658f3794ed6d7c8c2c4cd587dafb0342 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 19:17:43 +0700 Subject: [PATCH 062/158] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D1=88=D0=B8=D0=B5=20=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Reader/SearchPage/SearchPage.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client/components/Reader/SearchPage/SearchPage.vue b/client/components/Reader/SearchPage/SearchPage.vue index 93ec850c..d0ef2f60 100644 --- a/client/components/Reader/SearchPage/SearchPage.vue +++ b/client/components/Reader/SearchPage/SearchPage.vue @@ -13,7 +13,7 @@ :value="needle" @input="needle = $event.target.value"/-->
{{ foundText }}
@@ -43,6 +43,7 @@ export default @Component({ }, foundText: function(newValue) { + //недостатки сторонних ui const el = this.$refs.input.$el.querySelector('label div div div input'); if (el) el.style.paddingRight = newValue.length*12 + 'px'; @@ -166,12 +167,13 @@ class SearchPage extends Vue { this.$emit('search-toggle'); } - keyHook(event) { - //недостатки сторонних ui - if (document.activeElement === this.$refs.input && event.type == 'keydown' && event.key == 'Enter') { + inputKeyDown(event) { + if (event.key == 'Enter') { this.showNext(); } + } + keyHook(event) { if (event.type == 'keydown' && (event.code == 'Escape')) { this.close(); } @@ -200,7 +202,7 @@ class SearchPage extends Vue { } .button-group { - width: 120px; + width: 100px; margin: 0; padding: 0; height: 37px; @@ -208,10 +210,10 @@ class SearchPage extends Vue { .button { padding: 9px 17px 9px 17px; - width: 60px; + width: 50px; } .icon { - top: -8px; + top: -9px; } \ No newline at end of file From 5ae87c8e03bb444b9f3a0913b84ca1e8e733f00d Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 19:45:06 +0700 Subject: [PATCH 063/158] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/share/notify.js | 58 ++++++++++++------------------- 1 file changed, 22 insertions(+), 36 deletions(-) diff --git a/client/components/share/notify.js b/client/components/share/notify.js index 5b5ff0b7..de7c81cc 100644 --- a/client/components/share/notify.js +++ b/client/components/share/notify.js @@ -1,53 +1,39 @@ -export function success(vue, message, caption) { - caption = (caption ? `
${caption}

` : ''); +export function notify(vue, opts) { + let { + caption = null, + captionColor = 'black', + color = 'positive', + icon = '', + iconColor = 'white', + message = '', + messageColor = 'black', + } = opts; + + caption = (caption ? `
${caption}

` : ''); return vue.$q.notify({ position: 'top-right', - color: 'positive', - textColor: 'white', - icon: 'o_check_circle', + color, + textColor: iconColor, + icon, actions: [{icon: 'o_close', color: 'black'}], html: true, message: `
${caption} -
${message}
+
${message}
` }); } +export function success(vue, message, caption) { + notify(vue, {color: 'positive', icon: 'o_check_circle', message, caption}); +} + export function error(vue, message, caption) { - caption = (caption ? `
${caption}

` : ''); - return vue.$q.notify({ - position: 'top-right', - color: 'negative', - textColor: 'white', - icon: 'o_error_outline', - actions: [{icon: 'o_close', color: 'black'}], - html: true, - - message: - `
- ${caption} -
${message}
-
` - }); + notify(vue, {color: 'negative', icon: 'o_error_outline', messageColor: 'yellow', message, caption}); } export function info(vue, message, caption) { - caption = (caption ? `
${caption}

` : ''); - return vue.$q.notify({ - position: 'top-right', - color: 'info', - textColor: 'white', - icon: 'o_notifications', - actions: [{icon: 'o_close', color: 'black'}], - html: true, - - message: - `
- ${caption} -
${message}
-
` - }); + notify(vue, {color: 'info', icon: 'o_notifications', message, caption}); } From ca036b6676d0a6c54ca86bfb238ce7649b730121 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 4 Feb 2020 19:51:19 +0700 Subject: [PATCH 064/158] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BA=D0=BE=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=B1=D1=83=D1=84=D0=B5=D1=80=20?= =?UTF-8?q?=D0=BE=D0=B1=D0=BC=D0=B5=D0=BD=D0=B0,=20=D0=BF=D0=BE=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D1=82=D0=B5=D0=BA=D1=81=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HelpPage/CommonHelpPage/CommonHelpPage.vue | 17 +++++++++-------- .../HelpPage/DonateHelpPage/DonateHelpPage.vue | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue index 7100d0fb..d4880edf 100644 --- a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue +++ b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue @@ -3,10 +3,10 @@ Возможности читалки:
  • загрузка любой страницы интернета
    • +
  • синхронизация данных (настроек и читаемых книг) между различными устройствами
  • работа в автономном режиме (без связи)
  • изменение цвета фона, текста, размер и тип шрифта и прочее
  • установка и запоминание текущей позиции и настроек в браузере и на сервере
    • -
  • синхронизация данных (настроек и читаемых книг) между различными устройствами
  • кэширование файлов книг на клиенте и на сервере
  • открытие книг с локального диска
  • плавный скроллинг текста
    • @@ -25,10 +25,10 @@

    Вы можете добавить в свой браузер закладку, указав в ее свойствах вместо адреса следующий код:
    javascript:location.href='https://omnireader.ru/?url='+location.href; -   - - (скопировать) - + + Скопировать + +
    или перетащив на панель закладок следующую ссылку:
    Omni Reader
    Тогда, активировав получившуюся закладку на любой странице интернета, вы автоматически загрузите эту страницу в Omni Reader. @@ -77,9 +77,10 @@ class CommonHelpPage extends Vue { line-height: 130%; } -.clickable { - color: blue; - text-decoration: underline; +.copy-icon { + margin-left: 10px; cursor: pointer; + font-size: 120%; + color: blue; } diff --git a/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue b/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue index 4158dcfa..380d0ce4 100644 --- a/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue +++ b/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue @@ -113,5 +113,6 @@ class DonateHelpPage extends Vue { margin-left: 10px; cursor: pointer; font-size: 120%; + color: blue; } From c7dbe8599d95437af2b0bd147be358e95abfacde Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 5 Feb 2020 14:20:46 +0700 Subject: [PATCH 065/158] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B2=D0=B8=D0=B4=D0=B0=20=D1=81=D0=BB=D0=B0?= =?UTF-8?q?=D0=B9=D0=B4=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reader/SetPositionPage/SetPositionPage.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/client/components/Reader/SetPositionPage/SetPositionPage.vue b/client/components/Reader/SetPositionPage/SetPositionPage.vue index ad8e6f6a..03877dc6 100644 --- a/client/components/Reader/SetPositionPage/SetPositionPage.vue +++ b/client/components/Reader/SetPositionPage/SetPositionPage.vue @@ -4,8 +4,9 @@ Установить позицию -

    +
    + + \ No newline at end of file From 3c09f6ca55885a8d77e982402d5c392e338dcd25 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 5 Feb 2020 14:21:50 +0700 Subject: [PATCH 066/158] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20quasar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/RecentBooksPage/RecentBooksPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue index 2a6cee37..68d77857 100644 --- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue +++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue @@ -2,7 +2,7 @@ From 74ccd4a0013c460b0decb6d1c710640193a76233 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 5 Feb 2020 15:27:26 +0700 Subject: [PATCH 067/158] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8=20?= =?UTF-8?q?line-awesome?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonHelpPage/CommonHelpPage.vue | 2 +- .../DonateHelpPage/DonateHelpPage.vue | 8 +++---- .../Reader/LoaderPage/LoaderPage.vue | 2 +- client/components/Reader/Reader.vue | 24 +++++++++---------- .../Reader/SearchPage/SearchPage.vue | 8 ++----- .../components/Reader/TextPage/TextPage.vue | 2 +- client/components/share/Window.vue | 2 +- client/components/share/notify.js | 8 +++---- client/quasar.js | 6 ++++- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue index d4880edf..4e0ea557 100644 --- a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue +++ b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue @@ -25,7 +25,7 @@

    Вы можете добавить в свой браузер закладку, указав в ее свойствах вместо адреса следующий код:
    javascript:location.href='https://omnireader.ru/?url='+location.href; - + Скопировать diff --git a/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue b/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue index 380d0ce4..044cff35 100644 --- a/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue +++ b/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue @@ -6,7 +6,7 @@ Пожертвовать

    {{ yandexAddress }} - + Скопировать
    @@ -15,7 +15,7 @@
    {{ bitcoinAddress }} - + Скопировать
    @@ -24,7 +24,7 @@
    {{ litecoinAddress }} - + Скопировать
    @@ -33,7 +33,7 @@
    {{ moneroAddress }} - + Скопировать
    diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index fb4e25fb..10014025 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -14,7 +14,7 @@
    diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index cc2543cc..8efe6831 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -3,57 +3,57 @@
    diff --git a/client/components/Reader/SearchPage/SearchPage.vue b/client/components/Reader/SearchPage/SearchPage.vue index d0ef2f60..08396b88 100644 --- a/client/components/Reader/SearchPage/SearchPage.vue +++ b/client/components/Reader/SearchPage/SearchPage.vue @@ -18,8 +18,8 @@
    {{ foundText }}
    - - + +
    @@ -212,8 +212,4 @@ class SearchPage extends Vue { padding: 9px 17px 9px 17px; width: 50px; } - -.icon { - top: -9px; -} \ No newline at end of file diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index 857ba7ef..38c64827 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -284,7 +284,7 @@ class TextPage extends Vue { (async() => { await sleep(500); if (this.fontsLoading) - close = notify.info(this, 'Загрузка шрифта  grade'); + close = notify.info(this, 'Загрузка шрифта  '); })(); if (!this.fontsLoaded) diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue index 771c9350..af8be10c 100644 --- a/client/components/share/Window.vue +++ b/client/components/share/Window.vue @@ -5,7 +5,7 @@
    - +
    diff --git a/client/components/share/notify.js b/client/components/share/notify.js index de7c81cc..e9b8a13a 100644 --- a/client/components/share/notify.js +++ b/client/components/share/notify.js @@ -15,7 +15,7 @@ export function notify(vue, opts) { color, textColor: iconColor, icon, - actions: [{icon: 'o_close', color: 'black'}], + actions: [{icon: 'la la-times', color: 'black'}], html: true, message: @@ -27,13 +27,13 @@ export function notify(vue, opts) { } export function success(vue, message, caption) { - notify(vue, {color: 'positive', icon: 'o_check_circle', message, caption}); + notify(vue, {color: 'positive', icon: 'la la-check-circle', message, caption}); } export function error(vue, message, caption) { - notify(vue, {color: 'negative', icon: 'o_error_outline', messageColor: 'yellow', message, caption}); + notify(vue, {color: 'negative', icon: 'la la-exclamation-circle', messageColor: 'yellow', message, caption}); } export function info(vue, message, caption) { - notify(vue, {color: 'info', icon: 'o_notifications', message, caption}); + notify(vue, {color: 'info', icon: 'la la-bell', message, caption}); } diff --git a/client/quasar.js b/client/quasar.js index f7e9ae5f..c78baf62 100644 --- a/client/quasar.js +++ b/client/quasar.js @@ -65,7 +65,11 @@ Vue.use(Quasar, { config, components, directives, plugins }); //icons //import '@quasar/extras/material-icons/material-icons.css'; -import '@quasar/extras/material-icons-outlined/material-icons-outlined.css'; +//import '@quasar/extras/material-icons-outlined/material-icons-outlined.css'; //import '@quasar/extras/fontawesome-v5/fontawesome-v5.css'; + +//import '@quasar/extras/material-icons-outlined/material-icons-outlined.css'; +import '@quasar/extras/line-awesome/line-awesome.css'; + //import fontawesomeV5 from 'quasar/icon-set/fontawesome-v5.js' //Quasar.iconSet.set(fontawesomeV5); From fc71b953c7fba9466b104ddb5767bb3389dde01d Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 5 Feb 2020 15:28:09 +0700 Subject: [PATCH 068/158] update quasar --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b06307e..2c51bf6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10437,9 +10437,9 @@ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, "quasar": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.6.1.tgz", - "integrity": "sha512-0FHNK6vzozboFcnonwjFO8pvxUncPxXX+tcV8P1vi8hlzxgeKkYgKTkCb7rWDH/ip1T8nxjYsD0+2w4IkCiW0w==" + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.8.5.tgz", + "integrity": "sha512-iU9pitB0tEPwlJtNAJLnzIOSpolhZTPnfHBPNgLLxJSNXrgt5uQAuCcLXuG61AxRNhyrKdmsGIEMOYl/Aakv2Q==" }, "querystring": { "version": "0.2.0", diff --git a/package.json b/package.json index c5b06dfa..8e65f54b 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "node-stream-zip": "^1.8.2", "pako": "^1.0.10", "path-browserify": "^1.0.0", - "quasar": "^1.6.1", + "quasar": "^1.8.5", "safe-buffer": "^5.2.0", "sjcl": "^1.0.8", "sql-template-strings": "^2.2.2", From daf7b45e4589906bdc04ea10deeabe104e815fc9 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 5 Feb 2020 15:31:24 +0700 Subject: [PATCH 069/158] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/Reader.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 8efe6831..a17e0fc1 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -34,7 +34,7 @@ Найти в тексте
    -
    +
    {{ paypalAddress }} - - - - + + Скопировать +
    -
    +
    From 945a2dd3eba935bda397b941530b753654a9841e Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 7 Feb 2020 18:56:51 +0700 Subject: [PATCH 075/158] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20quasar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/App.vue | 2 +- .../RecentBooksPage/RecentBooksPage.vue | 109 +++++++++++------- 2 files changed, 66 insertions(+), 45 deletions(-) diff --git a/client/components/App.vue b/client/components/App.vue index 2cd2b3b7..1c40ab53 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -263,7 +263,7 @@ body, html, #app { } .dborder { - border: 2px solid yellow; + border: 2px solid yellow !important; } .icon-rotate { diff --git a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue index be72c676..5c97ec44 100644 --- a/client/components/Reader/RecentBooksPage/RecentBooksPage.vue +++ b/client/components/Reader/RecentBooksPage/RecentBooksPage.vue @@ -31,50 +31,53 @@ :key="col.name" :props="props" > - + - +