From 6db67cf0d1664612f28c53419d15aaaad8e44246 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 30 Jan 2024 22:52:51 +0300 Subject: [PATCH 01/24] fixed path to chat --- luckydiamond/src/assets/js/rest/RestMethods.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luckydiamond/src/assets/js/rest/RestMethods.js b/luckydiamond/src/assets/js/rest/RestMethods.js index 3b390fe..716805b 100644 --- a/luckydiamond/src/assets/js/rest/RestMethods.js +++ b/luckydiamond/src/assets/js/rest/RestMethods.js @@ -55,7 +55,7 @@ export async function GetCurrentMoney(authToken, searchToken) { export async function GetChatHistory() { try { - const response = await fetch(`${BackendApiUrl}/ChatHistory/GetChatHistory`, { + const response = await fetch(`${BackendApiUrl}/Chat/GetChatHistory`, { method: "POST", headers: { "Content-Type": "application/json", From 3bdd99bc1b9abd63e5f5d5d60fb169f02cd2a613 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 30 Jan 2024 23:11:10 +0300 Subject: [PATCH 02/24] added if-block for changed icon for system-notification --- luckydiamond/src/components/ChatComponent.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index 9ad4b69..698b09c 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -102,6 +102,10 @@ export default { icon: imageUrl, }; + if (MsgUser.username === '🛠️ System') { + MsgUser.icon = 'https://avatar.spworlds.ru/face/55/CONSOLE' + } + this.array.push(MsgUser); }); this.ScrollToBottom(); From 04d1e73d441ff54c4bbc31983d962815dec8983e Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 30 Jan 2024 23:39:12 +0300 Subject: [PATCH 03/24] fixed changed-icon for system-notification --- luckydiamond/src/components/ChatComponent.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index 698b09c..28d3466 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -81,6 +81,10 @@ export default { icon: imageUrl, }; + if (MsgUser.username === '🛠️ System') { + MsgUser.icon = 'https://avatar.spworlds.ru/face/55/CONSOLE' + } + this.array.push(MsgUser); this.ScrollToBottom(); From bde224c34790c41d9e82d8ae7e59d3a9e60a3861 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 30 Jan 2024 23:40:03 +0300 Subject: [PATCH 04/24] added comment for save icon --- luckydiamond/src/components/ChatComponent.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index 28d3466..ad7592f 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -81,10 +81,12 @@ export default { icon: imageUrl, }; - if (MsgUser.username === '🛠️ System') { + if (MsgUser.username === 'System') { MsgUser.icon = 'https://avatar.spworlds.ru/face/55/CONSOLE' } + + // 🛠️ - icon this.array.push(MsgUser); this.ScrollToBottom(); @@ -106,7 +108,7 @@ export default { icon: imageUrl, }; - if (MsgUser.username === '🛠️ System') { + if (MsgUser.username === 'System') { MsgUser.icon = 'https://avatar.spworlds.ru/face/55/CONSOLE' } From 0bc976855a28f91c01587b630bb79fcb5bb248fe Mon Sep 17 00:00:00 2001 From: Hepatica Date: Wed, 31 Jan 2024 21:29:46 +0100 Subject: [PATCH 05/24] Add chart --- luckydiamond/package-lock.json | 27 ++++++++++ luckydiamond/package.json | 1 + luckydiamond/src/pages/SettingsPage.vue | 70 ++++++++++++++++--------- 3 files changed, 74 insertions(+), 24 deletions(-) diff --git a/luckydiamond/package-lock.json b/luckydiamond/package-lock.json index 0a11ca1..7c52dfa 100644 --- a/luckydiamond/package-lock.json +++ b/luckydiamond/package-lock.json @@ -18,6 +18,7 @@ "save": "^2.9.0", "swiper": "^11.0.5", "vue": "^3.2.13", + "vue-chart-3": "^3.1.8", "vue-recaptcha": "^3.0.0-alpha.6", "vue-router": "^4.2.5", "vue3-recaptcha2": "^1.8.0" @@ -4306,6 +4307,12 @@ "node": ">=4" } }, + "node_modules/chart.js": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz", + "integrity": "sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w==", + "peer": true + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -7807,6 +7814,11 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "node_modules/lodash-es": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", + "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" + }, "node_modules/lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", @@ -11561,6 +11573,21 @@ } } }, + "node_modules/vue-chart-3": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/vue-chart-3/-/vue-chart-3-3.1.8.tgz", + "integrity": "sha512-zX5ajjQi/PocEqLETlej3vp92q/tnI/Fvu2RVb++Kap8qOrXu6PXCpodi73BFrWzEGZIAnqoUxC3OIkRWD657g==", + "dependencies": { + "@vue/runtime-core": "latest", + "@vue/runtime-dom": "latest", + "csstype": "latest", + "lodash-es": "latest" + }, + "peerDependencies": { + "chart.js": "=> ^3.1.0", + "vue": ">= 3" + } + }, "node_modules/vue-demi": { "version": "0.14.6", "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", diff --git a/luckydiamond/package.json b/luckydiamond/package.json index 9c6dd42..e825f8c 100644 --- a/luckydiamond/package.json +++ b/luckydiamond/package.json @@ -19,6 +19,7 @@ "save": "^2.9.0", "swiper": "^11.0.5", "vue": "^3.2.13", + "vue-chart-3": "^3.1.8", "vue-recaptcha": "^3.0.0-alpha.6", "vue-router": "^4.2.5", "vue3-recaptcha2": "^1.8.0" diff --git a/luckydiamond/src/pages/SettingsPage.vue b/luckydiamond/src/pages/SettingsPage.vue index 4c00078..9139cb3 100644 --- a/luckydiamond/src/pages/SettingsPage.vue +++ b/luckydiamond/src/pages/SettingsPage.vue @@ -1,28 +1,50 @@ - - \ No newline at end of file +}) + \ No newline at end of file From 2f5118791cefbb0c31d639e1f009726c1916c58e Mon Sep 17 00:00:00 2001 From: Kostya Date: Thu, 1 Feb 2024 00:57:37 +0300 Subject: [PATCH 06/24] added chat-notification --- .../src/assets/css/ComponentsStyles/chat.css | 8 ++++++++ luckydiamond/src/components/ChatComponent.vue | 16 +++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/luckydiamond/src/assets/css/ComponentsStyles/chat.css b/luckydiamond/src/assets/css/ComponentsStyles/chat.css index 32f6ef6..4f5777b 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/chat.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/chat.css @@ -183,4 +183,12 @@ .write__content button:disabled { cursor: not-allowed; +} + +.system-message { + background-color: rgb(1, 56, 74); +} + +.mention-message { + background-color: rgb(169, 113, 0); } \ No newline at end of file diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index ad7592f..d60f212 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -11,7 +11,7 @@