From 4188cdee77e23867ac8698599c3a78bb2ba03b95 Mon Sep 17 00:00:00 2001 From: rafael1209 Date: Wed, 28 Feb 2024 16:38:41 +0200 Subject: [PATCH 01/11] fix payment history --- .../src/assets/css/PagesStyles/profile.css | 15 ++++++++++++--- .../person-icon-profile-userinfo.png | Bin 15338 -> 3324 bytes luckydiamond/src/pages/ProfilePage.vue | 8 +++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index 720bc68..3a12d9e 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -102,6 +102,7 @@ .types { display: flex; + justify-content: space-between; } .types-margin h3 { @@ -116,27 +117,34 @@ } .types-line { + flex-grow: 1; /* Add this line */ margin-top: 2.1%; background: #38383E; - width: 86%; height: 3px; } .payments__card { margin-top: 4.9%; display: flex; + align-items: center; /* Center vertically */ } .user-info { display: flex; + align-items: center; /* Center vertically */ + margin-right: 1em; /* Add margin for spacing */ } .user-name { display: flex; flex-direction: column; margin-left: 0.625em; + align-items: center; /* Center horizontally */ + margin-top: -0.5em; /* Adjust this value as needed */ } + + .user-name__text h3 { color: #FFF; font-weight: 700; @@ -152,7 +160,8 @@ } .data-info { - margin-left: 10%; + margin-left: auto; /* Push to the right */ + margin-right: auto; /* Push to the left */ } .data-info__text h3 { @@ -163,7 +172,7 @@ } .transaction-info { - margin-left: 7%; + margin-right: 1em; /* Add margin for spacing */ } .transaction-info__text h3 { diff --git a/luckydiamond/src/assets/icons-test/person-icon-profile-userinfo.png b/luckydiamond/src/assets/icons-test/person-icon-profile-userinfo.png index d85d000a60931b01414573773c87af0ba33386d0..93cc231fa3dad07d3d2dfb0280fb83aa3820f9ac 100644 GIT binary patch delta 3306 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 literal 15338 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 IM6N<$f*0Kzga7~l diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 0e4c7da..12eeb2a 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -17,6 +17,7 @@
Пополнить Вывести + Вывести
@@ -35,7 +36,6 @@

{{ payment.name }}

-

{{ payment.comment }}

@@ -128,8 +128,7 @@ export default { }, claimDataDeposit(amount) { const historyPayments = { - name: 'TEST USER', - comment: 'test', + name: 'Пополнение', data: this.getCurrentFormattedDate(), amount: amount } @@ -138,8 +137,7 @@ export default { }, claimDataWithdraw(amount) { const historyPayments = { - name: 'TEST USER', - comment: 'test', + name: 'Вывод', data: this.getCurrentFormattedDate(), amount: -amount } From 8a0b33020a4cd48e7f5935731257ac0b44e97dff Mon Sep 17 00:00:00 2001 From: Madara0330E Date: Wed, 28 Feb 2024 18:08:53 +0300 Subject: [PATCH 02/11] rafick tvoia mater jirafic --- luckydiamond/src/assets/css/PagesStyles/profile.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index 3a12d9e..6bc8846 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -102,11 +102,12 @@ .types { display: flex; - justify-content: space-between; + justify-content: space-around; } .types-margin h3 { margin-right: 7.813em; + } .types-text h3 { @@ -121,6 +122,7 @@ margin-top: 2.1%; background: #38383E; height: 3px; + width: 100vh; } .payments__card { @@ -160,7 +162,7 @@ } .data-info { - margin-left: auto; /* Push to the right */ + margin-left: 17vh; /* Push to the right */ margin-right: auto; /* Push to the left */ } @@ -172,7 +174,7 @@ } .transaction-info { - margin-right: 1em; /* Add margin for spacing */ + margin-right: 10em; /* Add margin for spacing */ } .transaction-info__text h3 { From dc8d843d7b4afcc3cf97d0d9bcd6cd519aafc44b Mon Sep 17 00:00:00 2001 From: Madara0330E Date: Wed, 28 Feb 2024 18:24:51 +0300 Subject: [PATCH 03/11] rafick tvoia mater jirafic23333 --- luckydiamond/src/assets/css/PagesStyles/profile.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index 6bc8846..4e88189 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -122,7 +122,7 @@ margin-top: 2.1%; background: #38383E; height: 3px; - width: 100vh; + width: 86%; } .payments__card { @@ -162,7 +162,7 @@ } .data-info { - margin-left: 17vh; /* Push to the right */ + margin-left: 1vh; /* Push to the right */ margin-right: auto; /* Push to the left */ } @@ -174,7 +174,7 @@ } .transaction-info { - margin-right: 10em; /* Add margin for spacing */ + margin-right: 6em; /* Add margin for spacing */ } .transaction-info__text h3 { From 5436b5e6800ed45da59c30ff44d54c1c389c1ff1 Mon Sep 17 00:00:00 2001 From: Madara0330E Date: Wed, 28 Feb 2024 18:56:38 +0300 Subject: [PATCH 04/11] rafick tvoia mater jirafic23333dfsfdfsdfsfsf --- .../src/assets/css/PagesStyles/profile.css | 26 ++++++++++++++++--- luckydiamond/src/pages/ProfilePage.vue | 8 +++++- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index 6bc8846..812b931 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -94,7 +94,15 @@ padding: 3.8% 46% 3% 14%; background: #EF4444; } - +.playerandvid { + margin-right: 10vh; +} +.data1 { + margin-right: 20vh; +} +.summa { + margin-right: 10vh; +} .payments { margin: 2% 0 0 -4.25%; @@ -102,7 +110,7 @@ .types { display: flex; - justify-content: space-around; + } .types-margin h3 { @@ -129,6 +137,7 @@ margin-top: 4.9%; display: flex; align-items: center; /* Center vertically */ + justify-content: space-between; } .user-info { @@ -174,9 +183,18 @@ } .transaction-info { - margin-right: 10em; /* Add margin for spacing */ + margin-right: 6em; /* Add margin for spacing */ + display: flex; + justify-content: center; + align-content: center; + width: 25vh; +} +.transaction-info__text { + display: flex; + justify-content: center; + align-content: center; + width: 20vh; } - .transaction-info__text h3 { font-weight: 500; font-family: Montserrat; diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 12eeb2a..1b94050 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -17,17 +17,23 @@
Пополнить Вывести - Вывести + Вывести
+

Игрок и вид транзакции

+
+

Дата

+
+

Сумма

+
From 1434152bde5f6f0884cbb3811e8cbc2c77c0f5a8 Mon Sep 17 00:00:00 2001 From: Madara0330E Date: Wed, 28 Feb 2024 19:07:45 +0300 Subject: [PATCH 05/11] rafick tvoia mater jirafic23333dfsfdfsdfsfsf42314fsddfasfffafafafaf --- .../src/assets/css/PagesStyles/profile.css | 51 +++---------------- luckydiamond/src/pages/ProfilePage.vue | 12 +---- 2 files changed, 9 insertions(+), 54 deletions(-) diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index 05e27b2..384345f 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -2,26 +2,22 @@ width: 30%; margin-left: 3%; } - .profile__content .profile__user--img { margin: 17.6% 8.4% 1% 0; background: #969C8D; padding-top: 10px; border-radius: 20px; } - .profile__card { display: flex; flex-direction: column; } - .profile__card h1 { color: #FFF; font-weight: 700; font-family: Montserrat; font-size: 40px; } - .profile__card h2 { border-radius: 20px; background: #22252F; @@ -35,47 +31,38 @@ font-size: 28px; padding-left: 11px; } - .profile__card h2 img { margin-right: 4.4%; } - .profile__btns--payments { margin-top: 7.9%; display: flex; flex-direction: column; } - .icon-diamond h2 img { width: 33px; height: 33px; } - .deposit-icon { margin: 3px 0 0 10px; } - .withdraw-icon { margin-left: 33px; } - .btn-bg { border-radius: 10px; background: rgba(255, 255, 255, 0.12); box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); width: 36%; } - .btn-margin { padding: 3.8% 46% 3% 14%; margin-bottom: 11px; background: #62D4B2; } - .btn-display { display: flex; } - .text-btn { text-decoration: none; color: #000; @@ -85,15 +72,14 @@ font-size: 18px; margin-left: 4px; } - .icon-margin-deposit-withdraw { margin-right: 4px; } - .withdraw { padding: 3.8% 46% 3% 14%; background: #EF4444; } + .playerandvid { margin-right: 10vh; } @@ -110,29 +96,27 @@ .types { display: flex; - + + } .types-margin h3 { margin-right: 7.813em; } - .types-text h3 { color: #ABABB4; font-weight: 600; font-family: Montserrat; font-size: 14px; } - .types-line { flex-grow: 1; /* Add this line */ margin-top: 2.1%; background: #38383E; height: 3px; - width: 86%; + width: 100vh; } - .payments__card { margin-top: 4.9%; display: flex; @@ -145,7 +129,6 @@ align-items: center; /* Center vertically */ margin-right: 1em; /* Add margin for spacing */ } - .user-name { display: flex; flex-direction: column; @@ -153,28 +136,22 @@ align-items: center; /* Center horizontally */ margin-top: -0.5em; /* Adjust this value as needed */ } - - - .user-name__text h3 { color: #FFF; font-weight: 700; font-family: Montserrat; font-size: 20px; } - .user-name__text p { color: #A9A9A9; font-weight: 400; font-family: Montserrat; font-size: 20px; } - .data-info { - margin-left: 1vh; /* Push to the right */ + margin-left: 17vh; /* Push to the right */ margin-right: auto; /* Push to the left */ } - .data-info__text h3 { color: #A9A9A9; font-weight: 400; @@ -183,8 +160,8 @@ } .transaction-info { + margin-right: 10em; /* Add margin for spacing */ margin-right: 6em; /* Add margin for spacing */ -<<<<<<< HEAD display: flex; justify-content: center; align-content: center; @@ -195,71 +172,59 @@ justify-content: center; align-content: center; width: 20vh; -======= ->>>>>>> dc8d843d7b4afcc3cf97d0d9bcd6cd519aafc44b } + .transaction-info__text h3 { font-weight: 500; font-family: Montserrat; font-size: 22px; } - .deposit-color h3 { color: #32C966; } - .withdraw-color h3 { color: #EA3D38; } - .error-deposit { position: absolute; left: 190px; top: 52px; } - .error-deposit h2 { color: #BA3636; font-family: "Montserrat Alternates"; font-weight: 700; font-size: 11px; } - .error-card { position: absolute; top: 130px; left: 210px; } - .error-card h2 { color: #BA3636; font-family: "Montserrat Alternates"; font-weight: 700; font-size: 11px; } - .error-checkbox h2 { color: #BA3636; font-family: "Montserrat Alternates"; font-weight: 700; font-size: 11px; } - .error-captcha { top: 235px; left: 45px; position: absolute; } - .error-captcha h2 { color: #BA3636; font-family: "Montserrat Alternates"; font-weight: 700; font-size: 13px; } - /* Media */ - @media screen and (min-device-width: 1400px) and (max-device-width: 1600px) { .profile__card h2 { width: 72%; @@ -271,7 +236,6 @@ padding-right: 56%; } } - @media screen and (min-device-width: 1200px) and (max-device-width: 1399px) { .profile__card h2 { width: 80%; @@ -283,5 +247,4 @@ padding-right: 66%; } } - /* /Media */ \ No newline at end of file diff --git a/luckydiamond/src/pages/ProfilePage.vue b/luckydiamond/src/pages/ProfilePage.vue index 1b94050..c0d9d7a 100644 --- a/luckydiamond/src/pages/ProfilePage.vue +++ b/luckydiamond/src/pages/ProfilePage.vue @@ -2,11 +2,8 @@
- - -
@@ -17,7 +14,8 @@
Пополнить Вывести - Вывести + Вывести +
@@ -59,7 +57,6 @@
- \ No newline at end of file From ec4461f739561e9939280d88b3c3891d8629aeb2 Mon Sep 17 00:00:00 2001 From: rafael1209 Date: Thu, 29 Feb 2024 22:30:08 +0200 Subject: [PATCH 09/11] updated jackpot icon --- .../src/assets/icons-gamemodes/jackpot_icon.svg | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/luckydiamond/src/assets/icons-gamemodes/jackpot_icon.svg b/luckydiamond/src/assets/icons-gamemodes/jackpot_icon.svg index d6eacae..3335f08 100644 --- a/luckydiamond/src/assets/icons-gamemodes/jackpot_icon.svg +++ b/luckydiamond/src/assets/icons-gamemodes/jackpot_icon.svg @@ -1,6 +1,18 @@ + + + + + + + + + + + + From 439e4b032ea42c81c24bf26cb3fdbe8214a76d09 Mon Sep 17 00:00:00 2001 From: rafael1209 Date: Fri, 1 Mar 2024 08:42:59 +0200 Subject: [PATCH 10/11] Update slots-icon.svg --- .../src/assets/icons-menu/slots-icon.svg | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/luckydiamond/src/assets/icons-menu/slots-icon.svg b/luckydiamond/src/assets/icons-menu/slots-icon.svg index 9495301..c7db7c0 100644 --- a/luckydiamond/src/assets/icons-menu/slots-icon.svg +++ b/luckydiamond/src/assets/icons-menu/slots-icon.svg @@ -1,21 +1,21 @@ - - - + + + - + + - + - + - - + - + - + From 999b8ce31e8b57b91c010a1b47212465c24426c8 Mon Sep 17 00:00:00 2001 From: Madara0330E Date: Sat, 2 Mar 2024 20:11:49 +0300 Subject: [PATCH 11/11] =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=B4=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BD=D0=BE=20=D0=B7=D0=B2=D1=83?= =?UTF-8?q?=D0=BA=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=B0=D0=BA=20=D0=B8=20=D0=BA=D0=BD=D0=BE=D0=BF?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BC=D1=83=D1=82=D0=B0=20=D1=87=D0=B0=D1=82?= =?UTF-8?q?=D0=B0=20,=20=D0=B8=D1=81=D1=82=D0=BE=D1=80=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D1=82=D0=B5=D0=B6=D0=B5=D0=B9=20=D1=82=D0=BE?= =?UTF-8?q?=D0=B6=D0=B5=20=D0=B3=D0=BE=D0=B2=D0=BD=D0=BE=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luckydiamond/package-lock.json | 62 +++++++++++++++++-- luckydiamond/package.json | 1 + .../assets/css/ComponentsStyles/asidebar.css | 15 ++++- .../src/assets/css/ComponentsStyles/chat.css | 6 +- .../src/assets/css/PagesStyles/profile.css | 8 +++ .../src/assets/css/PagesStyles/settings.css | 24 ++++++- .../src/components/AsidebarComponent.vue | 2 +- luckydiamond/src/components/ChatComponent.vue | 10 ++- .../home-adaptive/icon-home-menu.png | 0 luckydiamond/src/pages/HomePage.vue | 2 +- luckydiamond/src/pages/ProfilePage.vue | 9 ++- luckydiamond/src/pages/SettingsPage.vue | 51 +++++++++++++-- 12 files changed, 170 insertions(+), 20 deletions(-) create mode 100644 luckydiamond/src/components/adaptive-components/@/assets/icons-adaptive/home-adaptive/icon-home-menu.png diff --git a/luckydiamond/package-lock.json b/luckydiamond/package-lock.json index 42267d9..2eda100 100644 --- a/luckydiamond/package-lock.json +++ b/luckydiamond/package-lock.json @@ -11,6 +11,7 @@ "@popperjs/core": "^2.11.8", "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", + "axios": "^1.6.7", "bootstrap": "^5.3.2", "core-js": "^3.8.3", "howler": "^2.2.4", @@ -3813,6 +3814,11 @@ "lodash": "^4.17.14" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, "node_modules/at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", @@ -3859,6 +3865,16 @@ "postcss": "^8.1.0" } }, + "node_modules/axios": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", + "dependencies": { + "follow-redirects": "^1.15.4", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/babel-loader": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz", @@ -4585,6 +4601,17 @@ "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/commander": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", @@ -5366,6 +5393,14 @@ "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.3.tgz", "integrity": "sha512-Vy2wmG3NTkmHNg/kzpuvHhkqeIx3ODWqasgCRbKtbXEN0G+HpEEv9BtJLp7ZG1CZloFaC41Ah3ZFbq7aqCqMeQ==" }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -6618,10 +6653,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", - "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", - "dev": true, + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "funding": [ { "type": "individual", @@ -6637,6 +6671,19 @@ } } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -8246,7 +8293,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "engines": { "node": ">= 0.6" } @@ -8255,7 +8301,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "dependencies": { "mime-db": "1.52.0" }, @@ -9823,6 +9868,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", diff --git a/luckydiamond/package.json b/luckydiamond/package.json index 85940b1..d34a8e5 100644 --- a/luckydiamond/package.json +++ b/luckydiamond/package.json @@ -12,6 +12,7 @@ "@popperjs/core": "^2.11.8", "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", + "axios": "^1.6.7", "bootstrap": "^5.3.2", "core-js": "^3.8.3", "howler": "^2.2.4", diff --git a/luckydiamond/src/assets/css/ComponentsStyles/asidebar.css b/luckydiamond/src/assets/css/ComponentsStyles/asidebar.css index b94e5be..a56e3b8 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/asidebar.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/asidebar.css @@ -20,7 +20,20 @@ align-items: center; height: 100%; } - +.fotosloti { + display: flex; + justify-content: center; + align-items: center; + margin-left: 0.1vh; +} +.fotosloti a img { + display: flex; + justify-content: center; + align-items: center; + text-align: center; + max-width: 100%; + max-height: 100%; +} .menu__content--gamemodes { background: rgba(217, 217, 217, 0.12); filter: drop-shadow(4px 4px 4px rgba(0, 0, 0, 0.25)); diff --git a/luckydiamond/src/assets/css/ComponentsStyles/chat.css b/luckydiamond/src/assets/css/ComponentsStyles/chat.css index 4f5777b..a79b02f 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/chat.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/chat.css @@ -41,7 +41,11 @@ font-size: 18px; font-weight: 700; } - +.chat__mute-button { + position: absolute; + bottom: 10px; + right: 10px; + } /* .content p { width: 80%; word-wrap: break-word; diff --git a/luckydiamond/src/assets/css/PagesStyles/profile.css b/luckydiamond/src/assets/css/PagesStyles/profile.css index faab582..1cc92e6 100644 --- a/luckydiamond/src/assets/css/PagesStyles/profile.css +++ b/luckydiamond/src/assets/css/PagesStyles/profile.css @@ -8,9 +8,17 @@ padding-top: 10px; border-radius: 20px; } + .profile__card { display: flex; flex-direction: column; +}.hisorypaymond { + /* height: 590px; */ + height: 70vh; + width: auto; + overflow-y: auto; + overflow-x: auto; + overflow-y: auto; } .profile__card h1 { color: #FFF; diff --git a/luckydiamond/src/assets/css/PagesStyles/settings.css b/luckydiamond/src/assets/css/PagesStyles/settings.css index 81567c0..a7719d4 100644 --- a/luckydiamond/src/assets/css/PagesStyles/settings.css +++ b/luckydiamond/src/assets/css/PagesStyles/settings.css @@ -6,4 +6,26 @@ background: #17181C; box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.25); margin: 10px 39px 18px 13px; -} \ No newline at end of file +} +#volume-control { + display: flex; + align-items: center; + } + + #volume-up, #volume-down { + width: 30px; + height: 30px; + border: 1px solid #ccc; + border-radius: 5px; + background-color: #fff; + cursor: pointer; + } + + #volume-indicator { + width: 100px; + height: 10px; + border: 1px solid #ccc; + border-radius: 5px; + background-color: #ccc; + } + diff --git a/luckydiamond/src/components/AsidebarComponent.vue b/luckydiamond/src/components/AsidebarComponent.vue index a1d25c8..41ae2e9 100644 --- a/luckydiamond/src/components/AsidebarComponent.vue +++ b/luckydiamond/src/components/AsidebarComponent.vue @@ -6,7 +6,7 @@
- +
diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index 43706b8..4534f20 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -31,6 +31,9 @@
+
+ +
@@ -72,6 +75,10 @@ export default { alert("Вы не можете отправлять сообщения чаще, чем раз в 2 секунды."); } }, + muteChat() { + // Mute the chat by disabling the event listener for incoming messages. + this.eventBus.$off("dataChat"); + }, }, mounted() { eventBus.on("dataChat", (dataFromServer) => { @@ -128,4 +135,5 @@ export default { \ No newline at end of file + + diff --git a/luckydiamond/src/components/adaptive-components/@/assets/icons-adaptive/home-adaptive/icon-home-menu.png b/luckydiamond/src/components/adaptive-components/@/assets/icons-adaptive/home-adaptive/icon-home-menu.png new file mode 100644 index 0000000..e69de29 diff --git a/luckydiamond/src/pages/HomePage.vue b/luckydiamond/src/pages/HomePage.vue index c807ba0..3754041 100644 --- a/luckydiamond/src/pages/HomePage.vue +++ b/luckydiamond/src/pages/HomePage.vue @@ -81,7 +81,7 @@
+
-
+
+ +
@@ -110,7 +113,7 @@ export default { }); }) .catch(error => { - console.error('Error fetching payment history:', error); + console.error('Error fetching hisorypaymond:', error); }); this.username = GetCookie('SpUserName') GetCurrentMoney(GetCookie('AUTHTOKEN'), GetCookie('SearchToken')) diff --git a/luckydiamond/src/pages/SettingsPage.vue b/luckydiamond/src/pages/SettingsPage.vue index 58d95c2..e09b046 100644 --- a/luckydiamond/src/pages/SettingsPage.vue +++ b/luckydiamond/src/pages/SettingsPage.vue @@ -6,7 +6,16 @@ -
+
+ +
+ + +
+ + + +
@@ -19,10 +28,42 @@ import HeaderComponent from "@/components/HeaderComponent.vue"; import '@/assets/css/PagesStyles/settings.css' export default { components: { - ChatComponent, - HeaderComponent, - AsideBarComponent -} + ChatComponent, + HeaderComponent, + AsideBarComponent + }, + methods: { + volumeUp() { + var volume = document.getElementById("volume-indicator").value; + if (volume) { + volume += 10; + if (volume > 100) { + volume = 100; + } + + document.getElementById("volume-indicator").value = volume; + } else { + console.error("Element with id 'volume-indicator' not found or does not have a value property."); + } + }, + // остальной код метода volumeDown() + + volumeDown() { + // Получить текущий уровень громкости + var volume = document.getElementById("volume-indicator").value; + + // Уменьшить уровень громкости на 10% + volume -= 10; + + // Убедиться, что уровень громкости не ниже 0% + if (volume < 0) { + volume = 0; + } + + // Установить новый уровень громкости + document.getElementById("volume-indicator").value = volume; + }, + }, } \ No newline at end of file