Update analytics and settings

Author: Job Hammer

app/helpers/ruby_cms/settings_helper.rb

@@ -85,31 +85,33 @@ def render_integer_setting_field(entry:, value:, tab:)
 
     def render_boolean_setting_field(entry:, value:, tab:)
       checked = ActiveModel::Type::Boolean.new.cast(value)
+      input_id = setting_input_id(entry)
+
       hidden = hidden_field_tag("preferences[#{entry.key}]", "false")
       checkbox = check_box_tag(
         "preferences[#{entry.key}]",
         "true",
         checked,
-        id: setting_input_id(entry),
+        id: input_id,
         class: "peer sr-only",
         data: autosave_data(entry.key, tab)
       )
-      label = content_tag(
-        :label,
-        "",
-        for: setting_input_id(entry),
-        class: "relative inline-flex h-7 w-12 cursor-pointer items-center rounded-full " \
-               "border border-border bg-muted transition-colors peer-checked:bg-primary peer-checked:border-primary"
-      ) do
-        content_tag(
-          :span,
-          "",
-          class: "inline-block h-5 w-5 transform rounded-full bg-background shadow-sm ring-1 ring-border transition " \
-                 "translate-x-1 peer-checked:translate-x-6"
-        )
-      end
 
-      content_tag(:div, class: "inline-flex items-center shrink-0") { hidden + checkbox + label }
+      track = content_tag(:label, "", for: input_id,
+                                      class: "relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full " \
+                                             "border-2 border-transparent bg-input transition-colors " \
+                                             "peer-checked:bg-primary " \
+                                             "peer-focus-visible:outline-none peer-focus-visible:ring-2 peer-focus-visible:ring-ring " \
+                                             "peer-focus-visible:ring-offset-2 peer-focus-visible:ring-offset-background")
+
+      thumb = content_tag(:span, "",
+                          class: "pointer-events-none absolute left-[3px] top-1/2 -translate-y-1/2 h-5 w-5 rounded-full " \
+                                 "bg-background shadow-lg ring-0 transition-transform " \
+                                 "translate-x-0 peer-checked:translate-x-5")
+
+      content_tag(:div, class: "relative inline-flex items-center shrink-0") do
+        safe_join([hidden, checkbox, track, thumb])
+      end
     end
 
     def render_json_setting_field(entry:, value:, tab:)

app/services/ruby_cms/analytics/report.rb

@@ -25,10 +25,18 @@ def initialize(start_date:, end_date:, period: nil)
 
       def dashboard_stats
         Rails.cache.fetch(cache_key("dashboard"), expires_in: cache_duration) do
+          total_views = page_view_events.count
+          total_sessions = visits.distinct.count(:visit_token)
+          unique_visitors = visits.distinct.count(:visitor_token)
+
           {
-            total_page_views: page_view_events.count,
-            unique_visitors: visits.distinct.count(:visitor_token),
-            total_sessions: visits.distinct.count(:visit_token),
+            total_page_views: total_views,
+            unique_visitors: unique_visitors,
+            total_sessions: total_sessions,
+            pages_per_session: total_sessions.positive? ? (total_views.to_f / total_sessions).round(1) : 0,
+            bounce_rate: compute_bounce_rate,
+            new_visitor_percentage: compute_new_visitor_percentage,
+            avg_daily_views: days_in_range.positive? ? (total_views.to_f / days_in_range).round(0).to_i : 0,
             popular_pages: popular_pages_data,
             top_visitors: top_visitors_data,
             hourly_activity: hourly_activity_data,
@@ -339,6 +347,32 @@ def extra_cards_data
         []
       end
 
+      def compute_bounce_rate
+        total = visits.distinct.count(:visit_token)
+        return 0 unless total.positive?
+
+        event_counts = page_view_events.group(:visit_id).count
+        single_page = event_counts.count { |_, c| c == 1 }
+        ((single_page.to_f / total) * 100).round(1)
+      rescue StandardError
+        0
+      end
+
+      def compute_new_visitor_percentage
+        total = visits.distinct.count(:visitor_token)
+        return 0 unless total.positive?
+
+        returning_tokens = Ahoy::Visit
+          .where("started_at < ?", @start_date)
+          .distinct
+          .pluck(:visitor_token)
+
+        new_count = visits.where.not(visitor_token: returning_tokens).distinct.count(:visitor_token)
+        ((new_count.to_f / total) * 100).round(0).to_i
+      rescue StandardError
+        0
+      end
+
       def days_in_range
         (@end_date.to_date - @start_date.to_date + 1).to_i
       end