diff --git a/luckydiamond/src/assets/css/ComponentsStyles/developer.css b/luckydiamond/src/assets/css/ComponentsStyles/developer.css index 91cd97e..62605d2 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/developer.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/developer.css @@ -48,7 +48,7 @@ .developer-card__socials { justify-content: space-around; display: flex; - margin: 95px 0 11px 27px; + margin: 35% 0 11px 27px; } diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index 8e35440..1280ec6 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -1,66 +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) { - - 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 +// 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/components/DeveloperComponent.vue b/luckydiamond/src/components/DeveloperComponent.vue index 2033c18..06b5e6e 100644 --- a/luckydiamond/src/components/DeveloperComponent.vue +++ b/luckydiamond/src/components/DeveloperComponent.vue @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/luckydiamond/src/mocks/DevelopersOptions.js b/luckydiamond/src/mocks/DevelopersOptions.js index 0b9de55..a5851b0 100644 --- a/luckydiamond/src/mocks/DevelopersOptions.js +++ b/luckydiamond/src/mocks/DevelopersOptions.js @@ -41,13 +41,8 @@ export default [ userRole: "Дизайнер", background: "#393A3A", technologyText: ["Designer"], - technologyIcons: { - figma: "@/assets/icons-developcard/figma.png" - }, - socialIcons: { - telegram: "@/assets/icons-developcard/telegram.png", - discord: "@/assets/icons-developcard/discord.png" - } + technologyIcons: ["figma"], + socialIcons: ["telegram", "discord"] }, { id: 6, @@ -55,15 +50,8 @@ export default [ userRole: "Фронтэндер", background: "#742271", technologyText: ["html 5, css"], - technologyIcons: { - html: "@/assets/icons-developcard/html.png" - }, - socialIcons: { - odniclasniki: "@/assets/icons-developcard/odniclasniki.png", - telegram: "@/assets/icons-developcard/telegram.png", - like: "@/assets/icons-developcard/like.png", - github: "@/assets/icons-developcard/github.png", - } + technologyIcons: ["html"], + socialIcons: ["odniclasniki", "telegram", "like", "github"], }, { id: 7, @@ -71,13 +59,8 @@ export default [ userRole: "Дизайнер", background: "#E2B374", technologyText: ["Designer"], - technologyIcons: { - figma: "@/assets/icons-developcard/figma.png" - }, - socialIcons: { - telegram: "@/assets/icons-developcard/telegram.png", - discord: "@/assets/icons-developcard/discord.png" - } + technologyIcons: ["figma"], + socialIcons: ["telegram", "discord"] } ]