Compare commits

...

2 Commits

Author SHA1 Message Date
Oliver Booth 20656e74e8
refactor: remove redundant function 2023-08-10 04:57:17 +01:00
Oliver Booth 2036970fa2
fix: remove redundant article tag 2023-08-10 04:56:28 +01:00
2 changed files with 14 additions and 51 deletions

View File

@ -60,20 +60,18 @@
<p>@Html.Raw(BlogService.GetExcerpt(post, out bool trimmed))</p> <p>@Html.Raw(BlogService.GetExcerpt(post, out bool trimmed))</p>
<article> @if (trimmed)
@if (trimmed) {
{ <p>
<p> <a asp-page="/blog/article"
<a asp-page="/blog/article" asp-route-year="@year"
asp-route-year="@year" asp-route-month="@month"
asp-route-month="@month" asp-route-day="@day"
asp-route-day="@day" asp-route-slug="@post.Slug">
asp-route-slug="@post.Slug"> Read more...
Read more... </a>
</a> </p>
</p> }
}
</article>
</div> </div>
</div> </div>

View File

@ -83,7 +83,7 @@ declare const katex: any;
i += 4; i += 4;
} }
const disqusCounter = document.createElement("script"); const disqusCounter = document.createElement("script");
disqusCounter.id = "dsq-count-scr"; disqusCounter.id = "dsq-count-scr";
disqusCounter.src = "https://oliverbooth-dev.disqus.com/count.js"; disqusCounter.src = "https://oliverbooth-dev.disqus.com/count.js";
@ -97,41 +97,6 @@ declare const katex: any;
}); });
} }
const formatRelativeTime = function (timestamp) {
const now = new Date();
// @ts-ignore
const diff = now - timestamp;
const suffix = diff < 0 ? 'from now' : 'ago';
const seconds = Math.floor(diff / 1000);
if (seconds < 60) {
return `${seconds} second${seconds !== 1 ? 's' : ''} ${suffix}`;
}
const minutes = Math.floor(diff / 60000);
if (minutes < 60) {
return `${minutes} minute${minutes !== 1 ? 's' : ''} ${suffix}`;
}
const hours = Math.floor(diff / 3600000);
if (hours < 24) {
return `${hours} hour${hours !== 1 ? 's' : ''} ${suffix}`;
}
const days = Math.floor(diff / 86400000);
if (days < 30) {
return `${days} day${days !== 1 ? 's' : ''} ${suffix}`;
}
const months = Math.floor(diff / 2592000000);
if (months < 12) {
return `${months} month${months !== 1 ? 's' : ''} ${suffix}`;
}
const years = Math.floor(diff / 31536000000);
return `${years} year${years !== 1 ? 's' : ''} ${suffix}`;
};
document.querySelectorAll("pre code").forEach((block) => { document.querySelectorAll("pre code").forEach((block) => {
let content = block.textContent; let content = block.textContent;
if (content.trim().split("\n").length > 1) { if (content.trim().split("\n").length > 1) {
@ -195,7 +160,7 @@ declare const katex: any;
case "R": case "R":
setInterval(() => { setInterval(() => {
timestamp.textContent = formatRelativeTime(date); timestamp.textContent = TimeUtility.formatRelativeTimestamp(date);
}, 1000); }, 1000);
break; break;
} }