slow load fix & new pay method

1 year ago · 0171e8830e
3 changed files with 76 additions and 6 deletions
--- a/src/components/Others/CustomSvg/DonationAlertsSvg.vue
+++ b/src/components/Others/CustomSvg/DonationAlertsSvg.vue
@ -0,0 +1,41 @@
+<template>
+  <svg xmlns="http://www.w3.org/2000/svg" :width="w" :height="h" viewBox="0 0 37 37">
+    <defs>
+      <linearGradient id="a" x1="86.328%" x2="8.51%" y1="11.463%" y2="100%">
+        <stop offset="0%" stop-color="#F59C07"/>
+        <stop offset="100%" stop-color="#F57507"/>
+      </linearGradient>
+    </defs>
+    <path fill="currentColor" fill-rule="nonzero" d="M18.692 25.041h-2.906a.63.63 0 0 1-.445-.175.502.502 0 0 1-.152-.415l.257-2.626c.025-.28.285-.495.596-.494h2.907c.17 0 .33.063.445.176.113.112.169.263.152.414l-.257 2.627c-.025.28-.285.494-.597.493zm.466-5.143h-2.96a.582.582 0 0 1-.593-.571l.806-8.875a.585.585 0 0 1 .592-.503h2.96c.327 0 .593.256.593.571l-.83 8.88a.585.585 0 0 1-.568.498zM36.566 9.549L28.898.63A1.81 1.81 0 0 0 27.525 0H4.56a1.803 1.803 0 0 0-1.8 1.616L.006 32.896c-.044.503.126 1 .468 1.373a1.81 1.81 0 0 0 1.332.582h4.51L5.63 43l8.869-8.143h10.074c.47 0 .922-.18 1.26-.507l9.462-9.155c.312-.302.504-.705.541-1.137l1.157-13.184a1.794 1.794 0 0 0-.427-1.325zm-7.013 11.994a1.796 1.796 0 0 1-.541 1.142l-5.478 5.197a1.81 1.81 0 0 1-1.249.496h-13.4a1.831 1.831 0 0 1-1.324-.59 1.816 1.816 0 0 1-.476-1.365L8.707 8.11a1.803 1.803 0 0 1 1.8-1.616h13.628c.522 0 1.02.226 1.362.62l4.326 4.976c.326.358.494.832.465 1.314l-.735 8.138z"/>
+  </svg>
+
+</template>
+
+<script>
+export default {
+  name: "DonationAlertsSvg",
+  props: {
+    w: {
+      type: String,
+      default: "512px"
+    },
+    h: {
+      type: String,
+      default: "60%"
+    },
+    url: {
+      type:String,
+      default: null
+    },
+    inline: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    openUrl(){
+      if (this.url !== null) window.open(this.url, '_blank');
+    }
+  }
+}
+</script>
--- a/src/components/TabsMenuElements/ProfileView/Components/ProfileContainer.vue
+++ b/src/components/TabsMenuElements/ProfileView/Components/ProfileContainer.vue
@ -87,10 +87,11 @@
        </div>
        <p class="profile-text" style="text-align: right; cursor: pointer;" v-if="this.player['play_on'] !== null && 'ip' in this.player['play_on']" v-on:click="showIP()">IP : {{player_ip}}</p>
        <p class="profile-text" style="text-align: right; cursor: pointer;" v-if="this.player['play_on'] !== null && 'country' in this.player['play_on']">Страна : {{this.player['play_on']['country']}}</p>
-        <p class="profile-text clickable" style="text-align: right" v-if="this.player['killfeed'] !== null && 'kills' in this.player['killfeed']" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 0)">Убийств : {{this.player['killfeed']['kills']}}</p>
-        <p class="profile-text clickable" style="text-align: right" v-if="this.player['killfeed'] !== null && 'assists' in this.player['killfeed']" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 2)">Помощи : {{this.player['killfeed']['assists']}}</p>
-        <p class="profile-text clickable" style="text-align: right" v-if="this.player['killfeed'] !== null && 'deads' in this.player['killfeed']" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 1)">Смертей : {{this.player['killfeed']['deads']}}</p>
-        <p class="profile-text" style="text-align: right" v-if="this.player['killfeed'] !== null && 'suicides' in this.player['killfeed']">Суицидов : {{this.player['killfeed']['suicides']}}</p>
+        <p class="profile-text clickable" style="text-align: right" v-on:click="loadKillFeed()">К\Д : {{this.killfeed.loading?'Загрузка...':this.killfeed.loaded?Math.round(this.killfeed.store['kills'] / this.killfeed.store['deads']):"Показать"}}</p>
+        <p class="profile-text clickable" style="text-align: right" v-if="this.killfeed.store !== null && 'kills' in this.killfeed.store" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 0)">Убийств : {{this.killfeed.store['kills']}}</p>
+        <p class="profile-text clickable" style="text-align: right" v-if="this.killfeed.store !== null && 'assists' in this.killfeed.store" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 2)">Помощи : {{this.killfeed.store['assists']}}</p>
+        <p class="profile-text clickable" style="text-align: right" v-if="this.killfeed.store !== null && 'deads' in this.killfeed.store" v-on:click="$refs.pc_mkd.showMe(true, player['steamids']['steam64'], undefined, 1)">Смертей : {{this.killfeed.store['deads']}}</p>
+        <p class="profile-text" style="text-align: right" v-if="this.killfeed.store !== null && 'suicides' in this.killfeed.store">Суицидов : {{this.killfeed.store['suicides']}}</p>
        <MyKillsDialog ref="pc_mkd"/>
        <MessagesDialog ref="pc_md"/>
        <p class="profile-text clickable" style="text-align: right" v-if="'messages' in this.player" v-on:click="$refs.pc_md.showMe(true, player['steamids']['steam64'])">Сообщений : {{this.player['messages']}}</p>
@ -154,6 +155,11 @@ export default {
      loading: false,
      loaded: false,
      store:[]
+    },
+    killfeed: {
+      loading: false,
+      loaded: false,
+      store:null
    }
  }),
  methods: {
@ -238,6 +244,18 @@ export default {
          })
          .catch(() => this.altaccount.loaded = false)
          .finally(() => this.altaccount.loading = false)
+    },
+    loadKillFeed(){
+      if (this.killfeed.store == null && this.killfeed.loading === false) {
+        this.killfeed.loading = true;
+        axios.get(`api/profile/web?steam64=${this.player['steamids']['steam64']}&requests=killfeed` + Random.getRndWebAppend())
+            .then(response => {
+             this.killfeed.store = response.data['killfeed'];
+             this.killfeed.loaded = true;
+            })
+            .catch(() => this.killfeed.loaded = false)
+            .finally(() => this.killfeed.loading = false)
+      }
    }
  }
 }
--- a/src/components/TabsMenuElements/VipView/Components/VipBuyDialog.vue
+++ b/src/components/TabsMenuElements/VipView/Components/VipBuyDialog.vue
@ -34,6 +34,11 @@
            <p class="p-vipbuy" style="margin-bottom: -5%">{{price.item_price}}</p>
            <p class="p-vipbuy-extra">В этом году купили {{getStat4('steam', price.period)}} раз</p>
          </div>
+          <div style="max-width: 40%; float: left;" class="clickable" v-if="price.period !=='free'" v-on:click="price.donationalerts===true?buyWithDA():showBMDD()">
+            <DonationAlertsSvg class="img-vipextra"/>
+            <p class="p-vipbuy" style="margin-bottom: -5%">{{price.money_price + price.money_price * price.da_percent / 100}} рублей</p>
+            <p class="p-vipbuy-extra">В этом году купили {{getStat4('donationalerts', price.period)}} раз</p>
+          </div>
          <div style="max-width: 40%; float: left;" class="clickable" v-if="price.period ==='free'" v-on:click="buyWithFree()">
            <FreeSvg class="img-vipextra"/>
            <p class="p-vipbuy" style="margin-bottom: -5%">{{price.item_price}}</p>
@ -63,10 +68,11 @@ import AuthWindow from "@/components/Others/Auth/AuthWindow.vue";
 import FreeVipDialog from "@/components/TabsMenuElements/VipView/Components/FreeVipDialog.vue";
 import Random from "@/api/Random";
 import BuyMethodDisableDialog from "@/components/ActionDialogs/BuyMethodDisableDialog.vue";
+import DonationAlertsSvg from "@/components/Others/CustomSvg/DonationAlertsSvg.vue";

 export default {
  name: 'VipBuyDialog',
-  components: {BuyMethodDisableDialog, FreeVipDialog, AuthWindow, FreeSvg, SteamSvg, QiwiSvg},
+  components: {DonationAlertsSvg, BuyMethodDisableDialog, FreeVipDialog, AuthWindow, FreeSvg, SteamSvg, QiwiSvg},
  data: () => ({
    showBuyDialog: false
  }),
@ -86,6 +92,9 @@ export default {
    buyWithQiwi(cost) {
      window.open(`api/profile/current/buyvip?buy_type=qiwi&steam64=${this.$API.player.store.steamids.steam64}&cost=${cost}` + Random.getRndWebAppend(), "_blank")
    },
+    buyWithDA() {
+      window.open("api/profile/current/buyvip?buy_type=donationalerts" + Random.getRndWebAppend(), "_blank");
+    },
    buyWithFree() {
      this.$refs.vfd.getFreeVIP();
    },
@ -94,7 +103,9 @@ export default {
    },
    getStat4(service, period) {
      try {
-        return this.$API.stats['donate']['year']['statistic'][service][period];
+        if (period in this.$API.stats['donate']['year']['statistic'][service])
+          return this.$API.stats['donate']['year']['statistic'][service][period];
+        else return 0;
      } catch (e) {return 0;}
    },
    showBMDD() {