Reverted changes back into website/src

website/src/controllers/auth.js

@@ -1,7 +1,7 @@
 var _ = require('lodash');
 var validator = require('validator');
 var passport = require('passport');
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var async = require('async');
 var utils = require('../utils');
 var nconf = require('nconf');

website/src/controllers/challenges.js

@@ -3,7 +3,7 @@
 var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var User = require('./../models/user').model;
 var Group = require('./../models/group').model;
 var Challenge = require('./../models/challenge').model;

website/src/controllers/groups.js

@@ -8,7 +8,7 @@ var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
 var utils = require('./../utils');
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var User = require('./../models/user').model;
 var Group = require('./../models/group').model;
 var Challenge = require('./../models/challenge').model;

website/src/controllers/hall.js

@@ -1,7 +1,7 @@
 var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var User = require('./../models/user').model;
 var Group = require('./../models/group').model;
 var api = module.exports;

website/src/controllers/members.js

@@ -4,7 +4,7 @@ var partyFields = require('./groups').partyFields
 var api = module.exports;
 var async = require('async');
 var _ = require('lodash');
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var utils = require('../utils');
 var nconf = require('nconf');
 

website/src/controllers/payments/index.js

@@ -1,6 +1,6 @@
 /* @see ./routes.coffee for routing*/
 var _ = require('lodash');
-var shared = require('habitrpg-shared');
+var shared = require('../../../../common');
 var nconf = require('nconf');
 var utils = require('./../../utils');
 var moment = require('moment');

website/src/controllers/payments/paypal.js

@@ -8,7 +8,7 @@ var payments = require('./index');
 var logger = require('../../logging');
 var ipn = require('paypal-ipn');
 var paypal = require('paypal-rest-sdk');
-var shared = require('habitrpg-shared');
+var shared = require('../../../../common');
 var mongoose = require('mongoose');
 var cc = require('coupon-code');
 

website/src/controllers/payments/paypalBillingSetup.js

@@ -8,7 +8,7 @@ var nconf = require('nconf');
 _ = require('lodash');
 nconf.argv().env().file('user', path.join(path.resolve(__dirname, '../../../config.json')));
 var paypal = require('paypal-rest-sdk');
-var blocks = require('habitrpg-shared').content.subscriptionBlocks;
+var blocks = require('../../../../common').content.subscriptionBlocks;
 var live = nconf.get('PAYPAL:mode')=='live';
 
 var OP = 'create'; // list create update remove

website/src/controllers/payments/stripe.js

@@ -3,7 +3,7 @@ var stripe = require("stripe")(nconf.get('STRIPE_API_KEY'));
 var async = require('async');
 var payments = require('./index');
 var User = require('mongoose').model('User');
-var shared = require('habitrpg-shared');
+var shared = require('../../../../common');
 var mongoose = require('mongoose');
 var cc = require('coupon-code');
 

website/src/controllers/user.js

@@ -5,7 +5,7 @@ var ipn = require('paypal-ipn');
 var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var User = require('./../models/user').model;
 var utils = require('./../utils');
 var ga = utils.ga;

website/src/i18n.js

@@ -2,10 +2,10 @@ var fs = require('fs'),
     path = require('path'),
     _ = require('lodash'),
     User = require('./models/user').model,
-    shared = require('habitrpg-shared'),
+    shared = require('../../common'),
     translations = {};
 
-var localePath = path.join(__dirname, "/../node_modules/habitrpg-shared/locales/")
+var localePath = path.join(__dirname, "/../../common/locales/")
 
 var loadTranslations = function(locale){
   var files = fs.readdirSync(path.join(localePath, locale));
@@ -54,7 +54,7 @@ _.each(langCodes, function(code){
   lang.momentLangCode = (momentLangsMapping[code] || code);
   try{
     // MomentJS lang files are JS files that has to be executed in the browser so we load them as plain text files
-    var f = fs.readFileSync(path.join(__dirname, '/../node_modules/moment/lang/' + lang.momentLangCode + '.js'), 'utf8');
+    var f = fs.readFileSync(path.join(__dirname, '/../../node_modules/moment/locale/' + lang.momentLangCode + '.js'), 'utf8');
     momentLangs[code] = f;
   }catch (e){}
 });

website/src/middleware.js

@@ -8,7 +8,7 @@ var logging = require('./logging');
 var domainMiddleware = require('domain-middleware');
 var cluster = require('cluster');
 var i18n = require('./i18n.js');
-var shared = require('habitrpg-shared');
+var shared = require('../../common');
 var request = require('request');
 var os = require('os');
 var moment = require('moment');

website/src/models/challenge.js

@@ -1,6 +1,6 @@
 var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var _ = require('lodash');
 var TaskSchemas = require('./task');
 
@@ -117,4 +117,4 @@ ChallengeSchema.methods.syncToUser = function(user, cb) {
 
 
 module.exports.schema = ChallengeSchema;
-module.exports.model = mongoose.model("Challenge", ChallengeSchema);
+module.exports.model = mongoose.model("Challenge", ChallengeSchema);

website/src/models/coupon.js

@@ -1,5 +1,5 @@
 var mongoose = require("mongoose");
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var _ = require('lodash');
 var async = require('async');
 var cc = require('coupon-code');

website/src/models/group.js

@@ -1,6 +1,6 @@
 var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var _ = require('lodash');
 var async = require('async');
 var logging = require('../logging');

website/src/models/task.js

@@ -6,7 +6,7 @@
 // ------------
 var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var _ = require('lodash');
 
 // Task Schema

website/src/models/user.js

@@ -6,7 +6,7 @@
 // ------------
 var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
-var shared = require('habitrpg-shared');
+var shared = require('../../../common');
 var _ = require('lodash');
 var TaskSchemas = require('./task');
 var Challenge = require('./challenge').model;

website/src/routes/apiv2.coffee

@@ -2,7 +2,7 @@
 ---------- /api/v2 API ------------
 see https://github.com/wordnik/swagger-node-express
 Every url added to router is prefaced by /api/v2
-Note: Many user-route ops exist in habitrpg-shard/script/index.coffee#user.ops, so that they can (1) be called both
+Note: Many user-route ops exist in ../../common/script/index.coffee#user.ops, so that they can (1) be called both
 client and server.
 v1 user. Requires x-api-user (user id) and x-api-key (api key) headers, Test with:
 $ mocha test/user.mocha.coffee
@@ -19,7 +19,7 @@ nconf = require("nconf")
 middleware = require("../middleware")
 cron = user.cron
 _ = require('lodash')
-content = require('habitrpg-shared').content
+content = require('../../../common').content
 i18n = require('../i18n')
 
 
@@ -298,7 +298,7 @@ module.exports = (swagger, v2) ->
         method: 'POST'
         description: "Casts a spell on a target."
         parameters: [
-          path 'spell',"The key of the spell to cast (see habitrpg-shared#content.coffee)",'string'
+          path 'spell',"The key of the spell to cast (see ../../common#content.coffee)",'string'
           query 'targetType',"The type of object you're targeting",'string',['party','self','user','task']
           query 'targetId',"The ID of the object you're targeting",'string'
 

website/src/server.js

@@ -19,13 +19,13 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
   });
 
 } else {
-  require('coffee-script'); // remove this once we've fully converted over
+  require('coffee-script/register'); // remove this once we've fully converted over
   var express = require("express");
   var http = require("http");
   var path = require("path");
   var swagger = require("swagger-node-express");
   var autoinc = require('mongoose-id-autoinc');
-  var shared = require('habitrpg-shared');
+  var shared = require('../../common');
 
   // Setup translations
   var i18n = require('./i18n');
@@ -116,7 +116,10 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
   var maxAge = isProd ? 31536000000 : 0;
   // Cache emojis without copying them to build, they are too many
   app.use(express['static'](path.join(__dirname, "/../build"), { maxAge: maxAge }));
-  app.use('/bower_components/habitrpg-shared/img/emoji/unicode', express['static'](publicDir + "/bower_components/habitrpg-shared/img/emoji/unicode", { maxAge: maxAge }));
+  app.use('/common/dist', express['static'](publicDir + "/../../common/dist", { maxAge: maxAge }));
+  app.use('/common/audio', express['static'](publicDir + "/../../common/audio", { maxAge: maxAge }));
+  app.use('/common/script/public', express['static'](publicDir + "/../../common/script/public", { maxAge: maxAge }));
+  app.use('/common/img/emoji/unicode', express['static'](publicDir + "/../../common/img/emoji/unicode", { maxAge: maxAge }));
   app.use(express['static'](publicDir));
 
   // Custom Directives