From 7de74e533b081f7adfed011a0799b330529be2ec Mon Sep 17 00:00:00 2001 From: Madara0330E Date: Sat, 16 Mar 2024 16:43:38 +0300 Subject: [PATCH 01/27] create duple game --- luckydiamond/src/assets/css/global.css | 16 +- .../icons-games/saper-game/arrowTop.png | Bin 0 -> 1381 bytes .../src/components/AsidebarComponent.vue | 3 +- .../src/components/DoubleComponent.vue | 29 +++ .../src/components/DoubleComponent2.vue | 231 ++++++++++++++++++ .../src/pages/games-pages/DoublePage.vue | 39 +++ .../src/pages/games-pages/RollPage.vue | 164 +++++++++++++ .../src/pages/games-pages/TutorialPage.vue | 50 ++++ luckydiamond/src/router/router.js | 2 + 9 files changed, 532 insertions(+), 2 deletions(-) create mode 100644 luckydiamond/src/assets/icons-games/saper-game/arrowTop.png create mode 100644 luckydiamond/src/components/DoubleComponent.vue create mode 100644 luckydiamond/src/components/DoubleComponent2.vue create mode 100644 luckydiamond/src/pages/games-pages/DoublePage.vue create mode 100644 luckydiamond/src/pages/games-pages/RollPage.vue create mode 100644 luckydiamond/src/pages/games-pages/TutorialPage.vue diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index 40e5e42..1b884d3 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -108,7 +108,21 @@ button { "menu jackpot jackpot jackpot jackpot jackpot chat"; grid-gap: 0.625rem; } - +.content-grid--double { + display: grid; + grid-auto-columns: 1fr; + grid-template-columns: 0.35fr repeat(5, 1fr) 1fr; + grid-template-rows: auto 0fr repeat(4, 1fr); + grid-template-areas: + "menu header header header header header header" + "menu double double double double double chat" + "menu double double double double double chat" + "menu double double double double double chat" + "menu double double double double double chat" + "menu double double double double double chat" + "menu double double double double double chat"; + grid-gap: 0.625rem; +} .grid-crash { display: grid; grid-template-columns: 0.35fr repeat(5, 1fr) 1fr; diff --git a/luckydiamond/src/assets/icons-games/saper-game/arrowTop.png b/luckydiamond/src/assets/icons-games/saper-game/arrowTop.png new file mode 100644 index 0000000000000000000000000000000000000000..8ea76a2ad235b78f96db7411216a4ecaaf237a8a GIT binary patch literal 1381 zcmah}c~FuG6#pb$!PZ34u~d450u`PaGBjz|0Ax21Vyou1=)##`YtNj(C4- zm?Ew1omK+(VJ1-< zm-Y*R4b?QPc!d&8DD~&TKMR6sZXDRk-t})Lr-pBoTBMGVj0rJVbS>CU!GYOD^W91j zNS8BEL$sqR%n9|V@x_3W3c0h9j~b|ub6tv87m27ibQvO-17ugc76 zEfa&q+u`?J9Z}QdM3~gEkDIwsXW=0>arDF)mU!cLpoCga?5;WxBC{h{H)&AbW^7yY zne2yU_dF5@OySSn@e`A_jYD&ZFzL{c zEVF&uJ8ZeQVeIbe;PB@?!#p|gL1PNX;*m85>*MF=iQH|0l_SJ__|ed_8_080OYh0p z&FW;B04de2!mN!@-G$ul?7e>7wVwxzKiCK9tSS03&JHAn-Epky6?4Jj)(Y}|mBqFBGfN}Y* z8Q#k{^Ivh-tukRjuPZJM>SWsl5pTgp>A{#iYb^ZlSX@Sl7MB)xkK28CUfp8Ot$s?9 z4~9ebX&ALA>wEwI~*pH_09Q!IoYK4LUc_x%KVy9o}kHtf*CM@n%3*;I?A3;h* ztt_t(enW02p^p;M=T<=7)=t<3dU4l z_R*==(8S5&WJ)YWWlwx9FfUxu2(Dif}#o_zLuE_A&p?QBxQ$ZB&@3AfVISrAT{-iNOH!X2%~0jn{5^| z$E_u~1S!=oVP){KJYv1b<(h8{{sfJ#=jkL3YK8#kGk|lm!rbQue5NM9s;1ohB`4Nx81SNn+y$DI_x*eTf?+(jslK3N6j!$Aua= z$ZpRwqvV9y-ku>hho)q3w~x8GQX;F3NA+;5R_!=a!hBIE8t?2kLY>6E&~99t5Zs1I zX`05T&i2oU^VT_XB!hmM_q;;h#t_td4b<CN}`2YTCHH}jzSJ2-n{lf2W Nfj}CA+C)hx_y;muPYwV8 literal 0 HcmV?d00001 diff --git a/luckydiamond/src/components/AsidebarComponent.vue b/luckydiamond/src/components/AsidebarComponent.vue index 46d78b9..ad16767 100644 --- a/luckydiamond/src/components/AsidebarComponent.vue +++ b/luckydiamond/src/components/AsidebarComponent.vue @@ -9,7 +9,8 @@ - + + diff --git a/luckydiamond/src/components/DoubleComponent.vue b/luckydiamond/src/components/DoubleComponent.vue new file mode 100644 index 0000000..ca6fa1f --- /dev/null +++ b/luckydiamond/src/components/DoubleComponent.vue @@ -0,0 +1,29 @@ + + + + + \ No newline at end of file diff --git a/luckydiamond/src/components/DoubleComponent2.vue b/luckydiamond/src/components/DoubleComponent2.vue new file mode 100644 index 0000000..0a937f1 --- /dev/null +++ b/luckydiamond/src/components/DoubleComponent2.vue @@ -0,0 +1,231 @@ + + + + \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue new file mode 100644 index 0000000..9002af0 --- /dev/null +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -0,0 +1,39 @@ + + \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/RollPage.vue b/luckydiamond/src/pages/games-pages/RollPage.vue new file mode 100644 index 0000000..7afdf30 --- /dev/null +++ b/luckydiamond/src/pages/games-pages/RollPage.vue @@ -0,0 +1,164 @@ + + + + + \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/TutorialPage.vue b/luckydiamond/src/pages/games-pages/TutorialPage.vue new file mode 100644 index 0000000..1bfab56 --- /dev/null +++ b/luckydiamond/src/pages/games-pages/TutorialPage.vue @@ -0,0 +1,50 @@ +d-flex align-items-center justify-conte + + + diff --git a/luckydiamond/src/router/router.js b/luckydiamond/src/router/router.js index 94c52fb..febf745 100644 --- a/luckydiamond/src/router/router.js +++ b/luckydiamond/src/router/router.js @@ -6,6 +6,7 @@ import SapergamePage from "@/pages/games-pages/SapergamePage.vue"; import SettingsPage from "@/pages/SettingsPage.vue"; import CrashGamePage from "@/pages/games-pages/CrashgamePage.vue"; import JackpotPage from "@/pages/games-pages/JackpotPage.vue"; +import DoublePage from "@/pages/games-pages/DoublePage.vue"; import AboutPage from "@/pages/AboutPage.vue"; import HelpPage from "@/pages/HelpPage.vue" ; @@ -17,6 +18,7 @@ export default createRouter({ { path: '/game/saper', component: SapergamePage, name: 'saper' }, { path: '/game/crash', component: CrashGamePage, name: 'crash' }, { path: '/game/jackpot', component: JackpotPage, name: 'jackpot' }, + { path: '/game/double', component: DoublePage, name: 'double' }, { path: '/settings', component: SettingsPage, name: 'settings' }, { path: '/about', component: AboutPage, name: 'about' }, { path: '/help', component: HelpPage, name: 'help' }, From 2fe6c054f01f60194deb9a23194cc02f40a82d9c Mon Sep 17 00:00:00 2001 From: Madara0330E Date: Sat, 16 Mar 2024 20:59:31 +0300 Subject: [PATCH 02/27] crete button mute --- .../src/assets/css/PagesStyles/settings.css | 53 ++++ .../src/components/AsidebarComponent.vue | 2 +- luckydiamond/src/components/ChatComponent.vue | 4 +- .../src/components/DoubleComponent.vue | 29 --- .../src/components/DoubleComponent2.vue | 231 ------------------ luckydiamond/src/pages/SettingsPage.vue | 16 ++ .../src/pages/games-pages/DoublePage.vue | 39 --- .../src/pages/games-pages/RollPage.vue | 164 ------------- .../src/pages/games-pages/TutorialPage.vue | 50 ---- luckydiamond/src/router/router.js | 2 - 10 files changed, 73 insertions(+), 517 deletions(-) delete mode 100644 luckydiamond/src/components/DoubleComponent.vue delete mode 100644 luckydiamond/src/components/DoubleComponent2.vue delete mode 100644 luckydiamond/src/pages/games-pages/DoublePage.vue delete mode 100644 luckydiamond/src/pages/games-pages/RollPage.vue delete mode 100644 luckydiamond/src/pages/games-pages/TutorialPage.vue diff --git a/luckydiamond/src/assets/css/PagesStyles/settings.css b/luckydiamond/src/assets/css/PagesStyles/settings.css index 6d73a79..3dd9e19 100644 --- a/luckydiamond/src/assets/css/PagesStyles/settings.css +++ b/luckydiamond/src/assets/css/PagesStyles/settings.css @@ -76,3 +76,56 @@ background: red; /* Цвет фона трека для Firefox */ height: 8px; /* Высота трека для Firefox */ } + + + +/* toggle in label designing */ +.toggle { + position : relative ; + display : flex; + width : 60px; + height : 32px; + background-color: #000413; + border-radius: 5px; + justify-content: center; + align-items: center; + + +} + +/* After slide changes */ +.toggle:after { + content: ''; + position: absolute; + width: 22px; + height: 22px; + border-radius: 5px; + display: flex; + justify-content: center; + align-items: center; + align-content: center; + background-color: #EF4444; + top: 5px; + left: 6px; + transition: all 0.5s; +} + +/* Toggle text */ +.toggle p { + font-family: Arial, Helvetica, sans-serif; + font-weight: bold; +} + +/* Checkbox checked effect */ +.checkbox:checked + .toggle::after { + + left : 34px; +} + +/* Checkbox checked toggle label bg color */ + + +/* Checkbox vanished */ +.checkbox { + display : none; +} \ No newline at end of file diff --git a/luckydiamond/src/components/AsidebarComponent.vue b/luckydiamond/src/components/AsidebarComponent.vue index ad16767..baa9ba3 100644 --- a/luckydiamond/src/components/AsidebarComponent.vue +++ b/luckydiamond/src/components/AsidebarComponent.vue @@ -9,7 +9,7 @@ - + diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index e906c17..2bdaf65 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -22,13 +22,15 @@
-

{{ msg.username }}

+

{{ msg.username.replace(/[a-zA-Z0-9]/g, '*') }}

{{ msg.msg }}

+ + -
- - - -
- - - - - \ No newline at end of file diff --git a/luckydiamond/src/components/DoubleComponent2.vue b/luckydiamond/src/components/DoubleComponent2.vue deleted file mode 100644 index 0a937f1..0000000 --- a/luckydiamond/src/components/DoubleComponent2.vue +++ /dev/null @@ -1,231 +0,0 @@ - - - - \ No newline at end of file diff --git a/luckydiamond/src/pages/SettingsPage.vue b/luckydiamond/src/pages/SettingsPage.vue index a077510..a3f82b2 100644 --- a/luckydiamond/src/pages/SettingsPage.vue +++ b/luckydiamond/src/pages/SettingsPage.vue @@ -12,6 +12,7 @@ --> +

Звук

Данная страница находится в разработке, и будет полностью переделанна
+ + +
+ + + +

скрыть чат

+
+
@@ -66,4 +81,5 @@ export default { } }, }; + \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue deleted file mode 100644 index 9002af0..0000000 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ /dev/null @@ -1,39 +0,0 @@ - - \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/RollPage.vue b/luckydiamond/src/pages/games-pages/RollPage.vue deleted file mode 100644 index 7afdf30..0000000 --- a/luckydiamond/src/pages/games-pages/RollPage.vue +++ /dev/null @@ -1,164 +0,0 @@ - - - - - \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/TutorialPage.vue b/luckydiamond/src/pages/games-pages/TutorialPage.vue deleted file mode 100644 index 1bfab56..0000000 --- a/luckydiamond/src/pages/games-pages/TutorialPage.vue +++ /dev/null @@ -1,50 +0,0 @@ -d-flex align-items-center justify-conte - - - diff --git a/luckydiamond/src/router/router.js b/luckydiamond/src/router/router.js index febf745..94c52fb 100644 --- a/luckydiamond/src/router/router.js +++ b/luckydiamond/src/router/router.js @@ -6,7 +6,6 @@ import SapergamePage from "@/pages/games-pages/SapergamePage.vue"; import SettingsPage from "@/pages/SettingsPage.vue"; import CrashGamePage from "@/pages/games-pages/CrashgamePage.vue"; import JackpotPage from "@/pages/games-pages/JackpotPage.vue"; -import DoublePage from "@/pages/games-pages/DoublePage.vue"; import AboutPage from "@/pages/AboutPage.vue"; import HelpPage from "@/pages/HelpPage.vue" ; @@ -18,7 +17,6 @@ export default createRouter({ { path: '/game/saper', component: SapergamePage, name: 'saper' }, { path: '/game/crash', component: CrashGamePage, name: 'crash' }, { path: '/game/jackpot', component: JackpotPage, name: 'jackpot' }, - { path: '/game/double', component: DoublePage, name: 'double' }, { path: '/settings', component: SettingsPage, name: 'settings' }, { path: '/about', component: AboutPage, name: 'about' }, { path: '/help', component: HelpPage, name: 'help' }, From f40a2ade8be0b5c8a824a00ddf559fb7d8f2521f Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sun, 17 Mar 2024 21:37:28 +0100 Subject: [PATCH 03/27] Add carousel element --- luckydiamond/src/assets/css/global.css | 19 +- .../double-game/RectangleBlackDouble.svg | 17 ++ .../double-game/RectangleGreenDouble.svg | 17 ++ .../double-game/RectangleRedDouble.svg | 17 ++ .../src/components/DoubleComponent.vue | 29 --- .../src/components/DoubleComponent2.vue | 231 ------------------ .../src/pages/games-pages/DoublePage.vue | 213 +++++++++++++--- 7 files changed, 244 insertions(+), 299 deletions(-) create mode 100644 luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.svg create mode 100644 luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.svg create mode 100644 luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.svg delete mode 100644 luckydiamond/src/components/DoubleComponent.vue delete mode 100644 luckydiamond/src/components/DoubleComponent2.vue diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index 1b884d3..b702f24 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -108,6 +108,7 @@ button { "menu jackpot jackpot jackpot jackpot jackpot chat"; grid-gap: 0.625rem; } + .content-grid--double { display: grid; grid-auto-columns: 1fr; @@ -123,6 +124,7 @@ button { "menu double double double double double chat"; grid-gap: 0.625rem; } + .grid-crash { display: grid; grid-template-columns: 0.35fr repeat(5, 1fr) 1fr; @@ -177,7 +179,7 @@ button { height: 86vh; position: relative; z-index: 3; - + } /* /Chat */ @@ -225,9 +227,15 @@ button { margin: 0.625rem 2.438rem 1.125rem 1.125rem; */ } +.double { + display: flex; + grid-area: double; + +} + .about { grid-area: about; - + } @@ -293,7 +301,7 @@ button { grid-area: help; display: flex; /* height:99%; */ - height:86vh; + height: 86vh; border-radius: 3.125rem; background: #17181C; box-shadow: 0.25rem 0.25rem 0.25rem 0px rgba(0, 0, 0, 0.25); @@ -301,7 +309,7 @@ button { /*height: 96.2%;*/ width: 1000px; margin: 0 auto; - + } @@ -328,8 +336,9 @@ button { height: 35%; z-index: 0; } + /* /Crash */ /* Media */ -/* /Media */ +/* /Media */ \ No newline at end of file diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.svg b/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.svg new file mode 100644 index 0000000..8f73ee1 --- /dev/null +++ b/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.svg b/luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.svg new file mode 100644 index 0000000..8025bc2 --- /dev/null +++ b/luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.svg b/luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.svg new file mode 100644 index 0000000..4f4ba8f --- /dev/null +++ b/luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/luckydiamond/src/components/DoubleComponent.vue b/luckydiamond/src/components/DoubleComponent.vue deleted file mode 100644 index ca6fa1f..0000000 --- a/luckydiamond/src/components/DoubleComponent.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - - - \ No newline at end of file diff --git a/luckydiamond/src/components/DoubleComponent2.vue b/luckydiamond/src/components/DoubleComponent2.vue deleted file mode 100644 index 0a937f1..0000000 --- a/luckydiamond/src/components/DoubleComponent2.vue +++ /dev/null @@ -1,231 +0,0 @@ - - - - \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index 9002af0..90a44a0 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -1,39 +1,184 @@ + :itemsToShow="10" + + > + + + +
+ +
+ + + + + + + + + \ No newline at end of file + }), + name: "HelpPage", + components: { + HeaderComponent, + AsideBarComponent, + ChatComponent, + Carousel, + Slide, + }, +}; + + + \ No newline at end of file From 864215e989b143b2bf992a85ea7eb33954e6594b Mon Sep 17 00:00:00 2001 From: Hepatica Date: Tue, 19 Mar 2024 20:48:05 +0100 Subject: [PATCH 04/27] add double --- .../double-game/RectangleBlackDouble.png | Bin 0 -> 2901 bytes .../double-game/RectangleBlackDouble.svg | 17 --- .../double-game/RectangleGreenDouble.png | Bin 0 -> 3014 bytes .../double-game/RectangleGreenDouble.svg | 17 --- .../double-game/RectangleRedDouble.png | Bin 0 -> 2996 bytes .../double-game/RectangleRedDouble.svg | 17 --- .../src/pages/games-pages/DoublePage.vue | 106 +++++++++--------- 7 files changed, 54 insertions(+), 103 deletions(-) create mode 100644 luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.png delete mode 100644 luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.svg create mode 100644 luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.png delete mode 100644 luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.svg create mode 100644 luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.png delete mode 100644 luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.svg diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.png b/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.png new file mode 100644 index 0000000000000000000000000000000000000000..9c11aa7663daa1623588b2de3a5c9b10f2f6779b GIT binary patch literal 2901 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 literal 0 HcmV?d00001 diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.svg b/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.svg deleted file mode 100644 index 8f73ee1..0000000 --- a/luckydiamond/src/assets/icons-games/double-game/RectangleBlackDouble.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.png b/luckydiamond/src/assets/icons-games/double-game/RectangleGreenDouble.png new file mode 100644 index 0000000000000000000000000000000000000000..fd4fb7b07d2dc057a65a35cfb57eaee50dc72620 GIT binary patch literal 3014 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 - - - - - - - - - - - - - - - - diff --git a/luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.png b/luckydiamond/src/assets/icons-games/double-game/RectangleRedDouble.png new file mode 100644 index 0000000000000000000000000000000000000000..c9934c3580a0c1a8c151562c4f19e16ccc8d9fb2 GIT binary patch literal 2996 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 - - - - - - - - - - - - - - - - diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index 90a44a0..a2d4574 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -4,36 +4,43 @@
-
-

gdfgf

+

double

+
+
+
+
+
+
+ + - - - - - -
- + +
+ +
+ + +
+
+
- - - - +
+
+

double

@@ -16,15 +15,12 @@ - -
- - -
@@ -73,63 +50,32 @@ import "@/assets/css/global.css"; export default { data: () => ({ - // carousel settings - // slides: [], + autoplay: 500, slides: [ { - img: require("@/assets/icons-games/double-game/RectangleRedDouble.png"), - nickname: "RedDouble", + img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), + target: "BlackDouble", + }, + { + img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), + target: "BlackDouble", }, { img: require("@/assets/icons-games/double-game/RectangleGreenDouble.png"), - nickname: "GreenDouble", + target: "GreenDouble", + }, + { + img: require("@/assets/icons-games/double-game/RectangleRedDouble.png"), + target: "RedDouble", }, { img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), - nickname: "BlackDouble", + target: "BlackDouble", }, { img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), - nickname: "BlackDouble", + target: "BlackDouble", }, - { - img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), - nickname: "BlackDouble", - }, - { - img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), - nickname: "BlackDouble", - }, - - // , - // { - // img: "https://avatar.spworlds.ru/face/55/Ckutls_.png", - // nickname: "Ckutls_", - // }, - // { - // img: "https://avatar.spworlds.ru/face/55/Ckutls_.png", - // nickname: "Ckutls_", - // }, - // { - // img: "https://avatar.spworlds.ru/face/55/Hepatir.png", - // nickname: "Hepagfdtir", - // }, - // { - // img: "https://avatar.spworlds.ru/face/55/Ckutls_.png", - // nickname: "Ckutls_", - // }, - // { - // img: "https://avatar.spworlds.ru/face/55/Ckutls_.png", - // nickname: "Ckutls_", - // }, - // { - // img: "https://avatar.spworlds.ru/face/55/Ckutls_.png", - // nickname: "Ckutls_", - // }, - // { - // img: "https://avatar.spworlds.ru/face/55/Hepatir.png", - // nickname: "Hepgdfatir", - // }, ], }), name: "HelpPage", @@ -140,6 +86,27 @@ export default { Carousel, Slide, }, + + methods: { + handleStepCarousel(data) { + try { + let { currentSlideIndex } = data; + + if (this.slides[currentSlideIndex+1].target == "RedDouble") { + // this.$refs.carousel.slideTo(this.currentSlideIndex); + + // if (this.slides[this.currentSlideIndex].nickname == this.targetNickname) { + + this.stopAutoplay(); + } + } catch (error) { + console.error("Error in handleSlideStart:", error); + } + }, + stopAutoplay() { + this.autoplay = 0; + }, + }, }; From be2cf10eac065d45c4b3c5b3ec120ddea6bf94a1 Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sat, 23 Mar 2024 16:36:36 +0100 Subject: [PATCH 06/27] fix chat displayning names --- luckydiamond/src/components/ChatComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index 2bdaf65..5f14787 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -22,7 +22,7 @@
-

{{ msg.username.replace(/[a-zA-Z0-9]/g, '*') }}

+

{{ msg.username }}

{{ msg.msg }}

From a03be74a851b1191379c11f99840683add92a54b Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sat, 23 Mar 2024 16:39:02 +0100 Subject: [PATCH 07/27] turn off button in setting to turn of chat --- luckydiamond/src/pages/SettingsPage.vue | 34 ++++++++++++------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/luckydiamond/src/pages/SettingsPage.vue b/luckydiamond/src/pages/SettingsPage.vue index f673f45..d13e8f1 100644 --- a/luckydiamond/src/pages/SettingsPage.vue +++ b/luckydiamond/src/pages/SettingsPage.vue @@ -12,23 +12,22 @@ --> -
-
-

Звук

- +
+
+

Звук

+ +
-
- - -
+ +
-
@@ -80,5 +79,4 @@ export default { } }, }; - \ No newline at end of file From b6034d8f36e6001d3d7d38e7e304da04948009f0 Mon Sep 17 00:00:00 2001 From: Kostya Date: Sat, 23 Mar 2024 18:54:08 +0300 Subject: [PATCH 08/27] refactor code to composition api --- .../src/pages/games-pages/DoublePage.vue | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index 9074165..4ad641b 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -15,7 +15,7 @@ - \ No newline at end of file From b812ea5e978a6598effc0ad661479b54a3439718 Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sun, 31 Mar 2024 08:47:27 +0200 Subject: [PATCH 19/27] Add set temeout for double history games --- luckydiamond/src/pages/games-pages/DoublePage.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index cf63ca0..ee48dcc 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -264,7 +264,9 @@ export default { endGame.value == true ) { stopAutoPlay(); - loadGameHistory(); + setTimeout(() => { + loadGameHistory(); + }, 2000); } } } catch (error) { @@ -383,9 +385,7 @@ export default { .double--history-carousel .carousel__slide--prev, .double--history-carousel .carousel__slide--next, .double--history-carousel .carousel__slide--active { - opacity: 1; + opacity: 1; transform: rotateY(0) scale(1); } - - \ No newline at end of file From 207d99edecb4be7c9096bd37ea11e3500a5f6b22 Mon Sep 17 00:00:00 2001 From: rafael1209 Date: Sun, 31 Mar 2024 17:11:37 +0300 Subject: [PATCH 20/27] d --- .gitignore | 363 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 363 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9491a2f --- /dev/null +++ b/.gitignore @@ -0,0 +1,363 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Oo]ut/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd \ No newline at end of file From 22b398ed5eb5852f4f74f757dbe716267f1ac0fb Mon Sep 17 00:00:00 2001 From: Hepatica Date: Mon, 1 Apr 2024 23:19:14 +0200 Subject: [PATCH 21/27] Add members showing in game --- .../css/PagesStyles/games-pages/double.css | 45 ++++++++++++++++++- .../src/pages/games-pages/DoublePage.vue | 29 +++++++++--- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css index 429647a..e216984 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css @@ -17,6 +17,49 @@ height: 94%; } +.double-members-ingame-red { + z-index: 1; + border: 2px solid #3B4260; + border-radius: 15px; + background: #1C2133; + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); + margin-top: 1vh; + margin-top: 1vh; + width: 100%; + height: 94%; +} + +.double-members-ingame-green { + z-index: 1; + border: 2px solid #3B4260; + border-radius: 15px; + background: #1C2133; + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); + margin-top: 1vh; + margin-top: 1vh; + width: 100%; + height: 94%; +} + +.double-members-ingame-black { + z-index: 1; + border: 2px solid #3B4260; + border-radius: 15px; + background: #1C2133; + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); + margin-top: 1vh; + margin-top: 1vh; + width: 100%; + height: 94%; +} + +.double-game { + z-index: 1; + border-radius: 20px; + width: 69%; + height: 94%; +} + .double-game-main-box { border-radius: 10px; border: 1px solid #262C55; @@ -41,8 +84,6 @@ height: 95%; } - - .container-double-history-text { display: flex; } diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index ee48dcc..ce2cb5d 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -111,12 +111,31 @@ -
-

double

-

- time to game - {{ timeToGame.toFixed(0) }} -

+
+
+

Red X2

+

fds

+

fds

+

fds

+
+
+
+

Red X2

+

fds

+

fds

+

fds

+
+
+
+
+

Red X2

+

fds

+

fds

+

fds

+
+
+
From a96636635a52a763c1058a2509b59b9f1908d610 Mon Sep 17 00:00:00 2001 From: Hepatica Date: Mon, 1 Apr 2024 23:57:52 +0200 Subject: [PATCH 22/27] Add main styles for double members elementsz --- .../css/PagesStyles/games-pages/double.css | 51 +++++++++++++++++- .../icons-games/double-game/MembersInGame.png | Bin 0 -> 690 bytes .../src/pages/games-pages/DoublePage.vue | 15 ++++-- 3 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 luckydiamond/src/assets/icons-games/double-game/MembersInGame.png diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css index e216984..0793d64 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css @@ -18,15 +18,17 @@ } .double-members-ingame-red { + background: linear-gradient(to bottom, #FF416C, #FF4B2B); z-index: 1; border: 2px solid #3B4260; border-radius: 15px; - background: #1C2133; + /* background: #1C2133; */ box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); margin-top: 1vh; margin-top: 1vh; width: 100%; height: 94%; + padding: 2vh; } .double-members-ingame-green { @@ -41,6 +43,53 @@ height: 94%; } +.double-members-flex-container { + display: flex; + justify-content: space-between; + align-items: center; + color: white; + /* Assuming the text is white */ +} + +.double-red-box { + display: flex; + align-items: baseline; + font-size: 18px; + font-family: Montserrat; + font-weight: bold; + color: #B64848; +} + +.double-number-color { + color: #56629A; + font-weight: bold; + font-size: 20px; + font-family: Montserrat; +} + +.double-red-box span { + font-size: larger; + /* Or any specific size */ + margin-left: 5px; + /* Spacing between RED and X2 */ +} + +.double-user-icon { + display: flex; + align-items: center; +} + +.double-user-icon .double-user-icon-span { + background-image: url('../../../icons-games/double-game/MembersInGame.png'); + width: 20px; + /* Replace with actual size of your icon */ + height: 20px; + /* Replace with actual size of your icon */ + margin-right: 5px; + /* Spacing between icon and number 6 */ +} + + .double-members-ingame-black { z-index: 1; border: 2px solid #3B4260; diff --git a/luckydiamond/src/assets/icons-games/double-game/MembersInGame.png b/luckydiamond/src/assets/icons-games/double-game/MembersInGame.png new file mode 100644 index 0000000000000000000000000000000000000000..abd37cd1fb1a24f9150aa01cb57912bf9624790e GIT binary patch literal 690 zcmV;j0!{siP)(aNGWsVSEDa&fX5>@4kfHc@ZDgdWmP9;Cq*3eBu4nD?HmVB=tz!Kp`Gi9^<|Ubb32t+a&s1H zt4CXV=M_|o?*UrfAmE*xo%rm^YekiV;|5FL1mLVP1B`Nm1Q&F@At3V05g0NS9%Tp8 z0X6H`d!JrA?7Ol}#lc5bLWJ8QDm{D+b_zt|AzX zO`H>=MVD(^*qJ~wOVHurH-}%9GmeF~mC)B3nK@5P7Pvs2GABMsb}?n;C{YWoMF$dI?vx
-

Red X2

+
+
+ RED X2 +
+
+ 6 +
+

fds

fds

fds

-
+

Red X2

fds

@@ -127,7 +134,7 @@

fds

-
+

Red X2

fds

@@ -135,8 +142,6 @@

fds

- -
From 41734a0e9a0ea04bc4f93329e90b11edb3ced859 Mon Sep 17 00:00:00 2001 From: Hepatica Date: Tue, 2 Apr 2024 00:36:22 +0200 Subject: [PATCH 23/27] Add styles for displaying red green black labels on display active member in game --- .../css/PagesStyles/games-pages/double.css | 83 ++++++++++++------- .../src/pages/games-pages/DoublePage.vue | 27 +++++- 2 files changed, 75 insertions(+), 35 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css index 0793d64..868918e 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css @@ -18,11 +18,40 @@ } .double-members-ingame-red { - background: linear-gradient(to bottom, #FF416C, #FF4B2B); + background: linear-gradient(to bottom right, + #A9373C, + #1C2133 20%); + z-index: 1; + border: 2px solid #3B4260; + border-radius: 15px; + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); + margin-top: 1vh; + width: 100%; + height: 94%; + padding: 2vh; +} + +.double-members-ingame-green { + background: linear-gradient(to bottom right, + #345D3B, + #1C2133 20%); + z-index: 1; + border: 2px solid #3B4260; + border-radius: 15px; + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); + margin-top: 1vh; + width: 100%; + height: 94%; + padding: 2vh; +} + +.double-members-ingame-black { + background: linear-gradient(to bottom right, + #1B1A1A, + #1C2133 26%); z-index: 1; border: 2px solid #3B4260; border-radius: 15px; - /* background: #1C2133; */ box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); margin-top: 1vh; margin-top: 1vh; @@ -31,24 +60,12 @@ padding: 2vh; } -.double-members-ingame-green { - z-index: 1; - border: 2px solid #3B4260; - border-radius: 15px; - background: #1C2133; - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); - margin-top: 1vh; - margin-top: 1vh; - width: 100%; - height: 94%; -} - .double-members-flex-container { display: flex; justify-content: space-between; align-items: center; color: white; - /* Assuming the text is white */ + margin-bottom: 2vh; } .double-red-box { @@ -60,10 +77,28 @@ color: #B64848; } +.double-white-box { + display: flex; + align-items: baseline; + font-size: 18px; + font-family: Montserrat; + font-weight: bold; + color: FEEBEB; +} + +.double-green-box { + display: flex; + align-items: baseline; + font-size: 18px; + font-family: Montserrat; + font-weight: bold; + color: #5EA25C; +} + .double-number-color { color: #56629A; font-weight: bold; - font-size: 20px; + font-size: 18px; font-family: Montserrat; } @@ -82,24 +117,8 @@ .double-user-icon .double-user-icon-span { background-image: url('../../../icons-games/double-game/MembersInGame.png'); width: 20px; - /* Replace with actual size of your icon */ height: 20px; - /* Replace with actual size of your icon */ margin-right: 5px; - /* Spacing between icon and number 6 */ -} - - -.double-members-ingame-black { - z-index: 1; - border: 2px solid #3B4260; - border-radius: 15px; - background: #1C2133; - box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); - margin-top: 1vh; - margin-top: 1vh; - width: 100%; - height: 94%; } .double-game { diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index 7ad8981..8c38a16 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -118,17 +118,31 @@ RED X2
- 6 + 0

fds

fds

fds

+

fds

+

fds

+

fds

+

fds

+

fds

+

fds

+

fds

-

Red X2

+
+
+ GREEN X20 +
+
+ 0 +
+

fds

fds

fds

@@ -136,7 +150,14 @@
-

Red X2

+
+
+ BLACK X2 +
+
+ 0 +
+

fds

fds

fds

From 02deed48b6dcb1ef1e1eebbb6d655a84315e4aef Mon Sep 17 00:00:00 2001 From: Madara0330E Date: Tue, 2 Apr 2024 18:12:15 +0500 Subject: [PATCH 24/27] I ve converted the button to roulette soon --- .../src/assets/css/PagesStyles/home.css | 58 +++++++++---------- luckydiamond/src/pages/HomePage.vue | 12 ++-- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/home.css b/luckydiamond/src/assets/css/PagesStyles/home.css index 01dfcb0..5049070 100644 --- a/luckydiamond/src/assets/css/PagesStyles/home.css +++ b/luckydiamond/src/assets/css/PagesStyles/home.css @@ -97,7 +97,7 @@ .bg-early{ border-radius: 40px; - background: #969B9E; + background: #EF4444; box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.25); } @@ -357,7 +357,7 @@ .gamemode__twoline--first__element { width: 100%; margin: 2% 3.6% 0 5.5%; - min-height: 180px; + min-height: 209px; } .linecontent-3 { @@ -370,23 +370,13 @@ color: #fff; text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); font-family: Montserrat Alternates; - font-size: 80px; + font-size: 60px; font-weight: 700; text-transform: uppercase; padding: 4.5% 2.2%; } -.gamemode__twoline--first__element .container { - display: flex; - justify-content: center; - align-items: center; -} -.gamemode__twoline--first__element .container a { - margin-right: 10%; - padding: 12px 10px; - margin-bottom: 3%; -} .gamemode__twoline--two__element { margin-top: 2%; @@ -406,6 +396,21 @@ .cumming_soon--img { margin-bottom: 4%; } +.gamemode__twoline--two__element { + margin-top: 2%; + width: 100%; + min-height: 180px; +} + +.gamemode__twoline--first__element .container { + display: flex; + justify-content: center; + +} + +.gamemode__twoline--first__element .container a { + margin-right: 10%; +} /* /GameMode */ @@ -430,7 +435,7 @@ } .title-twoline { - font-size: 60px; + font-size: 40px; } .line__img__jackpot { @@ -472,11 +477,7 @@ width: 80px; } - .gamemode__twoline--first__element .container a { - margin-right: 10%; - padding: 2px 11px 11px 11px; - margin-bottom: 3%; - } + .line__btn__jackpot { border-radius: 16px; @@ -506,7 +507,7 @@ } .title-twoline { - font-size: 40px; + font-size: 20px; } .line__img__jackpot { @@ -549,11 +550,7 @@ width: 80px; } - .gamemode__twoline--first__element .container a { - margin-right: 10%; - padding: 2px 11px 11px 11px; - margin-bottom: 3%; - } + .line__btn__jackpot { border-radius: 10px; @@ -575,15 +572,16 @@ height: 265px; } - .gamemode__twoline--first__element { - width: 100%; - margin: 0 3.6% 0 5.5%; - min-height: 60px; - } + .gamemode__twoline--two__element { margin-top: 0; width: 100%; min-height: 60px; } + .gamemode__twoline--first__element { + margin-top: 0; + width: 100%; + min-height: 60px; + } } \ No newline at end of file diff --git a/luckydiamond/src/pages/HomePage.vue b/luckydiamond/src/pages/HomePage.vue index 2f5f79b..11877ab 100644 --- a/luckydiamond/src/pages/HomePage.vue +++ b/luckydiamond/src/pages/HomePage.vue @@ -79,15 +79,19 @@
    -
  • +
  • -

    скоро

    +

    рулетка

    - play > --> + play - +
From dace90acdfdb74d2213ed98245495218b2dce9d5 Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sat, 6 Apr 2024 18:59:02 +0200 Subject: [PATCH 25/27] add double --- .../css/PagesStyles/games-pages/double.css | 47 +++++++++++++++++-- .../src/pages/games-pages/DoublePage.vue | 46 +++++++++--------- 2 files changed, 67 insertions(+), 26 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css index 868918e..e017472 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css @@ -17,6 +17,44 @@ height: 94%; } +.double-ui-component { + display: flex; + align-items: center; + background-color: #3b5998; + border-radius: 20px; + padding: 10px 20px; + max-width: 300px; + color: white; + font-family: Arial, sans-serif; +} + +.double-ui-component img { + border-radius: 50%; + margin-right: 10px; + /* Отступ справа от изображения */ +} + +.double-ui-component .double-username { + flex-grow: 1; + /* Занимает доступное пространство */ + text-align: left; + /* Выравнивание текста по левому краю */ +} + +.double-ui-component .double-score { + display: flex; + align-items: center; +} + +.double-ui-component .double-score img { + width: 20px; + /* Ширина изображения монетки */ + height: 20px; + /* Высота изображения монетки */ + margin-left: 5px; + /* Отступ слева от монетки */ +} + .double-members-ingame-red { background: linear-gradient(to bottom right, #A9373C, @@ -27,7 +65,8 @@ box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); margin-top: 1vh; width: 100%; - height: 94%; + height: 50vh; + /* height: 94%; */ padding: 2vh; } @@ -41,7 +80,8 @@ box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); margin-top: 1vh; width: 100%; - height: 94%; + height: 50vh; + /* height: 94%; */ padding: 2vh; } @@ -56,7 +96,8 @@ margin-top: 1vh; margin-top: 1vh; width: 100%; - height: 94%; + /* height: 94%; */ + height: 50vh; padding: 2vh; } diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index 8c38a16..62d7641 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -114,33 +114,29 @@
-
- RED X2 -
+
RED X2
- 0 + + 0

fds

-

fds

-

fds

-

fds

-

fds

-

fds

-

fds

-

fds

-

fds

-

fds

+
+
+ User Icon + {{ user.name }} + {{ user.amount }} +
+
-
- GREEN X20 -
+
GREEN X20
- 0 + + 0

fds

@@ -148,14 +144,16 @@

fds

-
+
-
- BLACK X2 -
+
BLACK X2
- 0 + + 0

fds

@@ -198,6 +196,7 @@ export default { data() { return { JackpotNumbers, + users: [] }; }, async created() {}, @@ -257,7 +256,8 @@ export default { onMounted(() => { loadGameHistory(); - + + this.users = this.fetchUsers(); // if (slides.length == 0) { // for (let i = 1; i < 29; i++) { // if (i == 15 || i == 28) { From 43c090693b1b15dcfbe240904768d84fd3d35b24 Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sat, 6 Apr 2024 19:15:15 +0200 Subject: [PATCH 26/27] preparing user list object for red layer in double --- .../src/pages/games-pages/DoublePage.vue | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index 62d7641..7f4dca6 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -121,13 +121,29 @@

fds

-
-
+ + +
+ + User Icon + + {{ user.name }} + {{ user.amount }}
-
+
+ Avatar +
FUpir
+
+ 500 + Coin +
+
+
@@ -195,12 +211,13 @@ export default { }, data() { return { - JackpotNumbers, - users: [] + JackpotNumbers }; }, async created() {}, setup() { + const users = ref([]); + const slides = reactive([ { img: require("@/assets/icons-games/double-game/RectangleGreenDouble.png"), @@ -257,7 +274,7 @@ export default { onMounted(() => { loadGameHistory(); - this.users = this.fetchUsers(); + users.value = fetchUsers(); // if (slides.length == 0) { // for (let i = 1; i < 29; i++) { // if (i == 15 || i == 28) { @@ -368,6 +385,13 @@ export default { targetColor.value = ""; } + function fetchUsers() { + return [ + { id: 1, name: 'Alice', amount: 100, image: 'path/to/alice.png' }, + { id: 2, name: 'Bob', amount: 200, image: 'path/to/bob.png' }, + ]; + } + return { slides, slidesHistory, @@ -377,6 +401,7 @@ export default { timeToGame, handleStepCarousel, stopAutoPlay, + users, }; }, }; From b93f23deaac40fd23d3eab78e60845946efb7172 Mon Sep 17 00:00:00 2001 From: Hepatica Date: Sun, 7 Apr 2024 03:04:02 +0200 Subject: [PATCH 27/27] add double --- .../css/PagesStyles/games-pages/double.css | 104 +++++- luckydiamond/src/assets/js/chat/ChatLogic.js | 4 +- .../src/assets/js/games/double/DoubleApi.js | 47 +++ .../src/pages/games-pages/DoublePage.vue | 349 ++++++++++++++---- 4 files changed, 411 insertions(+), 93 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css index e017472..ecd43d5 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/double.css @@ -1,10 +1,56 @@ +.bet-button { + border: none; + padding: 10px 20px; + margin: 5px; + border-radius: 10px; + color: white; + font-weight: bold; + cursor: pointer; + transition: transform 0.1s ease; + outline: none; +} + +/* Цвета для кнопок */ +.bet-button.red { + background-color: #863443; +} + +.bet-button.green { + background-color: #2D4940; +} + +.bet-button.black { + background-color: #202333; +} + +/* Стили для нажатой кнопки */ +.bet-button:active { + transform: scale(0.95); + /* Уменьшение при нажатии */ +} +.bet-button.active { + opacity: 0.7; /* Пример изменения стиля активной кнопки */ + } + +/* Можно добавить тени для кнопок, чтобы они выглядели объемнее */ +.bet-button { + margin: 1.2% 0 0 5.8%; + margin-bottom:1vh; + box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.2); +} + +/* Стиль для тени при нажатии (опционально) */ +.bet-button:active { + box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2); +} + .double-start { z-index: 1; border-radius: 20px; background: #1D223E; box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); width: 42vh; - height: 32vh; + height: 37vh; border: 1px solid #262C55; margin: 2.6%; margin-top: 0px; @@ -20,25 +66,34 @@ .double-ui-component { display: flex; align-items: center; - background-color: #3b5998; - border-radius: 20px; - padding: 10px 20px; + background-color: #25325A; + border-radius: 15px; + /* padding: 10px 20px; */ + padding-right: 2vh; + padding-bottom: 1vh; + padding-top: 1vh; + padding-left: 2vh; + margin-bottom: 1vh; max-width: 300px; color: white; font-family: Arial, sans-serif; + /* background: linear-gradient(to right, #1C213390 50%, #2F5139); */ } -.double-ui-component img { - border-radius: 50%; - margin-right: 10px; - /* Отступ справа от изображения */ +.double-ui-component-gradient { + background: linear-gradient(to right, #1C213390 50%, #2F5139); } +/* .double-ui-component img {} */ + .double-ui-component .double-username { flex-grow: 1; - /* Занимает доступное пространство */ text-align: left; - /* Выравнивание текста по левому краю */ + margin-left: 1vh; + font-size: 18px; + font-family: Montserrat; + font-weight: bold; + color: #515D83; } .double-ui-component .double-score { @@ -46,16 +101,25 @@ align-items: center; } +.double-score { + font-size: 20px; + font-family: Montserrat; + font-weight: bold; + color: #748985; +} + +.double-img-user { + margin-top: 6px; +} + .double-ui-component .double-score img { - width: 20px; - /* Ширина изображения монетки */ - height: 20px; - /* Высота изображения монетки */ - margin-left: 5px; - /* Отступ слева от монетки */ + width: 3vh; + height: 3vh; + margin-left: 10px; } .double-members-ingame-red { + overflow-y: auto; background: linear-gradient(to bottom right, #A9373C, #1C2133 20%); @@ -65,12 +129,13 @@ box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); margin-top: 1vh; width: 100%; - height: 50vh; + height: 49vh; /* height: 94%; */ padding: 2vh; } .double-members-ingame-green { + overflow-y: auto; background: linear-gradient(to bottom right, #345D3B, #1C2133 20%); @@ -80,12 +145,13 @@ box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); margin-top: 1vh; width: 100%; - height: 50vh; + height: 49vh; /* height: 94%; */ padding: 2vh; } .double-members-ingame-black { + overflow-y: auto; background: linear-gradient(to bottom right, #1B1A1A, #1C2133 26%); @@ -97,7 +163,7 @@ margin-top: 1vh; width: 100%; /* height: 94%; */ - height: 50vh; + height: 49vh; padding: 2vh; } diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index c49f0b5..3b3d6b0 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -31,14 +31,12 @@ export function ConnectToChat() { if (dataObject.MessageType == 'DoubleGameState') { eventBus.emit('doubleGame', event.data) - console.log(event.data) return; } if (dataObject.MessageType == "CrashGameState") { eventBus.emit('crash', event.data); return; - } if (Array.isArray(dataObject.CurrentGame.PlayerList)) { @@ -47,7 +45,7 @@ export function ConnectToChat() { } } catch (error) { - void(error); + void (error); } }; diff --git a/luckydiamond/src/assets/js/games/double/DoubleApi.js b/luckydiamond/src/assets/js/games/double/DoubleApi.js index 5797c4d..54e5a8b 100644 --- a/luckydiamond/src/assets/js/games/double/DoubleApi.js +++ b/luckydiamond/src/assets/js/games/double/DoubleApi.js @@ -1,4 +1,8 @@ import { BackendApiUrl } from '@/properties/Сonfig.js'; +import { + GetCookie +} from "@/assets/js/storage/CookieStorage.js"; + export async function GetNewestDoubleGames() { try { @@ -19,4 +23,47 @@ export async function GetNewestDoubleGames() { catch (error) { console.log('Fetch error') } +} + +export async function JoinGame(amount, betColor) { + + let betColorInt = 0; + if (betColor == "red") { + betColorInt = 0; + } + if (betColor == "green") { + betColorInt = 1; + } + if (betColor == "black") { + betColorInt = 2; + } + + const data = { + UserCredentials: { + SearchToken: GetCookie("SearchToken"), + AUTHTOKEN: GetCookie("AUTHTOKEN") + }, + bet: amount, + betColor: betColorInt + } + + try { + const response = await fetch(`${BackendApiUrl}/GameDouble/JoinGame`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify(data), + redirect: 'follow' + }) + + if (!response.ok) { + console.log('Fetch error:', response.status) + } + + return await response.json() + } + catch (error) { + console.log('Fetch error') + } } \ No newline at end of file diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index 7f4dca6..2003ac8 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -12,7 +12,16 @@

Рулетка

Крути, ставь, побеждай!

-

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

+

Цвет победной ячейки

+ + +
RED X2
- 0 + {{ + numberUserCountRed + }}
-

fds

- - -
- - User Icon - - {{ user.name }} - - {{ user.amount }} -
-
- Avatar -
FUpir
-
- 500 - Coin -
+ +
+ User + +
{{ user.name }}
+ +
+ {{ user.amount }} + +
+
@@ -152,12 +160,30 @@
GREEN X20
- 0 + {{ + numberUserCountGreen + }} +
+
+
+ User + +
{{ user.name }}
+ +
+ {{ user.amount }} + +
-

fds

-

fds

-

fds

BLACK X2
- 0 + {{ + numberUserCountBlack + }} +
+
+
+ User + +
{{ user.name }}
+ +
+ {{ user.amount }} + +
-

fds

-

fds

-

fds

@@ -191,8 +235,9 @@ import AsideBarComponent from "@/components/AsidebarComponent.vue"; import HeaderComponent from "@/components/HeaderComponent.vue"; import ChatComponent from "@/components/ChatComponent.vue"; import JackpotNumbers from "@/mocks/JackpotNumbers"; -import { GetNewestDoubleGames } from "@/assets/js/games/double/DoubleApi"; - +import { GetNewestDoubleGames,JoinGame } from "@/assets/js/games/double/DoubleApi"; +import { GetCurrentMoney } from "@/assets/js/rest/RestMethods"; +import { GetCookie } from "@/assets/js/storage/CookieStorage"; import { Carousel, Slide } from "vue3-carousel"; import "vue3-carousel/dist/carousel.css"; @@ -200,6 +245,14 @@ import "@/assets/css/PagesStyles/games-pages/jackpot.css"; import "@/assets/css/PagesStyles/games-pages/double.css"; import "@/assets/css/global.css"; import { eventBus } from "@/main"; +import { useVuelidate } from "@vuelidate/core"; +import { + maxValue, + minValue, + required, + numeric, + integer, +} from "@vuelidate/validators"; export default { components: { @@ -211,12 +264,101 @@ export default { }, data() { return { - JackpotNumbers + JackpotNumbers, + clickedColor: "", + amountDeposit: 0, + activeButton: null + }; + }, + methods: { + async clickedBtnChoice(index, content) { + this.clickedBtn = index; + if (content === "max") { + await GetCurrentMoney( + GetCookie("AUTHTOKEN"), + GetCookie("SearchToken") + ).then((response) => { + const responseBalance = response.currentMoney; + + if (responseBalance === this.balance) { + this.amountDeposit = parseInt(responseBalance); + } + }); + } else { + this.amountDeposit = content; + } + }, + async handleClick(color) { + this.clickedColor = color; + this.activeButton = color; + } +, + async clickPlayBtn() { + this.v$.$touch(); + this.offBtn = true; + + if ( + this.balance < this.amountDeposit || + !Number.isInteger(Number(this.amountDeposit)) + ) { + this.textError = "Некорректное значение. Введите целое число."; + this.offBtn = false; + this.errorPlayButton(); + } + + await JoinGame(this.amountDeposit,this.clickedColor).then((response) => { + if ( + response === `You can't join to started or ended game` || + response === "Player alredy in the game." + ) { + this.offBtn = false; + + if (response === `You can't join to started or ended game`) { + this.textError = "Игра уже началась или только закончилась!"; + this.errorPlayButton(); + } else if (response === "Player alredy in the game.") { + this.textError = "Вы уже в игре!"; + this.errorPlayButton(); + } + + return; + } + + // if (response.ok) { + // this.offBtn = false; + // this.startGame = true; + // } + }); + this.offBtn = false; + } + }, + validations() { + return { + amountDeposit: { + required, + numeric, + minValue: minValue(1), + maxValue: maxValue(this.balance), + integer, + }, }; }, async created() {}, + setup() { - const users = ref([]); + const v$ = useVuelidate(); + + const usersRed = ref([]); + + const usersGreen = ref([]); + + const usersBlack = ref([]); + + const numberUserCountRed = ref(0); + + const numberUserCountGreen = ref(0); + + const numberUserCountBlack = ref(0); const slides = reactive([ { @@ -261,7 +403,6 @@ export default { }, ]); - // const slides = reactive([]); const slidesHistory = reactive([]); let doubleData = reactive({}); @@ -273,36 +414,15 @@ export default { onMounted(() => { loadGameHistory(); - - users.value = fetchUsers(); - // if (slides.length == 0) { - // for (let i = 1; i < 29; i++) { - // if (i == 15 || i == 28) { - // slides.push({ - // img: require("@/assets/icons-games/double-game/RectangleGreenDouble.png"), - // target: "Green", - // }); - // } else { - // if (i % 2 == 0) { - // slides.push({ - // img: require("@/assets/icons-games/double-game/RectangleRedDouble.png"), - // target: "Red", - // }); - // } else { - // slides.push({ - // img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), - // target: "Black", - // }); - // } - // } - // } - // } + + // usersRed.value = fetchUsersRed(); eventBus.on("doubleGame", (dataDouble) => { const dataDoubleParse = JSON.parse(dataDouble); - // doubleData = Object.assign(doubleData, dataDoubleParse); - // timeToGame.value = doubleData.WaitingTime; + if (dataDoubleParse.Players.length > 0) { + processUsersInGame(dataDoubleParse.Players); + } if (endGame.value != true) { if (dataDoubleParse.Status == "InGame") { autoPlay.value = 20; @@ -312,11 +432,51 @@ export default { targetColor.value = dataDoubleParse.WInColor; endGame.value = true; autoPlay.value = 150; + + addWinEffectTouUsers( + dataDoubleParse.Players, + dataDoubleParse.WInColor + ); } } }); }); + function addWinEffectTouUsers(usersArray, winColor) { + usersArray.forEach((user) => { + if (user.BetColor == winColor) { + setTimeout(() => { + addGradientClassToUser(user); + }, 2000); + } + }); + } + + function addGradientClassToUser(user) { + const element = document.getElementById("user-" + user.UserName); + + if (element) { + element.classList.add("double-ui-component-gradient"); + } + } + + function addUserIfNotExist(usersArray, newUser, BetColor) { + const userExists = usersArray.some((user) => user.name === newUser.name); + + if (!userExists) { + if (BetColor == "Red") { + numberUserCountRed.value += 1; + } + if (BetColor == "Green") { + numberUserCountGreen.value += 1; + } + if (BetColor == "Black") { + numberUserCountBlack.value += 1; + } + usersArray.push(newUser); + } + } + function handleStepCarousel(data) { try { if (endGame.value == true) { @@ -326,7 +486,20 @@ export default { endGame.value == true ) { stopAutoPlay(); + setTimeout(() => { + setTimeout(() => { + if ( + usersRed.value.length > 0 || + usersBlack.value.length > 0 || + usersGreen.value.length > 0 + ) { + usersRed.value = []; + usersGreen.value = []; + usersBlack.value = []; + } + }, 4000); + loadGameHistory(); }, 2000); } @@ -336,6 +509,44 @@ export default { } } + function processUsersInGame(users) { + users.forEach((user) => { + if (user.BetColor == "Red") { + const newUser = { + name: user.UserName, + image: + "https://avatar.spworlds.ru/face/55/" + user.UserName + ".png", + amount: user.Bet, + hasGradient: false, + }; + + addUserIfNotExist(usersRed.value, newUser, "Red"); + } + if (user.BetColor == "Green") { + const newUser = { + name: user.UserName, + image: + "https://avatar.spworlds.ru/face/55/" + user.UserName + ".png", + amount: user.Bet, + hasGradient: false, + }; + + addUserIfNotExist(usersGreen.value, newUser, "Green"); + } + if (user.BetColor == "Black") { + const newUser = { + name: user.UserName, + image: + "https://avatar.spworlds.ru/face/55/" + user.UserName + ".png", + amount: user.Bet, + hasGradient: false, + }; + + addUserIfNotExist(usersBlack.value, newUser, "Black"); + } + }); + } + async function loadGameHistory() { try { await GetNewestDoubleGames() @@ -385,13 +596,6 @@ export default { targetColor.value = ""; } - function fetchUsers() { - return [ - { id: 1, name: 'Alice', amount: 100, image: 'path/to/alice.png' }, - { id: 2, name: 'Bob', amount: 200, image: 'path/to/bob.png' }, - ]; - } - return { slides, slidesHistory, @@ -401,7 +605,10 @@ export default { timeToGame, handleStepCarousel, stopAutoPlay, - users, + usersRed, + usersBlack, + usersGreen, + v$, }; }, };