strongmind-auth 1.1.58 → 1.1.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d339f7f3de97bf9d66d4016e9c6df2b5f42c690c64e951907789ff2ae2d785b
-  data.tar.gz: 5a428449da9ca208c4946c4f377a942b6b4374847489cc5124131b04c217d965
+  metadata.gz: 3e76213cdfcc9edec5c34b3d71920f847444f33bbb4b5999bc9699e49d8350ab
+  data.tar.gz: 9b10b41b6ca05f2ef7caa71113bc3702578dc5e2cd7adb377f4f27ac196182ee
 SHA512:
-  metadata.gz: fea2b8e89c58d9efd34ec21b908ae3e026ec2cafa7d4ccb53621337a8e3d8539561e1c0cfffcdeff0290f92ab9cb1f858a2a7ab1a8db74a0e0be697b55d578d9
-  data.tar.gz: 483a18db083fc299359338e1035853aab594a1beabf2473bfa0b1a84c8846a7d13ec716dc0e0f8257b83374e82285214e88f9eb226651cd444c4c251060488d7
+  metadata.gz: 9e99ec4b5c8ee816862b78beb662ca40fe29e795b23e6d59baa83602d23d9a6b0894b07ee4c247c2835fad760ab3d32e8783d513edda669c5020fd74f15a2645
+  data.tar.gz: c737bd54e6201dfca2bfaa5f4060dd2db3d5464c8393b307fae325c77595ab9ce6561a378a6993c866352ef3de4175cf34b9aa29ca4302009789dc50bf711413

data/app/controllers/logins_controller.rb

@@ -3,6 +3,6 @@ class LoginsController < ApplicationController
   skip_before_action :fetch_common_nav
 
   def index
-    flash[:alert] = nil
+
   end
 end

data/app/views/logins/index.html.erb

@@ -3,6 +3,11 @@
         top: 30vh;
         margin-left: auto;
         margin-right: auto;
+        height: 80%;
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
     }
 
     #loading .sm-loader {
@@ -28,6 +33,7 @@
 
 
 </script>
+
 <div id="loading">
   <% flash.each do |type, message| %>
     <div class="alert alert-<%= type %>"><%= message %></div>
@@ -38,5 +44,4 @@
       <img src="https://prod-backpack-ui.strongmind.com/assets/images/strongmind-loader.svg">
     <% end %>
   </div>
-
 </div>

data/config/initializers/devise.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-return if defined? Rails::Generators
+# return if defined? Rails::Generators # This line needs to be commented out to allow tailwindcss watch to run linked ticket: https://strongmind.atlassian.net/browse/BEL-2645
 
 # if Devise is not present in Gemfile
 unless File.read('Gemfile').include?('devise')

data/lib/strongmind/auth/version.rb

@@ -1,5 +1,5 @@
 module Strongmind
   module Auth
-    VERSION = "1.1.58"
+    VERSION = "1.1.63"
   end
 end

data/lib/strongmind/common_nav_fetcher.rb

@@ -35,7 +35,16 @@ module Strongmind
     private
 
     def current_page?(url)
-      request.fullpath == URI.parse(url).path
+      request.fullpath == URI.parse(url).path || path_in_request?(url)
+    end
+
+    def path_in_request?(path)
+      sanitized_path = path.gsub('/', '')
+
+      path_to_compare = request.fullpath.split('?').first
+
+      return path_to_compare == '/' if sanitized_path.empty?
+      path_to_compare.include?(sanitized_path) || path_to_compare.include?(sanitized_path.pluralize)
     end
 
     def fetch_navbar_data(nav_items)
@@ -91,7 +100,9 @@ module Strongmind
     end
 
     def build_nav_items(menu_items)
-      { nav_items: menu_items.map { |item| nav_item_data(item) } }
+      items = { nav_items: menu_items.map { |item| nav_item_data(item) } }
+      items[:nav_items].first[:is_active] = true unless items[:nav_items].any? { |item| item[:is_active] }
+      items
     end
 
     def nav_item_data(item)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strongmind-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.58
+  version: 1.1.63
 platform: ruby
 authors:
 - Team Belding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-22 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails