add progress bar for loading pages

kdstarter · Mar 24, 2016 · b573587 · b573587
1 parent bf63e4d
commit b573587
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,6 +16,10 @@ gem 'bootstrap-sass', '3.2.0.1'
 gem 'font-awesome-rails', '4.1.0'
 gem 'yui-compressor', '0.12.0', require: false
 
+gem 'turbolinks', '2.5.3'
+gem 'jquery-turbolinks', '2.1.0'
+gem 'nprogress-rails', '~> 0.1.6.7'
+
 gem 'devise', '3.3.0'
 gem 'devise-i18n', '0.11.0'
 gem 'devise-async', '0.9.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -173,9 +173,12 @@ GEM
     jquery-rails (3.1.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jquery-turbolinks (2.1.0)
+      railties (>= 3.1.0)
+      turbolinks
     jquery-ui-rails (5.0.0)
       railties (>= 3.2.16)
-    json (1.8.1)
+    json (1.8.3)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -197,6 +200,7 @@ GEM
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     non-stupid-digest-assets (1.0.4)
+    nprogress-rails (0.1.6.7)
     oneapm_rpm (1.3.5)
     orm_adapter (0.5.0)
     paranoia (2.0.2)
@@ -356,6 +360,8 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
+    turbolinks (2.5.3)
+      coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.5.1)
@@ -406,11 +412,13 @@ DEPENDENCIES
   highline (= 1.6.21)
   hirb (= 0.7.2)
   jquery-rails (= 3.1.1)
+  jquery-turbolinks (= 2.1.0)
   kaminari (= 0.16.1)
   mini_magick (= 3.8.0)
   mysql2 (= 0.3.16)
   nokogiri (= 1.6.3.1)
   non-stupid-digest-assets (= 1.0.4)
+  nprogress-rails (~> 0.1.6.7)
   oneapm_rpm (~> 1.3.5)
   paranoia (= 2.0.2)
   qiniu-rs (= 3.4.10)
@@ -429,6 +437,7 @@ DEPENDENCIES
   simple_form (= 3.1.0.rc2)
   simplecov (= 0.9.0)
   sinatra (= 1.4.5)
+  turbolinks (= 2.5.3)
   uglifier (= 2.5.1)
   watir-webdriver (= 0.6.11)
   whenever (= 0.9.2)

diff --git a/app/assets/javascripts/shared/utils.js.coffee b/app/assets/javascripts/shared/utils.js.coffee
@@ -1,6 +1,10 @@
-
 #= require jquery
 #= require jquery_ujs
+#= require turbolinks
+#= require jquery.turbolinks
+#= require nprogress
+#= require nprogress-turbolinks
+
 #= require shared/bootstrap
 #= require shared/underscore
 #= require shared/backbone

diff --git a/app/assets/stylesheets/shared/utils.css.scss b/app/assets/stylesheets/shared/utils.css.scss
@@ -1,3 +1,5 @@
+@import "nprogress";
+@import "nprogress-bootstrap";
 
 @import "shared/bootstrap";
 @import "font-awesome";