Fool-Stack/Kanban-Front
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/install' into install

Browse Source
This commit is contained in:
Dozzy7528
2026-03-14 16:07:55 +03:00
parent 6993eea1da 4eecb0af5d
commit aba66ca0bc
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/KBBoard/BoardLogic.js
View File

@@ -132,7 +132,7 @@ export const useBoardLogic = (id, setError, setInfo, setCategories, setLoading,
} finally { } finally {
setLoading(false); setLoading(false);
} }
}, [setLoading, setError]); }, [setLoading, setError, navigate]);
const deleteCategory = useCallback(async (categoryId, modalDelCateg, modalEditCateg) => { const deleteCategory = useCallback(async (categoryId, modalDelCateg, modalEditCateg) => {
setLoading(true); setLoading(true);
@@ -203,6 +203,7 @@ export const useBoardLogic = (id, setError, setInfo, setCategories, setLoading,
await quitMemberAPI( boardId ); await quitMemberAPI( boardId );
await loadBoardData(); await loadBoardData();
modalQuitMember(); modalQuitMember();
navigate('/kanban-boards-list');
} catch { } catch {
setError('Ошибка'); setError('Ошибка');
} finally{ } finally{
@@ -222,7 +223,7 @@ export const useBoardLogic = (id, setError, setInfo, setCategories, setLoading,
} finally { } finally {
setLoading(false); setLoading(false);
} }
}, [loadBoardData, setLoading, setError, navigate]); }, [loadBoardData, setLoading, setError]);

20
src/KBBoard/KBBoard.js
View File

@@ -43,7 +43,6 @@ const KBBoard = () => {
const [assignedMember, setAssignedMember] = useState(0); const [assignedMember, setAssignedMember] = useState(0);
const [addedUsername, setAddedUsername] = useState(''); const [addedUsername, setAddedUsername] = useState('');
const [deletedMember, setDeletedMember] = useState(''); const [deletedMember, setDeletedMember] = useState('');
const { const {
loadBoardData, loadBoardData,
createTask, createTask,
@@ -67,7 +66,7 @@ const KBBoard = () => {
return ( return (
<button onClick={user}> <button onClick={user}>
<div className="row"> <div className="row">
<h3>{item.display_name}<img className='members-avatar' src={item.avatar_url}></img></h3> <h3>{item.display_name}<img className='members-avatar' src={item.avatar_url} alt=''></img></h3>
<p><strong>Описание:</strong> {item.description ? item.description : 'Отсутствует'}</p> <p><strong>Описание:</strong> {item.description ? item.description : 'Отсутствует'}</p>
</div> </div>
</button> </button>
@@ -151,7 +150,6 @@ const KBBoard = () => {
e.preventDefault(); e.preventDefault();
await editBoard(id, boardTitle, boardDescription, modalEditBoard); await editBoard(id, boardTitle, boardDescription, modalEditBoard);
}; };
const handleEditCategory = async (e) => { const handleEditCategory = async (e) => {
e.preventDefault(); e.preventDefault();
await editCategory(editedCateg.id, categoryTitle, modalEditCateg); await editCategory(editedCateg.id, categoryTitle, modalEditCateg);
@@ -205,7 +203,7 @@ const KBBoard = () => {
<strong>Участники: </strong> <strong>Участники: </strong>
{(info.members || []).map((member) => ( {(info.members || []).map((member) => (
(member.id !== info.owner.id) ? ( (member.id !== info.owner.id) ? (
<img key={member.id} className='members-avatar' src={member.avatar_url}></img> <img key={member.id} className='members-avatar' src={member.avatar_url} alt=''></img>
) : ( ) : (
<></> <></>
) )
@@ -270,10 +268,9 @@ const KBBoard = () => {
<button className='task' onClick={modalEditTask(task, category.id)} key={task.id}> <button className='task' onClick={modalEditTask(task, category.id)} key={task.id}>
<div>{task.title}</div> <div>{task.title}</div>
<div>{task.description}</div> <div>{task.description}</div>
<div>Исполнители <div>Исполнители:
{task.assigned_users.map((member) => ( {task.assigned_users.map((member) => (
<img key={member.id} className='members-avatar' src={member.avatar_url}></img> <img key={member.id} className='members-avatar' src={member.avatar_url} alt=''></img>
))} ))}
</div> </div>
</button> </button>
@@ -520,7 +517,7 @@ const KBBoard = () => {
{addMemb && ( {addMemb && (
<div className="confirm-modal"> <div className="confirm-modal">
<div className="modal-content"> <div className="modal-content">
<div><h3>Добавление участникf</h3></div> <div><h3>Добавление участника</h3></div>
<form onSubmit={handleAddMember}> <form onSubmit={handleAddMember}>
<label >Введите логин человека которого хотите пригласить</label> <label >Введите логин человека которого хотите пригласить</label>
<input <input
@@ -529,10 +526,10 @@ const KBBoard = () => {
value={addedUsername} value={addedUsername}
onChange={(e) => setAddedUsername(e.target.value)} onChange={(e) => setAddedUsername(e.target.value)}
/> />
<button onClick={modalAddMember} type='reset'>Отменить</button>
<button type="submit" disabled={loading}> <button type="submit" disabled={loading}>
{loading ? 'Добавление...' : 'Добавить'} {loading ? 'Добавление...' : 'Добавить'}
</button> </button>
<button onClick={modalAddMember} type='reset'>Отменить</button>
</form> </form>
</div> </div>
</div> </div>
@@ -602,7 +599,7 @@ const KBBoard = () => {
<label >Вы точно хотите покинуть эту Канбан доску?</label> <label >Вы точно хотите покинуть эту Канбан доску?</label>
<button onClick={modalQuitMember} type='reset'>Отменить</button> <button onClick={modalQuitMember} type='reset'>Отменить</button>
<button className="Important-button" type="submit" disabled={loading}> <button className="Important-button" type="submit" disabled={loading}>
{loading ? 'Удаление...' : 'Удалить'} {loading ? 'Покинуть...' : 'Покинуть'}
</button> </button>
</form> </form>
</div> </div>
@@ -640,9 +637,6 @@ const KBBoard = () => {
</div> </div>
)} )}
</div> </div>
</div> </div>
); );