krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

@lefnire since we are just testing and not deploying from this I liked to try the loading bar we talked about so that everyone can say what they do think

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-10-30 19:13:21 +01:00
parent ff3266bac8
commit 1490380e53
5 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gruntfile.js
View File

@@ -29,6 +29,7 @@ module.exports = function(grunt) {
'public/bower_components/angular-resource/angular-resource.min.js',
'public/bower_components/angular-ui/build/angular-ui.min.js',
'public/bower_components/angular-ui-utils/modules/keypress/keypress.js',
'public/bower_components/angular-loading-bar/build/loading-bar.js',
// we'll remove this once angular-bootstrap is fixed
'public/bower_components/bootstrap/docs/assets/js/bootstrap.min.js',
'public/bower_components/angular-bootstrap/ui-bootstrap.min.js',

3
bower.json
View File

@@ -33,7 +33,8 @@
"angular-sanitize": "1.2.0-rc.2",
"marked": "~0.2.9",
"JavaScriptButtons": "git://github.com/paypal/JavaScriptButtons.git#master",
"angular-ui-router": "eda67d2da08cbe2aa1aa39ef154a87c7afe480ec"
"angular-ui-router": "eda67d2da08cbe2aa1aa39ef154a87c7afe480ec",
"angular-loading-bar": "~0.0.5"
},
"resolutions": {
"jquery": "~2.0.3",

1
public/css/index.styl
View File

@@ -6,6 +6,7 @@
@import "../bower_components/angular-ui/build/angular-ui.min.css"
@import "../bower_components/bootstrap/docs/assets/css/bootstrap-responsive.css"
@import "../bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css"
@import "../bower_components/angular-loading-bar/build/loading-bar.css"
// Custom includes
@import "./tasks.styl"

4
public/js/app.js
View File

@@ -1,7 +1,9 @@
"use strict";
window.habitrpg = angular.module('habitrpg',
['ngResource', 'ngSanitize', 'userServices', 'groupServices', 'memberServices', 'challengeServices', 'sharedServices', 'authServices', 'notificationServices', 'guideServices', 'ui.bootstrap', 'ui.keypress', 'ui.router'])
['ngResource', 'ngSanitize', 'userServices', 'groupServices', 'memberServices', 'challengeServices',
'sharedServices', 'authServices', 'notificationServices', 'guideServices',
'ui.bootstrap', 'ui.keypress', 'ui.router', 'chieffancypants.loadingBar'])
.constant("API_URL", "")
.constant("STORAGE_USER_ID", 'habitrpg-user')

2
views/index.jade
View File

@@ -39,6 +39,8 @@ html
script(type='text/javascript', src='/bower_components/angular-resource/angular-resource.js')
script(type='text/javascript', src='/bower_components/angular-ui/build/angular-ui.js')
script(type='text/javascript', src='/bower_components/angular-ui-utils/modules/keypress/keypress.js')
script(type='text/javascript', src='/bower_components/angular-loading-bar/build/loading-bar.js')
// we'll remove this once angular-bootstrap is fixed
script(type='text/javascript', src='/bower_components/bootstrap/docs/assets/js/bootstrap.min.js')
script(type='text/javascript', src='/bower_components/angular-bootstrap/ui-bootstrap.min.js')