Skip to content

webSocket #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ayeletBinder wants to merge 1 commit into
base: main
Choose a base branch
from
Open

webSocket #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client-side/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ REACT_APP_BASE_URL='http://localhost:3000'
REACT_APP_APOLLO_SERVER_URL='http://localhost:4000'
REACT_APP_SECRET_CODE_CAPVAL='6Ld5uBoqAAAAAKwPXqo5eanm9ZFSuOoBBSdl00pE'
REACT_APP_SERVER_URL='http://localhost:5000'
REACT_WS_URL='ws://localhost:8080'
2 changes: 0 additions & 2 deletions client-side/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,3 @@ function App() {
}

export default App;


60 changes: 33 additions & 27 deletions client-side/src/stories/header/Icon.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,33 @@
import React from 'react';
import { Badge, IconButton } from '@mui/material';
import { MailOutline, Mail } from '@mui/icons-material';
import './icon.scss';

const MessageIcon = ({ messages = [] }) => {
let cntUnreadMessages = messages.filter(message => !message.read).length;
const hasUnreadMessages = cntUnreadMessages > 0;

const handleClick = () => {
// Displays a generic component with the list
};

return (
<IconButton onClick={handleClick} className="iconButton">
{hasUnreadMessages ? (
<Badge badgeContent={cntUnreadMessages} color="error" className="badgeContent">
<Mail />
</Badge>
) : (
<MailOutline />
)}
</IconButton>
);
};

export default MessageIcon;
import React, { useState } from 'react';
import { Badge, IconButton } from '@mui/material';
import { MailOutline, Mail } from '@mui/icons-material';
import useWebSocket from '../../webSocket';
// import messages from '../../components/messages/messages'
import './icon.scss';

const MessageIcon = () => {
const [openMesagges,setOpenMesagges] = useState(false);
const userId = '66961bef8ca0916dcbfdabc3'; //change the userId according the correct user...
const { cntUnreadMessages } = useWebSocket(userId);

const hasUnreadMessages = cntUnreadMessages > 0;

const handleClick = () => {
// Displays a generic component with the list
};

return (
<IconButton onClick={()=>{setOpenMesagges(!openMesagges);}} className="iconButton">
{hasUnreadMessages ? (
<Badge badgeContent={cntUnreadMessages} color="error" className="badgeContent">
<Mail />
</Badge>
) : (
<MailOutline />
)}
{/* {openMesagges && <messages/>} */}
</IconButton>
);
};

export default MessageIcon;
2 changes: 1 addition & 1 deletion client-side/src/stories/header/header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function ResponsiveAppBar() {
nav={['/editUserProfile','/manageNotifications'] }
/>
</Menu>
<MessageIcon/>
<MessageIcon />
</Box>
</Toolbar>
</Container>
Expand Down
31 changes: 31 additions & 0 deletions client-side/src/webSocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { useEffect, useState } from 'react';

const useWebSocket = (userId) => {
const [cntUnreadMessages, setCntUnreadMessages] = useState(0);
const [socket, setSocket] = useState(null);

useEffect(() => {
const ws = new WebSocket('ws://localhost:8080');

ws.onopen = () => {
ws.send(JSON.stringify({userId,type:"countUnread"}));
};

ws.onmessage = (event) => {
const response = event.data;
setCntUnreadMessages(response);
};



setSocket(ws);

return () => {
ws.close();
};
}, [userId]);

return { cntUnreadMessages, socket };
};

export default useWebSocket;
11 changes: 11 additions & 0 deletions server-side/controllers/MessageType.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import mongoose, { Schema } from "mongoose";

const messageTypeSchema = new mongoose.Schema({
type: {
type: String,
enum: ['welcome'],
required: true,
},
});

export default mongoose.model('MessageType', messageTypeSchema);
60 changes: 60 additions & 0 deletions server-side/controllers/messageType.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import MessageType from '../models/MessageType.model.js';


export const getAllMessageTypes = async (req, res) => {
try {
const messageTypes = await MessageType.find().select('-__v');
res.status(200).json(messageTypes);
} catch (error) {
res.status(500).json({ error: error.message });
}
};


export const getMessageTypeById = async (req, res) => {
try {

const messageType = await MessageType.findById(req.params.id).select('-__v');

if (!messageType) {
return res.status(404).json({ error: 'Type not found' });
}
res.status(200).json(messageType);
} catch (error) {
res.status(500).json({ error: error.message });
}
};





export const updateMessageType = async (req, res) => {
try {
const { type } = req.body;
const updatedMessageType = await MessageType.findByIdAndUpdate(
req.params.id,
{ type },
{ new: true, runValidators: true }
);
if (!updatedMessageType) {
return res.status(404).json({ error: 'MessageType not found' });
}
res.status(200).json(updatedMessageType);
} catch (error) {
res.status(400).json({ error: error.message });
}
};


export const deleteMessageType = async (req, res) => {
try {
const deletedMessageType = await MessageType.findByIdAndDelete(req.params.id);
if (!deletedMessageType) {
return res.status(404).json({ error: 'MessageType not found' });
}
res.status(200).json({ message: 'MessageType deleted successfully' });
} catch (error) {
res.status(500).json({ error: error.message });
}
};
24 changes: 24 additions & 0 deletions server-side/models/Message.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import mongoose, { Schema } from "mongoose";

const messageSchema = new mongoose.Schema({
type: {
type: mongoose.Schema.Types.ObjectId,
ref:'MessageType',
required: true,
},
userId: {
type: mongoose.Schema.Types.ObjectId,
ref: 'Users',
required: true,
},
date: {
type: Date,
default: Date.now,
},
read: {
type: Boolean,
default: false,
},
});

export default mongoose.model('Message', messageSchema);
11 changes: 11 additions & 0 deletions server-side/models/MessageType.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import mongoose, { Schema } from "mongoose";

const messageTypeSchema = new mongoose.Schema({
type: {
type: String,
enum: ['welcome'],
required: true,
},
});

export default mongoose.model('MessageType', messageTypeSchema);
Loading