Skip to content

Commit 878ebb1

Browse files
Merge pull request #2 from tanmoythander/v2
Gulp v4 (Stable)
2 parents 6f65dc1 + d640ebf commit 878ebb1

19 files changed

+25
-9972
lines changed

components/controllers/list.controller.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
$scope.libs = [
1111
'NodeJS',
1212
'AngularJS',
13-
'GulpJS',
13+
'GulpJS v4.0.2',
1414
'ESlint',
15-
'jQuery',
15+
'jQuery v3.4',
1616
'lodash',
17-
'Bootstrap 4.1',
18-
'font-awesome',
17+
'Bootstrap v4.1',
18+
'font-awesome v4.7',
1919
'owl-carousel-2'
2020
];
2121
}

components/directives/carousel.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<div id="owl-carousel-1" class="owl-carousel owl-theme">
22
<div class="item">
3-
<img src="images/nodejs.jpg" alt="NodeJS">
3+
<img src="images/angularJS.png" alt="AngularJS">
44
</div>
55
<div class="item">
6-
<img src="images/angularjs.jpg" alt="AngularJS">
6+
<img src="images/gulpjs.png" alt="GulpJS">
77
</div>
88
<div class="item">
9-
<img height="380px" src="images/bootstrap-stack.png" alt="Bootstrap">
9+
<img src="images/nodejs.jpg" alt="NodeJS">
1010
</div>
1111
<div class="item">
12-
<img src="images/gulpjs.jpg" alt="GulpJS">
12+
<img src="images/font-awesome.jpg" alt="FontAwesome">
1313
</div>
1414
<div class="item">
15-
<img src="images/font-awesome.jpg" alt="FontAwesome">
15+
<img height="380px" src="images/bootstrap-wallpaper.png" alt="Bootstrap">
1616
</div>
1717
<div class="item">
1818
<img src="images/lodash.jpg" alt="Lodash">
-19.7 KB
Binary file not shown.

fonts/glyphicons-halflings-regular.svg

-288
This file was deleted.
-44.3 KB
Binary file not shown.
-22.9 KB
Binary file not shown.

gulpfile.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function cleanBuild(done) {
7777
// fonts
7878
function fonts() {
7979
var fonts = size();
80-
return gulp.src('./fonts/**/*.{ttf,woff,woff2,eof,eot,svg}')
80+
return gulp.src('./fonts/*.{ttf,woff,woff2,eof,eot,svg}')
8181
.pipe(changed('./_build/fonts'))
8282
.pipe(gulp.dest('./_build/fonts'))
8383
.pipe(fonts)
@@ -92,9 +92,11 @@ function fonts() {
9292
// images
9393
function images() {
9494
var images = size();
95-
return gulp.src('./images/**/*')
95+
return gulp.src('./images/*.{gif,jpg,jpeg,png}')
9696
.pipe(changed('./_build/images'))
97-
.pipe(imagemin())
97+
.pipe(imagemin({
98+
verbose: true
99+
}))
98100
.pipe(gulp.dest('./_build/images'))
99101
.pipe(images)
100102
.pipe(notify({
@@ -259,8 +261,8 @@ function watch() {
259261
exports.default = gulp.parallel(watch, syncSource);
260262
exports.serveSource = syncSource;
261263
exports.build = gulp.series(lintBuild, cleanBuild,
262-
images, fonts, cacheTemplate, minCssJs,
264+
cacheTemplate, minCssJs, images, fonts,
263265
gulp.parallel(buildCssSize, buildJsSize, buildSize));
264266
exports.serveBuild = gulp.series(lintBuild, cleanBuild,
265-
images, fonts, cacheTemplate, minCssJs,
267+
cacheTemplate, minCssJs, images, fonts,
266268
gulp.parallel(buildCssSize, buildJsSize, buildSize, syncBuild));

images/AngularJS.png

97.2 KB
Loading

images/angularJS.jpg

-50.7 KB
Binary file not shown.

images/bootstrap-stack.png

-50.9 KB
Binary file not shown.

images/bootstrap-wallpaper.png

71.1 KB
Loading

images/gulpjs.jpg

-30.3 KB
Binary file not shown.

images/gulpjs.png

28.3 KB
Loading

index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<link rel="stylesheet" type="text/css" href="node_modules/bootstrap/dist/css/bootstrap.css" />
2424
<link rel="stylesheet" type="text/css" href="node_modules/bootstrap/dist/css/bootstrap-grid.css" />
2525
<link rel="stylesheet" type="text/css" href="node_modules/bootstrap/dist/css/bootstrap-reboot.css" />
26-
<link rel="stylesheet" type="text/css" href="styles/font-awesome.css" />
26+
<link rel="stylesheet" type="text/css" href="node_modules/font-awesome/css/font-awesome.css" />
2727
<link rel="stylesheet" type="text/css" href="styles/owl.carousel.css" />
2828
<link rel="stylesheet" type="text/css" href="styles/owl.theme.default.css" />
2929
<!-- Global CSS -->

package-lock.json

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "boilerplate",
3-
"version": "2.0.0",
3+
"version": "2.0.1",
44
"license": "MIT",
55
"description": "Front-end application source boilerplate",
66
"main": "app/app.js",
@@ -37,6 +37,7 @@
3737
"angular": "^1.7.5",
3838
"angular-resource": "~1.5.8",
3939
"bootstrap": "^4.1.3",
40+
"font-awesome": "^4.7.0",
4041
"jquery": "^3.4.1",
4142
"ngstorage": "^0.3.11",
4243
"popper.js": "^1.14.6",

0 commit comments

Comments
 (0)