avo 3.0.0.pre13 → 3.0.0.pre16

data/lib/avo.rb

@@ -11,31 +11,9 @@ loader.inflector.inflect(
 loader.ignore("#{__dir__}/generators")
 loader.setup
 
-#                                      .//*,,.....,,*/(*
-#                                   **,,..............,*#.
-#                               ,*,,.....         .....*/#.
-#                            **,,....             ....,*/%%
-#                        ,**,,.......           . ....*/#&%
-#                    **,,,...... .             . ....*/#&&%
-#                **,,........ .           .     ...,//#&&&.
-#            */*,,..*//***,,,,*/(,..      .. .....*//%&%&*
-#         ,/**,..**/******,,***/(###,...........,//(%&&%.
-#       /**,,..((//*****////((##%%%%%*.........*//%%&&%
-#     ****,...#/**,,,*,*/(#%##%%%%&&&(*,.....,*/(%&&&/
-#    /**,....(/*,,,,,,,*(##%%%%%&&&&&(,.....,*(#&&&&.
-#  ,//*,.....(/*,,**//(##%%%%&&&&@&&%/,....,*((&&&&*
-# .//*,,.....(((//(((##%%%&&&&&&&&@#/,....,*/#%&&&#
-# (/**,,......###%%%%%&&&&&&&&&&@#/,,...,,*/#&&&&&
-# (/**,,........%%%%%&&&&&&&&@%(*,...,,,*//(&&&&%.
-# ///*,,,.........,*#&&&&#(/,,.....,,,*//(%&&&&%*
-#  (//**,,,.....................,,,,*//(%&&&&&&*
-#   *(///**,,,,............,,,,,,**/((&&&&&&&%.
-#     ((///*****,,,,,,,,,,,,***//((&&&&&%&%&#
-#       .((((////********///(((%&%&&&&%%%%%
-#           (############%%%%%%%%%%%%%%%*
-#               ,(############%%%%%#*
-
 module Avo
+  extend ActiveSupport::LazyLoadHooks
+
   ROOT_PATH = Pathname.new(File.join(__dir__, ".."))
   IN_DEVELOPMENT = ENV["AVO_IN_DEVELOPMENT"] == "1"
   PACKED = !IN_DEVELOPMENT
@@ -64,8 +42,112 @@ module Avo
   class DeprecatedAPIError < StandardError; end
 
   class << self
+    attr_reader :logger
+    attr_reader :cache_store
+    attr_reader :field_manager
+
+    delegate :license, :app, :error_manager, :tool_manager, :resource_manager, to: Avo::Current
+
+    def boot
+      boot_logger
+      boot_fields
+      @cache_store = get_cache_store
+      plugin_manager.boot_plugins
+      Avo.run_load_hooks(:boot, self)
+    end
+
+    def init
+      Avo::Current.error_manager = Avo::ErrorManager.build
+      Avo::Current.resource_manager = Avo::Resources::ResourceManager.build
+      Avo::Current.tool_manager = Avo::Tools::ToolManager.build
+
+      Avo.run_load_hooks(:init, self)
+    end
+
+    # Renerate a dynamic root path using the URIService
+    def root_path(paths: [], query: {}, **args)
+      Avo::Services::URIService.parse(Avo::Current.view_context.avo.root_url.to_s)
+        .append_paths(paths)
+        .append_query(query)
+        .to_s
+    end
+
+    def mount_path
+      Avo::Engine.routes.find_script_name({})
+    end
+
+    def main_menu
+      return unless Avo.plugin_manager.installed?("avo-menu")
+
+      # Return empty menu if the app doesn't have the profile menu configured
+      return Avo::Menu::Builder.new.build unless has_main_menu?
+
+      Avo::Menu::Builder.parse_menu(&Avo.configuration.main_menu)
+    end
+
+    def profile_menu
+      return unless Avo.plugin_manager.installed?("avo-menu")
+
+      # Return empty menu if the app doesn't have the profile menu configured
+      return Avo::Menu::Builder.new.build unless has_profile_menu?
+
+      Avo::Menu::Builder.parse_menu(&Avo.configuration.profile_menu)
+    end
+
+    def app_status
+      license.valid?
+    end
+
     def avo_filters_installed?
-      defined?(AvoFilters).present?
+      defined?(Avo::DynamicFilters).present?
+    end
+
+    def has_main_menu?
+      return false if Avo.license.lacks_with_trial(:menu_editor)
+      return false if Avo.configuration.main_menu.nil?
+
+      true
+    end
+
+    def has_profile_menu?
+      return false if Avo.license.lacks_with_trial(:menu_editor)
+      return false if Avo.configuration.profile_menu.nil?
+
+      true
+    end
+
+    private
+
+    def boot_logger
+      file_logger = ActiveSupport::Logger.new(Rails.root.join("log", "avo.log"))
+
+      file_logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+      file_logger.formatter = proc do |severity, time, progname, msg|
+        "[Avo] #{time}: #{msg}\n".tap do |i|
+          puts i
+        end
+      end
+
+      @logger = file_logger
+    end
+
+    def boot_fields
+      @field_manager = Avo::Fields::FieldManager.build
+    end
+
+    def get_cache_store
+      if Rails.env.production?
+        case Rails.cache.class.to_s
+        when "ActiveSupport::Cache::MemCacheStore", "ActiveSupport::Cache::RedisCacheStore"
+          Rails.cache
+        else
+          ActiveSupport::Cache.lookup_store(:file_store, Rails.root.join("tmp", "cache"))
+        end
+      elsif Rails.env.test?
+        Rails.cache
+      else
+        ActiveSupport::Cache.lookup_store(:memory_store)
+      end
     end
   end
 end

data/lib/generators/avo/action_generator.rb

@@ -5,20 +5,20 @@ module Generators
     class ActionGenerator < NamedBaseGenerator
       source_root File.expand_path("templates", __dir__)
 
-      class_option :standalone, type: :boolean
+      class_option :standalone, type: :boolean, default: false
+      class_option :name, type: :string
 
       namespace "avo:action"
 
       def create_resource_file
-        type = "resource"
+        template "action.tt", "app/avo/actions/#{singular_name}.rb"
+      end
 
-        type = "standalone" if options[:standalone]
+      def configuration_options
+        configuration = "  self.name = \"#{options[:name] || name.titleize}\""
+        configuration += "\n  self.standalone = true" if options[:standalone]
 
-        if type == "standalone"
-          template "standalone_action.tt", "app/avo/actions/#{singular_name}.rb"
-        else
-          template "action.tt", "app/avo/actions/#{singular_name}.rb"
-        end
+        configuration
       end
     end
   end

data/lib/generators/avo/card_generator.rb

@@ -0,0 +1,27 @@
+require_relative "named_base_generator"
+
+module Generators
+  module Avo
+    class Card < NamedBaseGenerator
+      namespace "avo:card"
+      source_root File.expand_path("templates", __dir__)
+      class_option :type, type: :string
+
+      def handle
+        raise "Invalid card type '#{options[:type]}'" unless card_types.include? options[:type]
+
+        template "cards/#{options[:type]}_card_sample.tt", "app/avo/cards/#{name.underscore}.rb"
+
+        if options[:type].to_sym == :partial
+          template "cards/partial_card_partial.tt", "app/views/avo/cards/_#{name.underscore}.html.erb"
+        end
+      end
+
+      private
+
+      def card_types
+        %w[metric chartkick partial]
+      end
+    end
+  end
+end

data/lib/generators/avo/filter_generator.rb

@@ -5,20 +5,20 @@ module Generators
     class FilterGenerator < NamedBaseGenerator
       source_root File.expand_path("templates", __dir__)
 
-      class_option :multiple_select, type: :boolean
-      class_option :select, type: :boolean
-      class_option :text, type: :boolean
+      class_option :type, type: :string, default: "boolean"
 
       namespace "avo:filter"
 
       def create_resource_file
-        type = "boolean"
+        raise "Invalid filter type '#{options[:type]}'" unless filter_types.include? options[:type]
 
-        type = "multiple_select" if options[:multiple_select]
-        type = "select" if options[:select]
-        type = "text" if options[:text]
+        template "filters/#{options[:type]}_filter.tt", "app/avo/filters/#{singular_name}.rb"
+      end
+
+      private
 
-        template "filters/#{type}_filter.tt", "app/avo/filters/#{singular_name}.rb"
+      def filter_types
+        %w[boolean select text multiple_select]
       end
     end
   end

data/lib/generators/avo/templates/action.tt

@@ -1,5 +1,5 @@
 class Avo::Actions::<%= class_name.camelize %> < Avo::BaseAction
-  self.name = "<%= name.underscore.humanize %>"
+<%= configuration_options %>
   # self.visible = -> do
   #   true
   # end
@@ -8,8 +8,8 @@ class Avo::Actions::<%= class_name.camelize %> < Avo::BaseAction
   #   # Add Action fields here
   # end
 
-  def handle(records:, fields:, current_user:, resource:)
-    records.each do |model|
+  def handle(records:, fields:, current_user:, resource:, **args)
+    records.each do |record|
       # Do something with your records.
     end
   end

data/lib/generators/avo/templates/cards/chartkick_card.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < AvoDashboards::ChartkickCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   self.chart_type = :area_chart

data/lib/generators/avo/templates/cards/chartkick_card_sample.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < AvoDashboards::ChartkickCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::ChartkickCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   self.chart_type = :area_chart

data/lib/generators/avo/templates/cards/metric_card.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < AvoDashboards::MetricCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::MetricCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
 

data/lib/generators/avo/templates/cards/metric_card_sample.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < AvoDashboards::MetricCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::MetricCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   # self.description = "Some description"

data/lib/generators/avo/templates/cards/partial_card.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < AvoDashboards::PartialCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::PartialCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   self.partial = "avo/cards/<%= name.underscore %>"

data/lib/generators/avo/templates/cards/partial_card_sample.tt

@@ -1,4 +1,4 @@
-class Avo::Cards::<%= class_name.camelize %> < AvoDashboards::PartialCard
+class Avo::Cards::<%= class_name.camelize %> < Avo::Dashboards::PartialCard
   self.id = "<%= name.underscore %>"
   self.label = "<%= name.underscore.humanize %>"
   self.partial = "avo/cards/<%= name.underscore %>"

data/lib/generators/avo/templates/dashboards/dashboard.tt

@@ -1,4 +1,4 @@
-class Avo::Dashboards::<%= class_name.camelize %> < AvoDashboards::BaseDashboard
+class Avo::Dashboards::<%= class_name.camelize %> < Avo::Dashboards::BaseDashboard
   self.id = "<%= name.underscore %>"
   self.name = "<%= name.underscore.humanize %>"
   # self.description = "Tiny dashboard description"

data/lib/generators/avo/templates/scope.tt

@@ -1,4 +1,4 @@
-class Avo::Scopes::<%= class_name.camelize %> < AvoPro::Scopes::BaseScope
+class Avo::Scopes::<%= class_name.camelize %> < Avo::Pro::Scopes::BaseScope
   self.name = "<%= name.underscore.humanize %>"
   self.description = "<%= name.underscore.humanize %>"
   self.scope = -> { query.all }

data/lib/tasks/avo_tasks.rake

@@ -5,7 +5,7 @@
 
 desc "Runs the update command for all Avo gems."
 task "avo:update" do
-  system "bundle update avo avo_pro avo_advanced avo_dashboards avo_filters avo_menu avo_upgrade"
+  system "bundle update avo avo-pro avo-advanced avo-dashboards avo_filters avo-menu avo_upgrade"
 end
 
 desc "Installs Avo assets and bundles them for when you want to use the GitHub repo in your app"
@@ -63,30 +63,3 @@ task "avo:gem_paths" do
   # avo:/Users/adrian/work/avocado/avo-3,avo_filters:/Users/adrian/work/avocado/advanced/avo_filters
   puts result
 end
-
-desc "Symlink registered gems in `./tmp/gems` so their views, etc. can be inspected by Tailwind CSS."
-task "avo:link" do
-  Avo::App.boot
-  abort Avo.plugin_manager.plugins.inspect
-  if Dir.exist?("tmp/gems")
-    puts "Removing previously linked gems."
-    `rm -f tmp/gems/*`
-  else
-    if File.exist?("tmp/gems")
-      raise "A file named `tmp/gems` already exists? It has to be removed before we can create the required directory."
-    end
-
-    puts "Creating 'tmp/gems' directory."
-    `mkdir tmp/gems`
-  end
-
-  `touch tmp/gems/.keep`
-
-  Avo.plugin_manager.plugins.each do |linked_gem|
-    target = `bundle show #{linked_gem}`.chomp
-    if target.present?
-      puts "Linking '#{linked_gem}' to '#{target}'."
-      `ln -s #{target} tmp/gems/#{linked_gem}`
-    end
-  end
-end

data/public/avo-assets/avo.base.css

@@ -5781,11 +5781,6 @@ progress[value]::-moz-progress-bar{
   background-color:rgb(var(--color-primary-500))
 }
 
-/*
-Trix 1.3.1
-Copyright © 2020 Basecamp, LLC
-http://trix-editor.org/*/
-
 trix-editor {
   border: 1px solid #bbb;
   border-radius: 3px;
@@ -5819,7 +5814,7 @@ trix-toolbar .trix-button-group:not(:first-child) {
   margin-left: 1.5vw;
 }
 
-@media (max-device-width: 768px) {
+@media (max-width: 768px) {
   trix-toolbar .trix-button-group:not(:first-child) {
     margin-left: 0;
   }
@@ -5829,7 +5824,7 @@ trix-toolbar .trix-button-group-spacer {
   flex-grow: 1;
 }
 
-@media (max-device-width: 768px) {
+@media (max-width: 768px) {
   trix-toolbar .trix-button-group-spacer {
     display: none;
   }
@@ -5868,7 +5863,7 @@ trix-toolbar .trix-button:disabled {
   color: rgba(0, 0, 0, 0.125);
 }
 
-@media (max-device-width: 768px) {
+@media (max-width: 768px) {
   trix-toolbar .trix-button {
     letter-spacing: -0.01em;
     padding: 0 0.3em;
@@ -5883,7 +5878,7 @@ trix-toolbar .trix-button--icon {
   text-indent: -9999px;
 }
 
-@media (max-device-width: 768px) {
+@media (max-width: 768px) {
   trix-toolbar .trix-button--icon {
     height: 2em;
     max-width: calc(0.8em + 3.5vw);
@@ -5904,7 +5899,7 @@ trix-toolbar .trix-button--icon::before {
   background-size: contain;
 }
 
-@media (max-device-width: 768px) {
+@media (max-width: 768px) {
   trix-toolbar .trix-button--icon::before {
     right: 6%;
     left: 6%;
@@ -5920,61 +5915,61 @@ trix-toolbar .trix-button--icon:disabled::before {
 }
 
 trix-toolbar .trix-button--icon-attach::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M16.5%206v11.5a4%204%200%201%201-8%200V5a2.5%202.5%200%200%201%205%200v10.5a1%201%200%201%201-2%200V6H10v9.5a2.5%202.5%200%200%200%205%200V5a4%204%200%201%200-8%200v12.5a5.5%205.5%200%200%200%2011%200V6h-1.5z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M10.5%2018V7.5c0-2.25%203-2.25%203%200V18c0%204.125-6%204.125-6%200V7.5c0-6.375%209-6.375%209%200V18%22%20stroke%3D%22%23000%22%20stroke-width%3D%222%22%20stroke-miterlimit%3D%2210%22%20stroke-linecap%3D%22round%22%20stroke-linejoin%3D%22round%22%2F%3E%3C%2Fsvg%3E");
   top: 8%;
   bottom: 4%;
 }
 
 trix-toolbar .trix-button--icon-bold::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M15.6%2011.8c1-.7%201.6-1.8%201.6-2.8a4%204%200%200%200-4-4H7v14h7c2.1%200%203.7-1.7%203.7-3.8%200-1.5-.8-2.8-2.1-3.4zM10%207.5h3a1.5%201.5%200%201%201%200%203h-3v-3zm3.5%209H10v-3h3.5a1.5%201.5%200%201%201%200%203z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M6.522%2019.242a.5.5%200%200%201-.5-.5V5.35a.5.5%200%200%201%20.5-.5h5.783c1.347%200%202.46.345%203.24.982.783.64%201.216%201.562%201.216%202.683%200%201.13-.587%202.129-1.476%202.71a.35.35%200%200%200%20.049.613c1.259.56%202.101%201.742%202.101%203.22%200%201.282-.483%202.334-1.363%203.063-.876.726-2.132%201.12-3.66%201.12h-5.89ZM9.27%207.347v3.362h1.97c.766%200%201.347-.17%201.733-.464.38-.291.587-.716.587-1.27%200-.53-.183-.928-.513-1.198-.334-.273-.838-.43-1.505-.43H9.27Zm0%205.606v3.791h2.389c.832%200%201.448-.177%201.853-.497.399-.315.614-.786.614-1.423%200-.62-.22-1.077-.63-1.385-.418-.313-1.053-.486-1.905-.486H9.27Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-italic::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M10%205v3h2.2l-3.4%208H6v3h8v-3h-2.2l3.4-8H18V5h-8z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M9%205h6.5v2h-2.23l-2.31%2010H13v2H6v-2h2.461l2.306-10H9V5Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-link::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M9.88%2013.7a4.3%204.3%200%200%201%200-6.07l3.37-3.37a4.26%204.26%200%200%201%206.07%200%204.3%204.3%200%200%201%200%206.06l-1.96%201.72a.91.91%200%201%201-1.3-1.3l1.97-1.71a2.46%202.46%200%200%200-3.48-3.48l-3.38%203.37a2.46%202.46%200%200%200%200%203.48.91.91%200%201%201-1.3%201.3z%22%2F%3E%3Cpath%20d%3D%22M4.25%2019.46a4.3%204.3%200%200%201%200-6.07l1.93-1.9a.91.91%200%201%201%201.3%201.3l-1.93%201.9a2.46%202.46%200%200%200%203.48%203.48l3.37-3.38c.96-.96.96-2.52%200-3.48a.91.91%200%201%201%201.3-1.3%204.3%204.3%200%200%201%200%206.07l-3.38%203.38a4.26%204.26%200%200%201-6.07%200z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M18.948%205.258a4.337%204.337%200%200%200-6.108%200L11.217%206.87a.993.993%200%200%200%200%201.41c.392.39%201.027.39%201.418%200l1.623-1.613a2.323%202.323%200%200%201%203.271%200%202.29%202.29%200%200%201%200%203.251l-2.393%202.38a3.021%203.021%200%200%201-4.255%200l-.05-.049a1.007%201.007%200%200%200-1.418%200%20.993.993%200%200%200%200%201.41l.05.049a5.036%205.036%200%200%200%207.091%200l2.394-2.38a4.275%204.275%200%200%200%200-6.072Zm-13.683%2013.6a4.337%204.337%200%200%200%206.108%200l1.262-1.255a.993.993%200%200%200%200-1.41%201.007%201.007%200%200%200-1.418%200L9.954%2017.45a2.323%202.323%200%200%201-3.27%200%202.29%202.29%200%200%201%200-3.251l2.344-2.331a2.579%202.579%200%200%201%203.631%200c.392.39%201.027.39%201.419%200a.993.993%200%200%200%200-1.41%204.593%204.593%200%200%200-6.468%200l-2.345%202.33a4.275%204.275%200%200%200%200%206.072Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-strike::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M12.73%2014l.28.14c.26.15.45.3.57.44.12.14.18.3.18.5%200%20.3-.15.56-.44.75-.3.2-.76.3-1.39.3A13.52%2013.52%200%200%201%207%2014.95v3.37a10.64%2010.64%200%200%200%204.84.88c1.26%200%202.35-.19%203.28-.56.93-.37%201.64-.9%202.14-1.57s.74-1.45.74-2.32c0-.26-.02-.51-.06-.75h-5.21zm-5.5-4c-.08-.34-.12-.7-.12-1.1%200-1.29.52-2.3%201.58-3.02%201.05-.72%202.5-1.08%204.34-1.08%201.62%200%203.28.34%204.97%201l-1.3%202.93c-1.47-.6-2.73-.9-3.8-.9-.55%200-.96.08-1.2.26-.26.17-.38.38-.38.64%200%20.27.16.52.48.74.17.12.53.3%201.05.53H7.23zM3%2013h18v-2H3v2z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M6%2014.986c.088%202.647%202.246%204.258%205.635%204.258%203.496%200%205.713-1.728%205.713-4.463%200-.275-.02-.536-.062-.781h-3.461c.398.293.573.654.573%201.123%200%201.035-1.074%201.787-2.646%201.787-1.563%200-2.773-.762-2.91-1.924H6ZM6.432%2010h3.763c-.632-.314-.914-.715-.914-1.273%200-1.045.977-1.739%202.432-1.739%201.475%200%202.52.723%202.617%201.914h2.764c-.05-2.548-2.11-4.238-5.39-4.238-3.145%200-5.392%201.719-5.392%204.316%200%20.363.04.703.12%201.02ZM4%2011a1%201%200%201%200%200%202h15a1%201%200%201%200%200-2H4Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-quote::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20version%3D%221%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M6%2017h3l2-4V7H5v6h3zm8%200h3l2-4V7h-6v6h3z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M4.581%208.471c.44-.5%201.056-.834%201.758-.995C8.074%207.17%209.201%207.822%2010%208.752c1.354%201.578%201.33%203.555.394%205.277-.941%201.731-2.788%203.163-4.988%203.56a.622.622%200%200%201-.653-.317c-.113-.205-.121-.49.16-.764.294-.286.567-.566.791-.835.222-.266.413-.54.524-.815.113-.28.156-.597.026-.908-.128-.303-.39-.524-.72-.69a3.02%203.02%200%200%201-1.674-2.7c0-.905.283-1.59.72-2.088Zm9.419%200c.44-.5%201.055-.834%201.758-.995%201.734-.306%202.862.346%203.66%201.276%201.355%201.578%201.33%203.555.395%205.277-.941%201.731-2.789%203.163-4.988%203.56a.622.622%200%200%201-.653-.317c-.113-.205-.122-.49.16-.764.294-.286.567-.566.791-.835.222-.266.412-.54.523-.815.114-.28.157-.597.026-.908-.127-.303-.39-.524-.72-.69a3.02%203.02%200%200%201-1.672-2.701c0-.905.283-1.59.72-2.088Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-heading-1::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20version%3D%221%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M12%209v3H9v7H6v-7H3V9h9zM8%204h14v3h-6v12h-3V7H8V4z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21.5%207.5v-3h-12v3H14v13h3v-13h4.5ZM9%2013.5h3.5v-3h-10v3H6v7h3v-7Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-code::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M18.2%2012L15%2015.2l1.4%201.4L21%2012l-4.6-4.6L15%208.8l3.2%203.2zM5.8%2012L9%208.8%207.6%207.4%203%2012l4.6%204.6L9%2015.2%205.8%2012z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3.293%2011.293a1%201%200%200%200%200%201.414l4%204a1%201%200%201%200%201.414-1.414L5.414%2012l3.293-3.293a1%201%200%200%200-1.414-1.414l-4%204Zm13.414%205.414%204-4a1%201%200%200%200%200-1.414l-4-4a1%201%200%201%200-1.414%201.414L18.586%2012l-3.293%203.293a1%201%200%200%200%201.414%201.414Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-bullet-list::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20version%3D%221%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M4%204a2%202%200%201%200%200%204%202%202%200%200%200%200-4zm0%206a2%202%200%201%200%200%204%202%202%200%200%200%200-4zm0%206a2%202%200%201%200%200%204%202%202%200%200%200%200-4zm4%203h14v-2H8v2zm0-6h14v-2H8v2zm0-8v2h14V5H8z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%207.5a1.5%201.5%200%201%200%200-3%201.5%201.5%200%200%200%200%203ZM8%206a1%201%200%200%201%201-1h11a1%201%200%201%201%200%202H9a1%201%200%200%201-1-1Zm1%205a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm0%206a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm-2.5-5a1.5%201.5%200%201%201-3%200%201.5%201.5%200%200%201%203%200ZM5%2019.5a1.5%201.5%200%201%200%200-3%201.5%201.5%200%200%200%200%203Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-number-list::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M2%2017h2v.5H3v1h1v.5H2v1h3v-4H2v1zm1-9h1V4H2v1h1v3zm-1%203h1.8L2%2013.1v.9h3v-1H3.2L5%2010.9V10H2v1zm5-6v2h14V5H7zm0%2014h14v-2H7v2zm0-6h14v-2H7v2z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%204h2v4H4V5H3V4Zm5%202a1%201%200%200%201%201-1h11a1%201%200%201%201%200%202H9a1%201%200%200%201-1-1Zm1%205a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm0%206a1%201%200%201%200%200%202h11a1%201%200%201%200%200-2H9Zm-3.5-7H6v1l-1.5%202H6v1H3v-1l1.667-2H3v-1h2.5ZM3%2017v-1h3v4H3v-1h2v-.5H4v-1h1V17H3Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-undo::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M12.5%208c-2.6%200-5%201-6.9%202.6L2%207v9h9l-3.6-3.6A8%208%200%200%201%2020%2016l2.4-.8a10.5%2010.5%200%200%200-10-7.2z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M3%2014a1%201%200%200%200%201%201h6a1%201%200%201%200%200-2H6.257c2.247-2.764%205.151-3.668%207.579-3.264%202.589.432%204.739%202.356%205.174%205.405a1%201%200%200%200%201.98-.283c-.564-3.95-3.415-6.526-6.825-7.095C11.084%207.25%207.63%208.377%205%2011.39V8a1%201%200%200%200-2%200v6Zm2-1Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-redo::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M18.4%2010.6a10.5%2010.5%200%200%200-16.9%204.6L4%2016a8%208%200%200%201%2012.7-3.6L13%2016h9V7l-3.6%203.6z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M21%2014a1%201%200%200%201-1%201h-6a1%201%200%201%201%200-2h3.743c-2.247-2.764-5.151-3.668-7.579-3.264-2.589.432-4.739%202.356-5.174%205.405a1%201%200%200%201-1.98-.283c.564-3.95%203.415-6.526%206.826-7.095%203.08-.513%206.534.614%209.164%203.626V8a1%201%200%201%201%202%200v6Zm-2-1Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-decrease-nesting-level::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M3%2019h19v-2H3v2zm7-6h12v-2H10v2zm-8.3-.3l2.8%202.9L6%2014.2%204%2012l2-2-1.4-1.5L1%2012l.7.7zM3%205v2h19V5H3z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%206a1%201%200%200%201%201-1h12a1%201%200%201%201%200%202H6a1%201%200%200%201-1-1Zm4%205a1%201%200%201%200%200%202h9a1%201%200%201%200%200-2H9Zm-3%206a1%201%200%201%200%200%202h12a1%201%200%201%200%200-2H6Zm-3.707-5.707a1%201%200%200%200%200%201.414l2%202a1%201%200%201%200%201.414-1.414L4.414%2012l1.293-1.293a1%201%200%200%200-1.414-1.414l-2%202Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-button--icon-increase-nesting-level::before {
-  background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2224%22%20height%3D%2224%22%3E%3Cpath%20d%3D%22M3%2019h19v-2H3v2zm7-6h12v-2H10v2zm-6.9-1L1%2014.2l1.4%201.4L6%2012l-.7-.7-2.8-2.8L1%209.9%203.1%2012zM3%205v2h19V5H3z%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M5%206a1%201%200%200%201%201-1h12a1%201%200%201%201%200%202H6a1%201%200%200%201-1-1Zm4%205a1%201%200%201%200%200%202h9a1%201%200%201%200%200-2H9Zm-3%206a1%201%200%201%200%200%202h12a1%201%200%201%200%200-2H6Zm-2.293-2.293%202-2a1%201%200%200%200%200-1.414l-2-2a1%201%200%201%200-1.414%201.414L3.586%2012l-1.293%201.293a1%201%200%201%200%201.414%201.414Z%22%20fill%3D%22%23000%22%2F%3E%3C%2Fsvg%3E");
 }
 
 trix-toolbar .trix-dialogs {
@@ -6048,7 +6043,7 @@ trix-editor [data-trix-mutable] ::selection {
   background: none;
 }
 
-trix-editor [data-trix-mutable].attachment__caption-editor:focus::selection {
+trix-editor .attachment__caption-editor:focus[data-trix-mutable]::selection {
   background: highlight;
 }
 
@@ -6167,7 +6162,7 @@ trix-editor .trix-button--remove::before {
   left: 0;
   opacity: 0.7;
   content: "";
-  background-image: url(data:image/svg+xml,%3Csvg%20height%3D%2224%22%20width%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M19%206.4L17.6%205%2012%2010.6%206.4%205%205%206.4l5.6%205.6L5%2017.6%206.4%2019l5.6-5.6%205.6%205.6%201.4-1.4-5.6-5.6z%22%2F%3E%3Cpath%20d%3D%22M0%200h24v24H0z%22%20fill%3D%22none%22%2F%3E%3C%2Fsvg%3E);
+  background-image: url("data:image/svg+xml,%3Csvg%20height%3D%2224%22%20width%3D%2224%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M19%206.41%2017.59%205%2012%2010.59%206.41%205%205%206.41%2010.59%2012%205%2017.59%206.41%2019%2012%2013.41%2017.59%2019%2019%2017.59%2013.41%2012z%22%2F%3E%3Cpath%20d%3D%22M0%200h24v24H0z%22%20fill%3D%22none%22%2F%3E%3C%2Fsvg%3E");
   background-position: center;
   background-repeat: no-repeat;
   background-size: 90%;
@@ -6287,7 +6282,7 @@ trix-editor .attachment__metadata .attachment__size {
 }
 
 .trix-content .attachment__caption .attachment__name + .attachment__size::before {
-  content: ' · ';
+  content: ' \2022 ';
 }
 
 .trix-content .attachment--preview {
@@ -6808,10 +6803,6 @@ trix-toolbar .trix-button-group:not(:first-child){
   margin-bottom:1rem
 }
 
-.me-1{
-  margin-inline-end:0.25rem
-}
-
 .ml-1{
   margin-left:0.25rem
 }
@@ -7296,6 +7287,10 @@ trix-toolbar .trix-button-group:not(:first-child){
   flex-grow:0
 }
 
+.grow{
+  flex-grow:1
+}
+
 .border-collapse{
   border-collapse:collapse
 }