Merge pull request #4593 from topcoder-platform/i-v5-develop

I v5 develop

Author: sushilshinde

.circleci/config.yml

@@ -91,7 +91,35 @@ jobs:
             source awsenvconf
             source buildenvvar
             ./master_deploy.sh -d ECS -e DEV -t latest -s test_communityapp_taskvar -i communityapp
-            
+  
+  # Build & Deploy against testing backend
+  "build-qa":
+    <<: *defaults
+    steps:
+      # Initialization.
+      - checkout
+      - setup_remote_docker
+      - run: *install_dependency
+      - run: *install_deploysuite
+      # Restoration of node_modules from cache.
+      - restore_cache: *restore_cache_settings_for_build
+      - run: 
+          name: "configuring environment"
+          command: |
+            ./awsconfiguration.sh DEV
+            ./buildenv.sh -e DEV -b qa_communityapp_buildvar,qa_communityapp_deployvar            
+      # Build of Docker image.
+      - run: *build_docker_image
+      # Caching node modules.
+      - save_cache: *save_cache_settings
+      # Deployment.
+      - deploy:
+          name: Running MasterScript
+          command: |
+            source awsenvconf
+            source buildenvvar
+            ./master_deploy.sh -d ECS -e DEV -t latest -s qa_communityapp_taskvar -i communityapp
+
   # Build & Deploy against prod api backend
   "build-prod-beta":
     <<: *defaults
@@ -203,13 +231,22 @@ workflows:
             branches:
               only:
                 - develop
+                - tco21
       # This is alternate dev env for parallel testing
       - "build-test":
+          context : org-global      
+          filters:
+            branches:
+              only:                
+                - feature-contentful
+      # This is alternate dev env for parallel testing
+      - "build-qa":
           context : org-global      
           filters:
             branches:
               only:
                 - integration-v5-challenge-api
+                - develop
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global

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

@@ -321,6 +321,15 @@ exports[`Matches shallow shapshot 1`] = `
               Talk to Sales
             </a>
           </li>
+          <li
+            className="src-shared-components-TopcoderFooter-___style__link___3-nzm"
+          >
+            <a
+              href="https://www.topcoder-dev.com/community/terms"
+            >
+              Terms
+            </a>
+          </li>
         </ul>
       </div>
       <div

config/default.js

@@ -57,7 +57,7 @@ module.exports = {
   /**
    * Disable PWA service worker.
    */
-  DISABLE_SERVICE_WORKER: false,
+  DISABLE_SERVICE_WORKER: true,
 
   /* API token for logentries.com. The token below is just for local testing of
    * the setup. To override it use LOG_ENTRIES_TOKEN environment variable. */

config/production.js

@@ -9,7 +9,7 @@ module.exports = {
     DOMAIN: 'topcoder.auth0.com',
   },
   CDN: {
-    PUBLIC: 'https://dlxczxztayxv6.cloudfront.net',
+    PUBLIC: 'https://community-app-cdn.topcoder.com',
   },
   COOKIES: {
     MAXAGE: 7,

deploy.sh

@@ -0,0 +1,20 @@
+{
+  "challengeFilter": {
+    "tags": ["TCO", "TCO21"]
+  },
+  "communityId": "tco21",
+  "communityName": "TCO21",
+  "groupIds": [],
+  "hideSearch": true,
+  "logos": [{
+    "img": "/community-app-assets/themes/tco/TCO21.svg",
+    "url": "https://tco21.topcoder.com"
+  }],
+  "menuItems": [{
+    "navigationMenu": "3UBKZJ0qMHAkqrobue73NB"
+  }],
+  "newsFeed": "http://www.topcoder.com/feed",
+  "subdomains": ["tco21"],
+  "description": "2021 Topcoder Open. The Ultimate Programming & Design Tournament",
+  "image": "tco21.jpg"
+}

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

@@ -181,12 +181,13 @@ async function getMenuDone(menuProps) {
                   cR2.fields.childRoutes,
                   cR3 => service.getEntry(cR3.sys.id).then(
                     async (c3) => {
-                      const sI3 = menuItemBuilder(url2, c3);
+                      const url3 = urlTarget(url2, cR2);
+                      const sI3 = menuItemBuilder(url3, c3);
                       if (c3.fields.childRoutes) {
                         sI3.subMenu = await Promise.all(_.map(
                           c3.fields.childRoutes,
                           cR4 => service.getEntry(cR4.sys.id).then(
-                            c4 => menuItemBuilder(urlTarget(url2, c3), c4),
+                            c4 => menuItemBuilder(url3, c4),
                           ),
                         ));
                       }
@@ -239,9 +240,10 @@ async function getMenuDone(menuProps) {
   } else {
     menu = menuData;
   }
-  // add the preconfigured secondary menus
-  menu[0].secondaryMenuForLoggedInUser = config.SECONDARY_MENU_FOR_LOGGED_USER;
-  menu[0].secondaryMenuForGuest = config.SECONDARY_MENU_FOR_GUEST;
+  // add the preconfigured secondary menus?
+  if (fields.showSecondaryNaviMenu) {
+    menu[0].secondaryMenu = config.HEADER_MENU[1].secondaryMenu;
+  }
 
   return {
     id: menuProps.id,

src/shared/actions/contentful.js

@@ -250,7 +250,7 @@ export default class Article extends React.Component {
                                 {subData.entries.items[rec.sys.id].fields.title}
                               </a>
                             ) : (
-                              <a href={`${config.TC_EDU_BASE_PATH}${config.TC_EDU_ARTICLES_PATH}/${subData.entries.items[rec.sys.id].fields.title}`}>
+                              <a href={`${config.TC_EDU_BASE_PATH}${config.TC_EDU_ARTICLES_PATH}/${subData.entries.items[rec.sys.id].fields.slug || subData.entries.items[rec.sys.id].fields.title}`}>
                                 {subData.entries.items[rec.sys.id].fields.title}
                               </a>
                             )
@@ -278,7 +278,7 @@ export default class Article extends React.Component {
                               Read More <ReadMoreArrow />
                             </a>
                           ) : (
-                            <a href={`${config.TC_EDU_BASE_PATH}${config.TC_EDU_ARTICLES_PATH}/${subData.entries.items[rec.sys.id].fields.title}`} className={theme.readMore}>
+                            <a href={`${config.TC_EDU_BASE_PATH}${config.TC_EDU_ARTICLES_PATH}/${subData.entries.items[rec.sys.id].fields.slug || subData.entries.items[rec.sys.id].fields.title}`} className={theme.readMore}>
                               Read More <ReadMoreArrow />
                             </a>
                           )

src/shared/components/Contentful/Article/Article.jsx

@@ -67,7 +67,7 @@ class ArticleCard extends React.Component {
     // determine if article cards will redirect to external link or article details page
     const articlePageUrl = article.externalArticle && article.contentUrl
       ? article.contentUrl
-      : `${config.TC_EDU_BASE_PATH}${config.TC_EDU_ARTICLES_PATH}/${article.title}`;
+      : `${config.TC_EDU_BASE_PATH}${config.TC_EDU_ARTICLES_PATH}/${article.slug || article.title}`;
     const articlePageTarget = article.externalArticle && article.contentUrl
       ? '_blank'
       : '_self';

src/shared/components/Contentful/ArticleCard/ArticleCard.jsx

@@ -13,6 +13,10 @@
   }
 }
 
+strong a {
+  font-weight: 600 !important;
+}
+
 .container {
   align-content: center;
   background: white;
@@ -74,13 +78,13 @@
     th {
       @include roboto-regular;
 
-      color: #808080;
+      color: #2a2a2a;
       font-size: 15px;
       font-weight: bold;
-      line-height: 25px;
+      line-height: 18px;
       text-align: left;
       text-transform: uppercase;
-      padding: 7px 10px 7px 0;
+      padding: 18px 10px 14px 0;
 
       @include md-to-xl {
         white-space: nowrap;
@@ -98,8 +102,8 @@
       line-height: 25px;
       text-align: left;
       color: $tc-gray-80;
-      border-top: 1px solid #ededf2;
-      border-bottom: 1px solid #ededf2;
+      border-top: 1px solid #d4d4d4;
+      border-bottom: 1px solid #d4d4d4;
       padding: 20px 50px 20px 0;
       min-height: 51px;