Skip to content

Commit 9d7b395

Browse files
jmgasperjmgasper
authored
Merge pull request #6981 from topcoder-platform/develop
Reskin home page and challenge listing / challenge details
2 parents dc56c0e + 45a245d commit 9d7b395

File tree

67 files changed

+1261
-1263
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1261
-1263
lines changed

‎.circleci/config.yml

+41-40
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
version: 2.1
22
parameters:
3-
run_basedeployment:
4-
default: true
5-
type: boolean
6-
run_smoketesting:
7-
default: false
8-
type: boolean
9-
run_performancetesting:
10-
default: false
11-
type: boolean
3+
run_basedeployment:
4+
default: true
5+
type: boolean
6+
run_smoketesting:
7+
default: false
8+
type: boolean
9+
run_performancetesting:
10+
default: false
11+
type: boolean
1212

1313
defaults: &defaults
14-
docker:
15-
- image: docker:20.10.21-git
16-
environment:
17-
ENV: $BASH_ENV
14+
docker:
15+
- image: docker:20.10.21-git
16+
environment:
17+
ENV: $BASH_ENV
1818

1919
install_dependency: &install_dependency
20-
name: Installation of build and deployment dependencies.
21-
command: |
22-
apk update
23-
apk add --no-cache bash openssl curl
24-
apk upgrade
25-
apk add --no-cache jq py-pip sudo
26-
sudo pip install awscli --upgrade
20+
name: Installation of build and deployment dependencies.
21+
command: |
22+
apk update
23+
apk add --no-cache bash openssl curl
24+
apk upgrade
25+
apk add --no-cache jq py-pip sudo
26+
sudo pip install awscli --upgrade
2727
2828
install_deploysuite: &install_deploysuite
29-
name: Installation of install_deploysuite.
30-
command: |
31-
git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
32-
cp ./../buildscript/master_deploy.sh .
33-
cp ./../buildscript/buildenv.sh .
34-
cp ./../buildscript/awsconfiguration.sh .
29+
name: Installation of install_deploysuite.
30+
command: |
31+
git clone --branch v1.4.14 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
32+
cp ./../buildscript/master_deploy.sh .
33+
cp ./../buildscript/buildenv.sh .
34+
cp ./../buildscript/awsconfiguration.sh .
3535
restore_cache_settings_for_build: &restore_cache_settings_for_build
3636
key: docker-node-modules-v3-{{ checksum "package-lock.json" }}
3737

@@ -41,11 +41,11 @@ save_cache_settings: &save_cache_settings
4141
- node_modules
4242

4343
build_docker_image: &build_docker_image
44-
name: Build of Docker image
45-
command: |
46-
source buildenvvar
47-
./build.sh
48-
no_output_timeout: 20m
44+
name: Build of Docker image
45+
command: |
46+
source buildenvvar
47+
./build.sh
48+
no_output_timeout: 20m
4949
jobs:
5050
# Build & Deploy against development backend
5151
"build-dev":
@@ -191,7 +191,7 @@ jobs:
191191
# command: |
192192
# source awsenvconf
193193
# source buildenvvar
194-
# ./master_deploy.sh -d ECS -e PROD -t latest -s staging_communityapp_taskvar, -i communityapp
194+
# ./master_deploy.sh -d ECS -e PROD -t latest -s staging_communityapp_taskvar, -i communityapp
195195
# curl --request POST \
196196
# --url https://circleci.com/api/v2/project/github/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/pipeline \
197197
# --header "Circle-Token: ${CIRCLE_TOKEN}" \
@@ -232,7 +232,7 @@ jobs:
232232
--data '{"branch":"'"$CIRCLE_BRANCH"'","parameters":{"run_smoketesting":true , "run_performancetesting":false, "run_basedeployment": false}}'
233233
234234
# Automated Smoke Testing against Staging
235-
# Deprecate this workflow due to beta env shutdown
235+
# Deprecate this workflow due to beta env shutdown
236236
# https://topcoder.atlassian.net/browse/CORE-202
237237
# Smoke-Testing-On-Staging:
238238
# <<: *defaults
@@ -259,7 +259,7 @@ jobs:
259259
# - store_artifacts:
260260
# path: ./automated-smoke-test/test-results
261261

262-
# Automated Smoke Testing against Production
262+
# Automated Smoke Testing against Production
263263
Smoke-Testing-On-Production:
264264
<<: *defaults
265265
steps:
@@ -330,9 +330,9 @@ jobs:
330330
# Download and cache dependencies
331331
- restore_cache:
332332
keys:
333-
- v1-dependencies-{{ checksum "pom.xml" }}
334-
# fallback to using the latest cache if no exact match is found
335-
- v1-dependencies-
333+
- v1-dependencies-{{ checksum "pom.xml" }}
334+
# fallback to using the latest cache if no exact match is found
335+
- v1-dependencies-
336336

337337
- run: mvn dependency:go-offline
338338

@@ -353,11 +353,12 @@ workflows:
353353
jobs:
354354
# Development builds are executed on "new-develop" branch only.
355355
- "build-dev":
356-
context : org-global
356+
context: org-global
357357
filters:
358358
branches:
359359
only:
360360
- develop
361+
- TOP-1390
361362
# This is alternate dev env for parallel testing
362363
# Deprecate this workflow due to beta env shutdown
363364
# https://topcoder.atlassian.net/browse/CORE-251
@@ -402,7 +403,7 @@ workflows:
402403
# deployed on the production
403404
# master branch.
404405
- "build-prod":
405-
context : org-global
406+
context: org-global
406407
filters: &filters-prod
407408
branches:
408409
only:
@@ -422,7 +423,7 @@ workflows:
422423
- Hold [Smoke-Testing]:
423424
type: approval
424425
- Smoke-Testing-On-Production:
425-
context : org-global
426+
context: org-global
426427
requires:
427428
- Hold [Smoke-Testing]
428429
filters:

‎__tests__/shared/components/TrackIcon/__snapshots__/index.jsx.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ exports[`Matches shallow shapshot 1`] = `
2323

2424
exports[`Matches shallow shapshot 2`] = `
2525
<span
26-
className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l"
26+
className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l src-shared-components-TrackIcon-___style__haveTco___2E6IG"
2727
>
2828
<div
2929
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`] = `
4444

4545
exports[`Matches shallow shapshot 3`] = `
4646
<span
47-
className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l"
47+
className="src-shared-components-TrackIcon-___style__trackIcon___3gJ9l src-shared-components-TrackIcon-___style__haveTco___2E6IG"
4848
>
4949
<div
5050
className="src-shared-components-TrackIcon-___style__CH___3YWAb src-shared-components-TrackIcon-___style__main-icon___1q-1_"

‎__tests__/shared/components/__snapshots__/Switch.jsx.snap

+2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
exports[`Matches shallow shapshot 1`] = `
44
<Switch
55
enabled={false}
6+
isBlue={false}
67
onSwitch={[Function]}
78
theme={
89
Object {
10+
"blue": "src-shared-components-Switch-style___blue___UCM-_3",
911
"disabled": "src-shared-components-Switch-style___disabled___EEAxIO",
1012
"enabled": "src-shared-components-Switch-style___enabled___7dhGcX",
1113
"handle": "src-shared-components-Switch-style___handle___3s_OOJ",

‎__tests__/shared/components/__snapshots__/SwitchWithLabel.jsx.snap

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
exports[`Matches shallow shapshot 1`] = `
44
<SwitchWithLabel
55
enabled={false}
6+
isBlue={false}
67
labelAfter=""
78
labelBefore=""
89
onSwitch={[Function]}

‎__tests__/shared/components/challenge-listing/Filters/__snapshots__/FiltersPanel.jsx.snap

+9-8
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ exports[`Matches shallow shapshot 2`] = `
4545
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filters___3um3W"
4646
>
4747
<div
48-
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row___2Vfd_"
48+
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"
4949
>
5050
<div
5151
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__search-bar___15MSx"
@@ -56,7 +56,7 @@ exports[`Matches shallow shapshot 2`] = `
5656
</div>
5757
</div>
5858
<div
59-
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__filter-row___2Vfd_"
59+
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"
6060
>
6161
<div
6262
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__bucket-selector-mobile___JbE2n"
@@ -79,7 +79,7 @@ exports[`Matches shallow shapshot 2`] = `
7979
<span
8080
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__label___3W9TU"
8181
>
82-
Challenge Category
82+
Category
8383
</span>
8484
<div
8585
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__switches___10Wrx"
@@ -93,6 +93,7 @@ exports[`Matches shallow shapshot 2`] = `
9393
composeAdhocTheme="deeply"
9494
composeContextTheme="softly"
9595
enabled={false}
96+
isBlue={true}
9697
labelAfter="Design"
9798
labelBefore=""
9899
mapThemrProps={[Function]}
@@ -109,6 +110,7 @@ exports[`Matches shallow shapshot 2`] = `
109110
composeAdhocTheme="deeply"
110111
composeContextTheme="softly"
111112
enabled={false}
113+
isBlue={true}
112114
labelAfter="Development"
113115
labelBefore=""
114116
mapThemrProps={[Function]}
@@ -125,6 +127,7 @@ exports[`Matches shallow shapshot 2`] = `
125127
composeAdhocTheme="deeply"
126128
composeContextTheme="softly"
127129
enabled={false}
130+
isBlue={true}
128131
labelAfter="Data Science"
129132
labelBefore=""
130133
mapThemrProps={[Function]}
@@ -141,6 +144,7 @@ exports[`Matches shallow shapshot 2`] = `
141144
composeAdhocTheme="deeply"
142145
composeContextTheme="softly"
143146
enabled={false}
147+
isBlue={true}
144148
labelAfter="QA"
145149
labelBefore=""
146150
mapThemrProps={[Function]}
@@ -160,7 +164,7 @@ exports[`Matches shallow shapshot 2`] = `
160164
<span
161165
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__label___3W9TU"
162166
>
163-
Challenge Type
167+
Type
164168
</span>
165169
<div
166170
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__checkboxes___3ukXp"
@@ -207,9 +211,6 @@ exports[`Matches shallow shapshot 2`] = `
207211
/>
208212
</div>
209213
</div>
210-
<hr
211-
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__hr___1WvP7"
212-
/>
213214
</div>
214215
<div
215216
className="src-shared-components-challenge-listing-Filters-FiltersPanel-___style__buttons___2r3xW"
@@ -227,7 +228,7 @@ exports[`Matches shallow shapshot 2`] = `
227228
}
228229
themePriority="adhoc-default-context"
229230
>
230-
RESET FILTERS
231+
Reset filters
231232
</Button>
232233
</div>
233234
</div>

‎__tests__/shared/components/challenge-listing/Sidebar/__snapshots__/index.jsx.snap

-6
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ exports[`Matches shallow shapshot 1`] = `
1717
selectBucket={[MockFunction]}
1818
/>
1919
</div>
20-
<hr
21-
className="src-shared-components-challenge-listing-Sidebar-___style__hr___2GEB7"
22-
/>
2320
</div>
2421
`;
2522

@@ -40,8 +37,5 @@ exports[`Matches shallow shapshot 2`] = `
4037
selectBucket={[MockFunction]}
4138
/>
4239
</div>
43-
<hr
44-
className="src-shared-components-challenge-listing-Sidebar-___style__hr___2GEB7"
45-
/>
4640
</div>
4741
`;

‎src/assets/images/arrow-prev-blue.svg

+3
Loading

‎src/assets/images/icons_upload.svg

+3
Loading

‎src/assets/images/open_in_new.svg

+8
Loading

‎src/shared/components/Dashboard/BlogFeed/index.jsx

+18-14
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,44 @@ import PT from 'prop-types';
77
import React from 'react';
88
import './styles.scss';
99
import { config } from 'topcoder-react-utils';
10-
import BlogArticlesIcon from 'assets/images/icon-blog-articles.svg';
1110

12-
export default function BlogFeed({
13-
blogs,
14-
loading,
15-
theme,
16-
}) {
11+
export default function BlogFeed({ blogs, loading, theme }) {
1712
return (
1813
<div styleName={`container ${theme}`}>
1914
<div styleName="header">
2015
<div styleName="title">
21-
<BlogArticlesIcon styleName="icon" />
22-
<span>BLOG ARTICLES</span>
16+
<span>Blog Articles</span>
2317
</div>
2418
<a
2519
styleName="allLink"
2620
href={`${config.URL.BASE}/blog/category/community-stories`}
2721
target="_blank"
2822
rel="noreferrer"
29-
>View all
23+
>
24+
View all
3025
</a>
3126
</div>
3227
<div styleName="blogs">
33-
{loading ? <div styleName="loading"><LoadingIndicator /></div>
34-
: blogs.map(blog => (
35-
<div styleName="row" key={`blog-feed-${blog.link}`}>
28+
{loading ? (
29+
<div styleName="loading">
30+
<LoadingIndicator />
31+
</div>
32+
) : (
33+
blogs.map(blog => (
34+
<div
35+
styleName="row"
36+
key={`blog-feed-${blog.link}`}
37+
>
3638
<a
3739
href={`${blog.link}`}
3840
target="_blank"
3941
rel="noreferrer"
40-
>{blog.title}
42+
>
43+
{blog.title}
4144
</a>
4245
</div>
43-
))}
46+
))
47+
)}
4448
</div>
4549
</div>
4650
);

0 commit comments

Comments
 (0)