TerribleDev/blog.terrible.dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stop

Browse Source
This commit is contained in:
Tommy Parnell
2019-01-21 11:01:18 -05:00
parent c7750013ba
commit 033bc5192d
12 changed files with 70 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/TerribleDev.Blog.Web/Controllers/HomeController.cs
View File

@@ -53,7 +53,7 @@ namespace TerribleDev.Blog.Web.Controllers
{
return NotFound();
}
return View(new HomeViewModel() { Posts = result, Page = pageNumber, HasNext = postsByPage.ContainsKey(pageNumber + 1) });
return View(new HomeViewModel() { Posts = result, Page = pageNumber, HasNext = postsByPage.ContainsKey(pageNumber + 1), HasPrevious = postsByPage.ContainsKey(pageNumber - 1) });
}
[Route("/theme/{postName?}")]
public IActionResult Theme(string postName)

2
src/TerribleDev.Blog.Web/Models/HomeViewModel.cs
View File

@@ -7,6 +7,8 @@ namespace TerribleDev.Blog.Web.Models
public IEnumerable<IPost> Posts { get; set;}
public int Page { get; set; }
public string NextUrl { get; set; }
public string PreviousUrl { get; set; }
public bool HasNext { get; set; }
public bool HasPrevious { get; set; }
}
}

2
src/TerribleDev.Blog.Web/Views/Home/FourOhFour.cshtml
View File

@@ -1,7 +1,7 @@
@{
ViewData["Title"] = "FourOhFour";
ViewData["RenderNav"] = true;
ViewData["DisableHeader"] = true;
}
<h1>Ruh Oh!</h1>

8
src/TerribleDev.Blog.Web/Views/Home/Index.cshtml
View File

@@ -2,7 +2,7 @@
@{
ViewData["Title"] = "Home Page";
ViewData["RenderNav"] = true;
ViewData["DisableHeader"] = true;
}
<cache vary-by-route="pageNumber">
@@ -12,8 +12,10 @@
}
@if (Model.HasNext)
{
<div class="nextPageHome">
<a href="/page/@(Model.Page + 1)/" class="btn">Next Page -></a>
<div class="bottomNavButtons">
<a href="/page/@(Model.Page - 1)/" class="btn">&#8592; Previous Page</a>
<div class="spacer"></div>
<a href="/page/@(Model.Page + 1)/" class="btn">Next Page &#8594;</a>
</div>
}
</cache>

1
src/TerribleDev.Blog.Web/Views/Home/Post.cshtml
View File

@@ -1,6 +1,7 @@
@model IPost
@{
ViewData["Title"] = "Post";
ViewData["HideNav"] = true;
}
<cache vary-by-route="postUrl">

15
src/TerribleDev.Blog.Web/Views/Shared/Nav.cshtml
View File

@@ -1,5 +1,16 @@
<nav class="navBar">
<img src="~/content/tommyAvatar3.jpg" class="round" asp-append-version="true" />
@{
var hideNav = ViewData["HideNav"] != null ? "hide" : "";
}
<nav class="navBar @hideNav">
@if (ViewData["HideNav"] != null)
{
<img src="" data-src="~/content/tommyAvatar3.jpg" class="lazy round" />
}
else
{
<img src="~/content/tommyAvatar3.jpg" class="round" />
}
<span>Tommy "Terrible Dev" Parnell</span>
<ul class="sidebarBtns">
<li><a href="/" class="link-unstyled">Home</a></li>

44
src/TerribleDev.Blog.Web/Views/Shared/_Layout.cshtml
View File

@@ -21,26 +21,40 @@
@RenderSection("Head", false)
</head>
<body>
@if (ViewData["RenderNav"] != null)
{
<desktopOnly user-agent="@this.Context.Request.Headers["User-Agent"]">
<partial name="Nav" />
</desktopOnly>
<main role="main" class="bodyWithNav">
<div class="main-content-wrap">
@RenderBody()
</div>
</main>
}
else
<partial name="Nav" />
@if (ViewData["DisableHeader"] == null)
{
<header class="header">
<div><a href="/" class="link-unstyled">The Ramblings of TerribleDev</a></div>
</header>
<main role="main" class="main-content-wrap headerBump">
@RenderBody()
</main>
}
@{
var bodyBump = ViewData["HideNav"] == null ? "bodyWithNav": "";
var headerBump = ViewData["DisableHeader"] == null ? "headerBump" : "";
}
<main role="main" class="@bodyBump @headerBump">
<div class="main-content-wrap">
@RenderBody()
</div>
</main>
@*@if (ViewData["DisableHeader"] != null)
{
<main role="main" class="bodyWithNav">
<div class="main-content-wrap">
@RenderBody()
</div>
</main>
}
else
{
<header class="header">
<div><a href="/" class="link-unstyled">The Ramblings of TerribleDev</a></div>
</header>
<main role="main" class="main-content-wrap headerBump">
@RenderBody()
</main>
}*@
@RenderSection("Scripts", required: false)
<environment names="Development">
<script asp-append-version="true" src="~/js/swi.js" async></script>

2
src/TerribleDev.Blog.Web/Views/Tags/AllTags.cshtml
View File

@@ -1,7 +1,7 @@
@model Dictionary<string, List<IPost>>
@{
ViewData["Title"] = "all-tags";
ViewData["RenderNav"] = true;
ViewData["DisableHeader"] = true;
}
<h2>All Tags</h2>
@foreach (var tag in Model.Keys)

2
src/TerribleDev.Blog.Web/Views/Tags/GetTag.cshtml
View File

@@ -2,7 +2,7 @@
@model GetTagViewModel
@{
ViewData["Tag:" + Model.Tag] = "GetTag";
ViewData["RenderNav"] = true;
ViewData["DisableHeader"] = true;
}
@foreach (var post in Model.Posts)
{

25
src/TerribleDev.Blog.Web/wwwroot/css/site.css
View File

@@ -45,11 +45,8 @@ body {
padding-left: 1.2em;
padding-bottom: 1.2em;
}
.main-content-wrap.headerBump {
.headerBump {
padding-top: 3.5rem;
padding-right: 1.2em;
padding-left: 1.2em;
padding-bottom: 1.2em;
}
.main-content-wrap img {
@@ -149,10 +146,6 @@ a {
font-size: 1.8rem;
}
.navBar {
display: none !important;
}
.bodyWithNav {
width: initial;
float: initial;
@@ -181,7 +174,13 @@ a {
color: white;
width: 250px;
padding-top: 20px;
transition: width ease-in .5s;
z-index: 100;
}
.navBar.hide {
width: 0;
overflow: auto;
}
.navBar > * {
max-width: 100%;
@@ -217,8 +216,12 @@ a {
border-radius: 50%;
}
.nextPageHome {
.bottomNavButtons {
display: flex;
flex-direction: row-reverse;
margin-top: .5rem
flex-direction: row;
margin-top: .5rem;
width: 100%;
}
.spacer {
flex-grow: 1;
}

2
src/TerribleDev.Blog.Web/wwwroot/js/swi.js
View File

@@ -20,4 +20,4 @@ if(fetch){
fetch(item.href);
})
}
Promise.resolve(fetched);
Promise.resolve(fetched);

1
src/TerribleDev.Blog.Web/wwwroot/svg/hamburger.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="32px" id="Layer_1" style="enable-background:new 0 0 32 32;" version="1.1" viewBox="0 0 32 32" width="32px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M4,10h24c1.104,0,2-0.896,2-2s-0.896-2-2-2H4C2.896,6,2,6.896,2,8S2.896,10,4,10z M28,14H4c-1.104,0-2,0.896-2,2 s0.896,2,2,2h24c1.104,0,2-0.896,2-2S29.104,14,28,14z M28,22H4c-1.104,0-2,0.896-2,2s0.896,2,2,2h24c1.104,0,2-0.896,2-2 S29.104,22,28,22z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 605 B