ruby_cms 0.2.0.4 → 0.2.0.8

data/config/locales/en.yml

@@ -57,10 +57,22 @@ en:
       settings:
         title: "Settings"
         subtitle: "Configure admin interface preferences"
+        categories_title: "Sections"
+        form_hint: "Toggles save immediately; other fields use Save below."
+        save_hint: "Toggles autosave; text fields need Save."
+        save_changes: "Save changes"
         pagination: "Pagination"
         pagination_description: "Number of items to display per page in each table"
         navigation: "Navigation"
         navigation_description: "Control which pages appear in the navigation menu"
+        navigation_title: "Navigation"
+        navigation_hint: "Reorder items or choose what appears in the sidebar."
+        nav_order_tab: "Order"
+        nav_items_tab: "Visibility"
+        drag_hint: "Drag to reorder"
+        show_in_sidebar: "Show in sidebar"
+        show_in_sidebar_hint: "Turn sections on or off. Changes save when you toggle."
+        no_nav_items: "No items to configure here."
         nav_order_label: "Menu order"
         nav_order_hint: "Drag items to reorder the sidebar menu."
         general: "General"
@@ -73,6 +85,44 @@ en:
         no_settings: "No settings in this category"
         commands_page_hint: "Registered rake tasks (Commands) are not a tab on this screen. Open “Commands” in the left sidebar under “Settings”, or use the link below."
         commands_open_link: "Open Commands"
+        categories:
+          general:
+            label: "General"
+            description: "General preferences for the admin environment."
+          navigation:
+            label: "Navigation"
+            description: "Control sidebar order and visibility."
+          pagination:
+            label: "Pagination"
+            description: "Define default table page sizes."
+          analytics:
+            label: "Analytics"
+            description: "Adjust analytics-related display settings."
+          dashboard:
+            label: "Dashboard"
+            description: "Configure dashboard widgets and defaults."
+          content:
+            label: "Content"
+            description: "Tune content editing and publishing preferences."
+      bulk_action_table:
+        selected: "selected"
+        select_all: "Select all"
+        clear: "Clear"
+        close: "Close"
+        confirm: "Confirm"
+        processing: "Processing..."
+        delete_selected_items: "Delete Selected Items"
+        delete_selected: "Delete Selected"
+        delete_selected_confirm: "Are you sure you want to delete the selected items? This action cannot be undone."
+        are_you_sure_you_want_to_delete_the_selected_items: "Are you sure you want to delete the selected items?"
+        this_action_cannot_be_undone: "This action cannot be undone."
+        cancel: "Cancel"
+        select_at_least_one: "Please select at least one item."
+        item_id_not_found: "Item ID not found for deletion."
+        delete_path_not_found: "Delete path not found."
+        action_url_not_configured: "Action URL not configured. Please configure an action URL for this page."
+        default_confirm: "Are you sure you want to proceed?"
+        generic_action_error: "An error occurred while performing %{action}."
       analytics:
         title: "Analytics"
         subtitle: "Traffic and engagement overview"
@@ -80,14 +130,28 @@ en:
         back_to_analytics: "Back to analytics"
         page_details_title: "Page details"
         visitor_details_title: "Visitor details"
-        total_page_views: "Total page views"
-        unique_visitors: "Unique visitors"
-        total_sessions: "Total sessions"
-        popular_pages: "Popular pages"
-        top_visitors: "Top visitors"
+        total_page_views: "Page Views"
+        unique_visitors: "Unique Visitors"
+        total_sessions: "Sessions"
+        bounce_rate: "Bounce Rate"
+        popular_pages: "Popular Pages"
+        top_visitors: "Top Visitors"
         suspicious_activity: "Suspicious activity"
         none_detected: "None detected in selected range."
         no_data: "No data yet."
+        exit_pages: "Exit Pages"
+        exit_pages_subtitle: "Last page viewed per session."
+        conversions: "Conversions"
+        conversions_subtitle: "Goals tracked via ahoy.track in your app."
+        conversions_total: "Total"
+        conversions_by_goal: "By goal"
+        no_conversions: "No conversions recorded."
+        no_conversions_hint: "Track goals with ahoy.track \"%{event}\", goal: \"your_goal\" in your controllers."
+        period_vs_previous: "vs previous period"
+        no_exit_pages: "No exit page data available."
+        page: "Page"
+        no_activity: "No activity recorded"
+        no_referrers: "No referrers recorded"
       visitor_errors:
         title: "Visitor errors"
         item_name: "error"

data/config/locales/nl.yml

@@ -44,13 +44,111 @@ nl:
         unknown: "Onbekend commando."
         right_column_label: "Commando-resultaat en applicatielog"
       settings:
+        title: "Instellingen"
+        subtitle: "Beheerinterface-voorkeuren configureren"
+        categories_title: "Secties"
+        form_hint: "Schakelaars slaan direct op; andere velden gebruik je met Opslaan."
+        save_hint: "Schakelaars slaan automatisch op; tekstvelden vereisen Opslaan."
+        save_changes: "Wijzigingen opslaan"
+        pagination: "Paginering"
+        pagination_description: "Aantal items per pagina in elke tabel"
+        navigation: "Navigatie"
+        navigation_description: "Bepaal welke pagina's in het navigatiemenu verschijnen"
+        navigation_title: "Navigatie"
+        navigation_hint: "Herschik items of kies wat in de zijbalk verschijnt."
+        nav_order_tab: "Volgorde"
+        nav_items_tab: "Zichtbaarheid"
+        drag_hint: "Sleep om te herschikken"
+        show_in_sidebar: "Toon in zijbalk"
+        show_in_sidebar_hint: "Zet secties aan of uit. Wijzigingen slaan op bij toggelen."
+        no_nav_items: "Geen items om hier in te stellen."
+        nav_order_label: "Menuvolgorde"
+        nav_order_hint: "Wijzigingen worden automatisch opgeslagen als je een item verplaatst."
+        general: "Algemeen"
+        updated: "Instelling '%{key}' is bijgewerkt."
+        defaults_reset: "Alle instellingen zijn teruggezet naar de standaardwaarden."
+        reset_defaults: "Standaardwaarden herstellen"
+        reset_defaults_short: "Herstel standaard"
+        reset_inline_hint: "Herstel fabrieksinstellingen voor de hele admin (alle secties)."
+        reset_confirm: "Alle instellingen terugzetten naar standaardwaarden?"
+        no_settings: "Geen instellingen in deze categorie"
         commands_page_hint: "Geregistreerde Rake-taken (Commando's) staan niet als tab op dit scherm. Open «Commando's» in de linkerzijbalk onder het kopje Instellingen, of gebruik de link hieronder."
         commands_open_link: "Commando's openen"
+        categories:
+          general:
+            label: "Algemeen"
+            description: "Algemene voorkeuren voor de beheeromgeving."
+          navigation:
+            label: "Navigatie"
+            description: "Beheer de volgorde en zichtbaarheid van de zijbalk."
+          pagination:
+            label: "Paginering"
+            description: "Stel standaard paginagroottes voor tabellen in."
+          analytics:
+            label: "Analytics"
+            description: "Pas analytics-gerelateerde weergave-instellingen aan."
+          dashboard:
+            label: "Dashboard"
+            description: "Configureer dashboard-widgets en standaardwaarden."
+          content:
+            label: "Inhoud"
+            description: "Stel voorkeuren voor bewerken en publiceren in."
+      bulk_action_table:
+        selected: "geselecteerd"
+        select_all: "Alles selecteren"
+        clear: "Wissen"
+        close: "Sluiten"
+        confirm: "Bevestigen"
+        processing: "Verwerken..."
+        delete_selected_items: "Geselecteerde items verwijderen"
+        delete_selected: "Geselecteerde verwijderen"
+        delete_selected_confirm: "Weet je zeker dat je de geselecteerde items wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt."
+        are_you_sure_you_want_to_delete_the_selected_items: "Weet je zeker dat je de geselecteerde items wilt verwijderen?"
+        this_action_cannot_be_undone: "Deze actie kan niet ongedaan worden gemaakt."
+        cancel: "Annuleren"
+        select_at_least_one: "Selecteer minimaal een item."
+        item_id_not_found: "Item-ID voor verwijderen niet gevonden."
+        delete_path_not_found: "Verwijderpad niet gevonden."
+        action_url_not_configured: "Actie-URL is niet ingesteld. Configureer een actie-URL voor deze pagina."
+        default_confirm: "Weet je zeker dat je wilt doorgaan?"
+        generic_action_error: "Er is een fout opgetreden tijdens het uitvoeren van %{action}."
+      analytics:
+        title: "Analytics"
+        subtitle: "Verkeer- en betrokkenheidoverzicht"
+        apply_filters: "Toepassen"
+        back_to_analytics: "Terug naar analytics"
+        page_details_title: "Paginadetails"
+        visitor_details_title: "Bezoekersdetails"
+        total_page_views: "Paginaweergaven"
+        unique_visitors: "Unieke bezoekers"
+        total_sessions: "Sessies"
+        bounce_rate: "Bouncepercentage"
+        popular_pages: "Populaire pagina's"
+        top_visitors: "Top bezoekers"
+        suspicious_activity: "Verdachte activiteit"
+        none_detected: "Niets gedetecteerd in de geselecteerde periode."
+        no_data: "Nog geen gegevens."
+        exit_pages: "Uitstappagina's"
+        exit_pages_subtitle: "Laatste bekeken pagina per sessie."
+        conversions: "Conversies"
+        conversions_subtitle: "Doelen bijgehouden via ahoy.track in je app."
+        conversions_total: "Totaal"
+        conversions_by_goal: "Per doel"
+        no_conversions: "Geen conversies geregistreerd."
+        no_conversions_hint: "Houd doelen bij met ahoy.track \"%{event}\", goal: \"jouw_doel\" in je controllers."
+        period_vs_previous: "t.o.v. vorige periode"
+        no_exit_pages: "Geen uitstappagina-gegevens beschikbaar."
+        page: "Pagina"
+        no_activity: "Geen activiteit geregistreerd"
+        no_referrers: "Geen verwijzers geregistreerd"
       content_blocks:
         created: "Contentblok aangemaakt."
         updated: "Contentblok bijgewerkt."
         deleted: "Contentblok verwijderd."
+        locale_read_only: "(taal kan niet worden gewijzigd voor bestaande blokken)"
         select_locale: "Selecteer taal"
+        edit_in_locale: "Bewerken in %{locale_name}"
+        other_languages: "Andere talen"
         content_type: "Inhoudstype"
         title: "Titel"
         content: "Inhoud"

data/lib/generators/ruby_cms/install_generator.rb

@@ -21,13 +21,16 @@ module RubyCms
         - If the host uses /admin already, remove or change those routes.
         - Avoid root to: redirect("/admin") — use a real root or ruby_cms.unauthorized_redirect_path.
         - Review config/initializers/ruby_cms.rb (session, CSP).
-        - Add 'css: bin/rails tailwindcss:watch' to Procfile.dev for Tailwind in development.
+        - RubyCMS admin styles are compiled once on install to app/assets/stylesheets/ruby_cms/admin.css.
         - Visit /admin (sign in as the admin you configured).
 
         Tracking:
         - Visitor errors: Automatically captured via ApplicationController (see /admin/visitor_errors)
         - Page views (Ahoy): Include RubyCms::PageTracking in your public controllers to track page views
           Example: class PagesController < ApplicationController; include RubyCms::PageTracking; end
+        - Conversions: Call ahoy.track RubyCms::Analytics::Report::EVENT_CONVERSION, goal: "contact_form"
+          from any controller action (e.g. after a successful form submit). Goal names are free-form strings.
+        - Bot filtering: Set config.ruby_cms.analytics_visit_scope to exclude IPs/bots (see config/initializers/ruby_cms.rb)
         - Analytics: View visit/event data in Ahoy tables (ahoy_visits, ahoy_events)
       TEXT
 
@@ -215,7 +218,18 @@ module RubyCms
       no_tasks do
         def copy_admin_css(dest_dir)
           admin_css_dest = dest_dir.join("admin.css")
+          precompiled_admin_css = RubyCms::Engine.root.join("app/assets/stylesheets/ruby_cms/admin.css")
+          if File.exist?(precompiled_admin_css) && File.size(precompiled_admin_css).to_i.positive?
+            FileUtils.cp(precompiled_admin_css, admin_css_dest)
+            return
+          end
+
           RubyCms::Engine.compile_admin_css(admin_css_dest)
+          return if File.size(admin_css_dest).to_i > 64
+
+          say "⚠ Task css/copy: Generated admin.css is very small. " \
+              "Ensure RubyCMS ships precompiled CSS at app/assets/stylesheets/ruby_cms/admin.css.",
+              :yellow
         end
 
         def copy_components_css(src_dir, dest_dir)
@@ -478,8 +492,8 @@ module RubyCms
         end
 
         def configure_tailwind(tailwind_css)
-          add_ruby_cms_tailwind_source(tailwind_css)
-          add_ruby_cms_tailwind_content_paths
+          remove_ruby_cms_tailwind_source(tailwind_css)
+          remove_ruby_cms_tailwind_content_paths
           run "bin/rails tailwindcss:build" if File.exist?(tailwind_css)
           # Importmap pins are provided by the engine via `ruby_cms/config/importmap.rb`.
           add_importmap_pins
@@ -855,114 +869,56 @@ module RubyCms
           end.join("\n")
         end
 
-        # Helper: add @source for RubyCMS views/components so Tailwind finds utility classes.
+        # RubyCMS admin styles are precompiled to app/assets/stylesheets/ruby_cms/admin.css.
+        # Remove RubyCMS-specific Tailwind source globs to keep host-app builds fast.
         # Not a generator task.
-        def add_ruby_cms_tailwind_source(tailwind_css_path)
-          return unless tailwind_css_path.to_s.present? && File.exist?(tailwind_css_path)
+        def remove_ruby_cms_tailwind_source(tailwind_css_path)
+          return unless valid_tailwind_source_path?(tailwind_css_path)
 
           content = File.read(tailwind_css_path)
-          gem_source_lines = build_gem_source_lines(tailwind_css_path)
-          return if gem_source_lines.all? {|line| content.include?(line) }
+          cleaned_content = remove_legacy_ruby_cms_tailwind_sources(content)
+          return if cleaned_content == content
 
-          inject_tailwind_source(tailwind_css_path, content, gem_source_lines)
+          File.write(tailwind_css_path, cleaned_content)
+          say_tailwind_source_cleaned
         rescue StandardError => e
-          say "⚠ Task tailwind/source: Could not add @source: #{e.message}. Add manually.", :yellow
+          say_tailwind_source_clean_failed(e)
         end
 
-        # Tailwind v3 support (tailwind.config.js content array)
-        def add_ruby_cms_tailwind_content_paths # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+        # Remove RubyCMS content globs from Tailwind v3 config as well.
+        def remove_ruby_cms_tailwind_content_paths
           config_path = Rails.root.join("config/tailwind.config.js")
           return unless File.exist?(config_path)
 
           content = File.read(config_path)
-          patterns = ruby_cms_tailwind_content_patterns
-          return if patterns.all? {|p| content.include?(p) }
-
-          inject = "#{patterns.map {|p| "    \"#{p}\"," }.join("\n")}\n"
+          cleaned = content.gsub(/^\s*["']?[^"'\n]*ruby_cms[^"'\n]*["']?,?\s*$\n?/i, "")
+          return if cleaned == content
 
-          # Insert inside `content: [` if present; otherwise no-op.
-          inserted = false
-          if content.match?(/content:\s*\[/)
-            gsub_file config_path.to_s, /content:\s*\[\s*\n/ do |match|
-              inserted = true
-              "#{match}#{inject}"
-            end
-          end
-
-          return unless inserted
-
-          say "✓ Task tailwind/content: Added RubyCMS paths to config/tailwind.config.js.", :green
+          File.write(config_path, cleaned)
+          say "✓ Task tailwind/content: Removed RubyCMS paths from tailwind.config.js.", :green
         rescue StandardError => e
-          say "⚠ Task tailwind/content: Could not update tailwind.config.js: #{e.message}.", :yellow
+          say "⚠ Task tailwind/content: Could not clean tailwind.config.js: #{e.message}.", :yellow
         end
 
-        def ruby_cms_tailwind_content_patterns
-          views = RubyCms::Engine.root.join("app/views").relative_path_from(Rails.root).to_s
-          components = RubyCms::Engine.root.join("app/components").relative_path_from(Rails.root).to_s
-          [
-            "#{views}/**/*.erb",
-            "#{components}/**/*.rb"
-          ]
+        def remove_legacy_ruby_cms_tailwind_sources(content)
+          content
+            .gsub(%r{^\s*/\*\s*Include RubyCMS views/components so Tailwind finds utility classes\.\s*\*/\s*$\n?}, "")
+            .gsub(/^\s*@source\s+"[^"\n]*ruby_cms[^"\n]*";\s*$\n?/i, "")
         end
 
-        def build_gem_source_lines(tailwind_css_path)
-          css_dir = Pathname.new(tailwind_css_path).dirname
-          gem_views = path_relative_to_css_or_absolute(RubyCms::Engine.root.join("app/views"),
-                                                       css_dir)
-          gem_components = path_relative_to_css_or_absolute(
-            RubyCms::Engine.root.join("app/components"), css_dir
-          )
-          [
-            %(@source "#{gem_views}/**/*.erb";),
-            %(@source "#{gem_components}/**/*.rb";)
-          ]
+        def valid_tailwind_source_path?(tailwind_css_path)
+          tailwind_css_path.to_s.present? && File.exist?(tailwind_css_path)
         end
 
-        def path_relative_to_css_or_absolute(target_path, css_dir)
-          Pathname.new(target_path).relative_path_from(css_dir).to_s
-        rescue ArgumentError
-          # Different mount/volume: fall back to absolute path.
-          Pathname.new(target_path).to_s
-        end
-
-        def inject_tailwind_source(tailwind_css_path, content, gem_source_lines)
-          to_inject = build_tailwind_source_injection(gem_source_lines)
-          inserted = try_insert_after_patterns?(tailwind_css_path, content, to_inject)
-          inject_at_start(tailwind_css_path, to_inject) unless inserted
-          say "✓ Task tailwind/source: Added @source for RubyCMS views/components to " \
-              "tailwind/application.css.",
+        def say_tailwind_source_cleaned
+          say "✓ Task tailwind/source: Removed RubyCMS @source paths from tailwind entry CSS.",
               :green
         end
 
-        def build_tailwind_source_injection(gem_source_lines)
-          to_inject = +"\n/* Include RubyCMS views/components so Tailwind finds utility classes. */\n"
-          Array(gem_source_lines).each {|line| to_inject << line << "\n" }
-          to_inject << "\n"
-          to_inject
-        end
-
-        def try_insert_after_patterns?(tailwind_css_path, content, to_inject)
-          patterns = [
-            %(@import "tailwindcss";\n),
-            %(@import "tailwindcss";),
-            %(@import "tailwindcss"\n),
-            %(@import "tailwindcss")
-          ]
-          patterns.each do |after_pattern|
-            next unless content.include?(after_pattern)
-
-            inject_into_file tailwind_css_path.to_s, after: after_pattern do
-              to_inject
-            end
-            return true
-          end
-          false
-        end
-
-        def inject_at_start(tailwind_css_path, to_inject)
-          inject_into_file tailwind_css_path.to_s, after: /\A/ do
-            to_inject
-          end
+        def say_tailwind_source_clean_failed(error)
+          say "⚠ Task tailwind/source: Could not clean @source lines: #{error.message}. " \
+              "Check tailwind/application.css manually.",
+              :yellow
         end
       end
 

data/lib/generators/ruby_cms/templates/admin.html.erb

@@ -15,7 +15,7 @@
     <link rel="manifest" href="<%= asset_path("site.webmanifest") %>">
 
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
+    <%= stylesheet_link_tag "ruby_cms/admin", "data-turbo-track": "reload" rescue nil %>
     <%= stylesheet_link_tag "actiontext", "data-turbo-track": "reload" rescue nil %>
     <%= javascript_importmap_tags "admin" %>
   </head>

data/lib/generators/ruby_cms/templates/ruby_cms.rb

@@ -49,10 +49,30 @@ RubyCms.configure do |c|
   # Preview data proc to pass instance variables.
   # c.preview_data = ->(page_key, view) { { products: Product.limit(5) } }
 
-  # Optional hook: customize Ahoy visit scope (e.g. exclude internal traffic)
-  # c.analytics_visit_scope = ->(scope) { scope.where.not(ip: ["127.0.0.1"]) }
+  # Optional hook: filter Ahoy visits before analytics queries run.
+  # Use this to exclude known bots, internal IPs, or staging traffic.
+  # Examples (combine as needed):
+  #
+  #   Exclude localhost + internal subnets:
+  #   c.analytics_visit_scope = ->(scope) {
+  #     scope.where.not(ip: %w[127.0.0.1 ::1])
+  #          .where("ip NOT LIKE '10.%'")
+  #          .where("ip NOT LIKE '192.168.%'")
+  #   }
+  #
+  #   Exclude Ahoy's built-in bot detection (requires Ahoy.bot_detection_enabled = true
+  #   in config/initializers/ahoy.rb, which sets user_agent on the visit):
+  #   c.analytics_visit_scope = ->(scope) {
+  #     scope.where("user_agent NOT REGEXP ?", Ahoy::BOT_AGENTS.join("|"))
+  #   }
+  #
+  #   Simple IP-based staging exclusion:
+  #   INTERNAL_IPS = %w[127.0.0.1 ::1].freeze
+  #   c.analytics_visit_scope = ->(scope) { scope.where.not(ip: INTERNAL_IPS) }
+  #
+  # c.analytics_visit_scope = ->(scope) { scope.where.not(ip: ["127.0.0.1", "::1"]) }
 
-  # Optional hook: customize Ahoy event scope
+  # Optional hook: customize Ahoy event scope (e.g. exclude events from certain visits)
   # c.analytics_event_scope = ->(scope) { scope }
 
   # Optional hook: provide extra dashboard cards
@@ -60,6 +80,23 @@ RubyCms.configure do |c|
   #   [{ title: "Custom KPI", value: visits_scope.where.not(utm_source: nil).count }]
   # end
 
+  # Conversion tracking: track goals from host app controllers or form handlers.
+  # Use the EVENT_CONVERSION constant to stay consistent with the analytics dashboard.
+  # Example in a controller action (after a successful form submit):
+  #
+  #   def create
+  #     if @contact.save
+  #       ahoy.track RubyCms::Analytics::Report::EVENT_CONVERSION,
+  #                  goal: "contact_form", path: request.path
+  #       redirect_to success_path
+  #     else
+  #       render :new
+  #     end
+  #   end
+  #
+  # Goal names are free-form strings; keep them consistent so the dashboard groups them.
+  # Recommended goal names: "contact_form", "newsletter_signup", "registration", "purchase"
+
   # -----------------------------------------------------------------------------
   # Optional bootstrap values (initializer -> DB import, once)
   #

data/lib/ruby_cms/settings_registry.rb

@@ -166,6 +166,41 @@ module RubyCms
           category: :analytics,
           description: "Events shown on visitor details screen"
         )
+        register(
+          key: :analytics_max_exit_pages,
+          type: :integer,
+          default: 10,
+          category: :analytics,
+          description: "Maximum number of exit pages to show"
+        )
+        register(
+          key: :analytics_max_conversions,
+          type: :integer,
+          default: 10,
+          category: :analytics,
+          description: "Maximum number of conversion goals to show in breakdown"
+        )
+        register(
+          key: :analytics_max_referrers,
+          type: :integer,
+          default: 10,
+          category: :analytics,
+          description: "Maximum number of top referrers to show"
+        )
+        register(
+          key: :analytics_max_landing_pages,
+          type: :integer,
+          default: 10,
+          category: :analytics,
+          description: "Maximum number of top landing pages to show"
+        )
+        register(
+          key: :analytics_max_utm_sources,
+          type: :integer,
+          default: 10,
+          category: :analytics,
+          description: "Maximum number of UTM sources to show"
+        )
 
         # Dashboard
         register(

data/lib/ruby_cms/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyCms
-  VERSION = "0.2.0.4"
+  VERSION = "0.2.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.0.4
+  version: 0.2.0.8
 platform: ruby
 authors:
 - Codebyjob