Merge pull request #4645 from topcoder-platform/develop

Updates

Author: sushilshinde

.circleci/config.yml

@@ -238,7 +238,7 @@ workflows:
           filters:
             branches:
               only:                
-                - feature-contentful
+                - integration-v5-challenge-api
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -259,7 +259,7 @@ workflows:
           filters:
             branches:
               only:
-                - feature-contentful
+                - 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/__snapshots__/TopcoderFooter.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
@@ -154,6 +163,15 @@ exports[`Matches shallow shapshot 1`] = `
               Blog
             </a>
           </li>
+          <li
+            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
+          >
+            <a
+              href="https://www.topcoder-dev.com/community/pipeline"
+            >
+              Challenge Pipeline
+            </a>
+          </li>
           <li
             className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
           >

config/default.js

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

config/production.js

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

src/server/tc-communities/wipro/metadata.json

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

src/shared/components/TopcoderFooter/index.jsx

@@ -44,8 +44,9 @@ export default function TopcoderFooter() {
             <div styleName="sep-line" />
             <ul styleName="navi-col-links">
               <Link to={`${base}/challenges`}>All Challenges</Link>
-              <Link to="https://arena.topcoder.com/">Competitive Programming</Link>
+              <Link to={`${base}/community/arena`}>Competitive Programming</Link>
               <Link to={`${base}/community/taas`}>Gig Work</Link>
+              <Link to={`${base}/community/practice`}>Practice</Link>
             </ul>
           </div>
           <div styleName="navi-col">
@@ -64,6 +65,7 @@ export default function TopcoderFooter() {
             <div styleName="sep-line" />
             <ul styleName="navi-col-links">
               <Link to={`${base}/blog`}>Blog</Link>
+              <Link to={`${base}/community/pipeline`}>Challenge Pipeline</Link>
               <Link to={`${base}/community/events`}>Events Calendar</Link>
               <Link to="https://apps.topcoder.com/forums">Forums</Link>
               <Link to={`${base}/community/member-programs`}>Programs</Link>

src/shared/components/buttons/themed/tc.scss

@@ -44,7 +44,7 @@
 
   &:active,
   &:visited {
-    border: 1px solid #0ab88a !important;
+    border: 1px solid #137d60 !important;
     box-shadow: none !important;
   }
 }

src/shared/components/tc-communities/communities/wipro/Home/index.jsx

@@ -149,15 +149,23 @@ export default function Home(props) {
       >
         <div>
           <ImageText
-            title="Improve Your Skills"
-            text="Our continuously evolving structured learning paths are customized to deepen your knowledge and help you acquire industry specific software capabilities. To keep abreast of emerging new technologies and succeed in this rapidly changing technology landscape. Click below to visit TopGear."
-            link={{
+            title="Leverage The Crowd"
+            text="Access your on-demand community of designers and technology experts."
+            link={[{
               newTab: true,
-              title: 'Start Learning',
-              url: 'https://topgear-app.wipro.com/',
-            }}
+              title: 'Initiate Project',
+              url: `${config.URL.TOPGEAR}/topcoder_projects/initiate_project?user_id=${userId}`,
+            }, {
+              newTab: true,
+              title: 'Add me to account groups',
+              url: 'https://topgear-app.wipro.com/topgear_groups/confirm_group_membership',
+            }, {
+              newTab: true,
+              title: 'Reusable Components',
+              url: 'https://wipro365.sharepoint.com/sites/ipgateway/SiteContent/Components.aspx',
+            }]}
             theme={ImageTextStyles}
-            imageSrc="/community-app-assets/themes/wipro/home/image-text-learn.png"
+            imageSrc="/community-app-assets/themes/wipro/home/image-text-leverage.png"
           />
           <ImageText
             title="Get Involved"
@@ -170,19 +178,15 @@ export default function Home(props) {
             imageSrc="/community-app-assets/themes/wipro/home/image-text-do.png"
           />
           <ImageText
-            title="Leverage The Crowd"
-            text="Access your on-demand community of designers and technology experts."
-            link={[{
-              newTab: true,
-              title: 'Initiate Project',
-              url: `${config.URL.TOPGEAR}/topcoder_projects/initiate_project?user_id=${userId}`,
-            }, {
+            title="Improve Your Skills"
+            text="Our continuously evolving structured learning paths are customized to deepen your knowledge and help you acquire industry specific software capabilities. To keep abreast of emerging new technologies and succeed in this rapidly changing technology landscape. Click below to visit TopGear."
+            link={{
               newTab: true,
-              title: 'Request Group',
-              url: 'https://help.topcoder.com/hc/en-us/requests/new?ticket_form_id=779747',
-            }]}
+              title: 'Start Learning',
+              url: 'https://topgear-app.wipro.com/',
+            }}
             theme={ImageTextStyles}
-            imageSrc="/community-app-assets/themes/wipro/home/image-text-leverage.png"
+            imageSrc="/community-app-assets/themes/wipro/home/image-text-learn.png"
           />
         </div>
       </Section>