From 275e0e127a4841b06e7d6e8651adef552c8e945c Mon Sep 17 00:00:00 2001
From: Thomas Kranitsas <kranitsasthomas@gmail.com>
Date: Wed, 28 Dec 2016 15:04:25 +0200
Subject: [PATCH 1/2] Misc bug fixes
---
app/directives/challenge-links/challenge-links.jade | 4 ++--
app/my-challenges/my-challenges.controller.js | 8 ++++++++
app/my-challenges/my-challenges.jade | 9 +++------
assets/css/community/members.scss | 3 +++
4 files changed, 16 insertions(+), 8 deletions(-)
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..60d1ee220 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;
+ }
}
}
From f0a96ea15c13cdee420d5aaf0a3ddbe78fd2234f Mon Sep 17 00:00:00 2001
From: Thomas Kranitsas <kranitsasthomas@gmail.com>
Date: Fri, 30 Dec 2016 11:58:30 +0200
Subject: [PATCH 2/2] Fix lint error
---
app/my-challenges/my-challenges.controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/my-challenges/my-challenges.controller.js b/app/my-challenges/my-challenges.controller.js
index 60d1ee220..d8623372c 100644
--- a/app/my-challenges/my-challenges.controller.js
+++ b/app/my-challenges/my-challenges.controller.js
@@ -149,7 +149,7 @@ import _ from 'lodash'
window.onscroll = function() {
if ((window.innerHeight + window.scrollY) >= document.body.offsetHeight) {
if (vm.totalCount > vm.myChallenges.length) {
- vm.loadMore();
+ vm.loadMore()
}
}
}