diff --git a/package.json b/package.json old mode 100755 new mode 100644 index 2e200df..45dc9c9 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "dependencies": { "body-parser": "^1.15.2", "express": "^4.14.0", + "ip": "^1.1.3", "mongoose": "^4.6.1", "nodemon": "^1.11.0", "socket.io": "^1.4.8" diff --git a/screenshots/chat.png b/screenshots/chat.png old mode 100755 new mode 100644 index 43cd695..9dd013b Binary files a/screenshots/chat.png and b/screenshots/chat.png differ diff --git a/screenshots/confirm_request.png b/screenshots/confirm_request.png new file mode 100644 index 0000000..71a7a4c Binary files /dev/null and b/screenshots/confirm_request.png differ diff --git a/screenshots/login.png b/screenshots/login.png new file mode 100644 index 0000000..a74cfe6 Binary files /dev/null and b/screenshots/login.png differ diff --git a/screenshots/online_users.png b/screenshots/online_users.png old mode 100755 new mode 100644 index a1fd9f7..2672810 Binary files a/screenshots/online_users.png and b/screenshots/online_users.png differ diff --git a/screenshots/recieving_request.png b/screenshots/recieving_request.png deleted file mode 100755 index 734a23c..0000000 Binary files a/screenshots/recieving_request.png and /dev/null differ diff --git a/screenshots/sending_request.png b/screenshots/sending_request.png deleted file mode 100755 index 48eba40..0000000 Binary files a/screenshots/sending_request.png and /dev/null differ diff --git a/server.js b/server.js index f195c62..b527f1b 100755 --- a/server.js +++ b/server.js @@ -2,10 +2,11 @@ var express=require('express'); var app=express(); var http=require('http').Server(app); var io = require('socket.io')(http); +var ip = require('ip'); app.use(express.static('./')); require("./controller/controller.js")(app,io); http.listen(8080,function(){ - console.log("Node Server is setup and it is listening on http://localhost:8080"); + console.log("Node Server is setup and it is listening on http://"+ip.address()+":8080"); }) \ No newline at end of file diff --git a/views/angular/controller.js b/views/angular/controller.js index b27fa25..407acb7 100755 --- a/views/angular/controller.js +++ b/views/angular/controller.js @@ -200,7 +200,7 @@ app.controller('myController',['$scope','socket','$http','$mdDialog','$compile', '+data.split("#*@")[1]+'\ '+getDate()+'\ \ - message user image\ + message user image\
' +data.split("#*@")[0]+ '
\ @@ -217,7 +217,7 @@ app.controller('myController',['$scope','socket','$http','$mdDialog','$compile', '+$scope.user+'\ '+getDate()+'\ \ - message user image\ + message user image\
' +message+ '
\ @@ -235,7 +235,7 @@ app.controller('myController',['$scope','socket','$http','$mdDialog','$compile', '+data.split("#*@")[2]+'\ '+getDate()+'\ \ - message user image\ + message user image\
' +data.split("#*@")[1]+ '
\ @@ -261,7 +261,7 @@ app.controller('myController',['$scope','socket','$http','$mdDialog','$compile', '+$scope.user+'\ '+getDate()+'\ \ - message user image\ + message user image\
' +message+ '
\ diff --git a/views/chat.html b/views/chat.html index 2c7cd6e..6de2eab 100755 --- a/views/chat.html +++ b/views/chat.html @@ -53,7 +53,7 @@

Online Members

@@ -89,7 +89,7 @@

Friends

diff --git a/views/login.html b/views/login.html index 38767b9..0a731c5 100644 --- a/views/login.html +++ b/views/login.html @@ -15,7 +15,7 @@

CHAT

- +