From 317f66d6b8fad053e4a8769032aef8597ea85b81 Mon Sep 17 00:00:00 2001
From: denis0001-dev <denis0001.dev@ya.ru>
Date: Tue, 19 Aug 2025 18:59:44 +0300
Subject: [PATCH] Add product name variable and fix bugs

---
 backend/routes/messaging.py | 14 ++++++--------
 frontend/index.html         |  2 +-
 frontend/src/config.ts      |  3 ++-
 frontend/src/main.ts        | 10 ++++++++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/backend/routes/messaging.py b/backend/routes/messaging.py
index 6ec86d1..2e93e1b 100644
--- a/backend/routes/messaging.py
+++ b/backend/routes/messaging.py
@@ -1,13 +1,13 @@
 from datetime import datetime
-from email.policy import HTTP
-from fastapi import APIRouter, Depends, HTTPException, WebSocket, WebSocketDisconnect, WebSocketException, logger, status
+import logging
+from fastapi import APIRouter, Depends, HTTPException, WebSocket, WebSocketDisconnect
 from fastapi.security import HTTPAuthorizationCredentials
 from sqlalchemy.orm import Session
 from dependencies import get_current_user, get_db
 from models import Message, SendMessageRequest, User
 
-
 router = APIRouter()
+logger = logging.getLogger("uvicorn.error")
 
 def convert_message(msg: Message) -> dict:
     return {
@@ -59,10 +59,7 @@ async def send_message(
 
 
 @router.get("/get_messages")
-async def get_messages(
-    current_user: User = Depends(get_current_user),
-    db: Session = Depends(get_db)
-):
+async def get_messages(db: Session = Depends(get_db)):
     return await get_messages_inner(db)
 
 
@@ -132,6 +129,8 @@ class MessaggingSocketManager:
         self.connections.append(websocket)
         try:
             await self.handle_connection(websocket, db)
+        except WebSocketDisconnect as e:
+            logger.info(f"WebSocket disconnected with code {e.code}: {e.reason}")
         finally:
             self.connections.remove(websocket)
 
@@ -146,5 +145,4 @@ async def chat_websocket(
     websocket: WebSocket,
     db: Session = Depends(get_db)
 ):
-    logger.logger.log(1, f"WebSocket connected: {websocket}")
     await messagingManager.connect(websocket, db)
\ No newline at end of file
diff --git a/frontend/index.html b/frontend/index.html
index 60fbd49..d834b94 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -79,7 +79,7 @@
             <div class="header">
                 <div class="container header-content">
                     <div class="logo">
-                        <span>PixelChat</span>
+                        <span id="productname">Loading...</span>
                     </div>
                     <ul class="nav-links">
                         <li>
diff --git a/frontend/src/config.ts b/frontend/src/config.ts
index 00f665f..01bcee0 100644
--- a/frontend/src/config.ts
+++ b/frontend/src/config.ts
@@ -1,2 +1,3 @@
 export const API_BASE_URL: string = '/api';
-export const API_FULL_BASE_URL: string = "localhost:8301/api"
\ No newline at end of file
+export const API_FULL_BASE_URL: string = "localhost:8301/api";
+export const PRODUCT_NAME: string = "FromChat";
\ No newline at end of file
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index f3ca8fe..56c8e25 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -1,6 +1,6 @@
 import './css/style.scss';
 import { showLogin, getAuthHeaders, authToken, currentUser } from './auth';
-import { API_BASE_URL, API_FULL_BASE_URL } from './config';
+import { API_BASE_URL, API_FULL_BASE_URL, PRODUCT_NAME } from './config';
 import type { Message, Messages, WebSocketMessage } from './types';
 import "./links";
 
@@ -120,6 +120,10 @@ export function sendMessage() {
 }
 
 
+// --------------
+// Initialization
+// --------------
+
 websocket.addEventListener("message", (e) => {
     const message: WebSocketMessage = JSON.parse(e.data);
     switch (message.type) {
@@ -136,4 +140,6 @@ showLogin();
 document.getElementById('message-form')!.addEventListener('submit', (e) => {
     e.preventDefault();
     sendMessage();
-});
\ No newline at end of file
+});
+
+document.getElementById("productname")!.textContent = PRODUCT_NAME;
\ No newline at end of file