From 697774978edf1dd7744a16c8b6f6883600012350 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Mon, 25 Mar 2024 12:52:46 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=B2=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B5=20?= =?UTF-8?q?=D0=BB=D1=8E=D0=B1=D1=83=D1=8E=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA?= =?UTF-8?q?=D1=83=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA?= =?UTF-8?q?=D0=B8=20"=D0=A1=D0=B5=D1=82=D0=B5=D0=B2=D0=B0=D1=8F=20=D0=B1?= =?UTF-8?q?=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B0",=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20networkLibra?= =?UTF-8?q?ryLink=20(#47)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ client/api/misc.js | 2 +- client/components/Reader/Reader.vue | 5 +++++ client/components/Reader/versionHistory.js | 5 +++-- server/config/base.js | 3 ++- server/config/index.js | 1 + 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f8a2b627..227f12bf 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,10 @@ Options: // Подключение себя, как клиента, к серверу обновлений "bucServer": false + + // Сcылка для открытия в новом окне брауpера по клику на кнопку "Сетевая библиотека" + // Если не задано, открывается внутренний менеджер библиотек с использванием фрейма + "networkLibraryLink": "http://samlib.ru/" } ``` diff --git a/client/api/misc.js b/client/api/misc.js index e3c4b3fb..9c4f3a0c 100644 --- a/client/api/misc.js +++ b/client/api/misc.js @@ -4,7 +4,7 @@ class Misc { async loadConfig() { const query = {params: [ - 'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch', + 'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink', ]}; const config = await wsc.message(await wsc.send(Object.assign({action: 'get-config'}, query))); diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 9a12d4da..e3910f51 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -1032,6 +1032,11 @@ class Reader { } libsToogle() { + if (this.config.networkLibraryLink) { + window.open(this.config.networkLibraryLink, '_blank'); + return; + } + this.libsActive = !this.libsActive; if (this.libsActive) { this.$refs.libsPage.init();//no await diff --git a/client/components/Reader/versionHistory.js b/client/components/Reader/versionHistory.js index 07826592..69e756e6 100644 --- a/client/components/Reader/versionHistory.js +++ b/client/components/Reader/versionHistory.js @@ -1,12 +1,13 @@ export const versionHistory = [ { version: '1.2.0', - releaseDate: '2023-12-??', - showUntil: '2023-12-??', + releaseDate: '2024-03-25', + showUntil: '2024-03-24', content: ` ` diff --git a/server/config/base.js b/server/config/base.js index 5655cb43..c1045377 100644 --- a/server/config/base.js +++ b/server/config/base.js @@ -18,7 +18,7 @@ module.exports = { useExternalBookConverter: false, acceptFileExt: '.fb2, .fb3, .html, .txt, .zip, .bz2, .gz, .rar, .epub, .mobi, .rtf, .doc, .docx, .pdf, .djvu, .jpg, .jpeg, .png', - webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch'], + webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink'], jembaDb: [ { @@ -74,5 +74,6 @@ module.exports = { accessToken: '', } */ + networkLibraryLink: '', }; diff --git a/server/config/index.js b/server/config/index.js index 7862ceb6..bf666b00 100644 --- a/server/config/index.js +++ b/server/config/index.js @@ -14,6 +14,7 @@ const propsToSave = [ 'remoteStorage', 'bucEnabled', 'bucServer', + 'networkLibraryLink', ]; let instance = null;