add images and readme

Author: tnguye59

README.md

@@ -29,3 +29,13 @@ server.js
 * Node.js
 * Socket.io
 * Express
+
+![Alt text](/images/tender_landingpage.png?raw=true "Landing Page")
+
+![Alt text](/images/tender_login.png?raw=true "Log in")
+
+![Alt text](/images/tender_profile.png?raw=true "User's profile")
+
+![Alt text](/images/tender_profile2.png?raw=true "Match Profile")
+
+![Alt text](/images/tender_chat.png?raw=true "Chat socket.io")

app/controllers/comments_controller.rb

@@ -4,6 +4,7 @@ class CommentsController < ApplicationController
 	def chat
 		@match_id = User.find(params[:id])
 		@messages = Message.where(user_id:current_user.id, match_id: params[:id])
+		@user = User.find(current_user.id)
 	end
 
 	def count

app/views/comments/chat.html.erb

@@ -17,7 +17,7 @@
     <form class="col s12" id="chat-form">
       <div class="row">
         <div class="input-field col s4">
-        <input type="hidden" id="chat-name" value="<%= current_user.first_name%>">
+        <input type="hidden" id="chat-name" value="<%= @user.first_name%>">
         <input type="hidden" value="<%= @match_id.id %>" id="match_id">
         <input id="textbox" class="input-filed col s12" placeholder="Enter message here" required>
         </div>
@@ -28,7 +28,7 @@
 <script type="text/javascript">
     var socket = io.connect("http://127.0.0.1:8000", {force_connection: true});
 
-    socket.on("welcome", function(){
+    socket.on("welcome", function(response){
         $("#chatbox").append("<div class='chatenter'>" + $("#chat-name").val() +" has entered chatroom</div>")
     });
 
@@ -51,15 +51,12 @@
     socket.on("feed", function(response){
         for(var i = 0; i < response.messageFeed.length; i++) {
             $("#chatbox").append("<p>" + response.messageFeed[i].message + "</p>")
-            $("#count").append(response.messageFeed.length);
         };
         var match_id = $("#match_id").val()
         $.post("/count", {count: response.messageFeed.length, match_id: match_id}, function(res){
             console.log(res.result);
         });
 
     });
-    socket.on("disconnected", function(){
-        $("#chatbox").append(name + " has left the chatroom");
-    })   
+ 
 </script>

chat/server.js

@@ -15,7 +15,7 @@ io.sockets.on('connection', function (socket) {
   console.log("WE ARE USING SOCKETS!");
   console.log(socket.id);
 
-  io.emit("welcome");
+  io.emit("welcome", {userId: socket.id});
 
   socket.emit("feed", {messageFeed: history})
 

config/database.yml

@@ -23,7 +23,7 @@ default: &default
 
 
 
-  username: jessicapeng
+  username: Tomtom 
   password: 
 
 development:
@@ -88,7 +88,7 @@ production:
   database: ror_project_production
 
 
-  username: jessicapeng
+  username: Tomtom
   password: