diff --git a/app/directives/challenge-links/challenge-links.jade b/app/directives/challenge-links/challenge-links.jade index 85c5c7954..cdb50febc 100644 --- a/app/directives/challenge-links/challenge-links.jade +++ b/app/directives/challenge-links/challenge-links.jade @@ -1,10 +1,10 @@ .challenge-links(ng-class="view + '-view'") - a.registrants(ng-href="{{challenge|challengeLinks:'registrants'}}", ng-switch="challenge.subTrack") + a.registrants(ng-href="{{challenge|challengeLinks:'registrants'}}", ng-switch="challenge.subTrack", target="_self") .icon.registrants-icon p(ng-switch-when="MARATHON_MATCH") {{challenge.numRegistrants[0]}} p(ng-switch-default) {{challenge.numRegistrants}} - a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'submissions'}}") + a.submissions(ng-hide="challenge.track === 'DATA_SCIENCE'", ng-href="{{challenge|challengeLinks:'submissions'}}", target="_self") .icon.submissions-icon p {{challenge.numSubmissions}} diff --git a/app/my-challenges/my-challenges.controller.js b/app/my-challenges/my-challenges.controller.js index b30fe3731..d8623372c 100644 --- a/app/my-challenges/my-challenges.controller.js +++ b/app/my-challenges/my-challenges.controller.js @@ -146,6 +146,14 @@ import _ from 'lodash' vm.getChallenges(currentOffset, false) } + window.onscroll = function() { + if ((window.innerHeight + window.scrollY) >= document.body.offsetHeight) { + if (vm.totalCount > vm.myChallenges.length) { + vm.loadMore() + } + } + } + function _checkForParticipation() { return ChallengeService.checkChallengeParticipation(vm.handle, function(participated) { vm.neverParticipated = !participated diff --git a/app/my-challenges/my-challenges.jade b/app/my-challenges/my-challenges.jade index 652af8165..644a84e4b 100644 --- a/app/my-challenges/my-challenges.jade +++ b/app/my-challenges/my-challenges.jade @@ -1,6 +1,6 @@ .my-challenges-container .my-challenges - + .page-header page-state-header(handle="{{vm.handle}}", page-title="My Challenges", hide-money="true", show-back-link="true", default-state="dashboard") @@ -26,10 +26,7 @@ .hasChallenges(ng-show="vm.myChallenges.length", state="vm.loading") - .data(ng-class="vm.view + '-view'") + .data(ng-class="vm.view + '-view'") challenge-tile( - ng-repeat="challenge in vm.myChallenges | orderBy:vm.orderBy:true", + ng-repeat="challenge in vm.myChallenges | orderBy:vm.orderBy:true", challenge="challenge", view="vm.view", ng-class="vm.view + '-view'") - - tc-section.load-more-section(state="vm.loading") - button.tc-btn(ng-show="vm.totalCount > vm.myChallenges.length", ng-click="vm.loadMore()") Load More diff --git a/assets/css/community/members.scss b/assets/css/community/members.scss index d2ae25751..019cb6999 100644 --- a/assets/css/community/members.scss +++ b/assets/css/community/members.scss @@ -65,6 +65,9 @@ color: #a3a3ae; font-size: 12px; font-weight: 400; + @media only screen and (max-width: 768px) { + font-size: 5vw; + } } } diff --git a/package.json b/package.json index d31ee074f..cc97ef8d2 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "auth0-js": "^6.8.0", "d3": "^3.5.14", "font-awesome": "^4.5.0", + "html-webpack-plugin": "^2.26.0", "intro.js": "^1.1.1", "jstimezonedetect": "^1.0.6", "lodash": "^4.5.0", @@ -69,10 +70,10 @@ "ng-dialog": "^0.5.6", "react-select": "1.0.0-beta8", "restangular": "^1.5.2", + "tc-accounts": "https://github.com/appirio-tech/accounts-app.git#0.0.7", "tc-angular-ellipsis": "^0.1.6", "topcoder-app-r": "^1.0.0", "xml2js": "^0.4.16", - "zepto": "1.0.1", - "tc-accounts": "https://github.com/appirio-tech/accounts-app.git#0.0.7" + "zepto": "1.0.1" } }