Merge pull request #1 from mizanxali/socketio

Added socket.IO server

.gitignore

@@ -1,23 +1,4 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules/
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*

README.md

@@ -1,70 +1 @@
-# Getting Started with Create React App
+Online multiplayer card game.
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.\
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.\
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.\
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
-
-### Analyzing the Bundle Size
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
-
-### Making a Progressive Web App
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
-
-### Advanced Configuration
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
-
-### Deployment
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
-
-### `npm run build` fails to minify
-
-This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)

client/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "uno-online",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@testing-library/jest-dom": "^5.11.9",
+    "@testing-library/react": "^11.2.5",
+    "@testing-library/user-event": "^12.7.0",
+    "query-string": "^6.14.0",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
+    "react-router-dom": "^5.2.0",
+    "react-scripts": "4.0.2",
+    "socket.io-client": "^3.1.1"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
+}

client/src/components/Homepage.js

@@ -0,0 +1,16 @@
+import React, { useState } from 'react'
+import { Link } from 'react-router-dom'
+
+const Homepage = () => {
+    const [roomCode, setRoomCode] = useState('')
+
+    return (
+        <div className='Homepage'>
+            <h1>UNO</h1>
+            <div><input type='text' placeholder='Room' onChange={(event) => setRoomCode(event.target.value)} /></div>
+            <Link to={`/play?roomCode=${roomCode}`}><button>START GAME</button></Link>
+        </div>
+    )
+}
+
+export default Homepage

package.json

@@ -1,38 +1,25 @@
 {
   "name": "uno-online",
-  "version": "0.1.0",
+  "version": "1.0.0",
-  "private": true,
+  "description": "Online multiplayer card game",
-  "dependencies": {
+  "main": "server.js",
-    "@testing-library/jest-dom": "^5.11.9",
-    "@testing-library/react": "^11.2.5",
-    "@testing-library/user-event": "^12.7.0",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-router-dom": "^5.2.0",
-    "react-scripts": "4.0.2"
-  },
   "scripts": {
-    "start": "react-scripts start",
+    "start": "node server",
-    "build": "react-scripts build",
+    "client": "npm start --prefix client"
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
   },
-  "eslintConfig": {
+  "repository": {
-    "extends": [
+    "type": "git",
-      "react-app",
+    "url": "git+https://github.com/mizanxali/uno-online.git"
-      "react-app/jest"
-    ]
   },
-  "browserslist": {
+  "author": "Mizan Ali",
-    "production": [
+  "license": "ISC",
-      ">0.2%",
+  "bugs": {
-      "not dead",
+    "url": "https://github.com/mizanxali/uno-online/issues"
-      "not op_mini all"
+  },
-    ],
+  "homepage": "https://github.com/mizanxali/uno-online#readme",
-    "development": [
+  "dependencies": {
-      "last 1 chrome version",
+    "cors": "^2.8.5",
-      "last 1 firefox version",
+    "express": "^4.17.1",
-      "last 1 safari version"
+    "socket.io": "^3.1.1"
-    ]
   }
 }

server.js

@@ -0,0 +1,56 @@
+const express = require('express')
+const socketio = require('socket.io')
+const http = require('http')
+const cors = require('cors')
+const { addUser, removeUser, getUser, getUsersInRoom } = require('./users')
+
+const PORT = process.env.PORT || 5000
+
+const app = express()
+const server = http.createServer(app)
+const io = socketio(server)
+
+app.use(cors())
+
+io.on('connection', socket => {
+    socket.on('join', (payload, callback) => {
+        let numberOfUsersInRoom = getUsersInRoom(payload.room).length
+
+        const { error, newUser} = addUser({
+            id: socket.id,
+            name: numberOfUsersInRoom===0 ? 'Player 1' : 'Player 2',
+            room: payload.room
+        })
+
+        if(error)
+            return callback(error)
+
+        socket.join(newUser.room)
+
+        io.to(newUser.room).emit('roomData', {room: newUser.room, users: getUsersInRoom(newUser.room)})
+        socket.emit('currentUserData', {name: newUser.name})
+        callback()
+    })
+
+    socket.on('initGameState', gameState => {
+        const user = getUser(socket.id)
+        if(user)
+            io.to(user.room).emit('initGameState', gameState)
+    })
+
+    socket.on('updateGameState', gameState => {
+        const user = getUser(socket.id)
+        if(user)
+            io.to(user.room).emit('updateGameState', gameState)
+    })
+
+    socket.on('disconnect', () => {
+        const user = removeUser(socket.id)
+        if(user)
+            io.to(user.room).emit('roomData', {room: user.room, users: getUsersInRoom(user.room)})
+    })
+})
+
+server.listen(PORT, () => {
+    console.log(`Server running on port ${PORT}`)
+})

src/components/Homepage.js

@@ -1,13 +0,0 @@
-import React from 'react'
-import { Link } from 'react-router-dom'
-
-const Homepage = () => {
-    return (
-        <div className='Homepage'>
-            <h1>UNO</h1>
-            <Link to='/play'><button>START GAME</button></Link>
-        </div>
-    )
-}
-
-export default Homepage

users.js

@@ -0,0 +1,28 @@
+ const users = []
+
+ const addUser = ({id, name, room}) => {
+    const numberOfUsersInRoom = users.filter(user => user.room === room).length
+    if(numberOfUsersInRoom === 2)
+    return { error: 'Room full' }
+
+    const newUser = { id, name, room }
+    users.push(newUser)
+    return { newUser }
+}
+
+const removeUser = id => {
+    const removeIndex = users.findIndex(user => user.id === id)
+
+    if(removeIndex!==-1)
+        return users.splice(removeIndex, 1)[0]
+}
+
+const getUser = id => {
+    return users.find(user => user.id === id)
+}
+
+const getUsersInRoom = room => {
+    return users.filter(user => user.room === room)
+}
+
+module.exports = { addUser, removeUser, getUser, getUsersInRoom }