New branch

.gitignore

@@ -0,0 +1,2 @@
+node_modules
+.vscode

app.js

@@ -1,7 +1,7 @@
 const express = require("express");
 const app = express();
-const path = require("path");
 const http = require("http").createServer(app);
+const cors=require('cors')
 let io = require("socket.io")(http);
 var valid = require("./public/js/validation.js");
 const port = process.env.PORT || 8000;
@@ -14,15 +14,15 @@ app.use(express.static("public"));
 var bodyparser = require("body-parser");
 app.use(bodyparser.json());
 app.use(bodyparser.urlencoded({ extended: false }));
-
+app.use(cors({'Content-Type': 'text/html'}))
 // route
 app.get("/", (req, res) => res.sendFile("html/form.html", { root: "public" }));
 app.get("/chat", (req, res) =>
-  res.sendFile("html/index.html", { root: "public" })
+  res.sendFile("html/main.html", { root: "public" })
 );
 // io
 io.on("connection", (socket) => {
-  console.log("a New user just  connected");
+  // console.log("a New user just  connected");
   socket.on("join", (query, callback) => {
     if ((!valid(query.usr)) || (!valid(query.room))) {
      return  callback("name and room is required");
@@ -31,22 +31,18 @@ io.on("connection", (socket) => {
     users.removeUser(socket.id)
     users.addUser(socket.id,query.usr,query.room)
     io.to(query.room).emit('updateUsersList',users.getUserList(query.room))
-    socket.emit("serverMsg", generator("Admin", "Welcome"));
-    socket.broadcast.to(query.room).emit("serverMsg", generator("Admin", `${query.usr} joined`));
+    socket.emit("serverMsg", generator("Admin", "Welcome"));  //admin
+    socket.broadcast.to(query.room).emit("serverMsg", generator("Admin", `${query.usr} joined`));  //admin
     callback();
 
   });
 
   // msg from cleint
   socket.on("createmsg", (msg) => {
-    console.log("client", msg);
+    // console.log("client", msg);
     // msg to all client
-    // io.emit('serverMsg', {
-    //   from: msg.from,
-    //   text: msg.text,
-    //   time: new Date()
-    // })
-    io.to(msg.room).emit("serverMsg", generator(msg.from, msg.text));
+    socket.broadcast.to(msg.room).emit('other',generator(msg.from,msg.text))
+    // io.to(msg.room).emit("serverMsg", generator(msg.from, msg.text));
   });
 
   // disconnectin
@@ -56,7 +52,7 @@ io.on("connection", (socket) => {
     if(leave)
     {
       io.to(leave.room).emit('updateUsersList',users.getUserList(leave.room))
-      io.to(leave.room).emit('serverMsg',generator('Admin',`${leave.name} has left  ${leave.room} room`))
+      io.to(leave.room).emit('serverMsg',generator('Admin',`${leave.name} left`))
     }
   });
 });