From 18bd42bcfe8fb0f49f30d05669e711455eaf63be Mon Sep 17 00:00:00 2001 From: DamianEdwards Date: Mon, 6 Oct 2014 14:30:08 -0700 Subject: [PATCH] Use grunt-bower-task in MusicStore.Spa --- src/MusicStore.Spa/Client/Site.less | 6 +++ src/MusicStore.Spa/Gruntfile.js | 15 ++++++- src/MusicStore.Spa/Pages/Admin.cshtml | 8 ++-- src/MusicStore.Spa/Pages/Home.cshtml | 4 +- .../Views/Shared/_Layout.cshtml | 10 ++--- src/MusicStore.Spa/bower.json | 33 +++++++++++--- src/MusicStore.Spa/grunt/clean.json | 3 +- src/MusicStore.Spa/grunt/copy.json | 45 ------------------- 8 files changed, 59 insertions(+), 65 deletions(-) diff --git a/src/MusicStore.Spa/Client/Site.less b/src/MusicStore.Spa/Client/Site.less index 64438d2afd..889ec01c0d 100644 --- a/src/MusicStore.Spa/Client/Site.less +++ b/src/MusicStore.Spa/Client/Site.less @@ -1,5 +1,11 @@ @import '../bower_components/bootstrap/less/bootstrap.less'; +@font-face { + font-family: 'Glyphicons Halflings'; + src: url('../lib/bootstrap/fonts/glyphicons-halflings-regular.eot'); + src: url('../lib/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../lib/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../lib/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../lib/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); +} + [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { display: none !important; } diff --git a/src/MusicStore.Spa/Gruntfile.js b/src/MusicStore.Spa/Gruntfile.js index 17270d75ae..0861116b65 100644 --- a/src/MusicStore.Spa/Gruntfile.js +++ b/src/MusicStore.Spa/Gruntfile.js @@ -3,12 +3,23 @@ module.exports = function (grunt) { + grunt.loadNpmTasks("grunt-bower-task"); + grunt.initConfig({ - staticFilePattern: "**/*.{js,css,map,html,htm,ico,jpg,jpeg,png,gif,eot,svg,ttf,woff}" + staticFilePattern: "**/*.{js,css,map,html,htm,ico,jpg,jpeg,png,gif,eot,svg,ttf,woff}", + bower: { + install: { + options: { + targetDir: "wwwroot/lib", + layout: "byComponent", + cleanTargetDir: true + } + } + } }); grunt.registerTask("ts", ["tslint", "tsng", "typescript:dev", "clean:tsng"]); - grunt.registerTask("dev", ["clean", "copy", "less:dev", "ts"]); + grunt.registerTask("dev", ["clean:assets", "copy", "bower:install", "less:dev", "ts"]); grunt.registerTask("release", ["clean", "copy", "uglify", "less:release", "typescript:release"]); grunt.registerTask("default", ["dev"]); diff --git a/src/MusicStore.Spa/Pages/Admin.cshtml b/src/MusicStore.Spa/Pages/Admin.cshtml index 59881197d5..233aba1a13 100644 --- a/src/MusicStore.Spa/Pages/Admin.cshtml +++ b/src/MusicStore.Spa/Pages/Admin.cshtml @@ -15,10 +15,10 @@ @section Scripts { - - - - + + + + @* TODO: This is currently all the compiled TypeScript, non-minified. Need to explore options for alternate loading schemes, e.g. AMD loader of individual modules, min vs. non-min, etc. *@ diff --git a/src/MusicStore.Spa/Pages/Home.cshtml b/src/MusicStore.Spa/Pages/Home.cshtml index ba62b7f966..1b54e601b7 100644 --- a/src/MusicStore.Spa/Pages/Home.cshtml +++ b/src/MusicStore.Spa/Pages/Home.cshtml @@ -17,8 +17,8 @@ @section Scripts { - - + + @* TODO: This is currently all the compiled TypeScript, non-minified. Need to explore options for alternate loading schemes, e.g. AMD loader of individual modules, min vs. non-min, etc. *@ diff --git a/src/MusicStore.Spa/Views/Shared/_Layout.cshtml b/src/MusicStore.Spa/Views/Shared/_Layout.cshtml index 6d64c3ed0d..6d0b2240ce 100644 --- a/src/MusicStore.Spa/Views/Shared/_Layout.cshtml +++ b/src/MusicStore.Spa/Views/Shared/_Layout.cshtml @@ -5,8 +5,8 @@ @ViewBag.Title – MVC Music Store - - + +