Merge branch 'main' into DevelopCkutls

luckydiamond/src/assets/css/ComponentsStyles/chat.css

@@ -23,15 +23,20 @@
     font-weight: 700;
 }
 
-.content p {
+/* .content p {
     width: 80%;
     word-wrap: break-word;
     margin: 0 auto;
+} */
+
+.content p {
+    word-wrap: break-word;
+    overflow-wrap: break-word;
   }
 
 .chat__content--users {
     height: 650px;
-    width: 250px;
+    width: auto;
     overflow-y: auto;
     overflow-x: auto;
 }

luckydiamond/src/assets/js/chat/ChatLogic.js

@@ -38,9 +38,13 @@ export function ConnectToChat() {
 
 export function SendMessageToChat(message) {
     try {
+
+        if (!GetCookie("SpUserName") && !GetCookie("AUTHTOKEN") && !GetCookie("SearchToken")) {
+            return;
+        }
+
         const data = {
             SpUserName: GetCookie("SpUserName"),
-            SearchToken: GetCookie("SearchToken"),
             Message: message
         };
 

luckydiamond/src/components/ChatComponent.vue

@@ -49,33 +49,32 @@ export default {
   },
   methods: {
     ClaimDatamsg(msg) {
-      const MsgUser = {
-        id: this.id + 1,
-        msg: msg[0],
-        username: msg[1],
-        icon: msg[2]
-      }
-
-      this.array.push(MsgUser)
 
       SendMessageToChat(msg[0]);
 
-      if(this.array.length > 7) {
-        this.array.shift()
-      }
+      // if(this.array.length > 7) {
+      //   this.array.shift()
+      // }
     }
   },
   mounted() {
     eventBus.on('dataChat', (dataFromServer) => {
+      try {
+      // Attempt to parse the JSON string
+      const dataObject = JSON.parse(dataFromServer);
+      let imageUrl = "https://avatar.spworlds.ru/face/55/" + dataObject.SpUserName;
+
       const MsgUser = {
         id: this.id + 1,
-        msg: dataFromServer,
-        username: dataFromServer,
-        icon: dataFromServer
-      }
+        msg: dataObject.Message,
+        username: dataObject.SpUserName,
+        icon: imageUrl
+      };
 
-      this.array.push(MsgUser)
-      console.log(dataFromServer)
+      this.array.push(MsgUser);
+    } catch (error) {
+      console.error('Error parsing JSON data:', error);
+    }
     })
   }
 }

luckydiamond/src/components/HeaderComponent.vue

@@ -1,7 +1,6 @@
 
 <script>
 import "@/assets/css/ComponentsStyles/header.css";
-// import { GetAuthCodeFromCurrentPath } from '@/assets/js/authentication/LoggingMiddleware.js';
 import { LogIn } from "@/assets/js/authentication/AuthService.js";
 import { GetCurrentMoney } from "@/assets/js/rest/RestMethods.js";
 

luckydiamond/src/components/WritechatComponent.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="write">
     <div class="write__content">
-      <input type="text" @keyup.enter="sendmsgDataEnter" v-model.trim="msg" placeholder="Напишите сообщение..." maxlength="22">
+      <input type="text" @keyup.enter="sendmsgDataEnter" v-model.trim="msg" placeholder="Напишите сообщение..." maxlength="100">
       <button
           :disabled="CheckerforBtn()"
           type="submit"