Преглед изворни кода

private chats find all user start task

serg1557733 пре 1 година
родитељ
комит
b672ac3d1e

+ 4 - 4
backend/app.js

@@ -240,6 +240,7 @@ io.on("connection", async (socket) => {
     const userName = socket.user.userName;
     const sockets = await io.fetchSockets();
     const dbUser = await getOneUser(userName);
+    const allUsers = await getAllDbUsers(socket) // send allUsers from DB to socket user
 
     //need to use this ID to socket privat messges
 
@@ -274,12 +275,11 @@ io.on("connection", async (socket) => {
     const privateChats = await PrivateMessage.find( {$or:[ {toUser: dbUser._id}, {fromUser: dbUser._id }],foreignField: '_id'}).populate( ['fromUser','toUser'])//need to optimal way found
 
     const myChats = []
-privateChats.map((item, i) => {
-    console.log(item.fromUser.userName, i)
+// privateChats.map((item, i) => {
+//     console.log(item.fromUser.userName, i)
     
-})
+// })
 ///
-
 // console.log(myChats)
 // console.log(users)
 

+ 18 - 0
frontend/src/components/chatPage/generalChat/FindUserBox.jsx

@@ -0,0 +1,18 @@
+import { useSelector } from 'react-redux';
+import './userInfo.scss';
+import { store } from '../../../store';
+
+export const FindUserBox = () => {
+
+    const allUsers = useSelector(state => state.getUserSocketReducer.allUsers)
+
+
+    return (
+        <div 
+            className={'online'}                       
+            onClick={() => {console.log(allUsers, "find user in array - allUsers")}}
+        >  
+            <div>Find users to write</div>
+        </div>
+    )
+}

+ 5 - 0
frontend/src/components/chatPage/userInfo/UserInfo.jsx

@@ -7,6 +7,7 @@ import { useState, useEffect } from 'react';
 import { UserInfoButton } from '../generalChat/UserInfoButton';
 import { AdminUserInfiButton } from '../generalChat/AdminUserInfiButton';
 import { MainChatButtton } from '../generalChat/MainChatButtton';
+import { FindUserBox } from '../generalChat/FindUserBox';
 import './userInfo.scss';
 
 
@@ -52,6 +53,9 @@ export const UserInfo = () => {
         setDisplayType('none')
     }
 
+console.log(allUsers)
+
+
 if(socket){
     socket.on('my chats', (data)=> console.log(data))
 }
@@ -80,6 +84,7 @@ if(socket){
                    
                 <MainChatButtton/>     
 
+                <FindUserBox/>        
                 
                     {user.isAdmin && !isTabletorMobile ? 
                             allUsers.map((item, i) =>