Merge branch 'develop' of https://github.com/topcoder-platform/commun…

…ity-app into develop
topcoder-platform · May 20, 2024 · 44356d2 · 44356d2
2 parents 341ca13 + 2099e4e
commit 44356d2
Show file tree

Hide file tree

Showing 12 changed files with 299 additions and 134 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/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>
   );

diff --git a/src/shared/components/Dashboard/BlogFeed/styles.scss b/src/shared/components/Dashboard/BlogFeed/styles.scss
@@ -18,7 +18,7 @@
   color: $tc-gray-90;
   padding: 13px 12px 3px 12px;
   border-radius: 8px;
-  margin-bottom: 20px;
+  margin-bottom: 18px;
 }
 
 .header {
@@ -28,18 +28,11 @@
   padding-bottom: 10px;
 
   .title {
-    @include barlow-semi-bold;
+    @include roboto-bold;
 
     display: flex;
     font-size: 16px;
     align-items: center;
-
-    .icon {
-      fill: $tc-gray-90;
-      width: 17px;
-      height: 17px;
-      margin-right: 9px;
-    }
   }
 
   .allLink {
@@ -102,3 +95,29 @@
     }
   }
 }
+
+.container.light {
+  color: #000;
+  background: #fff;
+  border: 1px solid #d4d4d4;
+  border-radius: 4px;
+
+  .header {
+    .icon {
+      fill: $tc-white;
+    }
+
+    .allLink {
+      color: #0d61bf;
+      font-size: 12px;
+      line-height: 20px;
+      text-decoration: none;
+    }
+  }
+
+  .blogs {
+    .row:not(:first-child) {
+      border-top: 1px solid $dashboard-dark-bg;
+    }
+  }
+}
diff --git a/src/shared/components/Dashboard/Challenges/index.jsx b/src/shared/components/Dashboard/Challenges/index.jsx
@@ -21,15 +21,24 @@ export default function ChallengesFeed({
         <span styleName="title">{title}</span>
         <a
           styleName="allLink"
-          href={`${config.URL.CHALLENGES_URL}${challengeListingQuery ? `?${qs.stringify(challengeListingQuery)}` : ''}`}
+          href={`${config.URL.CHALLENGES_URL}${
+            challengeListingQuery
+              ? `?${qs.stringify(challengeListingQuery)}`
+              : ''
+          }`}
           target="_blank"
           rel="noreferrer"
-        >View all <span>challenges</span>
+        >
+          View all
         </a>
       </div>
       <div styleName="challenges">
-        {loading ? <div styleName="loading"><LoadingIndicator /></div>
-          : (challenges || []).map(challenge => (
+        {loading ? (
+          <div styleName="loading">
+            <LoadingIndicator />
+          </div>
+        ) : (
+          (challenges || []).map(challenge => (
             <div styleName="row" key={challenge.id}>
               <a
                 href={`/challenges/${challenge.id}`}
@@ -40,13 +49,16 @@ export default function ChallengesFeed({
               </a>
               <div styleName="prize">
                 <span styleName="amount">
-                  {`$${_.sum(challenge.prizeSets
-                    .filter(set => set.type === 'placement')
-                    .map(item => _.sum(item.prizes.map(prize => prize.value)))).toLocaleString()}`}
+                  {`$${_.sum(
+                    challenge.prizeSets
+                      .filter(set => set.type === 'placement')
+                      .map(item => _.sum(item.prizes.map(prize => prize.value))),
+                  ).toLocaleString()}`}
                 </span>
               </div>
             </div>
-          ))}
+          ))
+        )}
       </div>
     </div>
   ) : null;
@@ -55,7 +67,7 @@ export default function ChallengesFeed({
 ChallengesFeed.defaultProps = {
   challenges: [],
   theme: 'light',
-  title: 'CHALLENGES',
+  title: 'Opportunities',
   challengeListingQuery: undefined,
 };
 

diff --git a/src/shared/components/Dashboard/Challenges/styles.scss b/src/shared/components/Dashboard/Challenges/styles.scss
@@ -31,9 +31,9 @@ $dashboard-dark-bg: #2a2a2a;
   padding: 12px 0;
 
   .title {
-    @include barlow-semi-bold;
+    @include roboto-bold;
 
-    font-size: 16px;
+    font-size: 20px;
   }
 
   .allLink {
@@ -120,8 +120,46 @@ $dashboard-dark-bg: #2a2a2a;
   .challenges {
     background-color: $dashboard-dark-card-bg;
 
-    .row:not(:first-child) {
-      border-top: 1px solid $dashboard-dark-bg;
+    // .row:not(:first-child) {
+    //   border-top: 1px solid $dashboard-dark-bg;
+    // }
+  }
+}
+
+.container.light {
+  color: $tc-white;
+  margin-bottom: 0;
+
+  .header {
+    padding: 19px 0;
+
+    .title {
+      color: #2a2a2a;
+    }
+
+    .allLink {
+      color: #fff;
+      border-radius: 4px;
+      background-color: #0d61bf;
+      font-size: 14px;
+      font-weight: 500;
+      line-height: 22px;
+      padding: 1px 12px;
+    }
+  }
+
+  .challenges {
+    background-color: transparent;
+    border-radius: 0;
+    color: #2a2a2a;
+
+    .row {
+      background-color: #fff;
+      border: 1px solid #d4d4d4;
+      margin: 0;
+      margin-bottom: 10px;
+      border-radius: 4px;
+      padding: 11px 15px;
     }
   }
 }