Merge remote-tracking branch 'origin/listing-develop-sync' into feature-refactor-challengelist

Author: luizrrodrigues

.circleci/config.yml

@@ -230,36 +230,37 @@ workflows:
           filters:
             branches:
               only:
-                - integration-v5-develop
+                - hot-fix
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
-              only:                
-                - feature-refactor-challengelist
+              only:
+                - listing-develop-sync
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
           filters:
             branches:
               only:
-                - develop
+                - gig-application
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
-                - integration-v5-develop
+                - integration-v5-challenge-api
+                - hot-fix
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global
           filters:
             branches:
               only:
                 - develop
-                - feature-refactor-challengelist
+                - listing-develop-sync
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

Dockerfile

@@ -43,6 +43,7 @@ ARG CONTENTFUL_EDU_PREVIEW_API_KEY
 
 ARG FILESTACK_API_KEY
 ARG FILESTACK_SUBMISSION_CONTAINER
+ARG RECRUITCRM_API_KEY
 
 # Credentials for Mailchimp service
 ARG MAILCHIMP_API_KEY
@@ -63,6 +64,8 @@ ARG TC_M2M_AUTH0_PROXY_SERVER_URL
 ARG TC_M2M_AUTH0_URL
 ARG AUTH_SECRET
 
+ARG COMMUNITY_APP_URL
+
 ################################################################################
 # Setting of environment variables in the Docker image.
 
@@ -115,6 +118,8 @@ ENV CONTENTFUL_MANAGEMENT_TOKEN=$CONTENTFUL_MANAGEMENT_TOKEN
 ENV CONTENTFUL_EDU_SPACE_ID=$CONTENTFUL_EDU_SPACE_ID
 ENV CONTENTFUL_EDU_CDN_API_KEY=$CONTENTFUL_EDU_CDN_API_KEY
 ENV CONTENTFUL_EDU_PREVIEW_API_KEY=$CONTENTFUL_EDU_PREVIEW_API_KEY
+ENV RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY
+ENV COMMUNITY_APP_URL=$COMMUNITY_APP_URL
 
 ################################################################################
 # Testing and build of the application inside the container.

__tests__/shared/__snapshots__/index.jsx.snap

@@ -19,6 +19,10 @@ exports[`Snapshot match 1`] = `
       href="/challenges/manifest.json"
       rel="manifest"
     />
+    <script
+      async={true}
+      src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
+    />
   </HelmetWrapper>
   <withRouter(Connect(Routes)) />
   <Connect(ErrorMessageContainer) />
@@ -53,6 +57,10 @@ exports[`Snapshot match 2`] = `
       href="/challenges/manifest.json"
       rel="manifest"
     />
+    <script
+      async={true}
+      src="https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com"
+    />
   </HelmetWrapper>
   <withRouter(Connect(Routes)) />
   <Connect(ErrorMessageContainer) />

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

@@ -15,10 +15,11 @@
 	"technologies": "",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DESIGN",
 		"forumId": 599349
 	},
-	"subTrack": "LOGO_DESIGN",
+	"track": "Design",
+	"type": "Challenge",
+	"tags": "Logo Design",
 	"name": "Sunshot - MapMySolar - SunGiver  - Brand Concept Logo Design Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30051608,
@@ -320,10 +321,11 @@
 	"technologies": "",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DESIGN",
 		"forumId": 598066
 	},
-	"subTrack": "LOGO_DESIGN",
+	"track": "Design",
+	"type": "Challenge",
+	"tags": ["Logo Design"],
 	"name": "2016 Topcoder Open Logo Design Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30051059,
@@ -532,10 +534,11 @@
 	"technologies": "",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DESIGN",
 		"forumId": 596557
 	},
-	"subTrack": "LOGO_DESIGN",
+	"track": "Design",
+	"type": "Challenge",
+	"tags": "Logo Design",
 	"name": "ACME Logos Design Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30050375,

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

@@ -22,10 +22,10 @@
 	"technologies": "CSS, HTML, JavaScript",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DEVELOP",
 		"forumId": 39153
 	},
-	"subTrack": "FIRST_2_FINISH",
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "$100 Eaton PX 2.0 Petting Zoo - MDC Web Enhancement F2F Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30060905,
@@ -165,10 +165,10 @@
 	"technologies": "ReactJS",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DEVELOP",
 		"forumId": 39151
 	},
-	"subTrack": "FIRST_2_FINISH",
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "$100 Eaton PX 2.0 Petting Zoo - ReactJS Enhancement F2F Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30060903,
@@ -323,10 +323,10 @@
 	"technologies": "Angular 2+, Express, JSON, Node.js",
 	"status": "COMPLETED",
 	"legacy": {
-		"track": "DEVELOP",
 		"forumId": 38951
 	},
-	"subTrack": "FIRST_2_FINISH",
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "$500 BG800 Online Course Mock Rest API F2F Challenge",
 	"reviewType": "INTERNAL",
 	"id": 30060687,
@@ -630,11 +630,11 @@
 	"updatedBy": "22841596",
 	"technologies": "JavaScript, ReactJS",
 	"status": "COMPLETED",
-	"legacy": {
-		"track": "DEVELOP",
+	"legacy": {		
 		"forumId": 38702
 	},
-	"subTrack": "FIRST_2_FINISH",
+	"track": "Development",
+	"type": "First2Finish",
 	"name": "John Hancock - Giving Tuesday - General image handling",
 	"reviewType": "INTERNAL",
 	"id": 30060425,