Merge pull request #1 from NickRI/master

Some fixes

Author: AlexLms

.gitignore

@@ -10,6 +10,8 @@
 /build
 yarn.lock
 /yarn.lock/
+log.txt
+public
 
 # misc
 .DS_Store
@@ -23,4 +25,4 @@ yarn-debug.log*
 yarn-error.log*
 
 # mockups
-/psd/
+/psd/

README.md

@@ -8,11 +8,15 @@ This is my PET Chat project that I'd like to share with you.
 
 2) Install dependencies via npm `npm i` or yarn `yarn install`.
 
-3) Start your web server `yarn start` || `npm run start`.
+3) Build ui application `npm run dev || prod`.
 
-4) Open 2 Browser tabs and enter 2 different nicknames.
+4) Start web server `npm run server`.
 
-5) Type anything in a chat.
+4.1) For fast start use `npm run start`
+
+5) Open 2 Browser tabs and enter 2 different nicknames. Navigate to [http://localhost:5001](http://localhost:5001)
+
+6) Type anything in a chat.
 
 # Location of stuff
 
@@ -33,4 +37,4 @@ This is my PET Chat project that I'd like to share with you.
 
 # Build production
 
-If you want to build a production version of my app you need to type `npm run prod` || `yarn prod` in a console. This will create public folder where everything will be compressed and minified.
+If you want to build a production version of my app you need to type `npm run prod` || `yarn prod` in a console. This will create public folder where everything will be compressed and minified.

index.js

@@ -1,7 +1,6 @@
 const express = require('express');
 const app = express();
-const server = require('http').createServer(app);
-const io = require('socket.io')(server);
+const io = require('socket.io');
 const port = process.env.PORT || 5001;
 const fs = require('fs');
 
@@ -11,21 +10,19 @@ app.get('/', (req, res) => {
   res.sendFile(`${__dirname  }./public/index.html`);
 });
 
-io.on('connection', socket => {
+var sock = io.listen(app.listen(port));
+
+sock.on('connection', socket => {
   console.log('a user connected');
 
   socket.on('chat message', msg => {
     fs.appendFile('log.txt', `${msg.author}: ${msg.text} ${new Date()}\n`, (err) => {
       if (err) throw err;
     });
-    io.emit('chat message', msg);
+    sock.emit('chat message', msg);
   });
 
   socket.on('disconnect', () => {
     console.log('a user disconnected');
   });
 });
-
-server.listen(port, () => {
-  console.log(`Server listening at port1 ${port}`);
-});

package.json

@@ -8,7 +8,8 @@
     "watch": "webpack --watch",
     "client": "webpack-dev-server",
     "server": "nodemon index.js",
-    "prod": "cross-env NODE_ENV=production webpack -p ",
+    "dev": "cross-env NODE_ENV=development webpack",
+    "prod": "cross-env NODE_ENV=production webpack -p",
     "start": "concurrently \"npm run client\" \"npm run server\" "
   },
   "dependencies": {

src/index.jsx

@@ -7,7 +7,7 @@ import MainApp from './app';
 
 import io from 'socket.io-client';
 import { sendMessage } from './actions/actionCreators';
-const socket = io('http://localhost:5001');
+const socket = io();
 
 socket.on('chat message', (message) => {
   store.dispatch(sendMessage(message.author, message.text));