From 050d694ed130aaf2953c9bdbcf9fc66d32720d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Hermida?= Date: Thu, 22 Nov 2018 17:52:35 +0100 Subject: [PATCH] Refactor tg-nav urls --- app/coffee/modules/base/navurls.coffee | 11 +++++++++-- .../featured-projects/featured-projects.jade | 4 ++-- .../discover/components/highlighted/highlighted.jade | 4 ++-- .../discover/discover-search/discover-search.jade | 4 ++-- app/modules/home/projects/home-project-list.jade | 6 +++--- .../dropdown-project-list/dropdown-project-list.jade | 2 +- app/modules/profile/profile-favs/items/project.jade | 4 ++-- .../profile/profile-projects/profile-projects.jade | 4 ++-- app/modules/projects/listing/projects-listing.jade | 4 ++-- app/modules/projects/project/project.jade | 2 +- 10 files changed, 26 insertions(+), 19 deletions(-) diff --git a/app/coffee/modules/base/navurls.coffee b/app/coffee/modules/base/navurls.coffee index a8a94c6d..e21b0464 100644 --- a/app/coffee/modules/base/navurls.coffee +++ b/app/coffee/modules/base/navurls.coffee @@ -54,7 +54,7 @@ module.service("$tgNavUrls", NavigationUrlsService) ## Navigation Urls Directive ############################################################################# -NavigationUrlsDirective = ($navurls, $auth, $q, $location, lightboxService) -> +NavigationUrlsDirective = ($navurls, $auth, $q, $location, lightboxService, tgSections) -> # Example: # link(tg-nav="project-backlog:project='sss',") @@ -118,7 +118,13 @@ NavigationUrlsDirective = ($navurls, $auth, $q, $location, lightboxService) -> user = $auth.getUser() options.user = user.username if user + if options['section'] + sections = tgSections.list() + section = _.find(sections, {"id": options['section']}) + name = "#{name}-#{section.path}" + url = $navurls.resolve(name) + fullUrl = $navurls.formatUrl(url, options) if $attrs.tgNavGetParams @@ -159,4 +165,5 @@ NavigationUrlsDirective = ($navurls, $auth, $q, $location, lightboxService) -> return {link: link} -module.directive("tgNav", ["$tgNavUrls", "$tgAuth", "$q", "$tgLocation", "lightboxService", NavigationUrlsDirective]) +module.directive("tgNav", + ["$tgNavUrls", "$tgAuth", "$q", "$tgLocation", "lightboxService", "$tgSections", NavigationUrlsDirective]) diff --git a/app/modules/discover/components/featured-projects/featured-projects.jade b/app/modules/discover/components/featured-projects/featured-projects.jade index f2450bd2..b41855f0 100644 --- a/app/modules/discover/components/featured-projects/featured-projects.jade +++ b/app/modules/discover/components/featured-projects/featured-projects.jade @@ -13,7 +13,7 @@ .project-card-header a.project-card-logo( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{::project.get('name')}}" ) img( @@ -23,7 +23,7 @@ h2.project-card-name a( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{::project.get('name')}}" ) {{::project.get('name')}} tg-svg.look-for-people( diff --git a/app/modules/discover/components/highlighted/highlighted.jade b/app/modules/discover/components/highlighted/highlighted.jade index 08cd39a0..fd611389 100644 --- a/app/modules/discover/components/highlighted/highlighted.jade +++ b/app/modules/discover/components/highlighted/highlighted.jade @@ -9,7 +9,7 @@ ) a.project-logo( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{::project.get('name')}}" ) img( @@ -21,7 +21,7 @@ h2.project-title a( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{::project.get('name')}}" ) {{::project.get('name')}} tg-svg.look-for-people( diff --git a/app/modules/discover/discover-search/discover-search.jade b/app/modules/discover/discover-search/discover-search.jade index e15ce454..b7d16b49 100644 --- a/app/modules/discover/discover-search/discover-search.jade +++ b/app/modules/discover/discover-search/discover-search.jade @@ -29,7 +29,7 @@ div(tg-discover-search) .list-itemtype-project-left a.list-itemtype-project-image( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{ ::project.get('name') }}" ) img( @@ -40,7 +40,7 @@ div(tg-discover-search) h2 a( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{ ::project.get('name') }}" ) {{project.get('name')}} tg-svg.look-for-people( diff --git a/app/modules/home/projects/home-project-list.jade b/app/modules/home/projects/home-project-list.jade index e77b2191..f14d58d2 100644 --- a/app/modules/home/projects/home-project-list.jade +++ b/app/modules/home/projects/home-project-list.jade @@ -7,12 +7,12 @@ section.home-project-list(ng-if="vm.projects.size") ) .project-card-inner( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" ) .project-card-header a.project-card-logo( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{::project.get('name')}}" ) img( @@ -22,7 +22,7 @@ section.home-project-list(ng-if="vm.projects.size") h3.project-card-name a.project-title( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{::project.get('name')}}" ) {{::project.get('name')}} diff --git a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade index 35f49617..5a8b5f70 100644 --- a/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade +++ b/app/modules/navigation-bar/dropdown-project-list/dropdown-project-list.jade @@ -11,7 +11,7 @@ div.navbar-dropdown.dropdown-project-list li(tg-repeat="project in vm.projects track by project.get('id')") a( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" ng-class="{'blocked-project': project.get('blocked_code')}" ) span {{::project.get("name")}} diff --git a/app/modules/profile/profile-favs/items/project.jade b/app/modules/profile/profile-favs/items/project.jade index e951ad07..a5507f4b 100644 --- a/app/modules/profile/profile-favs/items/project.jade +++ b/app/modules/profile/profile-favs/items/project.jade @@ -3,7 +3,7 @@ .list-itemtype-project-data-wrapper a.list-itemtype-project-image( href="#" - tg-nav="project:project=vm.item.get('slug')" + tg-nav="project:project=vm.item.get('slug'),section=vm.item.get('my_homepage')" title="{{ ::vm.item.get('name') }}" ) img( @@ -15,7 +15,7 @@ h2 a.list-itemtype-project-name( href="#" - tg-nav="project:project=vm.item.get('slug')" + tg-nav="project:project=vm.item.get('slug'),section=vm.item.get('my_homepage')" title="{{ ::vm.item.get('name') }}" ) {{ ::vm.item.get('name') }} diff --git a/app/modules/profile/profile-projects/profile-projects.jade b/app/modules/profile/profile-projects/profile-projects.jade index ec87a909..773ae0c7 100644 --- a/app/modules/profile/profile-projects/profile-projects.jade +++ b/app/modules/profile/profile-projects/profile-projects.jade @@ -18,7 +18,7 @@ section.profile-projects .project-list-single-title-wrapper a.list-itemtype-project-image( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{ ::project.get('name') }}" ) img( @@ -29,7 +29,7 @@ section.profile-projects h2 a.project-title( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{ ::project.get('name') }}" ) {{::project.get('name')}} diff --git a/app/modules/projects/listing/projects-listing.jade b/app/modules/projects/listing/projects-listing.jade index 4817158d..8153da20 100644 --- a/app/modules/projects/listing/projects-listing.jade +++ b/app/modules/projects/listing/projects-listing.jade @@ -22,7 +22,7 @@ .list-itemtype-project-data-wrapper a.list-itemtype-project-image( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{ ::project.get('name') }}" ) img( @@ -33,7 +33,7 @@ h2 a.project-title( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{ ::project.get('name') }}" ) {{project.get('name')}} tg-svg( diff --git a/app/modules/projects/project/project.jade b/app/modules/projects/project/project.jade index b4ded523..1e5c5964 100644 --- a/app/modules/projects/project/project.jade +++ b/app/modules/projects/project/project.jade @@ -4,7 +4,7 @@ div.wrapper section.single-project-intro .project-logo( href="#" - tg-nav="project:project=project.get('slug')" + tg-nav="project:project=project.get('slug'),section=project.get('my_homepage')" title="{{::project.get('name')}}" ) img(