diff --git a/src/MusicStore.Spa/Apis/AlbumsApiController.cs b/src/MusicStore.Spa/Apis/AlbumsApiController.cs index f92a13952a..5e800e2155 100644 --- a/src/MusicStore.Spa/Apis/AlbumsApiController.cs +++ b/src/MusicStore.Spa/Apis/AlbumsApiController.cs @@ -19,6 +19,7 @@ namespace MusicStore.Apis } [HttpGet] + [NoCache] public async Task Paged(int page = 1, int pageSize = 50, string sortBy = null) { await _storeContext.Genres.LoadAsync(); @@ -36,6 +37,7 @@ namespace MusicStore.Apis } [HttpGet("all")] + [NoCache] public async Task All() { var albums = await _storeContext.Albums @@ -48,6 +50,7 @@ namespace MusicStore.Apis } [HttpGet("mostPopular")] + [NoCache] public async Task MostPopular(int count = 6) { count = count > 0 && count < 20 ? count : 6; @@ -61,6 +64,7 @@ namespace MusicStore.Apis } [HttpGet("{albumId:int}")] + [NoCache] public async Task Details(int albumId) { await _storeContext.Genres.LoadAsync(); diff --git a/src/MusicStore.Spa/Infrastructure/NoCacheAttribute.cs b/src/MusicStore.Spa/Infrastructure/NoCacheAttribute.cs new file mode 100644 index 0000000000..1e9fcca2de --- /dev/null +++ b/src/MusicStore.Spa/Infrastructure/NoCacheAttribute.cs @@ -0,0 +1,16 @@ +using System; +using Microsoft.AspNet.Mvc; + +namespace MusicStore.Spa.Infrastructure +{ + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] + public sealed class NoCacheAttribute : ActionFilterAttribute + { + public override void OnResultExecuting(ResultExecutingContext context) + { + context.HttpContext.Response.Headers["Cache-Control"] = "private, max-age=0"; + + base.OnResultExecuting(context); + } + } +} \ No newline at end of file diff --git a/src/MusicStore.Spa/MusicStore.Spa.kproj b/src/MusicStore.Spa/MusicStore.Spa.kproj index bbcf20223f..65a8a57529 100644 --- a/src/MusicStore.Spa/MusicStore.Spa.kproj +++ b/src/MusicStore.Spa/MusicStore.Spa.kproj @@ -1,8 +1,9 @@ - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + 62635 @@ -11,4 +12,4 @@ ..\..\artifacts\bin\$(MSBuildProjectName)\ - + \ No newline at end of file diff --git a/src/MusicStore.Spa/bower.json b/src/MusicStore.Spa/bower.json index 62bfb591f1..f647c32c3a 100644 --- a/src/MusicStore.Spa/bower.json +++ b/src/MusicStore.Spa/bower.json @@ -3,14 +3,14 @@ "version": "0.0.0", "private": true, "dependencies": { - "bootstrap": "~3.1.0", - "jquery-validation": "~1.13.0", - "jquery": "~2.1.0", + "bootstrap": "~3.2.0", + "jquery-validation": "~1.13.1", + "jquery": "~2.1.1", "modernizr": "~2.7.1", "respond": "~1.4.2", - "angular": "~1.2.15", - "angular-route": "~1.2.15", - "angular-bootstrap": "~0.11.2" + "angular": "~1.3.3", + "angular-route": "~1.3.3", + "angular-bootstrap": "~0.12.0" }, "devDependencies": { "dt-angular": "~1.2.16", @@ -18,23 +18,26 @@ "dt-jquery": "~2.0.0" }, "exportsOverride": { - "bootstrap": { - "js": "dist/js/*.*", - "css": "dist/css/*.*", - "fonts": "dist/fonts/*.*" - }, - "/jquery/": { - "": "dist/*.*" - }, - "/angular/": { - "": "*.{js,map}" - }, - "modernizr": { - "": "modernizr.js" - }, - "respond": { - "": "dest/*.*" - }, - "dt-*": { } - } + "bootstrap": { + "js": "dist/js/*.*", + "css": "dist/css/*.*", + "fonts": "dist/fonts/*.*" + }, + "/jquery/": { + "": "dist/*.*" + }, + "/angular/": { + "": "*.{js,map}" + }, + "modernizr": { + "": "modernizr.js" + }, + "respond": { + "": "dest/*.*" + }, + "dt-*": {} + }, + "resolutions": { + "angular": "~1.3.3" + } } diff --git a/src/MusicStore.Spa/ng-apps/MusicStore.Admin/Catalog/AlbumListController.ts b/src/MusicStore.Spa/ng-apps/MusicStore.Admin/Catalog/AlbumListController.ts index 420e32c4c9..4d26a97372 100644 --- a/src/MusicStore.Spa/ng-apps/MusicStore.Admin/Catalog/AlbumListController.ts +++ b/src/MusicStore.Spa/ng-apps/MusicStore.Admin/Catalog/AlbumListController.ts @@ -28,9 +28,10 @@ this.currentPage = 1; this.pageSize = 50; - this.loadPage(1); this.sortColumn = "Title"; + this.loadPage(1); + this.showAlert(viewAlert.alert, 3000); viewAlert.alert = null; } diff --git a/src/MusicStore.Spa/wwwroot/js/MusicStore.Admin.js b/src/MusicStore.Spa/wwwroot/js/MusicStore.Admin.js index 86d5957c34..d235e5e8bd 100644 --- a/src/MusicStore.Spa/wwwroot/js/MusicStore.Admin.js +++ b/src/MusicStore.Spa/wwwroot/js/MusicStore.Admin.js @@ -908,9 +908,10 @@ var MusicStore; this.currentPage = 1; this.pageSize = 50; - this.loadPage(1); this.sortColumn = "Title"; + this.loadPage(1); + this.showAlert(viewAlert.alert, 3000); viewAlert.alert = null; } diff --git a/src/MusicStore/MusicStore.kproj b/src/MusicStore/MusicStore.kproj index 1e7c6ea463..3bb45078d0 100644 --- a/src/MusicStore/MusicStore.kproj +++ b/src/MusicStore/MusicStore.kproj @@ -1,8 +1,9 @@ - + 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + 62634 @@ -11,4 +12,4 @@ ..\..\artifacts\bin\$(MSBuildProjectName)\ - + \ No newline at end of file