pg_rails 7.6.21.pre.2 → 7.6.21.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6698336321ce3bb886aa1de70219bab209e2f8b2f1b3f867282a29f1f1ebf5a5
-  data.tar.gz: fae76eef1209ba3e463740c8818ebd406a0b387eab151d964519fe0f5a389cec
+  metadata.gz: 52db938b6aad2006d1815247f8b3f1c4bd297b811ca50db7e800760967942045
+  data.tar.gz: 1a095d3501f50d2b3fa9b123bb62a42e5c3472a1f679b4adf5932716f51693de
 SHA512:
-  metadata.gz: 55b7bc4417466c09110d4e48c4ee7355fdfc7bcf8e153592f9e0418fe518803953b73a6c3584274992aa3624cf6073b0ddab327e9971d7bb17923fbd176322ed
-  data.tar.gz: c51ce96d9af18a24111adc2130ae196290df313198561b4d6b23f59447b6d5d7762c5907bb1bcac59c7aabfbfc439b75324e06901d48de98181462b95c7e4582
+  metadata.gz: ab9d327f91d9153cf8e2ebc1e602510db545f1f086a23fb7d1ced3f5480b234f0b231327930b3707f972a5524cff80796488d3a762df95ed5d0ad649f52dd21c
+  data.tar.gz: 2ca7ae67777a8bac52b5f63642e52d3436fd094c166a97f2c84417bdfcd3305d9f5b5e6a286e2fbd4a655035a69049ddff6ab72ec83abbc6dc5853808ad9d8a9

data/pg_associable/app/helpers/pg_associable/form_builder_methods.rb

@@ -2,6 +2,7 @@
 module PgAssociable
   module FormBuilderMethods
     def self.included(mod)
+      mod.include PgEngine::DefaultUrlOptions
       mod.include Rails.application.routes.url_helpers
       mod.include PgEngine::RouteHelper
     end

data/pg_associable/app/inputs/pg_associable_input.rb

@@ -2,6 +2,7 @@
 
 class PgAssociableInput < SimpleForm::Inputs::StringInput
   include ActionView::Helpers::FormTagHelper
+  include PgEngine::DefaultUrlOptions
   include Rails.application.routes.url_helpers
   include PgEngine::RouteHelper
 

data/pg_associable/spec/system/associable_spec.rb

@@ -1,9 +1,9 @@
 require 'rails_helper'
 
 describe 'Associable' do
-  let(:user) { create :user, :developer }
+  let(:user) { create :user, :owner }
 
-  let(:path) { '/a/cosas/new' }
+  let(:path) { '/u/t/cosas/new' }
 
   before do
     login_as user
@@ -16,7 +16,6 @@ describe 'Associable' do
     find('.cosa_categoria_de_cosa input[type=text]').click
     expect(page).to have_text :all, 'Nueva categoría de cosa'
     find('.cosa_categoria_de_cosa .list-group-item').click
-    select Account.first.to_s
     fill_in 'categoria_de_cosa_nombre', with: 'la categoría'
     select 'Completar', from: 'categoria_de_cosa_tipo'
     click_on 'Agregar Categoría de cosa'
@@ -26,7 +25,7 @@ describe 'Associable' do
 
   context 'cuando crea desde el nested' do
     let!(:categ) { create :categoria_de_cosa }
-    let(:path) { "/a/categoria_de_cosas/#{categ.hashid}/cosas/new" }
+    let(:path) { "/u/t/categoria_de_cosas/#{categ.hashid}/cosas/new" }
 
     it do
       input = find_by_id('cosa_categoria_de_cosa')
@@ -37,7 +36,7 @@ describe 'Associable' do
   context 'cuando edita desde el nested' do
     let!(:categ) { create :categoria_de_cosa }
     let!(:cosa) { create :cosa, categoria_de_cosa: categ }
-    let(:path) { "/a/categoria_de_cosas/#{categ.hashid}/cosas/#{cosa.id}/edit" }
+    let(:path) { "/u/t/categoria_de_cosas/#{categ.hashid}/cosas/#{cosa.id}/edit" }
 
     it do
       ele = find_by_id('cosa_categoria_de_cosa_id', visible: :all)

data/pg_engine/app/controllers/users/accounts_controller.rb

@@ -17,6 +17,25 @@ module Users
 
     add_breadcrumb Account.model_name.human(count: 2), ->(h) { h.users_accounts_path(tid: nil) }
 
+    layout :set_layout
+    def set_layout
+      if action_name == 'index'
+        'pg_layout/containerized'
+      else
+        super
+      end
+    end
+
+    before_action do
+      if action_name.in? %w[index]
+        @container_class = 'container border p-0 my-3'
+        @container_style = 'max-width: 50em; xborder-left: 1px solid grey'
+      elsif action_name.in? %w[edit update]
+        @container_class = 'container border pb-3 my-3'
+        @container_style = 'max-width: 50em; xborder-left: 1px solid grey'
+      end
+    end
+
     # La user_account puede estar disabled
     def show
       add_breadcrumb @account, users_account_path(@account, tid: nil)
@@ -56,7 +75,7 @@ module Users
     end
 
     def atributos_para_listar
-      %i[nombre plan owner]
+      %i[nombre owner]
     end
   end
 end

data/pg_engine/app/controllers/users/invitations_controller.rb

@@ -10,6 +10,8 @@ module Users
       add_breadcrumb 'Agregar usuario'
       @sidebar = false
       @no_main_frame = true
+      @container_class = 'container border pb-3 my-3'
+      @container_style = 'max-width: 50em; xborder-left: 1px solid grey'
     end
 
     def new

data/pg_engine/app/decorators/account_decorator.rb

@@ -22,13 +22,13 @@ class AccountDecorator < PgEngine::BaseRecordDecorator
      ua.reject_invitation_link].compact.join.html_safe
   end
 
-  # def show_link(text: '', klass: 'btn-light')
-  #   return unless Pundit.policy!(Current.user, object).show?
+  def show_link(text: 'Usuarios', klass: 'btn-secondary')
+    return unless Pundit.policy!(Current.user, object).show?
 
-  #   helpers.content_tag :span, 'data-controller': :tooltip, title: 'Más opciones' do
-  #     helpers.link_to object_url, class: "btn btn-sm #{klass}" do
-  #       helpers.content_tag(:span, nil, class: clase_icono('list')) + text
-  #     end
-  #   end
-  # end
+    helpers.content_tag :span do
+      helpers.link_to object_url, class: "btn btn-sm #{klass}" do
+        helpers.content_tag(:span, nil, class: clase_icono('person')) + text
+      end
+    end
+  end
 end

data/pg_engine/app/decorators/user_account_decorator.rb

@@ -8,10 +8,13 @@ class UserAccountDecorator < PgEngine::BaseRecordDecorator
   def ingresar_link
     return unless Pundit.policy!(Current.user, object).ingresar?
 
-    h.link_to h.tenant_root_path(tid: object.to_param),
-              'data-turbo-frame': :_top,
-              class: 'btn btn-sm btn-primary' do
-      '<i class="bi bi-box-arrow-in-right"></i> Ingresar'.html_safe
+    # El span es necesario para que el tamaño de los botones sea homogéneo
+    helpers.content_tag :span do
+      h.link_to h.tenant_root_path(tid: object.to_param),
+                'data-turbo-frame': :_top,
+                class: 'btn btn-sm btn-primary' do
+        '<i class="bi bi-box-arrow-in-right"></i> Ingresar'.html_safe
+      end
     end
   end
 

data/pg_engine/app/helpers/pg_engine/flash_helper.rb

@@ -9,7 +9,8 @@ module PgEngine
     end
 
     def render_turbo_stream_title
-      title = [breadcrumbs.last&.name, ActsAsTenant.current_tenant, I18n.t('app_name')].compact.join(' - ')
+      title = [breadcrumbs.last&.name, ActsAsTenant.current_tenant,
+               I18n.t(Current.app_name, scope: 'app_name')].compact.join(' - ')
       turbo_stream.update_all 'title', title
     end
   end

data/pg_engine/app/mailers/pg_engine/base_devise_mailer.rb

@@ -0,0 +1,9 @@
+module PgEngine
+  class BaseDeviseMailer < ApplicationMailer
+    before_action do
+      @footer_image_src = 'mail-footer-lg.png'
+    end
+
+    layout 'pg_layout/devise_mailer'
+  end
+end

data/pg_engine/app/mailers/pg_engine/user_mailer.rb

@@ -9,6 +9,8 @@ module PgEngine
       mail(to: @recipient.email, subject: params[:subject])
     end
 
+    private
+
     def replace_user(input)
       # reemplaza todas las ocurrencias de: %{user}
       format(input, user: @recipient.nombre)

data/pg_engine/app/models/account.rb

@@ -30,7 +30,7 @@ class Account < ApplicationRecord
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'
 
-  enumerize :plan, in: { completar: 0, los: 1, valores: 2 }
+  enumerize :plan, in: { factura: 0, procura: 1 }
 
   validates :plan, :nombre, presence: true
 
@@ -61,6 +61,7 @@ class Account < ApplicationRecord
   end
 
   def to_s
+    # TODO: nombre_in_database?
     nombre
   end
 

data/pg_engine/app/models/current.rb

@@ -1,5 +1,6 @@
 class Current < ActiveSupport::CurrentAttributes
   attribute :user, :namespace, :controller, :active_user_account
+  attribute :app_name, default: :procura
   # attribute :request_id, :user_agent, :ip_address
 
   # resets { Time.zone = nil }

data/pg_engine/app/models/user.rb

@@ -89,6 +89,14 @@ class User < ApplicationRecord
     user_accounts.first.invitation_status = :ist_invited
   end
 
+  def invited_to_app
+    user_accounts.first.account.plan || 'procura'
+  rescue StandardError => e
+    pg_err(e)
+
+    'procura'
+  end
+
   attr_accessor :orphan
 
   def active_for_authentication?

data/pg_engine/app/models/user_account.rb

@@ -39,7 +39,7 @@ class UserAccount < ApplicationRecord
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'
 
-  validates :user_id, uniqueness: { scope: :account_id }
+  validates_uniqueness_to_tenant :user_id
 
   after_destroy :cleanup_invitation
   def cleanup_invitation

data/pg_engine/app/policies/pg_engine/base_policy.rb

@@ -82,15 +82,15 @@ module PgEngine
     end
 
     def puede_editar?
-      user_has_profile(:update)
+      user_has_profile?(:update)
     end
 
     def puede_crear?
-      user_has_profile(:create)
+      user_has_profile?(:create)
     end
 
     def puede_borrar?
-      user_has_profile(:destroy)
+      user_has_profile?(:destroy)
     end
 
     def puede_ver_archivados?
@@ -98,19 +98,19 @@ module PgEngine
         model = record.is_a?(ActiveRecord::Base) ? record.class : record
         model.respond_to?(:discarded)
       end
-      user_has_profile(:archive) && admits_discard
+      user_has_profile?(:archive) && admits_discard
     end
 
     def base_access_to_record?
-      user_has_profile(:read)
+      user_has_profile?(:read)
     end
 
     def base_access_to_collection?
-      user_has_profile(:read)
+      user_has_profile?(:read)
     end
 
     def export?
-      user_has_profile(:export)
+      user_has_profile?(:export)
     end
 
     def record_discarded?
@@ -125,7 +125,7 @@ module PgEngine
       record.model_name.plural
     end
 
-    def user_has_profile(key)
+    def user_has_profile?(key)
       return true if Current.namespace == :admin
       return false if ActsAsTenant.current_tenant.blank?
 

data/pg_engine/app/views/users/accounts/_form.html.slim

@@ -1,7 +1,7 @@
 div style="max-width: 22em"
   = pg_form_for(@account || object) do |f|
     = f.input :nombre
-    = f.input :plan
+    / = f.input :plan
     = f.input :logo
     .mt-2
     = f.button :submit

data/pg_engine/app/views/users/accounts/show.html.slim

@@ -3,10 +3,11 @@
   = @user_account.sign_off_link
 
 .text-center
-  - if @account.logo.present?
-    = image_tag @account.logo
-  h1
-    = @account
+  .d-flex.justify-content-center.gap-2.align-items-center.m-3
+    - if @account.logo.present?
+      = image_tag @account.logo, style: 'max-height:3em'
+    .fs-1
+      = @account
 
   / h6
     |> Administrado por:

data/pg_engine/config/initializers/devise.rb

@@ -30,7 +30,7 @@ Devise.setup do |config|
   # config.mailer = 'Devise::Mailer'
 
   # Configure the parent class responsible to send e-mails.
-  config.parent_mailer = 'ApplicationMailer'
+  config.parent_mailer = 'PgEngine::BaseDeviseMailer'
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and

data/pg_engine/config/locales/es.yml

@@ -141,10 +141,11 @@ es:
       invitation_instructions:
         subject: "Recibiste una invitación de %{inviter}"
         hello: "Hola %{email}"
-        someone_invited_you: "Has sido invitado a %{url}, puedes aceptarlo siguiendo el siguiente enlace"
+        someone_invited_you: "Hola! %{inviter} te invitó a su espacio en %{app_name}"
+        follow_link: "Podés aceptar la invitación en el siguiente link:"
         accept: "Aceptar la invitación"
         accept_until: "Esta invitación expirará en %{due_date}."
-        ignore: "Si no le interesa esta invitación, simplemente ignore este correo. No se creará tu cuenta hasta que accedas al enlace anterior y crees una contraseña."
+        ignore: "Si no te interesa esta invitación, simplemente ignora este correo. No se creará tu cuenta hasta que accedas al enlace anterior."
       confirmation_instructions:
         action: Confirmá tu cuenta
         greeting: "Hola %{recipient}"

data/pg_engine/db/migrate/20241027225618_add_membership_status_to_user_accounts.rb

@@ -3,4 +3,11 @@ class AddMembershipStatusToUserAccounts < ActiveRecord::Migration[7.2]
     add_column :user_accounts, :membership_status, :integer, null: false, default: 1
     add_column :user_accounts, :invitation_status, :integer, null: false, default: 1
   end
+
+  def migrate(direction)
+    if direction == :up
+      UserAccount.update_all(profiles: [0])
+    end
+    super
+  end
 end

data/pg_engine/lib/pg_engine/engine.rb

@@ -20,6 +20,15 @@ module PgEngine
         load override
       end
 
+      # TODO!: mover a otro lugar?
+      Devise.mailer.class_eval do
+        def invitation_instructions(record, token, opts = {})
+          @token = token
+          opts.merge!(subject: I18n.t('devise.mailer.invitation_instructions.subject', inviter: record.invited_by))
+          devise_mail(record, :invitation_instructions, opts)
+        end
+      end
+
       ActiveStorage::BaseController.class_eval do
         around_action :set_without_tenant
 

data/pg_engine/spec/factories/users.rb

@@ -70,8 +70,11 @@ FactoryBot.define do
     end
 
     trait :owner do
-      user_accounts do
-        [build(:user_account, account: ActsAsTenant.current_tenant, profiles: [:account__owner])]
+      after(:create) do |model|
+        model.user_accounts.create!(profiles: [:account__owner])
+        # ActsAsTenant.with_tenant(create(:account)) do
+        #   model.user_accounts.create!(profiles: [:account__owner])
+        # end
       end
     end
   end

data/pg_engine/spec/mailers/previews/devise_preview.rb

@@ -10,4 +10,10 @@ class DevisePreview < ActionMailer::Preview
     # ClienteMailer.comprobante_recibido(VComprobante.find(params[:]))
     Devise::Mailer.reset_password_instructions(User.first, 'TOKENN')
   end
+
+  def invitation
+    # ClienteMailer.comprobante_recibido(VComprobante.find(params[:]))
+    invitee = User.invitation_not_accepted.first
+    Devise::Mailer.invitation_instructions(invitee, 'TOKENN')
+  end
 end

data/pg_engine/spec/models/user_spec.rb

@@ -13,10 +13,6 @@ RSpec.describe User do
     expect(UserAccount.first.profiles).to include(:account__owner)
   end
 
-  it do
-    expect(user.default_account).to be_present
-  end
-
   describe 'search ransacker' do
     it 'searchs' do
       results = described_class.ransack(search_cont: user.nombre).result.to_a

data/pg_layout/app/views/devise/mailer/invitation_instructions.html.erb

@@ -1,11 +1,9 @@
-<p><%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %></p>
+<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", inviter: @resource.invited_by, app_name: I18n.t(@resource.invited_to_app, scope: 'app_name')) %></p>
 
-<p><%= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %></p>
+<p><%= t("devise.mailer.invitation_instructions.follow_link") %></p>
 
 <p><%= link_to t("devise.mailer.invitation_instructions.accept"), accept_invitation_url(@resource, invitation_token: @token) %></p>
 
-<% if @resource.invitation_due_at %>
+<% if false # @resource.invitation_due_at %>
   <p><%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %></p>
 <% end %>
-
-<p><%= t("devise.mailer.invitation_instructions.ignore") %></p>

data/pg_layout/app/views/devise/mailer/invitation_instructions.text.erb

@@ -1,11 +1,9 @@
-<%= t("devise.mailer.invitation_instructions.hello", email: @resource.email) %>
+<%= t("devise.mailer.invitation_instructions.someone_invited_you", inviter: @resource.invited_by, app_name: I18n.t(@resource.invited_to_app, scope: 'app_name')) %>
 
-<%= t("devise.mailer.invitation_instructions.someone_invited_you", url: root_url) %>
+<%= t("devise.mailer.invitation_instructions.follow_link") %>
 
 <%= accept_invitation_url(@resource, invitation_token: @token) %>
 
-<% if @resource.invitation_due_at %>
+<% if false # @resource.invitation_due_at %>
   <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %>
 <% end %>
-
-<%= t("devise.mailer.invitation_instructions.ignore") %>

data/pg_layout/app/views/layouts/pg_layout/base.html.slim

@@ -9,7 +9,7 @@ html
       meta name="turbo-visit-control" content="reload"
 
     - cache :title_icon
-      title = t('app_name')
+      title = t(Current.app_name, scope: 'app_name')
       - begin
         = render partial: 'layouts/favicon'
       - rescue ActionView::MissingTemplate => e
@@ -53,8 +53,7 @@ html
   body
     span#tid.d-none data-tid="#{Current.tid}"
     - sidebar_present = @navbar.present? && @sidebar != false
-    - if sidebar_present
-      = render partial: 'pg_layout/sidebar_mobile'
+    = render partial: 'pg_layout/sidebar_mobile'
 
     div class="#{ 'with-sidebar' if sidebar_present }"
       - if sidebar_present

data/pg_layout/app/views/layouts/pg_layout/containerized.html.slim

@@ -1,5 +1,5 @@
 - content_for :content do
-  div class="pt-3 #{modal_targeted? ? '' : 'container-fluid'}"
+  div class="pt-3 #{modal_targeted? ? '' : @container_class || 'container-fluid'}" style=@container_style
     = content_for?(:containerized_content) ? yield(:containerized_content) : yield
 
 = render template: 'layouts/pg_layout/base'

data/pg_layout/app/views/layouts/pg_layout/devise_mailer.html.slim

@@ -0,0 +1,12 @@
+html
+  body style="font-family: sans-serif"
+    center
+      = yield
+
+      - if @footer_href.present?
+        footer style="margin-top: 2em;"
+          = link_to @footer_href, rel: 'noreferrer', target: :_blank do
+            - if @footer_image_src.present?
+              = image_tag @footer_image_src, alt: @footer_image_alt
+            - else
+              = @footer_image_alt

data/pg_layout/app/views/layouts/pg_layout/devise_mailer.text.erb

@@ -0,0 +1,7 @@
+<%= yield %>
+
+<% if @footer_href.present? %>
+----------------------
+<%= @footer_image_alt %>
+<%= @footer_href %>
+<% end %>

data/pg_layout/app/views/pg_layout/_navbar.html.slim

@@ -0,0 +1,50 @@
+nav class="navbar navbar-expand-#{@breakpoint_navbar_expand}" data-bs-theme="dark"
+  .container-fluid.xgap-2
+    div
+      - unless @sidebar == false
+        button data-controller="navbar" data-action="navbar#expandNavbar" class="btn btn-outline-light me-2 d-none d-#{@breakpoint_navbar_expand}-inline-block"
+          i class="bi #{@navbar_chevron_class}"
+      - if @navbar.logo.present?
+        span.ms-3
+          = render @navbar.logo
+    - if user_signed_in? && @notifications_bell.present?
+      div class="d-#{@breakpoint_navbar_expand}-none"
+        = render @notifications_bell
+    div
+      - if user_signed_in?
+        .collapse.navbar-collapse.justify-content-end
+          = render partial: 'pg_layout/signed_in_links'
+      - @navbar.extensiones.each do |extension|
+        = extension
+      div class="d-#{@breakpoint_navbar_expand}-none"
+        - if user_signed_in?
+          a.d-flex.align-items-center.gap-2 href="#" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample"
+            - if Current.account.present?
+              - if Current.account.logo.present?
+                = image_tag Current.account.logo.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+              - else
+                i.bi.bi-bag-fill.me-2 style="font-size: 1.7em"
+            - if Current.user.avatar.present?
+              = image_tag Current.user.avatar.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+            - else
+              i.bi.bi-person-circle.me-2 style="font-size: 1.7em"
+        / - else
+          button class="btn btn-outline-light d-inline-block d-#{@breakpoint_navbar_expand}-none" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample"
+            i.bi.bi-list
+#notifications-collapse.collapse[data-controller="notifications"]
+  #notifications
+    #notifications-inner
+      - if @notifications&.any?
+        = render NotificationComponent.with_collection(@notifications) if @notifications&.any?
+      - else
+        span.text-light.text-center
+          |  No hay notificaciones 
+      .text-center
+        button.btn.btn-link.text-light.btn-sm[type="button" data-bs-toggle="collapse" data-bs-target="#notifications-collapse"]
+          i.bi-chevron-up.fs-3
+css:
+  @media(max-width: 767px) {
+    .navbar .navbar-brand {
+      visibility:visible!important;
+    }
+  }

data/pg_layout/app/views/pg_layout/_sidebar.html.slim

@@ -0,0 +1,10 @@
+div id="sidebar" class="#{@navbar_opened_class} flex-shrink-0 d-none d-#{@breakpoint_navbar_expand}-block"
+  .mt-1
+    .m-3
+      = render @navbar.logo if @navbar.logo.present?
+    ul.list-unstyled.ps-0.mt-5
+      - @navbar.sidebar.each do |entry|
+        - next if @navbar.hide_entry?(entry)
+        li.mb-1
+          a href=entry[:path] class="d-inline-flex text-decoration-none pg--nav-button #{@navbar.active_entry?(entry, request) ? 'active' : ''} #{entry[:attributes]}"
+            = entry[:title]

data/pg_layout/app/views/pg_layout/_sidebar_mobile.html.slim

@@ -0,0 +1,16 @@
+#offcanvasExample.offcanvas.offcanvas-end[tabindex="-1" aria-labelledby="offcanvasExampleLabel" data-bs-theme="dark"]
+  .offcanvas-header[data-bs-theme="dark"]
+    h5#offcanvasExampleLabel.offcanvas-title
+    button.btn-close[type="button" data-bs-dismiss="offcanvas" aria-label="Close"]
+  .offcanvas-body.text-end
+    - if user_signed_in?
+      = render partial: 'pg_layout/signed_in_links'
+    ul.list-unstyled.mt-4
+      - @navbar.sidebar.each do |entry|
+        - next if @navbar.hide_entry?(entry)
+        li
+          a href=entry[:path] class="pg--nav-button pe-4 text-light #{@navbar.active_entry?(entry, request) ? 'active' : ''} #{entry[:attributes]}"
+            = entry[:title]
+css:
+  .offcanvas a { text-decoration: none; }
+  .offcanvas li { xmargin-top: 0.75em; } 

data/pg_layout/app/views/pg_layout/_signed_in_links.html.slim

@@ -1,52 +1,54 @@
-- if user_signed_in?
-  .xcollapse.xnavbar-collapse.justify-content-end
-    ul.navbar-nav.flex-row
-      - if Current.account.present?
-        li.nav-item.dropdown
-          = link_to '#', class: 'nav-link dropdown-toggle py-0 d-flex align-items-center',
-                         role: :button, 'data-bs-toggle': :dropdown, 'aria-expanded': 'false' do
-            - if Current.account.logo.present?
-              = image_tag Current.account.logo.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
-            - else
-              i.bi.bi-bag-fill.me-2 style="font-size: 1.7em"
-            = Current.account
-          ul.dropdown-menu
-            - if @other_active_accounts&.any?
-              h6.dropdown-header Cambiar a:
-              - @other_active_accounts.each do |ua|
-                li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
-              li
-                hr.dropdown-divider
-            li = link_to "Administrar #{Account.model_name.human(count: 2)}", users_accounts_path(tid: nil), class: 'dropdown-item'
-      - elsif @other_active_accounts&.any?
-        li.nav-item.dropdown.d-flex
-          = link_to '#', class: 'nav-link dropdown-toggle py-0 d-flex align-items-center',
-                         role: :button, 'data-bs-toggle': :dropdown, 'aria-expanded': 'false' do
-            i.bi.bi-bag-fill.me-2 style="font-size: 1.7em"
-            = Account.model_name.human(count: 2)
-          ul.dropdown-menu
-            - @other_active_accounts.each do |ua|
-              li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
-            li
-              hr.dropdown-divider
-            li = link_to "Administrar #{Account.model_name.human(count: 2).downcase}", users_accounts_path(tid: nil), class: 'dropdown-item'
+ul.navbar-nav.gap-3.align-items-center class="gap-#{@breakpoint_navbar_expand}-0"
+  - if Current.account.present?
+    li.nav-item.dropdown
+      = link_to '#', class: 'nav-link dropdown-toggle py-0 d-flex align-items-center',
+                     role: :button, 'data-bs-toggle': :dropdown, 'aria-expanded': 'false' do
+        - if Current.account.logo.present?
+          = image_tag Current.account.logo.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+        - else
+          i.bi.bi-bag-fill.me-2 style="font-size: 1.7em"
+        = Current.account
+      ul.dropdown-menu
+        li = link_to "Administrar #{Current.account}", users_account_path(Current.account, tid: nil), class: 'dropdown-item'
+        li
+          hr.dropdown-divider
+        - if @other_active_accounts&.any?
+          h6.dropdown-header Cambiar a:
+          - @other_active_accounts.each do |ua|
+            li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
+          li
+            hr.dropdown-divider
+        li = link_to "Administrar #{Account.model_name.human(count: 2).downcase}", users_accounts_path(tid: nil), class: 'dropdown-item'
+  - elsif @other_active_accounts&.any?
+    li.nav-item.dropdown.d-flex
+      = link_to '#', class: 'nav-link dropdown-toggle py-0 d-flex align-items-center',
+                     role: :button, 'data-bs-toggle': :dropdown, 'aria-expanded': 'false' do
+        i.bi.bi-bag-fill.me-2 style="font-size: 1.7em"
+        = Account.model_name.human(count: 2)
+      ul.dropdown-menu
+        - @other_active_accounts.each do |ua|
+          li = link_to ua.account, tenant_root_path(tid: ua.to_param), class: 'dropdown-item'
+        li
+          hr.dropdown-divider
+        li = link_to "Administrar #{Account.model_name.human(count: 2).downcase}", users_accounts_path(tid: nil), class: 'dropdown-item'
 
-      .vr.bg-white.mx-3
-      - if Current.user.present? && @notifications_bell.present?
-        = render @notifications_bell
-      .vr.bg-white.mx-3
-      li.nav-item.dropdown.me-3
-        = link_to '#', class: 'nav-link dropdown-toggle py-0 d-flex align-items-center',
-                       role: :button, 'data-bs-toggle': :dropdown, 'aria-expanded': 'false' do
-          - if Current.user.avatar.present?
-            = image_tag Current.user.avatar.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
-          - else
-            i.bi.bi-person-circle.me-2 style="font-size: 1.7em"
-          = Current.user
-        ul.dropdown-menu
-          li = link_to 'Perfil', edit_user_registration_path(tid: nil), class: 'dropdown-item'
-          li = link_to Account.model_name.human(count: 2), users_accounts_path(tid: nil), class: 'dropdown-item'
-          - if Current.user.developer?
-            li = link_to 'Admin', admin_users_path, class: 'dropdown-item'
-          li = link_to 'Cerrar sesión', destroy_user_session_path(tid: nil),
-                       'data-turbo-method': :delete, class: 'dropdown-item'
+  .vr.bg-white.mx-3.d-none class="d-#{@breakpoint_navbar_expand}-inline-block"
+  - if Current.user.present? && @notifications_bell.present?
+    .d-none class="d-#{@breakpoint_navbar_expand}-inline-block"
+      = render @notifications_bell
+  .vr.bg-white.mx-3.d-none class="d-#{@breakpoint_navbar_expand}-inline-block"
+  li.nav-item.dropdown.me-3
+    = link_to '#', class: 'nav-link dropdown-toggle py-0 d-flex align-items-center',
+                   role: :button, 'data-bs-toggle': :dropdown, 'aria-expanded': 'false' do
+      - if Current.user.avatar.present?
+        = image_tag Current.user.avatar.variant(:thumb), class: 'rounded-circle border border-2 me-2', width: 40, height: 40
+      - else
+        i.bi.bi-person-circle.me-2 style="font-size: 1.7em"
+      = Current.user
+    ul.dropdown-menu
+      li = link_to 'Mi cuenta', edit_user_registration_path(tid: nil), class: 'dropdown-item'
+      li = link_to Account.model_name.human(count: 2), users_accounts_path(tid: nil), class: 'dropdown-item'
+      - if Current.user.developer?
+        li = link_to 'Admin', admin_users_path, class: 'dropdown-item'
+      li = link_to 'Cerrar sesión', destroy_user_session_path(tid: nil),
+                   'data-turbo-method': :delete, class: 'dropdown-item'

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.6.21.pre.2'
+  VERSION = '7.6.21-4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.21.pre.2
+  version: 7.6.21.pre.4
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
+date: 2024-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -757,6 +757,7 @@ files:
 - pg_engine/app/lib/pg_engine/filtros_builder.rb
 - pg_engine/app/lib/pg_form_builder.rb
 - pg_engine/app/mailers/pg_engine/admin_mailer.rb
+- pg_engine/app/mailers/pg_engine/base_devise_mailer.rb
 - pg_engine/app/mailers/pg_engine/base_mailer.rb
 - pg_engine/app/mailers/pg_engine/user_mailer.rb
 - pg_engine/app/models/account.rb
@@ -1017,13 +1018,15 @@ files:
 - pg_layout/app/views/layouts/pg_layout/container_logo.html.slim
 - pg_layout/app/views/layouts/pg_layout/containerized.html.slim
 - pg_layout/app/views/layouts/pg_layout/devise.html.slim
+- pg_layout/app/views/layouts/pg_layout/devise_mailer.html.slim
+- pg_layout/app/views/layouts/pg_layout/devise_mailer.text.erb
 - pg_layout/app/views/layouts/pg_layout/mailer.html.slim
 - pg_layout/app/views/layouts/pg_layout/mailer.text.erb
 - pg_layout/app/views/layouts/pg_layout/show.html.slim
 - pg_layout/app/views/pg_layout/_flash.html.slim
-- pg_layout/app/views/pg_layout/_navbar.html.erb
-- pg_layout/app/views/pg_layout/_sidebar.html.erb
-- pg_layout/app/views/pg_layout/_sidebar_mobile.html.erb
+- pg_layout/app/views/pg_layout/_navbar.html.slim
+- pg_layout/app/views/pg_layout/_sidebar.html.slim
+- pg_layout/app/views/pg_layout/_sidebar_mobile.html.slim
 - pg_layout/app/views/pg_layout/_signed_in_links.html.slim
 - pg_layout/lib/pg_layout.rb
 - pg_layout/lib/pg_layout/engine.rb

data/pg_layout/app/views/pg_layout/_navbar.html.erb

@@ -1,52 +0,0 @@
-<nav class="navbar navbar-expand-<%= @breakpoint_navbar_expand %>" data-bs-theme="dark">
-  <div class="container-fluid xgap-2">
-    <% unless @sidebar == false %>
-      <button data-controller="navbar" data-action="navbar#expandNavbar"
-              class="btn btn-outline-light me-2 d-none d-<%= @breakpoint_navbar_expand %>-inline-block">
-        <i class="bi <%= @navbar_chevron_class %>"></i>
-      </button>
-    <% end %>
-    <% if @navbar.logo.present? %>
-      <span class="ms-3">
-      <%= render @navbar.logo %>
-      </span>
-    <% end %>
-    <%= render partial: 'pg_layout/signed_in_links' %>
-    <% @navbar.extensiones.each do |extension| %>
-      <%= extension %>
-    <% end %>
-    <% unless @sidebar == false %>
-      <button class="btn btn-outline-light d-inline-block
-                     d-<%= @breakpoint_navbar_expand %>-none"
-              type="button"
-              data-bs-toggle="offcanvas"
-              data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
-        <i class="bi bi-list"></i>
-      </button>
-    <% end %>
-  </div>
-</nav>
-<div class="collapse" id="notifications-collapse" data-controller="notifications">
-  <div id="notifications">
-    <div id="notifications-inner">
-      <% if @notifications&.any? %>
-        <%= render NotificationComponent.with_collection(@notifications) if @notifications&.any? %>
-      <% else %>
-        <span class="text-light text-center">
-          No hay notificaciones
-        </span>
-      <% end %>
-      <div class="text-center">
-        <button type="button" class="btn btn-link text-light btn-sm" data-bs-toggle="collapse" data-bs-target="#notifications-collapse">
-          <i class="bi-chevron-up fs-3"></i>
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<style type="text/css" media="(max-width: 767px)">
-  .navbar .navbar-brand {
-    visibility:visible!important;
-  }
-</style>

data/pg_layout/app/views/pg_layout/_sidebar.html.erb

@@ -1,24 +0,0 @@
-<div id="sidebar" class="<%= @navbar_opened_class %> flex-shrink-0 d-none d-<%= @breakpoint_navbar_expand %>-block">
-  <div class="mt-1">
-    <div class="m-3">
-      <%= render @navbar.logo if @navbar.logo.present? %>
-    </div>
-    <ul class="list-unstyled ps-0 mt-5">
-      <% @navbar.sidebar.each do |entry| %>
-        <% next if @navbar.hide_entry?(entry) %>
-
-        <li class="mb-1">
-          <a
-            href="<%= entry[:path] %>"
-            class="
-              d-inline-flex text-decoration-none pg--nav-button
-              <%= @navbar.active_entry?(entry, request) ? 'active' : '' %>"
-            <%= entry[:attributes] %>
-          >
-            <%= entry[:title] %>
-          </a>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-</div>

data/pg_layout/app/views/pg_layout/_sidebar_mobile.html.erb

@@ -1,35 +0,0 @@
-<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasExample" aria-labelledby="offcanvasExampleLabel">
-  <div class="offcanvas-header" data-bs-theme="dark">
-    <h5 class="offcanvas-title" id="offcanvasExampleLabel"></h5>
-    <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
-  </div>
-  <div class="offcanvas-body text-end">
-    <% if user_signed_in? %>
-      <span class="text-light pe-4 mt-4 d-inline-block"><%= Current.user %></span>
-      <hr>
-    <% end %>
-    <ul class="list-unstyled mt-4">
-      <% @navbar.sidebar.each do |entry| %>
-        <% next if @navbar.hide_entry?(entry) %>
-
-        <li>
-          <a
-            href="<%= entry[:path] %>"
-            class="pg--nav-button pe-4 text-light <%= @navbar.active_entry?(entry, request) ? 'active' : '' %>"
-            <%= entry[:attributes] %>
-          >
-            <%= entry[:title] %>
-          </a>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-</div>
-<style type="text/css">
-  .offcanvas a {
-    text-decoration: none;
-  }
-  .offcanvas li {
-    xmargin-top: 0.75em;
-  }
-</style>