merge with develop branch

Author: LieutenantRoger

.circleci/config.yml

@@ -181,15 +181,19 @@ workflows:
           filters:
             branches:
               only:
-                - hot-fix-show-best-rating-color-in-profile
+                - feature-contentful
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
                 - develop
-      # Production builds are exectuted only on tagged commits to the
+      # Production builds are exectuted 
+      # when PR is merged to the master
+      # Don't change anything in this configuration
+      # That might trigger wrong branch to be 
+      # deployed on the production
       # master branch.
       - "build-prod":
           context : org-global      

Dockerfile

@@ -29,6 +29,11 @@ ARG CONTENTFUL_TOPGEAR_SPACE_ID
 ARG CONTENTFUL_TOPGEAR_CDN_API_KEY
 ARG CONTENTFUL_TOPGEAR_PREVIEW_API_KEY
 
+# Credentials for access to Comcast space in Contentful CMS
+ARG CONTENTFUL_COMCAST_SPACE_ID
+ARG CONTENTFUL_COMCAST_CDN_API_KEY
+ARG CONTENTFUL_COMCAST_PREVIEW_API_KEY
+
 #Credentials for Contentfu EDU space
 
 ARG CONTENTFUL_MANAGEMENT_TOKEN
@@ -79,6 +84,11 @@ ENV CONTENTFUL_TOPGEAR_SPACE_ID=$CONTENTFUL_TOPGEAR_SPACE_ID
 ENV CONTENTFUL_TOPGEAR_CDN_API_KEY=$CONTENTFUL_TOPGEAR_CDN_API_KEY
 ENV CONTENTFUL_TOPGEAR_PREVIEW_API_KEY=$CONTENTFUL_TOPGEAR_PREVIEW_API_KEY
 
+# Credentials for access to Comcast space in Contentful CMS
+ENV CONTENTFUL_COMCAST_SPACE_ID=$CONTENTFUL_COMCAST_SPACE_ID
+ENV CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY
+ENV CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY
+
 ENV FILESTACK_API_KEY=$FILESTACK_API_KEY
 ENV FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER
 

__tests__/shared/components/Contentful/SearchBar/__snapshots__/SearchBar.jsx.snap

@@ -13,7 +13,7 @@ exports[`Matches shallow shapshot 1`] = `
       onBlur={[Function]}
       onChange={[Function]}
       onFocus={[Function]}
-      placeholder="Search.."
+      placeholder="Search..."
       type="text"
       value=""
     />

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

@@ -143,7 +143,7 @@ exports[`Default render 1`] = `
               "separator": true,
             },
             Object {
-              "href": "https://community-app.topcoder-dev.com/thrive/tracks?track=Topcoder",
+              "href": "/thrive/tracks?track=Topcoder",
               "title": "Help",
             },
             Object {

__tests__/shared/components/Settings/Preferences/__snapshots__/index.jsx.snap

@@ -23,31 +23,17 @@ exports[`renders preferences setting page correctly 1`] = `
             width="30"
             xmlns="http://www.w3.org/2000/svg"
           />,
-          "invitation letter": <Invletter
-            height="30"
-            viewBox="0 0 30 30"
-            width="30"
-            xmlns="http://www.w3.org/2000/svg"
-          />,
           "payment": <Payment
             viewBox="0 0 34 30"
             xmlns="http://www.w3.org/2000/svg"
           />,
-          "referrals": <Referral
-            height="30"
-            viewBox="0 0 30 30"
-            width="30"
-            xmlns="http://www.w3.org/2000/svg"
-          />,
         }
       }
       names={
         Array [
           "e-mail",
           "forum",
           "payment",
-          "invitation letter",
-          "referrals",
         ]
       }
       toggle={[Function]}

__tests__/shared/components/__snapshots__/Content.jsx.snap

@@ -512,6 +512,22 @@ exports[`Matches shallow shapshot 1`] = `
         Zurich Community
       </Link>
     </li>
+    <li>
+      <Link
+        replace={false}
+        to="/__community__/tco20"
+      >
+        TCO20
+      </Link>
+    </li>
+    <li>
+      <Link
+        replace={false}
+        to="/__community__/comcast"
+      >
+        Comcast Community
+      </Link>
+    </li>
   </ul>
   <h3>
     Previews of Contentful Components