enterfront/front
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

integrated redux library

Browse Source
This commit is contained in:
Nikolai Petukhov 2024-10-16 23:40:34 +03:00
parent fde1f8ecfe
commit 59d4a44079
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/redux/api_slice.js
View File

@ -25,13 +25,11 @@ export const apiSlice = createApi({
query: (username) => `/chat/list/${username}`, query: (username) => `/chat/list/${username}`,
}), }),
postChat: builder.mutation({ postChat: builder.mutation({
query: (body) => ({ query: ({ id1, id2 }) => ({
url: '/chat/post', url: `/chat/item/${id1}/${id2}`,
method: 'POST', method: 'POST',
body,
}), }),
}), }),
// Add more endpoints as needed
}), }),
}); });

50
src/pages/Home.jsx
View File

@ -28,22 +28,29 @@ const Home = () => {
if (getError) { if (getError) {
displayMessage(getError.message, MessageType.ERROR); displayMessage(getError.message, MessageType.ERROR);
} }
}, [getError]); if (getError) {
displayMessage(getError.message, MessageType.ERROR);
}
}, [getError, postError]);
useEffect(() => { useEffect(() => {
if (chatsData) { if (chatsData) {
setChats(chatsData.chats); // setChats(chatsData.chats);
let data = chatsData.chats;
try { try {
// const sortedChats = chatsData.chats.sort((a, b) => { const sortedChats = [...data].sort((a, b) => {
// const lastMessageA = new Date(a.timestamp); const lastMessageA = a.messages[a.messages.length - 1];
// const lastMessageB = new Date(b.timestamp); const lastMessageB = b.messages[b.messages.length - 1];
// return lastMessageB - lastMessageA;
// }); const dateA = new Date(lastMessageA.timestamp);
// // const dateB = new Date(lastMessageB.timestamp);
// // console.log('sorted:', sortedChats);
// return dateB - dateA;
// setChats(sortedChats); });
setChats(sortedChats);
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }
@ -60,7 +67,7 @@ const Home = () => {
displayMessage("Sent", MessageType.INFO); displayMessage("Sent", MessageType.INFO);
try { try {
const data = await createChat({ alias, username }).unwrap(); // Using unwrap to handle promise rejection const data = await createChat({ id1: alias, id2: username }).unwrap(); // Using unwrap to handle promise rejection
localStorage.setItem("message", "Successfully opened chat!"); localStorage.setItem("message", "Successfully opened chat!");
localStorage.setItem("interlocutorId", alias); localStorage.setItem("interlocutorId", alias);
window.location.href = URLs.chat.url; window.location.href = URLs.chat.url;
@ -69,8 +76,6 @@ const Home = () => {
} }
}; };
if (isGetting) return <div>Loading...</div>;
return ( return (
<div className="homeWrapper"> <div className="homeWrapper">
<div className="headerPos"> <div className="headerPos">
@ -85,13 +90,24 @@ const Home = () => {
value={interlocutor} value={interlocutor}
setValue={setInterlocutor} setValue={setInterlocutor}
placeholder="Enter the username (id)" placeholder="Enter the username (id)"
enter={createChatHandler}
submit={interlocutor}
/> />
</div> </div>
<Search search={createChatHandler} item={interlocutor} /> {isGetting ? (
<div>Loading...</div>
) : (
<>
<Search search={createChatHandler} item={interlocutor} />
<p>Your chats</p>
<ChatsList chats={chats} />
</>
)}
<p>Your chats</p>
<ChatsList chats={chats} /> {/* Retained original variable name */}
</div> </div>
); );
}; };