pg_rails 7.6.24.pre.5 → 7.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24f6df5092e05945c72bd89a19aee27ab6bf20c5d6ea3920a5116a15c61b431e
-  data.tar.gz: 6b3761e5a283aa143f816d1008c1408baa8cab50bf164b4924c6ec60285b9ebb
+  metadata.gz: 18003c61fd4e38fc6e7a70402aa0eaba4f335390e50061b1569bbea56c604a83
+  data.tar.gz: f2732b2e071e3672cc8e4b6d16e2e577f7b6bf3590a8a6c3d76ef45215bdb67f
 SHA512:
-  metadata.gz: c82bfc1e6138d70770cb161ffdaf06732bc90e23aa5d0d9181b736abd600d425af0a3d5979a22fbe7e7dc9d7aa8ac660c009c523e327489527d2594512ec9535
-  data.tar.gz: d827ee4b37c451ac8d0c0f4a28374ce1b6d0c0bbd2fab2b5ef36d919a49897e88b5be3772b1440146302edad2edb0f8fb4b24da28dda80bddbcf016c53a78990
+  metadata.gz: 9953c023fe35b70091a3ddc70b4a49f8cc7975476388835f1a0c7b286132afa68c4f5eaf35b6b1e80345fb2ff20251c35b9e238293b43cb217e445e226080598
+  data.tar.gz: 39911c247bdd17a3828a378478d03bb4027326b9c9b72d9ad5c0db1dc1b0e4d491dc6b2e37d899a02043a3446818feb304969c4a828b91dc3f7bf9a0adcf89c6

data/pg_engine/app/assets/stylesheets/nav_toolbar.scss

@@ -0,0 +1,10 @@
+// Buttons border in nav toolbar
+$warning-border-emphasis:   shade-color($yellow, 60%);
+.btn-toolbar .btn-warning {
+  border: 1px solid $warning-border-emphasis;
+}
+
+$light-border-emphasis:   shade-color($light, 60%);
+.btn-toolbar .btn-light {
+  border: 1px solid $light-border-emphasis;
+}

data/pg_engine/app/assets/stylesheets/{pg_rails_b5.scss → pg_engine.scss}

@@ -1,8 +1,5 @@
 @use 'sass:color';
 
-@import 'notifications';
-
-
 :root,
 [data-bs-theme=light] {
   --bs-form-invalid-color: #b50000;
@@ -19,6 +16,12 @@ nav[aria-label=breadcrumb] a {
   display: inline-block;
 }
 
+// Signup
+
+#form-signup .form-inputs abbr {
+  display: none;
+}
+
 // FORMS
 
 // Radio buttons

data/pg_engine/app/assets/stylesheets/tables.scss

@@ -0,0 +1,29 @@
+// Column truncate
+$values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
+
+@for $i from 1 through length($values) {
+  $value: nth($values, $i);
+  $perc: #{percenage($value)};
+
+  .column-truncate-#{$value} {
+    max-width: 0;
+    width: percentage($value * 0.01);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    min-width: 30em * $value * 0.01;
+
+    // TODO: con css grid esto se debería poder hacer mejor
+    // además, el pg_asociable directamente se rompe
+    &:has(form) {
+      min-width: 28em;
+      overflow: initial;
+    }
+  }
+}
+
+// Table row clickable
+// .listado tr:has(td:hover):has(.bi-eye-fill) td {
+// 	background-color: #f2f2f2;
+// 	cursor: pointer;
+// }

data/pg_engine/app/assets/stylesheets/tom_select.scss

@@ -0,0 +1,16 @@
+// Tom Select
+.ts-control {
+  padding-top: 2px!important;
+  padding-bottom: 2px!important;
+  display: flex;
+  gap: 4px;
+}
+.input-group-sm > .ts-wrapper.multi.has-items .ts-control, .ts-wrapper.form-select-sm.multi.has-items .ts-control, .ts-wrapper.form-control-sm.multi.has-items .ts-control {
+	padding-top: 2px!important;
+}
+.ts-wrapper.multi .ts-control > div {
+	margin: 0!important;
+}
+.ts-control:not(.rtl) {
+	padding-right: 0.75rem !important;
+}

data/pg_engine/app/components/flash_container_component.rb

@@ -1,6 +1,8 @@
 class FlashContainerComponent < ViewComponent::Base
+  # z-1 es para que no se superponga con el dropdown de la navbar,
+  # ya que sticky-top setea un z-index de 1020 y el del dropdown es de 1000
   erb_template <<~HTML
-    <div id="flash-container" class="d-flex justify-content-around sticky-top">
+    <div id="flash-container" class="d-flex justify-content-around sticky-top z-1">
       <div id="flash" class="flash position-relative w-100 d-flex justify-content-center">
         <%= content || render(partial: 'pg_layout/flash') %>
       </div>

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

@@ -6,6 +6,7 @@ module Users
       yield resource if block_given?
 
       if resource.errors.empty?
+        sign_in(resource)
         set_flash_message!(:notice, :confirmed)
         respond_with_navigational(resource) { redirect_to after_confirmation_path_for(resource_name, resource) }
       else

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

@@ -4,6 +4,13 @@ module Users
       authorize resource, nil, policy_class: UserRegistrationPolicy
     end
 
+    # GET /resource/sign_up
+    def new
+      build_resource(accept_terms: true)
+      yield resource if block_given?
+      respond_with resource
+    end
+
     def create
       build_resource(sign_up_params)
 

data/pg_engine/app/lib/pg_form_builder.rb

@@ -23,6 +23,12 @@ class PgFormBuilder < SimpleForm::FormBuilder
   def input(attribute_name, options = {}, &)
     options[:error_prefix] ||= default_prefix(attribute_name)
 
+    # Bootstraps's floating labels require an empty placeholder attribute
+    merged_wrapper = self.options[:wrapper].to_s + options[:wrapper].to_s
+    if merged_wrapper.include?('floating')
+      options[:placeholder] = ''
+    end
+
     super
   end
 

data/pg_engine/app/models/user.rb

@@ -66,7 +66,7 @@ class User < ApplicationRecord
 
   has_many :notifications, as: :recipient, class_name: 'Noticed::Notification'
 
-  validates :nombre, :apellido, presence: true
+  # validates :nombre, :apellido, presence: true
 
   has_one_attached :avatar do |attachable|
     attachable.variant :thumb, resize_to_fill: [80, 80]

data/pg_engine/config/locales/es.yml

@@ -43,7 +43,7 @@ es:
     confirmed_at: Fecha de confirmación
     actualizado_por: Actualizado por
     creado_por: Creado por
-    accept_terms: Acepto los <a href="/terminos_y_condiciones" target="_blank">Términos y condiciones</a> y la <a href="/privacidad" target="_blank">Política de privacidad</a>
+    accept_terms: Acepto los <a href="/terminos_y_condiciones" target="_blank">términos y condiciones</a>
   enumerize:
     user_account:
       membership_status:
@@ -117,7 +117,7 @@ es:
         header: "Aceptar invitación"
         submit_button: "Aceptar"
     confirmations:
-      confirmed: ¡Tu cuenta está confirmada! Ya podés iniciar sesión
+      confirmed: ¡Bien! Ahora tu cuenta está confirmada
     sessions:
       signed_in: ''
       signed_out: ''
@@ -128,7 +128,7 @@ es:
       unauthenticated: ''
       invited: "Tenés una invitación pendiente en tu correo electrónico"
     registrations:
-      signed_up_but_unconfirmed: Te enviamos un correo electrónico con instrucciones para confirmar tu cuenta.
+      signed_up_but_unconfirmed: Por favor, revisá en tu bandeja de entrada las instrucciones para confirmar tu cuenta.
       new:
         sign_up: Crear una cuenta
     passwords:

data/pg_engine/config/routes.rb

@@ -35,6 +35,9 @@ Rails.application.routes.draw do
     root to: 'accounts#index'
   end
 
+  # User root for devise's signed_in_root_path
+  get '/u', to: 'accounts#index', as: :user_root
+
   namespace :tenant, path: 'u/t(/:tid)' do
     pg_resource(:user_accounts, only: [:index, :show, :edit, :update, :destroy])
     scope controller: 'inline_edit', path: 'inline', as: :inline do

data/pg_engine/spec/system/signup_spec.rb

@@ -18,10 +18,7 @@ describe 'Al Registrarse' do
       perform_enqueued_jobs do
         visit '/users/sign_up'
         fill_in 'user_email', with: Faker::Internet.email
-        fill_in 'user_nombre', with: Faker::Name.name
-        fill_in 'user_apellido', with: Faker::Name.name
         fill_in 'user_password', with: 'admin123'
-        fill_in 'user_password_confirmation', with: 'admin123'
 
         accept_terms
 
@@ -31,7 +28,7 @@ describe 'Al Registrarse' do
 
     context 'cuando acepta los términos' do
       let(:accept_terms) do
-        check 'user_accept_terms'
+        nil
       end
 
       it 'guarda el user' do
@@ -39,13 +36,13 @@ describe 'Al Registrarse' do
         ActsAsTenant.without_tenant do
           expect(Account.last.owner).to eq User.last
         end
-        expect(page).to have_text('Te enviamos un correo electrónico con instrucciones')
+        expect(page).to have_text('las instrucciones para confirmar')
       end
     end
 
     context 'si no acepta los terms' do
       let(:accept_terms) do
-        nil
+        uncheck 'user_accept_terms'
       end
 
       it do
@@ -77,12 +74,6 @@ describe 'Al Registrarse' do
     end
   end
 
-  # drivers = %i[
-  #   selenium_headless
-  #   selenium_chrome_headless
-  #   selenium_chrome_headless_notebook
-  #   selenium_chrome_headless_iphone
-  # ]
   drivers = %i[selenium_chrome_headless_iphone]
   drivers = [ENV['DRIVER'].to_sym] if ENV['DRIVER'].present?
 

data/pg_layout/app/views/devise/registrations/_signup_info.html.slim

@@ -0,0 +1 @@
+p Creá tu cuenta!

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

@@ -1,27 +1,29 @@
-<h2><%= t(".sign_up") %></h2>
-<div id="form-signup" data-controller="pg_form">
-  <%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-    <div class="form-inputs">
-      <%= f.input :nombre, required: true, autofocus: true %>
-      <%= f.input :apellido, required: true %>
-      <%= f.input :email,
-                  required: true,
-                  input_html: { autocomplete: "email" }%>
-      <%= f.input :password,
-                  required: true,
-                  hint: (t('devise.shared.minimum_password_length', count: @minimum_password_length) if @minimum_password_length),
-                  input_html: { autocomplete: "new-password" } %>
-      <%= f.input :password_confirmation,
-                  required: true,
-                  input_html: { autocomplete: "new-password" } %>
-      <%= f.input :accept_terms, as: :boolean, label: t('attributes.accept_terms').html_safe, error_prefix: '' %>
+<div class="container mt-5"  style="max-width: 80em">
+  <div class="row flex-wrap-reverse">
+    <div class="col-sm">
+      <%= render partial: 'signup_info' %>
     </div>
+    <div class="col-sm">
+      <div class="position-sticky z-1" style="top: 0.5em">
+        <h1 class="mb-4">Creá tu cuenta</h1>
+        <%# #form-signup se reemplaza por el mensaje de revisar la bandeja de entrada %>
+        <div class="text-center" id="form-signup" data-controller="pg_form">
+          <%= pg_form_for(resource, as: resource_name, url: registration_path(resource_name), wrapper: :floating_labels_form) do |f| %>
+            <div class="form-inputs m-auto d-inline-block" style="max-width: 20em">
+              <%= f.input :email, label: 'Tu email', input_html: { class: 'form-control-lg', autocomplete: "email" }%>
+              <%= f.input :password, label: 'Elegí una contraseña',
+                          input_html: { class: 'form-control-lg', autocomplete: "new-password" } %>
+              <%= f.input :accept_terms, as: :boolean, label: t('attributes.accept_terms').html_safe, error_prefix: '', wrapper_html: { class: 'justify-content-center' } %>
+            </div>
 
-    <div class="form-actions">
-      <%= f.button :submit, t(".sign_up") %>
-    </div>
-  <% end %>
+            <div class="form-actions">
+              <%= f.button :submit, 'Registrarme' %>
+            </div>
+          <% end %>
 
-  <%= render "devise/shared/links" %>
+          <%= render "devise/shared/links" %>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
-

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.6.24-5'
+  VERSION = '7.6.25'
 end

data/pg_rails/scss/pg_rails.scss

@@ -4,71 +4,20 @@ $font-size-base: 0.9rem;
 @import 'bootstrap_pre';
 @import 'bootstrap_overrides';
 @import 'bootstrap_post';
-@import 'border_radius';
-
-@import './../../pg_engine/app/assets/stylesheets/pg_rails_b5';
-@import './../../pg_associable/app/assets/stylesheets/pg_associable';
-@import './../../pg_layout/app/assets/stylesheets/sidebar';
-@import './../../pg_layout/app/assets/stylesheets/animations';
 
 @import 'bootstrap-icons/font/bootstrap-icons';
 
 @import 'trix/dist/trix';
 @import 'tom-select/dist/scss/tom-select.bootstrap5';
 
-// Tom Select
-.ts-control {
-  padding-top: 2px!important;
-  padding-bottom: 2px!important;
-  display: flex;
-  gap: 4px;
-}
-.input-group-sm > .ts-wrapper.multi.has-items .ts-control, .ts-wrapper.form-select-sm.multi.has-items .ts-control, .ts-wrapper.form-control-sm.multi.has-items .ts-control {
-	padding-top: 2px!important;
-}
-.ts-wrapper.multi .ts-control > div {
-	margin: 0!important;
-}
-.ts-control:not(.rtl) {
-	padding-right: 0.75rem !important;
-}
-
-// Column truncate
-$values: 0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100;
-
-@for $i from 1 through length($values) {
-  $value: nth($values, $i);
-  $perc: #{percenage($value)};
-
-  .column-truncate-#{$value} {
-    max-width: 0;
-    width: percentage($value * 0.01);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    min-width: 30em * $value * 0.01;
-
-    // TODO: con css grid esto se debería poder hacer mejor
-    // además, el pg_asociable directamente se rompe
-    &:has(form) {
-      min-width: 28em;
-      overflow: initial;
-    }
-  }
-}
-
-// Buttons border in nav toolbar
-$warning-border-emphasis:   shade-color($yellow, 60%);
-.btn-toolbar .btn-warning {
-  border: 1px solid $warning-border-emphasis;
-}
+@import './../../pg_associable/app/assets/stylesheets/pg_associable';
 
-$light-border-emphasis:   shade-color($light, 60%);
-.btn-toolbar .btn-light {
-  border: 1px solid $light-border-emphasis;
-}
+@import './../../pg_layout/app/assets/stylesheets/sidebar';
+@import './../../pg_layout/app/assets/stylesheets/animations';
 
-// .listado tr:has(td:hover):has(.bi-eye-fill) td {
-// 	background-color: #f2f2f2;
-// 	cursor: pointer;
-// }
+@import './../../pg_engine/app/assets/stylesheets/pg_engine';
+@import './../../pg_engine/app/assets/stylesheets/notifications';
+@import './../../pg_engine/app/assets/stylesheets/border_radius';
+@import './../../pg_engine/app/assets/stylesheets/tom_select';
+@import './../../pg_engine/app/assets/stylesheets/tables';
+@import './../../pg_engine/app/assets/stylesheets/nav_toolbar';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.24.pre.5
+  version: 7.6.25
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -685,8 +685,12 @@ files:
 - pg_engine/app/assets/javascripts/active_admin.js
 - pg_engine/app/assets/stylesheets/actiontext.css
 - pg_engine/app/assets/stylesheets/active_admin.scss
+- pg_engine/app/assets/stylesheets/border_radius.scss
+- pg_engine/app/assets/stylesheets/nav_toolbar.scss
 - pg_engine/app/assets/stylesheets/notifications.scss
-- pg_engine/app/assets/stylesheets/pg_rails_b5.scss
+- pg_engine/app/assets/stylesheets/pg_engine.scss
+- pg_engine/app/assets/stylesheets/tables.scss
+- pg_engine/app/assets/stylesheets/tom_select.scss
 - pg_engine/app/components/alert_component.html.slim
 - pg_engine/app/components/alert_component.rb
 - pg_engine/app/components/asociable_modal_component.html.slim
@@ -1016,6 +1020,7 @@ files:
 - pg_layout/app/views/devise/mailer/unlock_instructions.html.erb
 - pg_layout/app/views/devise/passwords/edit.html.erb
 - pg_layout/app/views/devise/passwords/new.html.erb
+- pg_layout/app/views/devise/registrations/_signup_info.html.slim
 - pg_layout/app/views/devise/registrations/edit.html.erb
 - pg_layout/app/views/devise/registrations/new.html.erb
 - pg_layout/app/views/devise/sessions/new.html.erb
@@ -1065,7 +1070,6 @@ files:
 - pg_rails/scss/bootstrap_overrides.scss
 - pg_rails/scss/bootstrap_post.scss
 - pg_rails/scss/bootstrap_pre.scss
-- pg_rails/scss/border_radius.scss
 - pg_rails/scss/pg_rails.scss
 - pg_scaffold/lib/generators/pg_active_record/model/model_generator.rb
 - pg_scaffold/lib/generators/pg_active_record/model/templates/admin.rb