3.51.0

* feat(content): mystery items 2016-10

* chore(news): Bailey 2016-10-25
Also ends the Enchanted Armoire A/B test.

* fix(armoire): failing tests from A/B conclusion

.eslintignore

@@ -1,28 +1,27 @@
 # Compiled and vendored files
-common/dist/
-common/transpiled-babel/
 coverage/
 database_reports/
 website/build/
 website/transpiled-babel/
+website/common/transpiled-babel/
+dist/
+dist-client/
 
+# Not linted
 migrations/*
-
-# The files in website/client-old/js should be moved out and browserified
 website/client-old/
-
-# Temporarilly disabled. These should be removed when the linting errors are fixed
-common/script/content/index.js
-
-debug-scripts/*
 scripts/*
-tasks/*.js
-gulpfile.js
-Gruntfile.js
-newrelic.js
-
-test/api-legacy/**/*
-test/common/simulations/**/*
-test/content/**/*
 test/server_side/**/*
-test/spec/**/*
+test/client-old/spec/**/*
+
+# Temporarilly disabled. These should be removed when the linting errors are fixed TODO
+website/common/script/content/index.js
+website/common/browserify.js
+test/content/**/*
+Gruntfile.js
+gulpfile.js
+gulp
+webpack
+test/client/e2e
+test/client/unit/index.js
+test/client/unit/karma.conf.js

.eslintrc

@@ -1,10 +1,10 @@
 {
+  "root": true,
+  "env": {
+    "node": true,
+  },
   "extends": [
-    "habitrpg/server",
-    "habitrpg/babel"
+    "habitrpg/es6",
+    "habitrpg"
   ],
-  "globals": {
-    "Promise": true,
-    "Set": false
-  }
 }

.gitignore

@@ -2,8 +2,10 @@
 website/client-old/gen
 website/client-old/common
 website/client-old/apidoc
+website/client-old/js/habitrpg-shared.js*
+website/client-old/css/habitrpg-shared.css
 website/transpiled-babel/
-common/transpiled-babel/
+website/common/transpiled-babel/
 node_modules
 *.swp
 .idea*
@@ -12,7 +14,6 @@ npm-debug.log*
 lib
 website/client-old/bower_components
 website/client-old/new-stuff.html
-website/build
 newrelic_agent.log
 .bower-tmp
 .bower-registry
@@ -30,9 +31,11 @@ website/client-old/docs
 coverage
 coverage.html
 common/dist/scripts/*
-common/dist/sprites/habitrpg-shared.css
-
-test/spec/mocks/translations.js
+dist
+dist-client
+test/client/unit/coverage
+test/client/e2e/reports
+test/client-old/spec/mocks/translations.js
 
 # Elastic Beanstalk Files
 .elasticbeanstalk/*

.nodemonignore

@@ -6,6 +6,7 @@ website/client-old/**
 website/client/**
 website/views/**
 website/build/**
+dist/**
 test/**
 .git/**
 Gruntfile.js

.travis.yml

@@ -2,16 +2,21 @@ language: node_js
 node_js:
   - '4.3.1'
 before_install:
-  - "npm install -g npm@3"
-  - "npm install -g gulp"
-  - "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10"
-  - "echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list"
-  - "sudo apt-get update"
-  - "sudo apt-get install mongodb-org-server"
+  - npm install -g npm@3
+  - if [ $REQUIRES_SERVER ]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10; echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list; sudo apt-get update; sudo apt-get install mongodb-org-server; fi
 before_script:
-  - 'npm install -g grunt-cli mocha'
+  - npm run test:build
   - cp config.json.example config.json
-  - "until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done"
-  - "export DISPLAY=:99"
+  - if [ $REQUIRES_SERVER ]; then until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done; export DISPLAY=:99; fi
 after_script:
-  - "./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js"
+  - ./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js
+script: npm run $TEST
+env:
+  matrix:
+    - TEST="lint"
+    - TEST="test:api-v3" REQUIRES_SERVER=true
+    - TEST="test:sanity"
+    - TEST="test:content"
+    - TEST="test:common"
+    - TEST="test:karma"
+    - TEST="client:unit"

Gruntfile.js

@@ -9,10 +9,10 @@ module.exports = function(grunt) {
 
     karma: {
       unit: {
-        configFile: 'karma.conf.js'
+        configFile: 'test/client-old/spec/karma.conf.js'
       },
       continuous: {
-        configFile: 'karma.conf.js',
+        configFile: 'test/client-old/spec/karma.conf.js',
         singleRun: true,
         autoWatch: false
       }
@@ -28,11 +28,11 @@ module.exports = function(grunt) {
           report: 'gzip'
         },
         files:{
-          "common/dist/sprites/habitrpg-shared.css": [
-            "common/dist/sprites/spritesmith*.css",
-            "common/css/backer.css",
-            "common/css/Mounts.css",
-            "common/css/index.css"
+          "website/client-old/css/habitrpg-shared.css": [
+            "website/assets/sprites/dist/spritesmith*.css",
+            "website/assets/sprites/css/backer.css",
+            "website/assets/sprites/css/Mounts.css",
+            "website/assets/sprites/css/index.css"
           ]
         }
       }
@@ -57,10 +57,10 @@ module.exports = function(grunt) {
         files: [
           {expand: true, cwd: 'website/client-old/', src: 'favicon.ico', dest: 'website/build/'},
           {expand: true, cwd: 'website/client-old/', src: 'favicon_192x192.png', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'common/dist/sprites/spritesmith*.png', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'common/img/sprites/backer-only/*.gif', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'common/img/sprites/npc_ian.gif', dest: 'website/build/'},
-          {expand: true, cwd: '', src: 'common/img/sprites/quest_*.gif', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/dist/', src: 'spritesmith*.png', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/', src: 'backer-only/*.gif', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/', src: 'npc_ian.gif', dest: 'website/build/'},
+          {expand: true, cwd: 'website/assets/sprites/', src: 'quest_*.gif', dest: 'website/build/'},
           {expand: true, cwd: 'website/client-old/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'website/build/'}
         ]
       }
@@ -77,10 +77,8 @@ module.exports = function(grunt) {
           'website/build/*.css',
           'website/build/favicon.ico',
           'website/build/favicon_192x192.png',
-          'website/build/common/dist/sprites/*.png',
-          'website/build/common/img/sprites/backer-only/*.gif',
-          'website/build/common/img/sprites/npc_ian.gif',
-          'website/build/common/img/sprites/quest_*.gif',
+          'website/build/*.png',
+          'website/build/*.gif',
           'website/build/bower_components/bootstrap/dist/fonts/*'
         ],
         dest: 'website/build/*.css'
@@ -128,15 +126,7 @@ module.exports = function(grunt) {
   // Register tasks.
   grunt.registerTask('build:prod', ['loadManifestFiles', 'clean:build', 'uglify', 'stylus', 'cssmin', 'copy:build', 'hashres']);
   grunt.registerTask('build:dev', ['cssmin', 'stylus']);
-  grunt.registerTask('build:test', ['test:prepare:translations', 'build:dev']);
-
-  grunt.registerTask('test:prepare:translations', function() {
-    var i18n  = require('./website/server/libs/i18n'),
-        fs    = require('fs');
-    fs.writeFileSync('test/spec/mocks/translations.js',
-      "if(!window.env) window.env = {};\n" +
-      "window.env.translations = " + JSON.stringify(i18n.translations['en']) + ';');
-  });
+  grunt.registerTask('build:test', ['build:dev']);
 
   // Load tasks
   grunt.loadNpmTasks('grunt-contrib-uglify');
@@ -146,6 +136,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-hashres');
-  grunt.loadNpmTasks('grunt-karma');
+  if (process.env.NODE_ENV !== 'production') grunt.loadNpmTasks('grunt-karma');
 
 };

README.md

@@ -1,4 +1,4 @@
-Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitrpg.svg?branch=develop)](https://travis-ci.org/HabitRPG/habitrpg) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.svg)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Coverage Status](https://coveralls.io/repos/HabitRPG/habitrpg/badge.svg?branch=develop)](https://coveralls.io/r/HabitRPG/habitrpg?branch=develop) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
+Habitica [![Build Status](https://travis-ci.org/HabitRPG/habitica.svg?branch=develop)](https://travis-ci.org/HabitRPG/habitica) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.svg)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Coverage Status](https://coveralls.io/repos/HabitRPG/habitrpg/badge.svg?branch=develop)](https://coveralls.io/r/HabitRPG/habitrpg?branch=develop) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE)
 ===============
 
 [Habitica](https://habitica.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.
@@ -10,21 +10,3 @@ For an introduction to the technologies used and how the software is organized,
 To set up a local install of Habitica for development and testing, see [Setting up Habitica Locally](http://habitica.wikia.com/wiki/Setting_up_Habitica_Locally), which contains instructions for Windows, *nix / Mac OS, and Vagrant.
 
 Then read [Guidance for Blacksmiths](http://habitica.wikia.com/wiki/Guidance_for_Blacksmiths) for additional instructions and useful tips.
-
-## Debug Scripts
-
-In the `./debug-scripts/` folder, there are a few files. Here's a sample:
-
-```bash
-grant-all-equipment.js
-grant-all-mounts.js
-grant-all-pets.js
-```
-
-You can run them by doing:
-
-```bash
-node debug-scripts/name-of-script.js
-```
-
-If there are more arguments required to make the script work, it will print out the usage and an explanation of what the script does.

bower.json

@@ -36,14 +36,15 @@
     "jquery-ui": "1.10.3",
     "jquery.cookie": "1.4.0",
     "js-emoji": "snicker/js-emoji#f25d8a303f",
-    "ngInfiniteScroll": "1.0.0",
+    "ngInfiniteScroll": "1.1.0",
     "pnotify": "1.3.1",
     "sticky": "1.0.3",
     "swagger-ui": "wordnik/swagger-ui#v2.0.24",
     "smart-app-banner": "78ef9c0679723b25be1a0ae04f7b4aef7cbced4f",
     "habitica-markdown": "1.2.2",
     "pusher-js-auth": "^2.0.0",
-    "pusher-websocket-iso": "pusher#^3.1.0"
+    "pusher-websocket-iso": "pusher#^3.2.0",
+    "taggle": "^1.11.1"
   },
   "devDependencies": {
     "angular-mocks": "1.3.9"

common/.eslintrc

@@ -1,4 +0,0 @@
-{
-  "extends": "habitrpg/browser"
-}
-

common/README.md

@@ -1,16 +0,0 @@
-# Common
-
-Shared resources useful for the multiple Habitica repositories, that way all the repositories remain in-sync with common characteristics. Includes things like:
-
- * Assets - sprites, images, etc
- * CSS - especially, esp. sprite-sheet mapping
- * Algorithms - level up algorithm, scoring functions, etc
- * View helper functions that may come in handy for multiple client MVCs
- * Item definitions - weapons, armor, pets 
-
-## Compiling spritesheets
-Because of some wonkiness with Heroku, the spritesheet compilation is not part of the production build process and must be done manually when new images are added by running: 
-
-``` bash
-npm run sprites
-```

common/dist/sprites/spritesmith-largeSprites-0.css

@@ -1,576 +0,0 @@
-.2014_Fall_HealerPROMO2 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1092px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.2014_Fall_Mage_PROMO9 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1513px -808px;
-  width: 120px;
-  height: 90px;
-}
-.2014_Fall_RoguePROMO3 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -769px -1378px;
-  width: 105px;
-  height: 90px;
-}
-.2014_Fall_Warrior_PROMO {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1433px -1378px;
-  width: 90px;
-  height: 90px;
-}
-.promo_android {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -954px -151px;
-  width: 175px;
-  height: 175px;
-}
-.promo_backgrounds_armoire_201602 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -199px;
-  width: 141px;
-  height: 294px;
-}
-.promo_backgrounds_armoire_201603 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1277px -199px;
-  width: 141px;
-  height: 294px;
-}
-.promo_backgrounds_armoire_201604 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -281px -525px;
-  width: 140px;
-  height: 441px;
-}
-.promo_backgrounds_armoire_201605 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px 0px;
-  width: 140px;
-  height: 441px;
-}
-.promo_backgrounds_armoire_201606 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -140px -525px;
-  width: 140px;
-  height: 447px;
-}
-.promo_backgrounds_armoire_201607 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -525px;
-  width: 139px;
-  height: 588px;
-}
-.promo_backgrounds_armoire_201608 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px 0px;
-  width: 140px;
-  height: 439px;
-}
-.promo_backgrounds_armoire_201609 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -440px;
-  width: 139px;
-  height: 438px;
-}
-.promo_backtoschool {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -151px -1378px;
-  width: 150px;
-  height: 150px;
-}
-.promo_burnout {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -151px;
-  width: 219px;
-  height: 240px;
-}
-.promo_chairs_glasses {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px 0px;
-  width: 51px;
-  height: 210px;
-}
-.promo_classes_fall_2014 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -684px;
-  width: 321px;
-  height: 100px;
-}
-.promo_classes_fall_2015 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -808px;
-  width: 377px;
-  height: 99px;
-}
-.promo_cow {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -442px;
-  width: 140px;
-  height: 441px;
-}
-.promo_dilatoryDistress {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -546px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_egg_mounts {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -494px;
-  width: 280px;
-  height: 147px;
-}
-.promo_enchanted_armoire {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1114px;
-  width: 374px;
-  height: 76px;
-}
-.promo_enchanted_armoire_201507 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -250px -1275px;
-  width: 217px;
-  height: 90px;
-}
-.promo_enchanted_armoire_201508 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -468px -1275px;
-  width: 180px;
-  height: 90px;
-}
-.promo_enchanted_armoire_201509 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -728px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_enchanted_armoire_201511 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1498px -908px;
-  width: 122px;
-  height: 90px;
-}
-.promo_enchanted_armoire_201601 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -910px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_floral_potions {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -785px;
-  width: 105px;
-  height: 273px;
-}
-.promo_habitica {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1419px -199px;
-  width: 175px;
-  height: 175px;
-}
-.promo_habitica_sticker {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -220px;
-  width: 305px;
-  height: 304px;
-}
-.promo_haunted_hair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -453px -1378px;
-  width: 100px;
-  height: 137px;
-}
-.promo_item_notif {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1275px;
-  width: 249px;
-  height: 102px;
-}
-.promo_mystery_201405 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1001px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201406 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -182px -1529px;
-  width: 90px;
-  height: 96px;
-}
-.promo_mystery_201407 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px -412px;
-  width: 42px;
-  height: 62px;
-}
-.promo_mystery_201408 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1573px -494px;
-  width: 60px;
-  height: 71px;
-}
-.promo_mystery_201409 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1183px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201410 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1060px -573px;
-  width: 72px;
-  height: 63px;
-}
-.promo_mystery_201411 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1274px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201412 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px -345px;
-  width: 42px;
-  height: 66px;
-}
-.promo_mystery_201501 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px -211px;
-  width: 48px;
-  height: 63px;
-}
-.promo_mystery_201502 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1365px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201503 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -819px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201504 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1573px -566px;
-  width: 60px;
-  height: 69px;
-}
-.promo_mystery_201505 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -637px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201506 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1634px -275px;
-  width: 42px;
-  height: 69px;
-}
-.promo_mystery_201507 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1529px;
-  width: 90px;
-  height: 105px;
-}
-.promo_mystery_201508 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1157px -1378px;
-  width: 93px;
-  height: 90px;
-}
-.promo_mystery_201509 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -364px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201510 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1063px -1378px;
-  width: 93px;
-  height: 90px;
-}
-.promo_mystery_201511 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1524px -1378px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201512 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1565px -96px;
-  width: 60px;
-  height: 81px;
-}
-.promo_mystery_201601 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1496px -1011px;
-  width: 120px;
-  height: 90px;
-}
-.promo_mystery_201602 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -1378px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201603 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1251px -1378px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201604 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -969px -1378px;
-  width: 93px;
-  height: 90px;
-}
-.promo_mystery_201605 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -455px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201606 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -91px -1529px;
-  width: 90px;
-  height: 105px;
-}
-.promo_mystery_201607 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -273px -1529px;
-  width: 90px;
-  height: 90px;
-}
-.promo_mystery_201608 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px -1378px;
-  width: 93px;
-  height: 90px;
-}
-.promo_mystery_3014 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -840px -967px;
-  width: 217px;
-  height: 90px;
-}
-.promo_orca {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -554px -1378px;
-  width: 105px;
-  height: 105px;
-}
-.promo_partyhats {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -954px -327px;
-  width: 115px;
-  height: 47px;
-}
-.promo_pastel_skin {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -1191px;
-  width: 330px;
-  height: 83px;
-}
-.customize-option.promo_pastel_skin {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -356px -1206px;
-  width: 60px;
-  height: 60px;
-}
-.promo_peppermint_flame {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px -879px;
-  width: 140px;
-  height: 147px;
-}
-.promo_pet_skins {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -884px;
-  width: 140px;
-  height: 147px;
-}
-.customize-option.promo_pet_skins {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -477px -899px;
-  width: 60px;
-  height: 60px;
-}
-.promo_shimmer_hair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1191px;
-  width: 330px;
-  height: 83px;
-}
-.promo_splashyskins {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1419px -375px;
-  width: 198px;
-  height: 91px;
-}
-.customize-option.promo_splashyskins {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1444px -390px;
-  width: 60px;
-  height: 60px;
-}
-.promo_spring_classes_2016 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -908px;
-  width: 362px;
-  height: 102px;
-}
-.promo_springclasses2014 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -840px -876px;
-  width: 288px;
-  height: 90px;
-}
-.promo_springclasses2015 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -840px -785px;
-  width: 288px;
-  height: 90px;
-}
-.promo_staff_spotlight_Lemoness {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
-  width: 102px;
-  height: 146px;
-}
-.promo_staff_spotlight_Viirus {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1005px -392px;
-  width: 119px;
-  height: 147px;
-}
-.promo_staff_spotlight_paglias {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -367px;
-  width: 99px;
-  height: 147px;
-}
-.promo_summer_classes_2014 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -96px;
-  width: 429px;
-  height: 102px;
-}
-.promo_summer_classes_2015 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -140px -973px;
-  width: 300px;
-  height: 88px;
-}
-.promo_summer_classes_2016 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px 0px;
-  width: 400px;
-  height: 150px;
-}
-.promo_takeThis_gear {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -649px -1275px;
-  width: 114px;
-  height: 87px;
-}
-.promo_takethis_armor {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -764px -1275px;
-  width: 114px;
-  height: 87px;
-}
-.promo_unconventional_armor {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1056px -684px;
-  width: 60px;
-  height: 60px;
-}
-.promo_updos {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1416px -494px;
-  width: 156px;
-  height: 147px;
-}
-.promo_veteran_pets {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -528px -1114px;
-  width: 146px;
-  height: 75px;
-}
-.promo_winter_classes_2016 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -1011px;
-  width: 360px;
-  height: 90px;
-}
-.promo_winterclasses2015 {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -573px;
-  width: 325px;
-  height: 110px;
-}
-.promo_winteryhair {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -375px -1114px;
-  width: 152px;
-  height: 75px;
-}
-.avatar_variety {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px 0px;
-  width: 498px;
-  height: 95px;
-}
-.npc_viirus {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -660px -1378px;
-  width: 108px;
-  height: 90px;
-}
-.party_preview {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px 0px;
-  width: 451px;
-  height: 219px;
-}
-.scene_coding {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -302px -1378px;
-  width: 150px;
-  height: 150px;
-}
-.scene_phone_peek {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1378px;
-  width: 150px;
-  height: 150px;
-}
-.welcome_basic_avatars {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1135px -642px;
-  width: 246px;
-  height: 165px;
-}
-.welcome_promo_party {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -392px;
-  width: 270px;
-  height: 180px;
-}
-.welcome_sample_tasks {
-  background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1382px -642px;
-  width: 246px;
-  height: 165px;
-}

common/locales/cs/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/da/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/de/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/en/_README_FIRST.md

@@ -1,6 +0,0 @@
-You may edit any files in this directory. Do not edit files in any
-other locales directory.
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/en@pirate/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/en_GB/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/es/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/es_419/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/fr/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/he/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/hu/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/id/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/it/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/ja/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/nl/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/nl/loadingscreentips.json

@@ -1,35 +0,0 @@
-{
-  "tipTitle": "Tip #<%= tipNumber %>",
-  "tip1": "Houd je taken overal in de gaten met de Habitica mobiele app. ",
-  "tip2": "Bereik level 100 om de Bol der Hergeboorte gratis vrij te spelen en een nieuw avontuur te beginnen.",
-  "tip3": "Gebruik emoticons om snel onderscheid te maken tussen je taken.",
-  "tip4": "Gebruik het # teken voor de naam van een taak om het heel groot te maken!",
-  "tip5": "Het beste is het om versterkingen 's morgens uit te spreken, zodat ze zo lang mogelijk effectief zijn. ",
-  "tip6": "Herevalueer je taken van tijd tot tijd om te zorgen dat ze up-to-date zijn!",
-  "tip7": "Sommige achtergronden verbinden zich perfect met elkaar als groepsleden dezelfde achtergrond gebruiken. Bv: Bergmeer, Pagodas en Rollende heuvels.",
-  "tip8": "Stuur een Persoonlijk bericht naar iemand door te klikken op het envelopje bij de naam van diegene in de chat!",
-  "tip9": "Bezoek de Guild Leaders & Challenge Creators gilde voor advies over het starten van een gilde.",
-  "tip10": "Je kan edelstenen winnen door deel te nemen aan Uitdagingen. Dagelijks worden er nieuwe toegevoegd. ",
-  "tip11": "Als je het leuk vindt om je avatar aan te kleden, neem dan een kijkje in de Costume Carnival gilde.",
-  "tip12": "Word lid van de \"Challenge... Accepted\" gilde voor regelmatig geplande willekeurige uitdagingen.",
-  "tip13": "Meer dan vier groepsleden hebben verhoogt de verantwoordelijkheid!",
-  "tip14": "Je kan koplijnen of inspirationele uitspraken toevoegen aan je lijst van Gewoontes zonder (+/-).",
-  "tip15": "Voeg checklijsten aan jet To-do lijst toe om je beloningen te verhogen!",
-  "tip16": "Bekijk de Data knop voor waardevolle inzichten in jouw vooruitgang. ",
-  "tip17": "Het gebruik van labels kan een haast onmogelijke takenlijst toch handelbaar maken. ",
-  "tip18": "Gewoontes die gewoon positief of negatief zijn, \"vervagen\" langzaam en worden terug geel.",
-  "tip19": "Verhoog je Intelligentie-eigenschap om meer EP te krijgen wanneer je een taak volbrengt.",
-  "tip20": "Verhoog je Perceptie-eigenschap om meer vondsten en goud te krijgen.",
-  "tip21": "Verhoog je Kracht-eigenschap om meer schade toe te brengen aan eindbazen of om voltreffers te krijgen.",
-  "tip22": "Verhoog je Lichaam eigenschap om de schade van onvoltooide dagelijkse taken te minderen.",
-  "tip23": "klik op het histogram-grafiek icoon van jouw taak om de grafiek te zien van je vooruitgang.",
-  "tip24": "Habitica is een Open source! Vraag in de Aankomende Legendes Gilde als je wilt bijdragen",
-  "tip25": "De vier seizoengebonden Grote Gala's beginnen dicht bij de zonnewende's en de nachteveningen.",
-  "tip26": "Een pijltje links van iemand's level nummer betekent dat ze op het moment versterkt zijn. ",
-  "tip27": "Verwijs in je laatavond dagelijkse taken naar de vorige avond (zoals: \"gisterenavond geflost\") zodat je ze 's ochtends kan afvinken.",
-  "tip28": "Stel een aangepast dagbegin in onder Instellingen > Site om te bepalen wanneer een nieuwe dag begint.",
-  "tip29": "Voltooi al je dagelijkse taken om een 'perfecte dag versterking' te krijgen die je eigenschappen verhoogt!",
-  "tip30": "Je kan mensen uitnodigen voor gildes, niet enkel voor groepen. ",
-  "tip31": "Bekijk de voorgemaakte lijsten in de \"Library of Shared Lists\" gilde voor voorbeeldtaken.",
-  "tip32": "Veel van Habitica's code, afbeeldingen en teksten zijn gemaakt door vrijwilligers! Iedereen kan helpen."
-}

common/locales/pl/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/pt/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/ro/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/ru/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/ru/loadingscreentips.json

@@ -1,35 +0,0 @@
-{
-  "tipTitle": "Совет #<%= tipNumber %>",
-  "tip1": "Проверьте задачи на ходу с помощью мобильных приложений Habitica.",
-  "tip2": "Достигните 100 уровня, чтобы бесплатно получить Шар Возрождения и начать новое приключение!",
-  "tip3": "Используйте emoji, чтобы быстро различать задачи.",
-  "tip4": "Используйте символ # перед названием задания, чтобы сделать его очень большим!",
-  "tip5": "Баффы, наложенные утром, продержатся дольше.",
-  "tip6": "Иногда переоценивайте свои задачи, чтобы удостовериться в их своевременности",
-  "tip7": "Некоторые фоны идеально соединяются друг с другом, если члены команды используют одно и то же изображение. Например, Горное Озеро, Пагода или Круглые Холмы.",
-  "tip8": "Чтобы отправить сообщение, просто щелкните по иконке конверта рядом с именем в чате.",
-  "tip9": "Visit the Guild Leaders & Challenge Creators Guild for advice on starting a Guild.",
-  "tip10": "Вы можете выиграть самоцветы, участвуя в испытаниях. Каждый день появляются новые!",
-  "tip11": "If you enjoy dressing up your avatar, check out the Costume Carnival Guild.",
-  "tip12": "Join the “Challenge... Accepted” Guild for regularly scheduled random challenges.",
-  "tip13": "Having more than four Party members increases accountability!",
-  "tip14": "You can add headers or inspirational quotes to your list as Habits with no (+/-).",
-  "tip15": "Add checklists to your To-Dos to increase your rewards!",
-  "tip16": "Check out the Data tab for valuable insights on your progress.",
-  "tip17": "Using Tags can make an unwieldy task list very manageable!",
-  "tip18": "Habits that are just positive or just negative gradually “fade” and return to yellow.",
-  "tip19": "Boost your Intelligence Stat to gain more XP when you complete a task.",
-  "tip20": "Повышайте Восприятие, чтобы получить больше добычи и золота.",
-  "tip21": "Повышайте свою Силу, чтобы наносить больше урона боссам или делать критические удары.",
-  "tip22": "Boost your Constitution Stat to lessen the damage from incomplete Dailies.",
-  "tip23": "Click the bar graph icon on your tasks to see a graph showing your progress.",
-  "tip24": "Habitica is Open Source! Ask in the Aspiring Legends Guild if you want to contribute.",
-  "tip25": "The four seasonal Grand Galas start near the solstices and equinoxes.",
-  "tip26": "An arrow to the left of someone’s level number means they’re currently buffed.",
-  "tip27": "Make late-night Dailies refer to the night before (such as “flossed last night”) so you can check them off in the morning.",
-  "tip28": "Set a Custom Day Start under Settings > Site to control when your day restarts.",
-  "tip29": "Complete all your Dailies to get a Perfect Day Buff that increases your stats!",
-  "tip30": "You can invite people to Guilds, not just Parties.",
-  "tip31": "Check out the pre-made lists in the Library of Shared Lists Guild for example tasks.",
-  "tip32": "Lots of Habitica’s code, art, and writing is made by volunteer contributors! Anyone can help."
-}

common/locales/sk/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/sr/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/sv/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/uk/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/uk/death.json

@@ -1,17 +0,0 @@
-{
-    "lostAllHealth": "У вас закінчилося здоров'я!",
-    "dontDespair": "Не занепадайте духом!",
-    "deathPenaltyDetails": "Ви втратили рівень, ваше золото, і одне обмундирування, але ви можете їх відпрацювати! Ви прекрасно справитеся, щасти!",
-    "refillHealthTryAgain": "Вилікуватися і спробувати знову",
-    "dyingOftenTips": "Часто вмираєте? <a href='http://habitica.wikia.com/wiki/Death_Mechanics#Strategies_for_Staying_Alive' target='_blank'>Ось кілька порад!</a>\n",
-    "losingHealthWarning": "Обережно - Ви втрачаєте здоров'я!",
-    "losingHealthWarning2": "Не дайте скінчитися здоров'ю! Втратите рівень, ваше золото, і одну річ з інвентаря.",
-    "toRegainHealth": "Щоб знову отримати Здоров'я:",
-    "lowHealthTips1": "Підвищіть рівень щоб повністю оздоровитися!",
-    "lowHealthTips2": "Купіть лікувальне зілля з колонки нагород щоб відновити 15 очків здоров'я.",
-    "losingHealthQuickly": "Швидко втрачаєте здоров'я?",
-    "lowHealthTips3": "Невиконані щоденні задачі приносять вам шкоду уночі, тож не додавайте забагато спочатку!",
-    "lowHealthTips4": "Ви можете вимкнути щоденне завдання, якщо воно не має терміну придатності.",
-    "goodLuck": "Удачі!",
-    "cannotRevive": "Не можливо оживити живого."
-}

common/locales/uk/loadingscreentips.json

@@ -1,35 +0,0 @@
-{
-  "tipTitle": "Порада #<%= tipNumber %>",
-  "tip1": "Відмічайте завдання на ходу за допомогою мобільних додатків Habitica.",
-  "tip2": "Досягніть ріня 100, щоб безплатно розблокувати Сферу Переродження та почати пригоди заново!",
-  "tip3": "Використовуйте смайлики, щоб швидко розрізняти свої завдання.",
-  "tip4": "Використайте знак # перед назвою завдання, щоб зробити текст справді великим!",
-  "tip5": "Краще використовувати підсилюючі чари вранці, щоб вони тривали довше.",
-  "tip6": "Час від часу переоцінюйте свої завдання, щоб переконатися в їх актуальності!",
-  "tip7": "Some backgrounds connect perfectly if party members use the same background. Ex: Mountain Lake, Pagodas, and Rolling Hills.",
-  "tip8": "Надішліть комусь приватне повідомлення, натиснувши на конверт біля його імені в чаті!",
-  "tip9": "Visit the Guild Leaders & Challenge Creators Guild for advice on starting a Guild.",
-  "tip10": "Ви можете виграти самоцвіти, проходячи випробування. Вони з'являються кожен день!",
-  "tip11": "If you enjoy dressing up your avatar, check out the Costume Carnival Guild.",
-  "tip12": "Join the “Challenge... Accepted” Guild for regularly scheduled random challenges.",
-  "tip13": "Having more than four Party members increases accountability!",
-  "tip14": "Ви можете додати заголовки або надихаючі вас цитати в ваш список як звички без (+/-)",
-  "tip15": "Add checklists to your To-Dos to increase your rewards!",
-  "tip16": "Глянувши на вкладку з даними, ви отримаєте корисну інформацію щодо вашого прогресу.",
-  "tip17": "Громіздкий список щоденних справ можна значно спростити, розбивши його тегами.",
-  "tip18": "Звички, які є лише хорошими або лише поганими, з часом жовтіють самі.",
-  "tip19": "Підвищіть ваш інтелект щоб отримувати більше досвіду від завдань.",
-  "tip20": "Підвищіть вашу спостережливість щоб отримувати більше випадкових призів та золота.",
-  "tip21": "Підвищіть вашу силу щоб наносити більше ушкоджень босам та критичних ударів.",
-  "tip22": "Boost your Constitution Stat to lessen the damage from incomplete Dailies.",
-  "tip23": "Натисніть іконку \"графік\" на задачі щоб поглянути на графік, ілюструючий ваш прогрес.",
-  "tip24": "Habitica is Open Source! Ask in the Aspiring Legends Guild if you want to contribute.",
-  "tip25": "The four seasonal Grand Galas start near the solstices and equinoxes.",
-  "tip26": "Стрілка зліва від рівня персонажа означає, що він посилений.",
-  "tip27": "Make late-night Dailies refer to the night before (such as “flossed last night”) so you can check them off in the morning.",
-  "tip28": "В налаштуваннях можна змінити час початку доби.",
-  "tip29": "За завершення всіх щоденних завдань дається \"підсилення ідеального дня\", яке збільшує характеристики.",
-  "tip30": "Крім груп, людей можна запрошувати в гільдії.",
-  "tip31": "Check out the pre-made lists in the Library of Shared Lists Guild for example tasks.",
-  "tip32": "Багато коду, графіки і текстів сайту Habitica зроблено добровольцями. Кожен може допомогти."
-}

common/locales/zh/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/locales/zh_TW/_README_FIRST.md

@@ -1,5 +0,0 @@
-Do not edit any files in this directory!
-
-For more information read:
-
-https://github.com/HabitRPG/habitrpg/blob/develop/common/locales/README.md

common/script/fns/dotGet.js

@@ -1,7 +0,0 @@
-import _ from 'lodash';
-
-// TODO remove completely, use _.get, only used in client
-
-module.exports = function dotGet (user, path) {
-  return _.get(user, path);
-};

common/script/fns/dotSet.js

@@ -1,14 +0,0 @@
-import _ from 'lodash';
-
-/*
- This allows you to set object properties by dot-path. Eg, you can run pathSet('stats.hp',50,user) which is the same as
- user.stats.hp = 50. This is useful because in our habitrpg-shared functions we're returning changesets as {path:value},
- so that different consumers can implement setters their own way. Derby needs model.set(path, value) for example, where
- Angular sets object properties directly - in which case, this function will be used.
-*/
-
-// TODO use directly _.set and remove this fn, only used in client
-
-module.exports = function dotSet (user, path, val) {
-  return _.set(user, path, val);
-};

common/script/fns/nullify.js

@@ -1,7 +0,0 @@
-// TODO remove once v2 is retired
-
-module.exports = function nullify (user) {
-  user.ops = null;
-  user.fns = null;
-  user = null;
-};

common/script/fns/randomVal.js

@@ -1,12 +0,0 @@
-import _ from 'lodash';
-import predictableRandom from './predictableRandom';
-
-// Get a random property from an object
-// returns random property (the value)
-
-module.exports = function randomVal (user, obj, options = {}) {
-  let array = options.key ? _.keys(obj) : _.values(obj);
-  let rand = predictableRandom(user, options.seed);
-  array.sort();
-  return array[Math.floor(rand * array.length)];
-};

common/script/ops/addWebhook.js

@@ -1,27 +0,0 @@
-import refPush from '../libs/refPush';
-import validator from 'validator';
-import i18n from '../i18n';
-import {
-  BadRequest,
-} from '../libs/errors';
-import _ from 'lodash';
-
-module.exports = function addWebhook (user, req = {}) {
-  let wh = user.preferences.webhooks;
-
-  if (!validator.isURL(_.get(req, 'body.url'))) throw new BadRequest(i18n.t('invalidUrl', req.language));
-  if (!validator.isBoolean(_.get(req, 'body.enabled'))) throw new BadRequest(i18n.t('invalidEnabled', req.language));
-
-  user.markModified('preferences.webhooks');
-
-  if (req.v2 === true) {
-    return user.preferences.webhooks;
-  } else {
-    return [
-      refPush(wh, {
-        url: req.body.url,
-        enabled: req.body.enabled,
-      }),
-    ];
-  }
-};

common/script/ops/allocateNow.js

@@ -1,15 +0,0 @@
-import _ from 'lodash';
-import autoAllocate from '../fns/autoAllocate';
-
-module.exports = function allocateNow (user, req = {}) {
-  _.times(user.stats.points, () => autoAllocate(user));
-  user.stats.points = 0;
-
-  if (req.v2 === true) {
-    return _.pick(user, 'stats');
-  } else {
-    return [
-      user.stats,
-    ];
-  }
-};

common/script/ops/deleteWebhook.js

@@ -1,10 +0,0 @@
-import _ from 'lodash';
-
-module.exports = function deleteWebhook (user, req) {
-  delete user.preferences.webhooks[_.get(req, 'params.id')];
-  user.markModified('preferences.webhooks');
-
-  return [
-    user.preferences.webhooks,
-  ];
-};

common/script/ops/getTag.js

@@ -1,18 +0,0 @@
-import _ from 'lodash';
-import i18n from '../i18n';
-import { NotFound } from '../libs/errors';
-
-// TODO used only in client, move there?
-
-module.exports = function getTag (user, req = {}) {
-  let tid = _.get(req, 'params.id');
-
-  let index = _.findIndex(user.tags, {
-    id: tid,
-  });
-  if (index === -1) {
-    throw new NotFound(i18n.t('messageTagNotFound', req.language));
-  }
-
-  return user.tags[index];
-};

common/script/ops/getTags.js

@@ -1,5 +0,0 @@
-// TODO used only in client, move there?
-
-module.exports = function getTags (user) {
-  return user.tags;
-};

common/script/ops/markPMSRead.js

@@ -1,14 +0,0 @@
-import i18n from '../i18n';
-
-module.exports = function markPmsRead (user, req = {}) {
-  user.inbox.newMessages = 0;
-
-  if (req.v2 === true) {
-    return user;
-  } else {
-    return [
-      user.inbox.newMessages,
-      i18n.t('pmsMarkedRead'),
-    ];
-  }
-};

common/script/ops/sleep.js

@@ -1,9 +0,0 @@
-module.exports = function sleep (user, req = {}) {
-  user.preferences.sleep = !user.preferences.sleep;
-
-  if (req.v2 === true) {
-    return {};
-  } else {
-    return [user.preferences.sleep];
-  }
-};

common/script/ops/update.js

@@ -1,11 +0,0 @@
-import _ from 'lodash';
-
-// TODO used only in client, move there?
-
-module.exports = function updateUser (user, req = {}) {
-  _.each(req.body, (val, key) => {
-    _.set(user, key, val);
-  });
-
-  return user;
-};

common/script/ops/updateWebhook.js

@@ -1,20 +0,0 @@
-import validator from 'validator';
-import i18n from '../i18n';
-import {
-  BadRequest,
-} from '../libs/errors';
-
-module.exports = function updateWebhook (user, req) {
-  if (!validator.isURL(req.body.url)) throw new BadRequest(i18n.t('invalidUrl', req.language));
-  if (!validator.isBoolean(req.body.enabled)) throw new BadRequest(i18n.t('invalidEnabled', req.language));
-
-  user.markModified('preferences.webhooks');
-  user.preferences.webhooks[req.params.id].url = req.body.url;
-  user.preferences.webhooks[req.params.id].enabled = req.body.enabled;
-
-  if (req.v2 === true) {
-    return user.preferences.webhooks;
-  } else {
-    return [user.preferences.webhooks[req.params.id]];
-  }
-};

config.json.example

@@ -7,6 +7,8 @@
     "FACEBOOK_ANALYTICS":"1234567890123456",
     "FACEBOOK_KEY":"123456789012345",
     "FACEBOOK_SECRET":"aaaabbbbccccddddeeeeffff00001111",
+    "GOOGLE_CLIENT_ID":"123456789012345",
+    "GOOGLE_CLIENT_SECRET":"aaaabbbbccccddddeeeeffff00001111",
     "NODE_DB_URI":"mongodb://localhost/habitrpg",
     "TEST_DB_URI":"mongodb://localhost/habitrpg_test",
     "NODE_ENV":"development",

debug-scripts/_helper.js

@@ -1,19 +0,0 @@
-import { MongoClient as mongo } from 'mongodb';
-import config from '../config';
-
-module.exports.updateUser = (_id, path, value) => {
-  mongo.connect(config.NODE_DB_URI, (err, db) => {
-    if (err) throw err;
-
-    let collection = db.collection('users');
-    collection.updateOne(
-      { _id },
-      { $set: { [`${path}`]: value } },
-      (updateErr, result) => {
-        if (updateErr) throw updateErr;
-        console.log('done updating', _id);
-        db.close();
-      }
-    );
-  });
-}

debug-scripts/grant-all-equipment.js

@@ -1,24 +0,0 @@
-'use strict';
-
-require('babel-register');
-
-let _ = require('lodash');
-let updateUser = require('./_helper').updateUser;
-
-let userId = process.argv[2];
-
-if (!userId) {
-  console.error('USAGE: node debug-scripts/grant-all-equipment.js <user_id>');
-  console.error('EFFECT: Adds all gear to specified user');
-  return;
-}
-
-let gearFlat = require('../common').content.gear.flat;
-
-let userGear = {};
-
-_.each(gearFlat, (piece, key) => {
-  userGear[key] = true;
-});
-
-updateUser(userId, 'items.gear.owned', userGear);

debug-scripts/grant-all-mounts.js

@@ -1,28 +0,0 @@
-'use strict';
-
-require('babel-register');
-
-let _ = require('lodash');
-let updateUser = require('./_helper').updateUser;
-let userId = process.argv[2];
-
-if (!userId) {
-  console.error('USAGE: node debug-scripts/grant-all-mounts.js <user_id>');
-  console.error('EFFECT: Adds all mounts to specified user');
-  return;
-}
-
-let dropMounts = require('../common').content.mounts;
-let questMounts = require('../common').content.questMounts;
-let specialMounts = require('../common').content.specialMounts;
-let premiumMounts = require('../common').content.premiumPets; // premium mounts isn't exposed on the content object
-
-let userMounts = {};
-
-_.each([ dropMounts, questMounts, specialMounts, premiumMounts ], (set) => {
-  _.each(set, (pet, key) => {
-    userMounts[key] = true;
-  });
-})
-
-updateUser(userId, 'items.mounts', userMounts);

debug-scripts/grant-all-pets.js

@@ -1,28 +0,0 @@
-'use strict';
-
-require('babel-register');
-
-let _ = require('lodash');
-let updateUser = require('./_helper').updateUser;
-let userId = process.argv[2];
-
-if (!userId) {
-  console.error('USAGE: node debug-scripts/grant-all-pets.js <user_id>');
-  console.error('EFFECT: Adds all pets to specified user');
-  return;
-}
-
-let dropPets = require('../common').content.pets;
-let questPets = require('../common').content.questPets;
-let specialPets = require('../common').content.specialPets;
-let premiumPets = require('../common').content.premiumPets;
-
-let userPets = {};
-
-_.each([ dropPets, questPets, specialPets, premiumPets ], (set) => {
-  _.each(set, (pet, key) => {
-    userPets[key] = 95;
-  });
-})
-
-updateUser(userId, 'items.pets', userPets);

gulp/.eslintrc

@@ -0,0 +1,10 @@
+{
+  "root": true,
+  "env": {
+    "node": true,
+  },
+  "extends": [
+    "habitrpg/server",
+    "habitrpg/babel"
+  ],
+}

gulp/gulp-apidoc.js

@@ -15,8 +15,12 @@ gulp.task('apidoc', ['apidoc:clean'], (done) => {
   });
 
   if (result === false) {
-    done(new Error('There was a problem generating apiDoc documentation.'))
+    done(new Error('There was a problem generating apiDoc documentation.'));
   } else {
     done();
   }
 });
+
+gulp.task('apidoc:watch', ['apidoc'], () => {
+  return gulp.watch(APIDOC_SRC_PATH + '/**/*.js', ['apidoc']);
+});

gulp/gulp-babelify.js

@@ -8,7 +8,7 @@ import babel from 'babelify';
 
 gulp.task('browserify', function () {
   let bundler = browserify({
-    entries: './common/browserify.js',
+    entries: './website/common/browserify.js',
     debug: true,
     transform: [[babel, { compact: false }]],
   });
@@ -23,9 +23,9 @@ gulp.task('browserify', function () {
       this.emit('end');
     })
     .pipe(sourcemaps.write('./'))
-    .pipe(gulp.dest('./common/dist/scripts/'));
+    .pipe(gulp.dest('./website/client-old/js/'));
 });
 
 gulp.task('browserify:watch', () => {
-  gulp.watch('./common/script/**/*.js', ['browserify']);
+  gulp.watch('./website/common/script/**/*.js', ['browserify']);
 });

gulp/gulp-build.js

@@ -18,22 +18,22 @@ gulp.task('build:src', () => {
 });
 
 gulp.task('build:common', () => {
-  return gulp.src('common/script/**/*.js')
+  return gulp.src('website/common/script/**/*.js')
     .pipe(babel())
-    .pipe(gulp.dest('common/transpiled-babel/'));
+    .pipe(gulp.dest('website/common/transpiled-babel/'));
 });
 
 gulp.task('build:server', ['build:src', 'build:common']);
 
-gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff'], (done) => {
+gulp.task('build:dev', ['browserify', 'prepare:staticNewStuff', 'semantic-ui'], (done) => {
   gulp.start('grunt-build:dev', done);
 });
 
 gulp.task('build:dev:watch', ['build:dev'], () => {
-  gulp.watch(['website/client-old/**/*.styl', 'common/script/*']);
+  gulp.watch(['website/client-old/**/*.styl', 'website/common/script/*']);
 });
 
-gulp.task('build:prod', ['browserify', 'build:server', 'prepare:staticNewStuff'], (done) => {
+gulp.task('build:prod', ['browserify', 'build:server', 'prepare:staticNewStuff', 'semantic-ui'], (done) => {
   runSequence(
     'grunt-build:prod',
     'apidoc',

gulp/gulp-console.js

@@ -10,11 +10,11 @@ let improveRepl = (context) => {
 
   // Let "exit" and "quit" terminate the console
   ['exit', 'quit'].forEach((term) => {
-    Object.defineProperty(context, term, { get() { process.exit(); }});
+    Object.defineProperty(context, term, { get () { process.exit(); }});
   });
 
   // "clear" clears the screen
-  Object.defineProperty(context, 'clear', { get() {
+  Object.defineProperty(context, 'clear', { get () {
     process.stdout.write('\u001B[2J\u001B[0;0f');
   }});
 
@@ -25,13 +25,13 @@ let improveRepl = (context) => {
   var isProd = nconf.get('NODE_ENV') === 'production';
   var mongooseOptions = !isProd ? {} : {
     replset: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } },
-    server: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } }
+    server: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } },
   };
   autoinc.init(
     mongoose.connect(
       nconf.get('NODE_DB_URI'),
       mongooseOptions,
-      function(err) {
+      function (err) {
         if (err) throw err;
         logger.info('Connected with Mongoose');
       }
@@ -42,6 +42,6 @@ let improveRepl = (context) => {
 
 gulp.task('console', (cb) => {
   improveRepl(repl.start({
-    prompt: 'Habitica > '
+    prompt: 'Habitica > ',
   }).context);
 });

gulp/gulp-semanticui.js

@@ -0,0 +1,43 @@
+import gulp from 'gulp';
+import fs from 'fs';
+
+// Make semantic-ui-less work with a theme in a different folder
+// Code taken from https://www.artembutusov.com/webpack-semantic-ui/
+
+// Relative to node_modules/semantic-ui-less
+const SEMANTIC_THEME_PATH = '../../website/client/assets/less/semantic-ui/theme.config';
+
+// fix well known bug with default distribution
+function fixFontPath (filename) {
+  return new Promise((resolve, reject) => {
+    fs.readFile(filename, 'utf8', (err, content) => {
+      if (err) return reject(err);
+
+      let newContent = content.replace(
+        '@fontPath  : \'../../themes/',
+        '@fontPath  : \'../../../themes/'
+      );
+
+      fs.writeFile(filename, newContent, 'utf8', (err1) => {
+        if (err) return reject(err1);
+        resolve();
+      });
+    });
+  });
+}
+
+gulp.task('semantic-ui', (done) => {
+  // relocate default config
+  fs.writeFile(
+    'node_modules/semantic-ui-less/theme.config',
+    `@import '${SEMANTIC_THEME_PATH}';\n`,
+    'utf8',
+    (err) => {
+      if (err) return done(err);
+
+      fixFontPath('node_modules/semantic-ui-less/themes/default/globals/site.variables')
+        .then(() => done())
+        .catch(done);
+    }
+  );
+});

gulp/gulp-sprites.js

@@ -10,17 +10,17 @@ import {each} from 'lodash';
 
 // https://github.com/Ensighten/grunt-spritesmith/issues/67#issuecomment-34786248
 const MAX_SPRITESHEET_SIZE = 1024 * 1024 * 3;
-const DIST_PATH = 'common/dist/sprites/';
+const DIST_PATH = 'website/assets/sprites/dist/';
 
 gulp.task('sprites:compile', ['sprites:clean', 'sprites:main', 'sprites:largeSprites', 'sprites:checkCompiledDimensions']);
 
 gulp.task('sprites:main', () => {
-  let mainSrc = sync('common/img/sprites/spritesmith/**/*.png');
+  let mainSrc = sync('website/assets/sprites/spritesmith/**/*.png');
   return createSpritesStream('main', mainSrc);
 });
 
 gulp.task('sprites:largeSprites', () => {
-  let largeSrc = sync('common/img/sprites/spritesmith_large/**/*.png');
+  let largeSrc = sync('website/assets/sprites/spritesmith_large/**/*.png');
   return createSpritesStream('largeSprites', largeSrc);
 });
 
@@ -52,7 +52,7 @@ gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSpri
   }
 });
 
-function createSpritesStream(name, src) {
+function createSpritesStream (name, src) {
   let spritesheetSliceIndicies = calculateSpritesheetsSrcIndicies(src);
   let stream = mergeStream();
 
@@ -65,7 +65,7 @@ function createSpritesStream(name, src) {
         cssName: `spritesmith-${name}-${index}.css`,
         algorithm: 'binary-tree',
         padding: 1,
-        cssTemplate: 'common/css/css.template.handlebars',
+        cssTemplate: 'website/assets/sprites/css/css.template.handlebars',
         cssVarMap: cssVarMap
       }));
 
@@ -83,7 +83,7 @@ function createSpritesStream(name, src) {
   return stream;
 }
 
-function calculateSpritesheetsSrcIndicies(src) {
+function calculateSpritesheetsSrcIndicies (src) {
   let totalPixels = 0;
   let slices = [0];
 
@@ -100,7 +100,7 @@ function calculateSpritesheetsSrcIndicies(src) {
   return slices;
 }
 
-function calculateImgDimensions(img, addPadding) {
+function calculateImgDimensions (img, addPadding) {
   let dims = sizeOf(img);
 
   let requiresSpecialTreatment = checkForSpecialTreatment(img);
@@ -109,7 +109,7 @@ function calculateImgDimensions(img, addPadding) {
     let newHeight = dims.height < 90 ? 90 : dims.height;
     dims = {
       width: newWidth,
-      height: newHeight
+      height: newHeight,
     };
   }
 
@@ -119,19 +119,19 @@ function calculateImgDimensions(img, addPadding) {
     padding = (dims.width * 8) + (dims.height * 8);
   }
 
-  if(!dims.width || !dims.height) console.error('MISSING DIMENSIONS:', dims);
+  if (!dims.width || !dims.height) console.error('MISSING DIMENSIONS:', dims);
 
   let totalPixelSize = (dims.width * dims.height) + padding;
 
   return totalPixelSize;
 }
 
-function checkForSpecialTreatment(name) {
+function checkForSpecialTreatment (name) {
   let regex = /^hair|skin|beard|mustach|shirt|flower|^headAccessory_special_\w+Ears|^eyewear_special_\w+TopFrame/;
   return name.match(regex) || name === 'head_0';
 }
 
-function cssVarMap(sprite) {
+function cssVarMap (sprite) {
   // For hair, skins, beards, etc. we want to output a '.customize-options.WHATEVER' class, which works as a
   // 60x60 image pointing at the proper part of the 90x90 sprite.
   // We set up the custom info here, and the template makes use of it.
@@ -142,9 +142,9 @@ function cssVarMap(sprite) {
         offset_x: `-${ sprite.x + 25 }px`,
         offset_y: `-${ sprite.y + 15 }px`,
         width: '60px',
-        height: '60px'
-      }
-    }
+        height: '60px',
+      },
+    };
   }
   if (~sprite.name.indexOf('shirt'))
     sprite.custom.px.offset_y = `-${ sprite.y + 30 }px`; // even more for shirts

gulp/gulp-start.js

@@ -12,6 +12,6 @@ gulp.task('nodemon', () => {
       'website/client-old/*',
       'website/views/*',
       'common/dist/script/content/*',
-    ]
+    ],
   });
 });

gulp/gulp-tests.js

@@ -13,10 +13,13 @@ import Bluebird                   from 'bluebird';
 import runSequence                from 'run-sequence';
 import os                         from 'os';
 import nconf                      from 'nconf';
+import fs from 'fs';
+
+const i18n = require('../website/server/libs/i18n');
 
 // TODO rewrite
 
-const TEST_SERVER_PORT  = 3003
+const TEST_SERVER_PORT  = 3003;
 let server;
 
 const TEST_DB_URI       = nconf.get('TEST_DB_URI');
@@ -33,11 +36,11 @@ let testResults = [];
 let testCount = (stdout, regexp) => {
   let match = stdout.match(regexp);
   return parseInt(match && match[1] || 0);
-}
+};
 
 let testBin = (string, additionalEnvVariables = '') => {
-  if(os.platform() === "win32") {
-    if(additionalEnvVariables != '') {
+  if (os.platform() === 'win32') {
+    if (additionalEnvVariables != '') {
       additionalEnvVariables = additionalEnvVariables.split(' ').join('&&set ');
       additionalEnvVariables = 'set ' + additionalEnvVariables + '&&';
     }
@@ -49,7 +52,7 @@ let testBin = (string, additionalEnvVariables = '') => {
 
 gulp.task('test:nodemon', (done) => {
   process.env.PORT = TEST_SERVER_PORT;
-  process.env.NODE_DB_URI=TEST_DB_URI;
+  process.env.NODE_DB_URI = TEST_DB_URI;
 
   runSequence('nodemon');
 });
@@ -65,17 +68,24 @@ gulp.task('test:prepare:mongo', (cb) => {
 
 gulp.task('test:prepare:server', ['test:prepare:mongo'], () => {
   if (!server) {
-    server = exec(testBin(`node ./website/server/index.js`, `NODE_DB_URI=${TEST_DB_URI} PORT=${TEST_SERVER_PORT}`), (error, stdout, stderr) => {
+    server = exec(testBin('node ./website/server/index.js', `NODE_DB_URI=${TEST_DB_URI} PORT=${TEST_SERVER_PORT}`), (error, stdout, stderr) => {
       if (error) { throw `Problem with the server: ${error}`; }
       if (stderr) { console.error(stderr); }
     });
   }
 });
 
-gulp.task('test:prepare:build', ['build'], (cb) => {
-  exec(testBin('grunt build:test'), cb);
+gulp.task('test:prepare:translations', (cb) => {
+  fs.writeFile(
+    'test/client-old/spec/mocks/translations.js',
+     `if(!window.env) window.env = {};
+window.env.translations = ${JSON.stringify(i18n.translations['en'])};`, cb);
+
 });
 
+gulp.task('test:prepare:build', ['build', 'test:prepare:translations']);
+// exec(testBin('grunt build:test'), cb);
+
 gulp.task('test:prepare:webdriver', (cb) => {
   exec('npm run test:prepare:webdriver', cb);
 });
@@ -83,7 +93,7 @@ gulp.task('test:prepare:webdriver', (cb) => {
 gulp.task('test:prepare', [
   'test:prepare:build',
   'test:prepare:mongo',
-  'test:prepare:webdriver'
+  'test:prepare:webdriver',
 ]);
 
 gulp.task('test:sanity', (cb) => {
@@ -128,7 +138,7 @@ gulp.task('test:common:safe', ['test:prepare:build'], (cb) => {
         suite: 'Common Specs\t',
         pass: testCount(stdout, /(\d+) passing/),
         fail: testCount(stdout, /(\d+) failing/),
-        pend: testCount(stdout, /(\d+) pending/)
+        pend: testCount(stdout, /(\d+) pending/),
       });
       cb();
     }
@@ -167,33 +177,7 @@ gulp.task('test:content:safe', ['test:prepare:build'], (cb) => {
         suite: 'Content Specs\t',
         pass: testCount(stdout, /(\d+) passing/),
         fail: testCount(stdout, /(\d+) failing/),
-        pend: testCount(stdout, /(\d+) pending/)
-      });
-      cb();
-    }
-  );
-  pipe(runner);
-});
-
-gulp.task('test:server_side', ['test:prepare:build'], (cb) => {
-  let runner = exec(
-    testBin(SERVER_SIDE_TEST_COMMAND),
-    (err, stdout, stderr) => {
-      cb(err);
-    }
-  );
-  pipe(runner);
-});
-
-gulp.task('test:server_side:safe', ['test:prepare:build'], (cb) => {
-  let runner = exec(
-    testBin(SERVER_SIDE_TEST_COMMAND),
-    (err, stdout, stderr) => {
-      testResults.push({
-        suite: 'Server Side Specs',
-        pass: testCount(stdout, /(\d+) passing/),
-        fail: testCount(stdout, /(\d+) failing/),
-        pend: testCount(stdout, /(\d+) pending/)
+        pend: testCount(stdout, /(\d+) pending/),
       });
       cb();
     }
@@ -232,7 +216,7 @@ gulp.task('test:karma:safe', ['test:prepare:build'], (cb) => {
         suite: 'Karma Specs\t',
         pass: testCount(stdout, /(\d+) tests? completed/),
         fail: testCount(stdout, /(\d+) tests? failed/),
-        pend: testCount(stdout, /(\d+) tests? skipped/)
+        pend: testCount(stdout, /(\d+) tests? skipped/),
       });
       cb();
     }
@@ -249,7 +233,7 @@ gulp.task('test:e2e', ['test:prepare', 'test:prepare:server'], (cb) => {
 
   Bluebird.all([
     awaitPort(TEST_SERVER_PORT),
-    awaitPort(4444)
+    awaitPort(4444),
   ]).then(() => {
     let runner = exec(
       'npm run test:e2e',
@@ -273,7 +257,7 @@ gulp.task('test:e2e:safe', ['test:prepare', 'test:prepare:server'], (cb) => {
 
   Bluebird.all([
     awaitPort(TEST_SERVER_PORT),
-    awaitPort(4444)
+    awaitPort(4444),
   ]).then(() => {
     let runner = exec(
       'npm run test:e2e',
@@ -284,7 +268,7 @@ gulp.task('test:e2e:safe', ['test:prepare', 'test:prepare:server'], (cb) => {
           suite: 'End-to-End Specs\t',
           pass: testCount(stdout, /(\d+) passing/),
           fail: testCount(stdout, /(\d+) failing/),
-          pend: testCount(stdout, /(\d+) pending/)
+          pend: testCount(stdout, /(\d+) pending/),
         });
         support.forEach(kill);
         cb();
@@ -296,14 +280,14 @@ gulp.task('test:e2e:safe', ['test:prepare', 'test:prepare:server'], (cb) => {
 
 gulp.task('test:api-v3:unit', (done) => {
   let runner = exec(
-    testBin('mocha test/api/v3/unit --recursive'),
+    testBin('mocha test/api/v3/unit --recursive --require ./test/helpers/start-server'),
     (err, stdout, stderr) => {
       if (err) {
         process.exit(1);
       }
       done();
     }
-  )
+  );
 
   pipe(runner);
 });
@@ -314,15 +298,15 @@ gulp.task('test:api-v3:unit:watch', () => {
 
 gulp.task('test:api-v3:integration', (done) => {
   let runner = exec(
-    testBin('mocha test/api/v3/integration --recursive'),
-    {maxBuffer: 500*1024},
+    testBin('mocha test/api/v3/integration --recursive --require ./test/helpers/start-server'),
+    {maxBuffer: 500 * 1024},
     (err, stdout, stderr) => {
       if (err) {
         process.exit(1);
       }
       done();
     }
-  )
+  );
 
   pipe(runner);
 });
@@ -335,9 +319,9 @@ gulp.task('test:api-v3:integration:watch', () => {
 gulp.task('test:api-v3:integration:separate-server', (done) => {
   let runner = exec(
     testBin('mocha test/api/v3/integration --recursive', 'LOAD_SERVER=0'),
-    {maxBuffer: 500*1024},
+    {maxBuffer: 500 * 1024},
     (err, stdout, stderr) => done(err)
-  )
+  );
 
   pipe(runner);
 });