From d6ecad255439f37b543b39153a51dcaeec20b217 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 4 Feb 2024 12:39:18 +0300 Subject: [PATCH 01/61] build grid for crash-game --- luckydiamond/src/assets/css/global.css | 30 +++++++++++++++++ .../src/pages/games-pages/CrashgamePage.vue | 32 +++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index 3e048ac..ef60c29 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -73,6 +73,22 @@ body, html { grid-gap: 10px; } +.grid-crash { + display: grid; + grid-template-columns: .35fr repeat(5, 1fr) 1fr; + grid-template-rows: auto 0fr repeat(4, 1fr); + grid-auto-columns: 1fr; + gap: 10px; + grid-auto-flow: row; + grid-template-areas: + "menu header header header header header header" + "menu crashgame crashgame crashgame crashgame crashgame chat" + "menu crashgame crashgame crashgame crashgame crashgame chat" + "menu crashgame crashgame crashgame crashgame crashgame chat" + "menu crashgame crashgame crashgame crashgame crashgame chat" + "menu crashplayers crashplayers crashplayers crashplayers crashplayers chat" + "menu crashplayers crashplayers crashplayers crashplayers crashplayers chat"; +} /* /Content Grid */ @@ -159,6 +175,20 @@ body, html { /* /Saper */ +/* Crash */ + +.crash-game { + grid-area: crashgame; + background: #8f07ff; +} + +.crash-game__players { + background: #1900ff; + grid-area: crashplayers; +} + +/* /Crash */ + /* Media */ /* /Media */ \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/CrashgamePage.vue b/luckydiamond/src/pages/games-pages/CrashgamePage.vue index 3475078..00b17e2 100644 --- a/luckydiamond/src/pages/games-pages/CrashgamePage.vue +++ b/luckydiamond/src/pages/games-pages/CrashgamePage.vue @@ -1,11 +1,39 @@ \ No newline at end of file From a530bf2c6ad2a5e9fd94f644e0ee948d52d50392 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 4 Feb 2024 12:53:26 +0300 Subject: [PATCH 02/61] rebuild grid for crash --- .../css/PagesStyles/games-pages/crash.css | 16 +++++++++ luckydiamond/src/assets/css/global.css | 18 +++++----- .../src/pages/games-pages/CrashgamePage.vue | 36 ++++++++++--------- 3 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css new file mode 100644 index 0000000..d3e0d7b --- /dev/null +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css @@ -0,0 +1,16 @@ +.crash-content { + display: grid; + grid-template-columns: repeat(6, 1fr); + grid-template-rows: repeat(5, 1fr); + gap: 10px; + grid-auto-flow: row; + grid-template-areas: + "crashgame crashgame crashgame crashgame crashgame crashgame" + "crashgame crashgame crashgame crashgame crashgame crashgame" + "crashgame crashgame crashgame crashgame crashgame crashgame" + "crashplayers crashplayers crashplayers crashplayers crashplayers crashplayers" + "crashplayers crashplayers crashplayers crashplayers crashplayers crashplayers"; + background: #17181C; + box-shadow: 0 4px #00000040; + border-radius: 20px; +} diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index ef60c29..b006b14 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -82,12 +82,12 @@ body, html { grid-auto-flow: row; grid-template-areas: "menu header header header header header header" - "menu crashgame crashgame crashgame crashgame crashgame chat" - "menu crashgame crashgame crashgame crashgame crashgame chat" - "menu crashgame crashgame crashgame crashgame crashgame chat" - "menu crashgame crashgame crashgame crashgame crashgame chat" - "menu crashplayers crashplayers crashplayers crashplayers crashplayers chat" - "menu crashplayers crashplayers crashplayers crashplayers crashplayers chat"; + "menu crash crash crash crash crash chat" + "menu crash crash crash crash crash chat" + "menu crash crash crash crash crash chat" + "menu crash crash crash crash crash chat" + "menu crash crash crash crash crash chat" + "menu crash crash crash crash crash chat"; } /* /Content Grid */ @@ -177,13 +177,15 @@ body, html { /* Crash */ +.crash-content { + grid-area: crash; +} + .crash-game { grid-area: crashgame; - background: #8f07ff; } .crash-game__players { - background: #1900ff; grid-area: crashplayers; } diff --git a/luckydiamond/src/pages/games-pages/CrashgamePage.vue b/luckydiamond/src/pages/games-pages/CrashgamePage.vue index 00b17e2..7fe191b 100644 --- a/luckydiamond/src/pages/games-pages/CrashgamePage.vue +++ b/luckydiamond/src/pages/games-pages/CrashgamePage.vue @@ -7,22 +7,24 @@ -
-
-
+
+
+
+
+ +
+
+ +
+
+
+ +
+
-
- -
-
-
- -
-
- -
-
+ + @@ -31,9 +33,11 @@ import HeaderComponent from "@/components/HeaderComponent.vue"; import AsideBarComponent from "@/components/AsidebarComponent.vue"; import ChatComponent from "@/components/ChatComponent.vue"; -import CrashGraphComponent from "@/components/games-components/CrashGraphComponent.vue"; +// import CrashGraphComponent from "@/components/games-components/CrashGraphComponent.vue"; + +import '@/assets/css/PagesStyles/games-pages/crash.css' export default { - components: { HeaderComponent, AsideBarComponent, ChatComponent, CrashGraphComponent } + components: { HeaderComponent, AsideBarComponent, ChatComponent } } \ No newline at end of file From 5f94676101d598c4f8e412b33fb74b875cb5278c Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 4 Feb 2024 13:01:59 +0300 Subject: [PATCH 03/61] refactor styles for off def-settings input, added off def-settings input for firefox --- .../css/ComponentsStyles/payments-modal.css | 10 ---------- .../css/PagesStyles/games-pages/saper.css | 14 -------------- luckydiamond/src/assets/css/global.css | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css index fe183ef..c046c74 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/payments-modal.css @@ -1,13 +1,3 @@ -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; -} - -input:focus { - outline: none; -} - .payment-modal { position: absolute; top: 20%; diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css index 645b198..7018280 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css @@ -1,17 +1,3 @@ -button { - cursor: pointer; -} - -button:focus { - outline: none; -} - -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; -} - .saper { display: flex; padding-top: 10%; diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index b006b14..010fb78 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -18,6 +18,24 @@ body, html { overflow-y: hidden; } +input[type="number"] { + -moz-appearance: textfield; +} + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + -webkit-appearance: none; + margin: 0; +} + +button:focus { + outline: none; +} + +button { + cursor: pointer; +} + /* /Global Settings */ /* Content Grid */ From 4b6d737ee0945c0cc156b02b35e778e80c8f2b95 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 4 Feb 2024 13:45:18 +0300 Subject: [PATCH 04/61] fixed max-btn padding --- luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css index 7018280..69ce40e 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css @@ -176,7 +176,7 @@ font-family: Inter; font-size: 16px; font-weight: 700; - padding: 4px 15px; + padding: 4px 13px; } .saper-start__btns { From 62827f885c23eaf9fa69c92a41c42829c2793731 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 4 Feb 2024 13:58:19 +0300 Subject: [PATCH 05/61] added styles for crash-game-window --- .../css/PagesStyles/games-pages/crash.css | 126 ++++++++++++++++ .../src/pages/games-pages/CrashgamePage.vue | 136 +++++++++++++++++- 2 files changed, 259 insertions(+), 3 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css index d3e0d7b..402b33c 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css @@ -14,3 +14,129 @@ box-shadow: 0 4px #00000040; border-radius: 20px; } + +.crash-game { + background: #22252F; + border-radius: 20px; + box-shadow: 4px 4px 4px 0px #00000040; + width: 95%; + height: 475px; + margin: 0 auto; +} + +.crash-game__content { + display: flex; +} + +/* Crash-Window */ + +.crash-game__start-window { + margin-left: 30px; +} + +.crash-game__start-window .crash__game-name { + margin: 62px 0 2px 0; + font-family: 'Montserrat Alternates'; + font-weight: 700; + font-size: 26px; + color: #fff; + box-shadow: 1px 1px 1px 0px #00000001; +} + +.crash-game__start-window p { + font-family: 'Montserrat Alternates'; + font-weight: 700; + font-size: 14px; + color: #FFFFFF85; +} + +.crash-game-window__inputs { + margin-top: 29px; +} + +.crash-label { + font-family: 'Montserrat Alternates'; + font-weight: 700; + font-size: 13px; + color: #44C6EF54; + margin: 0 0 4px 4px; +} + +.input-style-crash { + width: 347px; + height: 40px; + border: 2px solid #2B3458; + border-radius: 20px; + background: #22252F; +} + +.diamond-input-crash { + margin-left: -25px; +} + +.input-style-crash__text { + font-family: 'Montserrat Alternates'; + font-weight: 700; + font-size: 12px; + color: #fff; + padding-left: 35px; +} + +.crash-input-deposit .diamonds-btns__display { + margin: 8px 0 19px -22px; +} + +.crash-input-deposit #max-button { + padding: 4px 10px; +} + +.crash-input-deposit .diamond-icon { + left: 12px; +} + +.crash-game-window__btn-start { + display: flex; + justify-content: center; + margin-top: 23px; +} + +.crash-game-window__btn-start button { + background: #EF4444; + border: unset; + border-radius: 10px; + width: 300px; + height: 60px; + font-family: 'Montserrat Alternates'; + font-weight: 700; + font-size: 16px; +} + +.crash-window__line { + display: flex; + flex-direction: row-reverse; + position: relative; + top: -415px; + left: 10%; + z-index: 1; +} + +.line-crash { + width: 2px; + height: 474px; + background: #30364F; +} + +/* /Crash-Window */ + +/* Crash-Graph */ + +/* /Crash-Graph */ + +/* Crash-Players */ + +.crash-game__players { + z-index: 2; + background: #000; +} + +/* /Crash-Players */ \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/CrashgamePage.vue b/luckydiamond/src/pages/games-pages/CrashgamePage.vue index 7fe191b..d898a33 100644 --- a/luckydiamond/src/pages/games-pages/CrashgamePage.vue +++ b/luckydiamond/src/pages/games-pages/CrashgamePage.vue @@ -11,10 +11,41 @@
+

Краш

+

Жди момента и забирай выигрыш

+
+
+

Сумма депозита

+
+ + +
+
    +
  • + +
    • +
+
+
+
+
+

Автовывод

+
+ +
+
+
+
+ +
+
+
+
+
- +
@@ -33,11 +64,110 @@ import HeaderComponent from "@/components/HeaderComponent.vue"; import AsideBarComponent from "@/components/AsidebarComponent.vue"; import ChatComponent from "@/components/ChatComponent.vue"; -// import CrashGraphComponent from "@/components/games-components/CrashGraphComponent.vue"; +import CrashGraphComponent from "@/components/games-components/CrashGraphComponent.vue"; + +import { useVuelidate } from '@vuelidate/core' +import { maxValue, minValue, required, numeric, integer } from "@vuelidate/validators"; + import '@/assets/css/PagesStyles/games-pages/crash.css' +import SaperNumbers from "@/mocks/SaperNumbers"; +import {GetCurrentMoney} from "@/assets/js/rest/RestMethods"; +import {GetCookie} from "@/assets/js/storage/CookieStorage"; export default { - components: { HeaderComponent, AsideBarComponent, ChatComponent } + components: { HeaderComponent, AsideBarComponent, ChatComponent, CrashGraphComponent }, + data() { + return { + SaperNumbers, + amountDeposit: 0, + autoRatio: 0 + } + }, + setup() { + return { v$: useVuelidate() } + }, + validations() { + return { + amountDeposit: { required, numeric, minValue: minValue(1), maxValue: maxValue(100), integer }, + autoRatio: { numeric, minValue: minValue(1.01) } + } + }, + watch: { + amountDeposit(DepositCount) { + if (![1, 5, 10, 50, 100, parseInt(this.balance)].includes(DepositCount)) { + this.clickedBtn = null + } + else { + let index + switch (DepositCount) { + case 1: + if (parseInt(this.balance) === DepositCount) { + index = 5 + } + else { + index = 0 + } + break + case 5: + if (parseInt(this.balance) === DepositCount) { + index = 5 + } + else { + index = 1 + } + break + case 10: + if (parseInt(this.balance) === DepositCount) { + index = 5 + } + else { + index = 2 + } + break + case 50: + if (parseInt(this.balance) === DepositCount) { + index = 5 + } + else { + index = 3 + } + break + case 100: + if (parseInt(this.balance) === DepositCount) { + index = 5 + } + else { + index = 4 + } + break + case parseInt(this.balance): + index = 5 + break + } + + this.clickedBtnChoice(index, DepositCount) + } + }, + }, + methods: { + async clickedBtnChoice(index, content) { + this.clickedBtn = index + if (content === 'max') { + await GetCurrentMoney(GetCookie('AUTHTOKEN'), GetCookie('SearchToken')) + .then((response) => { + console.log(response.currentMoney, this.balance) + const responseBalance = response.currentMoney + + if (responseBalance === this.balance) { + this.amountDeposit = parseInt(responseBalance) + } + }) + } + else { + this.amountDeposit = content + } + }, + } } \ No newline at end of file From 73fda1b5707e9546efcd5be58b2314c9e42fc1cc Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 4 Feb 2024 14:11:35 +0300 Subject: [PATCH 06/61] added finaly styles for start-window crash --- .../css/PagesStyles/games-pages/crash.css | 23 +++++++++++++++---- .../games-components/CrashGraphComponent.vue | 14 ----------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css index 402b33c..179a940 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/crash.css @@ -21,7 +21,7 @@ box-shadow: 4px 4px 4px 0px #00000040; width: 95%; height: 475px; - margin: 0 auto; + margin: 41px auto 0 auto; } .crash-game__content { @@ -32,6 +32,7 @@ .crash-game__start-window { margin-left: 30px; + height: 0; } .crash-game__start-window .crash__game-name { @@ -114,22 +115,34 @@ .crash-window__line { display: flex; flex-direction: row-reverse; - position: relative; - top: -415px; - left: 10%; - z-index: 1; } .line-crash { width: 2px; height: 474px; background: #30364F; + position: relative; + top: -415px; + left: 10%; + z-index: 1; } /* /Crash-Window */ /* Crash-Graph */ +.chart-container { + width: 800px; + top: 10%; + left: 10%; +} + +.chart-container canvas { + width: 800px !important; + height: 400px !important; + transition: .3s ease; +} + /* /Crash-Graph */ /* Crash-Players */ diff --git a/luckydiamond/src/components/games-components/CrashGraphComponent.vue b/luckydiamond/src/components/games-components/CrashGraphComponent.vue index 697dbac..2e659f0 100644 --- a/luckydiamond/src/components/games-components/CrashGraphComponent.vue +++ b/luckydiamond/src/components/games-components/CrashGraphComponent.vue @@ -119,18 +119,4 @@ export default { \ No newline at end of file From 20ba9be6ae17208d5fe6b376cae41da84be4ca8e Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 4 Feb 2024 14:35:19 +0300 Subject: [PATCH 07/61] added logic for setvalue timer in crash --- luckydiamond/src/assets/js/chat/ChatLogic.js | 136 +++++++++--------- .../src/pages/games-pages/CrashgamePage.vue | 17 ++- 2 files changed, 86 insertions(+), 67 deletions(-) diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index 1280ec6..0bbece7 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -1,66 +1,70 @@ -// import { BackendWebSocketUrl } from '@/properties/Сonfig.js'; -// import { eventBus } from "@/main"; -// import { -// GetCookie -// } from "@/assets/js/storage/CookieStorage.js"; -// -// let webSocket; -// -// export function ConnectToChat() { -// try { -// webSocket = new WebSocket(BackendWebSocketUrl); -// -// webSocket.onopen = function () { -// console.log('Connection established'); -// }; -// -// webSocket.onmessage = function (event) { -// -// const dataObject = JSON.parse(event.data); -// -// if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { -// eventBus.emit('dataChat', event.data); -// } -// -// console.log('Message from Server:', event.data); -// }; -// -// webSocket.onclose = function () { -// -// webSocket = new WebSocket(BackendWebSocketUrl); -// -// console.log('Connection closed and reconnected'); -// }; -// -// webSocket.onerror = function (event) { -// console.error('WebSocket Error:', event); -// }; -// } catch (error) { -// console.error('Error in ConnectToChat:', error); -// } -// } -// -// export function SendMessageToChat(message) { -// try { -// -// if (!GetCookie("SpUserName") && !GetCookie("AUTHTOKEN") && !GetCookie("SearchToken")) { -// return; -// } -// -// const userCredentials = { -// SearchToken: GetCookie("SearchToken"), -// AUTHTOKEN: GetCookie("AUTHTOKEN") -// }; -// -// const messageObject = { -// UserCredentials: userCredentials, -// Message: message, -// MessageType: "Chat" -// }; -// -// webSocket.send(JSON.stringify(messageObject)); -// -// } catch (error) { -// console.error('Error in ConnectToChat:', error); -// } -// } \ No newline at end of file +import { BackendWebSocketUrl } from '@/properties/Сonfig.js'; +import { eventBus } from "@/main"; +import { + GetCookie +} from "@/assets/js/storage/CookieStorage.js"; + +let webSocket; + +export function ConnectToChat() { + try { + webSocket = new WebSocket(BackendWebSocketUrl); + + webSocket.onopen = function () { + console.log('Connection established'); + }; + + webSocket.onmessage = function (event) { + + const dataObject = JSON.parse(event.data); + + if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { + eventBus.emit('dataChat', event.data); + console.log('CHAT') + } + else { + eventBus.emit('crash', event.data) + } + + // console.log('Message from Server:', event.data); + }; + + webSocket.onclose = function () { + + webSocket = new WebSocket(BackendWebSocketUrl); + + console.log('Connection closed and reconnected'); + }; + + webSocket.onerror = function (event) { + console.error('WebSocket Error:', event); + }; + } catch (error) { + console.error('Error in ConnectToChat:', error); + } +} + +export function SendMessageToChat(message) { + try { + + if (!GetCookie("SpUserName") && !GetCookie("AUTHTOKEN") && !GetCookie("SearchToken")) { + return; + } + + const userCredentials = { + SearchToken: GetCookie("SearchToken"), + AUTHTOKEN: GetCookie("AUTHTOKEN") + }; + + const messageObject = { + UserCredentials: userCredentials, + Message: message, + MessageType: "Chat" + }; + + webSocket.send(JSON.stringify(messageObject)); + + } catch (error) { + console.error('Error in ConnectToChat:', error); + } +} \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/CrashgamePage.vue b/luckydiamond/src/pages/games-pages/CrashgamePage.vue index d898a33..eafaa39 100644 --- a/luckydiamond/src/pages/games-pages/CrashgamePage.vue +++ b/luckydiamond/src/pages/games-pages/CrashgamePage.vue @@ -74,6 +74,7 @@ import '@/assets/css/PagesStyles/games-pages/crash.css' import SaperNumbers from "@/mocks/SaperNumbers"; import {GetCurrentMoney} from "@/assets/js/rest/RestMethods"; import {GetCookie} from "@/assets/js/storage/CookieStorage"; +import {eventBus} from "@/main"; export default { components: { HeaderComponent, AsideBarComponent, ChatComponent, CrashGraphComponent }, @@ -81,12 +82,26 @@ export default { return { SaperNumbers, amountDeposit: 0, - autoRatio: 0 + autoRatio: 0, + timerGame: '' } }, setup() { return { v$: useVuelidate() } }, + mounted() { + eventBus.on('crash', (dataCrash) => { + try { + const dataCrashParse = JSON.parse(dataCrash) + + this.timerGame = dataCrashParse.WaitingTime + console.log(this.timerGame) + } + catch (e) { + console.error(e) + } + }) + }, validations() { return { amountDeposit: { required, numeric, minValue: minValue(1), maxValue: maxValue(100), integer }, From 2ec5085a711d378d3b9bf34f4ed3e56ab51d8efb Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 4 Feb 2024 15:33:28 +0300 Subject: [PATCH 08/61] added logic for graph in crash --- .../games-components/CrashGraphComponent.vue | 95 ++++++++----------- .../src/pages/games-pages/CrashgamePage.vue | 9 +- 2 files changed, 47 insertions(+), 57 deletions(-) diff --git a/luckydiamond/src/components/games-components/CrashGraphComponent.vue b/luckydiamond/src/components/games-components/CrashGraphComponent.vue index 2e659f0..4aa4a47 100644 --- a/luckydiamond/src/components/games-components/CrashGraphComponent.vue +++ b/luckydiamond/src/components/games-components/CrashGraphComponent.vue @@ -1,8 +1,9 @@ @@ -27,9 +28,16 @@ Chart.register( export default { components: { LineChart }, + props: { + crashdata: Object + }, + mounted() { + this.data = this.chartData; + this.updateData(); + }, data() { return { - dataValues: [1, 2, 3], + dataValues: [], labels: [""], data: null, options: { @@ -38,37 +46,12 @@ export default { text: "Line", }, }, - animation: { - duration: 200, - easing: "easeInOutQuad", - delay: 50, - onProgress: (animation) => { - const chart = animation.chart; - const ctx = chart.ctx; - const meta = chart.getDatasetMeta(0); - const points = meta.data; - const totalSteps = meta.total; - - ctx.save(); - ctx.beginPath(); - - points.forEach((point, index) => { - const prevPoint = meta.data[index - 1]; - const progress = animation.progress; - - if (index === 0 || progress * totalSteps > index) { - const x = prevPoint ? prevPoint.x + (point.x - prevPoint.x) * progress : point.x; - const y = prevPoint ? prevPoint.y + (point.y - prevPoint.y) * progress : point.y; - - ctx.lineTo(x, y); - } - }); - - ctx.lineWidth = 3; - ctx.stroke(); - ctx.restore(); + scales: { + y: { + beginAtZero: true, // Устанавливаем начало оси Y с нуля }, }, + animation: false, // Отключаем анимацию }, }; }, @@ -91,32 +74,38 @@ export default { }, }, - methods: { - updateData() { - const interval = 495; - let counter = 0; - - const updateInterval = setInterval(() => { - const nextDataValue = this.dataValues[this.dataValues.length - 1] + 1; - this.dataValues.push(nextDataValue); - - this.labels.push(""); - this.data = this.chartData; - - if (counter >= 6000 / interval) { - clearInterval(updateInterval); - } - counter++; - }, interval); - }, + watch: { + crashdata: { + handler: 'updateData', + immediate: true + } }, - mounted() { - this.data = this.chartData; - this.updateData(); + methods: { + updateData() { + let nextDataValue + if (this.crashdata.Status === 'WaitingForPlayers') { + this.data = this.chartData; + this.labels = [""]; + this.dataValues = [0]; + } + else if (this.crashdata.Status === 'InGame') { + nextDataValue = this.crashdata.CurrentX + + this.data = this.chartData; + this.labels.push(""); + this.dataValues.push(nextDataValue); + } + else if (this.crashdata.Status === 'GameEnd') { + this.dataValues = [] + } + else { + console.log('Error game') + } + }, }, }; \ No newline at end of file + diff --git a/luckydiamond/src/pages/games-pages/CrashgamePage.vue b/luckydiamond/src/pages/games-pages/CrashgamePage.vue index eafaa39..1b59947 100644 --- a/luckydiamond/src/pages/games-pages/CrashgamePage.vue +++ b/luckydiamond/src/pages/games-pages/CrashgamePage.vue @@ -45,7 +45,7 @@
- +
@@ -81,9 +81,10 @@ export default { data() { return { SaperNumbers, + clickedBtn: null, amountDeposit: 0, autoRatio: 0, - timerGame: '' + crashObject: '' } }, setup() { @@ -94,8 +95,8 @@ export default { try { const dataCrashParse = JSON.parse(dataCrash) - this.timerGame = dataCrashParse.WaitingTime - console.log(this.timerGame) + this.crashObject = dataCrashParse + console.log(dataCrashParse) } catch (e) { console.error(e) From d33836ac802726f2ef80608a95ca4b9a98f2eed9 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sun, 4 Feb 2024 15:48:33 +0300 Subject: [PATCH 09/61] added info in graph crash --- .../components/games-components/CrashGraphComponent.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/luckydiamond/src/components/games-components/CrashGraphComponent.vue b/luckydiamond/src/components/games-components/CrashGraphComponent.vue index 4aa4a47..2ea937b 100644 --- a/luckydiamond/src/components/games-components/CrashGraphComponent.vue +++ b/luckydiamond/src/components/games-components/CrashGraphComponent.vue @@ -1,10 +1,11 @@ diff --git a/luckydiamond/src/router/router.js b/luckydiamond/src/router/router.js index 25c678e..2085a1e 100644 --- a/luckydiamond/src/router/router.js +++ b/luckydiamond/src/router/router.js @@ -4,6 +4,7 @@ import HomePage from "../pages/HomePage.vue"; import ProfilePage from "@/pages/ProfilePage.vue"; import SapergamePage from "@/pages/games-pages/SapergamePage.vue"; import CrashGamePage from "@/pages/games-pages/CrashgamePage.vue"; +import JackpotPage from "@/pages/games-pages/JackpotPage.vue"; import SettingsPage from "@/pages/SettingsPage.vue" import AboutPage from "@/pages/AboutPage.vue" export default createRouter({ @@ -13,6 +14,7 @@ export default createRouter({ { path: '/profile', component: ProfilePage, name: 'profile' }, { path: '/game/saper', component: SapergamePage, name: 'saper' }, { path: '/game/crash', component: CrashGamePage, name: 'crash' }, + { path: '/game/jackpot', component: JackpotPage, name: 'jackpot' }, { path: '/settings', component: SettingsPage, name: 'settings' }, { path: '/about', component: AboutPage, name: 'about' }, ] From a3cf00730821fdaebfcc53fa6ac574ee609a2e81 Mon Sep 17 00:00:00 2001 From: Hepatica <75219332+danilt2000@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:49:34 +0100 Subject: [PATCH 60/61] Rename figma.png to Figma.png --- .../icons-developcard/{figma.png => Figma.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename luckydiamond/src/assets/icons-developcard/{figma.png => Figma.png} (100%) diff --git a/luckydiamond/src/assets/icons-developcard/figma.png b/luckydiamond/src/assets/icons-developcard/Figma.png similarity index 100% rename from luckydiamond/src/assets/icons-developcard/figma.png rename to luckydiamond/src/assets/icons-developcard/Figma.png From dca4010254f0560551d5067e6c50d1de91ba48da Mon Sep 17 00:00:00 2001 From: Hepatica <75219332+danilt2000@users.noreply.github.com> Date: Sat, 17 Feb 2024 15:49:43 +0100 Subject: [PATCH 61/61] Rename vue.png to Vue.png --- .../assets/icons-developcard/{vue.png => Vue.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename luckydiamond/src/assets/icons-developcard/{vue.png => Vue.png} (100%) diff --git a/luckydiamond/src/assets/icons-developcard/vue.png b/luckydiamond/src/assets/icons-developcard/Vue.png similarity index 100% rename from luckydiamond/src/assets/icons-developcard/vue.png rename to luckydiamond/src/assets/icons-developcard/Vue.png