Эх сурвалжийг харах

Merge branch 'release/0.8.4'

Book Pauk 5 жил өмнө
parent
commit
694976cb6e

+ 13 - 0
client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue

@@ -15,6 +15,18 @@
                 </div>
                 </div>
             </div>
             </div>
 
 
+            <div class="address">
+                <img class="logo" src="./assets/paypal.png">
+                <div class="para">{{ paypalAddress }}
+                    <el-tooltip :open-delay="500" effect="light">
+                        <template slot="content">
+                            Скопировать
+                        </template>
+                        <i class="el-icon-copy-document copy-icon" @click="copyAddress(paypalAddress, 'Paypal-адрес')"></i>
+                    </el-tooltip>
+                </div>
+            </div>            
+
             <div class="address">                
             <div class="address">                
                 <img class="logo" src="./assets/bitcoin.png">
                 <img class="logo" src="./assets/bitcoin.png">
                 <div class="para">{{ bitcoinAddress }}
                 <div class="para">{{ bitcoinAddress }}
@@ -64,6 +76,7 @@ export default @Component({
 })
 })
 class DonateHelpPage extends Vue {
 class DonateHelpPage extends Vue {
     yandexAddress = '410018702323056';
     yandexAddress = '410018702323056';
+    paypalAddress = 'bookpauk@gmail.com';
     bitcoinAddress = '3EbgZ7MK1UVaN38Gty5DCBtS4PknM4Ut85';
     bitcoinAddress = '3EbgZ7MK1UVaN38Gty5DCBtS4PknM4Ut85';
     litecoinAddress = 'MP39Riec4oSNB3XMjiquKoLWxbufRYNXxZ';
     litecoinAddress = 'MP39Riec4oSNB3XMjiquKoLWxbufRYNXxZ';
     moneroAddress = '8BQPnvHcPSHM5gMQsmuypDgx9NNsYqwXKfDDuswEyF2Q2ewQSfd2pkK6ydH2wmMyq2JViZvy9DQ35hLMx7g72mFWNJTPtnz';
     moneroAddress = '8BQPnvHcPSHM5gMQsmuypDgx9NNsYqwXKfDDuswEyF2Q2ewQSfd2pkK6ydH2wmMyq2JViZvy9DQ35hLMx7g72mFWNJTPtnz';

BIN
client/components/Reader/HelpPage/DonateHelpPage/assets/paypal.png


+ 12 - 0
client/components/Reader/versionHistory.js

@@ -1,4 +1,16 @@
 export const versionHistory = [
 export const versionHistory = [
+{
+    showUntil: '2020-02-05',
+    header: '0.8.4 (2020-02-06)',
+    content:
+`
+<ul>
+    <li>добавлен paypal-адрес для пожертвований</li>
+    <li>исправления багов</li>
+</ul>
+`
+},
+
 {
 {
     showUntil: '2020-01-27',
     showUntil: '2020-01-27',
     header: '0.8.3 (2020-01-28)',
     header: '0.8.3 (2020-01-28)',

+ 1 - 1
package-lock.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "Liberama",
   "name": "Liberama",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "lockfileVersion": 1,
   "lockfileVersion": 1,
   "requires": true,
   "requires": true,
   "dependencies": {
   "dependencies": {

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "Liberama",
   "name": "Liberama",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "author": "Book Pauk <bookpauk@gmail.com>",
   "license": "CC0-1.0",
   "license": "CC0-1.0",
   "repository": "bookpauk/liberama",
   "repository": "bookpauk/liberama",