diff options
| author | Gareth Rees <gareth@mysociety.org> | 2015-04-09 09:19:53 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2015-04-09 09:19:53 +0100 |
| commit | 5c4c867b4834a30c0c74fd120aeb58d84c105230 (patch) | |
| tree | 161b700cd6ff32317e449ab61b2e4e47c1178fe8 | |
| parent | 7f6013c9bfbfba05d21dbbc6fe2eece441100a35 (diff) | |
Play around with Peek
| -rw-r--r-- | Gemfile | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 24 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/responsive/application.css | 10 | ||||
| -rw-r--r-- | app/views/layouts/admin.html.erb | 1 | ||||
| -rw-r--r-- | app/views/layouts/default.html.erb | 1 | ||||
| -rw-r--r-- | config/initializers/peek.rb | 5 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
8 files changed, 53 insertions, 0 deletions
@@ -50,6 +50,13 @@ gem 'routing-filter', '~> 0.3.1' gem 'unicode', '~> 0.4.4' gem 'unidecoder', '~> 1.1.2' +gem 'peek' +gem 'peek-git' +gem 'peek-pg' +gem 'peek-gc' +gem 'peek-performance_bar' +gem 'peek-active_record' + group :assets do gem 'bootstrap-sass', '~> 2.3.1.2' gem 'sass-rails', '~> 3.2.3' diff --git a/Gemfile.lock b/Gemfile.lock index 2f88a474e..a7fe0a0dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,6 +57,7 @@ GEM annotate (2.5.0) rake arel (3.0.3) + atomic (1.1.99) bootstrap-sass (2.3.1.2) sass (~> 3.2) builder (3.0.4) @@ -174,6 +175,23 @@ GEM paper_trail (2.7.2) activerecord (~> 3.0) railties (~> 3.0) + peek (0.1.9) + atomic (>= 1.0.0) + railties (>= 3.0.0) + peek-active_record (0.5.0) + activerecord (~> 3.2.0) + atomic (>= 1.0.0) + peek (>= 0.1.0) + peek-gc (0.0.2) + peek + peek-git (1.0.2) + peek + peek-performance_bar (1.1.6) + peek (>= 0.1.0) + peek-pg (1.1.0) + atomic (>= 1.0.0) + peek + pg pg (0.17.1) polyglot (0.3.5) pry (0.9.12.6) @@ -333,6 +351,12 @@ DEPENDENCIES newrelic_rpm nokogiri (~> 1.5.9) open4 (~> 1.3.4) + peek + peek-active_record + peek-gc + peek-git + peek-performance_bar + peek-pg pg (~> 0.17.1) pry (~> 0.9.6) quiet_assets (~> 1.0.2) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index fd49d3b53..5e03ac12d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -6,3 +6,6 @@ //= require jquery.cookie //= require general //= require ba-throttle-debounce +//= require peek +//= require peek/views/performance_bar +//= require peek/views/active_record diff --git a/app/assets/stylesheets/responsive/application.css b/app/assets/stylesheets/responsive/application.css index 0b5aa8d66..94f65641c 100644 --- a/app/assets/stylesheets/responsive/application.css +++ b/app/assets/stylesheets/responsive/application.css @@ -1,7 +1,17 @@ /* ... *= require_self *= require normalize +*= require peek +*= require peek/views/performance_bar *= require responsive/main *= require jquery.ui.datepicker *= require jquery.ui.tabs */ + +#peek { + position: fixed; + bottom: 0; + left: 0; + right: 0; + z-index: 999; +}
\ No newline at end of file diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 2147f22e1..70683d3dd 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -11,6 +11,7 @@ </head> <body class="admin"> + <%= render 'peek/bar' %> <div id="main" class="container"> <%= render :partial => 'admin_general/admin_navbar' %> <% if flash[:error] %> diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 56e6b3362..ac7c2af35 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -50,6 +50,7 @@ <%= render :partial => 'general/before_head_end' %> </head> <body class="<%= 'front' if params[:action] == 'frontpage' %>"> + <%= render 'peek/bar' %> <% if AlaveteliConfiguration::force_registration_on_new_request && !@user %> <%= javascript_include_tag 'fancybox.js' %> <script type="text/javascript"> diff --git a/config/initializers/peek.rb b/config/initializers/peek.rb new file mode 100644 index 000000000..9466b71ed --- /dev/null +++ b/config/initializers/peek.rb @@ -0,0 +1,5 @@ +Peek.into Peek::Views::Git, :nwo => 'mysociety/alaveteli', :default_branch => 'rails-3-develop' +Peek.into Peek::Views::PerformanceBar +Peek.into Peek::Views::PG +Peek.into Peek::Views::ActiveRecord, :type_tracking => false +# Peek.into Peek::Views::GC diff --git a/config/routes.rb b/config/routes.rb index c975d6007..2368b4793 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,6 +26,8 @@ Alaveteli::Application.routes.draw do match '/version.:format' => 'general#version', :as => :version ##### + mount Peek::Railtie => '/peek' + ##### Request controller match '/list/recent' => 'request#list', :as => :request_list_recent, :view => 'recent' match '/list/all' => 'request#list', :as => :request_list_all, :view => 'all' |