From 9b68b15439850c5172234f5f9323f14563a2eeec Mon Sep 17 00:00:00 2001 From: Mathew Henson Date: Fri, 1 Apr 2016 14:23:04 +0100 Subject: [PATCH] Updated admin gulp to use ng-html2js & moved directory structure into lib folder. See 4 --- admin/gulpfile.js | 27 ++++++++++++++++-- admin/lib/application.ts | 2 +- admin/{html => lib/bootstrap}/index.jade | 1 + .../media/images/file-info-clock.jpg | Bin .../media/images/file-info-downloads.jpg | Bin .../bootstrap}/media/images/file-info-id.jpg | Bin .../media/images/file-info-mime.jpg | Bin .../media/images/file-info-size.jpg | Bin .../bootstrap}/media/images/folder.png | Bin .../bootstrap}/media/images/image-icon.png | Bin .../bootstrap}/media/images/loader.gif | Bin .../media/images/logo-home-small.jpg | Bin .../bootstrap}/media/images/media.png | Bin .../bootstrap}/media/images/posts.png | Bin .../bootstrap}/media/images/search.png | Bin .../bootstrap}/media/images/seo.png | Bin .../bootstrap}/media/images/standard-file.png | Bin .../bootstrap}/media/images/users.png | Bin admin/{html => lib/bootstrap}/style.css | 0 admin/{html => lib}/templates/dash-media.html | 0 admin/{html => lib}/templates/dash-posts.html | 0 admin/{html => lib}/templates/dash-seo.html | 0 admin/{html => lib}/templates/dash-users.html | 0 admin/{html => lib}/templates/dashboard.html | 0 .../templates/directives/pager.html | 0 admin/{html => lib}/templates/log-in.html | 0 admin/{html => lib}/templates/message.html | 0 admin/{html => lib}/templates/nav.html | 0 .../templates/password-reset.html | 0 admin/{html => lib}/templates/register.html | 0 admin/package.json | 7 +++-- 31 files changed, 31 insertions(+), 6 deletions(-) rename admin/{html => lib/bootstrap}/index.jade (96%) rename admin/{html => lib/bootstrap}/media/images/file-info-clock.jpg (100%) rename admin/{html => lib/bootstrap}/media/images/file-info-downloads.jpg (100%) rename admin/{html => lib/bootstrap}/media/images/file-info-id.jpg (100%) rename admin/{html => lib/bootstrap}/media/images/file-info-mime.jpg (100%) rename admin/{html => lib/bootstrap}/media/images/file-info-size.jpg (100%) rename admin/{html => lib/bootstrap}/media/images/folder.png (100%) rename admin/{html => lib/bootstrap}/media/images/image-icon.png (100%) rename admin/{html => lib/bootstrap}/media/images/loader.gif (100%) rename admin/{html => lib/bootstrap}/media/images/logo-home-small.jpg (100%) rename admin/{html => lib/bootstrap}/media/images/media.png (100%) rename admin/{html => lib/bootstrap}/media/images/posts.png (100%) rename admin/{html => lib/bootstrap}/media/images/search.png (100%) rename admin/{html => lib/bootstrap}/media/images/seo.png (100%) rename admin/{html => lib/bootstrap}/media/images/standard-file.png (100%) rename admin/{html => lib/bootstrap}/media/images/users.png (100%) rename admin/{html => lib/bootstrap}/style.css (100%) rename admin/{html => lib}/templates/dash-media.html (100%) rename admin/{html => lib}/templates/dash-posts.html (100%) rename admin/{html => lib}/templates/dash-seo.html (100%) rename admin/{html => lib}/templates/dash-users.html (100%) rename admin/{html => lib}/templates/dashboard.html (100%) rename admin/{html => lib}/templates/directives/pager.html (100%) rename admin/{html => lib}/templates/log-in.html (100%) rename admin/{html => lib}/templates/message.html (100%) rename admin/{html => lib}/templates/nav.html (100%) rename admin/{html => lib}/templates/password-reset.html (100%) rename admin/{html => lib}/templates/register.html (100%) diff --git a/admin/gulpfile.js b/admin/gulpfile.js index 93dbbabf..b1e8ecc0 100644 --- a/admin/gulpfile.js +++ b/admin/gulpfile.js @@ -9,6 +9,9 @@ var request = require('request'); var untar = require('gulp-untar'); var source = require('vinyl-source-stream'); var filter = require('gulp-filter'); +var ngHtml2Js = require("gulp-ng-html2js"); +var minifyHtml = require("gulp-minify-html"); +var uglify = require("gulp-uglify"); // CONFIG // ============================== @@ -56,9 +59,9 @@ gulp.task('ts-code', function() { /** * Copies the html source to its output directory */ -gulp.task('copy-html', function() { +gulp.task('copy-bootstrap', function() { - return gulp.src("html/**", { base: "html" }) + return gulp.src("lib/bootstrap/**", { base: "lib/bootstrap" }) .pipe(gulp.dest(outDir)); }); @@ -146,6 +149,24 @@ gulp.task('deploy-third-party', function() { .pipe(gulp.dest(outDir + "/third-party")); }); +/** + * Builds the definition + */ +gulp.task('html-to-ng', function() { + gulp.src("./lib/**/*.html") + .pipe(minifyHtml({ + empty: true, + spare: true, + quotes: true + })) + .pipe(ngHtml2Js({ + moduleName: "admin-templates", + prefix: "" + })) + .pipe(concat("partials.min.js")) + .pipe(uglify()) + .pipe(gulp.dest(outDir + "/templates")); +}); /** * Builds the definition @@ -175,4 +196,4 @@ gulp.task('ts-code-declaration', function() { .pipe(gulp.dest(outDirDefinitions)); }); -gulp.task('build-all', [ 'deploy-third-party', 'copy-html', 'ts-code', 'ts-code-declaration']); \ No newline at end of file +gulp.task('build-all', [ 'copy-bootstrap', 'deploy-third-party', 'html-to-ng', 'ts-code', 'ts-code-declaration']); \ No newline at end of file diff --git a/admin/lib/application.ts b/admin/lib/application.ts index e61cb42d..72b5fe9c 100644 --- a/admin/lib/application.ts +++ b/admin/lib/application.ts @@ -10,7 +10,7 @@ module clientAdmin { 'use strict'; - var appModule = angular.module("admin", ["ui.router", "ngAnimate", "ngSanitize", 'angular-loading-bar', 'ngFileUpload']) + var appModule = angular.module("admin", ["ui.router", "ngAnimate", "ngSanitize", 'angular-loading-bar', 'ngFileUpload', 'admin-templates']) .constant("usersURL", _users ) .constant("mediaURL", _media ) .constant("apiURL", "./api") diff --git a/admin/html/index.jade b/admin/lib/bootstrap/index.jade similarity index 96% rename from admin/html/index.jade rename to admin/lib/bootstrap/index.jade index b0243747..459ac304 100644 --- a/admin/html/index.jade +++ b/admin/lib/bootstrap/index.jade @@ -26,6 +26,7 @@ html(lang="en") script(type="text/javascript", src=url + "/third-party/tinymce/tinymce.js") each plugin, index in plugins script(type="text/javascript", src=url + plugin) + script(type="text/javascript", src=url + "/templates/partials.min.js") script(type="text/javascript", src=url + "/main.js") base(href="/") diff --git a/admin/html/media/images/file-info-clock.jpg b/admin/lib/bootstrap/media/images/file-info-clock.jpg similarity index 100% rename from admin/html/media/images/file-info-clock.jpg rename to admin/lib/bootstrap/media/images/file-info-clock.jpg diff --git a/admin/html/media/images/file-info-downloads.jpg b/admin/lib/bootstrap/media/images/file-info-downloads.jpg similarity index 100% rename from admin/html/media/images/file-info-downloads.jpg rename to admin/lib/bootstrap/media/images/file-info-downloads.jpg diff --git a/admin/html/media/images/file-info-id.jpg b/admin/lib/bootstrap/media/images/file-info-id.jpg similarity index 100% rename from admin/html/media/images/file-info-id.jpg rename to admin/lib/bootstrap/media/images/file-info-id.jpg diff --git a/admin/html/media/images/file-info-mime.jpg b/admin/lib/bootstrap/media/images/file-info-mime.jpg similarity index 100% rename from admin/html/media/images/file-info-mime.jpg rename to admin/lib/bootstrap/media/images/file-info-mime.jpg diff --git a/admin/html/media/images/file-info-size.jpg b/admin/lib/bootstrap/media/images/file-info-size.jpg similarity index 100% rename from admin/html/media/images/file-info-size.jpg rename to admin/lib/bootstrap/media/images/file-info-size.jpg diff --git a/admin/html/media/images/folder.png b/admin/lib/bootstrap/media/images/folder.png similarity index 100% rename from admin/html/media/images/folder.png rename to admin/lib/bootstrap/media/images/folder.png diff --git a/admin/html/media/images/image-icon.png b/admin/lib/bootstrap/media/images/image-icon.png similarity index 100% rename from admin/html/media/images/image-icon.png rename to admin/lib/bootstrap/media/images/image-icon.png diff --git a/admin/html/media/images/loader.gif b/admin/lib/bootstrap/media/images/loader.gif similarity index 100% rename from admin/html/media/images/loader.gif rename to admin/lib/bootstrap/media/images/loader.gif diff --git a/admin/html/media/images/logo-home-small.jpg b/admin/lib/bootstrap/media/images/logo-home-small.jpg similarity index 100% rename from admin/html/media/images/logo-home-small.jpg rename to admin/lib/bootstrap/media/images/logo-home-small.jpg diff --git a/admin/html/media/images/media.png b/admin/lib/bootstrap/media/images/media.png similarity index 100% rename from admin/html/media/images/media.png rename to admin/lib/bootstrap/media/images/media.png diff --git a/admin/html/media/images/posts.png b/admin/lib/bootstrap/media/images/posts.png similarity index 100% rename from admin/html/media/images/posts.png rename to admin/lib/bootstrap/media/images/posts.png diff --git a/admin/html/media/images/search.png b/admin/lib/bootstrap/media/images/search.png similarity index 100% rename from admin/html/media/images/search.png rename to admin/lib/bootstrap/media/images/search.png diff --git a/admin/html/media/images/seo.png b/admin/lib/bootstrap/media/images/seo.png similarity index 100% rename from admin/html/media/images/seo.png rename to admin/lib/bootstrap/media/images/seo.png diff --git a/admin/html/media/images/standard-file.png b/admin/lib/bootstrap/media/images/standard-file.png similarity index 100% rename from admin/html/media/images/standard-file.png rename to admin/lib/bootstrap/media/images/standard-file.png diff --git a/admin/html/media/images/users.png b/admin/lib/bootstrap/media/images/users.png similarity index 100% rename from admin/html/media/images/users.png rename to admin/lib/bootstrap/media/images/users.png diff --git a/admin/html/style.css b/admin/lib/bootstrap/style.css similarity index 100% rename from admin/html/style.css rename to admin/lib/bootstrap/style.css diff --git a/admin/html/templates/dash-media.html b/admin/lib/templates/dash-media.html similarity index 100% rename from admin/html/templates/dash-media.html rename to admin/lib/templates/dash-media.html diff --git a/admin/html/templates/dash-posts.html b/admin/lib/templates/dash-posts.html similarity index 100% rename from admin/html/templates/dash-posts.html rename to admin/lib/templates/dash-posts.html diff --git a/admin/html/templates/dash-seo.html b/admin/lib/templates/dash-seo.html similarity index 100% rename from admin/html/templates/dash-seo.html rename to admin/lib/templates/dash-seo.html diff --git a/admin/html/templates/dash-users.html b/admin/lib/templates/dash-users.html similarity index 100% rename from admin/html/templates/dash-users.html rename to admin/lib/templates/dash-users.html diff --git a/admin/html/templates/dashboard.html b/admin/lib/templates/dashboard.html similarity index 100% rename from admin/html/templates/dashboard.html rename to admin/lib/templates/dashboard.html diff --git a/admin/html/templates/directives/pager.html b/admin/lib/templates/directives/pager.html similarity index 100% rename from admin/html/templates/directives/pager.html rename to admin/lib/templates/directives/pager.html diff --git a/admin/html/templates/log-in.html b/admin/lib/templates/log-in.html similarity index 100% rename from admin/html/templates/log-in.html rename to admin/lib/templates/log-in.html diff --git a/admin/html/templates/message.html b/admin/lib/templates/message.html similarity index 100% rename from admin/html/templates/message.html rename to admin/lib/templates/message.html diff --git a/admin/html/templates/nav.html b/admin/lib/templates/nav.html similarity index 100% rename from admin/html/templates/nav.html rename to admin/lib/templates/nav.html diff --git a/admin/html/templates/password-reset.html b/admin/lib/templates/password-reset.html similarity index 100% rename from admin/html/templates/password-reset.html rename to admin/lib/templates/password-reset.html diff --git a/admin/html/templates/register.html b/admin/lib/templates/register.html similarity index 100% rename from admin/html/templates/register.html rename to admin/lib/templates/register.html diff --git a/admin/package.json b/admin/package.json index 12486790..f7397dcb 100644 --- a/admin/package.json +++ b/admin/package.json @@ -15,6 +15,9 @@ "vinyl-source-stream": "^1.1.0", "gulp-untar": "^0.0.4", "gulp-util": "^3.0.7", - "gulp-filter" : "^4.0.0" + "gulp-filter" : "^4.0.0", + "gulp-ng-html2js": "^0.2.2", + "gulp-minify-html": "^1.0.6", + "gulp-uglify": "^1.5.3" } -} +} \ No newline at end of file