Skip to content

Fixes #4479 : Add tabs for all challenges page #4512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RishabhJain2018 merged 10 commits into from
Mar 28, 2025
Merged

Fixes #4479 : Add tabs for all challenges page #4512

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
40998ce
Add tabs for challenges
Harshit28j Jun 20, 2024
5a33f1a
Optimized api call & added blank space in SCSS
Harshit28j Jun 27, 2024
2917329
revert changes to js
Harshit28j Jun 27, 2024
e0ddaf3
Add new line
lazyperson1020 Mar 25, 2025
525535b
tests
lazyperson1020 Mar 28, 2025
46f26a2
no change
lazyperson1020 Mar 28, 2025
135d496
no change
lazyperson1020 Mar 28, 2025
8723f08
added tests
lazyperson1020 Mar 28, 2025
836749f
changes
lazyperson1020 Mar 28, 2025
36d6b20
Merge branch 'master' into tabs_for_challenges_updated
RishabhJain2018 Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert changes to js
  • Loading branch information
@Harshit28j @lazyperson1020
Harshit28j authored and lazyperson1020 committed Mar 25, 2025
commit 291732995a359bb40f6725ca3fe86aff4c4625b1
20 changes: 9 additions & 11 deletions frontend/src/js/controllers/challengeListCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,7 @@
vm.noneCurrentChallenge = false;
vm.noneUpcomingChallenge = false;
vm.nonePastChallenge = false;
vm.getAllResults = function(parameters, resultsArray, typ,status){
if (status === 'current') {
parameters.url = 'challenges/challenge/present/approved/public';
} else if (status === 'upcoming') {
parameters.url = 'challenges/challenge/future/approved/public';
} else if (status === 'past') {
parameters.url = 'challenges/challenge/past/approved/public';
}
vm.getAllResults = function(parameters, resultsArray, typ){
parameters.method = 'GET';
parameters.callback = {
onSuccess: function(response) {
Expand Down Expand Up @@ -95,11 +88,16 @@
}

// calls for ongoing challenges
vm.getAllResults(parameters, vm.currentList, "noneCurrentChallenge", 'current');
parameters.url = 'challenges/challenge/present/approved/public';
vm.getAllResults(parameters, vm.currentList, "noneCurrentChallenge");

Copy link
Copy Markdown
Member

@RishabhJain2018 RishabhJain2018 Mar 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this line.

Copy link
Copy Markdown
Contributor Author

@lazyperson1020 lazyperson1020 Mar 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

// calls for upcoming challenges
vm.getAllResults(parameters, vm.upcomingList, "noneUpcomingChallenge", 'upcoming');
parameters.url = 'challenges/challenge/future/approved/public';
vm.getAllResults(parameters, vm.upcomingList, "noneUpcomingChallenge");

// calls for past challenges
vm.getAllResults(parameters, vm.pastList, "nonePastChallenge", 'past');
parameters.url = 'challenges/challenge/past/approved/public';
vm.getAllResults(parameters, vm.pastList, "nonePastChallenge");

vm.scrollUp = function() {
angular.element($window).bind('scroll', function() {
Expand Down