ruby_cms 0.2.1.0 → 1.0.0

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+# Tracks security events to Ahoy::Event for analytics and monitoring.
+# Use from host app controllers: SecurityTracker.track(...)
+#
+# Example:
+#   SecurityTracker.track("failed_login", description: "Invalid password", request: request)
+class SecurityTracker
+  EVENT_TYPES = %w[
+    failed_login
+    successful_login
+    logout
+    admin_access_denied
+    suspicious_user_agent
+    unusual_request_pattern
+    session_hijack_attempt
+    rate_limit_exceeded
+    csrf_token_mismatch
+    unauthorized_admin_attempt
+    contact_honeypot_triggered
+    contact_blocked_email_attempt
+    email_blocklist_error
+    ip_blocklist_error
+    ip_blocklist_blocked
+  ].freeze
+
+  def self.track(event_type, description:, user: nil, request: nil, ip_address: nil,
+                 user_agent: nil, request_path: nil)
+    return nil unless EVENT_TYPES.include?(event_type)
+
+    attrs = {
+      name: event_type,
+      ip_address: ip_address || request&.remote_ip,
+      request_path: request_path || request&.path,
+      user_agent: user_agent || request&.user_agent,
+      description: description,
+      time: Time.current,
+      user: user
+    }
+
+    Ahoy::Event.create!(**attrs)
+  rescue StandardError => e
+    Rails.logger.error "Failed to track security event: #{e.message}"
+    nil
+  end
+
+  def self.risk_level(event_type)
+    case event_type
+    when "session_hijack_attempt", "unauthorized_admin_attempt" then "high"
+    when "failed_login", "csrf_token_mismatch" then "medium"
+    when "successful_login", "logout" then "info"
+    else "low"
+    end
+  end
+
+  def self.risk_color(event_type)
+    case risk_level(event_type)
+    when "high" then "red"
+    when "medium" then "yellow"
+    when "info" then "green"
+    else "blue"
+    end
+  end
+
+  def self.formatted_description(event)
+    event_type = event.name
+    ip = event.ip_address
+    user_agent = event.user_agent
+    path = event.request_path
+    description = event.try(:description) || event.properties&.dig("description")
+
+    case event_type
+    when "failed_login" then "Failed login attempt from #{ip}"
+    when "successful_login" then "Successful admin login from #{ip}"
+    when "logout" then "Admin logout from #{ip}"
+    when "admin_access_denied" then "Unauthorized admin access attempt from #{ip}"
+    when "unauthorized_admin_attempt" then "Non-admin user attempted admin login"
+    when "suspicious_user_agent" then "Suspicious user agent: #{user_agent&.truncate(50)}"
+    when "unusual_request_pattern" then "Unusual request pattern: #{path}"
+    when "session_hijack_attempt" then "Potential session hijacking from #{ip}"
+    when "rate_limit_exceeded" then "Rate limit exceeded from #{ip}"
+    when "csrf_token_mismatch" then "CSRF token mismatch on #{path}"
+    when "contact_honeypot_triggered" then "Contact honeypot triggered from #{ip}"
+    when "contact_blocked_email_attempt" then "Blocked contact email attempt: #{description}"
+    when "email_blocklist_error" then "Error adding email to blocklist: #{description}"
+    when "ip_blocklist_blocked" then "Blocked IP #{ip} attempting #{path}"
+    else description.presence || event_type.humanize
+    end
+  end
+end

data/{app/views/ruby_cms → lib/generators/ruby_cms/templates/views}/admin/analytics/index.html.erb

@@ -1,35 +1,45 @@
-<%= admin_page(
-  title: t("ruby_cms.admin.analytics.title", default: "Analytics"),
-  subtitle: t("ruby_cms.admin.analytics.subtitle", default: "Traffic and engagement overview"),
-  content_card: false
-) do %>
-  <div class="space-y-6">
+<%= AdminPage do %>
+  <%= AdminPageHeader(
+    title: t("ruby_cms.admin.analytics.title", default: "Analytics"),
+    subtitle: t("ruby_cms.admin.analytics.subtitle", default: "Traffic and engagement overview"),
+    breadcrumbs: [
+      { label: t("ruby_cms.admin.breadcrumb.admin", default: "Admin"), url: admin_root_path },
+      { label: t("ruby_cms.admin.analytics.title", default: "Analytics") }
+    ]
+  ) %>
 
-    <%# ── Period selector + date range ── %>
-    <div class="flex flex-wrap items-start justify-between gap-4">
-      <div class="inline-flex items-center rounded-lg border border-border/60 bg-white p-1 shadow-sm">
-        <% [["Day", "day"], ["Week", "week"], ["Month", "month"], ["Year", "year"]].each do |label, value| %>
-          <% start_date = case value
-                         when "day" then Date.current
-                         when "week" then 6.days.ago.to_date
-                         when "month" then 29.days.ago.to_date
-                         else 364.days.ago.to_date
-                         end %>
-          <% active = params[:period] == value || (params[:period].blank? && value == @period.to_s) %>
-          <%= link_to label,
-                      ruby_cms_admin_analytics_path(start_date:, end_date: Date.current, period: value),
-                      class: "px-4 py-1.5 text-sm font-medium rounded-md transition-colors #{active ? 'bg-primary text-primary-foreground shadow-sm' : 'text-muted-foreground hover:text-foreground'}" %>
-        <% end %>
+<div class="min-w-0 space-y-6 p-4">
+
+    <%# ── Period selector + date range (same label + h-9 control row as date fields) ── %>
+    <div class="flex min-w-0 flex-col gap-4 sm:flex-row sm:flex-wrap sm:items-end sm:justify-between">
+      <div class="min-w-0 flex flex-col gap-1">
+        <span class="text-xs font-medium text-muted-foreground"><%= t("ruby_cms.admin.analytics.period_label", default: "Period") %></span>
+        <div class="overflow-x-auto pb-1 -mx-1 px-1 sm:mx-0 sm:px-0 sm:pb-0">
+        <div class="inline-flex h-9 min-w-max items-stretch gap-0.5 rounded-lg border border-border/60 bg-white p-0.5 shadow-sm">
+          <% [ [ "Day", "day" ], [ "Week", "week" ], [ "Month", "month" ], [ "Year", "year" ] ].each do |label, value| %>
+            <% start_date = case value
+               when "day" then Date.current
+               when "week" then 6.days.ago.to_date
+               when "month" then 29.days.ago.to_date
+               else 364.days.ago.to_date
+               end %>
+            <% active = params[:period] == value || (params[:period].blank? && value == @period.to_s) %>
+            <%= link_to label,
+                        admin_analytics_path(start_date:, end_date: Date.current, period: value),
+                        class: "inline-flex shrink-0 items-center justify-center px-3.5 text-sm font-medium rounded-md transition-colors #{active ? 'bg-primary text-primary-foreground shadow-sm' : 'text-muted-foreground hover:text-foreground'}" %>
+          <% end %>
+        </div>
+        </div>
       </div>
 
-      <%= form_with url: ruby_cms_admin_analytics_path, method: :get, local: true, class: "flex items-end gap-2" do |f| %>
+      <%= form_with url: admin_analytics_path, method: :get, local: true, class: "flex min-w-0 flex-1 flex-wrap items-end gap-2" do |f| %>
         <%= f.hidden_field :period, value: @period %>
         <div class="flex flex-col gap-1">
-          <span class="text-xs font-medium text-muted-foreground">From</span>
+          <span class="text-xs font-medium text-muted-foreground"><%= t("ruby_cms.admin.analytics.date_from", default: "From") %></span>
           <%= f.date_field :start_date, value: @start_date, class: "h-9 rounded-md border border-border bg-white px-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-primary/20" %>
         </div>
         <div class="flex flex-col gap-1">
-          <span class="text-xs font-medium text-muted-foreground">To</span>
+          <span class="text-xs font-medium text-muted-foreground"><%= t("ruby_cms.admin.analytics.date_to", default: "To") %></span>
           <%= f.date_field :end_date, value: @end_date, class: "h-9 rounded-md border border-border bg-white px-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-primary/20" %>
         </div>
         <%= f.submit t("ruby_cms.admin.analytics.apply_filters", default: "Apply"),
@@ -37,13 +47,13 @@
       <% end %>
     </div>
 
-    <%# ── Activity charts (3/4) + KPI summary card (1/4), same row height ── %>
-    <div class="grid gap-4 items-stretch" style="grid-template-columns: 3fr 1fr;">
+    <%# ── Activity charts (3/4) + KPI summary card (1/4), same row height on large screens ── %>
+    <div class="grid min-w-0 grid-cols-1 items-stretch gap-4 lg:grid-cols-[minmax(0,3fr)_minmax(0,1fr)]">
 
       <%# Left: activity charts stacked %>
       <div class="flex min-h-0 min-w-0 flex-col gap-4">
-        <%= render "ruby_cms/admin/analytics/partials/daily_activity_chart" %>
-        <%= render "ruby_cms/admin/analytics/partials/hourly_activity_chart" %>
+        <%= render "admin/analytics/partials/daily_activity_chart" %>
+        <%= render "admin/analytics/partials/hourly_activity_chart" %>
       </div>
 
       <%# Right: KPI summary — stretches to match combined chart column height %>
@@ -80,13 +90,13 @@
             <div class="flex items-center justify-between mb-1">
               <span class="text-xs font-medium text-muted-foreground"><%= t("ruby_cms.admin.analytics.total_page_views", default: "Page Views") %></span>
               <div class="rounded-md bg-blue-50 p-1 flex-shrink-0">
-                <svg class="w-3.5 h-3.5 text-blue-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"/></svg>
+                <svg class="w-3.5 h-3.5 text-blue-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" /></svg>
               </div>
             </div>
             <div class="flex items-baseline gap-2">
               <p class="text-xl font-bold tracking-tight text-foreground tabular-nums"><%= number_with_delimiter(@total_page_views) %></p>
               <% if (delta = @period_deltas&.dig(:total_page_views)) %>
-                <span class="inline-flex items-center text-xs font-semibold rounded-full px-1.5 py-0.5 <%= delta >= 0 ? 'bg-emerald-50 text-emerald-700' : 'bg-red-50 text-red-700' %>">
+                <span class="inline-flex items-center text-xs font-semibold rounded-full px-1.5 py-0.5 <%= delta >= 0 ? "bg-emerald-50 text-emerald-700" : "bg-red-50 text-red-700" %>">
                   <%= delta >= 0 ? "↑" : "↓" %> <%= delta.abs %>%
                 </span>
               <% end %>
@@ -99,13 +109,13 @@
             <div class="flex items-center justify-between mb-1">
               <span class="text-xs font-medium text-muted-foreground"><%= t("ruby_cms.admin.analytics.unique_visitors", default: "Unique Visitors") %></span>
               <div class="rounded-md bg-violet-50 p-1 flex-shrink-0">
-                <svg class="w-3.5 h-3.5 text-violet-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0z"/></svg>
+                <svg class="w-3.5 h-3.5 text-violet-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0z" /></svg>
               </div>
             </div>
             <div class="flex items-baseline gap-2">
               <p class="text-xl font-bold tracking-tight text-foreground tabular-nums"><%= number_with_delimiter(@unique_visitors) %></p>
               <% if (delta = @period_deltas&.dig(:unique_visitors)) %>
-                <span class="inline-flex items-center text-xs font-semibold rounded-full px-1.5 py-0.5 <%= delta >= 0 ? 'bg-emerald-50 text-emerald-700' : 'bg-red-50 text-red-700' %>">
+                <span class="inline-flex items-center text-xs font-semibold rounded-full px-1.5 py-0.5 <%= delta >= 0 ? "bg-emerald-50 text-emerald-700" : "bg-red-50 text-red-700" %>">
                   <%= delta >= 0 ? "↑" : "↓" %> <%= delta.abs %>%
                 </span>
               <% elsif @new_visitor_percentage.to_i > 0 %>
@@ -122,13 +132,13 @@
             <div class="flex items-center justify-between mb-1">
               <span class="text-xs font-medium text-muted-foreground"><%= t("ruby_cms.admin.analytics.total_sessions", default: "Sessions") %></span>
               <div class="rounded-md bg-emerald-50 p-1 flex-shrink-0">
-                <svg class="w-3.5 h-3.5 text-emerald-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z"/></svg>
+                <svg class="w-3.5 h-3.5 text-emerald-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z" /></svg>
               </div>
             </div>
             <div class="flex items-baseline gap-2">
               <p class="text-xl font-bold tracking-tight text-foreground tabular-nums"><%= number_with_delimiter(@total_sessions) %></p>
               <% if (delta = @period_deltas&.dig(:total_sessions)) %>
-                <span class="inline-flex items-center text-xs font-semibold rounded-full px-1.5 py-0.5 <%= delta >= 0 ? 'bg-emerald-50 text-emerald-700' : 'bg-red-50 text-red-700' %>">
+                <span class="inline-flex items-center text-xs font-semibold rounded-full px-1.5 py-0.5 <%= delta >= 0 ? "bg-emerald-50 text-emerald-700" : "bg-red-50 text-red-700" %>">
                   <%= delta >= 0 ? "↑" : "↓" %> <%= delta.abs %>%
                 </span>
               <% end %>
@@ -140,13 +150,13 @@
           <div class="px-4 py-3">
             <div class="flex items-center justify-between mb-1">
               <span class="text-xs font-medium text-muted-foreground"><%= t("ruby_cms.admin.analytics.bounce_rate", default: "Bounce Rate") %></span>
-              <div class="rounded-md p-1 flex-shrink-0 <%= @bounce_rate.to_f > 70 ? 'bg-red-50' : @bounce_rate.to_f > 50 ? 'bg-amber-50' : 'bg-emerald-50' %>">
-                <svg class="w-3.5 h-3.5 <%= @bounce_rate.to_f > 70 ? 'text-red-600' : @bounce_rate.to_f > 50 ? 'text-amber-600' : 'text-emerald-600' %>" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"/></svg>
+              <div class="rounded-md p-1 flex-shrink-0 <%= @bounce_rate.to_f > 70 ? "bg-red-50" : @bounce_rate.to_f > 50 ? "bg-amber-50" : "bg-emerald-50" %>">
+                <svg class="w-3.5 h-3.5 <%= @bounce_rate.to_f > 70 ? "text-red-600" : @bounce_rate.to_f > 50 ? "text-amber-600" : "text-emerald-600" %>" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" /></svg>
               </div>
             </div>
             <div class="flex items-baseline gap-2">
               <p class="text-xl font-bold tracking-tight text-foreground tabular-nums"><%= @bounce_rate %>%</p>
-              <span class="inline-flex items-center text-xs font-semibold rounded-full px-1.5 py-0.5 <%= @bounce_rate.to_f > 70 ? 'bg-red-50 text-red-700' : @bounce_rate.to_f > 50 ? 'bg-amber-50 text-amber-700' : 'bg-emerald-50 text-emerald-700' %>">
+              <span class="inline-flex items-center text-xs font-semibold rounded-full px-1.5 py-0.5 <%= @bounce_rate.to_f > 70 ? "bg-red-50 text-red-700" : @bounce_rate.to_f > 50 ? "bg-amber-50 text-amber-700" : "bg-emerald-50 text-emerald-700" %>">
                 <%= @bounce_rate.to_f > 70 ? "High" : @bounce_rate.to_f > 50 ? "Average" : "Good" %>
               </span>
             </div>
@@ -166,9 +176,9 @@
 
     <div class="grid grid-cols-1 lg:grid-cols-3 gap-4">
       <div class="lg:col-span-2">
-        <%= render "ruby_cms/admin/analytics/partials/popular_pages" %>
+        <%= render "admin/analytics/partials/popular_pages" %>
       </div>
-      <%= render "ruby_cms/admin/analytics/partials/top_visitors" %>
+      <%= render "admin/analytics/partials/top_visitors" %>
     </div>
 
     <%# ── Section: Traffic Sources ── %>
@@ -178,9 +188,9 @@
     </div>
 
     <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-      <%= render "ruby_cms/admin/analytics/partials/top_referrers" %>
-      <%= render "ruby_cms/admin/analytics/partials/landing_pages" %>
-      <%= render "ruby_cms/admin/analytics/partials/utm_sources" %>
+      <%= render "admin/analytics/partials/top_referrers" %>
+      <%= render "admin/analytics/partials/landing_pages" %>
+      <%= render "admin/analytics/partials/utm_sources" %>
     </div>
 
     <%# ── Section: Audience & Technology ── %>
@@ -190,9 +200,9 @@
     </div>
 
     <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-      <%= render "ruby_cms/admin/analytics/partials/browser_device" %>
-      <%= render "ruby_cms/admin/analytics/partials/os_stats" %>
-      <%= render "ruby_cms/admin/analytics/partials/recent_activity" %>
+      <%= render "admin/analytics/partials/browser_device" %>
+      <%= render "admin/analytics/partials/os_stats" %>
+      <%= render "admin/analytics/partials/recent_activity" %>
     </div>
 
     <%# ── Section: Behavior ── %>
@@ -202,8 +212,8 @@
     </div>
 
     <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
-      <% if lookup_context.exists?("ruby_cms/admin/analytics/partials/exit_pages", [], true) %>
-        <%= render "ruby_cms/admin/analytics/partials/exit_pages" %>
+      <% if lookup_context.exists?("admin/analytics/partials/exit_pages", [], true) %>
+        <%= render "admin/analytics/partials/exit_pages" %>
       <% else %>
         <div class="rounded-xl border border-border/60 bg-white p-4 shadow-sm">
           <p class="text-sm font-semibold text-foreground"><%= t("ruby_cms.admin.analytics.exit_pages", default: "Exit Pages") %></p>
@@ -211,8 +221,8 @@
         </div>
       <% end %>
 
-      <% if lookup_context.exists?("ruby_cms/admin/analytics/partials/conversions", [], true) %>
-        <%= render "ruby_cms/admin/analytics/partials/conversions" %>
+      <% if lookup_context.exists?("admin/analytics/partials/conversions", [], true) %>
+        <%= render "admin/analytics/partials/conversions" %>
       <% else %>
         <div class="rounded-xl border border-border/60 bg-white p-4 shadow-sm">
           <p class="text-sm font-semibold text-foreground"><%= t("ruby_cms.admin.analytics.conversions", default: "Conversions") %></p>
@@ -226,7 +236,7 @@
       <div class="rounded-xl border border-amber-200 bg-amber-50/60 shadow-sm overflow-hidden">
         <div class="px-4 py-3 border-b border-amber-200/60 flex items-center gap-3">
           <div class="rounded-md bg-amber-100 p-1.5 flex-shrink-0">
-            <svg class="w-4 h-4 text-amber-700" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"/></svg>
+            <svg class="w-4 h-4 text-amber-700" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg>
           </div>
           <div>
             <p class="text-sm font-semibold text-amber-900"><%= t("ruby_cms.admin.analytics.suspicious_activity", default: "Suspicious activity") %></p>
@@ -260,4 +270,5 @@
     <% end %>
 
   </div>
+</div>
 <% end %>

data/{app/views/ruby_cms → lib/generators/ruby_cms/templates/views}/admin/analytics/page_details.html.erb

@@ -3,18 +3,23 @@
   suspicious_ua = @page_views.any? { |e| e.visit&.user_agent.to_s.include?("bot") || e.visit&.user_agent.to_s.include?("crawler") }
   show_security = high_volume || suspicious_ua
 %>
-<%= admin_page(
+<%= AdminPageHeader(
   title: @page_name.to_s.humanize,
   subtitle: "Page analytics · #{@start_date} → #{@end_date}",
-  content_card: false
+  breadcrumbs: [
+    { label: t("ruby_cms.admin.breadcrumb.admin", default: "Admin"), url: admin_root_path },
+    { label: t("ruby_cms.admin.analytics.title", default: "Analytics"), url: admin_analytics_path },
+    { label: @page_name.to_s.humanize }
+  ]
 ) do %>
-  <div class="space-y-6">
-    <div class="flex items-start justify-between gap-4">
-      <div class="flex items-center gap-2">
-        <%= render "ruby_cms/admin/analytics/partials/security_alert" if show_security %>
-      </div>
-      <%= render "ruby_cms/admin/analytics/partials/back_button", path: ruby_cms_admin_analytics_path(start_date: @start_date, end_date: @end_date, period: @period) %>
+  <%= render "admin/analytics/partials/back_button", path: admin_analytics_path(start_date: @start_date, end_date: @end_date, period: @period) %>
+<% end %>
+<div class="space-y-6 mt-4">
+  <div class="flex items-start justify-between gap-4">
+    <div class="flex items-center gap-2">
+      <%= render "admin/analytics/partials/security_alert" if show_security %>
     </div>
+  </div>
 
     <div class="grid grid-cols-3 gap-4">
       <div class="rounded-lg border border-border/60 bg-white p-6 shadow-sm">
@@ -56,7 +61,7 @@
                   <td class="px-6 py-3 font-medium text-foreground tabular-nums">
                     <% if ip.present? && ip != "Unknown" %>
                       <%= link_to ip,
-                                  visitor_details_ruby_cms_admin_analytics_path(ip_address: ip, start_date: @start_date, end_date: @end_date, period: @period),
+                                  admin_analytics_visitor_details_path(ip_address: ip, start_date: @start_date, end_date: @end_date, period: @period),
                                   class: "text-primary hover:underline" %>
                     <% else %>
                       <span class="text-muted-foreground"><%= ip || "Unknown" %></span>
@@ -77,4 +82,4 @@
       </div>
     </div>
   </div>
-<% end %>
+</div>

data/{app/views/ruby_cms → lib/generators/ruby_cms/templates/views}/admin/analytics/partials/_browser_device.html.erb

@@ -1,7 +1,7 @@
 <div class="rounded-xl border border-border/60 bg-white shadow-sm overflow-hidden">
   <div class="flex items-center gap-3 px-4 py-3 border-b border-border/40">
     <div class="rounded-md bg-slate-100 p-1.5 flex-shrink-0">
-      <svg class="w-4 h-4 text-slate-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/></svg>
+      <svg class="w-4 h-4 text-slate-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>
     </div>
     <div>
       <p class="text-sm font-semibold text-foreground"><%= t("ruby_cms.admin.analytics.browsers_devices", default: "Browsers & Devices") %></p>
@@ -52,7 +52,7 @@
 
     <% if (@browser_stats.blank? || @browser_stats.empty?) && (@device_stats.blank? || @device_stats.empty?) %>
       <div class="flex flex-col items-center justify-center py-6 gap-2">
-        <svg class="w-8 h-8 text-muted-foreground/30" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"/></svg>
+        <svg class="w-8 h-8 text-muted-foreground/30" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>
         <p class="text-sm text-muted-foreground"><%= t("ruby_cms.admin.analytics.no_data", default: "No data yet.") %></p>
       </div>
     <% end %>

data/{app/views/ruby_cms → lib/generators/ruby_cms/templates/views}/admin/analytics/partials/_conversions.html.erb

@@ -2,7 +2,7 @@
   <div class="flex items-center justify-between gap-3 px-4 py-3 border-b border-border/40">
     <div class="flex items-center gap-3">
       <div class="rounded-md bg-emerald-50 p-1.5 flex-shrink-0">
-        <svg class="w-4 h-4 text-emerald-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"/></svg>
+        <svg class="w-4 h-4 text-emerald-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
       </div>
       <div>
         <p class="text-sm font-semibold text-foreground"><%= t("ruby_cms.admin.analytics.conversions", default: "Conversions") %></p>
@@ -37,11 +37,11 @@
     </div>
   <% else %>
     <div class="flex flex-col items-center justify-center px-4 py-10 gap-3">
-      <svg class="w-8 h-8 text-muted-foreground/30" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"/></svg>
+      <svg class="w-8 h-8 text-muted-foreground/30" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
       <div class="text-center">
         <p class="text-sm font-medium text-foreground"><%= t("ruby_cms.admin.analytics.no_conversions", default: "No conversions recorded.") %></p>
         <p class="mt-2 text-xs font-mono bg-muted/60 border border-border/40 rounded-md px-3 py-1.5 inline-block text-muted-foreground">
-          ahoy.track "<%= RubyCms::Analytics::Report::EVENT_CONVERSION %>", goal: "contact_form"
+          ahoy.track "<%= Analytics::Report::EVENT_CONVERSION %>", goal: "contact_form"
         </p>
       </div>
     </div>

data/{app/views/ruby_cms → lib/generators/ruby_cms/templates/views}/admin/analytics/partials/_daily_activity_chart.html.erb

@@ -4,14 +4,14 @@
   has_data     = daily_arr.present? && daily_arr.any?
   max_views    = daily_arr.map { |_k, v| v.to_i }.max.to_i
   max_visitors = (@daily_visitors || {}).values.map(&:to_i).max.to_i
-  max_value    = [max_views, max_visitors, 1].max
+  max_value    = [ max_views, max_visitors, 1 ].max
   # Plot height + x-axis band (month view labels like "03/12–03/14" need ~32–36px; 20px was too tight and clipped)
   bar_area_h   = 160
   x_axis_h     = 40
   chart_h      = bar_area_h + x_axis_h
   total_views    = daily_arr.sum { |_k, v| v.to_i }
   total_visitors = (@daily_visitors || {}).values.sum(&:to_i)
-  n_days         = [daily_arr.size.to_f, 1.0].max
+  n_days         = [ daily_arr.size.to_f, 1.0 ].max
   line_pts_views = daily_arr.each_with_index.map { |(d, vc), i|
     vx = ((i + 0.5) / n_days) * 100.0
     vy = 100.0 - (max_value.positive? ? (vc.to_f / max_value * 100.0) : 0.0)
@@ -24,7 +24,7 @@
     "#{vx.round(4)},#{vy.round(4)}"
   }.join(" ")
   # Month view: compact day-number ticks + scroll; ~14px per slot is enough when labels are "3".."31"
-  plot_scroll_min_w = [daily_arr.size * 14 + 56, 280].max
+  plot_scroll_min_w = [ daily_arr.size * 14 + 56, 280 ].max
 %>
 
 <div class="min-w-0 rounded-xl border border-border/60 bg-white shadow-sm">
@@ -34,7 +34,7 @@
     <div class="flex items-center gap-3">
       <div class="rounded-md bg-sky-50 p-1.5 flex-shrink-0">
         <svg class="w-4 h-4 text-sky-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 12l3-3 3 3 4-4M8 21l4-4 4 4M3 4h18M4 4h16v12a1 1 0 01-1 1H5a1 1 0 01-1-1V4z"/>
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 12l3-3 3 3 4-4M8 21l4-4 4 4M3 4h18M4 4h16v12a1 1 0 01-1 1H5a1 1 0 01-1-1V4z" />
         </svg>
       </div>
       <div>
@@ -64,7 +64,7 @@
         <div class="rcms-chart-mode-toggle inline-flex rounded-lg border border-border/60 bg-muted/30 p-0.5 text-[11px] font-medium"
              role="group"
              data-rcms-chart="<%= chart_id %>"
-             aria-label="<%= t('ruby_cms.admin.analytics.chart_display', default: 'Chart display') %>">
+             aria-label="<%= t("ruby_cms.admin.analytics.chart_display", default: "Chart display") %>">
           <button type="button"
                   class="rcms-mode-btn px-2 py-1 rounded-md transition-colors text-muted-foreground hover:text-foreground"
                   data-mode="bars"
@@ -99,7 +99,7 @@
 
           <%# Y-axis %>
           <div class="flex flex-col justify-between text-right text-xs text-muted-foreground tabular-nums" style="height:<%= chart_h %>px; padding-bottom:<%= x_axis_h %>px;">
-            <% [100, 75, 50, 25, 0].each do |pct| %>
+            <% [ 100, 75, 50, 25, 0 ].each do |pct| %>
               <div class="leading-none"><%= number_with_delimiter((max_value * pct / 100.0).round) %></div>
             <% end %>
           </div>
@@ -117,8 +117,8 @@
                  style="height:<%= bar_area_h %>px; top:0;"
                  aria-hidden="true">
               <svg class="w-full h-full overflow-visible" viewBox="0 0 100 100" preserveAspectRatio="none">
-                <polyline class="rcms-line-views" fill="none" stroke="rgb(37 99 235)" stroke-width="1.25" vector-effect="non-scaling-stroke" stroke-linejoin="round" stroke-linecap="round" points="<%= line_pts_views %>"/>
-                <polyline class="rcms-line-visitors" fill="none" stroke="rgb(96 165 250)" stroke-width="1.25" vector-effect="non-scaling-stroke" stroke-linejoin="round" stroke-linecap="round" points="<%= line_pts_visitors %>"/>
+                <polyline class="rcms-line-views" fill="none" stroke="rgb(37 99 235)" stroke-width="1.25" vector-effect="non-scaling-stroke" stroke-linejoin="round" stroke-linecap="round" points="<%= line_pts_views %>" />
+                <polyline class="rcms-line-visitors" fill="none" stroke="rgb(96 165 250)" stroke-width="1.25" vector-effect="non-scaling-stroke" stroke-linejoin="round" stroke-linecap="round" points="<%= line_pts_visitors %>" />
               </svg>
             </div>
 
@@ -127,8 +127,8 @@
               <% daily_arr.each do |date, views_count| %>
                 <%
                   visitors_count = (@daily_visitors || {})[date].to_i
-                  vh = views_count.to_i.positive? ? [((views_count.to_f / max_value) * bar_area_h).round, 2].max : 0
-                  uh = visitors_count.positive?   ? [((visitors_count.to_f / max_value) * bar_area_h).round, 2].max : 0
+                  vh = views_count.to_i.positive? ? [ ((views_count.to_f / max_value) * bar_area_h).round, 2 ].max : 0
+                  uh = visitors_count.positive?   ? [ ((visitors_count.to_f / max_value) * bar_area_h).round, 2 ].max : 0
                   label = format_chart_date(date)
                   short = format_chart_date_axis(date)
                   v_pct = total_views.positive? ? (100.0 * views_count.to_i / total_views) : 0.0
@@ -138,8 +138,8 @@
                      data-label="<%= label %>"
                      data-views="<%= number_with_delimiter(views_count.to_i) %>"
                      data-visitors="<%= number_with_delimiter(visitors_count) %>"
-                     data-views-pct="<%= sprintf('%.1f', v_pct) %>"
-                     data-visitors-pct="<%= sprintf('%.1f', u_pct) %>"
+                     data-views-pct="<%= sprintf("%.1f", v_pct) %>"
+                     data-visitors-pct="<%= sprintf("%.1f", u_pct) %>"
                      data-max-scale="<%= number_with_delimiter(max_value) %>">
                   <%# Bar pair %>
                   <div class="w-full flex items-end justify-center gap-px rcms-bar-stack" style="height:<%= bar_area_h %>px;">
@@ -161,24 +161,25 @@
         </div>
       </div>
 
-      <script>
+      <script nonce="<%= request.content_security_policy_nonce %>">
       (function() {
         var BLUE600 = "rgb(37 99 235)";
         var BLUE400 = "rgb(96 165 250)";
         var MODE_KEY = "ruby_cms.analytics.dailyChartMode";
+        var CHART_ID = <%= chart_id.to_json.html_safe %>;
 
         function init() {
-          var chart = document.getElementById("<%= chart_id %>");
+          var chart = document.getElementById(CHART_ID);
           if (!chart || chart.__rcmsInit) return;
           chart.__rcmsInit = true;
 
-          var tip       = document.getElementById("<%= chart_id %>-tip");
+          var tip       = document.getElementById(CHART_ID + "-tip");
           var groups    = chart.querySelectorAll(".rcms-bar-group");
           var allBars   = chart.querySelectorAll(".rcms-bar");
           var lineLayer = chart.querySelector(".rcms-line-layer");
           var barsLayer = chart.querySelector(".rcms-bars-layer");
           var linePolys = lineLayer ? lineLayer.querySelectorAll("polyline") : [];
-          var toggles   = document.querySelectorAll('.rcms-chart-mode-toggle[data-rcms-chart="<%= chart_id %>"] .rcms-mode-btn');
+          var toggles   = document.querySelectorAll('.rcms-chart-mode-toggle[data-rcms-chart="' + CHART_ID + '"] .rcms-mode-btn');
 
           function setMode(mode) {
             var isLine = mode === "line";
@@ -324,7 +325,7 @@
     <% else %>
       <div class="flex flex-col items-center justify-center h-44 gap-2">
         <svg class="w-8 h-8 text-muted-foreground/30" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7 12l3-3 3 3 4-4M8 21l4-4 4 4M3 4h18M4 4h16v12a1 1 0 01-1 1H5a1 1 0 01-1-1V4z"/>
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M7 12l3-3 3 3 4-4M8 21l4-4 4 4M3 4h18M4 4h16v12a1 1 0 01-1 1H5a1 1 0 01-1-1V4z" />
         </svg>
         <p class="text-sm text-muted-foreground"><%= t("ruby_cms.admin.analytics.no_daily_data", default: "No daily activity data") %></p>
       </div>

data/{app/views/ruby_cms → lib/generators/ruby_cms/templates/views}/admin/analytics/partials/_exit_pages.html.erb

@@ -1,7 +1,7 @@
 <div class="rounded-xl border border-border/60 bg-white shadow-sm overflow-hidden">
   <div class="flex items-center gap-3 px-4 py-3 border-b border-border/40">
     <div class="rounded-md bg-amber-50 p-1.5 flex-shrink-0">
-      <svg class="w-4 h-4 text-amber-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"/></svg>
+      <svg class="w-4 h-4 text-amber-600" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" /></svg>
     </div>
     <div>
       <p class="text-sm font-semibold text-foreground"><%= t("ruby_cms.admin.analytics.exit_pages", default: "Exit Pages") %></p>
@@ -14,7 +14,7 @@
     <div class="divide-y divide-border/30">
       <% @exit_pages.first(8).each_with_index do |(page_name, count), idx| %>
         <% pct = total.positive? ? (count / total * 100).round(1) : 0 %>
-        <%= link_to page_details_ruby_cms_admin_analytics_path(page_name:, start_date: @start_date, end_date: @end_date, period: @period),
+        <%= link_to admin_analytics_page_details_path(page_name:, start_date: @start_date, end_date: @end_date, period: @period),
                     class: "group relative flex items-center justify-between gap-3 px-4 py-2.5 hover:bg-muted/40 transition-colors" do %>
           <div class="absolute inset-y-0 left-0 bg-amber-500/5 transition-all" style="width: <%= pct %>%"></div>
           <div class="relative z-10 flex items-center gap-3 min-w-0">
@@ -24,14 +24,14 @@
           <div class="relative z-10 flex items-center gap-2.5 flex-shrink-0">
             <span class="text-xs text-muted-foreground tabular-nums"><%= pct %>%</span>
             <span class="text-sm font-semibold tabular-nums text-foreground"><%= number_with_delimiter(count) %></span>
-            <svg class="w-3.5 h-3.5 text-muted-foreground/40 group-hover:text-primary/60 transition-colors" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/></svg>
+            <svg class="w-3.5 h-3.5 text-muted-foreground/40 group-hover:text-primary/60 transition-colors" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" /></svg>
           </div>
         <% end %>
       <% end %>
     </div>
   <% else %>
     <div class="flex flex-col items-center justify-center px-4 py-10 gap-2">
-      <svg class="w-8 h-8 text-muted-foreground/30" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"/></svg>
+      <svg class="w-8 h-8 text-muted-foreground/30" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" /></svg>
       <p class="text-sm font-medium text-foreground"><%= t("ruby_cms.admin.analytics.no_exit_pages", default: "No exit page data available.") %></p>
       <p class="text-xs text-muted-foreground">Track some traffic to see which pages visitors leave from</p>
     </div>