From c505d88aeeed9a63beabfd4ff1d09da5ba34d7d5 Mon Sep 17 00:00:00 2001 From: Kostya Date: Wed, 13 Dec 2023 20:52:14 +0300 Subject: [PATCH 1/8] added redirected on click btn --- luckydiamond/src/components/PaymentsModal.vue | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/luckydiamond/src/components/PaymentsModal.vue b/luckydiamond/src/components/PaymentsModal.vue index b612c46..1f41996 100644 --- a/luckydiamond/src/components/PaymentsModal.vue +++ b/luckydiamond/src/components/PaymentsModal.vue @@ -21,7 +21,7 @@
- +
@@ -36,7 +36,7 @@
- +
@@ -81,19 +81,22 @@ export default { closeModal() { return this.$emit('closemodal') }, - detectorMethod(method) { - this.closeModal() - if (method === 'dep') { - return this.$emit('deposit', this.amount) - } - else if (method === 'with') { - return this.$emit('withdraw', this.amount, this.card) - } - else { - console.log('Произошла ошибка при взаимодействие') - return - } + RedirectedMethodDep() { + window.location.href = this.url }, + // detectorMethod(method) { + // this.closeModal() + // if (method === 'dep') { + // return this.$emit('deposit', this.amount) + // } + // else if (method === 'with') { + // return this.$emit('withdraw', this.amount, this.card) + // } + // else { + // console.log('Произошла ошибка при взаимодействие') + // return + // } + // }, clickedBtnChoice(index, content) { this.clickedBtn = index this.amount = content From 95cbda6842d86a57ba5aa6fe85473fa802c10b5e Mon Sep 17 00:00:00 2001 From: Kostya Date: Wed, 13 Dec 2023 20:57:48 +0300 Subject: [PATCH 2/8] added off btn if dont have response --- .../src/assets/css/ComponentsStyles/payments-modal.css | 4 ++++ luckydiamond/src/components/PaymentsModal.vue | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css index 14388a7..b230bec 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css @@ -126,6 +126,10 @@ input:focus { border: none; } +.btn-style-payments button:disabled { + background: #3d3a3a; +} + .btn-click { border-radius: 10px !important; background: #EF4444 !important; diff --git a/luckydiamond/src/components/PaymentsModal.vue b/luckydiamond/src/components/PaymentsModal.vue index 491c1a4..9c79886 100644 --- a/luckydiamond/src/components/PaymentsModal.vue +++ b/luckydiamond/src/components/PaymentsModal.vue @@ -21,7 +21,7 @@
- +
@@ -57,18 +57,21 @@ export default { card: 0, clickedBtn: '', url: '', + offBtn: false, PaymentsModalNumbers } }, watch: { amount(newAmount) { console.log(newAmount) + this.offBtn = !this.offBtn setTimeout(() => { try { GettingMoneyOperation(newAmount) .then((response) => { console.log('Payments Modal Working!: ', response) this.url = response.url + this.offBtn = !this.offBtn }) } catch (e) { From 8e589baa2706e12a29956420bbfeb6a8c26b46df Mon Sep 17 00:00:00 2001 From: Kostya Date: Wed, 13 Dec 2023 21:01:16 +0300 Subject: [PATCH 3/8] fixed bug with off btn --- luckydiamond/src/components/PaymentsModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/components/PaymentsModal.vue b/luckydiamond/src/components/PaymentsModal.vue index 9c79886..2d33b1c 100644 --- a/luckydiamond/src/components/PaymentsModal.vue +++ b/luckydiamond/src/components/PaymentsModal.vue @@ -57,7 +57,7 @@ export default { card: 0, clickedBtn: '', url: '', - offBtn: false, + offBtn: true, PaymentsModalNumbers } }, From 0a76103b9552d0e357399c8b61faee3598a929ab Mon Sep 17 00:00:00 2001 From: Kostya Date: Wed, 13 Dec 2023 21:04:52 +0300 Subject: [PATCH 4/8] fixed bug with off btn v.2 --- luckydiamond/src/components/PaymentsModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/luckydiamond/src/components/PaymentsModal.vue b/luckydiamond/src/components/PaymentsModal.vue index 2d33b1c..923a287 100644 --- a/luckydiamond/src/components/PaymentsModal.vue +++ b/luckydiamond/src/components/PaymentsModal.vue @@ -64,14 +64,14 @@ export default { watch: { amount(newAmount) { console.log(newAmount) - this.offBtn = !this.offBtn + this.offBtn = true setTimeout(() => { try { GettingMoneyOperation(newAmount) .then((response) => { console.log('Payments Modal Working!: ', response) this.url = response.url - this.offBtn = !this.offBtn + this.offBtn = false }) } catch (e) { From 930fa2be013a537ae11ad780b09795062572c1d4 Mon Sep 17 00:00:00 2001 From: Kostya Date: Wed, 13 Dec 2023 21:06:20 +0300 Subject: [PATCH 5/8] added debuger for checking status offbtn --- luckydiamond/src/components/PaymentsModal.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/luckydiamond/src/components/PaymentsModal.vue b/luckydiamond/src/components/PaymentsModal.vue index 923a287..0cebd3b 100644 --- a/luckydiamond/src/components/PaymentsModal.vue +++ b/luckydiamond/src/components/PaymentsModal.vue @@ -65,6 +65,7 @@ export default { amount(newAmount) { console.log(newAmount) this.offBtn = true + console.log('OFFBTN', this.offBtn) setTimeout(() => { try { GettingMoneyOperation(newAmount) @@ -72,6 +73,7 @@ export default { console.log('Payments Modal Working!: ', response) this.url = response.url this.offBtn = false + console.log('ONBTN', this.offBtn) }) } catch (e) { From 3577588268adac14e9c863c1027f19e3a103a1b4 Mon Sep 17 00:00:00 2001 From: Hepatica <75219332+danilt2000@users.noreply.github.com> Date: Wed, 13 Dec 2023 20:21:42 +0100 Subject: [PATCH 6/8] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6748566..b0dbb36 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,8 @@ https://github.com/sp-worlds/api-docs https://discord.com/developers/docs/topics/oauth2#oauth2 -

Bootstrap 5 Tutorial

-

Если получится то использовать его для фронта

- https://www.w3schools.com/bootstrap5/ +

Откуда берём вдохновление

+ https://cs.fail/en/ From 4806f65be65a29f64e98d79a31b3f33fe7cc924e Mon Sep 17 00:00:00 2001 From: Kostya Date: Wed, 13 Dec 2023 22:23:00 +0300 Subject: [PATCH 7/8] added username getting --- luckydiamond/src/pages/ProfilePage.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index ee20fb8..5c4a01d 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -57,6 +57,7 @@ import AsideBarComponent from "@/components/AsidebarComponent.vue"; import ChatComponent from "@/components/ChatComponent.vue"; import HeaderComponent from "@/components/HeaderComponent.vue"; import PaymentsModal from "@/components/PaymentsModal.vue"; +import { GetCookie } from "@/assets/js/storage/CookieStorage"; import '@/assets/css/PagesStyles/profile.css' export default { @@ -70,6 +71,10 @@ export default { arrayHistory: [], } }, + created() { + this.username = GetCookie('SpUserName') + console.log(this.username) + }, methods: { formatNumber(number) { return number < 10 ? `0${number}` : number; From 3dbefb199e30ad757076917424261355a44cd62b Mon Sep 17 00:00:00 2001 From: Kostya Date: Wed, 13 Dec 2023 22:28:06 +0300 Subject: [PATCH 8/8] added user img in profile page --- luckydiamond/src/pages/ProfilePage.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 5c4a01d..834926a 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -8,7 +8,7 @@
- +

{{ username }}

{{ balance }}

@@ -65,6 +65,7 @@ export default { data() { return { username: 'Artemka', + imageUrl: '', balance: 25000, openModal: false, payments: true, @@ -73,7 +74,7 @@ export default { }, created() { this.username = GetCookie('SpUserName') - console.log(this.username) + this.imageUrl = `https://visage.surgeplay.com/front/256/${this.username}` }, methods: { formatNumber(number) {