sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

v3: undo changes to client that were necessary to test v2

Browse source
This commit is contained in:
Matteo Pagliazzi 2016-04-18 22:42:59 +02:00
parent f44dbbbd71
commit 4138eab155
6 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
website/public/js/controllers/footerCtrl.js
View file

@ -70,8 +70,7 @@ function($scope, $rootScope, User, $http, Notification, ApiUrl, Social) {
/**
* Debug functions. Note that the server route for gems is only available if process.env.DEBUG=true
*/
// enable debug menu to test v3 TODO remove
if (true || _.contains(['development','test'],window.env.NODE_ENV)) {
if (_.contains(['development','test'],window.env.NODE_ENV)) {
$scope.setHealthLow = function(){
User.set({

4
website/public/manifest.json
View file

@ -32,6 +32,8 @@
"bower_components/jquery-ui/ui/minified/jquery.ui.mouse.min.js",
"bower_components/jquery-ui/ui/minified/jquery.ui.sortable.min.js",
"common/dist/scripts/habitrpg-shared.js",
"js/env.js",
"js/app.js",
@ -108,6 +110,7 @@
"static": {
"js": [
"bower_components/jquery/dist/jquery.min.js",
"common/dist/scripts/habitrpg-shared.js",
"bower_components/angular/angular.js",
"bower_components/angular-ui/build/angular-ui.js",
"bower_components/angular-bootstrap/ui-bootstrap.js",
@ -140,6 +143,7 @@
"tmp_static_front": {
"js": [
"bower_components/jquery/dist/jquery.min.js",
"common/dist/scripts/habitrpg-shared.js",
"bower_components/angular/angular.js",
"bower_components/angular-ui/build/angular-ui.js",
"bower_components/jquery-colorbox/jquery.colorbox-min.js",

2
website/src/controllers/api-v2/user.js
View file

@ -458,7 +458,7 @@ api.delete = function(req, res, next) {
Development Only Operations
------------------------------------------------------------------------
*/
if (true || nconf.get('NODE_ENV') === 'development') {
if (nconf.get('NODE_ENV') === 'development') {
api.addTenGems = function(req, res, next) {
var user = res.locals.user;

1
website/views/index.jade
View file

@ -20,7 +20,6 @@ html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":a
script(type='text/javascript').
window.env = !{JSON.stringify(env._.pick(env, env.clientVars))};
script(type='text/javascript', src='https://habitica.com/common/dist/scripts/habitrpg-shared.js')
!= env.getManifestFiles("app")
//webfonts

2
website/views/shared/footer.jade
View file

@ -79,7 +79,7 @@ footer.footer(ng-controller='FooterCtrl')
tr
td
iframe(src='/bower_components/github-buttons/github-btn.html?user=habitrpg&repo=habitrpg&type=watch&count=true', allowtransparency='true', frameborder='0', scrolling='0', width='85px', height='20px')
if (true || env.NODE_ENV==='development' || env.NODE_ENV==='test') && !env.isStaticPage
if (env.NODE_ENV==='development' || env.NODE_ENV==='test') && !env.isStaticPage
h4 Debug
.btn-group-vertical
a.btn.btn-default(ng-click='setHealthLow()') Health = 1

1
website/views/static/front.jade
View file

@ -32,7 +32,6 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
script(type='text/javascript').
window.env = !{JSON.stringify(env._.pick(env, env.clientVars))};
script(type='text/javascript', src='https://habitica.com/common/dist/scripts/habitrpg-shared.js')
!= env.getManifestFiles("tmp_static_front")
script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js')