rails_base 0.56.0 → 0.61.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8848ee352824c072f2cb33947b77f92e4516a2bb606fc327c0af9a13c0239eeb
-  data.tar.gz: d6a05900f769175ddda5500073ae3158eecd9442c71955f29fd770ee8f2ce65e
+  metadata.gz: f94ae56f9f525b93289e14773189cf437328e50ef8b2e4c7f374bc157730ddcc
+  data.tar.gz: 8bd40fe32d2bbb0e700e283cd0769121d385844bca3dd02dfd7e426bc32db057
 SHA512:
-  metadata.gz: dc283c62b445089c071258a6363a6bc77fd184ba19d34dd06d6ba26a7962b2a6b2ad31e47140af7ba1d682ce6275e9c7612d3e494ffab1d3c8e78d1604daefae
-  data.tar.gz: fc68932462a62c9b13738f9254d46026fdfcd2ff9f62da33032d747292c7eed50ac646a0a5f0982400cff1e7c9ae7e07f6f1514c95b07c1dd9f7bf3262c2be93
+  metadata.gz: 168ac878736a648e77e471b420a3efa0fac9244fd3c0ae594d09737db68e8ebfb99fa8077e48b63813ddde04f7ad59ca0fd52556da1db192f0fc0b6217c6f90c
+  data.tar.gz: '091ca1be6b369f1d5a03677a6b115e69e1dd5d9cdd07032b648e9650a358999b07bf2a2d0c25a531b92048dc6e2d304ae265fd7459e8b9cb7cc8d3e7554994f5'

data/app/views/layouts/rails_base/application.html.erb

@@ -24,7 +24,7 @@
 
     <%=
     if RailsBase.config.app.favicon_path
-      favicon_link_tag 'rails_base/favicon.ico'
+      favicon_link_tag(RailsBase.config.app.favicon_path)
     end
     %>
   </head>
@@ -178,15 +178,31 @@
         # dont load these when error page happens. The full stack of librarires are not
         # rendered and jquery/bootstrap are missing
       %>
-      <% case footer_mode_case %>
-      <% when :sticky %>
-      $('#base-footer').addClass('fixed-bottom')
-      <% when :bottom %>
-      if($('#_body_base_container').height() <= window.innerHeight){
+      function _rails_base_reload_base_footer(){
+        <% case footer_mode_case %>
+        <% when :sticky %>
         $('#base-footer').addClass('fixed-bottom')
+        <% when :bottom %>
+        if($('#_body_base_container').height() <= window.innerHeight){
+          $('#base-footer').addClass('fixed-bottom')
+        } else {
+          $('#base-footer').removeClass('fixed-bottom')
+        }
+        <% else %>
+        <% end %>
       }
-      <% else %>
-      <% end %>
+
+      function _rails_base_toggle_base_footer(status){
+        if(status=='show') {
+           $('#base-footer').show()
+        } else if(status=='hide') {
+           $('#base-footer').hide()
+        } else  {
+           $('#base-footer').toggle()
+        }
+      }
+
+      _rails_base_reload_base_footer();
 
       <% unless defined?(@error_page) %>
       $(document).ready(function(){

data/app/views/rails_base/devise/passwords/new.html.erb

@@ -1,14 +1,17 @@
 <h2 class='text-center'>Forgot your password?</h2>
 <%= render "devise/shared/error_messages", resource: resource %>
 
+<% submit_id = "submit_id_#{Time.now.to_i}" %>
 
-<%= form_for(:user, as: :user, url: RailsBase.url_routes.user_password_path, html: { method: :post }) do |f| %>
+<%= form_for(:user, as: :user, url: RailsBase.url_routes.user_password_path, html: { method: :post, class: 'forgot_password' }) do |f| %>
 
 	<div class="field form-group row">
 	  <div class="col-md-10 offset-md-1">
-    		<%= f.label :email, class: 'text-center' %><br />
+    		<%= f.label :email, class: 'text-center' %><br>
 	      <%= f.email_field :email, autofocus: true, autocomplete: "email", placeholder: :email, class: 'form-control'%>
-	    </div>
+      <div class="invalid-feedback">
+        Password Confirmation does not match Password
+      </div>
 	  </div>
 	</div>
 
@@ -16,7 +19,7 @@
     <div class="col-md-10 offset-md-1 text-center">
       <div class="row">
         <div class="col-md-9">
-          <%= f.submit "Send me reset password instructions", class: "btn btn_success btn-block" %>
+          <%= f.submit "Send me reset password instructions", class: "btn btn_success btn-block #{submit_id}" %>
         </div>
         <div class="col-md-3">
           <a class="btn btn_primary btn-block" href="<%= RailsBase.url_routes.new_user_session_path %>" role="button">Sign in</a>
@@ -25,3 +28,12 @@
     </div>
   </div>
 <% end %>
+
+<%
+  values = [
+    { name: '#user_email', criteria: { required: true, pattern: :email }}
+  ]
+  function_name = 'forgot_password'
+%>
+
+<%= render partial: 'rails_base/shared/custom_form_validation_javascript', locals: { function_name: function_name, values: values } %>

data/app/views/rails_base/email_verification_mailer/email_verification.html.erb

@@ -1,7 +1,9 @@
 <p>Hello <%= @user.full_name %>!</p>
 
 <p>
-  Welcome to <%= RailsBase.config.app.communication_name %>. Where you have the ability to keep track of all of your optiosn accross different companies and life events
+  Welcome to <%= RailsBase.config.app.communication_name %>.
+  </br>
+  <%= RailsBase.config.mailer.verification_content(@user) %>
   </br>
   Please finish your registration by following this <a href="<%=@sso_url_for_user%>" target="_blank"> Registration Link </a>
   </br>

data/app/views/rails_base/shared/_logged_in_header.html.erb

@@ -59,7 +59,7 @@
         </br>
         <div class='row'>
           <div class='col'>
-            <a class="btn btn_info btn-block" href="<%=RailsBase.url_routes.user_settings_path%>" role="button">Modify User</a>
+            <a class="btn btn_info btn-block" href="<%=RailsBase.url_routes.user_settings_path %>" role="button">Modify User</a>
           </div>
         </div>
         </br>
@@ -69,6 +69,14 @@
           </div>
         </div>
         </br>
+        <% if RailsBase.config.templates.logged_in_header_modal %>
+          <div class='row'>
+            <div class='col'>
+            <%= render partial: RailsBase.config.templates.logged_in_header_modal, locals: { current_user: current_user } %>
+            </div>
+          </div>
+          </br>
+        <% end %>
           <div class="dropdown-divider"></div>
         <div class='row'>
           <div class='col'>

data/app/views/rails_base/shared/_standardized_collapse.html.erb

@@ -0,0 +1,62 @@
+
+<%
+  id = options.fetch(:id)
+  title = options.fetch(:title_id)
+  body = options.fetch(:body_id)
+  use_fa_icon = options[:fa_icon] != false
+  if use_fa_icon
+    fa_icon_open = options.dig(:fa_icon, :open) || 'fa-caret-right'
+    fa_icon_closed = options.dig(:fa_icon, :closed) || 'fa-caret-down'
+    fa_icon_only = options.dig(:fa_icon, :collapse_only) || false
+    fa_icon_span_class = "fa-icon-span-class-#{rand(100..100_000)}_id-#{id}"
+    fa_icon_span_id = "id-#{fa_icon_span_class}"
+  end
+  start_open = !(options[:default_closed] || false)
+  close_display = start_open ? 'inline' : 'none'
+  open_display = !start_open ? 'inline' : 'none'
+  id_transposed = "id_transposed_#{rand(100_000..999_999)}"
+%>
+
+<% if use_fa_icon %>
+  <span id="<%= fa_icon_span_id %>" class="float-md-left fa-icon-span <%= fa_icon_span_class %> ">
+    <i class="fa <%= fa_icon_open %> open" aria-hidden="true" style="display:<%= open_display %>"></i>
+    <i class="fa <%= fa_icon_closed %> closed" aria-hidden="true" style="display:<%= close_display %>"></i>
+  </span>
+<% end %>
+
+<script type="text/javascript">
+  $(`#<%= body %>`).addClass('collapse')
+  <% if start_open %>
+    $(`#<%= body %>`).addClass('show')
+  <% end %>
+  <% if use_fa_icon %>
+    // Initialize fa <%= id %>
+    $(`#<%= fa_icon_span_id %>`).prependTo(`#<%= title %>`);
+  <% end %>
+
+  <% if use_fa_icon && fa_icon_only %>
+  var <%= id_transposed %> = `#<%= fa_icon_span_id %>`
+  <% else %>
+  var <%= id_transposed %> = `#<%= title %>`
+  <% end %>
+
+  $(<%= id_transposed %>).click(function(event){
+    _rails_base_toggle_base_footer('hide')
+    $(`#<%= body %>`).collapse('toggle')
+    <% if use_fa_icon %>
+      $(`#<%= fa_icon_span_id %> .open`).toggle()
+      $(`#<%= fa_icon_span_id %> .closed`).toggle()
+    <% end %>
+  });
+
+  $(`#<%= body %>`).on('shown.bs.collapse', function () {
+    _rails_base_reload_base_footer();
+    _rails_base_toggle_base_footer('show')
+  })
+
+  $(`#<%= body %>`).on('hidden.bs.collapse', function () {
+    _rails_base_reload_base_footer();
+    _rails_base_toggle_base_footer('show')
+  })
+
+</script>

data/lib/rails_base/config.rb

@@ -11,6 +11,7 @@ require 'rails_base/configuration/appearance'
 require 'rails_base/configuration/user'
 require 'rails_base/configuration/login_behavior'
 require 'rails_base/configuration/active_job'
+require 'rails_base/configuration/templates'
 
 module RailsBase
   class Config
@@ -28,7 +29,8 @@ module RailsBase
       appearance: nil,
       user: nil,
       active_job: nil,
-      login_behavior: nil
+      login_behavior: nil,
+      templates: nil,
     }
     attr_reader *VARIABLES.keys
 

data/lib/rails_base/configuration/mailer.rb

@@ -107,7 +107,12 @@ module RailsBase
           default: 'mailers',
           on_assignment: ->(val, _instance) { ACTION_MAILER_PROC.call(:deliver_later_queue_name, val) },
           description: 'The active job queue to send twilio messages from. Ensure that adapter is bound to the queue',
-        }
+        },
+        verification_content: {
+          type: :string_proc,
+          default: ->(user) { "We are pleased to have you here" },
+          description: 'Description of app for verification mailer. User is passed in.',
+        },
       }
 
       attr_accessor *DEFAULT_VALUES.keys

data/lib/rails_base/configuration/templates.rb

@@ -0,0 +1,18 @@
+require 'rails_base/configuration/base'
+
+module RailsBase
+  module Configuration
+    class Templates < Base
+
+      DEFAULT_VALUES = {
+        logged_in_header_modal: {
+          type: :string_nil,
+          default: nil,
+          description: 'The template to render in the logged in header modal. `current_user` is passed in',
+        },
+      }
+
+      attr_accessor *DEFAULT_VALUES.keys
+    end
+  end
+end

data/lib/rails_base/version.rb

@@ -1,6 +1,6 @@
 module RailsBase
   MAJOR = '0'
-  MINOR = '56'
+  MINOR = '61'
   PATCH = '0'
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_base
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.61.0
 platform: ruby
 authors:
 - Matt Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-05 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -531,6 +531,7 @@ files:
 - app/views/rails_base/shared/_reset_password_form.html.erb
 - app/views/rails_base/shared/_session_create_form.html.erb
 - app/views/rails_base/shared/_session_timeout_modal.html.erb
+- app/views/rails_base/shared/_standardized_collapse.html.erb
 - app/views/rails_base/switch_user/_widget.html.erb
 - app/views/rails_base/user_settings/_confirm_destroy_user.html.erb
 - app/views/rails_base/user_settings/_destroy_user.html.erb
@@ -590,6 +591,7 @@ files:
 - lib/rails_base/configuration/mfa.rb
 - lib/rails_base/configuration/owner.rb
 - lib/rails_base/configuration/redis.rb
+- lib/rails_base/configuration/templates.rb
 - lib/rails_base/configuration/user.rb
 - lib/rails_base/engine.rb
 - lib/rails_base/version.rb