diff --git a/BuildFeed/App_Start/RouteConfig.cs b/BuildFeed/App_Start/RouteConfig.cs index 55a35b4..d29fada 100644 --- a/BuildFeed/App_Start/RouteConfig.cs +++ b/BuildFeed/App_Start/RouteConfig.cs @@ -9,13 +9,6 @@ public class RouteConfig public static void RegisterRoutes(RouteCollection routes) { routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); - routes.MapHttpRoute("API", "api/{action}/{id}", - new - { - controller = "api", - action = "GetBuilds", - id = UrlParameter.Optional - }); routes.AppendTrailingSlash = true; routes.MapMvcAttributeRoutes(); } diff --git a/BuildFeed/Controllers/apiController.cs b/BuildFeed/Controllers/apiController.cs index 4ff0302..25a1aa6 100644 --- a/BuildFeed/Controllers/apiController.cs +++ b/BuildFeed/Controllers/apiController.cs @@ -19,21 +19,22 @@ public apiController() : base() bModel = new Build(); } - public async Task> GetBuilds() - { - return await bModel.SelectInBuildOrder(); - } - + [Route("/api/GetWin10Labs/")] public async Task> GetWin10Labs() { List labs = new List(); labs.AddRange(await bModel.SelectBuildLabs(6, 4)); labs.AddRange(await bModel.SelectBuildLabs(10, 0)); - return labs.GroupBy(l => l).Select(l => l.Key).Where(l => l.All(c => c != '(')).ToArray(); + return labs + .GroupBy(l => l) + .Select(l => l.Key) + .Where(l => l.All(c => c != '(')) + .ToArray(); } [HttpPost] + [Route("/api/AddWin10Builds/")] public async Task AddWin10Builds(NewBuild apiModel) { if (apiModel == null) @@ -60,6 +61,7 @@ public async Task AddWin10Builds(NewBuild apiModel) } } + [Route("/api/GetSearchResult/{query}/")] public async Task> GetSearchResult(string query) { if (string.IsNullOrWhiteSpace(query)) diff --git a/BuildFeed/Scripts/bfs.js b/BuildFeed/Scripts/bfs.js index 26965f4..c4315e3 100644 --- a/BuildFeed/Scripts/bfs.js +++ b/BuildFeed/Scripts/bfs.js @@ -19,7 +19,7 @@ $(function () { } bfsTimeout = setTimeout(function (object) { - bfsAjax = $.ajax("/api/GetSearchResult/?query=" + $("#search-input").val()).done(function (data) { + bfsAjax = $.ajax("/api/GetSearchResult/" + $("#search-input").val() + '/').done(function (data) { var template = $.templates("#result-template"); var content = $("
"); @@ -29,7 +29,7 @@ $(function () { $("#search-results").html(content); $("#search-results a.list-group-item").click(function () { - ga('send', 'pageview', '/api/GetSearchResult/?query=' + $("#search-input").val()); + ga('send', 'pageview', '/api/GetSearchResult/' + $("#search-input").val() + '/'); }); }); }, 200); diff --git a/BuildFeedApp-Full/MainPage.xaml b/BuildFeedApp-Full/MainPage.xaml index dfdb773..4c6f453 100644 --- a/BuildFeedApp-Full/MainPage.xaml +++ b/BuildFeedApp-Full/MainPage.xaml @@ -16,7 +16,7 @@ - +