Skip to content

Commit 79d2e87

Browse files
committed
Merge branch 'master' of https://github.com/shakacode/react_on_rails into add-new-api-register-renderer
2 parents 63416d2 + 7fecce1 commit 79d2e87

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

PROJECTS.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*Please add your project to this list.*
44

55
## Commercial Products Live
6-
* **[Friends and Guests](https://www.friendsandguests.com/listings)**, the signature product of [ShakaCode](http://www.shakacode.com), which is a "Network Connecting Hosts and Guests".
6+
* **[Friends and Guests](https://www.friendsandguests.com/)**, the signature product of [ShakaCode](http://www.shakacode.com), which is a "Network Connecting Hosts and Guests".
77
* **[Blink Inc](https://www.blinkinc.com)**: Website and more built by [ShakaCode](http://www.shakacode.com).
88
* **[Madrone Analytics](http://madroneco.com/)**: The original client of [ShakaCode](http://www.shakacode.com) that led to the development of React on Rails, as described in [Fast Rich Client Rails Development With Webpack and the ES6 Transpiler](http://www.railsonmaui.com/blog/2014/10/03/integrating-webpack-and-the-es6-transpiler-into-an-existing-rails-project/).
99
* **[Deliveroo](https://deliveroo.co.uk/)**: The leading food delivery site in Europe has gone live with React on Rails, with multi-lingual JavaScript support!
@@ -27,3 +27,10 @@
2727
## Demos and Tutorials
2828
* [reactrails.com](http://www.reactrails.com), source code [github.com/shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial/)
2929
* [Relay Rails Blog](https://github.com/gauravtiwari/relay-rails-blog): Tutorial to learn Relay with Rails.
30+
31+
--------
32+
33+
## Projects Based on React on Rails
34+
35+
* [github.com/Limenius/symfony-react-sandbox](https://github.com/Limenius/symfony-react-sandbox)
36+
* [github.com/tswayne/react-helper](https://github.com/tswayne/react-helper)

README.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,23 @@ Your support keeps this project going.
1212

1313
(Want to become a contributor? [Contact us](mailto:[email protected]) for an Slack team invite! Also, see ["easy" issues](https://github.com/shakacode/react_on_rails/labels/easy) and [issues for the full tutorial](https://github.com/shakacode/react-webpack-rails-tutorial/issues?q=is%3Aissue+is%3Aopen+label%3Aeasy).)
1414

15-
# Articles
15+
# Articles, Videos, and Podcasts
16+
17+
### Articles
1618
* [React on Rails, 2000+ 🌟 Stars](https://medium.com/shakacode/react-on-rails-2000-stars-32ff5cfacfbf#.6gmfb2gpy)
1719
* [The React on Rails Doctrine](https://medium.com/@railsonmaui/the-react-on-rails-doctrine-3c59a778c724)
1820

19-
# Videos
20-
2121
### [React On Rails Tutorial Series](https://www.youtube.com/playlist?list=PL5VAKH-U1M6dj84BApfUtvBjvF-0-JfEU)
2222

2323
1. [History and Motivation](https://youtu.be/F4oymbUHvoY)
2424
2. [Basic Tutorial Walkthrough](https://youtu.be/_bjScw60FBk)
2525
3. [Code Walkthrough](https://youtu.be/McQ9UM-_ocQ)
2626

27+
### Podcasts
28+
* [284 Ruby Rogues: React on Rails with Justin Gordon and Rob Wise](https://devchat.tv/ruby-rogues/284-rr-react-on-rails-with-justin-gordon-and-rob-wise)
29+
2730
# NEWS
31+
* 2016-11-03: Speaking at [LA Ruby, 7pm, Thursday, November 10 in Vencice, CA: "React on Rails: Why, What, and How?"](http://www.meetup.com/laruby/events/234825187/)
2832
* 2016-08-27: We now have a [Documentation Gitbook](https://shakacode.gitbooks.io/react-on-rails/content/) for improved readability & reference.
2933
* 2016-08-21: v6.1 ships with serveral new features and bug fixes. See the [Changelog](CHANGELOG.md).
3034
* 2016-07-28: If you're doing server rendering, be sure to use mini\_racer! See [issues/428](https://github.com/shakacode/react_on_rails/issues/428). It's supposedly much faster than `therubyracer`.
@@ -543,7 +547,7 @@ We owe much gratitude to the work of the [react-rails gem](https://github.com/re
543547

544548
# FINAL NOTES
545549
* See [Projects](PROJECTS.md) using and [KUDOS](./KUDOS.md) for React on Rails. Please submit yours! Please edit either page or [email us](mailto:[email protected]) and we'll add your info. We also **love stars** as it helps us attract new users and contributors.
546-
* Follow [@railsonmaui](https://twitter.com/railsonmaui) and [@shakacode](https://twitter.com/shakacode) on Twitter for updates on releases. We've also got a forum category dedicated to [react_on_rails](http://forum.shakacode.com/c/rails/ReactOnRails).
550+
* Follow [@railsonmaui](https://twitter.com/railsonmaui) and [@shakacode](https://twitter.com/shakacode) on Twitter for updates on releases. We've also got a forum category dedicated to [react_on_rails](https://forum.shakacode.com/c/rails/reactonrails).
547551

548552
---
549553

docs/additional-reading/turbolinks.md

+5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ the JavaScript and stylesheets are cached by the browser, as they will still req
1717
1. [react-router](https://github.com/ReactTraining/react-router) handles the back and forward buttons, as does TurboLinks. You *might* be able to make this work. *Please share your findings.*
1818
1. You want to do code splitting to minimize the JavaScript loaded.
1919

20+
## More Information
21+
* CSRF tokens need thorough checking with Turbolinks5. Turbolinks5 changes the head element by JavaScript (not only body) on page changes with the correct csrf meta tag, but if the JS code parsed this from head when several windows were opened, then our specs were not all passing. I didn't look details however, may be it is app code related, not library code. Anyway it may need additional check because there is CSRF helper in ReactOnRails and it need to work with Turbolinks5.
22+
* Turbolinks5 send requests without the `Accept: */*` in the header, only exactly like `Accept: text/html` which makes Rails behave a bit specifically compared to normal and mime-parsing, which is skipped by when Rails see */*. For some more details on Rails and */* can read [Mime Type Resolution in Rails](http://blog.bigbinary.com/2010/11/23/mime-type-resolution-in-rails.html)
23+
* If you're using multiple Webpack bundles, be sure to ensure that there are no name conflicts between JS objects or redux store paths.
24+
2025
### Install Checklist
2126
1. Include turbolinks via npm as shown in the [react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial/blob/8a6c8aa2e3b7ae5b08b0a9744fb3a63a2fe0f002/client/webpack.client.base.config.js#L22) or include the gem "turbolinks".
2227
1. Included the proper "track" tags when you include the javascript and stylesheet:

lib/generators/react_on_rails/base_generator.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ def add_base_gems_to_gemfile
9999
DATA
100100

101101
def append_to_assets_initializer
102-
assets_intializer = File.join(destination_root, "config/initializers/assets.rb")
103-
if File.exist?(assets_intializer)
104-
append_to_file(assets_intializer, ASSETS_RB_APPEND)
102+
assets_initializer = File.join(destination_root, "config/initializers/assets.rb")
103+
if File.exist?(assets_initializer)
104+
append_to_file(assets_initializer, ASSETS_RB_APPEND)
105105
else
106-
create_file(assets_intializer, ASSETS_RB_APPEND)
106+
create_file(assets_initializer, ASSETS_RB_APPEND)
107107
end
108108
end
109109

0 commit comments

Comments
 (0)