Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 4529026

Browse files
thabofletcherthabofletcher
committed
Merge pull request #75 from appirio-tech/qa
Release qa to prod
2 parents 7870d02 + 66c4fcb commit 4529026

File tree

92 files changed

+1927
-2796
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1927
-2796
lines changed

‎Gruntfile.js‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
/*global module:false*/
2+
/**
3+
* Copyright (C) 2015 TopCoder Inc., All Rights Reserved.
4+
* @author TCSASSEMBLER
5+
* @version 1.1
6+
*
7+
* Changed in 1.1 (topcoder new community site - Removal proxied API calls)
8+
* Removed LC related constants
9+
*/
210
module.exports = function(grunt) {
311
// Load grunt libraries from package.json
412
require('load-grunt-tasks')(grunt);
@@ -32,24 +40,21 @@ module.exports = function(grunt) {
3240
auth0URL: grunt.option('auth-main-url') || 'topcoder.auth0.com',
3341
mainURL: grunt.option('main-url') || 'http://local.topcoder.com',
3442
apiURL: grunt.option('api-url') || 'https://api.topcoder.com/v2',
43+
api3URL: grunt.option('api3-url') || 'https://api.topcoder.com/v3',
3544
cdnURL: grunt.option('cdn-url') || '/mf',
3645
useVer: grunt.option('use-ver') || false,
3746
version: grunt.option('cdn-version') || '',
3847
communityURL: grunt.option('community-url') || '//community.topcoder.com',
3948
reviewAppURL: grunt.option('review-app-url') || 'software.topcoder.com/review',
4049
helpAppURL: grunt.option('help-app-url') || 'help.topcoder.com',
41-
forumsAppURL: grunt.option('review-app-url') || 'forums.topcoder.com',
50+
forumsAppURL: grunt.option('forums-app-url') || 'forums.topcoder.com',
51+
swiftProgramId: grunt.option('swift-program-id') || 3445,
4252

4353
// only used on wp setup
4454
useGz: grunt.option('use-gz') || false,
4555
useMin: grunt.option('use-min') || false,
4656
useCND: grunt.option('use-cdn') || false,
47-
4857

49-
lcURL: grunt.option('lc-url') || '//prod-lc1-ext-challenge-service.herokuapp.com',
50-
lcDiscussionURL: grunt.option('lc-discussion-url') || '//prod-lc1-discussion-service.herokuapp.com',
51-
lcUserURL: grunt.option('lc-user-url') || '//prod-lc1-user-service.herokuapp.com',
52-
lcSiteUrl: grunt.option('lc-site-url') || '//beta.topcoder.com',
5358
myFiltersURL: grunt.option('my-filters-url') || '//lc1-user-settings-service.herokuapp.com',
5459
cbURL: grunt.option('cb-url') || 'https://coderbits.com',
5560

‎config.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
"useGz": false,
1313
"useMin": true,
1414
"useCND": false,
15-
"lcURL": "http://dev-lc1-ext-challenge-service.herokuapp.com",
16-
"lcDiscussionURL": "http://dev-lc1-discussion-service.herokuapp.com",
17-
"lcUserURL": "http://dev-lc1-user-service.herokuapp.com",
18-
"lcSiteUrl": "http://dev-lc1-challenge-app.herokuapp.com",
1915
"myFiltersURL": "https://staging-user-settings-service.herokuapp.com",
2016
"cbURL": "https://coderbits.com"
2117
}

‎src/conf/build-dev.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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
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‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ upstream www {
1010

1111
server {
1212
listen 80;
13-
server_name local.topcoder.com;
13+
server_name local.topcoder.com local.topcoder-dev.com local.topcoder-qa.com;
1414

15-
set $root_base /home/vagrant/tc-site; ## CHANGE ME repo reference
15+
set $app_base /home/vagrant; ## CHANGE ME root apps folder reference
16+
set $root_base $app_base/tc-site;
17+
set $app_review_base $app_base/ap-app-review;
1618
root $root_base/wp;
1719

18-
1920
client_max_body_size 20M;
2021

2122
location = /favicon.ico {
@@ -52,7 +53,15 @@ server {
5253
root $root_base/dist/html;
5354
}
5455

55-
location ~ ^/js/ {
56+
location /reviews {
57+
alias $app_review_base/.tmp;
58+
}
59+
60+
location /reviews/bower_components {
61+
alias $app_review_base/bower_components;
62+
}
63+
64+
location ~ ^/js/ {
5665
root $root_base/dist;
5766
}
5867

@@ -61,6 +70,8 @@ server {
6170
}
6271

6372
location ~ ^/fonts/ {
73+
add_header 'Access-Control-Allow-Origin' "$http_origin" always;
74+
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;
6475
root $root_base/dist;
6576
}
6677

@@ -94,9 +105,4 @@ server {
94105
## proxy_set_header X-Real-IP $remote_addr;
95106
## proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
96107
##}
97-
98-
location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
99-
expires max;
100-
log_not_found off;
101-
}
102108
}

‎src/css/base-responsive.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,10 @@ em{
514514
#footer .rootNode > a{
515515
cursor: pointer;
516516
}
517-
#footer .footerContentSection, #footer .connected{
517+
#footer .connected{
518518
width: 100%;
519519
}
520-
#footer .footerContentSection.twitter, #footer .connected{
520+
#footer .connected{
521521
margin-top: 20px;
522522
}
523523
.headerTopRightMenu{

‎src/css/base.css‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,15 @@ sub, sup {
211211
margin-top: 5px;
212212
}
213213

214+
.margin-bottom-1x {
215+
margin-bottom: 5px;
216+
}
217+
218+
.margin-vert-1x {
219+
margin-top: 5px;
220+
margin-bottom: 5px;
221+
}
222+
214223
.margin-top-2x {
215224
margin-top: 10px;
216225
}
@@ -626,29 +635,6 @@ sub, sup {
626635
width: 104px;
627636
vertical-align: top;
628637
}
629-
630-
#footer .footerContentSection{
631-
width: 289px;
632-
margin-right: 58px;
633-
float: left;
634-
}
635-
#footer .footerContentSection.aboutTopCoder{
636-
margin-right: 0px;
637-
}
638-
#footer .title{
639-
font-size: 18px;
640-
color: #fff;
641-
}
642-
#footer .twFollowIcon{
643-
height: 13px;
644-
width: 24px;
645-
background: url(@@cdn/i/footer-twitter-icon.png) no-repeat;
646-
background-position: 0 0;
647-
display: inline-block;
648-
}
649-
#footer .twFollowBtnText{
650-
display: inline-block;
651-
}
652638

653639
#footer a.btn.btnFooter{
654640
width: 85px;

‎src/css/challenge-detail-software.css‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2599,4 +2599,50 @@ h1.center {
25992599
background-color: #46b314;
26002600
}
26012601

2602+
.member-program-path *[rel="next-step"] {
2603+
color: #797979;
2604+
}
2605+
2606+
.member-program-path *[rel="next-step"] *[rel="next-step-description"] {
2607+
width: 70%;
2608+
float: left;
2609+
height: 135px;
2610+
position: relative;
2611+
}
2612+
2613+
.member-program-path *[rel="next-step"] *[rel="next-step-description"] *[rel="title"] {
2614+
font-size: 18px;
2615+
}
2616+
2617+
.member-program-path *[rel="next-step"] *[rel="next-step-description"] *[rel="description"] {
2618+
color: initial;
2619+
}
2620+
2621+
.member-program-path *[rel="next-step"] *[rel="next-step-description"] *[rel="action"] {
2622+
color: #666;
2623+
text-transform: uppercase;
2624+
position: absolute;
2625+
bottom: 15px;
2626+
}
2627+
2628+
.member-program-path *[rel="next-step"] *[rel="badge"] {
2629+
width: 30%;
2630+
float: left;
2631+
border: 1px solid #e7e7e7;
2632+
box-sizing: border-box;
2633+
padding: 10px;
2634+
}
2635+
2636+
.member-program-path *[rel="next-step"] *[rel="badge"] *[rel="title"] {
2637+
text-transform: uppercase;
2638+
font-weight: bold;
2639+
}
2640+
2641+
.member-program-path *[rel="next-step"] *[rel="badge"] > img {
2642+
display: block;;
2643+
margin-left: auto;
2644+
margin-right: auto;
2645+
height: 97px;
2646+
}
2647+
26022648
/* styles for member program path box - end */

0 commit comments

Comments
 (0)