diff --git a/Gruntfile.js b/Gruntfile.js index 3c1c785ccd..11012c197d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -82,7 +82,7 @@ module.exports = function(grunt) { 'public/bower_components/angular/angular.min.js', 'public/bower_components/angular-resource/angular-resource.min.js', 'public/bower_components/bootstrap/docs/assets/js/bootstrap.min.js', - + 'public/bower_components/angular-loading-bar/build/loading-bar.js', 'public/js/static.js', 'public/js/services/userServices.js', 'public/js/controllers/authCtrl.js' diff --git a/public/css/static.styl b/public/css/static.styl index 4de9de0283..b20358bcd4 100644 --- a/public/css/static.styl +++ b/public/css/static.styl @@ -1,5 +1,6 @@ // Vendor Includes - include first so we can override // Import only styles that do not have urls to images! Include them directly in the page! +@import "../bower_components/angular-loading-bar/build/loading-bar.css" @import "./static-pages.css" @import "./footer.css" \ No newline at end of file diff --git a/public/js/static.js b/public/js/static.js index 4876031b17..4eaee31a96 100644 --- a/public/js/static.js +++ b/public/js/static.js @@ -1,6 +1,6 @@ "use strict"; -window.habitrpg = angular.module('habitrpg', ['userServices']) +window.habitrpg = angular.module('habitrpg', ['userServices', 'chieffancypants.loadingBar']) .constant("API_URL", "") .constant("STORAGE_USER_ID", 'habitrpg-user') .constant("STORAGE_SETTINGS_ID", 'habit-mobile-settings') \ No newline at end of file diff --git a/views/static/layout.jade b/views/static/layout.jade index 2057c6ab30..29837f2e79 100644 --- a/views/static/layout.jade +++ b/views/static/layout.jade @@ -30,6 +30,7 @@ html script(type='text/javascript', src='/bower_components/angular/angular.min.js') script(type='text/javascript', src='/bower_components/angular-resource/angular-resource.min.js') script(type='text/javascript', src='/bower_components/bootstrap/docs/assets/js/bootstrap.min.js') + script(type='text/javascript', src='/bower_components/angular-loading-bar/build/loading-bar.js') script(type='text/javascript', src='/js/static.js') script(type='text/javascript', src='/js/services/userServices.js')