Skip to content

feat(app): implement navbar as directive #1042

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
merged 1 commit into from
Jul 8, 2015
Merged

feat(app): implement navbar as directive #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/templates/client/app/account(auth)/login/login(html).html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div ng-include="'components/navbar/navbar.html'"></div>
<navbar></navbar>

<div class="container">
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/app/account(auth)/login/login(jade).jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
div(ng-include='"components/navbar/navbar.html"')
navbar
.container
.row
.col-sm-12
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/app/account(auth)/settings/settings(html).html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div ng-include="'components/navbar/navbar.html'"></div>
<navbar></navbar>

<div class="container">
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/app/account(auth)/settings/settings(jade).jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
div(ng-include='"components/navbar/navbar.html"')
navbar
.container
.row
.col-sm-12
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/app/account(auth)/signup/signup(html).html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div ng-include="'components/navbar/navbar.html'"></div>
<navbar></navbar>

<div class="container">
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/app/account(auth)/signup/signup(jade).jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
div(ng-include='"components/navbar/navbar.html"')
navbar
.container
.row
.col-sm-12
Expand Down
2 changes: 1 addition & 1 deletion app/templates/client/app/admin(auth)/admin(html).html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div ng-include="'components/navbar/navbar.html'"></div>
<navbar></navbar>

<div class="container">
<p>The delete user and user index api routes are restricted to users with the 'admin' role.</p>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/client/app/admin(auth)/admin(jade).jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
div(ng-include='"components/navbar/navbar.html"')
navbar
.container
p
| The delete user and user index api routes are restricted to users with the 'admin' role.
Expand All @@ -8,4 +8,4 @@ div(ng-include='"components/navbar/navbar.html"')
br
span.text-muted {{user.email}}
a.trash(ng-click='delete(user)')
span.glyphicon.glyphicon-trash.pull-right
span.glyphicon.glyphicon-trash.pull-right
2 changes: 1 addition & 1 deletion app/templates/client/app/main/main(html).html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div ng-include="'components/navbar/navbar.html'"></div>
<navbar></navbar>

<header class="hero-unit" id="banner">
<div class="container">
Expand Down
4 changes: 2 additions & 2 deletions app/templates/client/app/main/main(jade).jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
div(ng-include='"components/navbar/navbar.html"')
navbar

header#banner.hero-unit
.container
Expand Down Expand Up @@ -30,4 +30,4 @@ footer.footer
= ' | '
a(href='https://twitter.com/tyhenkel') @tyhenkel
= ' | '
a(href='https://github.com/DaftMonk/generator-angular-fullstack/issues?state=open') Issues
a(href='https://github.com/DaftMonk/generator-angular-fullstack/issues?state=open') Issues
7 changes: 7 additions & 0 deletions app/templates/client/components/navbar/navbar.directive(coffee).coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
'use strict'

angular.module '<%= scriptAppName %>'
.directive 'navbar', ->
templateUrl: 'components/navbar/navbar.html'
restrict: 'E'
controller: 'NavbarCtrl'
10 changes: 10 additions & 0 deletions app/templates/client/components/navbar/navbar.directive(js).js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
'use strict';

angular.module('<%= scriptAppName %>')
.directive('navbar', function () {
return {
templateUrl: 'components/navbar/navbar.html',
restrict: 'E',
controller: 'NavbarCtrl'
};
});
1 change: 1 addition & 0 deletions test/test-file-creation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ describe('angular-fullstack generator', function () {
'client/assets/images/yeoman.png',
'client/components/navbar/navbar.' + markup,
'client/components/navbar/navbar.controller.' + script,
'client/components/navbar/navbar.directive.' + script,
'server/.jshintrc',
'server/.jshintrc-spec',
'server/app.js',
Expand Down