repack 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2c8f08f5c1c53363908ec95a4d2a691face35e
-  data.tar.gz: cb18f8b80a71ac2e459e554adcda3699a65a0ba4
+  metadata.gz: 78e6d267ffffc3eb51afc386a1382b1cfac43af7
+  data.tar.gz: 2d022dd91e66595577ef17c986a70fab98f49266
 SHA512:
-  metadata.gz: 171b0c4119583830faed0d30422e2519f082f44ea179c3aff6cdc236ba470455e2917d855cb3fe0c98a991f907e831951c11518231c7456deb6ed49f5db3219d
-  data.tar.gz: f5a5220c5eeaf2e6a6db31fc426495e8bc45bb8ddd0bdcb7646a9297ba940485f1acc6a34b2e694fcac67e0e0b0385101e5c671e498ab0a58ef7d1123626e8d4
+  metadata.gz: e55d2f339db2928a36ea29e268586b1f5b3c34d069e745ed85631cee858f83e8576fb5bac66f5b7ed6578030b939af8ff716db596e249808dab91ce133e3521c
+  data.tar.gz: fb8c3b0fa4df2d90d88e232cfec6ccf63f506a2d915753b9125cbd1464570bf2dacdb50b1f8c764b6f87c6f233306becb08082a58b266f2d4e229483de1cb2ab

data/example/Procfile

@@ -1,4 +1 @@
-# Run Rails & Webpack concurrently
-# Example file from webpack-rails gem
-rails: bundle exec rails server
-webpack: ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js
+web: bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development}

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

@@ -0,0 +1,52 @@
+import React from 'react';
+import { Link } from 'react-router';
+import { handleLogout } from '../actions/auth';
+import { connect } from 'react-redux';
+
+class BootstrapNavbar 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(
+      <nav className="navbar navbar-default">
+        <div className="container-fluid">
+          <div className="navbar-header">
+            <button type="button" className="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+              <span className="sr-only">Toggle navigation</span>
+              <span className="icon-bar"></span>
+              <span className="icon-bar"></span>
+              <span className="icon-bar"></span>
+            </button>
+            <a className="navbar-brand" href="#">Brand</a>
+          </div>
+
+          <div className="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+            <ul className="nav navbar-nav navbar-right">
+              { this.authLinks() }
+            </ul>
+          </div>
+        </div>
+      </nav>
+    );
+  }
+}
+
+const mapStateToProps = (state) => {
+  return { auth: state.auth }
+}
+
+export default connect(mapStateToProps)(BootstrapNavbar);

data/example/boilerplate/god_mode/components/{Navbar.js → MaterialNavbar.js}

@@ -3,7 +3,7 @@ import { Link } from 'react-router';
 import { handleLogout } from '../actions/auth';
 import { connect } from 'react-redux';
 
-class Navbar extends React.Component {
+class MaterialNavbar extends React.Component {
   logout = (e) => {
     e.preventDefault();
     this.props.dispatch(handleLogout());
@@ -42,4 +42,4 @@ const mapStateToProps = (state) => {
   return { auth: state.auth }
 }
 
-export default connect(mapStateToProps)(Navbar);
+export default connect(mapStateToProps)(MaterialNavbar);

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

@@ -0,0 +1,33 @@
+import React from 'react';
+import { connect } from 'react-redux';
+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>
+        <div style={{ marginBottom: '30px' }}>
+          <FlashMessage />
+        </div>
+        <div className='container'>
+          { children }
+        </div>
+      </div>
+    );
+  }
+}
+
+export default connect()(App);
+

data/lib/generators/repack/install_generator.rb

@@ -47,8 +47,10 @@ module Repack
     def copy_webpack_conf
       copy_file "webpack.config.js", "config/webpack.config.js"
       if yes?('Are you going to be deploying to heroku? (yes \ no)')
-        puts 'copying heroku webpack config!'
+        puts 'Copying Heroku Webpack Config!'
         copy_file "webpack.config.heroku.js", "config/webpack.config.heroku.js"
+        puts 'Adding Basic Puma Proc File'
+        copy_file "Procfile", 'Procfile'
       end
     end
 
@@ -131,6 +133,7 @@ module Repack
         end
       end
     end
+    
     def add_to_gitignore
       append_to_file ".gitignore" do
         <<-EOF.strip_heredoc
@@ -141,23 +144,27 @@ module Repack
       end
     end
 
-    def install_yarn
-      if yes?('Do you want to global install and use yarn as your package manager? (yes / no)')
-        @yarn_installed = true
-        run "npm install yarn -g"
-      end
-    end
-
-    def run_package_manager_install
-      if @yarn_installed
-        run "yarn install" if yes?("Would you like us to run 'yarn install' for you?")
-      else
-        run "npm install" if yes?("Would you like us to run 'npm install' for you?")
-      end
-    end
-
     def finishing_god_move
       if options[:god]
+        nav_template = ask('Frontend Framework: 1) Materialize, 2) Bootstrap, 3) None').strip
+        case nav_template
+          when 1
+            copy_file "boilerplate/god_mode/components/MaterialNavbar.js", "client/components/Navbar.js"
+          when 2
+            copy_file "boilerplate/god_mode/components/BootstrapNavbar.js", "client/components/Navbar.js"
+          when 3
+            puts 'No Navbar template, all the components are ready for you to implement however you want.'
+          else
+            puts 'Wrong template choice, try again!'
+            finishing_god_move
+        end
+
+        if nav_template == '3'
+          copy_file "boilerplate/god_mode/containers/NoNavApp.js", "client/containers/App.js"
+        else
+          copy_file "boilerplate/god_mode/containers/App.js", "client/containers/App.js"
+        end
+        
         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"
@@ -169,7 +176,6 @@ module Repack
         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"
@@ -209,24 +215,38 @@ respond_to :json
     end
 
     def whats_next
+      if options[:god]
+        puts <<-EOF.strip_heredoc
+           ██████╗  ██████╗ ██████╗     ███╗   ███╗ ██████╗ ██████╗ ███████╗    ███████╗███╗   ██╗ █████╗ ██████╗ ██╗     ███████╗██████╗ 
+          ██╔════╝ ██╔═══██╗██╔══██╗    ████╗ ████║██╔═══██╗██╔══██╗██╔════╝    ██╔════╝████╗  ██║██╔══██╗██╔══██╗██║     ██╔════╝██╔══██╗
+          ██║  ███╗██║   ██║██║  ██║    ██╔████╔██║██║   ██║██║  ██║█████╗      █████╗  ██╔██╗ ██║███████║██████╔╝██║     █████╗  ██║  ██║
+          ██║   ██║██║   ██║██║  ██║    ██║╚██╔╝██║██║   ██║██║  ██║██╔══╝      ██╔══╝  ██║╚██╗██║██╔══██║██╔══██╗██║     ██╔══╝  ██║  ██║
+          ╚██████╔╝╚██████╔╝██████╔╝    ██║ ╚═╝ ██║╚██████╔╝██████╔╝███████╗    ███████╗██║ ╚████║██║  ██║██████╔╝███████╗███████╗██████╔╝
+          ╚═════╝  ╚═════╝ ╚═════╝     ╚═╝     ╚═╝ ╚═════╝ ╚═════╝ ╚══════╝    ╚══════╝╚═╝  ╚═══╝╚═╝  ╚═╝╚═════╝ ╚══════╝╚══════╝╚═════╝                                      
+
+          Note: If you chose a frontend framework you still need to install and configure that gem in your project.
+
+        EOF
+      end
       puts <<-EOF.strip_heredoc
         We've set up the basics of repack for you, but you'll still
         need to:
-          1. Add an element with an id of 'app' to your layout
-          2. To disable hot module replacement remove <script src="http://localhost:3808/webpack-dev-server.js"></script> from layout
-          3. Run 'yarn run dev_server' to run the webpack-dev-server
-          4. Run 'bundle exec rails s' to run the rails server (both servers must be running)
-          5. If you are using react-router and want to sync server routes add:
-             get '*unmatched_route', to: <your client controller>#<default action>
-             This must be the very last route in your routes.rb file
-             e.g. get '*unmatched_route', to: 'home#index'
+          1. run yarn install or npm install depending on what package manager you are using
+          2. Add an element with an id of 'app' to your layout
+          3. To disable hot module replacement remove <script src="http://localhost:3808/webpack-dev-server.js"></script> from layout
+          4. Run 'yarn run dev_server' to run the webpack-dev-server
+          5. Run 'bundle exec rails s' to run the rails server (both servers must be running)
+          6. If you are using react-router or god mode and want to sync server routes add:
+            get '*unmatched_route', to: <your client controller>#<default action>
+            This must be the very last route in your routes.rb file
+            e.g. get '*unmatched_route', to: 'home#index'
           FOR HEROKU DEPLOYS:
           1.  yarn run heroku-setup
           2.  Push to heroku the post-build hook will take care of the rest
         See the README.md for this gem at
         https://github.com/cottonwoodcoding/repack/blob/master/README.md
         for more info.
-        Thanks for using repack!
+        Thanks for using Repack!
       EOF
     end
   end

data/lib/repack/version.rb

@@ -1,3 +1,3 @@
 module Repack
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repack
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Dave Jungst
@@ -43,12 +43,14 @@ files:
 - example/boilerplate/application.js
 - example/boilerplate/god_mode/actions/auth.js
 - example/boilerplate/god_mode/actions/flash.js
+- example/boilerplate/god_mode/components/BootstrapNavbar.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/MaterialNavbar.js
 - example/boilerplate/god_mode/components/SignUp.js
 - example/boilerplate/god_mode/containers/App.js
+- example/boilerplate/god_mode/containers/NoNavApp.js
 - example/boilerplate/god_mode/controllers/api/users_controller.rb
 - example/boilerplate/god_mode/reducers/auth.js
 - example/boilerplate/god_mode/reducers/flash.js