Skip to content

Commit aa19687

Browse files
Josh-HebbJosh-Hebb
committed
''
1 parent 7f36094 commit aa19687

File tree

109 files changed

+36317
-19486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+36317
-19486
lines changed

‎bower.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
{
22
"name": "angular-contentful-starter",
33
"dependencies": {
4-
"angular": "~1.3.15",
5-
"angular-ui-router": "~0.2.13",
6-
"angular-contentful": "^2.2.0"
4+
"angular": "1.6.7",
5+
"angular-contentful": "^2.2.0",
6+
"angular-sanitize": "^1.6.8",
7+
"bootstrap": "^4.0.0",
8+
"angular-ui-router": "^1.0.13",
9+
"font-awesome": "^4.7.0",
10+
"jquery": "^3.3.1",
11+
"ngmap": "^1.18.4",
12+
"tether": "^1.4.3",
13+
"angular-marked": "^1.2.2",
14+
"marked": "^0.3.12"
715
},
816
"devDependencies": {}
917
}

‎gulpfile.js‎

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@ var gulp = require("gulp"),
66
templatecache = require("gulp-angular-templatecache"),
77
usemin = require("gulp-usemin"),
88
uglify = require("gulp-uglify"),
9+
concat = require('gulp-concat'),
910
minifyCss = require("gulp-minify-css"),
1011
minifyHtml = require("gulp-minify-html"),
1112
replace = require("gulp-replace"),
1213
run = require("gulp-run"),
1314
connect = require("gulp-connect");
15+
sass = require('gulp-sass');
16+
1417

1518
var pkg = require("./package.json"),
1619

20+
// CSS page name
21+
cssFile = "index.css",
22+
1723
// index page path
1824
root = ".",
1925

@@ -28,10 +34,11 @@ var banner = [
2834
" * License: " + pkg.license,
2935
" */\n\n"
3036
].join("\n"),
37+
3138
paths = {
3239
"tmpl": [root+"/src/**/*.html"],
3340
"js": ["!**/*.tmp.js", "!**/*.test.js", "!"+root+"/src/**/*.min.js", root+"/src/**/*.js"],
34-
"css": ["!"+root+"/src/**/*.min.css", root+"/src/**/*.css"]
41+
"css": ["!"+root+"/src/**/*.min.scss", root+"/src/**/*.scss"]
3542
},
3643
ngModule = pkg.name;
3744

@@ -47,27 +54,31 @@ pages.forEach(function(page) {
4754
});
4855

4956
gulp.task("build", sync.sync([
50-
// stage 1: build resource
57+
// Build resources
5158
["css", "js", "tmpl", "bower.json"],
5259

53-
// stage 2: build pages sources
60+
// Build page sources
5461
pages.map(function(page) { return page + ".src.html"; }),
5562

56-
// stage 3: build release pages
63+
// Build release pages
5764
pages.map(function(page) { return page + ".html"; })
5865
]));
5966

60-
gulp.task("default", sync.sync([
61-
["build"],
62-
["watch"]
63-
]));
67+
// Default Task - Build & Watch
68+
gulp.task("default", sync.sync([ ["build"], ["watch"] ]));
6469

70+
// gulp dev (watch)
6571
gulp.task("dev", ["watch"]);
6672

73+
// gulp up (update npm & bower)
6774
gulp.task("up", ["update-npm", "update-bower"]);
6875

76+
// gulp CSS (compile sass, concat into single file and reload)
6977
gulp.task("css", function(done) {
7078
gulp.src(paths.css)
79+
.pipe(sass())
80+
.pipe(concat(cssFile))
81+
.pipe(gulp.dest(root+"/src/"))
7182
.pipe(connect.reload())
7283
.on("end", done);
7384
});
@@ -78,6 +89,8 @@ gulp.task("js", function(done) {
7889
.on("end", done);
7990
});
8091

92+
// gulp tmpl
93+
// All angular templates get put into a template cache
8194
gulp.task("tmpl", function(done) {
8295
gulp.src(paths.tmpl)
8396
.pipe(templatecache("angular-template.tmp.js", {
@@ -89,6 +102,29 @@ gulp.task("tmpl", function(done) {
89102
.on("end", done);
90103
});
91104

105+
gulp.task("watch", function() { ["tmpl", "css", "js"]
106+
.concat(pages.map(function(page) { return page + ".src.html"; }))
107+
.forEach(function(i) {
108+
gulp.watch(paths[i], function(i) {
109+
return function() {
110+
gulp.src(paths['css'])
111+
.pipe(sass())
112+
.pipe(concat(cssFile))
113+
.pipe(gulp.dest(root+"/src/"));
114+
115+
gulp.src(paths[i])
116+
.pipe(connect.reload());
117+
};
118+
}(i));
119+
});
120+
connect.server({
121+
root: root,
122+
port: 9000,
123+
livereload: true
124+
});
125+
});
126+
127+
92128
// generate task of pages
93129
pages.forEach(function(page) {
94130
(function(page) {
@@ -148,25 +184,7 @@ gulp.task("update-bower", function(done) {
148184
for (i in bowerjson.dependencies) {
149185
deps.push(i);
150186
}
187+
151188
cmd = "bower install --save --force-latest " + deps.join(" ");
152189
run(cmd).exec().on("end", done);
153-
});
154-
155-
gulp.task("watch", function() {
156-
["tmpl", "css", "js"]
157-
.concat(pages.map(function(page) { return page + ".src.html"; }))
158-
.forEach(function(i) {
159-
gulp.watch(paths[i], function(i) {
160-
return function() {
161-
gulp.src(paths[i])
162-
.pipe(connect.reload());
163-
};
164-
}(i));
165-
});
166-
167-
connect.server({
168-
root: root,
169-
port: 9000,
170-
livereload: true
171-
});
172-
});
190+
});

‎img/01.jpg‎

-535 KB
Binary file not shown.

‎img/02.jpg‎

-246 KB
Binary file not shown.

‎img/03.jpg‎

-522 KB
Binary file not shown.

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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><nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top"><div class=container><a class=navbar-brand href=#>AngularJS / Contentful Starter Kit</a> <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><div class="collapse navbar-collapse" id=navbarResponsive><ul class="navbar-nav ml-auto"><li class="nav-item active" ui-sref=index><a class=nav-link href=#>Home <span class=sr-only>(current)</span></a></li><li class=nav-item><a class=nav-link ui-sref=info>Project Information</a></li><li class=nav-item><a class=nav-link ui-sref=events>Events</a></li></ul></div></div></nav><header><div id=carouselExampleIndicators class="carousel slide" data-ride=carousel contentful-entries="'content_type=banner'"><div class=carousel-inner role=listbox><div class=carousel-item ng-repeat="banner in $contentfulEntries.items" 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-caption d-none d-md-block"><h3>{{ banner.fields.title }}</h3><p>{{ banner.fields.bannerText }}</p></div></div></div><a class=carousel-control-prev href=#carouselExampleIndicators role=button data-slide=prev ng-if="$contentfulEntries.items && $contentfulEntries.items.length > 1"><span class=carousel-control-prev-icon aria-hidden=true></span> <span class=sr-only>Previous</span></a> <a class=carousel-control-next href=#carouselExampleIndicators role=button data-slide=next ng-if="$contentfulEntries.items && $contentfulEntries.items.length > 1"><span class=carousel-control-next-icon aria-hidden=true></span> <span class=sr-only>Next</span></a></div></header><div ui-view></div><footer class="py-5 bg-dark"><div class=container><p class=text-white>AngularJS, Contentful & Bootstrap 4 Starter Kit. Thrown together by Josh Hebb.</p></div></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></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>

‎index.src.html‎

Lines changed: 51 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,65 @@
11
<!doctype html>
22
<html ng-app="angular-contentful-starter">
3-
<head>
4-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>angular-contentful-starter</title>
83

9-
<!-- build:css public/index.min.css -->
10-
<link rel="stylesheet" href="lib/bootstrap/dist/css/bootstrap.min.css" >
11-
<link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" >
12-
<link rel="stylesheet" href="src/index.css">
4+
<head>
5+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
8+
<title>angular-contentful-starter</title>
139

14-
<!-- endbuild -->
10+
<!-- build:css public/index.min.css -->
11+
<link rel="stylesheet" href="lib/bootstrap/dist/css/bootstrap.min.css">
12+
<link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css">
13+
<link rel="stylesheet" href="src/index.css">
14+
<!-- endbuild -->
1515

16-
<!-- Custom fonts for this template -->
17-
<link href="https://fonts.googleapis.com/css?family=Catamaran:100,200,300,400,500,600,700,800,900" rel="stylesheet">
18-
<link href="https://fonts.googleapis.com/css?family=Lato:100,100i,300,300i,400,400i,700,700i,900,900i" rel="stylesheet">
16+
<!-- Custom fonts for this template -->
17+
<link href="https://fonts.googleapis.com/css?family=Catamaran:100,200,300,400,500,600,700,800,900" rel="stylesheet">
18+
<link href="https://fonts.googleapis.com/css?family=Lato:100,100i,300,300i,400,400i,700,700i,900,900i" rel="stylesheet">
19+
</head>
1920

20-
</head>
21-
22-
<body>
23-
<!-- Navigation -->
24-
<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
25-
<div class="container">
26-
<a class="navbar-brand" href="#">AngularJS / Contentful Starter Kit</a>
27-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive"
28-
aria-expanded="false" aria-label="Toggle navigation">
29-
<span class="navbar-toggler-icon"></span>
30-
</button>
31-
<div class="collapse navbar-collapse" id="navbarResponsive">
32-
<ul class="navbar-nav ml-auto">
33-
<li class="nav-item active" ui-sref="index">
34-
<a class="nav-link" href="#">Home
35-
<span class="sr-only">(current)</span>
36-
</a>
37-
</li>
38-
<li class="nav-item">
39-
<a class="nav-link" ui-sref="info">Project Information</a>
40-
</li>
41-
<li class="nav-item">
42-
<a class="nav-link" ui-sref="products">Products</a>
43-
</li>
44-
</ul>
45-
</div>
46-
</div>
47-
</nav>
48-
49-
<header>
50-
<div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel" contentful-entries="'content_type=banner'">
51-
<div class="carousel-inner" role="listbox">
52-
<div class="carousel-item" ng-repeat="banner in $contentfulEntries.items" 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 + ')' }">
53-
54-
<div class="carousel-caption d-none d-md-block">
55-
<h3>{{ banner.fields.title }}</h3>
56-
<p>{{ banner.fields.bannerText }}</p>
57-
</div>
58-
</div>
59-
</div>
60-
61-
<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev" ng-if="$contentfulEntries.items && $contentfulEntries.items.length > 1">
62-
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
63-
<span class="sr-only">Previous</span>
64-
</a>
65-
<a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next" ng-if="$contentfulEntries.items && $contentfulEntries.items.length > 1">
66-
<span class="carousel-control-next-icon" aria-hidden="true"></span>
67-
<span class="sr-only">Next</span>
68-
</a>
69-
</div>
70-
</header>
21+
<body>
22+
<!-- Main Navigation (views/navigation.html) -->
23+
<navigation></navigation>
7124

72-
<div ui-view></div>
25+
<!-- Carousel (views/carousel.html) -->
26+
<carousel></carousel>
27+
28+
<!-- Render the Angular views. -->
29+
<div ui-view></div>
30+
31+
<!-- Footer Section (views/footer.html) -->
32+
<footer-section></footer-section>
7333

74-
<!-- Footer -->
75-
<footer class="py-5 bg-dark">
76-
<div class="container">
77-
<p class="text-white">AngularJS, Contentful & Bootstrap 4 Starter Kit. Thrown together by Josh Hebb.</p>
78-
</div>
79-
</footer>
34+
<!-- Third Party Scripts (Google Maps) -->
35+
<script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAYUxfnjxus1rXx-ntGcxqWD1BPRZrI1IM" type="text/javascript"></script>
8036

81-
<!-- Third Party Scripts (Google Maps) -->
82-
<script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAYUxfnjxus1rXx-ntGcxqWD1BPRZrI1IM" type="text/javascript"></script>
37+
<!-- build:js public/index.min.js -->
38+
<script src="lib/angular/angular.js"></script>
39+
<script src="src/config/app.js"></script>
40+
<script src="src/directives/carousel.js"></script>
41+
<script src="src/directives/navigation.js"></script>
42+
<script src="src/directives/footer.js"></script>
43+
<script src="src/directives/featured-products.js"></script>
44+
<script src="src/config/route.js"></script>
8345

84-
<!-- build:js public/index.min.js -->
85-
<script src="lib/angular/angular.js"></script>
86-
<script src="lib/angular-ui-router/release/angular-ui-router.js"></script>
87-
<script src="lib/angular-contentful/dist/angular-contentful.min.js"></script>
88-
<script src="lib/ngmap/build/scripts/ng-map.min.js"></script>
46+
<!-- Core Angular Libraries -->
47+
<script src="lib/angular-ui-router/release/angular-ui-router.js"></script>
48+
<script src="lib/angular-contentful/dist/angular-contentful.min.js"></script>
49+
<script src="lib/ngmap/build/scripts/ng-map.min.js"></script>
8950

90-
<script src="lib/angular-sanitize/angular-sanitize.js"></script>
91-
<script src="lib/showdown/compressed/showdown.js"></script>
92-
<script src="lib/angular-markdown-directive/markdown.js"></script>
93-
51+
<!-- Marked Libraries -->
52+
<script src="lib/angular-sanitize/angular-sanitize.js"></script>
53+
<script src="lib/marked/lib/marked.js"></script>
54+
<script src="lib/angular-marked/dist/angular-marked.js"></script>
9455

95-
<script src="lib/jquery/dist/jquery.min.js"></script>
96-
<script src="lib/bootstrap/dist/js/bootstrap.min.js"></script>
97-
<script src="lib/tether/dist/js/tether.min.js"></script>
56+
<!-- Bootstrap Scripts -->
57+
<script src="lib/jquery/dist/jquery.min.js"></script>
58+
<script src="lib/bootstrap/dist/js/bootstrap.min.js"></script>
59+
<script src="lib/tether/dist/js/tether.min.js"></script>
9860

61+
<!-- <script src="src/angular-template.tmp.js"></script> -->
62+
<!-- endbuild -->
63+
</body>
9964

100-
<script src="src/config/app.js"></script>
101-
<script src="src/config/route.js"></script>
102-
103-
<!--
104-
<script src="src/angular-template.tmp.js"></script>
105-
-->
106-
<!-- endbuild -->
107-
</body>
108-
</html>
65+
</html>

‎lib/angular-markdown-directive/.bower.json‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎lib/angular-markdown-directive/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎lib/angular-markdown-directive/bower.json‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)