Merge pull request #5561 from topcoder-platform/develop

Release v1.9.5 (hotfix)

Author: luizrrodrigues

.circleci/config.yml

@@ -341,6 +341,7 @@ workflows:
             branches:
               only:
                 - develop
+                - topgear-app
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
@@ -369,6 +370,7 @@ workflows:
             branches:
               only:
                 - develop
+                - topgear-app
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

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

@@ -29,20 +29,13 @@
   "menuItems": [
     {
       "title": "Home",
-      "url": "/"
-    }, {
-      "title": "TopGear Operations",
-      "openNewTab": true,
       "url": "https://topgear-app.wipro.com"
     }, {
       "title": "Challenges",
       "url": "/challenges"
     }, {
       "title": "Leaderboard",
       "url": "/leaderboard"
-    }, {
-      "title": "FAQ",
-      "url": "https://topgear-app.wipro.com/faq-categories"
     }
   ],
   "newsFeed": "http://www.topcoder.com/feed",

src/shared/containers/tc-communities/Loader.jsx

@@ -51,11 +51,10 @@ class Loader extends React.Component {
      * clear, what exactly do we need to support it in general. */
     if ((communityId === 'wipro' || communityId === 'comcast') && !visitorGroups) {
       const returnUrl = encodeURIComponent(window.location.href);
-      let subpath = 'member';
       if (communityId === 'wipro') {
-        subpath = 'sso-login/';
+        window.location = `${config.URL.AUTH}/?retUrl=${config.URL.TOPGEAR}`;
       }
-      window.location = `${config.URL.AUTH}/${subpath}?retUrl=${returnUrl}&utm_source=${communityId}`;
+      window.location = `${config.URL.AUTH}/member?retUrl=${returnUrl}&utm_source=${communityId}`;
     }
   }
 

src/shared/routes/Communities/Wipro/Routes.jsx

@@ -5,7 +5,7 @@
 import ChallengeDetails from 'routes/ChallengeDetails';
 import ChallengeListing from 'routes/Communities/ChallengeListing';
 import ChallengeListingBanner from 'components/tc-communities/communities/wipro/ChallengeListingBanner';
-import ContentfulRoute from 'components/Contentful/Route';
+// import ContentfulRoute from 'components/Contentful/Route';
 import Header from 'containers/tc-communities/Header';
 import LeaderboardBanner from 'components/tc-communities/communities/wipro/LeaderboardBanner';
 import PT from 'prop-types';
@@ -20,7 +20,7 @@ import Viewport from 'components/Contentful/Viewport';
 import theme from 'components/tc-communities/communities/wipro/theme';
 import { ThemeProvider } from 'react-css-super-themr';
 import { Route, Switch } from 'react-router-dom';
-import { config } from 'topcoder-react-utils';
+import { config, isomorphy } from 'topcoder-react-utils';
 
 import Leaderboard from '../Leaderboard';
 
@@ -115,11 +115,22 @@ export default function Wipro({ base, meta }) {
                 exact
                 path={`${base}/leaderboard`}
               />
+              {/*
               <ContentfulRoute
                 baseUrl={base}
                 id="1VXRAIxJdi6eCeeyKCmicK"
                 spaceName="topgear"
               />
+              */}
+              <Route
+                path={base}
+                component={() => {
+                  if (isomorphy.isClientSide()) {
+                    window.location = config.URL.TOPGEAR;
+                  }
+                  return null;
+                }}
+              />
             </Switch>
             <Viewport
               id="2rJCDsGCHTDygyx4dqxlNq"