pg_rails 7.0.8.pre.alpha.41 → 7.0.8.pre.alpha.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d403c93bba96aff99b15c51782370786112e7985992d5cb457d5c217cfd8ef8
-  data.tar.gz: 805484f5704ec187fb8eae8e8cf690401e62864c8014498e68dc5ac16aedc6ef
+  metadata.gz: a511a86c3378c0e8a02a7ffb6bae6dd1a42d20e78573fb52920084dca56408c5
+  data.tar.gz: 99cf2d173fc85f09acfa308321a227043996b9a073f236039a9eac611a67e910
 SHA512:
-  metadata.gz: 11cf0c29eb5fcc5be64cfd59a61808eb5378477a14e2c81a70e17fa3c5ec9d3ccbf6332396d046e73b547834668d28f16534be9c57a0e304726b6e6ef7c9fc0a
-  data.tar.gz: 1c0b40e8ac272a1d82894e5feb2084ee8b6be59efa9622f35aaf8c2e3583be9f2e19b3940eb5830dfaa920a7d419b0178d05ee6cee9a61414f6eac1dd79f7377
+  metadata.gz: a7b64b41e69d15acd510a795c9002877d3f50172e10837c6dcb0498ffb79c7a5e9b34e145e46cc1b08b80cbfb8e7d27216334031dfc2dccd657bfea1f972a7fb
+  data.tar.gz: fcbbcf98a4c84399aeebb6727380ebddb41b24c755a113bbe9a61b4b3e0544ec2f8ee8d10e6c668533bf03dd33122b1c5ce60cf90a4a05f54e79a0cae927773f

data/pg_engine/app/admin/users.rb

@@ -30,6 +30,11 @@ ActiveAdmin.register User do
     user.skip_confirmation! if action_name == 'create'
   end
 
+  member_action :confirm, method: :put do
+    resource.update(confirmed_at: Time.zone.now)
+    redirect_to resource_path, notice: 'Confirmed!'
+  end
+
   member_action :discard, method: :put do
     resource.discard!
     redirect_to resource_path, notice: 'Discarded!'
@@ -44,6 +49,10 @@ ActiveAdmin.register User do
     link_to 'Discard', discard_active_admin_user_path(resource), method: :put if resource.kept?
   end
 
+  action_item :view, only: :show do
+    link_to 'Confirm', confirm_active_admin_user_path(resource), method: :put if resource.kept?
+  end
+
   action_item :view, only: :show do
     link_to 'Restore', restore_active_admin_user_path(resource), method: :put if resource.discarded?
   end

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -56,7 +56,7 @@ module PgEngine
 
     before_action do
       @breakpoint_navbar_expand = 'md'
-      @navbar_opened_class = if cookies[:navbar_expand] == 'false' || !user_signed_in?
+      @navbar_opened_class = if cookies[:navbar_expand] == 'false'
                                ''
                              else
                                'opened'

data/pg_engine/app/lib/pg_engine/filtros_builder.rb

@@ -322,7 +322,7 @@ module PgEngine
     def filtro_fecha(campo, placeholder = '')
       content_tag :div, class: 'col-auto' do
         content_tag :div, class: 'filter' do
-          label_tag(nil, placeholder, class: 'text-muted') + \
+          label_tag(nil, placeholder, class: 'text-body-secondary') + \
             date_field_tag(
               campo, parametros_controller[campo], class: 'form-control form-control-sm d-inline-block w-auto ms-1', placeholder:, autocomplete: 'off'
             )

data/pg_engine/config/locales/es.yml

@@ -54,6 +54,10 @@ es:
     sign_in: ¿Ya tenés una cuenta? Iniciar sesión
     sign_out: Cerrar sesión
     sign_up: Crear una cuenta
+    sessions:
+      signed_in: ''
+      signed_out: ''
+      already_signed_out: ''
     registrations:
       new:
         sign_up: Crear una cuenta

data/pg_layout/app/assets/stylesheets/sidebar.scss

@@ -2,10 +2,6 @@ html, body {
   height: 100%;
 }
 
-.navbar {
-  --#{$prefix}navbar-toggler-border-color: #{$primary};
-}
-
 /* Style & Colors */
 $text-color: $gray-300;
 $text-hover-color: $gray-100;
@@ -95,7 +91,7 @@ $chevron-color: 200,200,200,.5;
 
   &.opened {
     // display: block!important;
-    flex-basis: 9em;
+    flex-basis: 10em;
   }
   & > * {
     width: 9em;
@@ -119,3 +115,23 @@ $chevron-color: 200,200,200,.5;
 .btn-toggle[aria-expanded="true"]::before {
   transform: rotate(90deg);
 }
+
+// FLASH
+#flash-wrapper {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+}
+
+@include media-breakpoint-up(md) {
+  #flash-wrapper {
+    top: 0;
+  }
+}
+
+@include media-breakpoint-down(md) {
+  #flash-wrapper {
+    bottom: 0;
+  }
+}

data/pg_layout/app/lib/navbar.rb

@@ -2,6 +2,7 @@ class Navbar
   include Rails.application.routes.url_helpers
 
   attr_reader :extensiones
+  attr_accessor :logo
 
   def initialize(user)
     @user = user
@@ -19,6 +20,12 @@ class Navbar
     @yaml_data[key] << ActiveSupport::HashWithIndifferentAccess.new(obj)
   end
 
+  def sidebar
+    ret = bar(@user.present? ? 'sidebar.signed_in' : 'sidebar.not_signed_in')
+    ret.push(*bar('sidebar.developer')) if @user.present? && @user.developer?
+    ret
+  end
+
   def bar(key)
     bar_data = @yaml_data[key]
     return [] if bar_data.blank?
@@ -27,6 +34,7 @@ class Navbar
     bar_data.map do |item|
       {
         title: item['name'],
+        attributes: item['attributes']&.html_safe, # rubocop:disable Rails/OutputSafety
         path: eval(item['path']),
         show: item['policy'] ? eval(item['policy']) : true
       }

data/pg_layout/app/views/devise/registrations/edit.html.erb

@@ -30,12 +30,6 @@
   </div>
 <% end %>
 
-<h3><%= t(".cancel_my_account") %></h3>
-
-<div><%= t(".unhappy") %> <%= button_to t(".cancel_my_account"), registration_path(resource_name), data: { confirm: t(".are_you_sure"), turbo_confirm: t(".are_you_sure") }, method: :delete %></div>
-
-<%= link_to t("devise.shared.links.back"), :back %>
-
 <style type="text/css" media="screen">
   form {
     max-width: 22em;

data/pg_layout/app/views/devise/shared/_links.html.erb

@@ -11,7 +11,7 @@
     <%= link_to t(".forgot_your_password"), new_password_path(resource_name) %>
   <% end %>
 
-  <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%- if false # devise_mapping.confirmable? && controller_name != 'confirmations' %>
     <%= link_to t('.didn_t_receive_confirmation_instructions'), new_confirmation_path(resource_name) %>
   <% end %>
 

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

@@ -22,15 +22,15 @@ html
       meta name="rollbar-token" content="#{@rollbar_token}"
       meta name="rollbar-env" content="#{Rails.env}"
   body
+    #flash-wrapper.d-flex.justify-content-around
+      #flash.flash.z-1
+        = render partial: 'pg_layout/flash'
     = render partial: 'pg_layout/sidebar_mobile'
 
     div class="#{ @sidebar == false ? '' : 'with-sidebar' }"
       - unless @sidebar == false
         = render partial: 'pg_layout/sidebar'
       div
-        .position-relative.d-flex.justify-content-around
-          #flash.flash.position-absolute.z-1.mt-1
-            = render partial: 'pg_layout/flash'
         = render partial: 'pg_layout/navbar'
         div
           - if user_signed_in? && breadcrumbs.any?

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

@@ -1,5 +1,5 @@
 - content_for :content do
-  .container.text-center
+  .container.text-center.pt-4
     = yield
 
   css:

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

@@ -1,67 +1,14 @@
-<nav class="navbar navbar-expand-<%= @breakpoint_navbar_expand %> bg-light">
+<nav class="navbar navbar-expand-<%= @breakpoint_navbar_expand %>">
   <div class="container-fluid">
     <% unless @sidebar == false %>
-      <button data-controller="navbar" data-action="navbar#expandNavbar" class="btn btn-outline-primary me-2 d-none d-<%= @breakpoint_navbar_expand %>-inline-block">
+      <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 bi-list"></i>
       </button>
 
-      <button class="btn btn-outline-primary d-inline-block d-<%= @breakpoint_navbar_expand %>-none" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasExample" aria-controls="offcanvasExample">
+      <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 %>
-    <!-- <a class="navbar-brand" href="#">Navbar</a> -->
-    <%# <button class="navbar-toggler btn btn-outline-primary me-2" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-      <i class="bi bi-list"></i>
-      <!-- <span class="navbar-toggler-icon"></span> -->
-    </button> %>
-    <div class="collapse navbar-collapse" id="navbarSupportedContent">
-      <ul class="navbar-nav mb-2 mb-lg-0">
-        <% @navbar.bar('topbar.before').each do |entry| %>
-          <li class="nav-item">
-            <a class="nav-link" href="<%= entry[:path] %>">
-              <%= entry[:title] %>
-            </a>
-          </li>
-        <% end %>
-        <% if user_signed_in? %>
-          <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-              <%= Current.user %>
-            </a>
-            <ul class="dropdown-menu">
-              <% if policy(Current.user).edit? %>
-                <li>
-                  <%= link_to "Mi perfil", edit_user_registration_path, class: 'dropdown-item' %>
-                </li>
-              <% end %>
-              <% @navbar.bar('topbar.dropdown_user').each do |entry| %>
-                <% next if @navbar.hide_entry?(entry) %>
-                <li>
-                  <a class="dropdown-item" href="<%= entry[:path] %>">
-                    <%= entry[:title] %>
-                  </a>
-                </li>
-              <% end %>
-
-              <li>
-                <%= link_to t("devise.sign_out"), destroy_user_session_path, data: { 'turbo-method': 'delete' }, class: 'dropdown-item' %>
-              </li>
-            </ul>
-          </li>
-        <% end %>
-      </ul>
-      <% unless user_signed_in? %>
-        <%= link_to t("devise.sign_up"), new_user_registration_path, class: 'btn btn-success' %>
-        <ul class="navbar-nav mb-2 mb-lg-0">
-          <li class="nav-item">
-            <%= link_to t("devise.sign_in"), new_user_session_path, class: 'nav-link' %>
-          </li>
-        </ul>
-      <% end %>
-      <% @navbar.extensiones.each do |extension| %>
-        <%= extension %>
-      <% end %>
-    </div>
+    <%= @navbar.logo if @navbar.logo.present? %>
   </div>
 </nav>

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

@@ -1,42 +1,25 @@
-<div id="sidebar" class="<%= @navbar_opened_class %> flex-shrink-0 bg-gradient d-none d-<%= @breakpoint_navbar_expand %>-block">
-  <% if user_signed_in? %>
-    <div class="sidebar--large-items">
+<div id="sidebar" class="<%= @navbar_opened_class %> flex-shrink-0 d-none d-<%= @breakpoint_navbar_expand %>-block">
+  <div class="mt-4">
+    <% if user_signed_in? %>
+      <span class="ms-3 text-light"><%= Current.user %></span>
       <hr>
-      <%# <div class="sidebar--small-items">
-        <ul class="list-unstyled ps-0">
-          <li class="mb-1 text-center">
-            <a href="javascript:void(0)" class="nav-link" data-bs-toggle="tooltip" data-bs-title="Agenda">
-              <i class="bi bi-calendar"></i>
-            </a>
-          </li>
-        </ul>
-      </div> %>
-      <div class="sidebar--large-items">
-        <ul class="list-unstyled ps-0">
-          <% @navbar.bar('sidebar').each do |entry| %>
-            <% next if @navbar.hide_entry?(entry) %>
-            <% random_id = rand(99999).to_s %>
-            <li class="mb-1">
-              <% if entry[:children].present? %>
-                <button class="btn btn-toggle d-inline-flex align-items-center rounded border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#<%= 'collapse-' + random_id %>" aria-expanded="true">
-                  <%= entry[:title] %>
-                </button>
-                <div class="collapse <%= @navbar.any_children_active?(entry, request) ? 'show' : '' %>" id="<%= 'collapse-' + random_id %>">
-                  <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
-                    <% entry[:children].each do |child| %>
-                      <% next if @navbar.hide_entry?(child) %>
-                      <li><a href="<%= child[:path] %>" class="<%= @navbar.active_entry?(child, request) ? 'active' : '' %> d-inline-flex text-decoration-none rounded"><%= child[:title] %></a></li>
-                    <% end %>
-                  </ul>
-                </div>
-              <% else %>
-                <a href="<%= entry[:path] %>" class="<%= @navbar.active_entry?(entry, request) ? 'active' : '' %> d-inline-flex text-decoration-none ms-4"><%= entry[:title] %></a>
-              <% end %>
-            </li>
-          <% end %>
-        </ul>
-        <hr>
-      </div>
-    </div>
-  <% end %>
+    <% end %>
+    <ul class="list-unstyled ps-0">
+      <% @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 ms-3
+              <%= @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

@@ -4,94 +4,35 @@
     <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
   </div>
   <div class="offcanvas-body">
-    <ul class="navbar-nav mb-2 mb-lg-0">
-      <% @navbar.bar('topbar.before').each do |entry| %>
-        <li class="nav-item">
-          <a class="nav-link" href="<%= entry[:path] %>">
+    <% if user_signed_in? %>
+      <span class="text-body-secondary"><%= 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="<%= @navbar.active_entry?(entry, request) ? 'active' : '' %>"
+            <%= entry[:attributes] %>
+          >
             <%= entry[:title] %>
           </a>
         </li>
       <% end %>
-      <% if user_signed_in? %>
-        <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-            <%= Current.user %>
-          </a>
-          <ul class="dropdown-menu">
-            <% if policy(Current.user).edit? %>
-              <li>
-                <%= link_to "Mi perfil", edit_user_registration_path, class: 'dropdown-item' %>
-              </li>
-            <% end %>
-            <% @navbar.bar('topbar.dropdown_user').each do |entry| %>
-              <% next if @navbar.hide_entry?(entry) %>
-              <li>
-                <a class="dropdown-item" href="<%= entry[:path] %>">
-                  <%= entry[:title] %>
-                </a>
-              </li>
-            <% end %>
-
-            <li>
-              <%= link_to t("devise.sign_out"), destroy_user_session_path, data: { 'turbo-method': 'delete' }, class: 'dropdown-item' %>
-            </li>
-          </ul>
-        </li>
+      <% @navbar.extensiones.each do |extension| %>
+        <%= extension %>
       <% end %>
     </ul>
-    <% unless user_signed_in? %>
-      <%= link_to t("devise.sign_up"), new_user_registration_path, class: 'btn btn-success' %>
-      <ul class="navbar-nav mb-2 mb-lg-0">
-        <li class="nav-item">
-          <%= link_to t("devise.sign_in"), new_user_session_path, class: 'nav-link' %>
-        </li>
-      </ul>
-    <% end %>
-    <% @navbar.extensiones.each do |extension| %>
-      <%= extension %>
-    <% end %>
-
-
-    <% if user_signed_in? %>
-      <div class="sidebar--large-items">
-        <hr>
-        <%# <div class="sidebar--small-items">
-          <ul class="list-unstyled ps-0">
-            <li class="mb-1 text-center">
-              <a href="javascript:void(0)" class="nav-link" data-bs-toggle="tooltip" data-bs-title="Agenda">
-                <i class="bi bi-calendar"></i>
-              </a>
-            </li>
-          </ul>
-        </div> %>
-        <div class="sidebar--large-items">
-          <ul class="list-unstyled ps-0">
-            <% @navbar.bar('sidebar').each do |entry| %>
-              <% next if @navbar.hide_entry?(entry) %>
-              <% random_id = rand(99999).to_s %>
-              <li class="mb-1">
-                <% if entry[:children].present? %>
-                  <button class="btn btn-toggle d-inline-flex align-items-center rounded border-0 collapsed" data-bs-toggle="collapse" data-bs-target="#<%= 'collapse-' + random_id %>" aria-expanded="true">
-                    <%= entry[:title] %>
-                  </button>
-                  <div class="collapse <%= @navbar.any_children_active?(entry, request) ? 'show' : '' %>" id="<%= 'collapse-' + random_id %>">
-                    <ul class="btn-toggle-nav list-unstyled fw-normal pb-1 small">
-                      <% entry[:children].each do |child| %>
-                        <% next if @navbar.hide_entry?(child) %>
-                        <li><a href="<%= child[:path] %>" class="<%= @navbar.active_entry?(child, request) ? 'active' : '' %> d-inline-flex text-decoration-none rounded"><%= child[:title] %></a></li>
-                      <% end %>
-                    </ul>
-                  </div>
-                <% else %>
-                  <a href="<%= entry[:path] %>" class="<%= @navbar.active_entry?(entry, request) ? 'active' : '' %> d-inline-flex text-decoration-none ms-4"><%= entry[:title] %></a>
-                <% end %>
-              </li>
-            <% end %>
-          </ul>
-          <hr>
-        </div>
-      </div>
-    <% end %>
-
   </div>
 </div>
+<style type="text/css">
+  .offcanvas a {
+    text-decoration: none;
+  }
+  .offcanvas li {
+    margin-top: 0.75em;
+  }
+</style>

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.0.8-alpha.41'
+  VERSION = '7.0.8-alpha.43'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.41
+  version: 7.0.8.pre.alpha.43
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails