fix: пофикшен доступ Websocket через SSL

refactor: косметический рефактор кода
This commit is contained in:
Dozzy7528
2026-03-30 18:31:04 +03:00
parent deb2fd4533
commit d478c1570a

View File

@@ -1,5 +1,5 @@
import { useState, useEffect } from 'react'; import {useEffect, useState} from 'react';
import { useParams, useNavigate } from 'react-router-dom'; import {useNavigate, useParams} from 'react-router-dom';
import {useBoardLogic} from './BoardLogic'; import {useBoardLogic} from './BoardLogic';
import Header from './../Header'; import Header from './../Header';
import './../css/Board.css'; import './../css/Board.css';
@@ -66,7 +66,9 @@ const KBBoard = () => {
function ListItem({item}) { function ListItem({item}) {
if (!item) return null; if (!item) return null;
const user = () => { navigate('/profile/' + item.id); }; const user = () => {
navigate('/profile/' + item.id);
};
return ( return (
<> <>
<button onClick={user}> <button onClick={user}>
@@ -83,7 +85,7 @@ const KBBoard = () => {
const [socket, setSocket] = useState(null); const [socket, setSocket] = useState(null);
useEffect(() => { useEffect(() => {
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:'; const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
const ws = new WebSocket(`${protocol}//back.fool-stack.ru/api/boards/ws/`+id); const ws = new WebSocket(`${protocol}//ws.back.fool-stack.ru/api/boards/ws/` + id);
ws.onopen = () => { ws.onopen = () => {
console.log('WebSocket соединение установлено'); console.log('WebSocket соединение установлено');
setSocket(ws); setSocket(ws);
@@ -239,7 +241,6 @@ const KBBoard = () => {
}; };
const handleDragEnd = (e) => { const handleDragEnd = (e) => {
setDraggedType(null); setDraggedType(null);
setDraggedItem(null); setDraggedItem(null);
@@ -304,7 +305,6 @@ const KBBoard = () => {
}; };
const handleTaskReorder = async (e, targetPosition, targetCategoryPos) => { const handleTaskReorder = async (e, targetPosition, targetCategoryPos) => {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
@@ -360,7 +360,8 @@ const KBBoard = () => {
{(info.members || []).map((member) => ( {(info.members || []).map((member) => (
<div key={member.id}> <div key={member.id}>
{(member.id !== info.owner?.id) ? ( {(member.id !== info.owner?.id) ? (
<img className='members-avatar' src={member.avatar_url} alt={member.display_name || 'Участник'}></img> <img className='members-avatar' src={member.avatar_url}
alt={member.display_name || 'Участник'}></img>
) : ( ) : (
<></> <></>
)} )}
@@ -427,7 +428,8 @@ const KBBoard = () => {
<div className='task-list'> <div className='task-list'>
{category.tasks.length > 0 ? ( {category.tasks.length > 0 ? (
category.tasks.map((task) => ( category.tasks.map((task) => (
<button className='task' onClick={modalEditTask(task, category.id)} key={task.position} <button className='task' onClick={modalEditTask(task, category.id)}
key={task.position}
draggable="true" draggable="true"
onDragStart={(e) => handleTaskDragStart(e, task, category.position)} onDragStart={(e) => handleTaskDragStart(e, task, category.position)}
onDragLeave={handleDragLeave} onDragLeave={handleDragLeave}
@@ -445,13 +447,15 @@ const KBBoard = () => {
year: 'numeric', year: 'numeric',
hour: '2-digit', hour: '2-digit',
minute: '2-digit', minute: '2-digit',
timeZone: 'UTC'})} timeZone: 'UTC'
})}
</div> </div>
)} )}
{task.assigned_users[0] !== undefined && ( {task.assigned_users[0] !== undefined && (
<div>Исполнители: <div>Исполнители:
{task.assigned_users.map((member) => ( {task.assigned_users.map((member) => (
<img key={member.id} className='members-avatar' src={member.avatar_url} alt=''></img> <img key={member.id} className='members-avatar'
src={member.avatar_url} alt=''></img>
))} ))}
</div> </div>
)} )}
@@ -559,7 +563,8 @@ const KBBoard = () => {
</div> </div>
<div> <div>
<label>Исполнитель:</label> <label>Исполнитель:</label>
<select value={assignedMembers} onChange={(e) => setAssignedMembers(e.target.value)}> <select value={assignedMembers}
onChange={(e) => setAssignedMembers(e.target.value)}>
<option value={null}> <option value={null}>
Выберите пользователя Выберите пользователя
</option> </option>
@@ -660,7 +665,8 @@ const KBBoard = () => {
year: 'numeric', year: 'numeric',
hour: '2-digit', hour: '2-digit',
minute: '2-digit', minute: '2-digit',
timeZone: 'UTC'}) : ""} timeZone: 'UTC'
}) : ""}
</label> </label>
<input <input
type="datetime-local" type="datetime-local"
@@ -771,7 +777,8 @@ const KBBoard = () => {
<div> <div>
<div> <div>
<label>Исполнитель:</label> <label>Исполнитель:</label>
<select value={assignedMember} onChange={(e) => setAssignedMember(e.target.value)}> <select value={assignedMember}
onChange={(e) => setAssignedMember(e.target.value)}>
<option value={0}> <option value={0}>
Выберите пользователя Выберите пользователя
</option> </option>
@@ -796,7 +803,8 @@ const KBBoard = () => {
<div> <div>
<div> <div>
<label>Исполнитель:</label> <label>Исполнитель:</label>
<select value={assignedMember} onChange={(e) => setAssignedMember(e.target.value)}> <select value={assignedMember}
onChange={(e) => setAssignedMember(e.target.value)}>
<option value={0}> <option value={0}>
Выберите пользователя Выберите пользователя
</option> </option>