From 013dcf1a0d62e8f0243bcd6bbabb861c9339c5c5 Mon Sep 17 00:00:00 2001 From: pburrows Date: Sun, 3 Apr 2016 12:38:48 -0400 Subject: [PATCH] updated nuget packages, removed superfluous ones. --- .../BTC.SiteGenerator.Website.csproj | 7 ++++--- .../Controllers/PublicationsController.cs | 5 +++-- src/BTC.SiteGenerator.Website/Web.config | 2 +- src/BTC.SiteGenerator.Website/packages.config | 7 +------ src/BTC.SiteGenerator.Website/scripts/app/app.js | 8 ++++++-- src/BTC.SiteGenerator.Website/scripts/app/app.js.map | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/BTC.SiteGenerator.Website/BTC.SiteGenerator.Website.csproj b/src/BTC.SiteGenerator.Website/BTC.SiteGenerator.Website.csproj index 4c06b78..046aca7 100644 --- a/src/BTC.SiteGenerator.Website/BTC.SiteGenerator.Website.csproj +++ b/src/BTC.SiteGenerator.Website/BTC.SiteGenerator.Website.csproj @@ -83,6 +83,10 @@ True + + ..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll + True + @@ -102,9 +106,6 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - diff --git a/src/BTC.SiteGenerator.Website/Controllers/PublicationsController.cs b/src/BTC.SiteGenerator.Website/Controllers/PublicationsController.cs index 086f6f2..b190443 100644 --- a/src/BTC.SiteGenerator.Website/Controllers/PublicationsController.cs +++ b/src/BTC.SiteGenerator.Website/Controllers/PublicationsController.cs @@ -5,6 +5,7 @@ using System.Net.Http; using System.Threading.Tasks; using System.Web.Http; +using BTC.SiteGenerator.Website.Models; namespace BTC.SiteGenerator.Website.Controllers { @@ -12,9 +13,9 @@ namespace BTC.SiteGenerator.Website.Controllers public class PublicationsController : ApiController { [HttpGet] - public async Task> GetPublications() + public Task> GetPublications() { - + return null; } } } diff --git a/src/BTC.SiteGenerator.Website/Web.config b/src/BTC.SiteGenerator.Website/Web.config index dd6f4c4..dac3652 100644 --- a/src/BTC.SiteGenerator.Website/Web.config +++ b/src/BTC.SiteGenerator.Website/Web.config @@ -54,7 +54,7 @@ - + diff --git a/src/BTC.SiteGenerator.Website/packages.config b/src/BTC.SiteGenerator.Website/packages.config index 9a2efbe..2a0f98f 100644 --- a/src/BTC.SiteGenerator.Website/packages.config +++ b/src/BTC.SiteGenerator.Website/packages.config @@ -2,10 +2,7 @@ - - - @@ -40,9 +37,7 @@ - - + - \ No newline at end of file diff --git a/src/BTC.SiteGenerator.Website/scripts/app/app.js b/src/BTC.SiteGenerator.Website/scripts/app/app.js index 4669beb..7b85edb 100644 --- a/src/BTC.SiteGenerator.Website/scripts/app/app.js +++ b/src/BTC.SiteGenerator.Website/scripts/app/app.js @@ -1,5 +1,5 @@ -System.register(["angular", "angular-ui-router", "ui-bootstrap", "angular-modal-service", "./config/app.config", "./home/home.module", "./publications/publications.module", "./articles/articles.module", "./authors/authors.module"], function(exports_1) { - var config, home, publication, articles, authors; +System.register(["angular", "angular-ui-router", "ui-bootstrap", "angular-modal-service", "./config/app.config", "./home/home.module", "./publications/publications.module", "./articles/articles.module", "./authors/authors.module", "./common/nav/navbar.component"], function(exports_1) { + var config, home, publication, articles, authors, navbar_component_1; var moduleName, app; return { setters:[ @@ -21,6 +21,9 @@ System.register(["angular", "angular-ui-router", "ui-bootstrap", "angular-modal- }, function (authors_1) { authors = authors_1; + }, + function (navbar_component_1_1) { + navbar_component_1 = navbar_component_1_1; }], execute: function() { moduleName = "app"; @@ -32,6 +35,7 @@ System.register(["angular", "angular-ui-router", "ui-bootstrap", "angular-modal- "ui.router", "ui.bootstrap" ]) + .directive("sgNavbar", navbar_component_1.SiteGenNavbarDirective) .config(config.routeConfig); exports_1("app", app); exports_1("moduleName", moduleName); diff --git a/src/BTC.SiteGenerator.Website/scripts/app/app.js.map b/src/BTC.SiteGenerator.Website/scripts/app/app.js.map index 0353d45..9a8f21f 100644 --- a/src/BTC.SiteGenerator.Website/scripts/app/app.js.map +++ b/src/BTC.SiteGenerator.Website/scripts/app/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["app.ts"],"names":[],"mappings":";;QAUM,UAAU,EAGZ,GAAG;;;;;;;;;;;;;;;;;;;;;;;YAHD,UAAU,GAAW,KAAK,CAAC;YAG7B,GAAG,GAAe,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC7C,IAAI,CAAC,UAAU;gBACf,WAAW,CAAC,UAAU;gBACtB,QAAQ,CAAC,UAAU;gBACnB,OAAO,CAAC,UAAU;gBAClB,WAAW;gBACX,cAAc;aACjB,CAAC;iBACG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAExB,qBAAG;YAAE,mCAAU"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["app.ts"],"names":[],"mappings":";;QAWM,UAAU,EAGZ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;YAHD,UAAU,GAAW,KAAK,CAAC;YAG7B,GAAG,GAAe,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE;gBAC7C,IAAI,CAAC,UAAU;gBACf,WAAW,CAAC,UAAU;gBACtB,QAAQ,CAAC,UAAU;gBACnB,OAAO,CAAC,UAAU;gBAClB,WAAW;gBACX,cAAc;aACjB,CAAC;iBACG,SAAS,CAAC,UAAU,EAAE,yCAAsB,CAAC;iBAC7C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAExB,qBAAG;YAAE,mCAAU"} \ No newline at end of file