-
+
- Вы можете пожертвовать на развитие проекта любую сумму:
+ Здесь вы можете пожертвовать на развитие проекта:
-
-

-
- Пожертвовать
-
-
- {{ yooAddress }}
-
-
- Скопировать
-
-
-
-
-
+
+
+ Поддержать проект
+
-
-

-
- {{ bitcoinAddress }}
-
-
- Скопировать
-
-
-
-
-
-
-

-
- {{ litecoinAddress }}
-
-
- Скопировать
-
-
-
-
-
-
-

-
- {{ moneroAddress }}
-
-
- Скопировать
-
-
-
+
+ * Ваш донат является подарком автору проекта
@@ -74,28 +21,14 @@
//-----------------------------------------------------------------------------
import vueComponent from '../../../vueComponent.js';
-import {copyTextToClipboard} from '../../../../share/utils';
+import * as utils from '../../../../share/utils';
class DonateHelpPage {
- yooAddress = '410018702323056';
- paypalAddress = 'bookpauk@gmail.com';
- bitcoinAddress = '3EbgZ7MK1UVaN38Gty5DCBtS4PknM4Ut85';
- litecoinAddress = 'MP39Riec4oSNB3XMjiquKoLWxbufRYNXxZ';
- moneroAddress = '8BQPnvHcPSHM5gMQsmuypDgx9NNsYqwXKfDDuswEyF2Q2ewQSfd2pkK6ydH2wmMyq2JViZvy9DQ35hLMx7g72mFWNJTPtnz';
-
created() {
}
- donateYooMoney() {
- window.open(`https://yoomoney.ru/to/${this.yooAddress}`, '_blank');
- }
-
- async copyAddress(address, prefix) {
- const result = await copyTextToClipboard(address);
- if (result)
- this.$root.notify.success(`${prefix} ${address} успешно скопирован в буфер обмена`);
- else
- this.$root.notify.error('Копирование не удалось');
+ makeDonation() {
+ utils.makeDonation();
}
}
@@ -116,31 +49,4 @@ export default vueComponent(DonateHelpPage);
padding: 0;
text-indent: 20px;
}
-
-.box {
- max-width: 550px;
- overflow-wrap: break-word;
-}
-
-.address {
- padding-top: 10px;
- margin-top: 20px;
-}
-
-.para {
- margin: 10px 10px 10px 40px;
-}
-
-.logo {
- width: 130px;
- position: relative;
- top: 10px;
-}
-
-.copy-icon {
- margin-left: 10px;
- cursor: pointer;
- font-size: 120%;
- color: blue;
-}
diff --git a/client/components/Reader/HelpPage/DonateHelpPage/assets/paypal.png b/client/components/Reader/HelpPage/DonateHelpPage/assets/paypal.png
deleted file mode 100644
index 17e6418c..00000000
Binary files a/client/components/Reader/HelpPage/DonateHelpPage/assets/paypal.png and /dev/null differ
diff --git a/client/components/Reader/HelpPage/DonateHelpPage/assets/yoomoney.png b/client/components/Reader/HelpPage/DonateHelpPage/assets/yoomoney.png
deleted file mode 100644
index dd47ef50..00000000
Binary files a/client/components/Reader/HelpPage/DonateHelpPage/assets/yoomoney.png and /dev/null differ
diff --git a/client/components/Reader/HelpPage/HelpPage.vue b/client/components/Reader/HelpPage/HelpPage.vue
index 2e1d80be..71b6b18c 100644
--- a/client/components/Reader/HelpPage/HelpPage.vue
+++ b/client/components/Reader/HelpPage/HelpPage.vue
@@ -1,5 +1,5 @@
-
+
Справка
@@ -36,14 +36,14 @@ import CommonHelpPage from './CommonHelpPage/CommonHelpPage.vue';
import HotkeysHelpPage from './HotkeysHelpPage/HotkeysHelpPage.vue';
import MouseHelpPage from './MouseHelpPage/MouseHelpPage.vue';
import VersionHistoryPage from './VersionHistoryPage/VersionHistoryPage.vue';
-//import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue';
+import DonateHelpPage from './DonateHelpPage/DonateHelpPage.vue';
const pages = {
'CommonHelpPage': CommonHelpPage,
'HotkeysHelpPage': HotkeysHelpPage,
'MouseHelpPage': MouseHelpPage,
'VersionHistoryPage': VersionHistoryPage,
- //'DonateHelpPage': DonateHelpPage,
+ 'DonateHelpPage': DonateHelpPage,
};
const tabs = [
@@ -51,7 +51,7 @@ const tabs = [
['MouseHelpPage', 'Мышь/тачскрин'],
['HotkeysHelpPage', 'Клавиатура'],
['VersionHistoryPage', 'История версий'],
- //['DonateHelpPage', 'Помочь проекту'],
+ ['DonateHelpPage', 'Помочь проекту'],
];
const componentOptions = {
@@ -80,7 +80,7 @@ class HelpPage {
}
activateDonateHelpPage() {
- //this.selectedTab = 'DonateHelpPage';
+ this.selectedTab = 'DonateHelpPage';
}
activateVersionHistoryHelpPage() {
diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue
index 34eb7cc4..1c8b9f13 100644
--- a/client/components/Reader/LoaderPage/LoaderPage.vue
+++ b/client/components/Reader/LoaderPage/LoaderPage.vue
@@ -57,7 +57,7 @@
Найти книгу
Справка
-
+
Помочь проекту
v{{ version }}
Версия сервера {{ version }}, версия клиента {{ clientVersion }}, необходимо обновить страницу
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 9cc55eba..02c4dceb 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -721,7 +721,7 @@ class Reader {
return;
const recent = this.mostRecentBook();
const pos = (recent && recent.bookPos && this.allowUrlParamBookPos ? `__p=${recent.bookPos}&` : '');
- const url = (recent ? `url=${recent.url}` : '');
+ const url = (recent ? `url=${encodeURIComponent(recent.url)}` : '');
if (isNewRoute)
this.$router.push(`/reader?${pos}${url}`).catch(() => {});
else
diff --git a/client/components/Reader/ReaderDialogs/ReaderDialogs.vue b/client/components/Reader/ReaderDialogs/ReaderDialogs.vue
index 248f4670..afdb37d7 100644
--- a/client/components/Reader/ReaderDialogs/ReaderDialogs.vue
+++ b/client/components/Reader/ReaderDialogs/ReaderDialogs.vue
@@ -18,56 +18,51 @@
-