Skip to content

Commit 4925dc2

Browse files
committed
Added links on main page, nvm 5.5, new shrinkwrap
* Plus updated README.md
1 parent f659764 commit 4925dc2

File tree

4 files changed

+13
-5363
lines changed

4 files changed

+13
-5363
lines changed

Diff for: .travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ env:
1515
- CXX=g++-4.9
1616
install:
1717
- bundle install
18-
- nvm install 5.0
19-
- nvm use 5.0
18+
- nvm install 5.5
19+
- nvm use 5.5
2020
- npm install
2121
before_script:
2222
- export DISPLAY=:99.0

Diff for: README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ See package.json and Gemfile for versions
5656
1. [React](http://facebook.github.io/react/) (for front-end app)
5757
1. [react-bootstrap](https://react-bootstrap.github.io/)
5858
1. [bootstrap-loader](https://www.npmjs.com/package/bootstrap-loader/)
59-
1. [Redux](https://github.com/rackt/redux)
59+
1. [Redux](https://github.com/reactjs/redux)
60+
1. [react-router](https://github.com/reactjs/react-router)
61+
1. [react-router-redux](https://github.com/reactjs/react-router-redux)
6062
1. [Webpack with hot-reload](https://github.com/webpack/docs/wiki/hot-module-replacement-with-webpack) (for local dev)
6163
1. [Babel transpiler](https://github.com/babel/babel)
6264
1. [Ruby on Rails 4.2](http://rubyonrails.org/) for backend app and comparision with plain HTML

Diff for: app/views/pages/index.html.erb

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
<h2>Using React (Server rendering) + Redux + React Router + Rails Backend (using the
2-
<a href="https://github.com/shakacode/react_on_rails">react_on_rails gem</a>)</h2>
3-
<h3>Now with
4-
<%= link_to "react-router-redux" , "https://github.com/reactjs/react-router-redux" %>!
1+
<h2>
2+
Featuring the <%= link_to "React on Rails gem", "https://github.com/shakacode/react_on_rails" %>
3+
</h2>
4+
<h3>Using <%= link_to "Ruby on Rails", "http://rubyonrails.org/" %> with
5+
<%= link_to "React", "http://facebook.github.io/react/" %> (Server rendering) +
6+
<%= link_to "Redux", "https://github.com/reactjs/redux" %> +
7+
<%= link_to "React Router", "https://github.com/reactjs/react-router" %> +
8+
<%= link_to "react-router-redux" , "https://github.com/reactjs/react-router-redux" %>
59
</h3>
610
<%= render "header" %>
711

0 commit comments

Comments
 (0)