Release qa to prod

Gruntfile.js

@@ -1,4 +1,12 @@
 /*global module:false*/
+/**
+ * Copyright (C) 2015 TopCoder Inc., All Rights Reserved.
+ * @author TCSASSEMBLER
+ * @version 1.1
+ *
+ * Changed in 1.1 (topcoder new community site - Removal proxied API calls)
+ * Removed LC related constants
+ */
 module.exports = function(grunt) {
   // Load grunt libraries from package.json
   require('load-grunt-tasks')(grunt);
@@ -32,24 +40,21 @@ module.exports = function(grunt) {
     auth0URL: grunt.option('auth-main-url') || 'topcoder.auth0.com',
     mainURL: grunt.option('main-url') || 'http://local.topcoder.com',
     apiURL: grunt.option('api-url') || 'https://api.topcoder.com/v2',
+    api3URL: grunt.option('api3-url') || 'https://api.topcoder.com/v3',
     cdnURL: grunt.option('cdn-url') || '/mf',
     useVer: grunt.option('use-ver') || false,
     version: grunt.option('cdn-version') || '',
     communityURL: grunt.option('community-url') || '//community.topcoder.com',
     reviewAppURL: grunt.option('review-app-url') || 'software.topcoder.com/review',
     helpAppURL: grunt.option('help-app-url') || 'help.topcoder.com',
-    forumsAppURL: grunt.option('review-app-url') || 'forums.topcoder.com',
+    forumsAppURL: grunt.option('forums-app-url') || 'forums.topcoder.com',
+    swiftProgramId: grunt.option('swift-program-id') || 3445,
 
     // only used on wp setup
     useGz: grunt.option('use-gz') || false,
     useMin: grunt.option('use-min') || false,
     useCND: grunt.option('use-cdn') || false,
-
 
-    lcURL: grunt.option('lc-url') || '//prod-lc1-ext-challenge-service.herokuapp.com',
-    lcDiscussionURL: grunt.option('lc-discussion-url') || '//prod-lc1-discussion-service.herokuapp.com',
-    lcUserURL: grunt.option('lc-user-url') || '//prod-lc1-user-service.herokuapp.com',
-    lcSiteUrl: grunt.option('lc-site-url') || '//beta.topcoder.com',
     myFiltersURL: grunt.option('my-filters-url') || '//lc1-user-settings-service.herokuapp.com',
     cbURL: grunt.option('cb-url') || 'https://coderbits.com',
 

config.json

@@ -12,10 +12,6 @@
   "useGz": false,
   "useMin": true,
   "useCND": false,
-  "lcURL": "http://dev-lc1-ext-challenge-service.herokuapp.com",
-  "lcDiscussionURL": "http://dev-lc1-discussion-service.herokuapp.com",
-  "lcUserURL": "http://dev-lc1-user-service.herokuapp.com",
-  "lcSiteUrl": "http://dev-lc1-challenge-app.herokuapp.com",
   "myFiltersURL": "https://staging-user-settings-service.herokuapp.com",
   "cbURL": "https://coderbits.com"
 }

src/conf/build-dev.sh

@@ -1 +1 @@
-grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --use-cdn=1 --use-min=1
+grunt --main-url=https://www.topcoder-dev.com --auth-main-url=topcoder-dev.auth0.com --auth-client-id=JFDo7HMkf0q2CkVFHojy3zHWafziprhT --auth-callback-url=https://www.topcoder-dev.com/reg2/callback.action --api-url=https://api.topcoder-dev.com/v2 --lc-url=https://dev-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://dev-lc1-discussion-service.herokuapp.com --lc-user-url=https://dev-lc1-user-service.herokuapp.com --lc-site-url=https://dev-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-dev.com --photo-link-base=http://community.topcoder-dev.com --review-app-url=software.topcoder-dev.com/review --help-app-url=help.topcoder-dev.com --forums-app-url=forums.topcoder-dev.com --swift-program-id=3445 --blog-rss-feed="https://www.topcoder-dev.com/feed/?post_type=blog" --api3-url=https://api.topcoder-dev.com/v3 --use-cdn=1 --use-min=1

src/conf/build-qa.sh

@@ -1 +1 @@
-grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --use-cdn=1 --use-min=1
+grunt --main-url=https://www.topcoder-qa.com --auth-main-url=topcoder-qa.auth0.com --auth-client-id=EVOgWZlCtIFlbehkq02treuRRoJk12UR --auth-callback-url="https://www.topcoder-qa.com/reg2/callback.action" --api-url=https://api.topcoder-qa.com/v2 --lc-url=https://qa-lc1-ext-challenge-service.herokuapp.com --lc-discussion-url=https://qa-lc1-discussion-service.herokuapp.com --lc-user-url=https://qa-lc1-user-service.herokuapp.com --lc-site-url=https://qa-lc1-challenge-app.herokuapp.com --my-filters-url=https://staging-user-settings-service.herokuapp.com --community-url=//community.topcoder-qa.com --photo-link-base=http://community.topcoder-qa.com --review-app-url=software.topcoder-qa.com/review --help-app-url=help.topcoder-qa.com --forums-app-url=forums.topcoder-qa.com --swift-program-id=3445 --blog-rss-feed="https://www.topcoder-qa.com/feed/?post_type=blog" --api3-url=https://api.topcoder-qa.com/v3 --use-cdn=1 --use-min=1

src/conf/tc-nginx.conf

@@ -10,12 +10,13 @@ upstream www {
 
 server {
     listen  80;
-    server_name  local.topcoder.com;
+    server_name  local.topcoder.com local.topcoder-dev.com local.topcoder-qa.com;
 
-    set $root_base /home/vagrant/tc-site;                       ## CHANGE ME repo reference
+    set $app_base /home/vagrant;            ## CHANGE ME root apps folder reference 
+    set $root_base $app_base/tc-site;
+    set $app_review_base $app_base/ap-app-review;            
     root $root_base/wp;
 
-
     client_max_body_size 20M;
 
     location = /favicon.ico {
@@ -52,7 +53,15 @@ server {
         root $root_base/dist/html;       
     }
 
-   location ~ ^/js/ {
+    location /reviews {
+        alias $app_review_base/.tmp;
+    }
+
+    location /reviews/bower_components {
+        alias $app_review_base/bower_components;
+    }
+
+    location ~ ^/js/ {
         root $root_base/dist;
     }
 
@@ -61,6 +70,8 @@ server {
     }
 
     location ~ ^/fonts/ {
+        add_header 'Access-Control-Allow-Origin' "$http_origin" always;
+        add_header 'Access-Control-Allow-Headers' "Content-Type,Accept,Origin,User-Agent,DNT,Cache-Control,X-Mx-ReqToken,Keep-Alive,X-Requested-With,If-Modified-Since" always;
         root $root_base/dist;
     }
 
@@ -94,9 +105,4 @@ server {
     ##    proxy_set_header X-Real-IP       $remote_addr;
     ##    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     ##}
-
-    location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
-        expires max;
-        log_not_found off;
-    }
 }

src/css/base-responsive.css

@@ -514,10 +514,10 @@ em{
     #footer .rootNode > a{
         cursor: pointer;
     }
-    	#footer .footerContentSection, #footer .connected{
+    	#footer .connected{
 				width: 100%;		
 			}
-			#footer .footerContentSection.twitter, #footer .connected{
+			#footer .connected{
 				margin-top: 20px;	
 			}
 			.headerTopRightMenu{

src/css/base.css

@@ -211,6 +211,15 @@ sub, sup {
     margin-top: 5px;
 }
 
+.margin-bottom-1x {
+    margin-bottom: 5px;
+}
+
+.margin-vert-1x {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
 .margin-top-2x {
     margin-top: 10px;
 }
@@ -626,29 +635,6 @@ sub, sup {
             width: 104px;
             vertical-align: top;
 }
-
-#footer .footerContentSection{
-		width: 289px;
-		margin-right: 58px;
-		float: left;
-}
-	#footer .footerContentSection.aboutTopCoder{
-			margin-right: 0px;
-	}
-	#footer .title{
-			font-size: 18px;
-			color: #fff;
-	}
-	#footer .twFollowIcon{
-			height: 13px;
-			width: 24px;
-	   background: url(@@cdn/i/footer-twitter-icon.png) no-repeat;
-	   background-position: 0 0;
-	   display: inline-block;
-	}
-	#footer .twFollowBtnText{
-	   display: inline-block;   
-	}
 
 #footer a.btn.btnFooter{
 	width: 85px;

src/css/challenge-detail-software.css

@@ -2599,4 +2599,50 @@ h1.center {
     background-color: #46b314;
 }
 
+.member-program-path *[rel="next-step"] {
+    color: #797979;
+}
+
+.member-program-path *[rel="next-step"] *[rel="next-step-description"] {
+    width: 70%;
+    float: left;
+    height: 135px;
+    position: relative;
+}
+
+.member-program-path *[rel="next-step"] *[rel="next-step-description"] *[rel="title"] {
+    font-size: 18px;
+}
+
+.member-program-path *[rel="next-step"] *[rel="next-step-description"] *[rel="description"] {
+    color: initial;
+}
+
+.member-program-path *[rel="next-step"] *[rel="next-step-description"] *[rel="action"] {
+    color: #666;
+    text-transform: uppercase;
+    position: absolute;
+    bottom: 15px;
+}
+
+.member-program-path *[rel="next-step"] *[rel="badge"] {
+    width: 30%;
+    float: left;
+    border: 1px solid #e7e7e7;
+    box-sizing: border-box;
+    padding: 10px;
+}
+
+.member-program-path *[rel="next-step"] *[rel="badge"] *[rel="title"] {
+    text-transform: uppercase;
+    font-weight: bold;
+}
+
+.member-program-path *[rel="next-step"] *[rel="badge"] > img {
+    display: block;;
+    margin-left: auto;
+    margin-right: auto;
+    height: 97px;
+}
+
 /* styles for member program path box - end */