ruby_cms 0.1.2 → 0.1.3

data/app/views/ruby_cms/admin/analytics/visitor_details.html.erb

@@ -7,114 +7,110 @@
   show_security = high_volume || rapid || suspicious_ua
 %>
 <%= admin_page(
-  title: t("ruby_cms.admin.analytics.visitor_details_title", default: "Visitor details"),
-  subtitle: "#{@start_date} → #{@end_date}",
+  title: @ip_address,
+  subtitle: "Visitor analytics · #{@start_date} → #{@end_date}",
   content_card: false
 ) do %>
   <div class="space-y-6">
     <div class="flex items-start justify-between gap-4">
-      <div class="min-w-0">
-        <p class="text-sm font-medium text-gray-500">IP Address</p>
-        <p class="mt-1 text-lg font-semibold tracking-tight text-gray-900 tabular-nums truncate"><%= @ip_address %></p>
-      </div>
-      <div class="flex items-center gap-2 flex-shrink-0">
+      <div class="flex items-center gap-2">
         <%= render "ruby_cms/admin/analytics/partials/security_alert" if show_security %>
-        <%= render "ruby_cms/admin/analytics/partials/back_button", path: ruby_cms_admin_analytics_path(start_date: @start_date, end_date: @end_date, period: @period) %>
       </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) %>
     </div>
 
-    <div class="grid grid-cols-4 gap-4">
-      <div class="rounded-lg border border-gray-200/80 bg-white p-5 shadow-sm">
-        <p class="text-sm font-medium text-gray-500">Total views</p>
-        <p class="mt-2 text-3xl font-semibold tracking-tight text-gray-900 tabular-nums"><%= number_with_delimiter(@visitor_stats[:total_views]) %></p>
+    <div class="grid grid-cols-2 lg:grid-cols-4 gap-4">
+      <div class="rounded-lg border border-border/60 bg-white p-6 shadow-sm">
+        <p class="text-sm font-medium text-muted-foreground">Total views</p>
+        <p class="mt-2 text-2xl font-semibold tracking-tight text-foreground tabular-nums"><%= number_with_delimiter(@visitor_stats[:total_views]) %></p>
       </div>
-      <div class="rounded-lg border border-gray-200/80 bg-white p-5 shadow-sm">
-        <p class="text-sm font-medium text-gray-500">Pages visited</p>
-        <p class="mt-2 text-3xl font-semibold tracking-tight text-gray-900 tabular-nums"><%= number_with_delimiter(@visitor_stats[:unique_pages]) %></p>
+      <div class="rounded-lg border border-border/60 bg-white p-6 shadow-sm">
+        <p class="text-sm font-medium text-muted-foreground">Pages visited</p>
+        <p class="mt-2 text-2xl font-semibold tracking-tight text-foreground tabular-nums"><%= number_with_delimiter(@visitor_stats[:unique_pages]) %></p>
       </div>
-      <div class="rounded-lg border border-gray-200/80 bg-white p-5 shadow-sm">
-        <p class="text-sm font-medium text-gray-500">First visit</p>
-        <p class="mt-2 text-base font-semibold text-gray-900"><%= @visitor_stats[:first_visit].present? ? l(@visitor_stats[:first_visit], format: :short) : "—" %></p>
+      <div class="rounded-lg border border-border/60 bg-white p-6 shadow-sm">
+        <p class="text-sm font-medium text-muted-foreground">First visit</p>
+        <p class="mt-2 text-base font-semibold text-foreground"><%= @visitor_stats[:first_visit].present? ? l(@visitor_stats[:first_visit], format: :short) : "—" %></p>
       </div>
-      <div class="rounded-lg border border-gray-200/80 bg-white p-5 shadow-sm">
-        <p class="text-sm font-medium text-gray-500">Last visit</p>
-        <p class="mt-2 text-base font-semibold text-gray-900"><%= @visitor_stats[:last_visit].present? ? l(@visitor_stats[:last_visit], format: :short) : "—" %></p>
+      <div class="rounded-lg border border-border/60 bg-white p-6 shadow-sm">
+        <p class="text-sm font-medium text-muted-foreground">Last visit</p>
+        <p class="mt-2 text-base font-semibold text-foreground"><%= @visitor_stats[:last_visit].present? ? l(@visitor_stats[:last_visit], format: :short) : "—" %></p>
       </div>
     </div>
 
     <% first_visit_record = Ahoy::Visit.where(ip: @ip_address, started_at: @start_date.beginning_of_day..@end_date.end_of_day).order(started_at: :asc).first %>
     <% has_meta = first_visit_record && (first_visit_record.os.present? || first_visit_record.device_type.present? || first_visit_record.browser.present? || (first_visit_record.respond_to?(:landing_page) && first_visit_record.landing_page.present?)) %>
     <% if has_meta %>
-      <div class="rounded-lg border border-gray-200/80 bg-white p-6 shadow-sm">
-        <p class="text-sm font-semibold text-gray-900">Environment</p>
-        <div class="mt-4 grid grid-cols-4 gap-4">
+      <div class="rounded-lg border border-border/60 bg-white p-6 shadow-sm">
+        <p class="text-sm font-semibold text-foreground">Environment</p>
+        <div class="mt-4 grid grid-cols-2 lg:grid-cols-4 gap-4">
           <% if first_visit_record.os.present? %>
             <div>
-              <p class="text-xs font-medium text-gray-500">OS</p>
-              <p class="mt-1 text-sm font-medium text-gray-900"><%= first_visit_record.os %></p>
+              <p class="text-xs font-medium text-muted-foreground">OS</p>
+              <p class="mt-1 text-sm font-medium text-foreground"><%= first_visit_record.os %></p>
             </div>
           <% end %>
           <% if first_visit_record.device_type.present? %>
             <div>
-              <p class="text-xs font-medium text-gray-500">Device</p>
-              <p class="mt-1 text-sm font-medium text-gray-900"><%= first_visit_record.device_type %></p>
+              <p class="text-xs font-medium text-muted-foreground">Device</p>
+              <p class="mt-1 text-sm font-medium text-foreground"><%= first_visit_record.device_type %></p>
             </div>
           <% end %>
           <% if first_visit_record.browser.present? %>
             <div>
-              <p class="text-xs font-medium text-gray-500">Browser</p>
-              <p class="mt-1 text-sm font-medium text-gray-900"><%= first_visit_record.browser %></p>
+              <p class="text-xs font-medium text-muted-foreground">Browser</p>
+              <p class="mt-1 text-sm font-medium text-foreground"><%= first_visit_record.browser %></p>
             </div>
           <% end %>
           <% if first_visit_record.respond_to?(:landing_page) && first_visit_record.landing_page.present? %>
-            <div class="col-span-4">
-              <p class="text-xs font-medium text-gray-500">Landing</p>
-              <p class="mt-1 text-sm font-medium text-gray-900 truncate" title="<%= first_visit_record.landing_page %>"><%= truncate(first_visit_record.landing_page, length: 120) %></p>
+            <div class="col-span-full">
+              <p class="text-xs font-medium text-muted-foreground">Landing page</p>
+              <p class="mt-1 text-sm font-medium text-foreground truncate" title="<%= first_visit_record.landing_page %>"><%= truncate(first_visit_record.landing_page, length: 120) %></p>
             </div>
           <% end %>
         </div>
       </div>
     <% end %>
 
-    <div class="rounded-lg border border-gray-200/80 bg-white shadow-sm overflow-hidden">
-      <div class="px-6 py-4 border-b border-gray-100">
-        <p class="text-sm font-semibold text-gray-900">Activity</p>
-        <p class="text-sm text-gray-500">Pages visited by this IP.</p>
+    <div class="rounded-lg border border-border/60 bg-white shadow-sm overflow-hidden">
+      <div class="px-6 py-4 border-b border-border/40">
+        <p class="text-sm font-semibold text-foreground">Activity</p>
+        <p class="text-sm text-muted-foreground">Pages visited by this IP.</p>
       </div>
 
       <div class="overflow-x-auto">
         <table class="min-w-full text-sm">
-          <thead class="bg-gray-50">
-            <tr class="text-left text-xs font-semibold uppercase tracking-wider text-gray-500">
+          <thead class="bg-muted/30">
+            <tr class="text-left text-xs font-medium uppercase tracking-wider text-muted-foreground">
               <th class="px-6 py-3">Page</th>
               <th class="px-6 py-3">Browser</th>
               <th class="px-6 py-3">Referrer</th>
               <th class="px-6 py-3">Time</th>
             </tr>
           </thead>
-          <tbody class="divide-y divide-gray-100">
+          <tbody class="divide-y divide-border/40">
             <% if @visitor_views.any? %>
               <% @visitor_views.each do |event| %>
                 <% visit = event.visit %>
-                <tr class="hover:bg-gray-50 transition-colors">
-                  <td class="px-6 py-3 font-medium text-gray-900">
+                <tr class="hover:bg-muted/30 transition-colors">
+                  <td class="px-6 py-3 font-medium text-foreground">
                     <% page_name = event.respond_to?(:page_name) ? event.page_name : nil %>
                     <% if page_name.present? %>
                       <%= link_to page_name,
                                   page_details_ruby_cms_admin_analytics_path(page_name:, start_date: @start_date, end_date: @end_date, period: @period),
-                                  class: "text-gray-900 hover:underline" %>
+                                  class: "text-primary hover:underline" %>
                     <% else %>
-                      <span class="text-gray-500">Unknown</span>
+                      <span class="text-muted-foreground">Unknown</span>
                     <% end %>
                   </td>
-                  <td class="px-6 py-3 text-gray-700"><%= visit&.browser || "Unknown" %></td>
-                  <td class="px-6 py-3 text-gray-700 truncate max-w-[26rem]"><%= visit&.referrer.presence || "Direct" %></td>
-                  <td class="px-6 py-3 text-gray-700"><%= time_ago_in_words(event.time) %> ago</td>
+                  <td class="px-6 py-3 text-foreground"><%= visit&.browser || "Unknown" %></td>
+                  <td class="px-6 py-3 text-foreground truncate max-w-[26rem]"><%= visit&.referrer.presence || "Direct" %></td>
+                  <td class="px-6 py-3 text-muted-foreground"><%= time_ago_in_words(event.time) %> ago</td>
                 </tr>
               <% end %>
             <% else %>
               <tr>
-                <td colspan="4" class="px-6 py-10 text-center text-sm text-gray-500">No activity recorded for this visitor</td>
+                <td colspan="4" class="px-6 py-10 text-center text-sm text-muted-foreground">No activity recorded for this visitor</td>
               </tr>
             <% end %>
           </tbody>

data/lib/generators/ruby_cms/install_generator.rb

@@ -13,7 +13,7 @@ module RubyCms
 
         Next steps (if not already done):
         - rails db:migrate
-        - rails ruby_cms:seed_permissions (includes manage_visitor_errors)
+        - rails ruby_cms:seed_permissions (includes manage_visitor_errors and manage_analytics)
         - rails ruby_cms:setup_admin (or: rails ruby_cms:grant_manage_admin email=you@example.com)
         - To seed content blocks from YAML: add content under content_blocks in config/locales/<locale>.yml, then run rails ruby_cms:content_blocks:seed (or call it from db/seeds.rb).
 
@@ -1035,6 +1035,7 @@ module RubyCms
               manage_permissions
               manage_content_blocks
               manage_visitor_errors
+              manage_analytics
             ]
             required_permission_ids = RubyCms::Permission.where(key: required_keys).pluck(:id)
             return false if required_permission_ids.size != required_keys.size

data/lib/ruby_cms/cli.rb

@@ -22,7 +22,7 @@ module RubyCms
   # Logic for the interactive first-admin setup. Uses Thor::Shell for prompts.
   class RunSetupAdmin
     ADMIN_PERMISSION_KEYS = %w[
-      manage_admin manage_permissions manage_content_blocks manage_visitor_errors
+      manage_admin manage_permissions manage_content_blocks manage_visitor_errors manage_analytics
     ].freeze
 
     class << self

data/lib/ruby_cms/version.rb

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

data/lib/tasks/admin.rake

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+namespace :admin do
+  def ruby_cms_user_class
+    Object.const_get(Rails.application.config.ruby_cms.user_class_name.presence ||
+                        "User")
+  end
+
+  def ruby_cms_email_attr(user_class)
+    user_class.column_names.include?("email_address") ? :email_address : :email
+  end
+
+  def ruby_cms_find_user_by_email(email)
+    user_class = ruby_cms_user_class
+    email_attr = ruby_cms_email_attr(user_class)
+    user_class.find_by(email_attr => email)
+  end
+
+  def ruby_cms_make_user_full_admin!(user)
+    # Prefer host app's make_admin! if it exists.
+    if user.respond_to?(:make_admin!) && user.respond_to?(:admin?) && !user.admin?
+      user.make_admin!
+    elsif user.class.column_names.include?("admin")
+      # Fallback if admin? / make_admin! aren't provided by host app.
+      user.update!(admin: true) unless user.respond_to?(:admin?) && user.admin?
+    end
+  end
+
+  def ruby_cms_grant_all_permissions_to!(user, email:)
+    RubyCms::Permission.ensure_defaults!
+    RubyCms::UserPermission.where(user:).destroy_all
+    RubyCms::Engine.grant_manage_admin_permission(user, email)
+  end
+
+  desc "Make a user a full admin with all permissions (no templates). Usage: rails admin:make_admin email=user@example.com"
+  task make_admin: :environment do
+    email = ENV["email"] || ENV.fetch("EMAIL", nil)
+    abort "Usage: rails admin:make_admin email=user@example.com" if email.blank?
+
+    user = ruby_cms_find_user_by_email(email)
+    abort "User not found: #{email}" unless user
+
+    ruby_cms_make_user_full_admin!(user)
+    ruby_cms_grant_all_permissions_to!(user, email:)
+
+    keys = RubyCms::UserPermission.where(user:)
+                                  .joins(:permission)
+                                  .pluck("permissions.key")
+                                  .sort
+                                  .uniq
+
+    puts "#{email} is now admin with #{keys.size} permission(s):"
+    keys.each {|k| puts "  - #{k}" }
+  end
+
+  desc "List all users with their admin status and permission keys"
+  task list_users: :environment do
+    user_class = ruby_cms_user_class
+    email_attr = ruby_cms_email_attr(user_class)
+
+    users = user_class.order(email_attr)
+
+    if users.none?
+      puts "No users found."
+      next
+    end
+
+    users.each do |user|
+      keys = RubyCms::UserPermission.where(user:)
+                                    .joins(:permission)
+                                    .pluck("permissions.key")
+                                    .sort
+
+      admin_flag = user.respond_to?(:admin?) ? user.admin? : false
+
+      puts "#{user.public_send(email_attr)} admin=#{admin_flag} keys=#{keys.join(', ')}"
+    end
+  end
+
+  desc "Seed all permission keys into the database (no templates)."
+  task seed_permissions: :environment do
+    RubyCms::Permission.ensure_defaults!
+    RubyCms::Settings.ensure_defaults! if defined?(RubyCms::Settings)
+    RubyCms::Settings.import_initializer_values! if defined?(RubyCms::Settings)
+
+    puts "Permissions: #{RubyCms::Permission.pluck(:key).sort.join(', ')}"
+  end
+
+  desc "Delete admin user. Usage: rails admin:delete email=user@example.com"
+  task delete: :environment do
+    email = ENV["email"] || ENV.fetch("EMAIL", nil)
+    abort "Usage: rails admin:delete email=user@example.com" if email.blank?
+
+    user = ruby_cms_find_user_by_email(email)
+    abort "User not found: #{email}" unless user
+
+    print "Delete #{email}? (yes/no): "
+    abort "Cancelled." unless $stdin.gets.to_s.strip.downcase == "yes"
+
+    user.destroy!
+    puts "Deleted #{email}"
+  end
+
+  desc "Log out all users (delete all sessions)"
+  task logout_all: :environment do
+    abort "Session constant not found in host app. Ensure your auth generator created Session." unless defined?(Session)
+
+    count = Session.count
+    if count.zero?
+      puts "No active sessions."
+      next
+    end
+
+    print "Log out all #{count} session(s)? (yes/no): "
+    abort "Cancelled." unless $stdin.gets.to_s.strip.downcase == "yes"
+
+    Session.destroy_all
+    puts "Logged out #{count} session(s)"
+  end
+end