fixed config

Author: jamesdotcom

common/designImageFileGenerator.js

@@ -11,7 +11,7 @@ var fs = require('fs');
 var path = require('path');
 var async = require('async');
 var _ = require('underscore');
-var config = require('../config').config;
+var config = require('../config/tc-config').tcConfig;
 var java = require('java');
 var usv = require("./unifiedSubmissionValidator");
 
@@ -770,4 +770,4 @@ exports.getDesignImageFileGenerator = function (challenge, submitter, submission
     };
 
     return imageFileGenerator;
-};
+};

common/unifiedSubmissionValidator.js

@@ -11,7 +11,7 @@ var path = require('path');
 var async = require('async');
 var _ = require('underscore');
 var AdmZip = require('adm-zip');
-var config = require("../config").config;
+var config = require("../config/tc-config").tcConfig;
 
 var IllegalArgumentError = require('../errors/IllegalArgumentError');
 

config/tc-config.js

@@ -120,7 +120,29 @@ var config = {
         serverName: process.env.AUTH0_SERVER_NAME || 'http://agile-crag-5056.herokuapp.com',
         clientSecret: process.env.AUTH0_CLIENT_SECRET || '80LhxpoArWfAbgiIekJnDOpRVQcIrjBZ8DGnjDLUFdswwkCOI8zaUhGUZ5dr_2fg',
         redirectUrl: process.env.AUTH0_REDIRECT_URL || '/v2/auth0/callback'
-    }
+    },
+    
+	watermark: {
+    	filePath: process.env.WATERMARK_FILE_PATH || '/home/studio/web/resources/studio/studio_logo_watermark.png',
+    	fileType: process.env.WATERMARK_FILE_TYPE || 'PNG',
+    	baseImageTransparency: process.env.WATERMARK_BASE_IMAGE_TRANSPARENCY || '50',
+    	overlayImageTransparency: process.env.WATERMARK_OVERLAY_IMAGE_TRANSPARENCY || '100',
+    	overlayImageRed: process.env.WATERMARK_OVERLAY_IMAGE_RED || '0',
+    	overlayImageGreen: process.env.WATERMARK_OVERLAY_IMAGE_GREEN || '0',
+    	overlayImageBlue: process.env.WATERMARK_OVERLAY_IMAGE_BLUE || '0'
+	},
+
+	galleryIds: [16, 17, 18, 20, 21, 22, 23, 30, 32],
+
+	designSubmission: {
+    		sourcePrefix: 'source/',
+    		submissionPrefix: 'submission/'
+	},
+
+	jvm: {
+    		minMemory: '128m',
+    		maxMemory: '2048m'
+	}
 };
 module.exports.tcConfig = config;
 

initializers/helper.js

@@ -98,7 +98,7 @@ if (typeof String.prototype.startsWith !== 'function') {
 
 var async = require('async');
 var _ = require('underscore');
-var moment = require('moment');
+var moment = require('moment-timezone');
 var stringUtils = require('../common/stringUtils');
 var S = require('string');
 var IllegalArgumentError = require('../errors/IllegalArgumentError');

package.json

@@ -19,13 +19,13 @@
     "underscore": "1.5.x",
     "datejs": "0.0.x",
     "string": "1.6.x",
-    "ldapjs": "git://github.com/mcavage/node-ldapjs.git#2f1b0790f6d5dd201468a3d5cb9674c3e2623f24",
+    "ldapjs": "0.7.x",
     "nodemailer": "0.5.x",
     "email-templates": "0.1.x",
     "bcrypt": "0.7.x",
     "bigdecimal": "0.6.x",
     "bignum": "0.6.x",
-    "java": "0.2.x",
+    "java": "0.x",
     "informix-wrapper": "git://github.com/cloudspokes/informix-wrapper.git#ae513d6c27d14acaef52092165831dcf23fc83dd",
     "forums-wrapper": "git://github.com/cloudspokes/forums-wrapper.git#8e2edb97fa5a19a1adae3f150a1f38e25e64a3f8",
     "asn1": "*",
@@ -41,7 +41,7 @@
     "adm-zip": "0.4.x",
     "mkdirp": "0.3.x",
     "archiver": "~0.6.1",
-    "redis": "0.10.x"
+    "redis": "0.10.x",
     "temp": "0.7.0"
   },
   "devDependencies": {

test/test.unifiedSubmissionValidator.js

@@ -17,7 +17,7 @@ var assert = require('chai').assert;
 var async = require('async');
 var path = require('path');
 var usv = require("../common/unifiedSubmissionValidator");
-var config = require("../config").config;
+var config = require("../config/tc-config").tcConfig;
 
 var unifiedSubmissionValidator = usv.getUnifiedSubmissionValidator(null, null);
 

test/test.updateUserProfile.js

@@ -13,7 +13,7 @@ var request = require('supertest');
 var assert = require('chai').assert;
 var async = require("async");
 var _ = require("underscore");
-var config = require("../config").config;
+var config = require("../config/tc-config").tcConfig;
 
 var testHelper = require('./helpers/testHelper');
 var SQL_DIR = __dirname + "/sqls/updateUserProfile/";
@@ -22,8 +22,8 @@ var API_ENDPOINT = process.env.API_ENDPOINT || 'http://localhost:8080';
 /**
  * Objects and values required for generating the OAuth token
  */
-var CLIENT_ID = require('../config').config.general.oauthClientId;
-var SECRET = require('../config').config.general.oauthClientSecret;
+var CLIENT_ID = config.oauthClientId;
+var SECRET = config.oauthClientSecret;
 var jwt = require('jsonwebtoken');
 
 /**