mirror of
https://github.com/fromchat-messenger/web.git
synced 2026-09-22 19:15:08 +03:00
Add product name variable and fix bugs
This commit is contained in:
@@ -1,13 +1,13 @@
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from email.policy import HTTP
|
import logging
|
||||||
from fastapi import APIRouter, Depends, HTTPException, WebSocket, WebSocketDisconnect, WebSocketException, logger, status
|
from fastapi import APIRouter, Depends, HTTPException, WebSocket, WebSocketDisconnect
|
||||||
from fastapi.security import HTTPAuthorizationCredentials
|
from fastapi.security import HTTPAuthorizationCredentials
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from dependencies import get_current_user, get_db
|
from dependencies import get_current_user, get_db
|
||||||
from models import Message, SendMessageRequest, User
|
from models import Message, SendMessageRequest, User
|
||||||
|
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
logger = logging.getLogger("uvicorn.error")
|
||||||
|
|
||||||
def convert_message(msg: Message) -> dict:
|
def convert_message(msg: Message) -> dict:
|
||||||
return {
|
return {
|
||||||
@@ -59,10 +59,7 @@ async def send_message(
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/get_messages")
|
@router.get("/get_messages")
|
||||||
async def get_messages(
|
async def get_messages(db: Session = Depends(get_db)):
|
||||||
current_user: User = Depends(get_current_user),
|
|
||||||
db: Session = Depends(get_db)
|
|
||||||
):
|
|
||||||
return await get_messages_inner(db)
|
return await get_messages_inner(db)
|
||||||
|
|
||||||
|
|
||||||
@@ -132,6 +129,8 @@ class MessaggingSocketManager:
|
|||||||
self.connections.append(websocket)
|
self.connections.append(websocket)
|
||||||
try:
|
try:
|
||||||
await self.handle_connection(websocket, db)
|
await self.handle_connection(websocket, db)
|
||||||
|
except WebSocketDisconnect as e:
|
||||||
|
logger.info(f"WebSocket disconnected with code {e.code}: {e.reason}")
|
||||||
finally:
|
finally:
|
||||||
self.connections.remove(websocket)
|
self.connections.remove(websocket)
|
||||||
|
|
||||||
@@ -146,5 +145,4 @@ async def chat_websocket(
|
|||||||
websocket: WebSocket,
|
websocket: WebSocket,
|
||||||
db: Session = Depends(get_db)
|
db: Session = Depends(get_db)
|
||||||
):
|
):
|
||||||
logger.logger.log(1, f"WebSocket connected: {websocket}")
|
|
||||||
await messagingManager.connect(websocket, db)
|
await messagingManager.connect(websocket, db)
|
||||||
+1
-1
@@ -79,7 +79,7 @@
|
|||||||
<div class="header">
|
<div class="header">
|
||||||
<div class="container header-content">
|
<div class="container header-content">
|
||||||
<div class="logo">
|
<div class="logo">
|
||||||
<span>PixelChat</span>
|
<span id="productname">Loading...</span>
|
||||||
</div>
|
</div>
|
||||||
<ul class="nav-links">
|
<ul class="nav-links">
|
||||||
<li>
|
<li>
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
export const API_BASE_URL: string = '/api';
|
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";
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import './css/style.scss';
|
import './css/style.scss';
|
||||||
import { showLogin, getAuthHeaders, authToken, currentUser } from './auth';
|
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 type { Message, Messages, WebSocketMessage } from './types';
|
||||||
import "./links";
|
import "./links";
|
||||||
|
|
||||||
@@ -120,6 +120,10 @@ export function sendMessage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// --------------
|
||||||
|
// Initialization
|
||||||
|
// --------------
|
||||||
|
|
||||||
websocket.addEventListener("message", (e) => {
|
websocket.addEventListener("message", (e) => {
|
||||||
const message: WebSocketMessage = JSON.parse(e.data);
|
const message: WebSocketMessage = JSON.parse(e.data);
|
||||||
switch (message.type) {
|
switch (message.type) {
|
||||||
@@ -136,4 +140,6 @@ showLogin();
|
|||||||
document.getElementById('message-form')!.addEventListener('submit', (e) => {
|
document.getElementById('message-form')!.addEventListener('submit', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
sendMessage();
|
sendMessage();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
document.getElementById("productname")!.textContent = PRODUCT_NAME;
|
||||||
Reference in New Issue
Block a user