Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Nav update #1181

Merged
merged 10 commits into from
Apr 24, 2017
Merged

Nav update #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bbce087
added getFilterFromUrl function to reactProp
chq-matteo Apr 8, 2017
03258ee
added locationChange watcher
chq-matteo Apr 8, 2017
d72d417
fixed undefined challengeFilter
chq-matteo Apr 8, 2017
feaf93f
Update listings.controller.js
chq-matteo Apr 8, 2017
898be1b
listen for location hash update
chq-matteo Apr 8, 2017
8fa4859
delegate the change to a new method
chq-matteo Apr 9, 2017
86e23d0
moved watcher to controller
chq-matteo Apr 9, 2017
f601843
fixed semicolon issue
chq-matteo Apr 9, 2017
93eee04
Merge pull request #1176 from appirio-tech/chq-patch-1
tladendo Apr 10, 2017
9ca6d96
Updated Compete section of top nav menu
birdofpreyru Apr 23, 2017
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
13 changes: 12 additions & 1 deletion app/listings/listings.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ import { loadUser } from '../services/userv3.service.js'
activate()

function activate() {

// listen for location hash update
$scope.$on('$locationChangeSuccess', function(event) {
if($scope.challengeFilter != null) {
$scope.challengeFilter.updateFilter($location.hash())
}
})
$scope.myChallenges = []
$scope.reactProps = {
config: CONSTANTS,
Expand All @@ -33,6 +38,9 @@ import { loadUser } from '../services/userv3.service.js'
myChallenges: [],
onSaveFilterToUrl: function(filter) {
$location.hash(filter)
},
setChallengeFilter: function(component) {
$scope.challengeFilter = component
}
}
logger.debug('Calling ListingsController activate()')
Expand Down Expand Up @@ -91,6 +99,9 @@ import { loadUser } from '../services/userv3.service.js'
myChallenges: vm.myChallenges,
onSaveFilterToUrl: function(filter) {
$location.hash(filter)
},
setChallengeFilter: function(component) {
$scope.challengeFilter = component
}
}

Expand Down
3 changes: 0 additions & 3 deletions app/services/nav.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ import angular from 'angular'
service.menuLinks = {
'compete': [
{ 'href': '/challenges/', 'text': 'ALL CHALLENGES', 'icon': require('../../assets/images/nav/rocket.svg') },
{ 'href': '/challenges/#&tracks=design&mode=6&name=All%20Challenges', 'text': 'DESIGN CHALLENGES', 'icon': require('../../assets/images/nav/track-design.svg') },
{ 'href': '/challenges/#&tracks=develop&mode=6&name=All%20Challenges', 'text': 'DEVELOPMENT CHALLENGES', 'icon': require('../../assets/images/nav/track-develop.svg') },
{ 'href': '/challenges/#&tracks=datasci&mode=6&name=All%20Challenges', 'text': 'DATA SCIENCE CHALLENGES', 'icon': require('../../assets/images/nav/track-data.svg') },
{ 'href': CONSTANTS.ARENA_URL, 'text': 'COMPETITIVE PROGRAMMING', 'icon': require('../../assets/images/nav/track-cp.svg'), 'target': '_blank' }
],
'learn': [
Expand Down