Fixed a couple of issues with the directives.

Josh-Hebb · Josh-Hebb · commit 3c6c154ad8fe · 2018-01-30T19:07:25.000-04:00
diff --git a/gulpfile.js b/gulpfile.js
@@ -153,7 +153,6 @@ pages.forEach(function(page) {
 					],
 					js: [
 						replace(/\.version = \"0\";/, ".version = \"" + pkg.version + "\""),
-						uglify(),
 						header(banner)
 					],
 					html: [
diff --git a/index.html b/index.html
@@ -1 +1 @@
-<!doctype html><html ng-app=angular-contentful-starter><head><meta http-equiv=Content-Type content="text/html; charset=utf-8"><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width, initial-scale=1.0"><title>angular-contentful-starter</title><link rel=stylesheet href=public/index.min.css><link href="https://fonts.googleapis.com/css?family=Catamaran:100,200,300,400,500,600,700,800,900" rel=stylesheet><link href="https://fonts.googleapis.com/css?family=Lato:100,100i,300,300i,400,400i,700,700i,900,900i" rel=stylesheet></head><body><navigation></navigation><carousel></carousel><div ui-view></div><footer></footer><script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAYUxfnjxus1rXx-ntGcxqWD1BPRZrI1IM" type=text/javascript></script><script src=public/index.min.js></script></body></html>
+<!doctype html><html ng-app=angular-contentful-starter><head><meta http-equiv=Content-Type content="text/html; charset=utf-8"><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width, initial-scale=1.0"><title>angular-contentful-starter</title><link rel=stylesheet href=public/index.min.css><link href="https://fonts.googleapis.com/css?family=Catamaran:100,200,300,400,500,600,700,800,900" rel=stylesheet><link href="https://fonts.googleapis.com/css?family=Lato:100,100i,300,300i,400,400i,700,700i,900,900i" rel=stylesheet></head><body><navigation></navigation><carousel></carousel><div ui-view></div><footer-section></footer-section><script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAYUxfnjxus1rXx-ntGcxqWD1BPRZrI1IM" type=text/javascript></script><script src=public/index.min.js></script></body></html>
diff --git a/index.src.html b/index.src.html
@@ -21,9 +21,9 @@
 <body>
 	<!-- Main Navigation (views/navigation.html) -->
 	<navigation></navigation>
-
+ 
 	<!-- Carousel (views/carousel.html) -->
-	<carousel></carousel>
+	<carousel></carousel> 
  
 	<!-- Render the Angular views. -->
 	<div ui-view></div>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-contentful-starter",
-  "version": "0.2.0",
+  "version": "1.0.0",
   "description": "AngularJS Contentful Starter Kit",
   "devDependencies": {
     "dateformat": "^1.0.11",
diff --git a/public/index.min.css b/public/index.min.css
diff --git a/public/index.min.js b/public/index.min.js
diff --git a/src/config/route.js b/src/config/route.js
@@ -41,7 +41,6 @@ app.config(["$stateProvider", "$urlRouterProvider", function ($stateProvider, $u
 				contentful
 					.entries('content_type=productLine&fields.urlSlug=' + $stateParams.productLine).then(
 						function (response) {
-							console.log(response);
 							if (response.data && response.data.items && response.data.items.length > 0) {
 								$scope.productLine = response.data.items[0].fields; } } );
 				}
diff --git a/src/directives/carousel.js b/src/directives/carousel.js
@@ -6,14 +6,16 @@
  * 
  */
 app.directive("carousel", function() {
-	return {
-        restrict: 'E',
+	return { 
+		restrict: 'E',
+		replace: true,
         templateUrl: "src/views/carousel.html", 
         controller: function($scope, contentful) {
             contentful
                     // Query Contentful for 'banner' objects.
 					.entries('content_type=banner').then(
 						function (response) {
+							console.log(response.data.items[0]);
 							if (response.data && response.data.items && response.data.items.length > 0) {
 								$scope.banners = response.data.items;
 							}
diff --git a/src/directives/featured-products.js b/src/directives/featured-products.js
@@ -8,6 +8,7 @@
 app.directive("featuredProducts", function() {
 	return {
         restrict: 'E',
+        replace: true,
         scope: {
             products: '='
         },
diff --git a/src/directives/footer.js b/src/directives/footer.js
@@ -8,6 +8,7 @@
 app.directive("footerSection", function() {
 	return {
         restrict: 'E',
+        replace: true,
         templateUrl: "src/views/footer.html"
     }
 });
diff --git a/src/directives/navigation.js b/src/directives/navigation.js
@@ -5,9 +5,10 @@
  * @Author Josh Hebb
  * 
  */
-app.directive("header", function() {
+app.directive("navigation", function() {
 	return {
         restrict: 'E',
-        templateUrl: "src/views/header.html"
+        replace: true,
+        templateUrl: "src/views/navigation.html"
     }
-});
+}); 
diff --git a/src/views/carousel.html b/src/views/carousel.html
@@ -1,15 +1,14 @@
 <!-- Header Carousel -->
 <header>
     <div id="carouselExampleIndicators" class="carousel slide " data-ride="carousel">
-
         <!-- Render the Carousel (data is passed from carousel.js query to contentful) -->
         <div class="carousel-inner" role="listbox">
-            <div class="carousel-item" ng-repeat="banner in banners" ng-class="{ active : $first }" ng-style="{ 'background-image': 'linear-gradient( rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5) ), 
-                    url(' + banner.fields.backgroundImage.fields.file.url + ')' }">
+            <div class="carousel-item" ng-repeat="banner in banners" ng-class="{ active : $first }" 
+                ng-style="{ 'background-image': 'linear-gradient( rgba(0, 0, 0, 0.4), rgba(0, 0, 0, 0.4) ), url(' + banner.fields.backgroundImage.fields.file.url + ')' }">
 
-                <div class="carousel-caption d-none d-md-block">
+                <div class="carousel-caption d-none d-md-block text-left offset-md-1">
                     <h3 class="display-5">{{ banner.fields.title }}</h3>
-                    <p class="col-md-6 offset-md-3">{{ banner.fields.bannerText }}</p>
+                    <h5>{{ banner.fields.bannerText }}</h5>
                 </div>
             </div>
         </div>
diff --git a/src/views/navigation.html b/src/views/navigation.html
@@ -6,12 +6,10 @@
         <a class="navbar-brand" href="#">
             Apple
             <i class="fa fa-apple px-3" aria-hidden="true"></i>
-            <i class="px-3">Demo Website</i>
         </a>
         
         <!-- Mobile Hamburger Icon -->
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive"
-            aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
         

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<!doctype html><html ng-app=angular-contentful-starter><head><meta http-equiv=Content-Type content="text/html; charset=utf-8"><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width, initial-scale=1.0"><title>angular-contentful-starter</title><link rel=stylesheet href=public/index.min.css><link href="https://fonts.googleapis.com/css?family=Catamaran:100,200,300,400,500,600,700,800,900" rel=stylesheet><link href="https://fonts.googleapis.com/css?family=Lato:100,100i,300,300i,400,400i,700,700i,900,900i" rel=stylesheet></head><body><navigation></navigation><carousel></carousel><div ui-view></div><footer></footer><script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAYUxfnjxus1rXx-ntGcxqWD1BPRZrI1IM" type=text/javascript></script><script src=public/index.min.js></script></body></html>
	`1`	+<!doctype html><html ng-app=angular-contentful-starter><head><meta http-equiv=Content-Type content="text/html; charset=utf-8"><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width, initial-scale=1.0"><title>angular-contentful-starter</title><link rel=stylesheet href=public/index.min.css><link href="https://fonts.googleapis.com/css?family=Catamaran:100,200,300,400,500,600,700,800,900" rel=stylesheet><link href="https://fonts.googleapis.com/css?family=Lato:100,100i,300,300i,400,400i,700,700i,900,900i" rel=stylesheet></head><body><navigation></navigation><carousel></carousel><div ui-view></div><footer-section></footer-section><script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAYUxfnjxus1rXx-ntGcxqWD1BPRZrI1IM" type=text/javascript></script><script src=public/index.min.js></script></body></html>
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-contentful-starter",`
`3`		`- "version": "0.2.0",`
	`3`	`+ "version": "1.0.0",`
`4`	`4`	`"description": "AngularJS Contentful Starter Kit",`
`5`	`5`	`"devDependencies": {`
`6`	`6`	`"dateformat": "^1.0.11",`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ app.config(["$stateProvider", "$urlRouterProvider", function ($stateProvider, $u`
`41`	`41`	`contentful`
`42`	`42`	`.entries('content_type=productLine&fields.urlSlug=' + $stateParams.productLine).then(`
`43`	`43`	`function (response) {`
`44`		`- console.log(response);`
`45`	`44`	`if (response.data && response.data.items && response.data.items.length > 0) {`
`46`	`45`	`$scope.productLine = response.data.items[0].fields; } } );`
`47`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`app.directive("footerSection", function() {`
`9`	`9`	`return {`
`10`	`10`	`restrict: 'E',`
	`11`	`+ replace: true,`
`11`	`12`	`templateUrl: "src/views/footer.html"`
`12`	`13`	`}`
`13`	`14`	`});`