cleanup

Src/VideoGameQuotes.Web/Controllers/QuoteController.cs

@@ -47,9 +47,10 @@ namespace VideoGameQuotes.Web.Controllers {
 		}
 
 		public ActionResult Recent() {
-			//get last 10 submitted quotes
+			return View(new QuoteCollectionModel { 
-			var quotes = quoteService.GetMostRecentQuotes(10);
+				Quotes = quoteService.GetMostRecentQuotes(10), 
-			return View(new QuoteCollectionModel { Quotes = quotes, User = currentUserProvider.CurrentUser });
+				User = currentUserProvider.CurrentUser 
+			});
 		}
 
 		public ActionResult Best(int start = 0, int end = 19) {

Src/VideoGameQuotes.Web/Models/PagedQuoteCollectionModel.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace VideoGameQuotes.Web.Models {
+	public class PagedQuoteCollectionModel : QuoteCollectionModel {
+		public int Start { get; set; }
+		public int End { get; set; }
+		public int PageSize { get { return End - Start + 1; } }
+		public int NextStart { get { return End + 1; } }
+		public int NextEnd { get { return End + PageSize; } }
+		public int PreviousStart { get { return Math.Max(0, Start - PageSize); } }
+		public int PreviousEnd { get { return Math.Max(PageSize - 1, End - PageSize); } }
+		public bool HasPrevious { get { return Start > 0; } }
+	}
+}

Src/VideoGameQuotes.Web/Models/QuoteCollectionModel.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using VideoGameQuotes.Api;
+
+namespace VideoGameQuotes.Web.Models {
+	public class QuoteCollectionModel {
+		public IEnumerable<Quote> Quotes { get; set; }
+		public User User { get; set; }
+	}
+}

Src/VideoGameQuotes.Web/Models/QuoteModel.cs

@@ -1,36 +1,12 @@
-using System;
+using JetBrains.Annotations;
-using System.Collections.Generic;
-using JetBrains.Annotations;
 using VideoGameQuotes.Api;
 
 namespace VideoGameQuotes.Web.Models {
-	public class QuoteCollectionModel {
-		public IEnumerable<Quote> Quotes { get; set; }
-		public User User { get; set; }
-	}
-
-	public class PagedQuoteCollectionModel : QuoteCollectionModel {
-		public int Start { get; set; }
-		public int End { get; set; }
-		public int PageSize { get { return End - Start + 1; } }
-		public int NextStart { get { return End + 1; } }
-		public int NextEnd { get { return End + PageSize; } }
-		public int PreviousStart { get { return Math.Max(0, Start - PageSize); } }
-		public int PreviousEnd { get { return Math.Max(PageSize - 1, End - PageSize); } }
-		public bool HasPrevious { get { return Start > 0; } }
-	}
-
 	public class QuoteModel {
 		[NotNull]
 		public Quote Quote { get; set; }
 		public User User { get; set; }
-
+		public bool VotedUp { get { return Quote.VotedFor(User) == VoteDirection.Up; } }
-		public bool VotedUp {
+		public bool VotedDown { get { return Quote.VotedFor(User) == VoteDirection.Down; } }
-			get { return Quote.VotedFor(User) == VoteDirection.Up; }
-		}
-
-		public bool VotedDown {
-			get { return Quote.VotedFor(User) == VoteDirection.Down; }
-		}
 	}
 }

Src/VideoGameQuotes.Web/Services/QuoteService.cs

@@ -23,7 +23,6 @@ namespace VideoGameQuotes.Web.Services {
 		Quote GetRandomQuote();
 		IEnumerable<Quote> GetBestQuotes(int start, int end);
 		Vote SaveVote(Vote vote);
-		[NotNull]
 		Vote GetVoteOrCreateNew(Quote quote, User voter);
 	}
 

Src/VideoGameQuotes.Web/VideoGameQuotes.Web.csproj

@@ -85,6 +85,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controllers\HomeController.cs" />
+    <Compile Include="Models\PagedQuoteCollectionModel.cs" />
+    <Compile Include="Models\QuoteCollectionModel.cs" />
     <Compile Include="Models\QuoteModel.cs" />
     <Compile Include="Models\VoteModel.cs" />
     <Compile Include="Validation\NonEmptyText.cs" />