Skip to content

Commit

Permalink
Added back client README, deleted DS_STORE file
Browse files Browse the repository at this point in the history
  • Loading branch information
justin808 committed May 11, 2016
1 parent f80eb14 commit ecb3325
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 2 deletions.
3 changes: 2 additions & 1 deletion lib/generators/react_on_rails/base_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ def copy_base_files
base_path = "base/base/"
base_files = %w(app/controllers/hello_world_controller.rb
client/.babelrc
client/webpack.config.js)
client/webpack.config.js
client/REACT_ON_RAILS_CLIENT_README.md)
base_files.each { |file| copy_file(base_path + file, file) }
end

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Client folder generated by the React on Rails gem.

See documentation [at github.com/shakacode/react_on_rails](https://github.com/shakacode/react_on_rails) for details on how it is organized.

If you need additional help, please consider:

* [Our ShakaCode Forum for React on Rails](https://forum.shakacode.com/c/rails/reactonrails).
* Joining our Slack discussion room by [email us a bit about you and your project](mailto:contact@shakacode.com).
* [Hiring us](https://forum.shakacode.com/c/rails/reactonrails) for coaching and custom web application development for your project.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import HelloWorld from '../containers/HelloWorld';
// See documentation for https://github.com/reactjs/react-redux.
// This is how you get props from the Rails view into the redux store.
// This code here binds your smart component to the redux store.
const HelloWorldApp = (props) => {
// railsContext provides contextual information especially useful for server rendering, such as
// knowing the locale. See the React on Rails documentation for more info on the railsContext
const HelloWorldApp = (props, _railsContext) => {
const store = createStore(props);
const reactComponent = (
<Provider store={store}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
it "copies react files" do
%w(app/controllers/hello_world_controller.rb
app/views/hello_world/index.html.erb
client/REACT_ON_RAILS_CLIENT_README.md
client/webpack.config.js
client/.babelrc
client/app/bundles/HelloWorld/startup/HelloWorldApp.jsx
Expand Down

0 comments on commit ecb3325

Please sign in to comment.