voyage 1.44.0.8 → 1.44.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a7660253e2c6e4fc6f64ad2e6edcd40a1b8927b
-  data.tar.gz: 24ac8a58416d07799c43e391399e597a5707ef37
+  metadata.gz: 34805db52fd3603e41eb324e307c4c5fca0e05af
+  data.tar.gz: 62e934b8eb5fae05b49f229c0795888d41fa1c96
 SHA512:
-  metadata.gz: 40ccda0ba49723dabca96ea51e0fea2d9a17884acbfefa5ae997d15d28292035b65bb93b76d4ca4fa8b7919a7499b36251047e650eaef6ea97f6357bfb96a1df
-  data.tar.gz: 292dfb3e8a16c2e15decc2f0a827116d82ec4761f4014689380e09bf04d191a4965f97d603c09679c5e2d96eb18188c18fce6f9f2544b4cdd8e1eebd6cdb8c2c
+  metadata.gz: a41c3764da14b591fd920a1c44c59bd7576351ad6b967120609d930f3975c5498db0d671f99c060420bf9f762c43b588ece957abf6752559d486eb1f53946585
+  data.tar.gz: 0ab410d991d66a534598e5b285f986f4301bc273ef24b8c6793babb308f1af6886c70bbc9f2ce9b58883c1b511504db09997bb37fef7a71a2236a78bc70f9688

data/lib/voyage/app_builder.rb

@@ -598,8 +598,23 @@ module Suspenders
 
     def add_app_css_file
       create_file "app/assets/stylesheets/#{app_name}.sass" do <<-RUBY.gsub(/^ {8}/, '')
-        .main-content
+        .outer-wrapper
+          position: relative
+          min-height: 100%
+
+        .navigation-wrapper
+          @include outer-container
+
+        .main
           padding: 18px
+          @include outer-container
+          padding-bottom: 450px
+
+        .footer
+          min-height: 420px
+          position: absolute
+          bottom: 0
+          left: 0
         RUBY
       end
     end
@@ -608,6 +623,16 @@ module Suspenders
       replace_in_file 'app/assets/stylesheets/refills/_flashes.scss', "margin-bottom: $base-spacing / 2;", "// margin-bottom: $base-spacing / 2;"
     end
 
+    def update_application_css_file
+      inject_into_file 'app/assets/stylesheets/application.scss', before: '@import "neat";'  do <<-RUBY.gsub(/^ {8}/, '')
+        $visual-grid: true;
+        $visual-grid-color: #9cf !default;
+        $visual-grid-index: front !default;
+        $visual-grid-opacity: 0.1 !default;
+        RUBY
+      end
+    end
+
     def add_admin_links_to_navigation
       return unless @@use_devise
       inject_into_file 'app/views/refills/_navigation.html.erb', after: '        <li class="nav-link"><a href="javascript:void(0)">Contact</a></li>'  do <<-RUBY
@@ -724,10 +749,16 @@ module Suspenders
         .env
         .zenflow-log
         errors.err
+        .ctags
         RUBY
       end
     end
 
+    def spin_up_webpacker
+      rake 'webpacker:install'
+      rake 'webpacker:install:react'
+    end
+
     ###############################
     # OVERRIDE SUSPENDERS METHODS #
     ###############################

data/lib/voyage/generators/app_generator.rb

@@ -35,6 +35,7 @@ module Suspenders
       invoke :generate_refills
       invoke :add_app_css_file
       invoke :update_flashes_css_file
+      invoke :update_application_css_file
       invoke :overwrite_application_layout
       invoke :generate_test_environment
       invoke :update_test_environment
@@ -50,6 +51,7 @@ module Suspenders
       invoke :run_rubocop_auto_correct
       invoke :copy_env_to_example
       invoke :add_to_gitignore
+      invoke :spin_up_webpacker
       invoke :actually_setup_spring
       invoke :bon_voyage
       super
@@ -103,6 +105,10 @@ module Suspenders
       build :update_flashes_css_file
     end
 
+    def update_application_css_file
+      build :update_application_css_file
+    end
+
     def overwrite_application_layout
       build :overwrite_application_layout
     end
@@ -131,6 +137,10 @@ module Suspenders
       build :add_favicon
     end
 
+    def spin_up_webpacker
+      build :spin_up_webpacker
+    end
+
     def rake_db_setup
       build :rake_db_setup
     end

data/lib/voyage/templates/Gemfile.erb

@@ -22,6 +22,7 @@ gem "sprockets", ">= 3.0.0"
 gem 'voyage'
 gem "title"
 gem "uglifier"
+gem 'webpacker', github: 'rails/webpacker'
 
 # Customizations
 gem 'font-awesome-rails'

data/lib/voyage/templates/voyage_layout.html.erb.erb

@@ -21,28 +21,17 @@
     <%%= Gon::Base.render_data %>
   </head>
   <body class="<%%= devise_controller? ? 'devise' : 'application' %> <%%= body_class %>">
-    <%%# Add gon here for turbolinks benefit %>
-    <%%= Gon::Base.render_data %>
-    <%%= render 'flashes' -%>
-    <%% if devise_controller? %>
+    <div class='outer-wrapper'>
+      <%%# Add gon here for turbolinks benefit %>
+      <%%= Gon::Base.render_data %>
+      <%%= render 'flashes' -%>
       <% if config[:add_refills] %><%%= render 'refills/navigation' %><% end %>
-      <div class='main-content'>
+      <div class='main'>
         <%%= yield %>
       </div>
-    <%% else %>
-      <div class='grid-offset'>
-        <div class='work-area'>
-          <% if config[:add_refills] %><%%= render 'refills/navigation' %><% end %>
-
-          <div class='main-content'>
-            <%%= yield %>
-          </div>
-        </div>
-      </div>
-    <%% end %>
-
-    <% if config[:add_refills] %><%%= render 'refills/footer' %><% end %>
-    <%%= render 'javascript' %>
-    <%%= render 'css_overrides' %>
+      <% if config[:add_refills] %><%%= render 'refills/footer' %><% end %>
+      <%%= render 'javascript' %>
+      <%%= render 'css_overrides' %>
+    </div>
   </body>
 </html>

data/lib/voyage/version.rb

@@ -5,5 +5,5 @@ module Voyage
       .read("#{File.dirname(__FILE__)}/../../.ruby-version")
       .strip
       .freeze
-  VERSION = '1.44.0.8'.freeze
+  VERSION = '1.44.0.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voyage
 version: !ruby/object:Gem::Version
-  version: 1.44.0.8
+  version: 1.44.0.9
 platform: ruby
 authors:
 - thoughtbot, headway