Chatify

Author: Ahad-webdev-90

client/src/components/EditUserDetails.js

@@ -56,40 +56,40 @@ const EditUserDetails = ({ onClose, user }) => {
         })
     }
 
-   
+
     const handleSubmit = async (e) => {
         e.preventDefault();
         e.stopPropagation();
-        
+
         try {
-            const URL = `${process.env.REACT_APP_BACKEND_URL}/api/update-user`;
-    
+            const URL = 'https://chatify-two-drab.vercel.app/api/update-user';
+
             // Filter out necessary fields from data object
             const filteredData = {
                 name: data.name,
                 profile_pic: data.profile_pic,
                 // Add any other properties that are required by your API
             };
-    
+
             const response = await axios({
                 method: 'post',
                 url: URL,
                 data: filteredData,
                 withCredentials: true
             });
-    
+
             taost.success(response?.data?.message);
-    
+
             if (response.data.success) {
                 dispatch(setUser(response.data.data));
                 onClose();
             }
-    
+
         } catch (error) {
             taost.error();
         }
     }
-    
+
     return (
         <div className='fixed top-0 bottom-0 left-0 right-0 bg-gray-700 bg-opacity-40 flex justify-center items-center z-10'>
             <div className='bg-white p-4 py-6 m-1 rounded w-full max-w-sm'>

client/src/components/SearchUser.js

@@ -13,7 +13,7 @@ const SearchUser = ({onClose}) => {
 
 
     const handleSearchUser = async()=>{
-        const URL = `${process.env.REACT_APP_BACKEND_URL}/api/search-user`
+        const URL = 'https://chatify-two-drab.vercel.app/api/search-user'
         try {
             setLoading(true)
             const response = await axios.post(URL,{

client/src/pages/CheckEmailPage.js

@@ -27,7 +27,7 @@ const CheckEmailPage = () => {
     e.preventDefault()
     e.stopPropagation()
 
-    const URL = `${process.env.REACT_APP_BACKEND_URL}api/email`
+    const URL = 'https://chatify-two-drab.vercel.app/api/email'
 
     try {
         const response = await axios.post(URL,data)

client/src/pages/CheckPasswordPage.js

@@ -39,7 +39,7 @@ const CheckPasswordPage = () => {
     e.preventDefault()
     e.stopPropagation()
 
-    const URL = `${process.env.REACT_APP_BACKEND_URL}api/password`
+    const URL = 'https://chatify-two-drab.vercel.app/api/password'
 
     try {
         const response = await axios({

client/src/pages/Home.js

@@ -16,7 +16,7 @@ const Home = () => {
 
   const fetchUserDetails = async()=>{
     try {
-        const URL = `${process.env.REACT_APP_BACKEND_URL}api/user-details`
+        const URL = 'https://chatify-two-drab.vercel.app/api/user-details'
         const response = await axios({
           url : URL,
           withCredentials : true

client/src/pages/RegisterPage.js

@@ -50,7 +50,7 @@ const RegisterPage = () => {
     e.preventDefault()
     e.stopPropagation()
 
-    const URL = `${process.env.REACT_APP_BACKEND_URL}api/register`
+    const URL = 'https://chatify-two-drab.vercel.app/api/register'
 
     try {
         const response = await axios.post(URL,data)

server/index.js

@@ -7,17 +7,9 @@ const cookiesParser = require('cookie-parser')
 const { app, server } = require('./socket/index')
 
 // const app = express()
-const allowedOrigins = [`${process.env.FRONTEND_URL}`];
-
 app.use(cors({
-    origin: function (origin, callback) {
-        if (allowedOrigins.indexOf(origin) !== -1 || !origin) {
-            callback(null, true);
-        } else {
-            callback(new Error('Not allowed by CORS'));
-        }
-    },
-    credentials: true,
+    origin: 'https://chatify-ahkg.vercel.app/',
+    credentials: true
 }))
 app.use(express.json())
 app.use(cookiesParser())

server/socket/index.js

@@ -1,26 +1,19 @@
 const express = require('express')
 const { Server } = require('socket.io')
-const http = require('http')
+const http  = require('http')
 const getUserDetailsFromToken = require('../helpers/getUserDetailsFromToken')
 const UserModel = require('../models/UserModel')
-const { ConversationModel, MessageModel } = require('../models/ConversationModel')
+const { ConversationModel,MessageModel } = require('../models/ConversationModel')
 const getConversation = require('../helpers/getConversation')
 
 const app = express()
 
 /***socket connection */
 const server = http.createServer(app)
-const allowedOrigins = [`${process.env.FRONTEND_URL}`];
-const io = new Server(server, {
-    cors: {
-        origin: function (origin, callback) {
-            if (allowedOrigins.indexOf(origin) !== -1 || !origin) {
-                callback(null, true);
-            } else {
-                callback(new Error('Not allowed by CORS'));
-            }
-        },
-        credentials: true,
+const io = new Server(server,{
+    cors : {
+        origin : 'https://chatify-ahkg.vercel.app/',
+        credentials : true
     }
 })
 
@@ -31,9 +24,9 @@ const io = new Server(server, {
 //online user
 const onlineUser = new Set()
 
-io.on('connection', async (socket) => {
+io.on('connection',async(socket)=>{
 
-    const token = socket.handshake.auth.token
+    const token = socket.handshake.auth.token 
 
     //current user details 
     const user = await getUserDetailsFromToken(token)
@@ -42,123 +35,123 @@ io.on('connection', async (socket) => {
     socket.join(user?._id.toString())
     onlineUser.add(user?._id?.toString())
 
-    io.emit('onlineUser', Array.from(onlineUser))
+    io.emit('onlineUser',Array.from(onlineUser))
 
-    socket.on('message-page', async (userId) => {
+    socket.on('message-page',async(userId)=>{
         const userDetails = await UserModel.findById(userId).select("-password")
-
+        
         const payload = {
-            _id: userDetails?._id,
-            name: userDetails?.name,
-            email: userDetails?.email,
-            profile_pic: userDetails?.profile_pic,
-            online: onlineUser.has(userId)
+            _id : userDetails?._id,
+            name : userDetails?.name,
+            email : userDetails?.email,
+            profile_pic : userDetails?.profile_pic,
+            online : onlineUser.has(userId)
         }
-        socket.emit('message-user', payload)
+        socket.emit('message-user',payload)
 
 
-        //get previous message
-        const getConversationMessage = await ConversationModel.findOne({
-            "$or": [
-                { sender: user?._id, receiver: userId },
-                { sender: userId, receiver: user?._id }
+         //get previous message
+         const getConversationMessage = await ConversationModel.findOne({
+            "$or" : [
+                { sender : user?._id, receiver : userId },
+                { sender : userId, receiver :  user?._id}
             ]
-        }).populate('messages').sort({ updatedAt: -1 })
+        }).populate('messages').sort({ updatedAt : -1 })
 
-        socket.emit('message', getConversationMessage?.messages || [])
+        socket.emit('message',getConversationMessage?.messages || [])
     })
 
 
     //new message
-    socket.on('new message', async (data) => {
+    socket.on('new message',async(data)=>{
 
         //check conversation is available both user
 
         let conversation = await ConversationModel.findOne({
-            "$or": [
-                { sender: data?.sender, receiver: data?.receiver },
-                { sender: data?.receiver, receiver: data?.sender }
+            "$or" : [
+                { sender : data?.sender, receiver : data?.receiver },
+                { sender : data?.receiver, receiver :  data?.sender}
             ]
         })
 
         //if conversation is not available
-        if (!conversation) {
+        if(!conversation){
             const createConversation = await ConversationModel({
-                sender: data?.sender,
-                receiver: data?.receiver
+                sender : data?.sender,
+                receiver : data?.receiver
             })
             conversation = await createConversation.save()
         }
-
+        
         const message = new MessageModel({
-            text: data.text,
-            imageUrl: data.imageUrl,
-            videoUrl: data.videoUrl,
-            msgByUserId: data?.msgByUserId,
+          text : data.text,
+          imageUrl : data.imageUrl,
+          videoUrl : data.videoUrl,
+          msgByUserId :  data?.msgByUserId,
         })
         const saveMessage = await message.save()
 
-        const updateConversation = await ConversationModel.updateOne({ _id: conversation?._id }, {
-            "$push": { messages: saveMessage?._id }
+        const updateConversation = await ConversationModel.updateOne({ _id : conversation?._id },{
+            "$push" : { messages : saveMessage?._id }
         })
 
         const getConversationMessage = await ConversationModel.findOne({
-            "$or": [
-                { sender: data?.sender, receiver: data?.receiver },
-                { sender: data?.receiver, receiver: data?.sender }
+            "$or" : [
+                { sender : data?.sender, receiver : data?.receiver },
+                { sender : data?.receiver, receiver :  data?.sender}
             ]
-        }).populate('messages').sort({ updatedAt: -1 })
+        }).populate('messages').sort({ updatedAt : -1 })
 
 
-        io.to(data?.sender).emit('message', getConversationMessage?.messages || [])
-        io.to(data?.receiver).emit('message', getConversationMessage?.messages || [])
+        io.to(data?.sender).emit('message',getConversationMessage?.messages || [])
+        io.to(data?.receiver).emit('message',getConversationMessage?.messages || [])
 
         //send conversation
         const conversationSender = await getConversation(data?.sender)
         const conversationReceiver = await getConversation(data?.receiver)
 
-        io.to(data?.sender).emit('conversation', conversationSender)
-        io.to(data?.receiver).emit('conversation', conversationReceiver)
+        io.to(data?.sender).emit('conversation',conversationSender)
+        io.to(data?.receiver).emit('conversation',conversationReceiver)
     })
 
 
     //sidebar
-    socket.on('sidebar', async (currentUserId) => {
-        console.log("current user", currentUserId)
+    socket.on('sidebar',async(currentUserId)=>{
+        console.log("current user",currentUserId)
         const conversation = await getConversation(currentUserId)
 
-        socket.emit('conversation', conversation)
-
+        socket.emit('conversation',conversation)
+        
     })
 
-    socket.on('seen', async (msgByUserId) => {
-
+    socket.on('seen',async(msgByUserId)=>{
+        
         let conversation = await ConversationModel.findOne({
-            "$or": [
-                { sender: user?._id, receiver: msgByUserId },
-                { sender: msgByUserId, receiver: user?._id }
+            "$or" : [
+                { sender : user?._id, receiver : msgByUserId },
+                { sender : msgByUserId, receiver :  user?._id}
             ]
         })
 
         const conversationMessageId = conversation?.messages || []
 
-        const updateMessages = await MessageModel.updateMany(
-            { _id: { "$in": conversationMessageId }, msgByUserId: msgByUserId },
-            { "$set": { seen: true } }
+        const updateMessages  = await MessageModel.updateMany(
+            { _id : { "$in" : conversationMessageId }, msgByUserId : msgByUserId },
+            { "$set" : { seen : true }}
         )
 
         //send conversation
         const conversationSender = await getConversation(user?._id?.toString())
         const conversationReceiver = await getConversation(msgByUserId)
 
-        io.to(user?._id?.toString()).emit('conversation', conversationSender)
-        io.to(msgByUserId).emit('conversation', conversationReceiver)
+        io.to(user?._id?.toString()).emit('conversation',conversationSender)
+        io.to(msgByUserId).emit('conversation',conversationReceiver)
     })
 
     //disconnect
-    socket.on('disconnect', () => {
+    socket.on('disconnect',()=>{
         onlineUser.delete(user?._id?.toString())
-        console.log('disconnect user ', socket.id)
+        console.log('disconnect user ',socket.id)
     })
 })