rob/website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Various blog improvements

Browse source
This commit is contained in:
Robert Marshall 2020-01-03 17:56:51 +00:00
parent 929adac910
commit 8e79aed647
8 changed files with 37 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Website.Tests/VIewModels/BlogPostPreviewViewModelTests.cs
View file

@ -14,7 +14,7 @@ namespace Website.Tests.VIewModels
Post_Content = new string('a', 1001)
};
var post = new BlogPost(state);
var vm = new BlogPostPreviewViewModel(post);
var vm = new BlogPostSnippetViewModel(post);
vm.Content.Length.Should().Be(1000);
}
@ -24,7 +24,7 @@ namespace Website.Tests.VIewModels
Post_Content = new string('a', 900)
};
var post = new BlogPost(state);
var vm = new BlogPostPreviewViewModel(post);
var vm = new BlogPostSnippetViewModel(post);
vm.Content.Length.Should().Be(900);
}
}

8
Website.Tests/VIewModels/BlogPostViewModelTests.cs
View file

@ -15,7 +15,7 @@ namespace Website.Tests.VIewModels
Post_Content="# header"
};
var post = new BlogPost(state);
var vm = new BlogPostViewModel(post);
var vm = new BlogPostViewModel(post, false);
vm.ContentHtml.Should().Be("<h1>header</h1>");
}
@ -26,7 +26,7 @@ namespace Website.Tests.VIewModels
Post_Timestamp = new DateTime(2018, 10, 01, 15, 1, 25)
};
var post = new BlogPost(state);
var vm = new BlogPostViewModel(post);
var vm = new BlogPostViewModel(post, false);
vm.Timestamp.Should().Be("Monday the 1st of October 2018");
}
@ -37,7 +37,7 @@ namespace Website.Tests.VIewModels
Post_Timestamp = new DateTime(2018, 10, 02, 15, 1, 25)
};
var post = new BlogPost(state);
var vm = new BlogPostViewModel(post);
var vm = new BlogPostViewModel(post, false);
vm.Timestamp.Should().Be("Tuesday the 2nd of October 2018");
}
@ -48,7 +48,7 @@ namespace Website.Tests.VIewModels
Post_Timestamp = new DateTime(2018, 10, 03, 15, 1, 25)
};
var post = new BlogPost(state);
var vm = new BlogPostViewModel(post);
var vm = new BlogPostViewModel(post, false);
vm.Timestamp.Should().Be("Wednesday the 3rd of October 2018");
}
}

30
Website/Controllers/BlogController.cs
View file

@ -7,32 +7,29 @@ using Website.Data;
using Website.Models;
using Website.ViewModels;
namespace Website.Controllers
{
public class BlogController : Controller
{
namespace Website.Controllers {
public class BlogController:Controller {
private const int MaxPostsPerPage = 10;
private readonly BlogRepository _repo;
public BlogController(BlogRepository repo)
{
_repo = repo;
}
public BlogController(BlogRepository repo) => _repo = repo;
public async Task<IActionResult> Page(int page)
{
public async Task<IActionResult> Page(int page) {
var offset = (page - 1) * MaxPostsPerPage;
var posts = (await _repo.GetLatestPostsAsync(MaxPostsPerPage, offset)).Select(p => new BlogPostPreviewViewModel(p));
var posts = (await _repo.GetLatestPostsAsync(MaxPostsPerPage, offset)).Select(p => new BlogPostSnippetViewModel(p));
var maxPages = (await _repo.GetCountAsync()) / MaxPostsPerPage;
var model = new BlogViewModel(posts, page, maxPages);
return View(model);
}
public async Task<IActionResult> Entry(string url)
{
public async Task<IActionResult> Entry(string url, bool preview = false) {
try {
var post = await _repo.GetPostByUrlAsync(url);
var model = new BlogPostViewModel(post);
if (!preview && string.IsNullOrEmpty(post.Content))
return NotFound();
var model = new BlogPostViewModel(post, preview);
return View(model);
} catch (InvalidOperationException) {
return NotFound();
@ -52,8 +49,7 @@ namespace Website.Controllers
Content = post.Draft
};
return View(model);
}
catch (InvalidOperationException) {
} catch (InvalidOperationException) {
return NotFound();
}
}
@ -74,7 +70,7 @@ namespace Website.Controllers
[Authorize]
public async Task<IActionResult> Manage() {
var posts = await _repo.GetAllPostsAsync();
var models = posts.OrderByDescending(post => post.Timestamp).Select(post => new BlogPostViewModel(post));
var models = posts.OrderByDescending(post => post.Timestamp).Select(post => new BlogPostViewModel(post, false));
return View(models);
}

2
Website/Controllers/HomeController.cs
View file

@ -17,7 +17,7 @@ namespace Website.Controllers
public async Task<IActionResult> Index()
{
var post = await _blogRepo.GetLatestPostAsync();
var model = new BlogPostPreviewViewModel(post);
var model = new BlogPostSnippetViewModel(post);
return View(model);
}
}

9
Website/ViewModels/BlogPostPreviewViewModel.cs
View file

@ -1,9 +0,0 @@
using Website.Models;
namespace Website.ViewModels
{
public class BlogPostPreviewViewModel:BlogPostViewModel
{
public BlogPostPreviewViewModel(BlogPost blogPost) : base(blogPost) => Content = Content.Length < 1000 ? Content : Content.Substring(0, 1000);
}
}

9
Website/ViewModels/BlogPostSnippetViewModel.cs Normal file
View file

@ -0,0 +1,9 @@
using Website.Models;
namespace Website.ViewModels
{
public class BlogPostSnippetViewModel:BlogPostViewModel
{
public BlogPostSnippetViewModel(BlogPost blogPost) : base(blogPost, false) => Content = Content.Length < 1000 ? Content : Content.Substring(0, 1000);
}
}

4
Website/ViewModels/BlogPostViewModel.cs
View file

@ -7,12 +7,12 @@ namespace Website.ViewModels
{
public class BlogPostViewModel
{
public BlogPostViewModel(BlogPost blogPost) {
public BlogPostViewModel(BlogPost blogPost, bool preview) {
Id = blogPost.Id;
Title = blogPost.Title;
Timestamp = FormatTimestamp(blogPost.Timestamp);
Url = blogPost.Url;
Content = blogPost.Content;
Content = preview ? blogPost.Draft : blogPost.Content;
}
private static string GetDaySuffix(int day) {

13
Website/Views/Blog/Manage.cshtml
View file

@ -5,16 +5,13 @@
}
<table>
<thead><tr>
<td>Title</td>
<td colspan="3">Action</td>
</tr></thead>
@foreach (var post in Model) {
<tr>
<td>@post.Title</td>
<td><a href="edit?id=@post.Id">Edit</a></td>
<td><a href="publish?id=@post.Id">Publish</a></td>
<td><a href="delete?id=@post.Id">Delete</a></td>
<td><a href="/blog/view/@post.Url">@post.Title</a></td>
<td><a href="/blog/view/@post.Url?preview=true"><img src="/images/blog.svg" alt="Preview" title="Preview"/></a></td>
<td><a href="edit?id=@post.Id"><img src="/images/edit.svg" alt="Edit" title="Edit"/></a></td>
<td><a href="publish?id=@post.Id"><img src="/images/send.svg" alt="Publish" title="Publish" onclick="return confirm('Are you sure?')"/></a></td>
<td><a href="delete?id=@post.Id"><img src="/images/delete.svg" alt="Delete" title="Delete" onclick="return confirm('Are you sure?')"/></a></td>
</tr>
}
</table>