work on websocket, username

Author: r-mcgrath

app/src/components/top/NavBarButtons.tsx

@@ -327,14 +327,6 @@ function navbarDropDown(props) {
           <path d="M6.5 1h3a.5.5 0 0 1 .5.5v1H6v-1a.5.5 0 0 1 .5-.5ZM11 2.5v-1A1.5 1.5 0 0 0 9.5 0h-3A1.5 1.5 0 0 0 5 1.5v1H2.506a.58.58 0 0 0-.01 0H1.5a.5.5 0 0 0 0 1h.538l.853 10.66A2 2 0 0 0 4.885 16h6.23a2 2 0 0 0 1.994-1.84l.853-10.66h.538a.5.5 0 0 0 0-1h-.995a.59.59 0 0 0-.01 0H11Zm1.958 1-.846 10.58a1 1 0 0 1-.997.92h-6.23a1 1 0 0 1-.997-.92L3.042 3.5h9.916Zm-7.487 1a.5.5 0 0 1 .528.47l.5 8.5a.5.5 0 0 1-.998.06L5 5.03a.5.5 0 0 1 .47-.53Zm5.058 0a.5.5 0 0 1 .47.53l-.5 8.5a.5.5 0 1 1-.998-.06l.5-8.5a.5.5 0 0 1 .528-.47ZM8 4.5a.5.5 0 0 1 .5.5v8.5a.5.5 0 0 1-1 0V5a.5.5 0 0 1 .5-.5Z" />
         </svg>
       </button>
-<<<<<<< HEAD
-      {/* {<ExportButton />} */}
-      {/* 
-      <button onClick={handleDarkModeToggle}>
-        {isDarkMode ? 'Light' : 'Dark'} Mode {switchDark}
-      </button> */}
-=======
->>>>>>> dev
       {state.isLoggedIn && (
         <button onClick={handleClick}>
           Manage Project

server/controllers/userController.ts

@@ -25,6 +25,20 @@ const randomPassword = () => {
 };
 
 const userController: UserController = {
+    //get username for join-room display
+  getUsername: async (req, res, next) => {
+    try{
+    const { username } = req.body;
+    const user = await Users.findOne({username})
+    return next()
+    } catch(err) {
+      return next({
+        log: 'error cuaght in getUsername middleware',
+        status: 400,
+        message: {err: 'cannot get username'}
+      })
+    }
+  },
   createUser: (req, res, next) => {
     let email, username, password;
     // use this condition for Oauth login
@@ -127,6 +141,8 @@ const userController: UserController = {
       }
     });
   }
-};
+
+
+ };
 
 export default userController;

server/interfaces.ts

@@ -46,6 +46,7 @@ export interface newUserError extends NativeError {
 }
 
 export interface UserController {
+  getUsername: RequestHandler;
   createUser: RequestHandler;
   verifyUser: RequestHandler;
 }

server/server.ts

@@ -95,14 +95,20 @@ const io = new Server(httpServer, {
   }
 });
 
+const usersInRoom = [];
+
 io.on('connection', (socket) => {
+
   console.log('Socket ID: -----', socket.id);
-  socket.on('custom-event', (string, redux_store, room) => {
-    console.log('Room Code', room);
+  socket.on('set-username', (username) => {
+  console.log('username set:', username)
+  });
+  socket.on('custom-event', ( string, redux_store, room, username) => {
+    console.log('Room Code: ', room );
     if (room) {
-      socket.to(room).emit('receive message', redux_store);
+      socket.to(room).emit('receive message', redux_store, 'username: ', username);
     } else {
-      socket.broadcast.emit('receive message', redux_store);
+      socket.broadcast.emit('receive message', redux_store, 'username: ', username);
     }
   });
   socket.on('room-code', (roomCode) => {
@@ -111,6 +117,13 @@ io.on('connection', (socket) => {
   });
 });
 
+
+app.get('/', userController.getUsername, (req, res) =>{
+  const username = req.body.username
+  console.log(username)
+  usersInRoom.push(username)
+  return res.status(200).json({username: username})
+});
 /*
 GraphQl Router
 */
@@ -170,7 +183,7 @@ app.post(
   cookieController.setSSIDCookie,
   sessionController.startSession,
   (req, res) => res.status(200).json({ sessionId: res.locals.ssid })
-);
+  );
 
 //confirming whether user is logged in for index.tsx rendering
 app.get('/loggedIn', sessionController.isLoggedIn, (req, res) =>