active_analytics 0.1.0 → 0.2.0

data/app/views/active_analytics/referrers/_table.html.erb

@@ -1,14 +1,21 @@
-<table>
-  <% for referrer in referrers %>
-    <tr>
-      <td>
-        <% if referrer.host %>
-          <%= link_to referrer.host, referrer_path(site: params[:site], referrer: referrer.host) %>
-        <% else %>
-          <%= referrer.host %>
-        <% end %>
-        </td>
-      <td><%= referrer.total %></td>
-    </tr>
-  <% end %>
-</table>
+<% if referrers.empty? %>
+  <div class="is-empty">
+    <span>no data</span>
+  </div>
+<% else %>
+  <table>
+    <% for referrer in referrers %>
+      <tr>
+        <td>
+          <% if referrer.host %>
+            <%= site_icon referrer.host %>
+            <%= link_to referrer.host, referrer_path(site: params[:site], referrer: referrer.host, from: params[:from], to: params[:to]) %>
+          <% else %>
+            <%= referrer.host %>
+          <% end %>
+          </td>
+        <td class="number"><%= format_view_count referrer.total %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>

data/app/views/active_analytics/referrers/index.html.erb

@@ -1,8 +1,9 @@
-<section>
-  <h2>Referrers</h2>
+<section class="card">
+  <h3><%= format_view_count @histogram.total %> views</h3>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
-<section>
+<section class="card">
+  <h3>Top sources</h3>
   <%= render "table", referrers: @referrers %>
 </section>

data/app/views/active_analytics/referrers/show.html.erb

@@ -1,14 +1,19 @@
 <section>
-  <h2>Referrer <%= params[:referrer] %></h2>
-  <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
+  <h2>Source: <%= params[:referrer] %></h2>
 </section>
 
-<section>
-  <h3>Sources</h3>
-  <%= render "/active_analytics/pages/table", pages: @previous_pages %>
+<section class="card">
+  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
+<ul class="grid-auto">
+  <li class="card">
+    <h3>Source page</h3>
+    <%= render "/active_analytics/pages/table", pages: @previous_pages %>
+  </li>
 
-<section>
-  <h3>Destinations</h3>
-  <%= render "/active_analytics/pages/table", pages: @next_pages %>
-</section>
+  <li class="card">
+    <h3>Destination page</h3>
+    <%= render "/active_analytics/pages/table", pages: @next_pages %>
+  </li>
+</ul>

data/app/views/active_analytics/sites/_histogram.html.erb

@@ -1,19 +1,15 @@
-<table class="charts-css column show-5-secondary-axes show-data-on-hover show-labels" style="height: calc(var(--space-2x) * 10);">
-  <thead>
-    <tr>
-      <th scope="col">Day</th>
-      <th scope="col">Views</th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% for bar in histogram.bars %>
-      <tr>
-        <th scope="row"><%= l bar.label, format: :short %></td>
-        <td style="--size: <%= bar.height %>; --color: rgb(240,241,243);">
-          <span class="data"><%= bar.value.to_i %></span>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<% if histogram.bars.count > 1 %>
+  <table class="charts-css column show-primary-axis show-5-secondary-axes hide-data <%= "show-labels" if histogram.bars.count < 32 %>" style="height: calc(var(--space-2x) * 8);">
+    <tbody>
+      <% for bar in histogram.bars %>
+        <tr>
+          <th scope="row"><%= bar.label.day %></td>
+            <td style="--size: <%= bar.height %>; --color: rgba(var(--color-grey-100), 1);">
+            <span class="data"><%= bar.value.to_i %></span>
+            <span class="tooltip"><small class="tooltip-date"><%= l bar.label, format: :long%></small><br/><%= format_view_count bar.value %> views</span>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

data/app/views/active_analytics/sites/index.html.erb

@@ -1,7 +1,12 @@
-<h1>Sites</h1>
-
-<ul>
-  <% for site in @sites %>
-    <li><%= link_to site.host, site_path(site: site.host) %> <%= site.total %></li>
-  <% end %>
-</ul>
+<h2>Site views in the last 30 days</h2>
+<div class="card">
+  <table>
+    </tr>
+    <% for site in @sites %>
+      <tr>
+        <td><%= link_to site.host, site_path(site: site.host) %></td>
+        <td class="number"><%= format_view_count site.total %></td>
+      </tr>
+    <% end %>
+  </table>
+</div>

data/app/views/active_analytics/sites/show.html.erb

@@ -1,16 +1,16 @@
-<section>
-  <h3>Views per day</h3>
+<section class="card">
+  <h3><%= format_view_count @histogram.total %> views</h3>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
-<section>
-  <h3>Top Pages</h3>
-  <%= render "/active_analytics/pages/table", pages: @pages %>
-  <p style="text-align: center;"><br/><%= link_to "More pages", pages_path, role: "button"%></p>
-</section>
+<ul class="grid-auto">
+  <li class="card">
+    <h3>Top sources <%= link_to "view all", referrers_path(from: params[:from], to: params[:to]) %></h3>
+    <%= render "/active_analytics/referrers/table", referrers: @referrers %>
+  </li>
 
-<section>
-  <h3>Top referrers</h3>
-  <%= render "/active_analytics/referrers/table", referrers: @referrers %>
-  <p style="text-align: center;"><br/><%= link_to "More referrers", referrers_path, role: "button" %></p>
-</section>
+  <li class="card">
+    <h3>Top pages <%= link_to "view all", pages_path(from: params[:from], to: params[:to]) %></h3>
+    <%= render "/active_analytics/pages/table", pages: @pages %>
+  </li>
+</ul>

data/app/views/layouts/active_analytics/_footer.html.erb

@@ -1,6 +1,48 @@
 <footer>
   <p>
-    Made in <a href="https://www.basesecrete.com">Base Secrète</a> |
-    <%= link_to "Source code", "https://github.com/BaseSecrete/active_analytics" %>
+    Made in <a href="https://www.basesecrete.com" target="_blank" rel="noopener">Base Secrète</a> | <%= link_to "Source code", "https://github.com/BaseSecrete/active_analytics", target: "_blank", rel: "noopener" %> | <%= link_to "Twitter", "https://twitter.com/base_secrete", target: "_blank", rel: "noopener" %>
   </p>
-</footer>
+  
+  <div class="card">
+    <ul class="grid-auto">
+      <li>
+        <a href="https://github.com/BaseSecrete/rorvswild" target="_blank" rel="noopener">RoRvsWild</a>
+        <p>Ruby on Rails application performances and exceptions monitoring.</p>
+      </li>
+      <li>
+        <a href="https://github.com/BaseSecrete/redis_dashboard" target="_blank" rel="noopener">Redis Dashboard</a>
+        <p>Sinatra app to monitor Redis servers.</p>
+      </li>
+      <li>
+        <a href="https://github.com/BaseSecrete/type_scopes" target="_blank" rel="noopener">Type Scopes</a>
+        <p>Automatic scopes for ActiveRecord models.</p>
+      </li>
+      <li>
+        <a href="https://github.com/BaseSecrete/secure_attribute" target="_blank" rel="noopener">Secure Attribute</a>
+        <p>Encrypt attributes of any Ruby object or ActiveRecord model.</p>
+      </li>
+      <li>
+        <a href="https://github.com/BaseSecrete/teamodoro" target="_blank" rel="noopener">Teamodoro</a>
+        <p>Synchronize pomodoros with your coworkers.</p>
+      </li>
+      <li>
+        <a href="https://github.com/BaseSecrete/ariato" target="_blank" rel="noopener">Ariato</a>
+        <p>Web UI framework to improve accessibility.</p>
+      </li>
+    </ul>
+  </div>
+</footer>
+
+<div role="dialog" hidden="true" id="custom-date-range" aria-labelledby="custom-range-title" aria-modal="true">
+  <header id="custom-range-title">Custom range</header>
+  <%= form_tag url_for(params.except(:from, :to).to_unsafe_hash), method: "get", id: "dateRangeForm" do %>
+    <div role="group" class="is-block">
+      <label>From <%= text_field_tag :from, params[:from] %></label>
+      <label>To <%= text_field_tag :to, params[:to] %></label>
+    </div>
+  <% end %>
+  <footer>
+    <%= submit_tag "Change date range", form: "dateRangeForm" %>
+    <button type="reset" onclick="Ariato.Dialog.close(this)">Close</button>
+  </footer>
+</div>

data/app/views/layouts/active_analytics/_header.html.erb

@@ -1,25 +1,51 @@
-<header>
+<header data-ariato="ActiveAnalytics.Header">
   <nav aria-label="site"> <!-- implicit role="navigation", aria label "site" is announced = "site navigation" -->
-    <div role="toolbar" data-ariato="Application.Toolbar">
-      <div role="group">
-        <%= link_to "Analytics", active_analytics_path, role: "button" %>
-        <% if params[:site] %>
-          <div class="menubutton">
-            <button type="button" id="site-menu-button" aria-haspopup="true" aria-controls="site-menu"><%= params[:site] %></button>
-            <ul id="site-menu" role="menu" aria-labelledby="site-menu-button">
-              <li role="none">
-                <%= link_to "Site", site_path(params[:site]), role: "menuitem", tabindex: -1 %>
-              </li>
-              <li role="none">
-                <%= link_to "Pages", pages_path, role: "menuitem", tabindex: -1 %>
-              </li>
-              <li role="none">
-                <%= link_to "Referrers", referrers_path, role: "menuitem", tabindex: -1 %>
-              </li>
-            </ul>
-          </div>
-        <% end %>
+    
+    <%#= link_to "Analytics", active_analytics_path, role: "button" %>
+    <%= link_to active_analytics_path, class: 'logo' do %>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
+        <path class="a" d="M.5,5.5s0,2,1,2,1-2,1-2,0-2,1-2,1,2,1,2,0,2,1,2,1-2,1-2,0-2,1-2,1,2,1,2,0,2,1,2,1-2,1-2"/>
+        <circle class="a" cx="5.5" cy="5.5" r="5"/>
+        <line class="a" x1="0.5" y1="5.5" x2="10.5" y2="5.5"/>
+      </svg>
+    <% end %>
+
+    <% if params[:site] %>
+      <%= link_to params[:site], site_path(params[:site], from: params[:from], to: params[:to]) %>
+      
+      <% if controller_name == "pages" %>
+        &nbsp;/&nbsp;<%= link_to "pages", pages_path(params[:site], from: params[:from], to: params[:to]) %>
+      <% end %>
+
+      <% if controller_name == "referrers" %>
+        &nbsp;/&nbsp;<%= link_to "referrers", referrers_path(params[:site], from: params[:from], to: params[:to]) %>
+      <% end %>
+
+      <div class="menubutton">
+        <button type="button" id="date-range" aria-haspopup="true" aria-controls="date-range-menu">
+          <%= l params[:from].to_date, format: :long %>
+          <% if params[:to].to_date !=  params[:from].to_date %> → <%= l params[:to].to_date, format: :long %><% end%>
+        </button>
+        <ul id="date-range-menu" role="menu" aria-labelledby="date-range">
+          <li role="none">
+            <%= link_to "Today", url_for(params.merge(from: Date.today, to: Date.today).to_unsafe_hash), role: "menuitem", tabindex: "-1" %>
+          </li>
+          <li role="none">
+            <%= link_to "Yesterday", url_for(params.merge(from: Date.yesterday, to: Date.yesterday).to_unsafe_hash), role: "menuitem", tabindex: "-1" %>
+          </li>
+          <li role="none">
+            <%= link_to "Last 7 days", url_for(params.merge(from: 7.days.ago.to_date, to: Date.today).to_unsafe_hash), role: "menuitem", tabindex: "-1" %>
+          </li>
+          <li role="none">
+            <%= link_to "Last 30 days", url_for(params.merge(from: 30.days.ago.to_date, to: Date.today).to_unsafe_hash), role: "menuitem", tabindex: "-1" %>
+          </li>
+          <li role="none">
+            <button type="button" onclick="Ariato.Dialog.open('custom-date-range')"  tabindex="-1" class="is-link">
+              Custom range
+            </button>
+          </li>
+        </ul>
       </div>
-    </div>
+    <% end %>
   </nav>
 </header>

data/app/views/layouts/active_analytics/application.html.erb

@@ -1,19 +1,20 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Active analytics</title>
-  <%= csrf_meta_tags %>
-  <%= csp_meta_tag %>
+  <head>
+    <title>Active analytics</title>
+    <meta name=viewport content="width=device-width, initial-scale=1">
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
 
-  <%= stylesheet_link_tag "active_analytics/application", media: "all" %>
-  <%= javascript_include_tag "active_analytics/application" %>
-</head>
+    <%= stylesheet_link_tag "active_analytics/application", media: "all" %>
+    <%= javascript_include_tag "active_analytics/application" %>
+  </head>
 
-<body>
-  <%= render "/layouts/active_analytics/header" %>
-  <main aria-label="Content">
-    <%= yield %>
-  </main>
-  <%= render "/layouts/active_analytics/footer" %>
-</body>
+  <body>
+    <%= render "/layouts/active_analytics/header" %>
+    <main aria-label="Content">
+      <%= yield %>
+    </main>
+    <%= render "/layouts/active_analytics/footer" %>
+  </body>
 </html>

data/db/migrate/20210303094108_create_active_analytics_views_per_days.rb

@@ -10,7 +10,7 @@ class CreateActiveAnalyticsViewsPerDays < ActiveRecord::Migration[5.2]
       t.timestamps
     end
     add_index :active_analytics_views_per_days, :date
-    add_index :active_analytics_views_per_days, [:site, :page, :date]
+    add_index :active_analytics_views_per_days, [:site, :page, :date], name: "index_active_analytics_views_per_days_on_site_and_date"
     add_index :active_analytics_views_per_days, [:referrer_host, :referrer_path, :date], name: "index_active_analytics_views_per_days_on_referrer_and_date"
   end
 

data/lib/active_analytics.rb

@@ -2,21 +2,19 @@ require "active_analytics/version"
 require "active_analytics/engine"
 
 module ActiveAnalytics
-  VERSION = "0.1.0"
-
   def self.record_request(request)
     params = {
       site: request.host,
       page: request.path,
       date: Date.today,
     }
-    if request.referer.present?
+    if request.referrer.present?
       referrer_uri = URI(request.referrer)
       params[:referrer_host] = referrer_uri.host
       params[:referrer_path] = referrer_uri.path
     end
     ViewsPerDay.append(params)
   rescue => ex
-    raise if Rails.env.development?
+    raise if Rails.env.development? || Rails.env.test?
   end
 end

data/lib/active_analytics/version.rb

@@ -1,3 +1,3 @@
 module ActiveAnalytics
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: active_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
 description: NO cookies, NO JavaScript, NO third parties and NO bullshit
@@ -35,11 +35,14 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/active_analytics_manifest.js
+- app/assets/images/active_analytics.png
+- app/assets/images/active_analytics_screenshot.png
 - app/assets/javascripts/active_analytics/application.js
 - app/assets/javascripts/active_analytics/ariato.js
 - app/assets/stylesheets/active_analytics/application.css
 - app/assets/stylesheets/active_analytics/ariato.css
 - app/assets/stylesheets/active_analytics/charts.css
+- app/assets/stylesheets/active_analytics/style.css
 - app/controllers/active_analytics/application_controller.rb
 - app/controllers/active_analytics/pages_controller.rb
 - app/controllers/active_analytics/referrers_controller.rb