change structure

wayou · Dec 3, 2013 · 61024ff · 61024ff
1 parent e1573c8
commit 61024ff
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,15 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+build
+
+node_modules
diff --git a/app.js b/app.js
@@ -3,8 +3,8 @@ var app = express();
 var server = require('http').createServer(app);
 var io = require('socket.io').listen(server);
 
-// server.listen(80);
-server.listen(process.env.PORT || 3000);
+server.listen(80); //for local test
+//server.listen(process.env.PORT || 3000);//for publish to heroku
 
 app.use("/", express.static(__dirname + '/public'));
 

diff --git a/favicon.ico b/favicon.ico
diff --git a/public/img/emoji/ghost_smile.png b/public/img/emoji/ghost_smile.png
diff --git a/public/img/favicon.ico b/public/img/favicon.ico
diff --git a/public/img/ghost.png b/public/img/ghost.png
diff --git a/public/img/ghost_white.png b/public/img/ghost_white.png
diff --git a/public/index.html b/public/index.html
@@ -1,15 +1,17 @@
 <!DOCTYPE HTML>
 <html>
   <head>
-    <title>Simple Chat</title>
-    <link rel="stylesheet" type="text/css" href="style.css">
+    <title>HiChat</title>
+    <link rel="stylesheet" type="text/css" href="style/app.css">
+     <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+    <link rel="icon" href="img/favicon.ico" type="image/x-icon">
     <script type="text/javascript" src="/socket.io/socket.io.js"></script>
     <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-    <script type="text/javascript" src="chat.js"></script>
+    <script type="text/javascript" src="js/hichat.js"></script>
   </head>
   <body>
     <div id="wrapper">
-      <h1>Simple Chat</h1>
+      <h1>HiChat</h1>
       <div id="messages"></div>
       <div class="nic">
         Your Name
@@ -18,10 +20,11 @@ <h1>Simple Chat</h1>
       <textarea id="message"></textarea>
       <input id="send" type="submit" value="Send"/>
     </div>
+    <footer>Wayou-a web programmer who has free time | <a href="mailto:[email protected]" target="_blank">[email protected]</a></footer>
     <script type="text/javascript">
       $(document).ready(function() {
-        // Chat.initialize('http://localhost/');
-        Chat.initialize('http://hichat.herokuapp.com/');
+         hiChat.initialize('http://localhost/');//for localhost test
+        //hiChat.initialize('http://hichat.herokuapp.com/');//for publish
       });
     </script>
   </body>

diff --git a/public/chat.js → public/js/hichat.js b/public/chat.js → public/js/hichat.js
@@ -1,19 +1,19 @@
 //Create a chat module to use.
 (function () {
-  window.Chat = {
+  window.hiChat = {
     socket : null,
 
     initialize : function(socketURL) {
       this.socket = io.connect(socketURL);
 
       //Send message on button click or enter
       $('#send').click(function() {
-        Chat.send();
+        hiChat.send();
       });
 
       $('#message').keyup(function(evt) {
         if ((evt.keyCode || evt.which) == 13) {
-          Chat.send();
+          hiChat.send();
           return false;
         }
       });

diff --git a/public/style.css → public/style/app.css b/public/style.css → public/style/app.css