Add product name variable and fix bugs

This commit is contained in:
2025-08-19 18:59:44 +03:00
Unverified
parent a5a501e364
commit 317f66d6b8
4 changed files with 17 additions and 12 deletions
+6 -8
View File
@@ -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)
+1 -1
View File
@@ -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>
+2 -1
View File
@@ -1,2 +1,3 @@
export const API_BASE_URL: string = '/api';
export const API_FULL_BASE_URL: string = "localhost:8301/api"
export const API_FULL_BASE_URL: string = "localhost:8301/api";
export const PRODUCT_NAME: string = "FromChat";
+8 -2
View File
@@ -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();
});
});
document.getElementById("productname")!.textContent = PRODUCT_NAME;