Merge branch 'master' into feature-policy-pages

Author: kkartunov

.circleci/config.yml

@@ -259,7 +259,7 @@ workflows:
           filters:
             branches:
               only:
-                - staging-env-setup
+                - develop
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

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

@@ -58,7 +58,7 @@ exports[`Default render 1`] = `
                   "title": "All Challenges",
                 },
                 Object {
-                  "href": "https://arena.topcoder-dev.com",
+                  "href": "/community/arena",
                   "title": "Competitive Programming",
                 },
                 Object {
@@ -208,4 +208,4 @@ exports[`Default render 1`] = `
     }
   />
 </div>
-`;
+`;

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

@@ -0,0 +1,70 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`renders email preferences setting page correctly 1`] = `
+<div
+  className="src-shared-components-Settings-Preferences-Email-___styles__EmailPreferences___2FUGT"
+>
+  <h1
+    className="src-shared-components-Settings-Preferences-Email-___styles__title___1q6eb"
+  >
+    E-Mail Preferences
+  </h1>
+  <div
+    className="src-shared-components-Settings-Preferences-Email-___styles__sub-title___2Fh1W"
+  >
+    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"
+    />
+  </div>
+</div>
+`;

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

@@ -0,0 +1,11 @@
+import React from 'react';
+import Renderer from 'react-test-renderer/shallow';
+
+import Email from 'components/Settings/Preferences/Email';
+
+const rnd = new Renderer();
+
+it('renders email preferences setting page correctly', () => {
+  rnd.render((<Email email="[email protected]" preferences={[]} />));
+  expect(rnd.getRenderOutput()).toMatchSnapshot();
+});

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

@@ -54,7 +54,7 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://arena.topcoder.com/"
+              href="https://www.topcoder-dev.com/community/arena"
             >
               Competitive Programming
             </a>
@@ -68,6 +68,15 @@ exports[`Matches shallow shapshot 1`] = `
               Gig Work
             </a>
           </li>
+          <li
+            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
+          >
+            <a
+              href="https://www.topcoder-dev.com/community/practice"
+            >
+              Practice
+            </a>
+          </li>
         </ul>
       </div>
       <div
@@ -149,18 +158,27 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/community/member-programs/topcoder-open"
+              href="https://www.topcoder-dev.com/blog"
             >
-              TCO
+              Blog
             </a>
           </li>
           <li
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/community/member-programs"
+              href="https://www.topcoder-dev.com/community/pipeline"
             >
-              Programs
+              Challenge Pipeline
+            </a>
+          </li>
+          <li
+            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
+          >
+            <a
+              href="https://www.topcoder-dev.com/community/events"
+            >
+              Events Calendar
             </a>
           </li>
           <li
@@ -172,6 +190,15 @@ exports[`Matches shallow shapshot 1`] = `
               Forums
             </a>
           </li>
+          <li
+            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
+          >
+            <a
+              href="https://www.topcoder-dev.com/community/member-programs"
+            >
+              Programs
+            </a>
+          </li>
           <li
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
@@ -185,9 +212,9 @@ exports[`Matches shallow shapshot 1`] = `
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >
             <a
-              href="https://www.topcoder-dev.com/blog"
+              href="https://www.topcoder-dev.com/community/member-programs/topcoder-open"
             >
-              Blog
+              TCO
             </a>
           </li>
           <li

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

@@ -71,6 +71,7 @@ module.exports = {
 
   /* Holds params to signup for different newsletters. */
   NEWSLETTER_SIGNUP: {
+    DEFAUL_LIST_ID: '28bfd3c062',
     COGNITIVE: {
       APIKEY: '',
       URL: '',
@@ -307,7 +308,7 @@ module.exports = {
             },
             {
               title: 'Competitive Programming',
-              href: 'https://arena.topcoder-dev.com',
+              href: '/community/arena',
             },
             {
               title: 'Gig Work',

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

@@ -111,7 +111,7 @@ module.exports = {
             },
             {
               title: 'Competitive Programming',
-              href: 'https://arena.topcoder.com',
+              href: '/community/arena',
             },
             {
               title: 'Gig Work',

config/default.js

@@ -80,8 +80,10 @@ other types too.
   | ---       | ---                      | ---                                                                               |
   | label     | Subscribe for Newsletter | Optional. Custom label to show on the button.                                     |
   | listId    |                          | ID of MailChimp list to subscribe.                                                |
-  | interests | empty string             | Optional. commas separated string of group ids to which user should be subscribed |
-
+  | tags      |                          | ID of MailChimp tags to subscribe.                                                |
+  | buttonTheme | primary-green-md | Theme key(`tc-` is omitted) for the button. See https://community-app.topcoder.com/examples/contentful/contentblock/3k7k1JpnSvIRrJYWs4izYi |
+  | title | Sign up for the Topcoder Newsletter | Modal title |
+  | desc | Do you want to subscribe to this newsletter? | Modal description |
 
 - #### VideoModalButton
   *Example:* `<VideoModalButton videoTitle="Video Title" videoUrl="Video URL" />`

config/production.js

@@ -42,7 +42,7 @@
       "url": "/leaderboard"
     }, {
       "title": "FAQ",
-      "url": "/faq"
+      "url": "https://topgear-app.wipro.com/faq-categories"
     }
   ],
   "newsFeed": "http://www.topcoder.com/feed",