Merge pull request #1042 from kingcody/feature/navbar-directive

Awk34 · Awk34 · commit cc841e1f7c7b · 2015-07-08T01:43:48.000-04:00
feat(app): implement navbar as directive
diff --git a/app/templates/client/app/account(auth)/login/login(html).html b/app/templates/client/app/account(auth)/login/login(html).html
@@ -1,4 +1,4 @@
-<div ng-include="'components/navbar/navbar.html'"></div>
+<navbar></navbar>
 
 <div class="container">
   <div class="row">
diff --git a/app/templates/client/app/account(auth)/login/login(jade).jade b/app/templates/client/app/account(auth)/login/login(jade).jade
@@ -1,4 +1,4 @@
-div(ng-include='"components/navbar/navbar.html"')
+navbar
 .container
   .row
     .col-sm-12
diff --git a/app/templates/client/app/account(auth)/settings/settings(html).html b/app/templates/client/app/account(auth)/settings/settings(html).html
@@ -1,4 +1,4 @@
-<div ng-include="'components/navbar/navbar.html'"></div>
+<navbar></navbar>
 
 <div class="container">
   <div class="row">
diff --git a/app/templates/client/app/account(auth)/settings/settings(jade).jade b/app/templates/client/app/account(auth)/settings/settings(jade).jade
@@ -1,4 +1,4 @@
-div(ng-include='"components/navbar/navbar.html"')
+navbar
 .container
   .row
     .col-sm-12
diff --git a/app/templates/client/app/account(auth)/signup/signup(html).html b/app/templates/client/app/account(auth)/signup/signup(html).html
@@ -1,4 +1,4 @@
-<div ng-include="'components/navbar/navbar.html'"></div>
+<navbar></navbar>
 
 <div class="container">
   <div class="row">
diff --git a/app/templates/client/app/account(auth)/signup/signup(jade).jade b/app/templates/client/app/account(auth)/signup/signup(jade).jade
@@ -1,4 +1,4 @@
-div(ng-include='"components/navbar/navbar.html"')
+navbar
 .container
   .row
     .col-sm-12
diff --git a/app/templates/client/app/admin(auth)/admin(html).html b/app/templates/client/app/admin(auth)/admin(html).html
@@ -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>
diff --git a/app/templates/client/app/admin(auth)/admin(jade).jade b/app/templates/client/app/admin(auth)/admin(jade).jade
@@ -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.
@@ -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
diff --git a/app/templates/client/app/main/main(html).html b/app/templates/client/app/main/main(html).html
@@ -1,4 +1,4 @@
-<div ng-include="'components/navbar/navbar.html'"></div>
+<navbar></navbar>
 
 <header class="hero-unit" id="banner">
   <div class="container">
diff --git a/app/templates/client/app/main/main(jade).jade b/app/templates/client/app/main/main(jade).jade
@@ -1,4 +1,4 @@
-div(ng-include='"components/navbar/navbar.html"')
+navbar
 
 header#banner.hero-unit
   .container
@@ -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
diff --git a/app/templates/client/components/navbar/navbar.directive(coffee).coffee b/app/templates/client/components/navbar/navbar.directive(coffee).coffee
@@ -0,0 +1,7 @@
+'use strict'
+
+angular.module '<%= scriptAppName %>'
+.directive 'navbar', ->
+  templateUrl: 'components/navbar/navbar.html'
+  restrict: 'E'
+  controller: 'NavbarCtrl'
diff --git a/app/templates/client/components/navbar/navbar.directive(js).js b/app/templates/client/components/navbar/navbar.directive(js).js
@@ -0,0 +1,10 @@
+'use strict';
+
+angular.module('<%= scriptAppName %>')
+  .directive('navbar', function () {
+    return {
+      templateUrl: 'components/navbar/navbar.html',
+      restrict: 'E',
+      controller: 'NavbarCtrl'
+    };
+  });
diff --git a/test/test-file-creation.js b/test/test-file-creation.js
@@ -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',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div ng-include="'components/navbar/navbar.html'"></div>`
	`1`	`+<navbar></navbar>`
`2`	`2`
`3`	`3`	`<div class="container">`
`4`	`4`	`<div class="row">`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-div(ng-include='"components/navbar/navbar.html"')`
	`1`	`+navbar`
`2`	`2`	`.container`
`3`	`3`	`.row`
`4`	`4`	`.col-sm-12`