diff --git a/src/api/GlobalApi.js b/src/api/GlobalApi.js index 6fc5c06..bb591ea 100644 --- a/src/api/GlobalApi.js +++ b/src/api/GlobalApi.js @@ -2,6 +2,7 @@ import axios from "axios"; import AdminApi from "@/api/AdminApi"; import PlayerApi from "@/api/PlayerApi"; import Stages from "@/api/Stages"; +import VipAPI from "@/api/VipApi"; export default class GlobalApi { stats = { @@ -23,6 +24,7 @@ export default class GlobalApi { admin = new AdminApi() player = new PlayerApi() + vip = new VipAPI(); builddate = process.env.BUILDDATE === undefined ? null : process.env.BUILDDATE; @@ -86,7 +88,9 @@ export default class GlobalApi { this.fillThis('uniq'), this.fillServers(), this.admin.load(this.load_stages), - this.player.load(this.load_stages)] + this.player.load(this.load_stages), + this.vip.getVipPrices(this.load_stages), + this.vip.getVipStatistic(this.load_stages)] ).then(() => { console.log("[Loader] success end"); this.loading = false; diff --git a/src/api/PlayerApi.js b/src/api/PlayerApi.js index 70b773e..2af856c 100644 --- a/src/api/PlayerApi.js +++ b/src/api/PlayerApi.js @@ -4,7 +4,8 @@ export default class PlayerApi { store = { permition: null, steam_data: null, - ban: null + ban: null, + steamids: null } discord = null; diff --git a/src/api/Stages.js b/src/api/Stages.js index ff1d7af..50c7835 100644 --- a/src/api/Stages.js +++ b/src/api/Stages.js @@ -12,9 +12,11 @@ export default class Stages { human(s) { switch (s) { - case 'servers':return 'информация о серверах...'; - case 'uniq': return 'уникальные игроки...'; - case 'statistic': return 'сейчас играют...'; + case 'servers':return 'смотрим сколько путисов умерло...'; + case 'uniq': return 'оцениваем шапку...'; + case 'statistic': return 'молимся за здравия всех...'; + case 'vip prices': return 'курс рубля к лаймовой краске...'; + case 'vip statistic': return 'переводим деньги на СВО...'; default: return s; } } diff --git a/src/api/VipApi.js b/src/api/VipApi.js new file mode 100644 index 0000000..4600275 --- /dev/null +++ b/src/api/VipApi.js @@ -0,0 +1,46 @@ +import axios from "axios"; + +export default class VipAPI { + + vip_prices = [{'human_duration':"НИКОГДА", 'money_price':0, 'img_url':'', 'period':'never', 'item_price':"нихуя"}] + vip_statistic = {} + freevip_players = -1; + vip_players = -1; + + async getVipPrices(stages) { + console.log(`[API] load: vip prices`); + stages.add("vip prices"); + return await axios.get(`/api/external/vip`) + .then(response => response.data) + .then(response => { + this.vip_prices = response; + this.vip_prices.forEach(price => { + price.img_url = require(`@/assets/images/vip/${price.img_url.replace("site_content/images/vip/", "")}`); + }) + }) + .catch(err => { + console.log(`[API] cannot request vip prices, err: ${err}`); + throw new Error("BLYA"); + }).finally(() => { + stages.remove("vip prices"); + }) + } + + async getVipStatistic(stages) { + console.log(`[API] load: vip statistic`); + stages.add("vip statistic"); + return await axios.get(`/api/stats?filter=donate`) + .then(response => response.data) + .then(response => { + this.vip_statistic = response['donate']; + this.freevip_players = response['freevip_players']; + this.vip_players = response['vip_players'] + }) + .catch(err => { + console.log(`[API] cannot request vip statistic, err: ${err}`); + throw new Error("BLYA"); + }).finally(() => { + stages.remove("vip statistic"); + }) + } +} \ No newline at end of file diff --git a/src/assets/images/vip/VIP_1_DAY.jpg b/src/assets/images/vip/VIP_1_DAY.jpg new file mode 100644 index 0000000..e4eaf98 Binary files /dev/null and b/src/assets/images/vip/VIP_1_DAY.jpg differ diff --git a/src/assets/images/vip/VIP_1_MOUNTH.jpg b/src/assets/images/vip/VIP_1_MOUNTH.jpg new file mode 100644 index 0000000..eded584 Binary files /dev/null and b/src/assets/images/vip/VIP_1_MOUNTH.jpg differ diff --git a/src/assets/images/vip/VIP_7_DAYS.jpg b/src/assets/images/vip/VIP_7_DAYS.jpg new file mode 100644 index 0000000..b614512 Binary files /dev/null and b/src/assets/images/vip/VIP_7_DAYS.jpg differ diff --git a/src/assets/images/vip/freevip.jpg b/src/assets/images/vip/freevip.jpg new file mode 100644 index 0000000..3f815f2 Binary files /dev/null and b/src/assets/images/vip/freevip.jpg differ diff --git a/src/components/Others/CustomSvg/FreeSvg.vue b/src/components/Others/CustomSvg/FreeSvg.vue new file mode 100644 index 0000000..6f64d76 --- /dev/null +++ b/src/components/Others/CustomSvg/FreeSvg.vue @@ -0,0 +1,57 @@ + + + \ No newline at end of file diff --git a/src/components/Others/CustomSvg/QiwiSvg.vue b/src/components/Others/CustomSvg/QiwiSvg.vue new file mode 100644 index 0000000..21ea96a --- /dev/null +++ b/src/components/Others/CustomSvg/QiwiSvg.vue @@ -0,0 +1,21 @@ + + + \ No newline at end of file diff --git a/src/components/TabsMenu.vue b/src/components/TabsMenu.vue index 18278af..a53d453 100644 --- a/src/components/TabsMenu.vue +++ b/src/components/TabsMenu.vue @@ -19,7 +19,7 @@ import RulesView from "@/components/TabsMenuElements/RulesView/RulesView.vue"; import ServersView from "@/components/TabsMenuElements/ServersView/ServersView.vue"; import ProfileView from "@/components/TabsMenuElements/ProfileView/ProfileView.vue"; -import VipView from "@/components/TabsMenuElements/VipView.vue"; +import VipView from "@/components/VipView/VipView.vue"; import AboutView from "@/components/TabsMenuElements/AboutView.vue"; import EmptyTab from "@/components/TabsMenuElements/EmptyTab.vue"; import MainView from "@/components/TabsMenuElements/MainView/MainView.vue"; diff --git a/src/components/TabsMenuElements/ProfileView/AuthWindow.vue b/src/components/TabsMenuElements/ProfileView/AuthWindow.vue index ff75af5..dc8c3c2 100644 --- a/src/components/TabsMenuElements/ProfileView/AuthWindow.vue +++ b/src/components/TabsMenuElements/ProfileView/AuthWindow.vue @@ -23,6 +23,7 @@

если хочешь на наш дискорд сервер, а так не надо

+
Не хочу
@@ -42,7 +43,9 @@ export default { return window.open(`/api/auth/${action}`, '_self'); } return window.open(`/api/auth/${service}/${action}`, '_self'); - } + }, + openAW() { this.showAuthDialog = true }, + closeAW() { this.showAuthDialog = false } } } diff --git a/src/components/TabsMenuElements/VipView.vue b/src/components/TabsMenuElements/VipView.vue deleted file mode 100644 index bc5f3b5..0000000 --- a/src/components/TabsMenuElements/VipView.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/src/components/VipView/Components/VipBuyDialog.vue b/src/components/VipView/Components/VipBuyDialog.vue new file mode 100644 index 0000000..b127035 --- /dev/null +++ b/src/components/VipView/Components/VipBuyDialog.vue @@ -0,0 +1,129 @@ + + + + + \ No newline at end of file diff --git a/src/components/VipView/Components/VipCard.vue b/src/components/VipView/Components/VipCard.vue new file mode 100644 index 0000000..c69b562 --- /dev/null +++ b/src/components/VipView/Components/VipCard.vue @@ -0,0 +1,63 @@ + + + + + \ No newline at end of file diff --git a/src/components/VipView/VipView.vue b/src/components/VipView/VipView.vue new file mode 100644 index 0000000..d94fb8b --- /dev/null +++ b/src/components/VipView/VipView.vue @@ -0,0 +1,75 @@ + + + \ No newline at end of file