Merge pull request #136 from restarone/addTablesToDomainAdmin

Add tables to domain admin

Author: donrestarone

Gemfile

@@ -40,6 +40,11 @@ gem "aws-sdk-s3", require: false
 gem 'meta-tags'
 gem 'sitemap_generator'
 gem 'ahoy_matey'
+gem 'ransack'
+gem 'will_paginate'
+gem "chartkick"
+gem 'groupdate'
+gem 'local_time'
 
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.4.4', require: false

Gemfile.lock

@@ -164,6 +164,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    chartkick (4.0.4)
     childprocess (3.0.0)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
@@ -195,6 +196,8 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     gravatar_image_tag (1.2.0)
+    groupdate (5.2.2)
+      activesupport (>= 5)
     haml (5.2.1)
       temple (>= 0.8.0)
       tilt
@@ -229,6 +232,7 @@ GEM
     listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    local_time (2.1.0)
     loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -312,6 +316,10 @@ GEM
       rake (>= 0.8.7)
       thor (~> 1.0)
     rake (13.0.3)
+    ransack (2.4.2)
+      activerecord (>= 5.2.4)
+      activesupport (>= 5.2.4)
+      i18n
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -437,15 +445,18 @@ DEPENDENCIES
   capistrano-rbenv
   capistrano3-puma
   capybara (>= 3.26)
+  chartkick
   comfortable_mexican_sofa!
   comfy_blog!
   devise
   devise_invitable
   friendly_id
   gravatar_image_tag
+  groupdate
   image_processing (~> 1.2)
   jbuilder (~> 2.7)
   listen (~> 3.3)
+  local_time
   mailgun-ruby
   meta-tags
   mocha
@@ -454,6 +465,7 @@ DEPENDENCIES
   rack-mini-profiler (~> 2.0)
   rails (~> 6.1.3, >= 6.1.3.1)
   rails-controller-testing
+  ransack
   ros-apartment
   ros-apartment-sidekiq
   sass-rails (>= 6)
@@ -469,6 +481,7 @@ DEPENDENCIES
   webdrivers
   webpacker (~> 5.0)
   wicked
+  will_paginate
 
 RUBY VERSION
    ruby 2.6.6p146

app/assets/stylesheets/comfy/admin/cms/custom.sass

@@ -13,3 +13,8 @@ label[for=layout_app_layout]
 select[id=layout_app_layout] 
 	display: none 
 
+
+
+
+
+

app/controllers/admin/subdomains_controller.rb

@@ -2,7 +2,9 @@ class Admin::SubdomainsController < Admin::BaseController
   before_action :load_subdomain, except: [:index]
 
   def index
-    @subdomains = Subdomain.all
+    params[:q] ||= {}
+    @subdomains_q = Subdomain.ransack(params[:q])
+    @subdomains = @subdomains_q.result.paginate(page: params[:page], per_page: 10)
   end
 
   def edit

app/controllers/comfy/admin/users_controller.rb

@@ -4,7 +4,9 @@ class Comfy::Admin::UsersController < Comfy::Admin::Cms::BaseController
   before_action :ensure_authority_to_manage_users, only: [:index, :new, :invite, :edit, :update, :destroy]
 
   def index
-    @users = User.all
+    params[:q] ||= {}
+    @users_q = User.ransack(params[:q])
+    @users = @users_q.result.paginate(page: params[:page], per_page: 10)
   end
 
   def new

app/controllers/comfy/admin/web_settings_controller.rb

@@ -3,6 +3,9 @@ class Comfy::Admin::WebSettingsController < Comfy::Admin::Cms::BaseController
   before_action :ensure_authority_to_manage_web
 
   def edit
+    params[:q] ||= {}
+    @visits_q = Subdomain.current.ahoy_visits.ransack(params[:q])
+    @visits = @visits_q.result.paginate(page: params[:page], per_page: 10)
   end
 
   def update

app/helpers/application_helper.rb

@@ -1,5 +1,15 @@
 module ApplicationHelper
   def display_subdomain_name(schema_path)
-    "#{schema_path}.#{ENV['APP_HOST']}"
+    subdomain = schema_path != Subdomain::ROOT_DOMAIN_NAME ? schema_path : 'www'
+    "#{subdomain}.#{ENV['APP_HOST']}"
   end
+
+  def page_entries_info(collection)
+    model_name = collection.respond_to?(:human_name) ? collection.model_name.human : (collection.first&.model_name&.human || '')
+
+    sanitize "Displaying #{model_name} " +
+      tag.b("#{collection.offset + 1} - #{[collection.per_page * collection.current_page, collection.total_entries].min}") +
+      ' of ' + tag.b(collection.total_entries) +
+      ' in total'
+end
 end

app/helpers/subdomain_helper.rb

@@ -23,6 +23,18 @@ def web_pages_count(subdomain)
     end
   end
 
+  def forum_threads_count(subdomain)
+    Apartment::Tenant.switch subdomain.name do
+      ForumThread.all.size
+    end
+  end
+
+  def visits_count(subdomain)
+    Apartment::Tenant.switch subdomain.name do
+      Ahoy::Visit.all.size
+    end
+  end
+
   def html_title(subdomain)
     subdomain.html_title ? subdomain.html_title : subdomain.name
   end

app/models/subdomain.rb

@@ -30,6 +30,10 @@ def self.current
     end
   end
 
+  def ahoy_visits
+    Ahoy::Visit.order(started_at: :desc)
+  end
+
   def initialize_mailbox
     Apartment::Tenant.switch self.name do
       mailbox = Mailbox.first_or_create

app/models/user.rb

@@ -30,6 +30,10 @@ def self.global_admins
   def self.forum_mods
     self.where(moderator: true)
   end
+
+  def previous_ahoy_visits
+    Ahoy::Visit.where(user_id: self.id).order(started_at: :desc).limit(5)
+  end
 
   private
 

app/views/admin/subdomains/_pagination.haml

@@ -0,0 +1,4 @@
+.digg_pagination
+  .page-info
+    = page_entries_info @subdomains
+  = will_paginate @subdomains, container: false

app/views/admin/subdomains/_search_filters.haml

@@ -0,0 +1,11 @@
+= search_form_for @subdomains_q, url: admin_subdomains_path do |f|
+  .form-group
+    = f.label "name", class: 'col-form-label'
+    = f.search_field :name_cont, value: params[:q][:name_cont], class: 'form-control'
+    = f.label "by SEO", class: 'col-form-label'
+    = f.search_field :keywords_or_description_cont, value: params[:q][:keywords_or_description_cont], class: 'form-control'
+    = f.label "by HTML meta", class: 'col-form-label'
+    = f.search_field :html_title_or_blog_title_or_blog_html_title_or_forum_title_or_forum_html_title_cont, value: params[:q][:html_title_or_blog_title_or_blog_html_title_or_forum_title_or_forum_html_title_cont], class: 'form-control'
+    .text-center
+      = f.submit class: 'btn btn-primary my-2'
+      = link_to "Clear Search", request.path, class:"cancel-button"

app/views/admin/subdomains/edit.haml

@@ -11,4 +11,5 @@
       %li= "#{pluralize(emails_count(@subdomain), 'Email')}"
       %li= "#{pluralize(web_pages_count(@subdomain), 'Web Page')}"
       %li= "#{pluralize(blog_posts_count(@subdomain), 'Blog Post')}"
+      %li= "#{pluralize(forum_threads_count(@subdomain), 'Forum Thread')}"
     = link_to "Destroy Domain (Irreversible)", admin_subdomain_path(id: @subdomain), method: :delete, class: 'btn btn-lg btn-block btn-danger', data: { confirm: 'are you sure? This cannot be undone' }

app/views/admin/subdomains/index.haml

@@ -1,12 +1,37 @@
 %h1
   Active Subdomains
 .my-5.list-group
-  - @subdomains.each do |subdomain|
-    - if subdomain.name
-      = link_to edit_admin_subdomain_path(id: subdomain.id), class: 'list-group-item list-group-item-action flex-column align-items-start' do
-        .d-flex.w-100.justify-content-between
-          %h5 
-            = display_subdomain_name(subdomain.name)
-          %small
-            = subdomain.created_at
-
+  = render partial: 'search_filters'
+  = render partial: 'pagination'
+  %table.table.table-responsive
+    %thead
+      %tr
+        %th{:scope => "col"}
+          = sort_link @subdomains_q, :name
+        %th{:scope => "col"}
+          = sort_link @subdomains_q, :description
+        %th{:scope => "col"}
+          = sort_link @subdomains_q, :keywords
+        %th{:scope => "col"}
+          = sort_link @subdomains_q, :visitors
+        %th{:scope => "col"}
+          = sort_link @subdomains_q, :users
+        %th{:scope => "col"}
+          = sort_link @subdomains_q, :created_at
+        %th{:scope => "col"}
+          = sort_link @subdomains_q, :updated_at
+        %th{:scope => "col"}
+          = sort_link @subdomains_q, :storage_used
+    - @subdomains.each do |subdomain|
+      - if subdomain.name
+        %tr
+          %td
+            = link_to display_subdomain_name(subdomain.name), edit_admin_subdomain_path(id: subdomain.id)
+          %td= subdomain.description
+          %td= subdomain.keywords
+          %td= visits_count(subdomain)
+          %td= users_count(subdomain)
+          %td= local_time(subdomain.created_at)
+          %td= local_time(subdomain.updated_at)
+          %td= number_to_human_size(subdomain.storage_used)
+  = render partial: 'pagination'

app/views/comfy/admin/users/_pagination.haml

@@ -0,0 +1,4 @@
+.digg_pagination
+  .page-info
+    = page_entries_info @users
+  = will_paginate @users, container: false

app/views/comfy/admin/users/_search_filters.haml

@@ -0,0 +1,9 @@
+= search_form_for @users_q, url: admin_users_path do |f|
+  .form-group
+    = f.label "name", class: 'col-form-label'
+    = f.search_field :name_cont, value: params[:q][:name_cont], class: 'form-control'
+    = f.label "email", class: 'col-form-label'
+    = f.search_field :email_cont, value: params[:q][:email_cont], class: 'form-control'
+    .text-center
+      = f.submit class: 'btn btn-primary my-2'
+      = link_to "Clear Search", request.path, class:"cancel-button"

app/views/comfy/admin/users/edit.haml

@@ -32,4 +32,71 @@
         %label 
           Can manage and invite users
       = f.submit "Update", class: 'btn btn-success'
-      = link_to "Remove", admin_user_path(id: @user.id), method: :delete, class: 'btn btn-sm btn-danger', data: { confirm: 'Are you sure you want to remove this user? This cannot be undone' }
+      = link_to "Remove", admin_user_path(id: @user.id), method: :delete, class: 'btn btn-sm btn-danger', data: { confirm: 'Are you sure you want to remove this user? This cannot be undone' }
+  %hr/
+  %main{class: 'my-5'}
+    %h3 
+      Stats
+    .card
+      %ul.list-group.list-group-flush
+        %li.list-group-item
+          sign ins:
+          = @user.sign_in_count
+        %li.list-group-item
+          current sign in:
+          = @user.current_sign_in_at
+        %li.list-group-item
+          last sign in:
+          = @user.last_sign_in_at
+        %li.list-group-item
+          current session IP:
+          = @user.current_sign_in_ip
+        %li.list-group-item
+          last session IP:
+          = @user.last_sign_in_ip
+        %li.list-group-item
+          created at:
+          = local_time(@user.created_at)
+        %li.list-group-item
+          updated at:
+          = local_time(@user.created_at)
+        %li.list-group-item
+          confirmed at:
+          = @user.confirmed_at
+        %li.list-group-item
+          confirmation sent at:
+          = @user.confirmation_sent_at
+        %li.list-group-item
+          locked at:
+          = @user.locked_at
+
+  %main{class: 'my-5'}
+    %h3 
+      Sessions
+    .card
+      .table-responsive
+        %table.table.table-bordered
+          %thead
+            %tr
+              %th Timestamp
+              %th IP
+              %th OS
+              %th Browser
+              %th Device Type
+              %th Country
+              %th Region
+              %th City
+              %th User Agent
+            - @user.previous_ahoy_visits.each do |v|
+              %tr
+                %th= v.started_at.strftime('%I:%M %P - %b %d, %Y')
+                %th= v.ip
+                %th= v.os
+                %th= v.browser
+                %th= v.device_type
+                %th= v.country
+                %th= v.region
+                %th= v.city
+                %th.text-wrap.text-break= v.user_agent  
+          
+

app/views/comfy/admin/users/index.html.haml

@@ -2,11 +2,24 @@
   = link_to I18n.t('views.comfy.users.index.header.action'), new_admin_user_path, class: 'btn btn-secondary float-right'
   .h2
     = I18n.t('views.comfy.users.index.header.title')
-- @users.each do |user|
-  = link_to edit_admin_user_path(id: user.id) do
-    .card.my-3
-      .card-body 
-        .card-title
-          = user.email
-        .card-subtitle.mb-2.text-muted
-          = user.created_at
+  = render partial: 'search_filters'
+  = render partial: 'pagination'
+  %table.table.table-responsive
+    %thead
+      %tr
+        %th{:scope => "col"}
+          = sort_link @users_q, :email
+        %th{:scope => "col"}
+          = sort_link @users_q, :name
+        %th{:scope => "col"}
+          = sort_link @users_q, :current_sign_in_at
+        %th{:scope => "col"}
+          = sort_link @users_q, :last_sign_in_at
+        %th{:scope => "col"}
+    - @users.each do |user|
+      %tr
+        %td= link_to user.email, edit_admin_user_path(id: user.id)
+        %td= user.name
+        %td= user.current_sign_in_at
+        %td= user.last_sign_in_at
+  = render partial: 'pagination'