Merge branch 'develop' into srrvnn-develop

website/src/controllers/api-v2/auth.js

@@ -1,16 +1,16 @@
 var _ = require('lodash');
 var validator = require('validator');
 var passport = require('passport');
-var shared = require('../../../common');
+var shared = require('../../../../common');
 var async = require('async');
-var utils = require('../utils');
+var utils = require('../../libs/utils');
 var nconf = require('nconf');
 var request = require('request');
 var FirebaseTokenGenerator = require('firebase-token-generator');
-var User = require('../models/user').model;
-var EmailUnsubscription = require('../models/emailUnsubscription').model;
+var User = require('../../models/user').model;
+var EmailUnsubscription = require('../../models/emailUnsubscription').model;
 var analytics = utils.analytics;
-var i18n = require('./../i18n');
+var i18n = require('./../../libs/i18n');
 
 var isProd = nconf.get('NODE_ENV') === 'production';
 

website/src/controllers/api-v2/challenges.js

@@ -3,15 +3,15 @@
 var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
-var shared = require('../../../common');
-var User = require('./../models/user').model;
-var Group = require('./../models/group').model;
-var Challenge = require('./../models/challenge').model;
-var logging = require('./../logging');
+var shared = require('../../../../common');
+var User = require('./../../models/user').model;
+var Group = require('./../../models/group').model;
+var Challenge = require('./../../models/challenge').model;
+var logging = require('./../../libs/logging');
 var csv = require('express-csv');
-var utils = require('../utils');
+var utils = require('../../libs/utils');
 var api = module.exports;
-var pushNotify = require('./pushNotifications');
+var pushNotify = require('./../pushNotifications');
 
 /*
   ------------------------------------------------------------------------

website/src/controllers/api-v2/coupon.js

@@ -1,5 +1,5 @@
 var _ = require('lodash');
-var Coupon = require('./../models/coupon').model;
+var Coupon = require('./../../models/coupon').model;
 var api = module.exports;
 var csv = require('express-csv');
 var async = require('async');

website/src/controllers/api-v2/groups.js

@@ -9,17 +9,17 @@ var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
 var Q = require('q');
-var utils = require('./../utils');
-var shared = require('../../../common');
-var User = require('./../models/user').model;
-var Group = require('./../models/group').model;
-var Challenge = require('./../models/challenge').model;
-var EmailUnsubscription = require('./../models/emailUnsubscription').model;
+var utils = require('./../../libs/utils');
+var shared = require('../../../../common');
+var User = require('./../../models/user').model;
+var Group = require('./../../models/group').model;
+var Challenge = require('./../../models/challenge').model;
+var EmailUnsubscription = require('./../../models/emailUnsubscription').model;
 var isProd = nconf.get('NODE_ENV') === 'production';
 var api = module.exports;
-var pushNotify = require('./pushNotifications');
+var pushNotify = require('./../pushNotifications');
 var analytics = utils.analytics;
-var firebase = require('../libs/firebase');
+var firebase = require('../../libs/firebase');
 
 /*
   ------------------------------------------------------------------------

website/src/controllers/api-v2/hall.js

@@ -1,9 +1,9 @@
 var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
-var shared = require('../../../common');
-var User = require('./../models/user').model;
-var Group = require('./../models/group').model;
+var shared = require('../../../../common');
+var User = require('./../../models/user').model;
+var Group = require('./../../models/group').model;
 var api = module.exports;
 
 api.ensureAdmin = function(req, res, next) {

website/src/controllers/api-v2/members.js

@@ -1,13 +1,13 @@
 var User = require('mongoose').model('User');
-var groups = require('../models/group');
+var groups = require('../../models/group');
 var partyFields = require('./groups').partyFields
 var api = module.exports;
 var async = require('async');
 var _ = require('lodash');
-var shared = require('../../../common');
-var utils = require('../utils');
+var shared = require('../../../../common');
+var utils = require('../../libs/utils');
 var nconf = require('nconf');
-var pushNotify = require('./pushNotifications');
+var pushNotify = require('./../pushNotifications');
 
 var fetchMember = function(uuid, restrict){
   return function(cb){

website/src/controllers/api-v2/unsubscription.js

@@ -1,7 +1,7 @@
-var User = require('../models/user').model;
-var EmailUnsubscription = require('../models/emailUnsubscription').model;
-var utils = require('../utils');
-var i18n = require('../../../common').i18n;
+var User = require('../../models/user').model;
+var EmailUnsubscription = require('../../models/emailUnsubscription').model;
+var utils = require('../../libs/utils');
+var i18n = require('../../../../common').i18n;
 
 var api = module.exports = {};
 

website/src/controllers/api-v2/user.js

@@ -5,19 +5,19 @@ var ipn = require('paypal-ipn');
 var _ = require('lodash');
 var nconf = require('nconf');
 var async = require('async');
-var shared = require('../../../common');
-var User = require('./../models/user').model;
-var utils = require('./../utils');
+var shared = require('../../../../common');
+var User = require('./../../models/user').model;
+var utils = require('./../../libs/utils');
 var analytics = utils.analytics;
-var Group = require('./../models/group').model;
-var Challenge = require('./../models/challenge').model;
+var Group = require('./../../models/group').model;
+var Challenge = require('./../../models/challenge').model;
 var moment = require('moment');
-var logging = require('./../logging');
+var logging = require('./../../libs/logging');
 var acceptablePUTPaths;
 var api = module.exports;
 var qs = require('qs');
-var firebase = require('../libs/firebase');
-var webhook = require('../webhook');
+var firebase = require('../../libs/firebase');
+var webhook = require('../../libs/webhook');
 
 // api.purchase // Shared.ops
 
@@ -290,7 +290,7 @@ api.getUserAnonymized = function(req, res, next) {
  * The trick here is to only accept leaf paths, not root/intermediate paths (see http://goo.gl/OEzkAs)
  * FIXME - one-by-one we want to widdle down this list, instead replacing each needed set path with API operations
  */
-acceptablePUTPaths = _.reduce(require('./../models/user').schema.paths, function(m,v,leaf){
+acceptablePUTPaths = _.reduce(require('./../../models/user').schema.paths, function(m,v,leaf){
   var found= _.find('achievements filters flags invitations lastCron party preferences profile stats inbox'.split(' '), function(root){
     return leaf.indexOf(root) == 0;
   });

website/src/controllers/payments/index.js

@@ -2,13 +2,13 @@
 var _ = require('lodash');
 var shared = require('../../../../common');
 var nconf = require('nconf');
-var utils = require('./../../utils');
+var utils = require('./../../libs/utils');
 var moment = require('moment');
 var isProduction = nconf.get("NODE_ENV") === "production";
 var stripe = require('./stripe');
 var paypal = require('./paypal');
 var amazon = require('./amazon');
-var members = require('../members')
+var members = require('../api-v2/members')
 var async = require('async');
 var iap = require('./iap');
 var mongoose= require('mongoose');

website/src/controllers/payments/paypal.js

@@ -5,7 +5,7 @@ var _ = require('lodash');
 var url = require('url');
 var User = require('mongoose').model('User');
 var payments = require('./index');
-var logger = require('../../logging');
+var logger = require('../../libs/logging');
 var ipn = require('paypal-ipn');
 var paypal = require('paypal-rest-sdk');
 var shared = require('../../../../common');