pg_rails 7.0.8.pre.alpha.104 → 7.0.8.pre.alpha.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6fdaccc20ccfd58b84e38d8e40297b88dfeedbb6f7a15537f3e73c8b8df44ec
-  data.tar.gz: c4ade51d7e5e236773a2bd383c7eb57450b62f7c34bd2e2de6dbfb31359bebe7
+  metadata.gz: e2a9f062721d2900f647105438960c927cc262319bbbcb7f5216e259b500b6ab
+  data.tar.gz: 167d755004373fbaefab1b12b7b84c692bf31913e301ade7c813093ecd91a648
 SHA512:
-  metadata.gz: '009593f789f9711382f098a7fd6cbf71f944374c2da8a5f16c6cc1a3873793412ff03e5496d705e3533cfdb4c8796172b258a54d8becdf72a2253bdbc6404e0d'
-  data.tar.gz: 639c41eb50e2a611522577a8bfc808257e8ca350e7b0a40632749ee6994c797da860de6d4eb39327885c0433f37a4292c2a7b8d7a9aa966f59a9de18dfa0da5b
+  metadata.gz: 8356ae90a28fff08552492726f92fa54a351000950dcf82a6ac2733b3214d7b505b7a3cb18d358ac0e1deac8b8793c645e23fddaeba8a7184d8cd2317e199e74
+  data.tar.gz: 524ecc875a60ca7420196d87c0bdeae04b83ee1b6c025a72ea8ba6ca2a54b6e03622e01ea1f760b12f51c5a2b9e95c3f8b4eee6852605c54477395d609b0c144

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

@@ -27,7 +27,7 @@
   flex-direction: column;
   gap: 5px;
   background-color: $primary;
-  padding: 1.5em 5px;
+  padding: 1.5em 1em;
 }
 
 #notifications-inner {
@@ -41,9 +41,7 @@
   border: 1px solid #0003;
   border-radius: 2px;
   position: relative;
-  padding: 0.3em 2.5em;
-  padding-right: 0.5em;
-  xpadding-left: 2.5em;
+  padding: 0.5em;
   display: flex;
   align-items: stretch;
   background-color: white;
@@ -58,11 +56,11 @@
 .notification.unseen {
   background-color: rgb(230, 225, 251);
 }
-.notification.unseen::before {
+.notification.unseen .notification--time::before {
   content: '';
   padding: 5px;
-  left: 1em;
-  vertical-align: middle;
+  right: 0.4em;
+  top: 0.4em;
   position: absolute;
   background-color: #079510;
   border-radius: 50%;
@@ -75,4 +73,5 @@
 .notification--time {
   font-size: 0.8em;
   min-width: 6em;
+  padding-top: 0.9em;
 }

data/pg_engine/app/components/notification_component.rb

@@ -5,12 +5,12 @@ class NotificationComponent < BaseComponent
   end
 
   erb_template <<~ERB
-    <div class="notification d-flex justify-content-between <%= 'unseen' if @notification.unseen? %>"
+    <div class="notification d-flex flex-column flex-sm-row justify-content-between <%= 'unseen' if @notification.unseen? %>"
          id="<%= dom_id(@notification) %>" data-id="<%= @notification.id %>">
-      <div>
+      <div class="pe-3">
         <%= @notification.message.html_safe %>
       </div>
-      <div class="notification--time d-flex flex-column justify-content-end text-body-tertiary text-end ms-4">
+      <div class="notification--time d-flex flex-column justify-content-end text-body-tertiary text-end">
         <div>
           hace
           <%= distance_of_time_in_words @notification.created_at, Time.zone.now %>

data/pg_engine/app/components/notifications_bell_component.rb

@@ -8,7 +8,7 @@ class NotificationsBellComponent < BaseComponent
   erb_template <<~ERB
     <div>
       <% if @tooltip.present? %>
-        <div class="d-none d-sm-inline-block text-white pg--notifications-bell--tooltip">
+        <div class="d-inline-block text-white pg--notifications-bell--tooltip">
           <%= @tooltip %>
         </div>
       <% end %>

data/pg_engine/app/overrides/activestorage_direct_uploads.rb

@@ -0,0 +1,10 @@
+# MonkeyPatch para que las direct uploads usen el service
+# local. Si se usa S3 es complicado, porque hay que setear
+# la CORS config.
+ActiveStorage::DirectUploadsController.class_eval do
+  alias_method :old_blob_args, :blob_args
+
+  def blob_args
+    old_blob_args.merge(service_name: :local)
+  end
+end

data/pg_engine/app/views/admin/eventos/new.html.slim

@@ -2,7 +2,10 @@
   = f.mensajes_de_error
 
   = f.input :type, as: :select, collection: ApplicationNotifier.descendants.map(&:to_s)
-  = f.rich_text_area :message
+  - if params[:plain_text]
+    = f.input :message, as: :text
+  - else
+    = f.rich_text_area :message
   = f.input :tooltip
   = f.input :record_type
   = f.input :record_id

data/pg_engine/config/initializers/zeitwerk.rb

@@ -0,0 +1,7 @@
+Rails.autoloaders.main.ignore(
+  "#{PgEngine::Engine.root}/app/admin",
+  "#{PgEngine::Engine.root}/app/assets",
+  "#{PgEngine::Engine.root}/app/javascript",
+  "#{PgEngine::Engine.root}/app/overrides",
+  "#{PgEngine::Engine.root}/app/views"
+)

data/pg_engine/lib/pg_engine/engine.rb

@@ -13,13 +13,13 @@ module PgEngine
       g.fallbacks[:pg_active_record] = :active_record
     end
 
-    # overrides = "#{PgEngine::Engine.root}/app/overrides"
+    overrides = "#{PgEngine::Engine.root}/app/overrides"
 
-    # config.to_prepare do
-    #   Dir.glob("#{overrides}/**/*.rb").each do |override|
-    #     load override
-    #   end
-    # end
+    config.to_prepare do
+      Dir.glob("#{overrides}/**/*.rb").each do |override|
+        load override
+      end
+    end
 
     initializer 'pg_engine.set_exceptions_app' do
       Rails.application.config.exceptions_app = Rails.application.routes

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

@@ -28,7 +28,7 @@
       <% if @notifications&.any? %>
         <%= render NotificationComponent.with_collection(@notifications) if @notifications&.any? %>
       <% else %>
-        <span class="text-light">
+        <span class="text-light text-center">
           No hay notificaciones
         </span>
       <% end %>

data/pg_rails/lib/version.rb

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

data/pg_rails/scss/pg_rails.scss

@@ -38,4 +38,4 @@ $alert-margin-bottom:           0.5rem;
 
 @import 'bootstrap-icons/font/bootstrap-icons';
 
-@import 'trix.css';
+@import 'trix/dist/trix';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.0.8.pre.alpha.104
+  version: 7.0.8.pre.alpha.106
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2024-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1044,6 +1044,7 @@ files:
 - pg_engine/app/models/user_account.rb
 - pg_engine/app/notifiers/application_notifier.rb
 - pg_engine/app/notifiers/simple_user_notifier.rb
+- pg_engine/app/overrides/activestorage_direct_uploads.rb
 - pg_engine/app/policies/account_policy.rb
 - pg_engine/app/policies/email_log_policy.rb
 - pg_engine/app/policies/email_policy.rb
@@ -1091,6 +1092,7 @@ files:
 - pg_engine/config/initializers/devise.rb
 - pg_engine/config/initializers/rollbar.rb
 - pg_engine/config/initializers/simple_form_monkey_patch.rb
+- pg_engine/config/initializers/zeitwerk.rb
 - pg_engine/config/locales/devise.en.yml
 - pg_engine/config/locales/es.yml
 - pg_engine/config/routes.rb