Skip to content

Commit 3011563

Browse files
kkartunovkkartunov
committed
merge blogfeed
1 parent ea6ba1d commit 3011563

File tree

34 files changed

+2712
-257
lines changed

34 files changed

+2712
-257
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ workflows:
356356
filters:
357357
branches:
358358
only:
359-
- slash-tc
359+
- free
360360
# This is beta env for production soft releases
361361
- "build-prod-beta":
362362
context : org-global
@@ -371,7 +371,6 @@ workflows:
371371
branches:
372372
only:
373373
- develop
374-
- fix-challenge-end-date
375374
# Production builds are exectuted
376375
# when PR is merged to the master
377376
# Don't change anything in this configuration

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,14 @@ exports[`Matches shallow shapshot 1`] = `
10661066
</Link>
10671067
10681068
- Demo of Challenges Feed Component
1069+
<Link
1070+
replace={false}
1071+
to="/examples/blog-feed"
1072+
>
1073+
Blog Feed
1074+
</Link>
1075+
1076+
- Demo of Blog Feed component
10691077
</li>
10701078
</ul>
10711079
</div>

‎automated-smoke-test/config/automation-config-beta.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -122,61 +122,61 @@
122122
"memberProfile": {
123123
"url": "https://beta-community-app.topcoder.com/members",
124124
"profileInfo": {
125-
"handle": "iamtong",
126-
"numberOfCollapsedSkills": 10,
127-
"verifiedSkill": "HTML5",
128-
"noneVerifiedSkill": "Marvel - Design",
129-
"country": "THAILAND",
130-
"memberSince": "MEMBER SINCE MAY, 2009",
131-
"tracks": ["COPILOT", "DEVELOP", "DESIGN"],
132-
"quote": "I'm a designer focusing on designing mobile/ web applications and user experience.",
133-
"forumLink": "https://apps.topcoder.com/forums/?module=History&userID=22781893"
125+
"handle": "oton",
126+
"numberOfCollapsedSkills": 4,
127+
"verifiedSkill": "Geometry",
128+
"noneVerifiedSkill": "User Experience (Ux)",
129+
"country": "INDONESIA",
130+
"memberSince": "MEMBER SINCE MAY, 2006",
131+
"tracks": ["COPILOT", "DEVELOP", "DESIGN", "DATA_SCIENCE"],
132+
"quote": "Indonesian. Dad of two. IA. WordPress/WooCommerce. Rails.",
133+
"forumLink": "https://apps.topcoder.com/forums/?module=History&userID=22076237"
134134
},
135135
"memberHaveWebSectionInfo": {
136136
"handle": "oton",
137137
"webLink": "HTTPS://ARIFWIDIANTO.COM"
138138
},
139139
"copilotProfile": {
140-
"handle": "iamtong",
140+
"handle": "oton",
141141
"trackName": "COPILOT",
142142
"fullfillmentInfo": {
143143
"name": "COPILOT",
144-
"info": "100%",
144+
"info": "92.31%",
145145
"infoTitle": "FULFILLMENT",
146-
"link": "https://beta-community-app.topcoder.com/members/iamtong/details/?track=COPILOT&subTrack=COPILOT"
146+
"link": "https://beta-community-app.topcoder.com/members/oton/details/?track=COPILOT&subTrack=COPILOT"
147147
}
148148
},
149149
"designProfile": {
150-
"handle": "iamtong",
150+
"handle": "oton",
151151
"trackName": "DESIGN",
152-
"numberOfSubtracks": 11,
152+
"numberOfSubtracks": 8,
153153
"winInfo": {
154154
"name": "WEB DESIGNS",
155-
"info": "268",
155+
"info": "4",
156156
"infoTitle": "WINS",
157-
"link": "https://beta-community-app.topcoder.com/members/iamtong/details/?track=DESIGN&subTrack=WEB_DESIGNS"
157+
"link": "https://beta-community-app.topcoder.com/members/oton/details/?track=DESIGN&subTrack=WEB_DESIGNS"
158158
}
159159
},
160160
"developmentProfile": {
161-
"handle": "iamtong",
161+
"handle": "oton",
162162
"trackName": "DEVELOP",
163-
"numberOfSubtracks": 7,
163+
"numberOfSubtracks": 2,
164164
"winInfo": {
165-
"name": "FIRST2FINISH",
166-
"info": "61",
167-
"infoTitle": "WINS",
168-
"link": "https://beta-community-app.topcoder.com/members/iamtong/details/?track=DEVELOP&subTrack=FIRST_2_FINISH"
165+
"name": "UI PROTOTYPE COMPETITION",
166+
"info": "908",
167+
"infoTitle": "RATING",
168+
"link": "https://beta-community-app.topcoder.com/members/oton/details/?track=DEVELOP&subTrack=UI_PROTOTYPE_COMPETITION"
169169
}
170170
},
171171
"dataScienceProfile": {
172-
"handle": "FireIce",
172+
"handle": "oton",
173173
"trackName": "DATA_SCIENCE",
174-
"numberOfSubtracks": 2,
174+
"numberOfSubtracks": 1,
175175
"ratingInfo": {
176-
"name": "MARATHON MATCH",
177-
"info": "999",
176+
"name": "SRM",
177+
"info": "952",
178178
"infoTitle": "RATING",
179-
"link": "https://beta-community-app.topcoder.com/members/FireIce/details/?track=DATA_SCIENCE&subTrack=MARATHON_MATCH"
179+
"link": "https://beta-community-app.topcoder.com/members/oton/details/?track=DATA_SCIENCE&subTrack=SRM"
180180
}
181181
}
182182
}

‎automated-smoke-test/config/automation-config-prod.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -118,61 +118,61 @@
118118
"memberProfile": {
119119
"url": "https://www.topcoder.com/members",
120120
"profileInfo": {
121-
"handle": "iamtong",
122-
"numberOfCollapsedSkills": 10,
123-
"verifiedSkill": "HTML5",
124-
"noneVerifiedSkill": "Marvel - Design",
125-
"country": "THAILAND",
126-
"memberSince": "MEMBER SINCE MAY, 2009",
127-
"tracks": ["COPILOT", "DEVELOP", "DESIGN"],
128-
"quote": "I'm a designer focusing on designing mobile/ web applications and user experience.",
129-
"forumLink": "https://apps.topcoder.com/forums/?module=History&userID=22781893"
121+
"handle": "oton",
122+
"numberOfCollapsedSkills": 4,
123+
"verifiedSkill": "Geometry",
124+
"noneVerifiedSkill": "User Experience (Ux)",
125+
"country": "INDONESIA",
126+
"memberSince": "MEMBER SINCE MAY, 2006",
127+
"tracks": ["COPILOT", "DEVELOP", "DESIGN", "DATA_SCIENCE"],
128+
"quote": "Indonesian. Dad of two. IA. WordPress/WooCommerce. Rails.",
129+
"forumLink": "https://apps.topcoder.com/forums/?module=History&userID=22076237"
130130
},
131131
"memberHaveWebSectionInfo": {
132132
"handle": "oton",
133133
"webLink": "HTTPS://ARIFWIDIANTO.COM"
134134
},
135135
"copilotProfile": {
136-
"handle": "iamtong",
136+
"handle": "oton",
137137
"trackName": "COPILOT",
138138
"fullfillmentInfo": {
139139
"name": "COPILOT",
140-
"info": "100%",
140+
"info": "92.31%",
141141
"infoTitle": "FULFILLMENT",
142-
"link": "https://www.topcoder.com/members/iamtong/details/?track=COPILOT&subTrack=COPILOT"
142+
"link": "https://www.topcoder.com/members/oton/details/?track=COPILOT&subTrack=COPILOT"
143143
}
144144
},
145145
"designProfile": {
146-
"handle": "iamtong",
146+
"handle": "oton",
147147
"trackName": "DESIGN",
148-
"numberOfSubtracks": 11,
148+
"numberOfSubtracks": 8,
149149
"winInfo": {
150150
"name": "WEB DESIGNS",
151-
"info": "268",
151+
"info": "4",
152152
"infoTitle": "WINS",
153-
"link": "https://www.topcoder.com/members/iamtong/details/?track=DESIGN&subTrack=WEB_DESIGNS"
153+
"link": "https://www.topcoder.com/members/oton/details/?track=DESIGN&subTrack=WEB_DESIGNS"
154154
}
155155
},
156156
"developmentProfile": {
157-
"handle": "iamtong",
157+
"handle": "oton",
158158
"trackName": "DEVELOP",
159-
"numberOfSubtracks": 7,
159+
"numberOfSubtracks": 2,
160160
"winInfo": {
161-
"name": "FIRST2FINISH",
162-
"info": "61",
163-
"infoTitle": "WINS",
164-
"link": "https://www.topcoder.com/members/iamtong/details/?track=DEVELOP&subTrack=FIRST_2_FINISH"
161+
"name": "UI PROTOTYPE COMPETITION",
162+
"info": "908",
163+
"infoTitle": "RATING",
164+
"link": "https://www.topcoder.com/members/oton/details/?track=DEVELOP&subTrack=UI_PROTOTYPE_COMPETITION"
165165
}
166166
},
167167
"dataScienceProfile": {
168-
"handle": "FireIce",
168+
"handle": "oton",
169169
"trackName": "DATA_SCIENCE",
170-
"numberOfSubtracks": 2,
170+
"numberOfSubtracks": 1,
171171
"ratingInfo": {
172-
"name": "MARATHON MATCH",
173-
"info": "999",
172+
"name": "SRM",
173+
"info": "952",
174174
"infoTitle": "RATING",
175-
"link": "https://www.topcoder.com/members/FireIce/details/?track=DATA_SCIENCE&subTrack=MARATHON_MATCH"
175+
"link": "https://www.topcoder.com/members/oton/details/?track=DATA_SCIENCE&subTrack=SRM"
176176
}
177177
}
178178
}

‎automated-smoke-test/config/automation-config-staging.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -123,61 +123,61 @@
123123
"memberProfile": {
124124
"url": "https://staging-community-app.topcoder.com/members",
125125
"profileInfo": {
126-
"handle": "iamtong",
127-
"numberOfCollapsedSkills": 10,
128-
"verifiedSkill": "HTML5",
129-
"noneVerifiedSkill": "Marvel - Design",
130-
"country": "THAILAND",
131-
"memberSince": "MEMBER SINCE MAY, 2009",
132-
"tracks": ["COPILOT", "DEVELOP", "DESIGN"],
133-
"quote": "I'm a designer focusing on designing mobile/ web applications and user experience.",
134-
"forumLink": "https://apps.topcoder.com/forums/?module=History&userID=22781893"
126+
"handle": "oton",
127+
"numberOfCollapsedSkills": 4,
128+
"verifiedSkill": "Geometry",
129+
"noneVerifiedSkill": "User Experience (Ux)",
130+
"country": "INDONESIA",
131+
"memberSince": "MEMBER SINCE MAY, 2006",
132+
"tracks": ["COPILOT", "DEVELOP", "DESIGN", "DATA_SCIENCE"],
133+
"quote": "Indonesian. Dad of two. IA. WordPress/WooCommerce. Rails.",
134+
"forumLink": "https://apps.topcoder.com/forums/?module=History&userID=22076237"
135135
},
136136
"memberHaveWebSectionInfo": {
137137
"handle": "oton",
138138
"webLink": "HTTPS://ARIFWIDIANTO.COM"
139139
},
140140
"copilotProfile": {
141-
"handle": "iamtong",
141+
"handle": "oton",
142142
"trackName": "COPILOT",
143143
"fullfillmentInfo": {
144144
"name": "COPILOT",
145-
"info": "100%",
145+
"info": "92.31%",
146146
"infoTitle": "FULFILLMENT",
147-
"link": "https://staging-community-app.topcoder.com/members/iamtong/details/?track=COPILOT&subTrack=COPILOT"
147+
"link": "https://staging-community-app.topcoder.com/members/oton/details/?track=COPILOT&subTrack=COPILOT"
148148
}
149149
},
150150
"designProfile": {
151-
"handle": "iamtong",
151+
"handle": "oton",
152152
"trackName": "DESIGN",
153-
"numberOfSubtracks": 11,
153+
"numberOfSubtracks": 8,
154154
"winInfo": {
155155
"name": "WEB DESIGNS",
156-
"info": "268",
156+
"info": "4",
157157
"infoTitle": "WINS",
158-
"link": "https://staging-community-app.topcoder.com/members/iamtong/details/?track=DESIGN&subTrack=WEB_DESIGNS"
158+
"link": "https://staging-community-app.topcoder.com/members/oton/details/?track=DESIGN&subTrack=WEB_DESIGNS"
159159
}
160160
},
161161
"developmentProfile": {
162-
"handle": "iamtong",
162+
"handle": "oton",
163163
"trackName": "DEVELOP",
164-
"numberOfSubtracks": 7,
164+
"numberOfSubtracks": 2,
165165
"winInfo": {
166-
"name": "FIRST2FINISH",
167-
"info": "61",
168-
"infoTitle": "WINS",
169-
"link": "https://staging-community-app.topcoder.com/members/iamtong/details/?track=DEVELOP&subTrack=FIRST_2_FINISH"
166+
"name": "UI PROTOTYPE COMPETITION",
167+
"info": "908",
168+
"infoTitle": "RATING",
169+
"link": "https://staging-community-app.topcoder.com/members/oton/details/?track=DEVELOP&subTrack=UI_PROTOTYPE_COMPETITION"
170170
}
171171
},
172172
"dataScienceProfile": {
173-
"handle": "FireIce",
173+
"handle": "oton",
174174
"trackName": "DATA_SCIENCE",
175-
"numberOfSubtracks": 2,
175+
"numberOfSubtracks": 1,
176176
"ratingInfo": {
177-
"name": "MARATHON MATCH",
178-
"info": "999",
177+
"name": "SRM",
178+
"info": "952",
179179
"infoTitle": "RATING",
180-
"link": "https://staging-community-app.topcoder.com/members/FireIce/details/?track=DATA_SCIENCE&subTrack=MARATHON_MATCH"
180+
"link": "https://staging-community-app.topcoder.com/members/oton/details/?track=DATA_SCIENCE&subTrack=SRM"
181181
}
182182
}
183183
}

‎automated-smoke-test/page-objects/pages/topcoder/member-profile-page/member-profile.helper.ts

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -114,28 +114,30 @@ export class MemberProfilePageHelper {
114114
})
115115
).toBe(true, 'Unverified skill should not be displayed with a check mark');
116116
const numberOfCollapsedSkills = skills.length;
117-
await CommonHelper.findElementByText('button', 'VIEW ALL').click();
118-
await CommonHelper.waitUntilVisibilityOf(
119-
() => CommonHelper.findElementByText('button', 'VIEW LESS'),
120-
'Wait for view less button',
121-
false
122-
);
123117
skills = await MemberProfilePageObject.getAllSkills();
124118
const numberOfAllSkills = skills.length;
125-
expect(numberOfCollapsedSkills <= numberOfAllSkills).toBe(
126-
true,
127-
'Button View All does not work as expected'
128-
);
129-
await CommonHelper.findElementByText('button', 'VIEW LESS').click();
130-
await CommonHelper.waitUntilVisibilityOf(
131-
() => CommonHelper.findElementByText('button', 'VIEW ALL'),
132-
'Wait for view less button',
133-
false
134-
);
135-
expect(skills.length <= numberOfAllSkills).toBe(
136-
true,
137-
'Button View Less does not work as expected'
138-
);
119+
if (numberOfCollapsedSkills !== numberOfAllSkills) {
120+
await CommonHelper.findElementByText('button', 'VIEW ALL').click();
121+
await CommonHelper.waitUntilVisibilityOf(
122+
() => CommonHelper.findElementByText('button', 'VIEW LESS'),
123+
'Wait for view less button',
124+
false
125+
);
126+
expect(numberOfCollapsedSkills <= numberOfAllSkills).toBe(
127+
true,
128+
'Button View All does not work as expected'
129+
);
130+
await CommonHelper.findElementByText('button', 'VIEW LESS').click();
131+
await CommonHelper.waitUntilVisibilityOf(
132+
() => CommonHelper.findElementByText('button', 'VIEW ALL'),
133+
'Wait for view less button',
134+
false
135+
);
136+
expect(skills.length <= numberOfAllSkills).toBe(
137+
true,
138+
'Button View Less does not work as expected'
139+
);
140+
}
139141
}
140142

141143
/**

‎config/default.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@ module.exports = {
161161
COMMUNITY_APP_GITHUB_ISSUES: 'https://github.com/topcoder-platform/community-app/issues',
162162
EMAIL_VERIFY_URL: 'http://www.topcoder-dev.com/settings/account/changeEmail',
163163
ABANDONMENT_EMBED: 'https://43d132d5dbff47c59d9d53ad448f93c2.js.ubembed.com',
164+
// If a logged in user is a member of any of these groups, when they land on
165+
// their profile page (members/:handle), they'll be redirected to the "userProfile" url
166+
SUBDOMAIN_PROFILE_CONFIG: [{
167+
groupId: '20000000', communityId: 'wipro', communityName: 'topgear', userProfile: 'https://topgear-app.wipro.com/user-details',
168+
}],
164169
},
165170

166171
/* Information about Topcoder user groups can be cached in various places.

0 commit comments

Comments
 (0)