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