1. move rails app to root folder

2. upgrade react-rails to 1.11.0

poker/Gemfile → Gemfile

@@ -48,7 +48,7 @@ gem 'slim'
 gem 'slim-rails'
 
 # React for view components
-gem 'react-rails', '~> 1.5.0'
+gem 'react-rails', '~> 1.11.0'
 
 # browserify-rails for
 # gem 'browserify-rails'

poker/Gemfile.lock → Gemfile.lock

@@ -129,12 +129,11 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
-    react-rails (1.5.0)
+    react-rails (1.11.0)
       babel-transpiler (>= 0.7.0)
-      coffee-script-source (~> 1.8)
       connection_pool
       execjs
-      rails (>= 3.2)
+      railties (>= 3.2)
       tilt
     redis (3.3.3)
     ruby_dep (1.5.0)
@@ -199,7 +198,7 @@ DEPENDENCIES
   newrelic_rpm
   puma
   rails (>= 5.0.0.rc1, < 5.1)
-  react-rails (~> 1.5.0)
+  react-rails (~> 1.11.0)
   redis
   sass-rails
   slim

README.md

@@ -1,75 +1,24 @@
-## rails-poker
-[![Code Climate](https://codeclimate.com/github/cdphp/rails-poker/badges/gpa.svg)](https://codeclimate.com/github/cdphp/rails-poker)
-[![Build Status](https://travis-ci.org/cdphp/rails-poker.svg?branch=master)](https://travis-ci.org/cdphp/rails-poker)
-[![License](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fcdphp%2Frails-poker.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fcdphp%2Frails-poker?ref=badge_shield)
----
-## info
-  rails poker is a rails 5 based project.</br>
-  and include a chatroom in it ;)</br>
-  I start the project with a purpose to buid a demo for **rails5 + actioncable + reactjs**</br>
-  i can't stop my keybord while i found much fun with it!</br>
-  then i extend the actioncable demo to a nice chating app</br>
-  and build a internal use online srum-poker app</br>
-
-  I think this will help someone who is interested in actioncable and reactjs,</br>
-  maybe this can be the starting example.
-## demo
-  [Chat room](http://poker.miaowu.org/)</br>
-  [scum poker](http://poker.miaowu.org/usersessions/new)</br>
+# README
 
-## FEATURES
-  - **Chat Room**
-  > 1. random displayname by session, everyday changes, very interesting
-  > 2. user join/quit staus(some problem with the quit)
-  > 3. some mark-down support
-  > 4. send image by url
-  > 5. kamoji support
-  
-  - **Scrum Poker**
-  > 1. create room and send the url to participants
-  > 2. subject can change every turn
-  > 3. organizer can switch the room status, **ready** -> **start poking** -> **draw result**
-  > 4. the participants status will be showed on the right
-  > 5. the result will showing as a pie chart
+This README would normally document whatever steps are necessary to get the
+application up and running.
 
-## Support
+Things you may want to cover:
 
-For support please create an issue here at GitHub
+* Ruby version
 
-## Pull Requests
+* System dependencies
 
-Feel free to submit any PRs here, too. :)
+* Configuration
 
-Please indent using two spaces only, have a newline at the EOF and use UNIX line ending, thanks!
+* Database creation
 
-# development
+* Database initialization
 
-```bashshell
-# install docker and docker-compose beforehand
-# clone the repo
-git clone https://github.com/cdphp/rails-poker.git
+* How to run the test suite
 
-# create the database
-docker-compose run app /bin/bash
-root@3b552a0a5c99:/usr/src/app# mysql -hdb -p
-Enter password: root
-mysql> CREATE DATABASE IF NOT EXISTS poker default charset utf8 COLLATE utf8_general_ci;
-mysql> exit
-Bye
-root@3b552a0a5c99:/usr/src/app# rake db:migrate
-root@3b552a0a5c99:/usr/src/app# exit
-exit
-docker-compose up
-# http://localhost:3000
-```
+* Services (job queues, cache servers, search engines, etc.)
 
-# contribute
-如果你有什么想法或者建议，请不要客气尽可以提出来。<br>
-show me your ideas, thanks!
+* Deployment instructions
 
-----
-Built by (c) Joey Huang and contributors. Released under the MIT license.
-
-## License
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fcdphp%2Frails-poker.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fcdphp%2Frails-poker?ref=badge_large)
+* ...

docker-compose.prod.yml

@@ -13,10 +13,10 @@ services:
       MYSQL_PASSWORD: root
   app:
     container_name: poker_app_production
-    build: ./poker
+    build: ./
     command: bundle exec rails s -p 3000 -b 0.0.0.0 -e production
     volumes:
-      - ./poker:/usr/src/app
+      - .:/usr/src/app
     ports:
       - "3000:3000"
     links:

docker-compose.yml

@@ -11,10 +11,10 @@ services:
       MYSQL_USER: root
       MYSQL_PASSWORD: root
   app:
-    build: ./poker
+    build: ./
     command: bundle exec rails s -p 3000 -b 0.0.0.0
     volumes:
-      - ./poker:/usr/src/app
+      - .:/usr/src/app
     ports:
       - "3000:3000"
     links: