ish_manager 0.1.8.488 → 0.1.8.490

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d6230cc24c1746299a40db13ee998b8ad59fb10cf90c5d4b6efd060f7b43a71
-  data.tar.gz: b9708207b607a11368db470bcfc76d2e84fb549c9ddef553e062fe4cfc5470a2
+  metadata.gz: f3eeaba4f2df8f0813b9c4c52aa4bfa7526d4dbeccd199b2fae4f5c510dde395
+  data.tar.gz: 4a07d354553477353bce3225c42ddd36cd394226b9401a37200544ab08012f4b
 SHA512:
-  metadata.gz: 3c9b239cfd2593b44bcbe50bfdcb92ea7fb3479d01a5e496b37afd78e8e010048c73d2b10469a0fa30d647ee2098d22a64e170b4318190f3fb80cdd5d11f44c6
-  data.tar.gz: 6a82bf2054f9efaa665365d1bf2cba8e8384ed55ae431cfe84fe5780e6dc2d3d987a590fa62811842e45cf36686e67094edc451714e25e56fc02c3cd4de057a0
+  metadata.gz: 124c737e4fce7120d0d30f7ff0a7945cda87f89f1188611ee1f6006daabb8569c78cdba1184b2d34b2fc42c794fa58df3c8e10a1d12dd55fb542819f81693572
+  data.tar.gz: cc2440a9421a471f20b6cc8d9ab8edded0949d0d7e94c2fe6de47b1bb5637a04a985746c14de1ce49569f4f309a5f09a1cac11886daf2de648b0a241014bfff9

data/app/assets/stylesheets/ish_manager/photos.scss

@@ -42,6 +42,11 @@
   .thumbnails {
     .item {
       border: 1px solid blue;
+      display: flex;
+
+      > * {
+        margin-right: .5em;
+      }
     }
   }
 

data/app/controllers/ish_manager/analytics_controller.rb

@@ -1,38 +1,91 @@
 
 class IshManager::AnalyticsController < IshManager::ApplicationController
 
+  before_action :set_vars
+
+  def index
+    authorize! :analytics, IshManager::Ability
+  end
+
   def test
     authorize! :analytics, IshManager::Ability
 
+    if params[:prev_interval].present?
+      if !@prev_intervals.include?( params[:prev_interval] )
+        flash_alert "prev_interval not allowed"
+        redirect_to action: :index
+        return
+      end
+      prev_interval = eval( params[:prev_interval] )
+      selected_date = "#{(Time.now - prev_interval ).to_date.to_s},#{Time.now.to_date.to_s}"
+    else
+      selected_date = "#{params[:date_from]},#{params[:date_to]}"
+    end
+
     base_url = "https://analytics.wasya.co/index.php?force_api_session=1&module=API&format=JSON&"
+    # api_url_trash = "&idDimension=1&idSite=2&period=day&date=2023-07-01,2023-09-01"
     opts = {
-      "method" => "Actions.getPageUrls",
       "token_auth" => ANALYTICS_TOKEN,
+      "filter_limit" => "-1",
+      "expanded" => 1,
+
+      # "method" => "Actions.getPageUrls",
+      method: params[:method],
+
       "idDimension" => 1,
-      "idSite" => 2,
-      "period" => "day",
-      "date" => "#{(Time.now - 3.months ).to_date.to_s},#{Time.now.to_date.to_s}",
+
+      # "idSite" => 2,
+      idSite: params[:idSite],
+
+      # "period" => "day",
+      "period" => "range",
+      # period: params[:period],
+
+      "date" => selected_date,
     }
-    api_url = "&idDimension=1&idSite=2&period=day&date=2023-07-01,2023-09-01"
+
     cids    = []
     reports = {}
+    reports[9999] = []
+
+    puts! "#{base_url}#{opts.to_query}", 'ze query'
 
     inns = HTTParty.get( "#{base_url}#{opts.to_query}" )
     inns = JSON.parse( inns.body )
 
-    inns.each do |date, items|
-      items.each do |item|
+    if "Actions.getPageUrls" == params[:method]
+      inns.each do |date, items|
+        items.each do |item|
 
-        path = item['label']
-        if path[0] != '/'
-          path = "/#{path}"
+          path = item['label']
+          if path[0] != '/'
+            path = "/#{path}"
+          end
+
+          cid = path[/.*cid=([\d]*)/,1]&.to_i
+          if cid
+            cids.push cid
+            reports[cid] ||= []
+            reports[cid].push "#{date} :: #{path}"
+          end
         end
+      end
+    end
+
+    if "Live.getLastVisitsDetails" == params[:method]
+      inns.each do |items|
+        date = items['serverDate']
+        items['actionDetails'].each do |item|
+          path = item['url']
 
-        cid = path[/.*cid=([\d]*)/,1]&.to_i
-        if cid
-          cids.push cid
-          reports[cid] ||= []
-          reports[cid].push "#{date} :: #{path}"
+          cid = path[/.*cid=([\d]*)/,1]&.to_i
+          if cid
+            cids.push cid
+            reports[cid] ||= []
+            reports[cid].push "#{date} :: #{path}"
+          else
+            reports[9999].push "#{date} :: #{path}"
+          end
         end
       end
     end
@@ -42,10 +95,50 @@ class IshManager::AnalyticsController < IshManager::ApplicationController
     @reports = {}
 
     reports.each do |k, v|
-      email = leads_h[k].email
-      @reports[email] = v
+      lead_label = "[#{k}] <#{leads_h[k]&.name} #{leads_h[k]&.email}>"
+      @reports[lead_label] = v
     end
 
+    @reports = @reports.sort
+
+  end
+
+  ##
+  ## private
+  ##
+  private
+
+  def set_vars
+    @methods_list = [
+      "Actions.getPageUrls",
+      "Live.getLastVisitsDetails",
+    ]
+
+
+    @prev_intervals = [
+      nil,
+      "1.month",
+      "2.months",
+      "3.months",
+    ]
+
+    @sites_list = [
+      [ '2 - wasya.co', 2 ],
+      [ '6 - wasyaco.com', 6 ],
+
+      [ '3 - old pi', 3 ],
+      [ '8 - pi_drup', 8 ],
+
+
+      [ 'bjjc_drup', 9 ],
+      [ 'bjjc_legacy', 12 ],
+
+      [ 'demmitv', 7 ],
+
+      [ 'ish', 5 ],
+
+
+    ]
   end
 
 end

data/app/views/ish_manager/analytics/_menu.haml

@@ -0,0 +1,26 @@
+
+.analytics--menu
+
+  %ul
+    %li= link_to 'Test', analytics_test_path
+
+  = form_tag( analytics_test_path, method: :get ) do
+
+    .field
+      %label Domain
+      = select_tag :idSite, options_for_select(@sites_list, selected: params[:idSite]), class: :select2
+
+    .field
+      %label prev_interval
+      = select_tag :prev_interval, options_for_select( @prev_intervals, selected: params[:prev_interval] )
+      %label date_from
+      = text_field_tag :date_from, params[:date_from]
+      %label date_to
+      = text_field_tag :date_to, params[:date_to]
+
+    .field
+      %label method
+      = select_tag :method, options_for_select( @methods_list, selected: params[:method] )
+
+    .actions
+      = submit_tag 'Submit'

data/app/views/ish_manager/analytics/index.haml

@@ -0,0 +1,6 @@
+
+.analytics-index.max-width
+  %h5 Analytics Index
+
+  = render 'ish_manager/analytics/menu'
+  %hr

data/app/views/ish_manager/analytics/test.haml

@@ -1,5 +1,9 @@
 
 .analytics-test.maxwidth
+  %h5 Analytics Test
+
+  = render 'ish_manager/analytics/menu'
+  %hr
 
   %ul
     - @reports.each do |email, paths|

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -105,6 +105,7 @@
           = link_to '[+]', new_office_action_path
         %li
           = link_to 'Unsubs', unsubscribes_path
+          = link_to 'Analytics', analytics_path
 
     .c
 

data/config/routes.rb

@@ -6,6 +6,7 @@ IshManager::Engine.routes.draw do
   ##
   root :to => 'application#home'
 
+  get 'analytics',      to: 'analytics#index'
   get 'analytics/test', to: 'analytics#test'
 
   get 'application/tinymce', to: 'application#tinymce'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.488
+  version: 0.1.8.490
 platform: ruby
 authors:
 - piousbox
@@ -568,6 +568,8 @@ files:
 - app/views/202212 Mailchimp Templates/202212 theme subtle.html
 - app/views/202212 Mailchimp Templates/202212 theme ticket.html
 - app/views/202212 Mailchimp Templates/202212 theme whale.html
+- app/views/ish_manager/analytics/_menu.haml
+- app/views/ish_manager/analytics/index.haml
 - app/views/ish_manager/analytics/test.haml
 - app/views/ish_manager/appliance_tmpls/_form.haml
 - app/views/ish_manager/appliance_tmpls/index.haml