diff --git a/TwitterPractice/TwitterPractice/Content/Site.css b/TwitterPractice/TwitterPractice/Content/Site.css index 5244089..78fbe34 100644 --- a/TwitterPractice/TwitterPractice/Content/Site.css +++ b/TwitterPractice/TwitterPractice/Content/Site.css @@ -322,3 +322,7 @@ div#title { .tri-state { width: 6em; } + +#qsvars { + display: none; +} \ No newline at end of file diff --git a/TwitterPractice/TwitterPractice/Controllers/HomeController.cs b/TwitterPractice/TwitterPractice/Controllers/HomeController.cs index c9dd01f..c341f67 100644 --- a/TwitterPractice/TwitterPractice/Controllers/HomeController.cs +++ b/TwitterPractice/TwitterPractice/Controllers/HomeController.cs @@ -20,20 +20,30 @@ namespace TwitterPractice.Controllers ViewBag.HasQsVars = (Request.QueryString.Keys.Count > 0); ViewBag.QueryString = Request.QueryString; ViewBag.Message = title; + + return View(); + } + + public ActionResult UserTimelineFragment() + { string username = Request.QueryString["username"]; if (null == username) { - ViewBag.UserTimeline = null; - ViewBag.Username = null; + return new HttpNotFoundResult("you must provide a username, derp."); } else { - ViewBag.UserTimeline = _twitterModels.GetTwitterStream(username); - ViewBag.Username = username; - } - return View(); + try + { + ViewBag.UserTimeline = _twitterModels.GetTwitterStream(username); + ViewBag.Username = username; + return View(); + } + catch (System.SystemException e) + { + return new HttpNotFoundResult("FAIL: " + e.Message); + } + } } - - } } diff --git a/TwitterPractice/TwitterPractice/Models/TwitterModels.cs b/TwitterPractice/TwitterPractice/Models/TwitterModels.cs index 40e9b1e..b1f42be 100644 --- a/TwitterPractice/TwitterPractice/Models/TwitterModels.cs +++ b/TwitterPractice/TwitterPractice/Models/TwitterModels.cs @@ -13,7 +13,7 @@ namespace TwitterPractice.Models requestTemplate = ConfigurationManager.AppSettings["TwitterRequestTemplate"]; } - public JArray GetTwitterStream(string username = "meatballhat") + public JArray GetTwitterStream(string username) { string requestUrl = String.Format(requestTemplate, username); WebClient req = new WebClient(); diff --git a/TwitterPractice/TwitterPractice/Scripts/Site.js b/TwitterPractice/TwitterPractice/Scripts/Site.js new file mode 100644 index 0000000..0c4f33a --- /dev/null +++ b/TwitterPractice/TwitterPractice/Scripts/Site.js @@ -0,0 +1,6 @@ +$(function () { + $('#user-timeline-form').submit(function () { + $('#user-timeline').load('/Home/UserTimelineFragment?username=' + $('#username-input').attr('value')); + return false; + }); +}); \ No newline at end of file diff --git a/TwitterPractice/TwitterPractice/TwitterPractice.csproj b/TwitterPractice/TwitterPractice/TwitterPractice.csproj index 0abfce7..fe74df3 100644 --- a/TwitterPractice/TwitterPractice/TwitterPractice.csproj +++ b/TwitterPractice/TwitterPractice/TwitterPractice.csproj @@ -75,6 +75,7 @@ + @@ -150,6 +151,9 @@ + + +