Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ v1.1 - Sunday, March 22, 2015

This is out of date.

See: [pull requests](https://github.com/justin808/react-webpack-rails-tutorial/pulls?utf8=%E2%9C%93&q=is%3Apr)
See: [pull requests](https://github.com/shakacode/react-webpack-rails-tutorial/pulls?utf8=%E2%9C%93&q=is%3Apr)
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
By Justin Gordon and the Shaka Code Team, http://www.railsonmaui.com

- If you came to here from the blog article, this example project has evolved.
See [pull requests](https://github.com/justin808/react-webpack-rails-tutorial/pulls?utf8=%E2%9C%93&q=is%3Apr).
See [pull requests](https://github.com/shakacode/react-webpack-rails-tutorial/pulls?utf8=%E2%9C%93&q=is%3Apr).
- If this work interests you and you are looking for full or part-time remote work, please
[click here](http://forum.railsonmaui.com/t/railsonmaui-is-hiring-and-partnering-part-time-remote-is-ok/156).
- Please email us at [justin@railsonmaui.com](mailto:justin@railsonmaui.com) if you have a ReactJs +
Rails project and are interested in help from our experienced team.
- Please file issues for problems and feature requests.
- Pull requests are welcome! (and a great way to get on the team)
- Feel free to open discussions at [forum.railsonmaui.com](http://www.forum.railsonmaui.com).
- We now have a [gitter chat room for this topic](https://gitter.im/justin808/react-webpack-rails-tutorial).
- We now have a [gitter chat room for this topic](https://gitter.im/shakacode/react-webpack-rails-tutorial).
- Check out the [react_on_rails gem](https://github.com/shakacode/react_on_rails) for easy webpack integration.

A Full tutorial article can be found at: [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/)
Expand Down Expand Up @@ -59,7 +59,7 @@ See package.json and Gemfile for versions
# Basic Setup
1. Be sure that you have Node installed. I use [nvm](https://github.com/creationix/nvm), with node
version `v0.12.7`. See this article [Updating and using nvm](http://forum.railsonmaui.com/t/updating-and-using-nvm/293).
1. `git clone git@github.com:justin808/react-webpack-rails-tutorial.git`
1. `git clone git@github.com:shakacode/react-webpack-rails-tutorial.git`
1. `cd react-webpack-rails-tutorial`
1. Check that you have Ruby 2.2.2
1. Check that you're using the right version of node. Run `nvm list` to check.
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<li><a href="/">React Demo</a></li>
<li><%= link_to "Classic Rails", comments_path %></li>
<li><%= link_to "by Justin Gordon, www.railsonmaui.com", "http://www.railsonmaui.com" %></li>
<li><%= link_to "Source on Github", "https://github.com/justin808/react-webpack-rails-tutorial" %></li>
<li><%= link_to "Source on Github", "https://github.com/shakacode/react-webpack-rails-tutorial" %></li>
<li><%= link_to "Tutorial Article", "http://www.railsonmaui.com/blog/2014/10/03/integrating-webpack-and-the-es6-transpiler-into-an-existing-rails-project/" %></li>
<li><%= link_to "Forum Discussion", "http://forum.railsonmaui.com/t/fast-rich-client-rails-development-with-webpack-and-the-es6-transpiler/82/22" %></li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/justin808/react-webpack-rails-tutorial.git"
"url": "https://github.com/shakacode/react-webpack-rails-tutorial.git"
},
"keywords": [
"react",
Expand All @@ -19,9 +19,9 @@
"author": "justin808",
"license": "MIT",
"bugs": {
"url": "https://github.com/justin808/react-webpack-rails-tutorial/issues"
"url": "https://github.com/shakacode/react-webpack-rails-tutorial/issues"
},
"homepage": "https://github.com/justin808/react-webpack-rails-tutorial",
"homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
"dependencies": {
"babel-core": "^5.8.20",
"babel-loader": "^5.3.2",
Expand Down
2 changes: 1 addition & 1 deletion client/webpack.hot.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const config = require('./webpack.common.config');
const webpack = require('webpack');

// We're using the bootstrap-sass loader.
// See: https://github.com/justin808/bootstrap-sass-loader
// See: https://github.com/shakacode/bootstrap-sass-loader
config.entry.push('webpack-dev-server/client?http://localhost:3000',
'webpack/hot/dev-server',
'./scripts/webpack_only',
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"repository": {
"type": "git",
"url": "https://github.com/justin808/react-webpack-rails-tutorial.git"
"url": "https://github.com/shakacode/react-webpack-rails-tutorial.git"
},
"keywords": [
"react",
Expand All @@ -24,8 +24,8 @@
"author": "justin808",
"license": "MIT",
"bugs": {
"url": "https://github.com/justin808/react-webpack-rails-tutorial/issues"
"url": "https://github.com/shakacode/react-webpack-rails-tutorial/issues"
},
"homepage": "https://github.com/justin808/react-webpack-rails-tutorial",
"homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
"dependencies": {}
}