ish_manager 0.1.8.488 → 0.1.8.489

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d6230cc24c1746299a40db13ee998b8ad59fb10cf90c5d4b6efd060f7b43a71
-  data.tar.gz: b9708207b607a11368db470bcfc76d2e84fb549c9ddef553e062fe4cfc5470a2
+  metadata.gz: eeabedb9e57e736ebd35e8e73ac4387f3cb77aafda58658dcb913fff72e6ab1d
+  data.tar.gz: 5ed6cb10a9536857cc6e2c6f33dcd0a6f9bba66c4cbea4d939f43e44ee1f26cd
 SHA512:
-  metadata.gz: 3c9b239cfd2593b44bcbe50bfdcb92ea7fb3479d01a5e496b37afd78e8e010048c73d2b10469a0fa30d647ee2098d22a64e170b4318190f3fb80cdd5d11f44c6
-  data.tar.gz: 6a82bf2054f9efaa665365d1bf2cba8e8384ed55ae431cfe84fe5780e6dc2d3d987a590fa62811842e45cf36686e67094edc451714e25e56fc02c3cd4de057a0
+  metadata.gz: e25f395330b7566a261f7dd9e0e0742bb0cf481ad6b1481c71004320d2acdc65cd9f2eb93dca4c231a7f7b2217dd74ef42b13a63c05d76e4f4ddffb795c108c2
+  data.tar.gz: e94184249552ace988a61121a50e4730600b279b519972c3cc91e3c884be5082e5c4fb011e519d6ca9db7042589c51612f145eca55343083d5be37a0c5e83324

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,22 +1,47 @@
 
 class IshManager::AnalyticsController < IshManager::ApplicationController
 
+  before_action :set_vars
+
+  def index
+    authorize! :analytics, IshManager::Ability
+  end
+
   def test
     authorize! :analytics, IshManager::Ability
 
+    if !@prev_intervals.include?( params[:prev_interval] )
+      flash_error "prev_interval not allowed"
+      redirect_to action: :index
+      return
+    end
+    prev_interval = eval( params[:prev_interval] )
+    puts! prev_interval, 'prev_interval'
+
     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,
+
+      # "method" => "Actions.getPageUrls",
+      method: params[:method],
+
       "idDimension" => 1,
-      "idSite" => 2,
+
+      # "idSite" => 2,
+      idSite: params[:idSite],
+
       "period" => "day",
-      "date" => "#{(Time.now - 3.months ).to_date.to_s},#{Time.now.to_date.to_s}",
+      # period: params[:period],
+
+      "date" => "#{(Time.now - prev_interval ).to_date.to_s},#{Time.now.to_date.to_s}",
     }
-    api_url = "&idDimension=1&idSite=2&period=day&date=2023-07-01,2023-09-01"
+
     cids    = []
     reports = {}
 
+    puts! "#{base_url}#{opts.to_query}", 'ze query'
+
     inns = HTTParty.get( "#{base_url}#{opts.to_query}" )
     inns = JSON.parse( inns.body )
 
@@ -42,10 +67,46 @@ 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
 
   end
 
+  ##
+  ## private
+  ##
+  private
+
+  def set_vars
+    @methods_list = [
+      "Actions.getPageUrls",
+    ]
+
+
+    @prev_intervals = [
+      "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,18 @@
+
+.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] )
+    .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.489
 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