From 7bd159766bc229af222d7d3c4e985f927fa9cd48 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 18 Sep 2020 17:40:37 +0700 Subject: [PATCH 01/66] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20?= =?UTF-8?q?=D0=B8=D1=81=D1=87=D0=B5=D0=B7=D0=BD=D0=BE=D0=B2=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BA=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D0=B2=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B9=D0=BA=D0=B5=20"=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D1=83=D1=81=D1=82=D1=8B=D0=B5=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/share/BookParser.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/client/components/Reader/share/BookParser.js b/client/components/Reader/share/BookParser.js index 8412d9fd..5162c79f 100644 --- a/client/components/Reader/share/BookParser.js +++ b/client/components/Reader/share/BookParser.js @@ -656,6 +656,7 @@ export default class BookParser { let style = {}; let ofs = 0;//смещение от начала параграфа para.offset let imgW = 0; + let imageInPara = false; const compactWidth = this.measureText('W', {})*this.compactTextPerc/100; // тут начинается самый замес, перенос по слогам и стилизация, а также изображения for (const part of parts) { @@ -664,7 +665,7 @@ export default class BookParser { //изображения if (part.image.id && !part.image.inline) { - parsed.visible = this.showImages; + imageInPara = true; let bin = this.binary[part.image.id]; if (!bin) bin = {h: 1, w: 1}; @@ -832,10 +833,14 @@ export default class BookParser { } //parsed.visible - parsed.visible = !( - (para.addIndex > this.addEmptyParagraphs) || - (para.addIndex == 0 && this.cutEmptyParagraphs && paragraphText.trim() == '') - ); + if (imageInPara) { + parsed.visible = this.showImages; + } else { + parsed.visible = !( + (para.addIndex > this.addEmptyParagraphs) || + (para.addIndex == 0 && this.cutEmptyParagraphs && paragraphText.trim() == '') + ); + } parsed.lines = lines; para.parsed = parsed; From 8806b4141e1623b04e1b19e7159568a81e6b585a Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 18 Sep 2020 17:43:05 +0700 Subject: [PATCH 02/66] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/versionHistory.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/client/components/Reader/versionHistory.js b/client/components/Reader/versionHistory.js index ba29ba9f..9ca43d3b 100644 --- a/client/components/Reader/versionHistory.js +++ b/client/components/Reader/versionHistory.js @@ -1,4 +1,15 @@ export const versionHistory = [ +{ + showUntil: '2020-09-01', + header: '0.9.4 (2020-10-??)', + content: +` + +` +}, + { showUntil: '2020-05-20', header: '0.9.3 (2020-05-21)', From fcaa724c00345d1933ebd4522e473ff9531f9786 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 18 Sep 2020 17:45:27 +0700 Subject: [PATCH 03/66] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20ya-share?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/LoaderPage/LoaderPage.vue | 8 ++++---- client/index.html.template | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index 0b50fd58..6cb4e4b4 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -31,7 +31,7 @@
-
+ Отзывы о читалке Старая версия
@@ -82,8 +82,8 @@ class LoaderPage extends Vue { mounted() { this.progress = this.$refs.progress; - if (this.mode == 'omnireader') - Ya.share2(this.$refs.yaShare2);// eslint-disable-line no-undef + /*if (this.mode == 'omnireader') + Ya.share2(this.$refs.yaShare2);// eslint-disable-line no-undef*/ } activated() { diff --git a/client/index.html.template b/client/index.html.template index 5ae948ef..4ed03687 100644 --- a/client/index.html.template +++ b/client/index.html.template @@ -10,6 +10,5 @@
- From 2e58cfdb7517f52b29479b3b2feebd261f0bcfe9 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Fri, 18 Sep 2020 18:05:32 +0700 Subject: [PATCH 04/66] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B9=20?= =?UTF-8?q?=D0=B1=D0=B0=D0=B3=20PageDown?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/TextPage/TextPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index 68928c67..0fe7f20d 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -839,7 +839,7 @@ class TextPage extends Vue { let i = this.pageLineCount; if (this.keepLastToFirst) i--; - if (i >= 0 && this.linesDown.length >= 2*i) { + if (i >= 0 && this.linesDown.length >= 2*i + (this.keepLastToFirst ? 1 : 0)) { this.currentAnimation = this.pageChangeAnimation; this.pageChangeDirectionDown = true; this.bookPos = this.linesDown[i].begin; From 39e14d70eecbfe8addc5c0207d04af70b6d5ccb6 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 13 Oct 2020 16:24:35 +0700 Subject: [PATCH 05/66] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20?= =?UTF-8?q?=D1=80=D0=B0=D1=81=D0=BF=D0=B0=D0=BA=D0=BE=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?Zip-=D0=B0=D1=80=D1=85=D0=B8=D0=B2=D0=BE=D0=B2=20=D1=81=20?= =?UTF-8?q?=D0=BF=D0=BB=D0=BE=D1=85=D0=B8=D0=BC=D0=B8=20=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=D0=BC=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/FileDecompressor.js | 9 +++++++-- server/core/Zip/node_stream_zip.js | 2 +- server/core/utils.js | 9 +++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/server/core/FileDecompressor.js b/server/core/FileDecompressor.js index 382d4105..ab2e58b2 100644 --- a/server/core/FileDecompressor.js +++ b/server/core/FileDecompressor.js @@ -119,14 +119,19 @@ class FileDecompressor { try { return await zip.unpack(filename, outputDir, { limitFileSize: this.limitFileSize, - limitFileCount: 1000 - }); + limitFileCount: 1000, + decodeEntryNameCallback: (nameRaw) => { + return utils.bufferRemoveZeroes(nameRaw); + } + } +); } catch (e) { fs.emptyDir(outputDir); return await zip.unpack(filename, outputDir, { limitFileSize: this.limitFileSize, limitFileCount: 1000, decodeEntryNameCallback: (nameRaw) => { + nameRaw = utils.bufferRemoveZeroes(nameRaw); const enc = textUtils.getEncodingLite(nameRaw); if (enc.indexOf('ISO-8859') < 0) { return iconv.decode(nameRaw, enc); diff --git a/server/core/Zip/node_stream_zip.js b/server/core/Zip/node_stream_zip.js index d60cc996..81a40fc2 100644 --- a/server/core/Zip/node_stream_zip.js +++ b/server/core/Zip/node_stream_zip.js @@ -766,7 +766,7 @@ ZipEntry.prototype.readDataHeader = function(data) { }; ZipEntry.prototype.read = function(data, offset) { - this.nameRaw = data.slice(offset, offset += this.fnameLen); + this.nameRaw = Buffer.from(data.slice(offset, offset += this.fnameLen)); this.name = this.nameRaw.toString(); var lastChar = data[offset - 1]; this.isDirectory = (lastChar == 47) || (lastChar == 92); diff --git a/server/core/utils.js b/server/core/utils.js index 53f7a2b3..f5190ded 100644 --- a/server/core/utils.js +++ b/server/core/utils.js @@ -14,6 +14,14 @@ function fromBase36(data) { return bs36.decode(data); } +function bufferRemoveZeroes(buf) { + const i = buf.indexOf(0); + if (i >= 0) { + return buf.slice(0, i); + } + return buf; +} + function getFileHash(filename, hashName, enc) { return new Promise((resolve, reject) => { const hash = crypto.createHash(hashName); @@ -86,6 +94,7 @@ function spawnProcess(cmd, opts) { module.exports = { toBase36, fromBase36, + bufferRemoveZeroes, getFileHash, sleep, randomHexString, From d65881439916ae9a43cdee60a64563d6c9c71376 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sat, 24 Oct 2020 13:11:17 +0700 Subject: [PATCH 06/66] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D0=B0=D1=82=D0=B0=D0=BC=20=D1=82=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/sax.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/server/core/sax.js b/server/core/sax.js index fb30334d..c921e8be 100644 --- a/server/core/sax.js +++ b/server/core/sax.js @@ -93,6 +93,12 @@ function parseSync(xstr, options) { } tag = tag.toLowerCase(); + if (innerCut.has(tag) && (!cutCounter || cutTag === tag)) { + if (!cutCounter) + cutTag = tag; + cutCounter++; + } + let endTag = (singleTag ? tag : ''); if (tag === '' || tag[0] !== '/') { _onStartNode(tag, tail, singleTag, cutCounter, cutTag); @@ -103,12 +109,6 @@ function parseSync(xstr, options) { if (endTag) _onEndNode(endTag, tail, singleTag, cutCounter, cutTag); - if (innerCut.has(tag) && (!cutCounter || cutTag === tag)) { - if (!cutCounter) - cutTag = tag; - cutCounter++; - } - if (cutTag === endTag) { cutCounter = (cutCounter > 0 ? cutCounter - 1 : 0); if (!cutCounter) @@ -233,6 +233,12 @@ async function parse(xstr, options) { } tag = tag.toLowerCase(); + if (innerCut.has(tag) && (!cutCounter || cutTag === tag)) { + if (!cutCounter) + cutTag = tag; + cutCounter++; + } + let endTag = (singleTag ? tag : ''); if (tag === '' || tag[0] !== '/') { await _onStartNode(tag, tail, singleTag, cutCounter, cutTag); @@ -243,12 +249,6 @@ async function parse(xstr, options) { if (endTag) await _onEndNode(endTag, tail, singleTag, cutCounter, cutTag); - if (innerCut.has(tag) && (!cutCounter || cutTag === tag)) { - if (!cutCounter) - cutTag = tag; - cutCounter++; - } - if (cutTag === endTag) { cutCounter = (cutCounter > 0 ? cutCounter - 1 : 0); if (!cutCounter) From 4362ae95bac0f3954bacf5fbf86aa42f11e9421e Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sat, 24 Oct 2020 17:25:36 +0700 Subject: [PATCH 07/66] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D0=B0=D1=82=D1=83=20=D1=82=D0=B5=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/sax.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/core/sax.js b/server/core/sax.js index c921e8be..5dc903f1 100644 --- a/server/core/sax.js +++ b/server/core/sax.js @@ -125,9 +125,9 @@ function parseSync(xstr, options) { if (i < len) { if (inCdata) { - _onCdata(xstr.substr(leftData, len - leftData), cutCounter, cutTag); + _onCdata(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag); } else if (inComment) { - _onComment(xstr.substr(leftData, len - leftData), cutCounter, cutTag); + _onComment(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag); } else { _onTextNode(xstr.substr(i, len - i), cutCounter, cutTag); } @@ -265,9 +265,9 @@ async function parse(xstr, options) { if (i < len) { if (inCdata) { - await _onCdata(xstr.substr(leftData, len - leftData), cutCounter, cutTag); + await _onCdata(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag); } else if (inComment) { - await _onComment(xstr.substr(leftData, len - leftData), cutCounter, cutTag); + await _onComment(xstr.substr(leftData + 1, len - leftData - 1), cutCounter, cutTag); } else { await _onTextNode(xstr.substr(i, len - i), cutCounter, cutTag); } From a20d05aba80a3215d1cb868ad77a1a6dfd1669d6 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sun, 25 Oct 2020 17:30:34 +0700 Subject: [PATCH 08/66] =?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=D1=8F=20=D0=B2=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D0=B0=D1=85,=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20nginx=20=D0=B4=D0=BB=D1=8F=20=D1=81?= =?UTF-8?q?=D0=B0=D0=B9=D1=82=D0=B0=20liberama.top?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../beta.omnireader | 0 .../deploy.sh | 0 .../run_server.sh | 0 docs/liberama.top/liberama | 44 ++++++++++++++++++ docs/{omnireader => omnireader.ru}/README.md | 0 docs/{omnireader => omnireader.ru}/deploy.sh | 0 .../old/.htaccess | 0 .../old/apple-touch-icon-precomposed.png | Bin .../old/apple-touch-icon.png | Bin .../old/config/config.js | 0 .../old/config/config.php | 0 docs/{omnireader => omnireader.ru}/old/f.php | 0 .../old/favicon.ico | Bin .../old/index.html | 0 .../old/info.txt | 0 .../old/js/bpr319.js | 0 .../old/js/bpricon.gif | Bin .../old/js/colo58.png | Bin .../old/js/load.gif | Bin .../old/js/stylex.css | 0 .../old/parser.php | 0 .../old/robots.txt | 0 .../old/test.php | 0 .../old/txt/.htaccess | 0 docs/{omnireader => omnireader.ru}/omnireader | 0 .../omnireader_http | 0 .../run_server.sh | 0 28 files changed, 45 insertions(+), 1 deletion(-) rename docs/{beta.omnireader => beta.omnireader.ru}/beta.omnireader (100%) rename docs/{beta.omnireader => beta.omnireader.ru}/deploy.sh (100%) rename docs/{beta.omnireader => beta.omnireader.ru}/run_server.sh (100%) create mode 100644 docs/liberama.top/liberama rename docs/{omnireader => omnireader.ru}/README.md (100%) rename docs/{omnireader => omnireader.ru}/deploy.sh (100%) rename docs/{omnireader => omnireader.ru}/old/.htaccess (100%) rename docs/{omnireader => omnireader.ru}/old/apple-touch-icon-precomposed.png (100%) rename docs/{omnireader => omnireader.ru}/old/apple-touch-icon.png (100%) rename docs/{omnireader => omnireader.ru}/old/config/config.js (100%) rename docs/{omnireader => omnireader.ru}/old/config/config.php (100%) rename docs/{omnireader => omnireader.ru}/old/f.php (100%) rename docs/{omnireader => omnireader.ru}/old/favicon.ico (100%) rename docs/{omnireader => omnireader.ru}/old/index.html (100%) rename docs/{omnireader => omnireader.ru}/old/info.txt (100%) rename docs/{omnireader => omnireader.ru}/old/js/bpr319.js (100%) rename docs/{omnireader => omnireader.ru}/old/js/bpricon.gif (100%) rename docs/{omnireader => omnireader.ru}/old/js/colo58.png (100%) rename docs/{omnireader => omnireader.ru}/old/js/load.gif (100%) rename docs/{omnireader => omnireader.ru}/old/js/stylex.css (100%) rename docs/{omnireader => omnireader.ru}/old/parser.php (100%) rename docs/{omnireader => omnireader.ru}/old/robots.txt (100%) rename docs/{omnireader => omnireader.ru}/old/test.php (100%) rename docs/{omnireader => omnireader.ru}/old/txt/.htaccess (100%) rename docs/{omnireader => omnireader.ru}/omnireader (100%) rename docs/{omnireader => omnireader.ru}/omnireader_http (100%) rename docs/{omnireader => omnireader.ru}/run_server.sh (100%) diff --git a/README.md b/README.md index 03ce9764..4c681801 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ![](docs/assets/reader.jpg) ## VPS -Для разворачивания читалки на чистом VPS с нуля смотрите [docs/omnireader](docs/omnireader/README.md) +Для разворачивания читалки на чистом VPS с нуля смотрите [docs/omnireader.ru](docs/omnireader.ru/README.md) ## Сборка проекта Необходима версия node.js не ниже 10. diff --git a/docs/beta.omnireader/beta.omnireader b/docs/beta.omnireader.ru/beta.omnireader similarity index 100% rename from docs/beta.omnireader/beta.omnireader rename to docs/beta.omnireader.ru/beta.omnireader diff --git a/docs/beta.omnireader/deploy.sh b/docs/beta.omnireader.ru/deploy.sh similarity index 100% rename from docs/beta.omnireader/deploy.sh rename to docs/beta.omnireader.ru/deploy.sh diff --git a/docs/beta.omnireader/run_server.sh b/docs/beta.omnireader.ru/run_server.sh similarity index 100% rename from docs/beta.omnireader/run_server.sh rename to docs/beta.omnireader.ru/run_server.sh diff --git a/docs/liberama.top/liberama b/docs/liberama.top/liberama new file mode 100644 index 00000000..b59de4e9 --- /dev/null +++ b/docs/liberama.top/liberama @@ -0,0 +1,44 @@ +server { + listen 443 ssl; # managed by Certbot + + server_name liberama.top; + + client_max_body_size 50m; + proxy_read_timeout 1h; + + gzip on; + gzip_min_length 1024; + gzip_proxied expired no-cache no-store private auth; + gzip_types *; + + location /api { + proxy_pass http://127.0.0.1:55081; + } + + location /ws { + proxy_pass http://127.0.0.1:55081; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location / { + root /home/liberama/public; + + location /tmp { + types { } default_type "application/xml; charset=utf-8"; + add_header Content-Encoding gzip; + } + + location ~* \.(?:manifest|appcache|html)$ { + expires -1; + } + } +} + +server { + listen 80; + server_name liberama.top; + + return 301 https://$host$request_uri; +} diff --git a/docs/omnireader/README.md b/docs/omnireader.ru/README.md similarity index 100% rename from docs/omnireader/README.md rename to docs/omnireader.ru/README.md diff --git a/docs/omnireader/deploy.sh b/docs/omnireader.ru/deploy.sh similarity index 100% rename from docs/omnireader/deploy.sh rename to docs/omnireader.ru/deploy.sh diff --git a/docs/omnireader/old/.htaccess b/docs/omnireader.ru/old/.htaccess similarity index 100% rename from docs/omnireader/old/.htaccess rename to docs/omnireader.ru/old/.htaccess diff --git a/docs/omnireader/old/apple-touch-icon-precomposed.png b/docs/omnireader.ru/old/apple-touch-icon-precomposed.png similarity index 100% rename from docs/omnireader/old/apple-touch-icon-precomposed.png rename to docs/omnireader.ru/old/apple-touch-icon-precomposed.png diff --git a/docs/omnireader/old/apple-touch-icon.png b/docs/omnireader.ru/old/apple-touch-icon.png similarity index 100% rename from docs/omnireader/old/apple-touch-icon.png rename to docs/omnireader.ru/old/apple-touch-icon.png diff --git a/docs/omnireader/old/config/config.js b/docs/omnireader.ru/old/config/config.js similarity index 100% rename from docs/omnireader/old/config/config.js rename to docs/omnireader.ru/old/config/config.js diff --git a/docs/omnireader/old/config/config.php b/docs/omnireader.ru/old/config/config.php similarity index 100% rename from docs/omnireader/old/config/config.php rename to docs/omnireader.ru/old/config/config.php diff --git a/docs/omnireader/old/f.php b/docs/omnireader.ru/old/f.php similarity index 100% rename from docs/omnireader/old/f.php rename to docs/omnireader.ru/old/f.php diff --git a/docs/omnireader/old/favicon.ico b/docs/omnireader.ru/old/favicon.ico similarity index 100% rename from docs/omnireader/old/favicon.ico rename to docs/omnireader.ru/old/favicon.ico diff --git a/docs/omnireader/old/index.html b/docs/omnireader.ru/old/index.html similarity index 100% rename from docs/omnireader/old/index.html rename to docs/omnireader.ru/old/index.html diff --git a/docs/omnireader/old/info.txt b/docs/omnireader.ru/old/info.txt similarity index 100% rename from docs/omnireader/old/info.txt rename to docs/omnireader.ru/old/info.txt diff --git a/docs/omnireader/old/js/bpr319.js b/docs/omnireader.ru/old/js/bpr319.js similarity index 100% rename from docs/omnireader/old/js/bpr319.js rename to docs/omnireader.ru/old/js/bpr319.js diff --git a/docs/omnireader/old/js/bpricon.gif b/docs/omnireader.ru/old/js/bpricon.gif similarity index 100% rename from docs/omnireader/old/js/bpricon.gif rename to docs/omnireader.ru/old/js/bpricon.gif diff --git a/docs/omnireader/old/js/colo58.png b/docs/omnireader.ru/old/js/colo58.png similarity index 100% rename from docs/omnireader/old/js/colo58.png rename to docs/omnireader.ru/old/js/colo58.png diff --git a/docs/omnireader/old/js/load.gif b/docs/omnireader.ru/old/js/load.gif similarity index 100% rename from docs/omnireader/old/js/load.gif rename to docs/omnireader.ru/old/js/load.gif diff --git a/docs/omnireader/old/js/stylex.css b/docs/omnireader.ru/old/js/stylex.css similarity index 100% rename from docs/omnireader/old/js/stylex.css rename to docs/omnireader.ru/old/js/stylex.css diff --git a/docs/omnireader/old/parser.php b/docs/omnireader.ru/old/parser.php similarity index 100% rename from docs/omnireader/old/parser.php rename to docs/omnireader.ru/old/parser.php diff --git a/docs/omnireader/old/robots.txt b/docs/omnireader.ru/old/robots.txt similarity index 100% rename from docs/omnireader/old/robots.txt rename to docs/omnireader.ru/old/robots.txt diff --git a/docs/omnireader/old/test.php b/docs/omnireader.ru/old/test.php similarity index 100% rename from docs/omnireader/old/test.php rename to docs/omnireader.ru/old/test.php diff --git a/docs/omnireader/old/txt/.htaccess b/docs/omnireader.ru/old/txt/.htaccess similarity index 100% rename from docs/omnireader/old/txt/.htaccess rename to docs/omnireader.ru/old/txt/.htaccess diff --git a/docs/omnireader/omnireader b/docs/omnireader.ru/omnireader similarity index 100% rename from docs/omnireader/omnireader rename to docs/omnireader.ru/omnireader diff --git a/docs/omnireader/omnireader_http b/docs/omnireader.ru/omnireader_http similarity index 100% rename from docs/omnireader/omnireader_http rename to docs/omnireader.ru/omnireader_http diff --git a/docs/omnireader/run_server.sh b/docs/omnireader.ru/run_server.sh similarity index 100% rename from docs/omnireader/run_server.sh rename to docs/omnireader.ru/run_server.sh From 0690a365dae7408ea44e7b2ae0621ce8d5e40119 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sun, 25 Oct 2020 17:35:53 +0700 Subject: [PATCH 09/66] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE=D0=BA=D1=81=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20flibusta.is?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/liberama.top/liberama | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docs/liberama.top/liberama b/docs/liberama.top/liberama index b59de4e9..004542fa 100644 --- a/docs/liberama.top/liberama +++ b/docs/liberama.top/liberama @@ -42,3 +42,36 @@ server { return 301 https://$host$request_uri; } + +server { + listen 23480; + server_name flibusta_proxy; + + valid_referers omnireader.ru beta.omnireader.ru liberama.top; + + if ($invalid_referer) { + return 403; + } + + location / { + proxy_pass http://flibusta.is; + proxy_redirect http://static.flibusta.is:443 http://$server_addr:23481; + } +} + + +server { + listen 23481; + server_name flibusta_proxy_static; + + valid_referers omnireader.ru beta.omnireader.ru liberama.top; + + if ($invalid_referer) { + return 403; + } + + location / { + proxy_pass http://static.flibusta.is:443; + proxy_set_header Referer ""; + } +} From 7c2cb9a0c7d04fbf1b9e61ea6f5374e29e338f77 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sun, 25 Oct 2020 17:39:26 +0700 Subject: [PATCH 10/66] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B4=D0=BE=D0=BA=D0=B0=20=D0=B2=20=D1=81=D0=B2?= =?UTF-8?q?=D1=8F=D0=B7=D0=B8=20=D1=81=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/omnireader.ru/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/omnireader.ru/README.md b/docs/omnireader.ru/README.md index 2f1308b5..72ab7569 100644 --- a/docs/omnireader.ru/README.md +++ b/docs/omnireader.ru/README.md @@ -39,11 +39,11 @@ sudo apt install poppler-utils ``` ### nginx, server config -Для своего домена необходимо будет подправить docs/omnireader/omnireader. +Для своего домена необходимо будет подправить docs/omnireader.ru/omnireader. Можно также настроить сервер для HTTP, без SSL. ``` sudo apt install nginx -sudo cp docs/omnireader/omnireader /etc/nginx/sites-available/omnireader +sudo cp docs/omnireader.ru/omnireader /etc/nginx/sites-available/omnireader sudo ln -s /etc/nginx/sites-available/omnireader /etc/nginx/sites-enabled/omnireader sudo rm /etc/nginx/sites-enabled/default sudo service nginx reload @@ -59,12 +59,12 @@ sudo service php7.2-fpm restart sudo mkdir /home/oldreader sudo chown www-data.www-data /home/oldreader -sudo -u www-data cp -r docs/omnireader/old/* /home/oldreader +sudo -u www-data cp -r docs/omnireader.ru/old/* /home/oldreader ``` ## Деплой и запуск ``` -cd docs/omnireader +cd docs/omnireader.ru ./deploy.sh ./run_server.sh ``` From f998edb2aaa0ff3d3219db1c7b760a16ffe0e5f5 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sun, 25 Oct 2020 17:46:14 +0700 Subject: [PATCH 11/66] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=81=D0=B5=D1=80=D1=82=D0=B8=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=D1=82=D1=8B=20=D0=B4=D0=BB=D1=8F=20ssl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/liberama.top/liberama | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/liberama.top/liberama b/docs/liberama.top/liberama index 004542fa..b267a35c 100644 --- a/docs/liberama.top/liberama +++ b/docs/liberama.top/liberama @@ -1,5 +1,9 @@ server { listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/liberama.top/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/liberama.top/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot server_name liberama.top; From 1fb1a1b2b1dea7f2b1dea42b6ec14554d390c650 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sun, 25 Oct 2020 18:08:04 +0700 Subject: [PATCH 12/66] =?UTF-8?q?=D0=92=D1=80=D0=B5=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=B0=D1=8F=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20liberama.top=20=D0=BD=D0=B0=20beta-=D1=81=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/liberama.top/liberama | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/liberama.top/liberama b/docs/liberama.top/liberama index b267a35c..828b8d1e 100644 --- a/docs/liberama.top/liberama +++ b/docs/liberama.top/liberama @@ -27,7 +27,7 @@ server { } location / { - root /home/liberama/public; + root /home/beta.liberama/public; location /tmp { types { } default_type "application/xml; charset=utf-8"; From df76de7352815a9e9cbfcdbd083b456e5559a563 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sun, 25 Oct 2020 18:35:42 +0700 Subject: [PATCH 13/66] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=BE=D0=B2=D0=BE?= =?UTF-8?q?=D0=B3=D0=BE=20=D1=81=D0=B0=D0=B9=D1=82=D0=B0=20liberama.top?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/App.vue | 8 +++++--- .../HelpPage/CommonHelpPage/CommonHelpPage.vue | 12 ++++++++---- client/components/Reader/LoaderPage/LoaderPage.vue | 6 ++++-- client/components/Reader/Reader.vue | 2 +- .../Reader/SettingsPage/include/ProfilesTab.inc | 2 +- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/client/components/App.vue b/client/components/App.vue index a467dd28..c979599e 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -202,7 +202,9 @@ class App extends Vue { setAppTitle(title) { if (!title) { - if (this.mode == 'omnireader') { + if (this.mode == 'liberama.top') { + document.title = `Liberama Reader - всегда с вами`; + } else if (this.mode == 'omnireader') { document.title = `Omni Reader - всегда с вами`; } else if (this.config && this.mode !== null) { document.title = `${this.config.name} - ${this.itemRuText[this.$root.rootRoute]}`; @@ -221,7 +223,7 @@ class App extends Vue { } get showAsideBar() { - return (this.mode !== null && this.mode != 'reader' && this.mode != 'omnireader'); + return (this.mode !== null && this.mode != 'reader' && this.mode != 'omnireader' && this.mode != 'liberama.top'); } set showAsideBar(value) { @@ -232,7 +234,7 @@ class App extends Vue { } redirectIfNeeded() { - if ((this.mode == 'reader' || this.mode == 'omnireader') && (!this.isReaderActive)) { + if ((this.mode == 'reader' || this.mode == 'omnireader' || this.mode == 'liberama.top') && (!this.isReaderActive)) { //старый url const search = window.location.search.substr(1); const s = search.split('url='); diff --git a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue index ab945a71..b5860517 100644 --- a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue +++ b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue @@ -22,15 +22,15 @@ на файл из онлайн-библиотеки (например, скопировав адрес ссылки или кнопки "скачать fb2").

Поддерживаемые форматы: fb2, fb2.zip, html, txt и другие.

-
+

Вы можете добавить в свой браузер закладку, указав в ее свойствах вместо адреса следующий код: -
javascript:location.href='https://omnireader.ru/?url='+location.href; - +
{{ bookmarkText }} + Скопировать
или перетащив на панель закладок следующую ссылку: -
Omni Reader +
{{ (mode == 'omnireader' ? 'Omni' : 'Liberama') }} Reader
Тогда, активировав получившуюся закладку на любой странице интернета, вы автоматически загрузите эту страницу в Omni Reader.
В Chrome для Android можно вызывать такую закладку по имени прямо в адресной строке браузера (имя стоит сделать попроще).

@@ -56,6 +56,10 @@ class CommonHelpPage extends Vue { return this.$store.state.config.mode; } + get bookmarkText() { + return `javascript:location.href='https://${window.location.host}/?url='+location.href;` + } + async copyText(text, mes) { const result = await copyTextToClipboard(text); const msg = (result ? mes : 'Копирование не удалось'); diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index 6cb4e4b4..df395a17 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -40,8 +40,8 @@
- Отзывы о читалке - Старая версия + Отзывы о читалке + Старая версия
@@ -93,6 +93,8 @@ class LoaderPage extends Vue { get title() { if (this.mode == 'omnireader') return 'Omni Reader - браузерная онлайн-читалка.'; + if (this.mode == 'liberama.top') + return 'Liberama Reader - браузерная онлайн-читалка.'; return 'Универсальная читалка книг и ресурсов интернета.'; } diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 6c837fe3..979938d3 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -410,7 +410,7 @@ class Reader extends Vue { await utils.sleep(3000); const today = utils.formatDate(new Date(), 'coDate'); - if (this.mode == 'omnireader' && today < '2020-03-01' && this.showDonationDialog2020 && this.donationRemindDate != today) { + if ((this.mode == 'omnireader' || this.mode == 'liberama.top') && today < '2020-03-01' && this.showDonationDialog2020 && this.donationRemindDate != today) { this.donationVisible = true; } } diff --git a/client/components/Reader/SettingsPage/include/ProfilesTab.inc b/client/components/Reader/SettingsPage/include/ProfilesTab.inc index 8ce04f07..b9e0a898 100644 --- a/client/components/Reader/SettingsPage/include/ProfilesTab.inc +++ b/client/components/Reader/SettingsPage/include/ProfilesTab.inc @@ -68,7 +68,7 @@ Скопировать
-
+

Переход по ссылке позволит автоматически ввести ключ доступа:
Ссылка для ввода ключа From 55a5375e46647780e819da50802f8cd994747cbe Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sun, 25 Oct 2020 23:36:02 +0700 Subject: [PATCH 14/66] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20"=D0=9E?= =?UTF-8?q?=D1=82=D0=B7=D1=8B=D0=B2=D1=8B=20=D0=BE=20=D1=87=D0=B8=D1=82?= =?UTF-8?q?=D0=B0=D0=BB=D0=BA=D0=B5"=20=D0=B8=20"=D0=A1=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F"=20=D0=B2?= =?UTF-8?q?=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B5=20"liberama.top"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/LoaderPage/LoaderPage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index df395a17..51f47f1b 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -40,8 +40,8 @@
- Отзывы о читалке - Старая версия + Отзывы о читалке + Старая версия
From dd94418c26983963ccad138af8cfd5d9eda444f4 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Mon, 26 Oct 2020 00:23:30 +0700 Subject: [PATCH 15/66] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D1=86=D0=B5=D1=81?= =?UTF-8?q?=D1=81=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=BA?= =?UTF-8?q?=D0=BD=D0=B0:=20"=D0=91=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82?= =?UTF-8?q?=D0=B5=D0=BA=D0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/Reader.vue | 67 +++++++++++++++++------------ client/store/modules/reader.js | 5 ++- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 979938d3..5657d24b 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -2,10 +2,12 @@
- +
+ +
-
- +
+ + +
@@ -230,6 +238,7 @@ export default @Component({ class Reader extends Vue { rstore = {}; loaderActive = false; + offlineModeActive = false; progressActive = false; fullScreenActive = false; @@ -237,8 +246,8 @@ class Reader extends Vue { setPositionActive = false; searchActive = false; copyTextActive = false; + libsActive = false; recentBooksActive = false; - offlineModeActive = false; settingsActive = false; helpActive = false; clickMapActive = false; @@ -587,7 +596,7 @@ class Reader extends Vue { } } - closeAllTextPages() { + closeAllWindows() { this.setPositionActive = false; this.copyTextActive = false; this.recentBooksActive = false; @@ -600,7 +609,7 @@ class Reader extends Vue { loaderToggle() { this.loaderActive = !this.loaderActive; if (this.loaderActive) { - this.closeAllTextPages(); + this.closeAllWindows(); } } @@ -608,7 +617,7 @@ class Reader extends Vue { this.setPositionActive = !this.setPositionActive; const page = this.$refs.page; if (this.setPositionActive && this.activePage == 'TextPage' && page.parsed) { - this.closeAllTextPages(); + this.closeAllWindows(); this.setPositionActive = true; this.$nextTick(() => { @@ -660,7 +669,7 @@ class Reader extends Vue { this.searchActive = !this.searchActive; const page = this.$refs.page; if (this.searchActive && this.activePage == 'TextPage' && page.parsed) { - this.closeAllTextPages(); + this.closeAllWindows(); this.searchActive = true; this.$nextTick(() => { @@ -676,7 +685,7 @@ class Reader extends Vue { this.copyTextActive = !this.copyTextActive; const page = this.$refs.page; if (this.copyTextActive && this.activePage == 'TextPage' && page.parsed) { - this.closeAllTextPages(); + this.closeAllWindows(); this.copyTextActive = true; this.$nextTick(() => { @@ -694,7 +703,7 @@ class Reader extends Vue { recentBooksToggle() { this.recentBooksActive = !this.recentBooksActive; if (this.recentBooksActive) { - this.closeAllTextPages(); + this.closeAllWindows(); this.$refs.recentBooksPage.init(); this.recentBooksActive = true; } else { @@ -710,7 +719,7 @@ class Reader extends Vue { settingsToggle() { this.settingsActive = !this.settingsActive; if (this.settingsActive) { - this.closeAllTextPages(); + this.closeAllWindows(); this.settingsActive = true; this.$nextTick(() => { @@ -724,7 +733,7 @@ class Reader extends Vue { helpToggle() { this.helpActive = !this.helpActive; if (this.helpActive) { - this.closeAllTextPages(); + this.closeAllWindows(); this.helpActive = true; } } @@ -791,8 +800,9 @@ class Reader extends Vue { case 'search': case 'copyText': case 'refresh': - case 'offlineMode': + case 'libs': case 'recentBooks': + case 'offlineMode': case 'settings': if (this.progressActive) { classResult = classDisabled; @@ -896,7 +906,7 @@ class Reader extends Vue { return; } - this.closeAllTextPages(); + this.closeAllWindows(); let url = encodeURI(decodeURI(opts.url)); @@ -1071,9 +1081,6 @@ class Reader extends Vue { case 'help': this.helpToggle(); break; - case 'settings': - this.settingsToggle(); - break; case 'undoAction': this.undoAction(); break; @@ -1101,12 +1108,18 @@ class Reader extends Vue { case 'refresh': this.refreshBook(); break; - case 'offlineMode': - this.offlineModeToggle(); + case 'libs': + this.libsToogle(); break; case 'recentBooks': this.recentBooksToggle(); break; + case 'offlineMode': + this.offlineModeToggle(); + break; + case 'settings': + this.settingsToggle(); + break; case 'switchToolbar': this.toolBarToggle(); break; diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js index 1cd342da..4ba12b4b 100644 --- a/client/store/modules/reader.js +++ b/client/store/modules/reader.js @@ -12,6 +12,7 @@ const readerActions = { 'copyText': 'Скопировать текст со страницы', 'refresh': 'Принудительно обновить книгу', 'offlineMode': 'Автономный режим (без интернета)', + 'libs': 'Библиотеки', 'recentBooks': 'Открыть недавние', 'switchToolbar': 'Показать/скрыть панель управления', 'donate': '', @@ -37,8 +38,9 @@ const toolButtons = [ {name: 'search', show: true}, {name: 'copyText', show: false}, {name: 'refresh', show: true}, - {name: 'offlineMode', show: false}, + {name: 'libs', show: true}, {name: 'recentBooks', show: true}, + {name: 'offlineMode', show: false}, ]; //readerActions[name] @@ -55,6 +57,7 @@ const hotKeys = [ {name: 'copyText', codes: ['Ctrl+C']}, {name: 'refresh', codes: ['R']}, {name: 'offlineMode', codes: ['O']}, + {name: 'libs', codes: ['L']}, {name: 'recentBooks', codes: ['X']}, {name: 'switchToolbar', codes: ['Tab', 'Q']}, From 749667aefd2f0f9d2a4d92120256238dfda7357b Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 11:17:49 +0700 Subject: [PATCH 16/66] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20LibsPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Reader/LibsPage/LibsPage.vue | 113 ++++++++++++++++++ client/components/Reader/Reader.vue | 18 +++ client/store/modules/reader.js | 20 ++++ 3 files changed, 151 insertions(+) create mode 100644 client/components/Reader/LibsPage/LibsPage.vue diff --git a/client/components/Reader/LibsPage/LibsPage.vue b/client/components/Reader/LibsPage/LibsPage.vue new file mode 100644 index 00000000..611e9d3f --- /dev/null +++ b/client/components/Reader/LibsPage/LibsPage.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 5657d24b..458722f4 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -85,6 +85,7 @@ @stop-text-search="stopTextSearch"> + @@ -167,6 +168,7 @@ import ProgressPage from './ProgressPage/ProgressPage.vue'; import SetPositionPage from './SetPositionPage/SetPositionPage.vue'; import SearchPage from './SearchPage/SearchPage.vue'; import CopyTextPage from './CopyTextPage/CopyTextPage.vue'; +import LibsPage from './LibsPage/LibsPage.vue'; import RecentBooksPage from './RecentBooksPage/RecentBooksPage.vue'; import SettingsPage from './SettingsPage/SettingsPage.vue'; import HelpPage from './HelpPage/HelpPage.vue'; @@ -189,6 +191,7 @@ export default @Component({ SetPositionPage, SearchPage, CopyTextPage, + LibsPage, RecentBooksPage, SettingsPage, HelpPage, @@ -599,6 +602,7 @@ class Reader extends Vue { closeAllWindows() { this.setPositionActive = false; this.copyTextActive = false; + this.libsActive = false; this.recentBooksActive = false; this.settingsActive = false; this.stopScrolling(); @@ -711,6 +715,17 @@ class Reader extends Vue { } } + libsToogle() { + this.libsActive = !this.libsActive; + if (this.libsActive) { + this.closeAllWindows(); + this.$refs.libsPage.init(); + this.libsActive = true; + } else { + this.libsActive = false; + } + } + offlineModeToggle() { this.offlineModeActive = !this.offlineModeActive; this.$refs.serverStorage.offlineModeActive = this.offlineModeActive; @@ -1205,6 +1220,9 @@ class Reader extends Vue { if (!handled && this.copyTextActive) handled = this.$refs.copyTextPage.keyHook(event); + if (!handled && this.libsActive) + handled = this.$refs.libsPage.keyHook(event); + if (!handled && this.$refs.page && this.$refs.page.keyHook) handled = this.$refs.page.keyHook(event); diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js index 4ba12b4b..261f2a5d 100644 --- a/client/store/modules/reader.js +++ b/client/store/modules/reader.js @@ -253,6 +253,18 @@ const settingDefaults = { userHotKeys: {}, }; +const libsDefaults = { + startLink: 'http://flibusta.is', + links: [ + {r: 'http://flibusta.is', s: 'http://flibusta.is', list: [ + {l: 'http://flibusta.is', c: 'Флибуста - книжное братство'} + ]}, + {r: 'http://samlib.ru', s: 'http://samlib.ru', list: [ + {l: 'http://samlib.ru', c: 'Журнал "Самиздат"'} + ]}, + ] +}; + for (const font of fonts) settingDefaults.fontShifts[font.name] = font.fontVertShift; for (const font of webFonts) @@ -275,6 +287,8 @@ const state = { currentProfile: '', settings: Object.assign({}, settingDefaults), settingsRev: {}, + libs: Object.assign({}, libsDefaults), + libsRev: 0, }; // getters @@ -318,6 +332,12 @@ const mutations = { setSettingsRev(state, value) { state.settingsRev = Object.assign({}, state.settingsRev, value); }, + setLibs(state, value) { + state.libs = value; + }, + setLibsRev(state, value) { + state.libsRev = value; + }, }; export default { From 44655dc81ce300653d8360dc2f5b72b3b49d1225 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 13:28:54 +0700 Subject: [PATCH 17/66] Quasar update --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d9bff31..dcaa1936 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Liberama", - "version": "0.9.2", + "version": "0.9.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -12597,9 +12597,9 @@ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, "quasar": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.11.3.tgz", - "integrity": "sha512-ZlWNn7nfo7dgh8pmhdYB5Jn9Sv/mFsYfoY0K/hYrCE/mJq2ZYWHTVCAFqbp1MEirbSz4RcRXu5kMa+sf/v/uAg==" + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.14.3.tgz", + "integrity": "sha512-0baTygeaRhrOK9e+mtc32i6+xOnPKXaplgELJJdGWeoQBCwwfUX0tah0fgUmrdOEft3XmwhYW0a9yv/TAPUz7A==" }, "querystring": { "version": "0.2.0", diff --git a/package.json b/package.json index 1d91e843..aab63446 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "multer": "^1.4.2", "pako": "^1.0.11", "path-browserify": "^1.0.0", - "quasar": "^1.11.3", + "quasar": "^1.14.3", "safe-buffer": "^5.2.0", "sjcl": "^1.0.8", "sql-template-strings": "^2.2.2", From 0f81fa53d2f88323897451ab4e4587e888185972 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 13:30:05 +0700 Subject: [PATCH 18/66] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20LibsPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Reader/LibsPage/LibsPage.vue | 128 ++++++++++++++++-- client/components/Reader/Reader.vue | 2 +- client/store/modules/reader.js | 8 +- 3 files changed, 123 insertions(+), 15 deletions(-) diff --git a/client/components/Reader/LibsPage/LibsPage.vue b/client/components/Reader/LibsPage/LibsPage.vue index 611e9d3f..e7e28f50 100644 --- a/client/components/Reader/LibsPage/LibsPage.vue +++ b/client/components/Reader/LibsPage/LibsPage.vue @@ -1,31 +1,36 @@ @@ -65,6 +69,7 @@ export default @Component({ } }) class LibsPage extends Vue { + frameVisible = false; startLink = ''; rootLink = ''; selectedLink = ''; @@ -81,6 +86,8 @@ class LibsPage extends Vue { this.$refs.window.init(); if (!this.frameSrc) this.frameSrc = this.libs.startLink; + this.frameVisible = false; + this.frameVisible = true; } get libs() { @@ -139,6 +146,14 @@ class LibsPage extends Vue { this.frameSrc = this.addProtocol(this.bookUrl); } + goToStartLink() { + this.frameSrc = this.libs.startLink; + this.frameVisible = false; + this.$nextTick(() => { + this.frameVisible = true; + }); + } + addProtocol(url) { if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0)) return 'http://' + url; @@ -184,7 +199,7 @@ class LibsPage extends Vue { submitUrl() { if (this.bookUrl) { - this.$emit('load-book', {url: this.bookUrl, force: true}); + this.$emit('load-book', {url: this.addProtocol(this.bookUrl), force: true}); this.bookUrl = ''; } } From dcbc8409e0d43be5e7e6746551f34841d001f840 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 14:31:07 +0700 Subject: [PATCH 20/66] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20LibsPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/LibsPage/LibsPage.vue | 4 +++- client/index.html.template | 1 + client/store/modules/reader.js | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/components/Reader/LibsPage/LibsPage.vue b/client/components/Reader/LibsPage/LibsPage.vue index 59110030..25d75fb9 100644 --- a/client/components/Reader/LibsPage/LibsPage.vue +++ b/client/components/Reader/LibsPage/LibsPage.vue @@ -34,7 +34,9 @@ - Открыть + Открыть + Открыть в читалке +
diff --git a/client/index.html.template b/client/index.html.template index 4ed03687..372b4608 100644 --- a/client/index.html.template +++ b/client/index.html.template @@ -6,6 +6,7 @@ + diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js index ad3adb28..35a20344 100644 --- a/client/store/modules/reader.js +++ b/client/store/modules/reader.js @@ -255,10 +255,10 @@ const settingDefaults = { const libsDefaults = { startLink: 'http://flibusta.is', - comment: 'Флибуста - книжное братство', + comment: 'Флибуста | Книжное братство', groups: [ {r: 'http://flibusta.is', s: 'http://flibusta.is', list: [ - {l: 'http://flibusta.is', c: 'Флибуста - книжное братство'}, + {l: 'http://flibusta.is', c: 'Флибуста | Книжное братство'}, ]}, {r: 'http://samlib.ru', s: 'http://samlib.ru', list: [ {l: 'http://samlib.ru', c: 'Журнал "Самиздат"'}, From c956e7a802fbe6663666feef58a80e2fe99c7a17 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 14:34:12 +0700 Subject: [PATCH 21/66] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B4?= =?UTF-8?q?=D0=B5=D0=B1=D0=B0=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/LibsPage/LibsPage.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/client/components/Reader/LibsPage/LibsPage.vue b/client/components/Reader/LibsPage/LibsPage.vue index 25d75fb9..e61ed1c3 100644 --- a/client/components/Reader/LibsPage/LibsPage.vue +++ b/client/components/Reader/LibsPage/LibsPage.vue @@ -98,7 +98,6 @@ class LibsPage extends Vue { loadLibs() { const libs = this.libs; - console.log(libs.comment); this.startLink = (libs.comment ? libs.comment + ' ': '') + this.removeProtocol(libs.startLink); this.rootLink = this.getOrigin(libs.startLink); this.updateSelectedLink(); From 4f0189f3e0bd3d20f1a5051d5c2c143685537f96 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 16:24:59 +0700 Subject: [PATCH 22/66] =?UTF-8?q?=D0=AD=D0=BA=D1=81=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Reader/LibsPage/LibsPage.vue | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/client/components/Reader/LibsPage/LibsPage.vue b/client/components/Reader/LibsPage/LibsPage.vue index e61ed1c3..94eadfbc 100644 --- a/client/components/Reader/LibsPage/LibsPage.vue +++ b/client/components/Reader/LibsPage/LibsPage.vue @@ -53,6 +53,31 @@ import _ from 'lodash'; import Window from '../../share/Window.vue'; //import rstore from '../../../store/modules/reader'; +const popupCenter = ({url, title, w, h}) => { + // Fixes dual-screen position Most browsers Firefox + const dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : window.screenX; + const dualScreenTop = window.screenTop !== undefined ? window.screenTop : window.screenY; + + const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width; + const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height; + + const systemZoom = width / window.screen.availWidth; + const left = (width - w) / 2 / systemZoom + dualScreenLeft + const top = (height - h) / 2 / systemZoom + dualScreenTop + const newWindow = window.open(url, title, + ` + scrollbars=yes, + width=${w / systemZoom}, + height=${h / systemZoom}, + top=${top}, + left=${left} + ` + ) + + if (window.focus) newWindow.focus(); + //newWindow.close(); +} + export default @Component({ components: { Window @@ -153,6 +178,7 @@ class LibsPage extends Vue { this.$nextTick(() => { this.frameVisible = true; }); + popupCenter({url: this.libs.startLink, w: 900, h: 500}); } addProtocol(url) { From b41d46ac571a699e172af0fe8effce5468ff912a Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 17:40:56 +0700 Subject: [PATCH 23/66] =?UTF-8?q?=D0=AD=D0=BA=D1=81=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/LibsPage/LibsPage.vue | 3 +++ client/index.html.template | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/components/Reader/LibsPage/LibsPage.vue b/client/components/Reader/LibsPage/LibsPage.vue index 94eadfbc..a1fb934c 100644 --- a/client/components/Reader/LibsPage/LibsPage.vue +++ b/client/components/Reader/LibsPage/LibsPage.vue @@ -67,6 +67,9 @@ const popupCenter = ({url, title, w, h}) => { const newWindow = window.open(url, title, ` scrollbars=yes, + location=no, + toolbar=yes, + menubar=no, width=${w / systemZoom}, height=${h / systemZoom}, top=${top}, diff --git a/client/index.html.template b/client/index.html.template index 372b4608..bf792546 100644 --- a/client/index.html.template +++ b/client/index.html.template @@ -6,7 +6,7 @@ - + From b901d9b8c9fe306bad7b8f79c764abda59218b84 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 17:45:08 +0700 Subject: [PATCH 24/66] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D1=8D?= =?UTF-8?q?=D0=BA=D1=81=D0=BF=D0=B5=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/index.html.template | 1 - 1 file changed, 1 deletion(-) diff --git a/client/index.html.template b/client/index.html.template index bf792546..4ed03687 100644 --- a/client/index.html.template +++ b/client/index.html.template @@ -6,7 +6,6 @@ - From da6fed80d1ec653e78f1aaf163ffe81d815b2b3e Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 23:02:28 +0700 Subject: [PATCH 25/66] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20LibsPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Reader/LibsPage/LibsPage.vue | 33 ++----------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/client/components/Reader/LibsPage/LibsPage.vue b/client/components/Reader/LibsPage/LibsPage.vue index a1fb934c..b0732ea2 100644 --- a/client/components/Reader/LibsPage/LibsPage.vue +++ b/client/components/Reader/LibsPage/LibsPage.vue @@ -1,7 +1,7 @@ - Открыть + Открыть Открыть в читалке
@@ -53,34 +53,6 @@ import _ from 'lodash'; import Window from '../../share/Window.vue'; //import rstore from '../../../store/modules/reader'; -const popupCenter = ({url, title, w, h}) => { - // Fixes dual-screen position Most browsers Firefox - const dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : window.screenX; - const dualScreenTop = window.screenTop !== undefined ? window.screenTop : window.screenY; - - const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width; - const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height; - - const systemZoom = width / window.screen.availWidth; - const left = (width - w) / 2 / systemZoom + dualScreenLeft - const top = (height - h) / 2 / systemZoom + dualScreenTop - const newWindow = window.open(url, title, - ` - scrollbars=yes, - location=no, - toolbar=yes, - menubar=no, - width=${w / systemZoom}, - height=${h / systemZoom}, - top=${top}, - left=${left} - ` - ) - - if (window.focus) newWindow.focus(); - //newWindow.close(); -} - export default @Component({ components: { Window @@ -181,7 +153,6 @@ class LibsPage extends Vue { this.$nextTick(() => { this.frameVisible = true; }); - popupCenter({url: this.libs.startLink, w: 900, h: 500}); } addProtocol(url) { From 49f813e8807f08b7dd2f071514599e1ec5d9ea46 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 23:10:45 +0700 Subject: [PATCH 26/66] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20LibsPage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ExternalLibs/ExternalLibs.vue | 235 ++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 client/components/ExternalLibs/ExternalLibs.vue diff --git a/client/components/ExternalLibs/ExternalLibs.vue b/client/components/ExternalLibs/ExternalLibs.vue new file mode 100644 index 00000000..b0732ea2 --- /dev/null +++ b/client/components/ExternalLibs/ExternalLibs.vue @@ -0,0 +1,235 @@ + + + + + From 2c66ca4fdd293f962197f3b2baa912de28c3ee22 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Tue, 27 Oct 2020 23:46:44 +0700 Subject: [PATCH 27/66] =?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=BD=D1=84=D0=B8=D0=B3=D0=B0=20ngi?= =?UTF-8?q?nx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/liberama.top/liberama | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/liberama.top/liberama b/docs/liberama.top/liberama index 828b8d1e..b5885852 100644 --- a/docs/liberama.top/liberama +++ b/docs/liberama.top/liberama @@ -1,3 +1,9 @@ +server { + listen 80 default_server; + server_name _; + return 444; +} + server { listen 443 ssl; # managed by Certbot ssl_certificate /etc/letsencrypt/live/liberama.top/fullchain.pem; # managed by Certbot @@ -51,7 +57,7 @@ server { listen 23480; server_name flibusta_proxy; - valid_referers omnireader.ru beta.omnireader.ru liberama.top; + valid_referers omnireader.ru beta.omnireader.ru liberama.top popup.liberama.top; if ($invalid_referer) { return 403; @@ -68,7 +74,7 @@ server { listen 23481; server_name flibusta_proxy_static; - valid_referers omnireader.ru beta.omnireader.ru liberama.top; + valid_referers omnireader.ru beta.omnireader.ru liberama.top popup.liberama.top; if ($invalid_referer) { return 403; From b8f8df8927e926bd6259919843b429f824d8751d Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 28 Oct 2020 11:19:31 +0700 Subject: [PATCH 28/66] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B8=20nginx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/liberama.top/liberama | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/liberama.top/liberama b/docs/liberama.top/liberama index b5885852..e034344d 100644 --- a/docs/liberama.top/liberama +++ b/docs/liberama.top/liberama @@ -1,7 +1,12 @@ server { - listen 80 default_server; - server_name _; - return 444; + server_name _; + listen 80 default_server; + listen 443 ssl default_server; + + #openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/ssl/nginx.key -out /etc/nginx/ssl/nginx.crt + ssl_certificate /etc/nginx/ssl/nginx.crt; + ssl_certificate_key /etc/nginx/ssl/nginx.key; + return 403; } server { From ebe42956ada40f04cbd3b7ece372f758ccfe3173 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 28 Oct 2020 18:27:24 +0700 Subject: [PATCH 29/66] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=D1=8B=20=D0=B7=D0=B0=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=B6=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D0=B4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B0=D0=BC=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/router.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/client/router.js b/client/router.js index 512e0db4..9fc8ebbc 100644 --- a/client/router.js +++ b/client/router.js @@ -2,18 +2,14 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; import _ from 'lodash'; -//немедленная загрузка -import CardIndex from './components/CardIndex/CardIndex.vue'; -//const CardIndex = () => import('./components/CardIndex/CardIndex.vue'); - +const CardIndex = () => import('./components/CardIndex/CardIndex.vue'); const Search = () => import('./components/CardIndex/Search/Search.vue'); const Card = () => import('./components/CardIndex/Card/Card.vue'); const Book = () => import('./components/CardIndex/Book/Book.vue'); const History = () => import('./components/CardIndex/History/History.vue'); - +const Reader = () => import('./components/Reader/Reader.vue'); //немедленная загрузка -//const Reader = () => import('./components/Reader/Reader.vue'); -import Reader from './components/Reader/Reader.vue'; +//import Reader from './components/Reader/Reader.vue'; //const Forum = () => import('./components/Forum/Forum.vue'); const Income = () => import('./components/Income/Income.vue'); From 8c0f193738d2a137b8147eb90cf66873fdc3bd5e Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 28 Oct 2020 18:28:28 +0700 Subject: [PATCH 30/66] =?UTF-8?q?=D0=98=D1=81=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=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/App.vue | 65 ++++++++------------------------------- 1 file changed, 12 insertions(+), 53 deletions(-) diff --git a/client/components/App.vue b/client/components/App.vue index c979599e..038cd293 100644 --- a/client/components/App.vue +++ b/client/components/App.vue @@ -1,56 +1,4 @@