Merge pull request #4816 from topcoder-platform/feature-contentful

Feature contentful

Author: sushilshinde

.circleci/config.yml

@@ -230,13 +230,14 @@ workflows:
           filters:
             branches:
               only:
-                - develop
+                - feature-contentful
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:                
+                - feature-contentful
                 - hot-fix
       # This is alternate dev env for parallel testing
       - "build-qa":
@@ -258,6 +259,7 @@ workflows:
           filters:
             branches:
               only:
+                - feature-contentful
                 - develop
       # Production builds are exectuted 
       # when PR is merged to the master

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
@@ -115,6 +116,7 @@ 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
 
 ################################################################################
 # Testing and build of the application inside the container.

__tests__/shared/components/Header/__snapshots__/index.jsx.snap

@@ -62,7 +62,7 @@ exports[`Default render 1`] = `
                   "title": "Competitive Programming",
                 },
                 Object {
-                  "href": "/community/taas",
+                  "href": "/gigs",
                   "title": "Gig Work",
                 },
                 Object {

build.sh

@@ -42,7 +42,8 @@ docker build -t $TAG \
   --build-arg TC_M2M_GRANT_TYPE=$TC_M2M_GRANT_TYPE \
   --build-arg CONTENTFUL_COMCAST_SPACE_ID=$CONTENTFUL_COMCAST_SPACE_ID \
   --build-arg CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY \
-  --build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY .
+  --build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY \
+  --build-arg RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY .
 
 # Copies "node_modules" from the created image, if necessary for caching.
 docker create --name app $TAG

config/custom-environment-variables.js

@@ -95,6 +95,8 @@ module.exports = {
       AUTH0_PROXY_SERVER_URL: 'TC_M2M_AUTH0_PROXY_SERVER_URL',
       TOKEN_CACHE_TIME: 'TOKEN_CACHE_TIME',
     },
+
+    RECRUITCRM_API_KEY: 'RECRUITCRM_API_KEY',
   },
   AUTH_CONFIG: {
     AUTH0_URL: 'TC_M2M_AUTH0_URL',

config/default.js

@@ -247,6 +247,8 @@ module.exports = {
       AUTH0_URL: '',
       TOKEN_CACHE_TIME: '',
     },
+
+    RECRUITCRM_API_KEY: '',
   },
 
   AUTH_CONFIG: {
@@ -312,7 +314,7 @@ module.exports = {
             },
             {
               title: 'Gig Work',
-              href: '/community/taas',
+              href: '/gigs',
             },
             {
               title: 'Practice',
@@ -406,4 +408,5 @@ module.exports = {
   TC_EDU_SEARCH_PATH: '/search',
   TC_EDU_SEARCH_BAR_MAX_RESULTS_EACH_GROUP: 3,
   POLICY_PAGES_PATH: '/policy',
+  GIGS_PAGES_PATH: '/gigs',
 };

config/production.js

@@ -115,7 +115,7 @@ module.exports = {
             },
             {
               title: 'Gig Work',
-              href: '/community/taas',
+              href: '/gigs',
             },
             {
               title: 'Practice',

package-lock.json

@@ -107,6 +107,7 @@
     "react-infinite-scroller": "^1.1.4",
     "react-inlinesvg": "^0.8.4",
     "react-markdown": "^4.3.1",
+    "react-paginate": "^6.3.2",
     "react-player": "^0.24.1",
     "react-redux": "^5.0.7",
     "react-redux-toastr": "^7.2.6",