From 1e3d04b0b1afa63dd234a193e88fc3512ab4b969 Mon Sep 17 00:00:00 2001 From: ajefts Date: Tue, 27 Oct 2015 11:44:48 -0400 Subject: [PATCH 1/4] Update communityData.service.js --- app/services/communityData.service.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/services/communityData.service.js b/app/services/communityData.service.js index 358b96a31..fe6808554 100644 --- a/app/services/communityData.service.js +++ b/app/services/communityData.service.js @@ -71,17 +71,17 @@ var deferred = $q.defer(); var data = { "SRMWinners": [{ - "avatar": "http://www.topcoder.com/i/m/tourist.jpeg", - "name": "tourist", - "date": "20151014T000000Z", - "country": "Belarus", - "contests": ["SRM 671 DIVISION 1 WINNER"] + "avatar": "https://s3.amazonaws.com/app.topcoder-dev.com/images/ico-user-default.7aa28736.svg", + "name": "xudyh", + "date": "20151020T000000Z", + "country": "China", + "contests": ["SRM 672 DIVISION 1 WINNER"] }, { - "avatar": "https://www.topcoder.com/i/m/thegunner2401.jpeg", - "name": "thegunner2401", - "date": "20151014T000000Z", - "country": "Viet Nam", - "contests": ["SRM 671 DIVISION 2 WINNER"] + "avatar": "https://s3.amazonaws.com/app.topcoder-dev.com/images/ico-user-default.7aa28736.svg", + "name": "jiangshibiao2", + "date": "20151020T000000Z", + "country": "China", + "contests": ["SRM 672 DIVISION 2 WINNER"] }], "MarathonWinner": [{ "avatar": "http://www.topcoder.com/i/m/eldidou.jpeg", From 3e04c9980e9bef27eafdcc504fc79ccbc2032a03 Mon Sep 17 00:00:00 2001 From: TonyJ Date: Tue, 27 Oct 2015 11:59:14 -0400 Subject: [PATCH 2/4] Updated Arena to Competitive Programming --- app/services/nav.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/nav.service.js b/app/services/nav.service.js index fc2d8d31d..7f21fd9d1 100644 --- a/app/services/nav.service.js +++ b/app/services/nav.service.js @@ -19,7 +19,7 @@ { 'href': "/challenges/design/active/", 'text': 'DESIGN CHALLENGES', 'icon': '/images/nav/track-design.svg' }, { 'href': "/challenges/develop/active", 'text': 'DEVELOPMENT CHALLENGES', 'icon': '/images/nav/track-develop.svg' }, { 'href': "/challenges/data/active", 'text': 'DATA SCIENCE CHALLENGES', 'icon': '/images/nav/track-data.svg' }, - { 'href': CONSTANTS.ARENA_URL, 'text': 'THE ARENA', 'icon': '/images/nav/track-cp.svg', 'target': '_blank' }, + { 'href': CONSTANTS.ARENA_URL, 'text': 'COMPETITIVE PROGRAMMING', 'icon': '/images/nav/track-cp.svg', 'target': '_blank' }, ], 'learn': [ { 'href': '/member-onboarding/', 'text': 'GET STARTED', 'icon': '/images/nav/rocket.svg' }, From 91386c1b844a5cde14a8fae98b4612e6c23a8ba4 Mon Sep 17 00:00:00 2001 From: TonyJ Date: Tue, 27 Oct 2015 15:38:38 -0400 Subject: [PATCH 3/4] Cutting member of month and moving copilots up After discussing with Anuj, rearranged this page slightly. --- app/community/members.jade | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/app/community/members.jade b/app/community/members.jade index 5403a5a54..db19ec5d9 100644 --- a/app/community/members.jade +++ b/app/community/members.jade @@ -9,18 +9,16 @@ input(ng-model="ctrl.keywords", name="keywords", placeholder="find people", type="text", required) input(type="submit" name="search-btn" value="").search-ico - .default-show-container(ng-show="ctrl.notSearch") - .members-of-month-container - h2 Members of the Month - small {{ctrl.currentMonth}} - .members-wrapper - .user-tile(ng-repeat="item in ctrl.memberLeaderboard") + .copilots-container + h2 Copilots + .copilots-wrapper + .user-tile(ng-repeat="item in ctrl.copilots") .avatar-wrapper: img(ng-src="{{item.avatar}}") .user-name {{item.name}} - .user-tag(class="{{item.class}}") {{item.contestType}} - p.user-desc {{item.description}} - a(ng-href="//www.{{ctrl.domain}}/community/member-programs/topcoder-member-of-the-month/", target="_blank").user-more Read the story - p.member-congratulation Congratulations to all the members of the month! + .user-country {{item.country}} + .btn-wrapper + a(ng-href="//community.{{ctrl.domain}}/tc?module=ViewCopilotPool&size=20&view=0&sort=12", target="_blank").blue-btn View all copilots + .reviewboard-container h2 Review Boards @@ -45,15 +43,6 @@ .link: a(ng-href="//www.{{ctrl.domain}}/tc?module=ReviewBoard&pt=9", target="_blank") Bug Hunt - .copilots-container - h2 Copilots - .copilots-wrapper - .user-tile(ng-repeat="item in ctrl.copilots") - .avatar-wrapper: img(ng-src="{{item.avatar}}") - .user-name {{item.name}} - .user-country {{item.country}} - .btn-wrapper - a(ng-href="//community.{{ctrl.domain}}/tc?module=ViewCopilotPool&size=20&view=0&sort=12", target="_blank").blue-btn View all copilots .search-result-container(ng-hide="ctrl.notSearch") From 1de6a3071b0e4435740cd9d65df72ba629495c61 Mon Sep 17 00:00:00 2001 From: TonyJ Date: Tue, 27 Oct 2015 17:41:56 -0400 Subject: [PATCH 4/4] reverted back based on review with community team --- app/community/members.jade | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/app/community/members.jade b/app/community/members.jade index db19ec5d9..5403a5a54 100644 --- a/app/community/members.jade +++ b/app/community/members.jade @@ -9,16 +9,18 @@ input(ng-model="ctrl.keywords", name="keywords", placeholder="find people", type="text", required) input(type="submit" name="search-btn" value="").search-ico - .copilots-container - h2 Copilots - .copilots-wrapper - .user-tile(ng-repeat="item in ctrl.copilots") + .default-show-container(ng-show="ctrl.notSearch") + .members-of-month-container + h2 Members of the Month + small {{ctrl.currentMonth}} + .members-wrapper + .user-tile(ng-repeat="item in ctrl.memberLeaderboard") .avatar-wrapper: img(ng-src="{{item.avatar}}") .user-name {{item.name}} - .user-country {{item.country}} - .btn-wrapper - a(ng-href="//community.{{ctrl.domain}}/tc?module=ViewCopilotPool&size=20&view=0&sort=12", target="_blank").blue-btn View all copilots - + .user-tag(class="{{item.class}}") {{item.contestType}} + p.user-desc {{item.description}} + a(ng-href="//www.{{ctrl.domain}}/community/member-programs/topcoder-member-of-the-month/", target="_blank").user-more Read the story + p.member-congratulation Congratulations to all the members of the month! .reviewboard-container h2 Review Boards @@ -43,6 +45,15 @@ .link: a(ng-href="//www.{{ctrl.domain}}/tc?module=ReviewBoard&pt=9", target="_blank") Bug Hunt + .copilots-container + h2 Copilots + .copilots-wrapper + .user-tile(ng-repeat="item in ctrl.copilots") + .avatar-wrapper: img(ng-src="{{item.avatar}}") + .user-name {{item.name}} + .user-country {{item.country}} + .btn-wrapper + a(ng-href="//community.{{ctrl.domain}}/tc?module=ViewCopilotPool&size=20&view=0&sort=12", target="_blank").blue-btn View all copilots .search-result-container(ng-hide="ctrl.notSearch")