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/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/assets/css/ComponentsStyles/developer.css b/luckydiamond/src/assets/css/ComponentsStyles/developer.css index 8605c6e..74e5ffd 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/developer.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/developer.css @@ -1,3 +1,4 @@ +<<<<<<< HEAD .info { flex-direction: column; @@ -30,10 +31,98 @@ /*beginning Hepatir_card-2 2*/ .Hepatir_card { +======= +.developer-card__content_down { + width: 1204px; + height: 443px; + background-color: aquamarine; + margin-left: 287px; + margin-right: 298px; + margin-bottom: 77px; +} +.developer-card__content { + + display: flex; + + background-color: black; + +} + +/* beginning card 1 */ + +.developer-card__width { + display: flex; + width: 422px; + height: 269px; + border-radius: 22px; + border: 3px solid #595959 ; + /*background-color: #742271;*/ +} + +.developer-card__about-text { + margin: 30px 0 0 15px; +} + +.developer-card__about-text p { + font-family: 'Montserrat'; + color: #fff; + font-size: 14px; +} + +.developer-card__about-text h1 { + font-family: 'Montserrat'; + color: #fff; + font-size: 32px; + margin-bottom: 20px; +} + +.developer-card__technology { + display: flex; + margin: 5px 0 0 15px; + font-family: 'Montserrat'; +} + +.developer-card__technology img { + width: 21px; + height: 21px; + margin-right: 3px; +} + +.developer-card__socials { + justify-content: space-around; + display: flex; + margin: 35% 0 11px 27px; + +} + +.developer-card__socials img { + width: 36px; + height: 36px; + border-radius: 10px; +} + +.developer-card__skin { + display: flex; + align-items: flex-end; + margin-left: 15px; +} + +.developer-card__skin img { + width: 212px; + height: 212px; +} + +/*the and card 1*/ + +/*beginning card 2*/ + +.developer-card__height { +>>>>>>> 49a494977b172fe4ea3d91155eb39f66ffe70420 width: 250px; height: 443px; background-color: #413C3B; border: 3px solid #595959 ; +<<<<<<< HEAD border-color: #595959; border-radius: 22px; } @@ -653,7 +742,6 @@ /*the and CLARFFY_card 1*/ @media only screen and (min-width: 2048px) { - .info { flex-direction: column; align-items: center; @@ -712,6 +800,65 @@ margin-bottom: 20px; } } +======= + border-radius: 22px; +} + +.developer-card-height__about-text { + margin: 30px 0 0 19px; + +} +.developer-card-height__about-text p { + font-family: 'Montserrat'; + color: #fff; + font-size: 14px; +} + +.developer-card-height__about-text h1 { + font-family: 'Montserrat'; + color: white; + font-size: 32px; +} + +.developer-card-height__technology { + display: flex; + font-family: 'Montserrat'; + margin: 30px 0 0 24px; +} + +.developer-card-height__technology-two-column { + display: flex; + font-family: 'Montserrat'; + margin: 10px 0 0 22px; +} + +.techonology-styles img { + height: 20px; + margin-right: 5px; +} + +.developer-card-height__skin { + margin-top: 6px; + display: inline-block; + align-items: center; + justify-content: center; +} + +.developer-card-height__skin { + width: 212px; + height: 212px; + + justify-content: space-around; + display: flex; + align-items: flex-end; + margin-top: 54px; +} + +.developer-card-height__social-icons { + justify-content: space-around; + display: flex; +} +>>>>>>> 49a494977b172fe4ea3d91155eb39f66ffe70420 diff --git a/luckydiamond/src/assets/css/PagesStyles/SettingsPage.css b/luckydiamond/src/assets/css/PagesStyles/settings.css similarity index 100% rename from luckydiamond/src/assets/css/PagesStyles/SettingsPage.css rename to luckydiamond/src/assets/css/PagesStyles/settings.css diff --git a/luckydiamond/src/assets/icons-developcard/Logo_C_sharp.png b/luckydiamond/src/assets/icons-developcard/csharp-logo.png similarity index 100% rename from luckydiamond/src/assets/icons-developcard/Logo_C_sharp.png rename to luckydiamond/src/assets/icons-developcard/csharp-logo.png diff --git a/luckydiamond/src/assets/icons-developcard/Figma.png b/luckydiamond/src/assets/icons-developcard/figma.png similarity index 100% rename from luckydiamond/src/assets/icons-developcard/Figma.png rename to luckydiamond/src/assets/icons-developcard/figma.png diff --git a/luckydiamond/src/assets/icons-developcard/pngegg.png b/luckydiamond/src/assets/icons-developcard/sql-logo.png similarity index 100% rename from luckydiamond/src/assets/icons-developcard/pngegg.png rename to luckydiamond/src/assets/icons-developcard/sql-logo.png diff --git a/luckydiamond/src/assets/icons-developcard/Vue.png b/luckydiamond/src/assets/icons-developcard/vue.png similarity index 100% rename from luckydiamond/src/assets/icons-developcard/Vue.png rename to luckydiamond/src/assets/icons-developcard/vue.png diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index 7e6cf50..1280ec6 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -1,62 +1,66 @@ -import { BackendWebSocketUrl } from '@/properties/Сonfig.js'; -import { eventBus } from "@/main"; -import { - GetCookie -} from "@/assets/js/storage/CookieStorage.js"; - -let webSocket; - -export function ConnectToChat() { - try { - webSocket = new WebSocket(BackendWebSocketUrl); - - webSocket.onopen = function () { - console.log('Connection established'); - }; - - webSocket.onmessage = function (event) { - - eventBus.emit('dataChat', event.data) - - console.log('Message from Server:', event.data); - }; - - webSocket.onclose = function () { - - webSocket = new WebSocket(BackendWebSocketUrl); - - console.log('Connection closed and reconnected'); - }; - - webSocket.onerror = function (event) { - console.error('WebSocket Error:', event); - }; - } catch (error) { - console.error('Error in ConnectToChat:', error); - } -} - -export function SendMessageToChat(message) { - try { - - if (!GetCookie("SpUserName") && !GetCookie("AUTHTOKEN") && !GetCookie("SearchToken")) { - return; - } - - const userCredentials = { - SearchToken: GetCookie("SearchToken"), - AUTHTOKEN: GetCookie("AUTHTOKEN") - }; - - const messageObject = { - UserCredentials: userCredentials, - Message: message, - MessageType: "Chat" - }; - - webSocket.send(JSON.stringify(messageObject)); - - } catch (error) { - console.error('Error in ConnectToChat:', error); - } -} \ No newline at end of file +// import { BackendWebSocketUrl } from '@/properties/Сonfig.js'; +// import { eventBus } from "@/main"; +// import { +// GetCookie +// } from "@/assets/js/storage/CookieStorage.js"; +// +// let webSocket; +// +// export function ConnectToChat() { +// try { +// webSocket = new WebSocket(BackendWebSocketUrl); +// +// webSocket.onopen = function () { +// console.log('Connection established'); +// }; +// +// webSocket.onmessage = function (event) { +// +// const dataObject = JSON.parse(event.data); +// +// if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { +// eventBus.emit('dataChat', event.data); +// } +// +// console.log('Message from Server:', event.data); +// }; +// +// webSocket.onclose = function () { +// +// webSocket = new WebSocket(BackendWebSocketUrl); +// +// console.log('Connection closed and reconnected'); +// }; +// +// webSocket.onerror = function (event) { +// console.error('WebSocket Error:', event); +// }; +// } catch (error) { +// console.error('Error in ConnectToChat:', error); +// } +// } +// +// export function SendMessageToChat(message) { +// try { +// +// if (!GetCookie("SpUserName") && !GetCookie("AUTHTOKEN") && !GetCookie("SearchToken")) { +// return; +// } +// +// const userCredentials = { +// SearchToken: GetCookie("SearchToken"), +// AUTHTOKEN: GetCookie("AUTHTOKEN") +// }; +// +// const messageObject = { +// UserCredentials: userCredentials, +// Message: message, +// MessageType: "Chat" +// }; +// +// webSocket.send(JSON.stringify(messageObject)); +// +// } catch (error) { +// console.error('Error in ConnectToChat:', error); +// } +// } \ No newline at end of file diff --git a/luckydiamond/src/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", diff --git a/luckydiamond/src/components/ChatComponent.vue b/luckydiamond/src/components/ChatComponent.vue index 9ad4b69..3103651 100644 --- a/luckydiamond/src/components/ChatComponent.vue +++ b/luckydiamond/src/components/ChatComponent.vue @@ -11,7 +11,7 @@