Merge pull request #6981 from topcoder-platform/develop

Reskin home page and challenge listing / challenge details
topcoder-platform · May 21, 2024 · 9d7b395 · 9d7b395
2 parents dc56c0e + 45a245d
commit 9d7b395
Show file tree

Hide file tree

Showing 67 changed files with 1,261 additions and 1,263 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,37 +1,37 @@
 version: 2.1
 parameters:
-    run_basedeployment:
-        default: true
-        type: boolean
-    run_smoketesting:
-        default: false
-        type: boolean
-    run_performancetesting:
-        default: false
-        type: boolean
+  run_basedeployment:
+    default: true
+    type: boolean
+  run_smoketesting:
+    default: false
+    type: boolean
+  run_performancetesting:
+    default: false
+    type: boolean
 
 defaults: &defaults
-    docker:
-      - image: docker:20.10.21-git
-        environment:
-          ENV: $BASH_ENV
+  docker:
+    - image: docker:20.10.21-git
+      environment:
+        ENV: $BASH_ENV
 
 install_dependency: &install_dependency
-          name: Installation of build and deployment dependencies.
-          command: |
-            apk update
-            apk add --no-cache bash openssl curl
-            apk upgrade
-            apk add --no-cache jq py-pip sudo
-            sudo pip install awscli --upgrade
+  name: Installation of build and deployment dependencies.
+  command: |
+    apk update
+    apk add --no-cache bash openssl curl
+    apk upgrade
+    apk add --no-cache jq py-pip sudo
+    sudo pip install awscli --upgrade
 
 install_deploysuite: &install_deploysuite
-          name: Installation of install_deploysuite.
-          command: |
-            git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
-            cp ./../buildscript/master_deploy.sh .
-            cp ./../buildscript/buildenv.sh .
-            cp ./../buildscript/awsconfiguration.sh .
+  name: Installation of install_deploysuite.
+  command: |
+    git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+    cp ./../buildscript/master_deploy.sh .
+    cp ./../buildscript/buildenv.sh .
+    cp ./../buildscript/awsconfiguration.sh .
 restore_cache_settings_for_build: &restore_cache_settings_for_build
   key: docker-node-modules-v3-{{ checksum "package-lock.json" }}
 
@@ -41,11 +41,11 @@ save_cache_settings: &save_cache_settings
     - node_modules
 
 build_docker_image: &build_docker_image
-          name: Build of Docker image
-          command: |
-            source buildenvvar
-            ./build.sh
-          no_output_timeout: 20m
+  name: Build of Docker image
+  command: |
+    source buildenvvar
+    ./build.sh
+  no_output_timeout: 20m
 jobs:
   # Build & Deploy against development backend
   "build-dev":
@@ -191,7 +191,7 @@ jobs:
   #         command: |
   #           source awsenvconf
   #           source buildenvvar
-  #           ./master_deploy.sh -d ECS -e PROD -t latest -s staging_communityapp_taskvar, -i communityapp     
+  #           ./master_deploy.sh -d ECS -e PROD -t latest -s staging_communityapp_taskvar, -i communityapp
   #           curl --request POST \
   #           --url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \
   #           --header "Circle-Token: ${CIRCLE_TOKEN}" \
@@ -232,7 +232,7 @@ jobs:
             --data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
 
   # Automated Smoke Testing against Staging
-    # Deprecate this workflow due to beta env shutdown
+  # Deprecate this workflow due to beta env shutdown
   # https://topcoder.atlassian.net/browse/CORE-202
   # Smoke-Testing-On-Staging:
   #   <<: *defaults
@@ -259,7 +259,7 @@ jobs:
   #     - store_artifacts:
   #         path: ./automated-smoke-test/test-results
 
-   # Automated Smoke Testing against Production
+  # Automated Smoke Testing against Production
   Smoke-Testing-On-Production:
     <<: *defaults
     steps:
@@ -330,9 +330,9 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-          - v1-dependencies-{{ checksum "pom.xml" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
+            - v1-dependencies-{{ checksum "pom.xml" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
 
       - run: mvn dependency:go-offline
 
@@ -353,11 +353,12 @@ workflows:
     jobs:
       # Development builds are executed on "new-develop" branch only.
       - "build-dev":
-          context : org-global
+          context: org-global
           filters:
             branches:
               only:
                 - develop
+                - TOP-1390
       # This is alternate dev env for parallel testing
       # Deprecate this workflow due to beta env shutdown
       # https://topcoder.atlassian.net/browse/CORE-251
@@ -402,7 +403,7 @@ workflows:
       # deployed on the production
       # master branch.
       - "build-prod":
-          context : org-global
+          context: org-global
           filters: &filters-prod
             branches:
               only:
@@ -422,7 +423,7 @@ workflows:
       - Hold [Smoke-Testing]:
           type: approval
       - Smoke-Testing-On-Production:
-          context : org-global
+          context: org-global
           requires:
             - Hold [Smoke-Testing]
           filters:

diff --git a/__tests__/shared/components/TrackIcon/__snapshots__/index.jsx.snap b/__tests__/shared/components/TrackIcon/__snapshots__/index.jsx.snap
@@ -23,7 +23,7 @@ exports[`Matches shallow shapshot 1`] = `
 
 exports[`Matches shallow shapshot 2`] = `
 <span
-  className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l"
+  className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l src-shared-components-TrackIcon-___style__haveTco___2E6IG"
 >
   <div
     className="src-shared-components-TrackIcon-___style__CH___3YWAb src-shared-components-TrackIcon-___style__main-icon___1q-1_"
@@ -44,7 +44,7 @@ exports[`Matches shallow shapshot 2`] = `
 
 exports[`Matches shallow shapshot 3`] = `
 <span
-  className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l"
+  className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l src-shared-components-TrackIcon-___style__haveTco___2E6IG"
 >
   <div
     className="src-shared-components-TrackIcon-___style__CH___3YWAb src-shared-components-TrackIcon-___style__main-icon___1q-1_"

diff --git a/__tests__/shared/components/__snapshots__/Switch.jsx.snap b/__tests__/shared/components/__snapshots__/Switch.jsx.snap
@@ -3,9 +3,11 @@
 exports[`Matches shallow shapshot 1`] = `
 <Switch
   enabled={false}
+  isBlue={false}
   onSwitch={[Function]}
   theme={
     Object {
+      "blue": "src-shared-components-Switch-style___blue___UCM-_3",
       "disabled": "src-shared-components-Switch-style___disabled___EEAxIO",
       "enabled": "src-shared-components-Switch-style___enabled___7dhGcX",
       "handle": "src-shared-components-Switch-style___handle___3s_OOJ",

diff --git a/__tests__/shared/components/__snapshots__/SwitchWithLabel.jsx.snap b/__tests__/shared/components/__snapshots__/SwitchWithLabel.jsx.snap
@@ -3,6 +3,7 @@
 exports[`Matches shallow shapshot 1`] = `
 <SwitchWithLabel
   enabled={false}
+  isBlue={false}
   labelAfter=""
   labelBefore=""
   onSwitch={[Function]}

diff --git a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap
@@ -45,7 +45,7 @@ exports[`Matches shallow shapshot 2`] = `
     className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filters___3um3W"
   >
     <div
-      className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row___2Vfd_"
+      className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row___2Vfd_ src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row-search-bar___8N6by"
     >
       <div
         className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__search-bar___15MSx"
@@ -56,7 +56,7 @@ exports[`Matches shallow shapshot 2`] = `
       </div>
     </div>
     <div
-      className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row___2Vfd_"
+      className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row___2Vfd_ src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row-bucket-selector-mobile___2jOjh"
     >
       <div
         className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__bucket-selector-mobile___JbE2n"
@@ -79,7 +79,7 @@ exports[`Matches shallow shapshot 2`] = `
         <span
           className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__label___3W9TU"
         >
-          Challenge Category
+          Category
         </span>
         <div
           className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__switches___10Wrx"
@@ -93,6 +93,7 @@ exports[`Matches shallow shapshot 2`] = `
               composeAdhocTheme="deeply"
               composeContextTheme="softly"
               enabled={false}
+              isBlue={true}
               labelAfter="Design"
               labelBefore=""
               mapThemrProps={[Function]}
@@ -109,6 +110,7 @@ exports[`Matches shallow shapshot 2`] = `
               composeAdhocTheme="deeply"
               composeContextTheme="softly"
               enabled={false}
+              isBlue={true}
               labelAfter="Development"
               labelBefore=""
               mapThemrProps={[Function]}
@@ -125,6 +127,7 @@ exports[`Matches shallow shapshot 2`] = `
               composeAdhocTheme="deeply"
               composeContextTheme="softly"
               enabled={false}
+              isBlue={true}
               labelAfter="Data Science"
               labelBefore=""
               mapThemrProps={[Function]}
@@ -141,6 +144,7 @@ exports[`Matches shallow shapshot 2`] = `
               composeAdhocTheme="deeply"
               composeContextTheme="softly"
               enabled={false}
+              isBlue={true}
               labelAfter="QA"
               labelBefore=""
               mapThemrProps={[Function]}
@@ -160,7 +164,7 @@ exports[`Matches shallow shapshot 2`] = `
         <span
           className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__label___3W9TU"
         >
-          Challenge Type
+          Type
         </span>
         <div
           className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__checkboxes___3ukXp"
@@ -207,9 +211,6 @@ exports[`Matches shallow shapshot 2`] = `
         />
       </div>
     </div>
-    <hr
-      className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hr___1WvP7"
-    />
   </div>
   <div
     className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__buttons___2r3xW"
@@ -227,7 +228,7 @@ exports[`Matches shallow shapshot 2`] = `
       }
       themePriority="adhoc-default-context"
     >
-      RESET FILTERS
+      Reset filters
     </Button>
   </div>
 </div>

diff --git a/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap b/__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap
@@ -17,9 +17,6 @@ exports[`Matches shallow shapshot 1`] = `
       selectBucket={[MockFunction]}
     />
   </div>
-  <hr
-    className="src-shared-components-challenge-listing-Sidebar-___style__hr___2GEB7"
-  />
 </div>
 `;
 
@@ -40,8 +37,5 @@ exports[`Matches shallow shapshot 2`] = `
       selectBucket={[MockFunction]}
     />
   </div>
-  <hr
-    className="src-shared-components-challenge-listing-Sidebar-___style__hr___2GEB7"
-  />
 </div>
 `;
diff --git a/src/assets/images/arrow-prev-blue.svg b/src/assets/images/arrow-prev-blue.svg
diff --git a/src/assets/images/icons_upload.svg b/src/assets/images/icons_upload.svg
diff --git a/src/assets/images/open_in_new.svg b/src/assets/images/open_in_new.svg
diff --git a/src/shared/components/Dashboard/BlogFeed/index.jsx b/src/shared/components/Dashboard/BlogFeed/index.jsx
@@ -7,40 +7,44 @@ import PT from 'prop-types';
 import React from 'react';
 import './styles.scss';
 import { config } from 'topcoder-react-utils';
-import BlogArticlesIcon from 'assets/images/icon-blog-articles.svg';
 
-export default function BlogFeed({
-  blogs,
-  loading,
-  theme,
-}) {
+export default function BlogFeed({ blogs, loading, theme }) {
   return (
     <div styleName={`container ${theme}`}>
       <div styleName="header">
         <div styleName="title">
-          <BlogArticlesIcon styleName="icon" />
-          <span>BLOG ARTICLES</span>
+          <span>Blog Articles</span>
         </div>
         <a
           styleName="allLink"
           href={`${config.URL.BASE}/blog/category/community-stories`}
           target="_blank"
           rel="noreferrer"
-        >View all
+        >
+          View all
         </a>
       </div>
       <div styleName="blogs">
-        {loading ? <div styleName="loading"><LoadingIndicator /></div>
-          : blogs.map(blog => (
-            <div styleName="row" key={`blog-feed-${blog.link}`}>
+        {loading ? (
+          <div styleName="loading">
+            <LoadingIndicator />
+          </div>
+        ) : (
+          blogs.map(blog => (
+            <div
+              styleName="row"
+              key={`blog-feed-${blog.link}`}
+            >
               <a
                 href={`${blog.link}`}
                 target="_blank"
                 rel="noreferrer"
-              >{blog.title}
+              >
+                {blog.title}
               </a>
             </div>
-          ))}
+          ))
+        )}
       </div>
     </div>
   );