Merge branch 'develop' into ast-fix-search

luizrrodrigues · web-flow · commit 068a27922b02 · 2021-06-04T13:49:02.000-03:00
diff --git a/.circleci/config.yml b/.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      
@@ -361,15 +362,14 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - thrive-bug-fixes
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
           filters: &filters-staging
             branches:
               only:
                 - develop
-                - ast-fix-search
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration
diff --git a/src/assets/images/icon-gesture.svg b/src/assets/images/icon-gesture.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="22px" height="20px" viewBox="0 0 22 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
-    <title>Group 9</title>
-    <desc>Created with Sketch.</desc>
+    <title>Click to show preference!</title>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="D03_1_Article" transform="translate(-208.000000, -2452.000000)">
             <g id="Group-11" transform="translate(189.000000, 2434.000000)">
diff --git a/src/assets/images/tc-logo-pride.svg b/src/assets/images/tc-logo-pride.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="54px" height="20px" viewBox="0 0 54 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <path d="M9,6.22C4.17,5.8,1,6.69.19,9S.9,14.8,4,18.76A3.09,3.09,0,0,0,6,20a25,25,0,0,1,3-8Z" style="fill:#760088;fill-rule:evenodd"></path>
+  <path d="M45,6.22v6.4c.3.63.6,1.28.9,2,.6,1.35,1.17,2.71,1.68,4,.22.56.4,1,.53,1.39A3.1,3.1,0,0,0,50,18.76c3.14-4,4.59-7.57,3.85-9.78S49.83,5.8,45,6.22Z" style="fill:#ff1e26;fill-rule:evenodd"></path>
+  <path d="M45,15.21v4.05c.22.12.44.23.69.34A5.52,5.52,0,0,0,47,20c-.19-.5-.4-1.05-.64-1.64C45.9,17.28,45.45,16.24,45,15.21Z" style="fill:#ff1e26;fill-rule:evenodd"></path>
+  <path d="M36,6.92c1.19-.34,2.38-.65,3.56-.91A21.69,21.69,0,0,0,36,2.89Z" style="fill:#fe941d;fill-rule:evenodd"></path>
+  <path d="M18,13.65a23.42,23.42,0,0,1,7.17-3A69.27,69.27,0,0,0,18,8Z" style="fill:#07bd01;fill-rule:evenodd"></path>
+  <path d="M9,12A33.83,33.83,0,0,1,12.45,6.7c-1.22-.22-2.38-.38-3.45-.48Z" style="fill:#011a98;fill-rule:evenodd"></path>
+  <path d="M36,8a66.83,66.83,0,0,0-7.22,2.6l-.09,0A22.91,22.91,0,0,1,32.74,12c.62.27,1.14.5,1.64.74l.22.11c.44.22.88.45,1.4.75Z" style="fill:#ffff01;fill-rule:evenodd"></path>
+  <path d="M36,13.59c1.54.89,3.74,2.3,8.37,5.29.22.14.43.27.63.38V15.21c-.33-.74-.66-1.47-1-2.18a35.49,35.49,0,0,0-3-5.26,10.49,10.49,0,0,0-.66-.85A38.64,38.64,0,0,0,36,8Z" style="fill:#fe941d;fill-rule:evenodd"></path>
+  <path d="M45,6.23c-1.07.09-2.22.25-3.44.47A33.69,33.69,0,0,1,45,12.62Z" style="fill:#fe941d;fill-rule:evenodd"></path>
+  <path d="M9,14.33A20.52,20.52,0,0,0,7.08,20,7.43,7.43,0,0,0,9,19.32Z" style="fill:#760088;fill-rule:evenodd"></path>
+  <path d="M18,8A36.84,36.84,0,0,0,13.66,7,34.3,34.3,0,0,0,9,14.34v5c.27-.13.55-.27.83-.43.71-.42,1.46-.89,2.37-1.48l2.45-1.63C15.86,15,17,14.28,18,13.67Z" style="fill:#011a98;fill-rule:evenodd"></path>
+  <path d="M18,3.11A24.12,24.12,0,0,0,14.5,6c1.16.26,2.33.56,3.5.9Z" style="fill:#011a98;fill-rule:evenodd"></path>
+  <path d="M18,6.92a59,59,0,0,1,7.86,2.84l1.14.52V0a16.23,16.23,0,0,0-9,3.11Z" style="fill:#07bd01;fill-rule:evenodd"></path>
+  <path d="M27,10.28h0l1.15-.52A58.17,58.17,0,0,1,36,6.92v-4A15.49,15.49,0,0,0,27,0h0Z" style="fill:#ffff01;fill-rule:evenodd"></path>
+</svg>
diff --git a/src/server/tc-communities/wipro/metadata.json b/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",
diff --git a/src/shared/components/Contentful/SearchPageFilter/SearchPageFilter.jsx b/src/shared/components/Contentful/SearchPageFilter/SearchPageFilter.jsx
@@ -110,7 +110,7 @@ export class SearchPageFilterInner extends Component {
             <div className={theme.section}>
               <button
                 type="button"
-                className={`${theme['section-header']} ${isShowSubCategory ? theme.expanded : ''}`}
+                className={`${theme['section-header']} ${!isShowSubCategory ? theme.expanded : ''}`}
                 onClick={() => { this.setState({ isShowSubCategory: !isShowSubCategory }); }}
               >
                 <span className={theme['section-title']}>sub category</span>
diff --git a/src/shared/components/Contentful/SearchPageFilter/themes/default.scss b/src/shared/components/Contentful/SearchPageFilter/themes/default.scss
@@ -102,6 +102,8 @@ $green-color: #137d60;
 }
 
 .expanded {
+  margin-bottom: 0 !important;
+
   svg {
     -moz-transform: scale(-1, -1);
     -o-transform: scale(-1, -1);
diff --git a/src/shared/components/Contentful/TracksTree/ChildListRow/themes/default.scss b/src/shared/components/Contentful/TracksTree/ChildListRow/themes/default.scss
@@ -77,7 +77,7 @@ $text-gray: #7f7f7f;
   flex-direction: column;
   margin-left: 22px;
   color: $text-black;
-  cursor: pointer;
+  align-items: flex-start;
 
   > div {
     position: relative;
diff --git a/src/shared/components/Header/index.jsx b/src/shared/components/Header/index.jsx
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import React, { useState, useEffect } from 'react';
 import PT from 'prop-types';
 import { config } from 'topcoder-react-utils';
-import Logo from 'assets/images/tc-logo.svg';
+import Logo from 'assets/images/tc-logo-pride.svg';
 import { tracking } from '../../actions';
 
 import './style.scss';
diff --git a/src/shared/containers/EDU/styles/home.scss b/src/shared/containers/EDU/styles/home.scss
@@ -146,7 +146,7 @@
           align-items: center;
           background-image: url(assets/images/data-back.svg);
           width: 78px;
-          height: 69px;
+          height: 71px;
         }
 
         .trackIconDesign {
@@ -207,6 +207,7 @@
 
           @include xs-to-sm {
             margin: 32px 0 0 0;
+            text-align: center;
           }
 
           .trackTitle {
@@ -219,7 +220,7 @@
             text-align: left;
             text-transform: uppercase;
             margin-bottom: 13px;
-            display: block;
+            display: inline-block;
 
             @include xs-to-sm {
               text-align: center;
diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx
@@ -363,8 +363,12 @@ class ChallengeDetailPageContainer extends React.Component {
       metadata,
     } = challenge;
 
-    const { track } = legacy || {};
+    let { track } = legacy || {};
 
+    if (!track) {
+      /* eslint-disable prefer-destructuring */
+      track = challenge.track || '';
+    }
     const submissionsViewable = _.find(metadata, { type: 'submissionsViewable' });
 
     const isLoggedIn = !_.isEmpty(auth.tokenV3);
diff --git a/src/shared/containers/tc-communities/Loader.jsx b/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}`;
     }
   }
 
diff --git a/src/shared/routes/Communities/Wipro/Routes.jsx b/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"

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ export class SearchPageFilterInner extends Component {`
`110`	`110`	`<div className={theme.section}>`
`111`	`111`	`<button`
`112`	`112`	`type="button"`
`113`		- className={`${theme['section-header']} ${isShowSubCategory ? theme.expanded : ''}`}
	`113`	+ className={`${theme['section-header']} ${!isShowSubCategory ? theme.expanded : ''}`}
`114`	`114`	`onClick={() => { this.setState({ isShowSubCategory: !isShowSubCategory }); }}`
`115`	`115`	`>`
`116`	`116`	`<span className={theme['section-title']}>sub category</span>`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,8 @@ $green-color: #137d60;`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`.expanded {`
	`105`	`+ margin-bottom: 0 !important;`
	`106`	`+`
`105`	`107`	`svg {`
`106`	`108`	`-moz-transform: scale(-1, -1);`
`107`	`109`	`-o-transform: scale(-1, -1);`