Skip to content

Commit 5c1eb67

Browse files
Merge pull request #6571 from topcoder-platform/reskin-tco-badge
TCO badges in member profile
2 parents bb8fd8b + 2e8b7b1 commit 5c1eb67

File tree

23 files changed

+513
-18
lines changed

23 files changed

+513
-18
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,21 +356,21 @@ workflows:
356356
filters:
357357
branches:
358358
only:
359-
- gig-share
359+
- free
360360
# This is alternate dev env for parallel testing
361361
- "build-qa":
362362
context : org-global
363363
filters:
364364
branches:
365365
only:
366-
- reskin-profile-settings
366+
- free
367367
# This is beta env for production soft releases
368368
- "build-prod-beta":
369369
context : org-global
370370
filters:
371371
branches:
372372
only:
373-
- tco23-leaderboards
373+
- free
374374
# This is stage env for production QA releases
375375
- "build-prod-staging":
376376
context : org-global

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ ENV GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY=$GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY
143143
# Optimizely
144144
ENV OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY
145145

146+
ENV GAMIFICATION_ORG_ID=$GAMIFICATION_ORG_ID
147+
146148
################################################################################
147149
# Testing and build of the application inside the container.
148150

__tests__/shared/components/ProfilePage/__snapshots__/index.jsx.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ exports[`renders a full Profile correctly 1`] = `
5858
},
5959
]
6060
}
61+
badges={Object {}}
6162
challenges={null}
6263
clearSubtrackChallenges={[Function]}
6364
copilot={true}
@@ -720,6 +721,7 @@ exports[`renders a full Profile correctly 1`] = `
720721
exports[`renders an empty Profile correctly 1`] = `
721722
<ProfilePage
722723
achievements={Array []}
724+
badges={Object {}}
723725
challenges={null}
724726
clearSubtrackChallenges={[Function]}
725727
copilot={false}

build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ docker build -t $TAG \
5353
--build-arg OPTIMIZELY_SDK_KEY=$OPTIMIZELY_SDK_KEY \
5454
--build-arg COMMUNITY_APP_URL=$COMMUNITY_APP_URL \
5555
--build-arg GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY=$GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY \
56+
--build-arg GAMIFICATION_ORG_ID=$GAMIFICATION_ORG_ID \
5657
--build-arg VALID_ISSUERS=$VALID_ISSUERS .
5758

5859
# Copies "node_modules" from the created image, if necessary for caching.

config/custom-environment-variables.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,8 @@ module.exports = {
114114
SDK_KEY: 'OPTIMIZELY_SDK_KEY',
115115
},
116116
GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY: 'GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY',
117+
GAMIFICATION: {
118+
ORG_ID: 'GAMIFICATION_ORG_ID',
119+
ENABLE_BADGE_UI: 'GAMIFICATION_ENABLE_BADGE_UI',
120+
},
117121
};

config/default.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,9 @@ module.exports = {
452452
OPTIMIZELY: {
453453
SDK_KEY: '7V4CJhurXT3Y3bnzv1hv1',
454454
},
455-
PLATFORM_SITE_URL: 'https://platform.topcoder-dev.com',
455+
GAMIFICATION: {
456+
ORG_ID: '6052dd9b-ea80-494b-b258-edd1331e27a3',
457+
ENABLE_BADGE_UI: true,
458+
},
456459
PLATFORMUI_SITE_URL: 'https://platform-ui.topcoder-dev.com',
457460
};
Lines changed: 17 additions & 0 deletions
Loading
11.9 KB
Loading

src/assets/images/profile/header-overlay.svg

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/shared/actions/page/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import _ from 'lodash';
22
import challengeDetails from './challenge-details';
3+
import memberProfile from './profile';
34

4-
export default _.merge({}, challengeDetails);
5+
export default _.merge({}, challengeDetails, memberProfile);

0 commit comments

Comments
 (0)