pg_rails 7.0.8.pre.alpha.34 → 7.0.8.pre.alpha.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c2e13f12a7fb0f1530859b0c5d3dbd9ce1c58c77e7ee9a7394d2b20a23f32e
-  data.tar.gz: 82241162ef062ce35d088541a07f96f805bbeb44b00609a0293fb109d013854b
+  metadata.gz: 93eefb2a65a83f488ee2d3cc62e955844b5eb497aa3425714ca9ff1ad0e63f2f
+  data.tar.gz: ec802a0a627d82d7f6abe4afed70bb08a764a93c29941657d3a8e9056a635ad1
 SHA512:
-  metadata.gz: ffdc024ebc7186a8e89796edc5c30b6532a4234633a1cc0904985b149676cb0fef63979f65c048e1c263b552757fec8ecd81690c228ae856a6f0f1ef957a5970
-  data.tar.gz: 4c6b1eb208310e6948ec6894dea6c4b8a5456c359e2d554f761e6ebf92ebbb5cfcff2855e5e6550e20cec23b19d83249ed113ec3278e1facefad34b80271c233
+  metadata.gz: b5dc96061a84f93538f5357b4d4638580101c65b338310f619e26436d096788bef33d923549872148da73d1fe05b560cbb8f3eede283576a3bc160380b1f0bb6
+  data.tar.gz: 437c2837c6595cf6df6d2e9fb05b446bc1e65c22743a89dae9f5fb4b7eb9ac2be71f4892854ab5a7d29f69fdfdcc943ec79683cdfb3261f1d8e49d2cf4f4244e

data/pg_engine/config/locales/es.yml

@@ -8,6 +8,7 @@ es:
     created_at: Fecha de creación
     updated_at: Fecha de actualización
     discarded_at: Fecha de borrado
+    confirmed_at: Fecha de confirmación
     actualizado_por: Actualizado por
     creado_por: Creado por
   form:

data/pg_layout/app/javascript/channels/consumer.js

@@ -3,7 +3,6 @@
 
 import { createConsumer } from '@anycable/web'
 
-
 let cableProtocol = document.head.querySelector('meta[name=actioncable-protocol]')
 cableProtocol = cableProtocol && cableProtocol.content
 cableProtocol = cableProtocol || 'actioncable-v1-ext-json'

data/pg_layout/app/views/devise/confirmations/new.html.erb

@@ -1,7 +1,7 @@
 <h2><%= t(".resend_confirmation_instructions") %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-  <%= f.error_notification %>
+  <%= f.mensajes_de_error %>
   <%= f.full_error :confirmation_token %>
 
   <div class="form-inputs">

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

@@ -1,7 +1,7 @@
 <h2><%= t(".change_your_password") %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= f.error_notification %>
+  <%= f.mensajes_de_error %>
 
   <%= f.input :reset_password_token, as: :hidden %>
   <%= f.full_error :reset_password_token %>

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

@@ -1,7 +1,7 @@
 <h2><%= t(".forgot_your_password") %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= f.error_notification %>
+  <%= f.mensajes_de_error %>
 
   <div class="form-inputs">
     <%= f.input :email,

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

@@ -1,7 +1,7 @@
 <h2><%= t(".title", resource: devise_i18n_fix_model_name_case(resource.model_name.human, i18n_key: "registrations.edit.title")) %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= f.error_notification %>
+  <%= f.mensajes_de_error %>
 
   <div class="form-inputs">
     <%= f.input :email, required: true, autofocus: true %>

data/pg_layout/app/views/devise/unlocks/new.html.erb

@@ -1,7 +1,7 @@
 <h2><%= t(".resend_unlock_instructions") %></h2>
 
 <%= pg_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
-  <%= f.error_notification %>
+  <%= f.mensajes_de_error %>
   <%= f.full_error :unlock_token %>
 
   <div class="form-inputs">

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

@@ -16,11 +16,14 @@ html
 
     = stylesheet_link_tag 'application', 'data-turbo-track': 'reload'
     = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'
-    meta name="actioncable-protocol" content="#{Rails.env.test? ? 'actioncable-v1-json' : 'actioncable-v1-ext-json'}"
+    meta(name="actioncable-protocol"
+         content="#{Rails.env.test? ? 'actioncable-v1-json' : 'actioncable-v1-ext-json'}")
     - if @rollbar_token.present?
       meta name="rollbar-token" content="#{@rollbar_token}"
       meta name="rollbar-env" content="#{Rails.env}"
   body
+    = render partial: 'pg_layout/sidebar_mobile'
+
     div class="#{ @sidebar == false ? '' : 'with-sidebar' }"
       - unless @sidebar == false
         = render partial: 'pg_layout/sidebar'

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

@@ -4,12 +4,17 @@
       <button data-controller="navbar" data-action="navbar#expandNavbar" class="btn btn-outline-primary 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">
+        <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">
+    <%# <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>
+    </button> %>
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav mb-2 mb-lg-0">
         <% @navbar.bar('topbar.before').each do |entry| %>
@@ -44,16 +49,6 @@
               </li>
             </ul>
           </li>
-          <%# Los item de sidebar en mobile %>
-          <% @navbar.bar('sidebar').each do |entry| %>
-            <% next if @navbar.hide_entry?(entry) %>
-            <% random_id = rand(99999).to_s %>
-            <li class="nav-item d-md-none">
-              <a class="nav-link" href="<%= entry[:path] %>" role="button">
-                <%= entry[:title] %>
-              </a>
-            </li>
-          <% end %>
         <% end %>
       </ul>
       <% unless user_signed_in? %>

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

@@ -0,0 +1,97 @@
+<div class="offcanvas offcanvas-start" tabindex="-1" id="offcanvasExample" aria-labelledby="offcanvasExampleLabel">
+  <div class="offcanvas-header">
+    <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">
+    <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 %>
+
+
+    <% 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>

data/pg_rails/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.34
+  version: 7.0.8.pre.alpha.35
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -570,6 +570,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.1
+- !ruby/object:Gem::Dependency
+  name: stimulus-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: bullet
   requirement: !ruby/object:Gem::Requirement
@@ -985,6 +999,7 @@ files:
 - pg_layout/app/views/pg_layout/_flash_alert.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/lib/pg_layout.rb
 - pg_layout/lib/pg_layout/engine.rb
 - pg_layout/spec/lib/navbar_spec.rb