Skip to content

Commit 2099e4e

Browse files
kkartunovkkartunov
authored
Merge pull request #6980 from topcoder-platform/TOP-1390
TOP-1390 talent home refresh
2 parents 7822683 + 6bde6e4 commit 2099e4e

File tree

12 files changed

+299
-134
lines changed

12 files changed

+299
-134
lines changed

‎.circleci/config.yml

Lines changed: 41 additions & 40 deletions
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:

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

Lines changed: 18 additions & 14 deletions
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
);

‎src/shared/components/Dashboard/BlogFeed/styles.scss

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
color: $tc-gray-90;
1919
padding: 13px 12px 3px 12px;
2020
border-radius: 8px;
21-
margin-bottom: 20px;
21+
margin-bottom: 18px;
2222
}
2323

2424
.header {
@@ -28,18 +28,11 @@
2828
padding-bottom: 10px;
2929

3030
.title {
31-
@include barlow-semi-bold;
31+
@include roboto-bold;
3232

3333
display: flex;
3434
font-size: 16px;
3535
align-items: center;
36-
37-
.icon {
38-
fill: $tc-gray-90;
39-
width: 17px;
40-
height: 17px;
41-
margin-right: 9px;
42-
}
4336
}
4437

4538
.allLink {
@@ -102,3 +95,29 @@
10295
}
10396
}
10497
}
98+
99+
.container.light {
100+
color: #000;
101+
background: #fff;
102+
border: 1px solid #d4d4d4;
103+
border-radius: 4px;
104+
105+
.header {
106+
.icon {
107+
fill: $tc-white;
108+
}
109+
110+
.allLink {
111+
color: #0d61bf;
112+
font-size: 12px;
113+
line-height: 20px;
114+
text-decoration: none;
115+
}
116+
}
117+
118+
.blogs {
119+
.row:not(:first-child) {
120+
border-top: 1px solid $dashboard-dark-bg;
121+
}
122+
}
123+
}

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

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,24 @@ export default function ChallengesFeed({
2121
<span styleName="title">{title}</span>
2222
<a
2323
styleName="allLink"
24-
href={`${config.URL.CHALLENGES_URL}${challengeListingQuery ? `?${qs.stringify(challengeListingQuery)}` : ''}`}
24+
href={`${config.URL.CHALLENGES_URL}${
25+
challengeListingQuery
26+
? `?${qs.stringify(challengeListingQuery)}`
27+
: ''
28+
}`}
2529
target="_blank"
2630
rel="noreferrer"
27-
>View all <span>challenges</span>
31+
>
32+
View all
2833
</a>
2934
</div>
3035
<div styleName="challenges">
31-
{loading ? <div styleName="loading"><LoadingIndicator /></div>
32-
: (challenges || []).map(challenge => (
36+
{loading ? (
37+
<div styleName="loading">
38+
<LoadingIndicator />
39+
</div>
40+
) : (
41+
(challenges || []).map(challenge => (
3342
<div styleName="row" key={challenge.id}>
3443
<a
3544
href={`/challenges/${challenge.id}`}
@@ -40,13 +49,16 @@ export default function ChallengesFeed({
4049
</a>
4150
<div styleName="prize">
4251
<span styleName="amount">
43-
{`$${_.sum(challenge.prizeSets
44-
.filter(set => set.type === 'placement')
45-
.map(item => _.sum(item.prizes.map(prize => prize.value)))).toLocaleString()}`}
52+
{`$${_.sum(
53+
challenge.prizeSets
54+
.filter(set => set.type === 'placement')
55+
.map(item => _.sum(item.prizes.map(prize => prize.value))),
56+
).toLocaleString()}`}
4657
</span>
4758
</div>
4859
</div>
49-
))}
60+
))
61+
)}
5062
</div>
5163
</div>
5264
) : null;
@@ -55,7 +67,7 @@ export default function ChallengesFeed({
5567
ChallengesFeed.defaultProps = {
5668
challenges: [],
5769
theme: 'light',
58-
title: 'CHALLENGES',
70+
title: 'Opportunities',
5971
challengeListingQuery: undefined,
6072
};
6173

‎src/shared/components/Dashboard/Challenges/styles.scss

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ $dashboard-dark-bg: #2a2a2a;
3131
padding: 12px 0;
3232

3333
.title {
34-
@include barlow-semi-bold;
34+
@include roboto-bold;
3535

36-
font-size: 16px;
36+
font-size: 20px;
3737
}
3838

3939
.allLink {
@@ -120,8 +120,46 @@ $dashboard-dark-bg: #2a2a2a;
120120
.challenges {
121121
background-color: $dashboard-dark-card-bg;
122122

123-
.row:not(:first-child) {
124-
border-top: 1px solid $dashboard-dark-bg;
123+
// .row:not(:first-child) {
124+
// border-top: 1px solid $dashboard-dark-bg;
125+
// }
126+
}
127+
}
128+
129+
.container.light {
130+
color: $tc-white;
131+
margin-bottom: 0;
132+
133+
.header {
134+
padding: 19px 0;
135+
136+
.title {
137+
color: #2a2a2a;
138+
}
139+
140+
.allLink {
141+
color: #fff;
142+
border-radius: 4px;
143+
background-color: #0d61bf;
144+
font-size: 14px;
145+
font-weight: 500;
146+
line-height: 22px;
147+
padding: 1px 12px;
148+
}
149+
}
150+
151+
.challenges {
152+
background-color: transparent;
153+
border-radius: 0;
154+
color: #2a2a2a;
155+
156+
.row {
157+
background-color: #fff;
158+
border: 1px solid #d4d4d4;
159+
margin: 0;
160+
margin-bottom: 10px;
161+
border-radius: 4px;
162+
padding: 11px 15px;
125163
}
126164
}
127165
}

0 commit comments

Comments
 (0)