Recommender final fix

.circleci/config.yml

@@ -275,14 +275,14 @@ workflows:
           filters:
             branches:
               only:
-                - feature/poc-recommender-sub-2
+                - develop
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:                
-                - feature/poc-recommender-sub-2
+                - free
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -296,14 +296,15 @@ workflows:
           filters:
             branches:
               only:
-                - feature/poc-recommender-sub-2
+                - free
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
           filters:
             branches:
               only:
                 - develop
+                - nav-vanilla-forum
       - "approve-smoke-test-on-staging":
           type: approval
           requires:

Dockerfile

@@ -65,6 +65,7 @@ ARG TC_M2M_AUTH0_URL
 ARG AUTH_SECRET
 
 ARG COMMUNITY_APP_URL
+ARG GSHEETS_API_KEY
 
 ################################################################################
 # Setting of environment variables in the Docker image.
@@ -120,6 +121,7 @@ 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
+ENV GSHEETS_API_KEY=$GSHEETS_API_KEY
 
 ################################################################################
 # Testing and build of the application inside the container.

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

@@ -110,8 +110,7 @@ exports[`Default render 1`] = `
                   "title": "Programs",
                 },
                 Object {
-                  "href": "https://apps.topcoder-dev.com/forums",
-                  "openNewTab": true,
+                  "href": "https://vanilla.topcoder-dev.com",
                   "title": "Forums",
                 },
                 Object {

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

@@ -10,69 +10,48 @@ exports[`renders email preferences setting page correctly 1`] = `
     E-Mail Preferences
   </h1>
   <div
-    className="src-shared-components-Settings-Preferences-Email-___styles__sub-title___2Fh1W"
+    className="src-shared-components-Settings-Preferences-Email-___styles__unsubscribed-msg___3yh6s"
   >
-    Your preferences
-  </div>
-  <div
-    className="src-shared-components-Settings-Preferences-Email-___styles__preferences-container___38AVF"
-  >
-    <ToggleableItem
-      checked={false}
-      id="Pipeline"
-      onToggle={[Function]}
-      primaryText="Challenge Pipeline"
-      secondaryText="Subscribe to this newsletter if you want to get updates on the types of challenges coming up in the future. To view these challenges at your leisure you can always visit the <a href=\\"https://www.topcoder.com/community/pipeline\\" style=\\"color:#0d61bf;text-decoration:underline\\">Challenge Pipeline</a> page."
-      value="Pipeline"
-    />
-    <ToggleableItem
-      checked={false}
-      id="Gig Work"
-      onToggle={[Function]}
-      primaryText="Gig Work"
-      secondaryText="This newsletter gets sent out at various times, specifically when we have an opportunity of mass appeal. For more information you can visit the <a href=\\"https://www.topcoder.com/community/taas\\" style=\\"color:#0d61bf;text-decoration:underline\\">Gig Work</a> page."
-      value="Gig Work"
-    />
-    <ToggleableItem
-      checked={false}
-      id="Monthly Newsletter"
-      onToggle={[Function]}
-      primaryText="Monthly Newsletter"
-      secondaryText="This newsletter gets sent out at the end of every month and contains a variety of important information across all of our tracks."
-      value="Monthly Newsletter"
-    />
-    <ToggleableItem
-      checked={false}
-      id="Marathon Match Reminders"
-      onToggle={[Function]}
-      primaryText="Marathon Match Reminders"
-      secondaryText="Receive updates whenever a new marathon match is scheduled."
-      value="Marathon Match Reminders"
-    />
-    <ToggleableItem
-      checked={false}
-      id="Single Round Match Reminders"
-      onToggle={[Function]}
-      primaryText="Single Round Match (SRM) Reminders"
-      secondaryText="Attention Competitive Programmers! If there is any newsletter you are subscribing too, it better be this one. Receive updates when a new SRM event is scheduled."
-      value="Single Round Match Reminders"
-    />
-    <ToggleableItem
-      checked={false}
-      id="TCO Tuesdays"
-      onToggle={[Function]}
-      primaryText="TCO Newsletter"
-      secondaryText="For all the latest updates surrounding the <a href=\\"https://www.topcoder.com/community/member-programs/topcoder-open\\" style=\\"color:#0d61bf;text-decoration:underline\\">Topcoder Open</a> you should definitely be subscribing to this one. Expect an update in your mailbox every Tuesday!"
-      value="TCO Tuesdays"
-    />
-    <ToggleableItem
-      checked={false}
-      id="RDM"
-      onToggle={[Function]}
-      primaryText="Rapid Development Match (RDM) Reminders"
-      secondaryText="Receive notifications of our brand new RDMs! These rated, development matches will be a fun new way to engage with us!"
-      value="RDM"
-    />
+    <h3>
+      You are not subscribed to receive Topcoder emails
+    </h3>
+    <p>
+      If this was a mistake or if you would like to resubscribe, please click the button below.
+    </p>
+    <form
+      action="https://topcoder.us13.list-manage.com/subscribe/post?u=65bd5a1857b73643aad556093&id=28bfd3c062"
+      id="mc-embedded-subscribe-form"
+      method="post"
+      name="mc-embedded-subscribe-form"
+      noValidate={true}
+    >
+      <input
+        id="mce-EMAIL"
+        name="EMAIL"
+        readOnly={true}
+        type="email"
+        value="[email protected]"
+      />
+      <input
+        id="gdpr_11101"
+        name="gdpr[11101]"
+        type="checkbox"
+        value="Y"
+      />
+      <input
+        name="b_65bd5a1857b73643aad556093_28bfd3c062"
+        tabIndex="-1"
+        type="text"
+        value=""
+      />
+      <input
+        className="submit-button"
+        id="mc-embedded-subscribe"
+        name="subscribe"
+        type="submit"
+        value="Subscribe"
+      />
+    </form>
   </div>
 </div>
 `;

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

@@ -185,7 +185,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://apps.topcoder.com/forums"
+              href="https://vanilla.topcoder-dev.com"
             >
               Forums
             </a>

__tests__/shared/components/challenge-listing/__snapshots__/index.jsx.snap

@@ -5,6 +5,9 @@ exports[`Matches shallow shapshot 1 shapshot 1 1`] = `
   className="src-shared-components-challenge-listing-___style__ChallengeFiltersExample___3IjeI"
   id="challengeFilterContainer"
 >
+  <Connect(Container)
+    setFilterState={[MockFunction]}
+  />
   <div
     className="src-shared-components-challenge-listing-___style__tc-content-wrapper___1MqlF"
   >
@@ -21,41 +24,34 @@ exports[`Matches shallow shapshot 1 shapshot 1 1`] = `
         setFilterState={[MockFunction]}
       />
     </div>
-    <div
-      className="src-shared-components-challenge-listing-___style__card-container___3-J4n"
-    >
-      <Connect(Container)
-        setFilterState={[MockFunction]}
-      />
-      <Connect(Listing)
-        activeBucket="abc"
-        auth={Object {}}
-        challenges={Array []}
-        communityName={null}
-        expandTag={null}
-        expandedTags={Array []}
-        expanding={false}
-        filterState={Object {}}
-        loadMoreActive={null}
-        loadMoreAll={null}
-        loadMoreMy={null}
-        loadMoreMyPast={null}
-        loadMoreOnGoing={null}
-        loadMoreOpenForRegistration={null}
-        loadMorePast={null}
-        loadMoreReviewOpportunities={null}
-        loadingPastChallenges={false}
-        newChallengeDetails={false}
-        openChallengesInNewTabs={false}
-        preListingMsg={null}
-        prizeMode="money-usd"
-        reviewOpportunities={Array []}
-        selectBucket={[MockFunction]}
-        setFilterState={[MockFunction]}
-        setSort={[MockFunction]}
-        sorts={Object {}}
-      />
-    </div>
+    <Connect(Listing)
+      activeBucket="abc"
+      auth={Object {}}
+      challenges={Array []}
+      communityName={null}
+      expandTag={null}
+      expandedTags={Array []}
+      expanding={false}
+      filterState={Object {}}
+      loadMoreActive={null}
+      loadMoreAll={null}
+      loadMoreMy={null}
+      loadMoreMyPast={null}
+      loadMoreOnGoing={null}
+      loadMoreOpenForRegistration={null}
+      loadMorePast={null}
+      loadMoreReviewOpportunities={null}
+      loadingPastChallenges={false}
+      newChallengeDetails={false}
+      openChallengesInNewTabs={false}
+      preListingMsg={null}
+      prizeMode="money-usd"
+      reviewOpportunities={Array []}
+      selectBucket={[MockFunction]}
+      setFilterState={[MockFunction]}
+      setSort={[MockFunction]}
+      sorts={Object {}}
+    />
   </div>
 </div>
 `;
@@ -65,6 +61,9 @@ exports[`Matches shallow shapshot 2 shapshot 2 1`] = `
   className="src-shared-components-challenge-listing-___style__ChallengeFiltersExample___3IjeI"
   id="challengeFilterContainer"
 >
+  <Connect(Container)
+    setFilterState={[MockFunction]}
+  />
   <div
     className="src-shared-components-challenge-listing-___style__tc-content-wrapper___1MqlF"
   >
@@ -81,41 +80,34 @@ exports[`Matches shallow shapshot 2 shapshot 2 1`] = `
         setFilterState={[MockFunction]}
       />
     </div>
-    <div
-      className="src-shared-components-challenge-listing-___style__card-container___3-J4n"
-    >
-      <Connect(Container)
-        setFilterState={[MockFunction]}
-      />
-      <Connect(Listing)
-        activeBucket="abc"
-        auth={Object {}}
-        challenges={Array []}
-        communityName={null}
-        expandTag={null}
-        expandedTags={Array []}
-        expanding={false}
-        filterState={Object {}}
-        loadMoreActive={null}
-        loadMoreAll={null}
-        loadMoreMy={null}
-        loadMoreMyPast={null}
-        loadMoreOnGoing={null}
-        loadMoreOpenForRegistration={null}
-        loadMorePast={null}
-        loadMoreReviewOpportunities={null}
-        loadingPastChallenges={false}
-        newChallengeDetails={false}
-        openChallengesInNewTabs={false}
-        preListingMsg={null}
-        prizeMode="money-usd"
-        reviewOpportunities={Array []}
-        selectBucket={[MockFunction]}
-        setFilterState={[MockFunction]}
-        setSort={[MockFunction]}
-        sorts={Object {}}
-      />
-    </div>
+    <Connect(Listing)
+      activeBucket="abc"
+      auth={Object {}}
+      challenges={Array []}
+      communityName={null}
+      expandTag={null}
+      expandedTags={Array []}
+      expanding={false}
+      filterState={Object {}}
+      loadMoreActive={null}
+      loadMoreAll={null}
+      loadMoreMy={null}
+      loadMoreMyPast={null}
+      loadMoreOnGoing={null}
+      loadMoreOpenForRegistration={null}
+      loadMorePast={null}
+      loadMoreReviewOpportunities={null}
+      loadingPastChallenges={false}
+      newChallengeDetails={false}
+      openChallengesInNewTabs={false}
+      preListingMsg={null}
+      prizeMode="money-usd"
+      reviewOpportunities={Array []}
+      selectBucket={[MockFunction]}
+      setFilterState={[MockFunction]}
+      setSort={[MockFunction]}
+      sorts={Object {}}
+    />
   </div>
 </div>
 `;

build.sh

@@ -44,6 +44,7 @@ docker build -t $TAG \
   --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 RECRUITCRM_API_KEY=$RECRUITCRM_API_KEY \
+  --build-arg GSHEETS_API_KEY=$GSHEETS_API_KEY \
   --build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL .
 
 # Copies "node_modules" from the created image, if necessary for caching.

config/custom-environment-variables.js

@@ -104,4 +104,5 @@ module.exports = {
     AUTH0_PROXY_SERVER_URL: 'TC_M2M_AUTH0_PROXY_SERVER_URL',
     TOKEN_CACHE_TIME: 'TOKEN_CACHE_TIME',
   },
+  GSHEETS_API_KEY: 'GSHEETS_API_KEY',
 };

config/default.js

@@ -111,6 +111,7 @@ module.exports = {
     BLOG_FEED: 'https://www.topcoder.com/blog/feed/',
     COMMUNITY: 'https://community.topcoder-dev.com',
     FORUMS: 'https://apps.topcoder-dev.com/forums',
+    FORUMS_VANILLA: 'https://vanilla.topcoder-dev.com',
     HELP: 'https://www.topcoder.com/thrive/tracks?track=Topcoder&tax=Help%20Articles',
     SUBMISSION_REVIEW: 'https://submission-review.topcoder-dev.com',
 
@@ -249,6 +250,8 @@ module.exports = {
     RECRUITCRM_API_KEY: '',
   },
 
+  GSHEETS_API_KEY: 'AIzaSyBRdKySN5JNCb2H6ZxJdTTvp3cWU51jiOQ',
+
   AUTH_CONFIG: {
     AUTH0_URL: 'TC_M2M_AUTH0_URL',
     AUTH0_AUDIENCE: 'TC_M2M_AUDIENCE',
@@ -358,8 +361,7 @@ module.exports = {
             },
             {
               title: 'Forums',
-              href: 'https://apps.topcoder-dev.com/forums',
-              openNewTab: true,
+              href: 'https://vanilla.topcoder-dev.com',
             },
             {
               title: 'Statistics',
@@ -412,4 +414,5 @@ module.exports = {
   GUIKIT: {
     DEBOUNCE_ON_CHANGE_TIME: 150,
   },
+  ENABLE_RECOMMENDER: true,
 };