serg1557733 1 рік тому
батько
коміт
d2a284b9fd

+ 3 - 5
backend/app.js

@@ -13,7 +13,7 @@ const Uuid = require('uuid'); //lib for unic id generate
 const fileupload = require('express-fileupload');
 const fs = require('fs');
 
-
+const ORIGIN_URL = process.env.REACT_APP_BASE_URL
 
 const server = http.createServer(app);
 app.use(cors());
@@ -22,9 +22,7 @@ app.use(fileupload())
 app.use(express.static('avatars')); //folder for static files
 
 const io = require("socket.io")(server, {
-    cors: {
-        origin: "http://localhost:3000" //client endpoint and port
-    }
+    cors: 'no-cors'
 });
 const PORT = process.env.PORT || 5000;
 const TOKEN_KEY = process.env.TOKEN_KEY || 'rGH4r@3DKOg06hgj'; 
@@ -56,7 +54,7 @@ const getOneUser = async (userName) => {
     return userInDb;
 }
 app.post('/login', async (req, res) => {
-    
+    console.log(req)
 
     try {
         const {userName,password} = req.body;

+ 2 - 2
frontend/src/components/chatPage/messageForm/MessegaForm.jsx

@@ -17,7 +17,7 @@ export const MessageForm = () => {
     const dispatch = useDispatch();
     const socket = useSelector(state => state.getUserSocketReducer.socket)
 
-    const SERVER_URL = process.env.REACT_APP_SERVER_URL|| 'http://localhost:5000/';
+    const SERVER_URL = process.env.REACT_APP_SERVER_URL;
 
     const startMessages = useSelector(state => state.getUserSocketReducer.startMessages)
     const user = useSelector(state => state.getUserSocketReducer.socketUserData)
@@ -69,7 +69,7 @@ export const MessageForm = () => {
                             >
                             <Avatar 
                                 key={i} 
-                                src= {SERVER_URL + item?.user?.avatar}
+                                src= {SERVER_URL + '/'+ item?.user?.avatar}
                                 sx={
                                     (item.userName === user.userName)
                                     ? 

+ 2 - 2
frontend/src/components/chatPage/userInfo/UserInfo.jsx

@@ -34,7 +34,7 @@ export const UserInfo = () => {
             setDisplayType('none')
         }, 4000)
     }
-    const SERVER_URL = process.env.REACT_APP_SERVER_URL|| 'http://localhost:5000/';
+    const SERVER_URL = process.env.REACT_APP_SERVER_URL;
 
     const allUsers = useSelector(state => state.getUserSocketReducer.allUsers)
     const user = useSelector(state => state.getUserSocketReducer.socketUserData)
@@ -63,7 +63,7 @@ export const UserInfo = () => {
                 <Avatar
                     sx={isTabletorMobile ? MOBILE_AVATAR_STYLE : PC_AVATAR_STYLE} //add deleting function after update avatar
                     onClick={() => loadAvatarHandler()}
-                    src={userAvatarUrl ? SERVER_URL + userAvatarUrl : ""}
+                    src={userAvatarUrl ? SERVER_URL +'/'+ userAvatarUrl : ""}
                     >
                 </Avatar>  
                 

+ 1 - 1
frontend/src/reducers/socketReducer.js

@@ -16,8 +16,8 @@ const initialState = {
     newMessages : []
 }
 
+const SOCKET_URL = process.env.REACT_APP_SERVER_URL;
 
-const SOCKET_URL = 'http://localhost:5000'; 
 
 const connectToSocket = (event) => {
  

+ 4 - 3
frontend/src/reducers/userDataReducer.js

@@ -15,10 +15,11 @@ const initialState = {
     showUserInfoBox: false,
     avatar: ''
 }
+const SERVER_URL = process.env.REACT_APP_SERVER_URL;
 
-const POST_URL =  process.env.REACT_APP_POST_URL || 'http://localhost:5000/login';
-const GET_AVATAR_URL =  process.env.REACT_APP_GET_AVATAR_URL || 'http://localhost:5000/avatar';
-
+const POST_URL =  SERVER_URL + '/login';
+const GET_AVATAR_URL =  SERVER_URL + '/avatar';
+console.log(POST_URL)
 
 export const getUserData = createAsyncThunk(
     'userData/getUser',