repack 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3544828053114aa5dcc0d6dba65db42e243d6996
-  data.tar.gz: db580c08614f6633a8e1eee96d650e8a6818a7bb
+  metadata.gz: 512edcf1b6ceeae486756f16c6de2035059bab31
+  data.tar.gz: 80d6ca9ca00b9fdba2b77ee02aae587116554581
 SHA512:
-  metadata.gz: 1588340b6e9ec331bbe801975d475fda393a95ce525f36d08b426e7602436b0388d442064320d0d5709c7cf25dc6d52d17d1b3eb25c724c14bc6c3fb91e4627f
-  data.tar.gz: 7749c7cd6ac80d28c3d514b99fe750f5b47dcfaf26eaaaa0cd76a069179374c2d64eb642e0f56780be3f0229ce022e0434e7cf9a4b91ea4d94a20c8326bb9fc0
+  metadata.gz: eca54c72ed38802324459e62fc1aa87269033c11cf6b180522a689eb63dbd9d15b5bfcd32c5585c9f29a33685cbdcd86220ca7bf1e416c6de421f4c5010bb97d
+  data.tar.gz: 5977c99360398ee72bf8b70a2eaf2bc93d00598e5de4e1fc41e509416af4fdedebe5215d8204fc5d3f284cf30017894490351cc98b195decd6290ad5abc280cd

data/example/babelrc

@@ -1,3 +1,3 @@
 {
-  presets: ['latest', 'react', 'stage-2']
+  presets: ['env', 'react', 'stage-2']
 }

data/example/boilerplate/god_mode/actions/auth.js

@@ -0,0 +1,74 @@
+import { browserHistory } from 'react-router';
+import { setFlash } from './flash';
+
+const logout = () => {
+  return { type: 'LOGOUT' }
+}
+
+const login = (user) => {
+  return { type: 'LOGIN', user }
+}
+
+export const handleLogin = (email, password) => {
+  return(dispatch) => {
+    $.ajax({
+      url: '/users/sign_in',
+      type: 'POST',
+      dataType: 'JSON',
+      data: { user: { email, password } }
+    }).done( user => {
+      dispatch(login(user));
+      browserHistory.push('/')
+    }).fail( data => {
+      dispatch(setFlash('Error Logging In.', 'error'));
+    });
+  }
+}
+
+export const handleLogout = () => {
+  return(dispatch) => {
+    $.ajax({
+      url: '/users/sign_out',
+      type: 'DELETE',
+      dataType: 'JSON'
+    }).done( data => {
+      dispatch(logout());
+      browserHistory.push('/');
+    }).fail( data => {
+      dispatch(setFlash('Error Logging Out.', 'error'));
+    });
+  }
+}
+
+export const refreshLogin = () => {
+  return(dispatch) => {
+    $.ajax({
+      url: '/api/logged_in_user',
+      type: 'GET',
+      dataType: 'JSON'
+    }).done( user => {
+      if(user.id)
+        dispatch(login(user))
+      else
+        dispatch(logout());
+    }).fail( data => {
+      dispatch(setFlash('Error Refreshing User Data.', 'error'));
+    });
+  }
+}
+
+export const handleSignUp = (email, password) => {
+  return(dispatch) => {
+    $.ajax({
+      url: '/users',
+      type: 'POST',
+      dataType: 'JSON',
+      data: { user: { email, password } } 
+    }).done( user => {
+      dispatch(login(user));
+      browserHistory.push('/');
+    }).fail(data => {
+      dispatch(setFlash('Error Creating Account.', 'error'));
+    });
+  }
+}

data/example/boilerplate/god_mode/actions/flash.js

@@ -0,0 +1,11 @@
+export const clearFlash = () => {
+  return { type: "CLEAR_FLASH" }
+}
+
+export const setFlash = (message, msgType) => {
+  return {
+    type: 'SET_FLASH',
+    message,
+    msgType
+  }
+}

data/example/boilerplate/god_mode/components/FlashMessage.js

@@ -0,0 +1,41 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { clearFlash } from '../actions/flash.js';
+
+const fadeFlash = (dispatch) => {
+  setTimeout( () => {
+    dispatch(clearFlash())
+  }, 15000)
+}
+
+const FlashMessage= ({ flash, dispatch }) => {
+  if (flash.message) {
+    return (
+      <div 
+        id="alert" 
+        className={`alert alert-${flash.msgType} center`} 
+        style={{ width: '90%', margin: '0 auto'}}
+        onClick={ (e) => { 
+          e.preventDefault 
+          dispatch(clearFlash())
+        }}
+      >
+        {flash.message}
+        { fadeFlash(dispatch) }
+      </div>
+    )
+  } else {
+    return null
+  }
+}
+
+FlashMessage.PropTypes = {
+  flash: React.PropTypes.object,
+  dispatch: React.PropTypes.func,
+}
+
+const mapStateToProps = (state) => {
+  return { flash: state.flash }
+}
+
+export default connect(mapStateToProps)(FlashMessage);

data/example/boilerplate/god_mode/components/Loading.js

@@ -0,0 +1,47 @@
+import React from 'react';
+
+class Loading extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = { isLoading: false };
+    let destructTimeout;
+  }
+
+  componentDidMount() {
+    this.setState({ isLoading: true });
+  }
+
+  componentWillUnmount() {
+    clearTimeout(this.destructTimeout);
+  }
+
+  selfDestruct = () => {
+    this.destructTimeout = setTimeout( () => {
+      this.setState({ isLoading: false });
+    }, 3000);
+  }
+
+  render() {
+    if(this.state.isLoading) {
+      this.selfDestruct();
+    } else {
+      clearTimeout(this.destructTimeout);
+    }
+
+    return (
+      <div>
+        { this.state.isLoading ?
+          <span className="loading">{`Loading ${this.props.info}`}</span>
+          :
+          <span>{`No ${this.props.info} found`}</span>
+        }
+      </div>
+    )
+  }
+}
+
+Loading.proptypes = {
+  info: React.PropTypes.string.isRequired
+}
+
+export default Loading;

data/example/boilerplate/god_mode/components/Login.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import { handleLogin } from '../actions/auth';
+import { connect } from 'react-redux';
+import { Link } from 'react-router';
+
+class Login extends React.Component {
+  handleSubmit = (e) => {
+    e.preventDefault();
+    let email = this.refs.email.value;
+    let password = this.refs.password.value;
+    this.props.dispatch(handleLogin(email, password));
+  }
+
+  render() {
+    return(
+      <div>
+        <h3>Login</h3>
+        <form onSubmit={ this.handleSubmit }>
+          <input ref='email' type='text' required placeholder='Email' />
+          <br />
+          <input ref='password' type='password' required placeholder='Password' />
+          <br />
+          <input type='submit' className='btn' />
+        </form>
+        <Link to='/sign_up'>Sign Up</Link>
+      </div>
+    );
+  }
+}
+
+export default connect()(Login);

data/example/boilerplate/god_mode/components/Navbar.js

@@ -0,0 +1,45 @@
+import React from 'react';
+import { Link } from 'react-router';
+import { handleLogout } from '../actions/auth';
+import { connect } from 'react-redux';
+
+class Navbar extends React.Component {
+  logout = (e) => {
+    e.preventDefault();
+    this.props.dispatch(handleLogout());
+  }
+
+  authLinks = () =>{
+    let { auth } = this.props;
+    if(auth && auth.isAuthenticated) {
+      return(
+        <li> <a href='#' onClick={this.logout}>Logout</a> </li>
+      )
+    } else {
+      return(<li> <Link to='/login'>Login</Link> </li>);
+    }
+  }
+
+  render() {
+    return(
+      <header>
+        <div className='navbar-fixed'>
+          <nav>
+            <div className='nav-wrapper'>
+              <Link to='/' className='brand-logo'>Logo</Link>
+              <ul className='right'>
+                { this.authLinks() }
+              </ul>
+            </div>
+          </nav>
+        </div>
+      </header>
+    );
+  }
+}
+
+const mapStateToProps = (state) => {
+  return { auth: state.auth }
+}
+
+export default connect(mapStateToProps)(Navbar);

data/example/boilerplate/god_mode/components/SignUp.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import { Link } from 'react-router';
+import { handleSignUp } from '../actions/auth';
+import { connect } from 'react-redux';
+
+class SignUp extends React.Component { 
+  handleSubmit = (e) => {
+    e.preventDefault();
+    let email = this.refs.email.value;
+    let password = this.refs.password.value;
+    this.props.dispatch(handleSignUp(email, password));
+  }
+
+  render() {
+    return(
+      <div className='center'>
+        <h3>Sign Up For A New Account</h3>
+        <form onSubmit={ this.handleSubmit }>
+          <input ref='email' type='text' required placeholder='Email' />
+          <br />
+          <input ref='password' type='password' required placeholder='Password' />
+          <br />
+          <input type='submit' className='btn' value='Sign Up' />
+          <Link to='/login' className='btn grey'>Cancel</Link>
+        </form>
+      </div>
+    );
+  }
+}
+
+export default connect()(SignUp);

data/example/boilerplate/god_mode/containers/App.js

@@ -0,0 +1,35 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import Navbar from '../components/Navbar';
+import { refreshLogin } from '../actions/auth';
+import FlashMessage from '../components/FlashMessage';
+import { clearFlash } from '../actions/flash';
+
+class App extends React.Component {
+  componentDidMount() {
+    this.props.dispatch(refreshLogin());
+  }
+
+  componentDidUpdate() {
+    this.props.dispatch(clearFlash());
+  }
+
+  render() {
+    let { auth, children } = this.props;
+
+    return(
+      <div>
+        <Navbar />
+        <div style={{ marginBottom: '30px' }}>
+          <FlashMessage />
+        </div>
+        <div className='container'>
+          { children }
+        </div>
+      </div>
+    );
+  }
+}
+
+export default connect()(App);
+

data/example/boilerplate/god_mode/controllers/api/users_controller.rb

@@ -0,0 +1,9 @@
+class Api::UsersController < ApplicationController
+  def logged_in_user
+    if current_user
+      render json: current_user
+    else
+      render json: {}
+    end
+  end
+end

data/example/boilerplate/god_mode/reducers/auth.js

@@ -0,0 +1,15 @@
+const auth = (state = {}, action) => {
+  switch(action.type) {
+    case 'LOGIN':
+      return {
+        isAuthenticated: true,
+        user: action
+      }
+    case 'LOGOUT':
+      return {}
+    default:
+     return state;
+  }
+}
+
+export default auth;

data/example/boilerplate/god_mode/reducers/flash.js

@@ -0,0 +1,13 @@
+const flash = ( state = {}, action ) => {
+  switch ( action.type ) {
+    case 'SET_FLASH':
+      let { message, msgType } = action;
+      return { message, msgType }
+    case 'CLEAR_FLASH':
+      return {}
+    default:
+      return state;
+  }
+}
+
+export default flash;

data/example/boilerplate/god_mode/reducers/index.js

@@ -0,0 +1,8 @@
+import { combineReducers } from 'redux';
+import { routerReducer } from 'react-router-redux';
+import auth from './auth'
+import flash from './flash';
+
+const rootReducer = combineReducers({ routing: routerReducer, auth, flash });
+
+export default rootReducer;

data/example/boilerplate/god_mode/routes.js

@@ -0,0 +1,24 @@
+import React from 'react';
+import { Route, IndexRoute, browserHistory } from 'react-router';
+import App from './containers/App';
+import NoMatch from './components/NoMatch';
+import Login from './components/Login';
+import SignUp from './components/SignUp';
+import { UserAuthWrapper } from 'redux-auth-wrapper';
+
+const UserIsAuthenticated = UserAuthWrapper({
+  authSelector: state => state.auth,
+  predicate: auth => auth.isAuthenticated,
+});
+
+export default (
+  <Route>
+
+    <Route path="/" component={App}>
+      <Route path='/login' component={Login} />
+      <Route path='/sign_up' component={SignUp} />
+    </Route>
+
+    <Route path="*" status={404} component={NoMatch} />
+  </Route>
+)

data/example/boilerplate/god_mode/scss/alert.css.scss

@@ -0,0 +1,22 @@
+.alert {
+  top: 0px;
+  left: 0px;
+  right: 0px;
+  padding: 15px 0px;
+  margin-bottom: 60px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  z-index: 1999;
+}
+
+.alert-success {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+
+.alert-error {
+  color: #a94442;
+  background-color: #f2dede;
+  border-color: #ebccd1;
+}

data/example/package.json

@@ -1,5 +1,6 @@
 {
   "name": "repack",
+  "repository": "https://github.com/cottonwoodcoding/repack",
   "version": "0.0.1",
   "license": "MIT",
   "jest": {
@@ -22,11 +23,11 @@
     "autoprefixer": "^6.7.6",
     "react": "^15.1.0",
     "react-dom": "^15.1.0",
-    "stats-webpack-plugin": "^0.2.1",
+    "stats-webpack-plugin": "^0.5.0",
     "webpack": "^2.2.1",
     "babel-core": "^6.9.1",
     "babel-loader": "^6.2.4",
-    "babel-preset-latest": "^6.16.0",
+    "babel-preset-env": "^1.2.1",
     "image-webpack-loader": "3.0.0",
     "file-loader": "^0.9.0",
     "url-loader": "^0.5.7",

data/lib/generators/repack/install_generator.rb

@@ -6,16 +6,26 @@ module Repack
     desc "Install everything you need for a basic repack integration"
     class_option :router, type: :boolean, default: false, description: 'Add React Router'
     class_option :redux, type: :boolean, default: false, description: 'Add Redux'
+    class_option :god, type: :boolean, default: false, description: 'Router, Redux, Devise, Auth, GOD'
+
+    def check_god_mode
+      if options[:god]
+        unless yes?('Is this is new application?')
+          raise 'GOD MODE is for new apps only. Run again at your own risk!'
+        end
+      end
+    end
+
     def copy_package_json
       copy_file "package.json", "package.json"
-      if options[:router]
+      if options[:router] || options[:god]
         insert_into_file './package.json', after: /dependencies\": {\n/ do
           <<-'RUBY'
     "react-router": "^2.4.1",
           RUBY
         end
       end
-      if options[:redux]
+      if options[:redux] || options[:god]
         insert_into_file './package.json', after: /dependencies\": {\n/ do
           <<-'RUBY'
     "react-redux": "^4.4.5",
@@ -24,10 +34,11 @@ module Repack
           RUBY
         end
       end
-      if options[:router] && options[:redux]
+      if options[:router] && options[:redux] || options[:god]
           insert_into_file './package.json', after: /dependencies\": {\n/ do
           <<-'RUBY'
     "react-router-redux": "^4.0.5",
+    "redux-auth-wrapper": "^1.0.0",
           RUBY
          end
       end
@@ -70,8 +81,10 @@ module Repack
         create_file "client/actions.js"
         copy_file "boilerplate/App.js", "client/containers/App.js"
       else
-        copy_file "boilerplate/application.js", "client/application.js"
-        copy_file "boilerplate/App.js", "client/containers/App.js"
+        unless options[:god]
+          copy_file "boilerplate/application.js", "client/application.js"
+          copy_file "boilerplate/App.js", "client/containers/App.js"
+        end
       end
 
       haml_installed = Gem.loaded_specs.has_key? 'haml-rails'
@@ -106,17 +119,15 @@ module Repack
             RUBY
         end
       else
-        insert_into_file application_view, before: /<\/head>/ do
-          <<-'RUBY'
-<% if Rails.env.development? %>
-  <script src="http://localhost:3808/webpack-dev-server.js"></script>
-<% end %>
-          RUBY
+        insert_into_file application_view, before: /<\/head>/ do <<-'RUBY'
+  <% if Rails.env.development? %>
+    <script src="http://localhost:3808/webpack-dev-server.js"></script>
+  <% end %>
+        RUBY
         end
-        insert_into_file application_view, before: /<\/body>/ do
-          <<-'RUBY'
-<%= javascript_include_tag *webpack_asset_paths('application') %>
-          RUBY
+        insert_into_file application_view, before: /<\/body>/ do <<-'RUBY'
+    <%= javascript_include_tag *webpack_asset_paths('application') %>
+        RUBY
         end
       end
     end
@@ -131,9 +142,9 @@ module Repack
     end
 
     def install_yarn
-      if yes?('Do you want to install and use yarn as your package manager? (yes / no)')
+      if yes?('Do you want to global install and use yarn as your package manager? (yes / no)')
         @yarn_installed = true
-        run "npm install yarn --save-dev"
+        run "npm install yarn -g"
       end
     end
 
@@ -145,6 +156,58 @@ module Repack
       end
     end
 
+    def finishing_god_move
+      if options[:god]
+        copy_file "boilerplate/router_redux/application.js", "client/application.js"
+        copy_file "boilerplate/god_mode/routes.js", "client/routes.js"
+        copy_file "boilerplate/router_redux/store.js", "client/store.js"
+        copy_file "boilerplate/router/NoMatch.js", "client/components/NoMatch.js"
+        copy_file "boilerplate/god_mode/actions/auth.js", "client/actions/auth.js"
+        copy_file "boilerplate/god_mode/actions/flash.js", "client/actions/flash.js"
+        copy_file "boilerplate/god_mode/components/Navbar.js", "client/components/Navbar.js"
+        copy_file "boilerplate/god_mode/components/FlashMessage.js", "client/components/FlashMessage.js"
+        copy_file "boilerplate/god_mode/components/Login.js", "client/components/Login.js"
+        copy_file "boilerplate/god_mode/components/SignUp.js", "client/components/SignUp.js"
+        copy_file "boilerplate/god_mode/components/Loading.js", "client/components/Loading.js"
+        copy_file "boilerplate/god_mode/containers/App.js", "client/containers/App.js"
+        copy_file "boilerplate/god_mode/reducers/auth.js", "client/reducers/auth.js"
+        copy_file "boilerplate/god_mode/reducers/flash.js", "client/reducers/flash.js"
+        copy_file "boilerplate/god_mode/reducers/index.js", "client/reducers/index.js"
+        copy_file "boilerplate/god_mode/controllers/api/users_controller.rb", "app/controllers/api/users_controller.rb"
+        copy_file "boilerplate/god_mode/scss/alert.css.scss", "app/assets/stylesheets/alert.css.scss"
+        gem "devise"
+        Bundler.with_clean_env do
+          run "bundle install"
+        end
+        run 'bin/spring stop'
+        generate "devise:install"
+        run "bundle exec rake db:create"
+        model_name = ask("What would you like the user model to be called? [user]")
+        model_name = "user" if model_name.blank?
+        generate "devise", model_name
+        generate "devise:controllers #{model_name.pluralize}"
+
+        insert_into_file 'config/routes.rb', after: /devise_for :users/ do <<-'RUBY'
+, controllers: {
+    sessions: 'users/sessions',
+    registrations: 'users/registrations'
+  }
+  namespace :api do
+    get 'logged_in_user', to: 'users#logged_in_user'
+  end
+        RUBY
+        end
+        ['./app/controllers/users/sessions_controller.rb', './app/controllers/users/registrations_controller.rb'].each do |c|
+          insert_into_file c, after: /Devise::\W*.*\n/ do <<-'RUBY'
+skip_before_action :verify_authenticity_token
+respond_to :json
+            RUBY
+          end
+        end
+      end
+      run 'bundle exec rake db:migrate'
+    end
+
     def whats_next
       puts <<-EOF.strip_heredoc
         We've set up the basics of repack for you, but you'll still

data/lib/repack/version.rb

@@ -1,3 +1,3 @@
 module Repack
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repack
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Dave Jungst
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,6 +41,20 @@ files:
 - example/babelrc
 - example/boilerplate/App.js
 - example/boilerplate/application.js
+- example/boilerplate/god_mode/actions/auth.js
+- example/boilerplate/god_mode/actions/flash.js
+- example/boilerplate/god_mode/components/FlashMessage.js
+- example/boilerplate/god_mode/components/Loading.js
+- example/boilerplate/god_mode/components/Login.js
+- example/boilerplate/god_mode/components/Navbar.js
+- example/boilerplate/god_mode/components/SignUp.js
+- example/boilerplate/god_mode/containers/App.js
+- example/boilerplate/god_mode/controllers/api/users_controller.rb
+- example/boilerplate/god_mode/reducers/auth.js
+- example/boilerplate/god_mode/reducers/flash.js
+- example/boilerplate/god_mode/reducers/index.js
+- example/boilerplate/god_mode/routes.js
+- example/boilerplate/god_mode/scss/alert.css.scss
 - example/boilerplate/redux/application.js
 - example/boilerplate/redux/reducers.js
 - example/boilerplate/redux/store.js