Skip to content

Commit 87d160b

Browse files
authored
Merge pull request #17 from topcoder-platform/integration-v5-challenge-api
Integration v5 challenge api
2 parents 91731b9 + 03e0bcc commit 87d160b

File tree

243 files changed

+4425
-3199
lines changed

Some content is hidden

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

243 files changed

+4425
-3199
lines changed

.circleci/config.yml

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,35 @@ jobs:
9191
source awsenvconf
9292
source buildenvvar
9393
./master_deploy.sh -d ECS -e DEV -t latest -s test_communityapp_taskvar -i communityapp
94-
94+
95+
# Build & Deploy against testing backend
96+
"build-qa":
97+
<<: *defaults
98+
steps:
99+
# Initialization.
100+
- checkout
101+
- setup_remote_docker
102+
- run: *install_dependency
103+
- run: *install_deploysuite
104+
# Restoration of node_modules from cache.
105+
- restore_cache: *restore_cache_settings_for_build
106+
- run:
107+
name: "configuring environment"
108+
command: |
109+
./awsconfiguration.sh DEV
110+
./buildenv.sh -e DEV -b qa_communityapp_buildvar,qa_communityapp_deployvar
111+
# Build of Docker image.
112+
- run: *build_docker_image
113+
# Caching node modules.
114+
- save_cache: *save_cache_settings
115+
# Deployment.
116+
- deploy:
117+
name: Running MasterScript
118+
command: |
119+
source awsenvconf
120+
source buildenvvar
121+
./master_deploy.sh -d ECS -e DEV -t latest -s qa_communityapp_taskvar -i communityapp
122+
95123
# Build & Deploy against prod api backend
96124
"build-prod-beta":
97125
<<: *defaults
@@ -202,28 +230,37 @@ workflows:
202230
filters:
203231
branches:
204232
only:
205-
- develop
233+
- hot-fix
234+
- integration-v5-develop
206235
# This is alternate dev env for parallel testing
207236
- "build-test":
208237
context : org-global
209238
filters:
210239
branches:
211-
only:
240+
only:
212241
- integration-v5-challenge-api
242+
# This is alternate dev env for parallel testing
243+
- "build-qa":
244+
context : org-global
245+
filters:
246+
branches:
247+
only:
248+
- hot-fix
213249
# This is beta env for production soft releases
214250
- "build-prod-beta":
215251
context : org-global
216252
filters:
217253
branches:
218254
only:
219-
- integration-v5-challenge-api
255+
- hot-fix
256+
- integration-v5-develop
220257
# This is stage env for production QA releases
221258
- "build-prod-staging":
222259
context : org-global
223260
filters:
224261
branches:
225262
only:
226-
- develop
263+
- integration-v5-challenge-api
227264
# Production builds are exectuted
228265
# when PR is merged to the master
229266
# Don't change anything in this configuration

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"extends": "./node_modules/topcoder-react-utils/config/eslint/default.json",
33
"rules": {
44
"jsx-a11y/anchor-is-valid": false,
5-
"import/no-cycle": [2, { "maxDepth": 1 }]
5+
"import/no-cycle": [2, { "maxDepth": 1 }],
6+
"react/forbid-prop-types": false
67
},
78
"env": {
89
"browser": true

__tests__/shared/components/ChallengeTile/__mocks__/design.json

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
"technologies": "",
1616
"status": "COMPLETED",
1717
"legacy": {
18-
"track": "DESIGN"
18+
"forumId": 599349
1919
},
20-
"subTrack": "LOGO_DESIGN",
20+
"track": "Design",
21+
"type": "Challenge",
22+
"tags": "Logo Design",
2123
"name": "Sunshot - MapMySolar - SunGiver - Brand Concept Logo Design Challenge",
2224
"reviewType": "INTERNAL",
2325
"id": 30051608,
24-
"forumId": 599349,
25-
"numSubmissions": 22,
26-
"numRegistrants": 31,
26+
"numOfSubmissions": 22,
27+
"numOfRegistrants": 31,
2728
"registrationStartDate": "2015-10-01T22:21:07.491Z",
2829
"registrationEndDate": "2015-10-09T13:04:02.272Z",
2930
"checkpointSubmissionEndDate": "2015-10-05T13:05:56.398Z",
@@ -320,15 +321,16 @@
320321
"technologies": "",
321322
"status": "COMPLETED",
322323
"legacy": {
323-
"track": "DESIGN"
324+
"forumId": 598066
324325
},
325-
"subTrack": "LOGO_DESIGN",
326+
"track": "Design",
327+
"type": "Challenge",
328+
"tags": ["Logo Design"],
326329
"name": "2016 Topcoder Open Logo Design Challenge",
327330
"reviewType": "INTERNAL",
328331
"id": 30051059,
329-
"forumId": 598066,
330-
"numSubmissions": 57,
331-
"numRegistrants": 111,
332+
"numOfSubmissions": 57,
333+
"numOfRegistrants": 111,
332334
"registrationStartDate": "2015-08-10T13:00:01.576Z",
333335
"registrationEndDate": "2015-08-24T13:17:15.335Z",
334336
"checkpointSubmissionEndDate": "2015-08-17T13:10:56.385Z",
@@ -532,15 +534,16 @@
532534
"technologies": "",
533535
"status": "COMPLETED",
534536
"legacy": {
535-
"track": "DESIGN"
537+
"forumId": 596557
536538
},
537-
"subTrack": "LOGO_DESIGN",
539+
"track": "Design",
540+
"type": "Challenge",
541+
"tags": "Logo Design",
538542
"name": "ACME Logos Design Challenge",
539543
"reviewType": "INTERNAL",
540544
"id": 30050375,
541-
"forumId": 596557,
542-
"numSubmissions": 15,
543-
"numRegistrants": 55,
545+
"numOfSubmissions": 15,
546+
"numOfRegistrants": 55,
544547
"registrationStartDate": "2015-06-01T19:00:33.351Z",
545548
"registrationEndDate": "2015-06-09T13:00:37.186Z",
546549
"checkpointSubmissionEndDate": "2015-06-06T13:07:38.023Z",

__tests__/shared/components/ChallengeTile/__mocks__/develop.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
"technologies": "CSS, HTML, JavaScript",
2323
"status": "COMPLETED",
2424
"legacy": {
25-
"track": "DEVELOP"
25+
"forumId": 39153
2626
},
27-
"subTrack": "FIRST_2_FINISH",
27+
"track": "Development",
28+
"type": "First2Finish",
2829
"name": "$100 Eaton PX 2.0 Petting Zoo - MDC Web Enhancement F2F Challenge",
2930
"reviewType": "INTERNAL",
3031
"id": 30060905,
31-
"forumId": 39153,
32-
"numSubmissions": 3,
33-
"numRegistrants": 8,
32+
"numOfSubmissions": 3,
33+
"numOfRegistrants": 8,
3434
"registrationStartDate": "2017-12-02T09:01:23.251Z",
3535
"registrationEndDate": "2017-12-12T20:01:00.000Z",
3636
"checkpointSubmissionEndDate": null,
@@ -165,15 +165,15 @@
165165
"technologies": "ReactJS",
166166
"status": "COMPLETED",
167167
"legacy": {
168-
"track": "DEVELOP"
168+
"forumId": 39151
169169
},
170-
"subTrack": "FIRST_2_FINISH",
170+
"track": "Development",
171+
"type": "First2Finish",
171172
"name": "$100 Eaton PX 2.0 Petting Zoo - ReactJS Enhancement F2F Challenge",
172173
"reviewType": "INTERNAL",
173174
"id": 30060903,
174-
"forumId": 39151,
175-
"numSubmissions": 2,
176-
"numRegistrants": 6,
175+
"numOfSubmissions": 2,
176+
"numOfRegistrants": 6,
177177
"registrationStartDate": "2017-12-02T09:01:21.329Z",
178178
"registrationEndDate": "2017-12-12T20:01:00.000Z",
179179
"checkpointSubmissionEndDate": null,
@@ -323,15 +323,15 @@
323323
"technologies": "Angular 2+, Express, JSON, Node.js",
324324
"status": "COMPLETED",
325325
"legacy": {
326-
"track": "DEVELOP"
326+
"forumId": 38951
327327
},
328-
"subTrack": "FIRST_2_FINISH",
328+
"track": "Development",
329+
"type": "First2Finish",
329330
"name": "$500 BG800 Online Course Mock Rest API F2F Challenge",
330331
"reviewType": "INTERNAL",
331332
"id": 30060687,
332-
"forumId": 38951,
333-
"numSubmissions": 14,
334-
"numRegistrants": 18,
333+
"numOfSubmissions": 14,
334+
"numOfRegistrants": 18,
335335
"registrationStartDate": "2017-11-24T13:27:44.751Z",
336336
"registrationEndDate": "2017-12-05T22:27:00.000Z",
337337
"checkpointSubmissionEndDate": null,
@@ -630,16 +630,16 @@
630630
"updatedBy": "22841596",
631631
"technologies": "JavaScript, ReactJS",
632632
"status": "COMPLETED",
633-
"legacy": {
634-
"track": "DEVELOP"
633+
"legacy": {
634+
"forumId": 38702
635635
},
636-
"subTrack": "FIRST_2_FINISH",
636+
"track": "Development",
637+
"type": "First2Finish",
637638
"name": "John Hancock - Giving Tuesday - General image handling",
638639
"reviewType": "INTERNAL",
639640
"id": 30060425,
640-
"forumId": 38702,
641-
"numSubmissions": 3,
642-
"numRegistrants": 17,
641+
"numOfSubmissions": 3,
642+
"numOfRegistrants": 17,
643643
"registrationStartDate": "2017-11-11T02:02:21.127Z",
644644
"registrationEndDate": "2017-11-21T02:02:00.000Z",
645645
"checkpointSubmissionEndDate": null,

0 commit comments

Comments
 (0)