oliverbooth/oliverbooth.dev
oliverbooth/oliverbooth.dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

refactor: combine sites into one

Browse Source 
CORS was "cors"ing some issues (heh).

But also it is easier to maintain this way. Development was made much more difficult when I separated it. Combining it all also improves SEO
This commit is contained in:
Oliver Booth 2023-08-13 17:33:54 +01:00
parent be44fb4b4b
commit 0a9c2e82d5
Signed by: oliverbooth
GPG Key ID: B89D139977693FED
60 changed files with 278 additions and 404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gulpfile.js
View File

@ -7,7 +7,7 @@ const terser = require('gulp-terser');
const webpack = require('webpack-stream');
const srcDir = 'src';
const destDir = 'OliverBooth.Common/wwwroot';
const destDir = 'OliverBooth/wwwroot';
function compileSCSS() {
return gulp.src(`${srcDir}/scss/**/*.scss`)

20
OliverBooth.Blog/Dockerfile
View File

@ -1,20 +0,0 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
WORKDIR /src
COPY ["OliverBooth.Blog/OliverBooth.Blog.csproj", "OliverBooth.Blog/"]
RUN dotnet restore "OliverBooth.Blog/OliverBooth.Blog.csproj"
COPY . .
WORKDIR "/src/OliverBooth.Blog"
RUN dotnet build "OliverBooth.Blog.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "OliverBooth.Blog.csproj" -c Release -o /app/publish /p:UseAppHost=false
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "OliverBooth.Blog.dll"]

13
OliverBooth.Blog/OliverBooth.Blog.csproj
View File

@ -1,13 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\OliverBooth.Common\OliverBooth.Common.csproj"/>
</ItemGroup>
</Project>

2
OliverBooth.Blog/Pages/_ViewImports.cshtml
View File

@ -1,2 +0,0 @@
@namespace OliverBooth.Blog.Pages
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

3
OliverBooth.Blog/Pages/_ViewStart.cshtml
View File

@ -1,3 +0,0 @@
@{
Layout = "_Layout";
}

39
OliverBooth.Blog/Program.cs
View File

@ -1,39 +0,0 @@
using OliverBooth.Blog.Data;
using OliverBooth.Blog.Middleware;
using OliverBooth.Blog.Services;
using OliverBooth.Common;
using OliverBooth.Common.Extensions;
using OliverBooth.Common.Services;
using Serilog;
Log.Logger = new LoggerConfiguration()
.WriteTo.Console()
.WriteTo.File("logs/latest.log", rollingInterval: RollingInterval.Day)
.CreateLogger();
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
builder.Configuration.AddTomlFile("data/config.toml", true, true);
builder.Logging.ClearProviders();
builder.Logging.AddSerilog();
builder.Services.AddMarkdownPipeline();
builder.Services.ConfigureOptions<OliverBoothConfigureOptions>();
builder.Services.AddDbContextFactory<BlogContext>();
builder.Services.AddSingleton<IBlogPostService, BlogPostService>();
builder.Services.AddSingleton<IUserService, UserService>();
builder.Services.AddSingleton<ITemplateService, TemplateService>();
builder.Services.AddRazorPages().AddRazorRuntimeCompilation();
builder.Services.AddControllersWithViews();
builder.WebHost.AddCertificateFromEnvironment(2846, 5050);
WebApplication app = builder.Build();
app.UseHttpsRedirection();
app.UseStaticFiles();
app.UseRouting();
app.MapRssFeed("/feed");
app.MapRazorPages();
app.MapControllers();
app.Run();

70
OliverBooth.Blog/Services/TemplateService.cs
View File

@ -1,70 +0,0 @@
using System.Buffers.Binary;
using Microsoft.EntityFrameworkCore;
using OliverBooth.Blog.Data;
using OliverBooth.Common.Formatting;
using OliverBooth.Common.Markdown;
using OliverBooth.Common.Services;
using SmartFormat;
using SmartFormat.Extensions;
namespace OliverBooth.Blog.Services;
/// <summary>
/// Represents a service that renders MediaWiki-style templates.
/// </summary>
internal sealed class TemplateService : ITemplateService
{
private static readonly Random Random = new();
private readonly IDbContextFactory<BlogContext> _webContextFactory;
private readonly SmartFormatter _formatter;
/// <summary>
/// Initializes a new instance of the <see cref="TemplateService" /> class.
/// </summary>
/// <param name="serviceProvider">The <see cref="IServiceProvider" />.</param>
/// <param name="webContextFactory">The <see cref="BlogContext" /> factory.</param>
public TemplateService(IServiceProvider serviceProvider, IDbContextFactory<BlogContext> webContextFactory)
{
_formatter = Smart.CreateDefaultSmartFormat();
_formatter.AddExtensions(new DefaultSource());
_formatter.AddExtensions(new ReflectionSource());
_formatter.AddExtensions(new DateFormatter());
_formatter.AddExtensions(new MarkdownFormatter(serviceProvider));
_webContextFactory = webContextFactory;
}
/// <inheritdoc />
public string RenderTemplate(TemplateInline templateInline)
{
if (templateInline is null) throw new ArgumentNullException(nameof(templateInline));
using BlogContext webContext = _webContextFactory.CreateDbContext();
Template? template = webContext.Templates.Find(templateInline.Name);
if (template is null)
{
return $"{{{{{templateInline.Name}}}}}";
}
Span<byte> randomBytes = stackalloc byte[20];
Random.NextBytes(randomBytes);
var formatted = new
{
templateInline.ArgumentList,
templateInline.ArgumentString,
templateInline.Params,
RandomInt = BinaryPrimitives.ReadInt32LittleEndian(randomBytes[..4]),
RandomGuid = new Guid(randomBytes[4..]).ToString("N"),
};
try
{
return _formatter.Format(template.FormatString, formatted);
}
catch
{
return $"{{{{{templateInline.Name}|{templateInline.ArgumentString}}}}}";
}
}
}

28
OliverBooth.Common/Extensions/ServiceCollectionExtensions.cs
View File

@ -1,28 +0,0 @@
using Markdig;
using Microsoft.Extensions.DependencyInjection;
using OliverBooth.Common.Markdown;
using OliverBooth.Common.Services;
namespace OliverBooth.Common.Extensions;
/// <summary>
/// Extension methods for <see cref="IServiceCollection" />.
/// </summary>
public static class ServiceCollectionExtensions
{
/// <summary>
/// Adds the Markdown pipeline to the <see cref="IServiceCollection" />.
/// </summary>
/// <param name="serviceCollection">The <see cref="IServiceCollection" />.</param>
/// <returns>The <see cref="IServiceCollection" />.</returns>
public static IServiceCollection AddMarkdownPipeline(this IServiceCollection serviceCollection)
{
return serviceCollection.AddSingleton(provider => new MarkdownPipelineBuilder()
.Use(new TemplateExtension(provider.GetRequiredService<ITemplateService>()))
.UseAdvancedExtensions()
.UseBootstrap()
.UseEmojiAndSmiley()
.UseSmartyPants()
.Build());
}
}

39
OliverBooth.Common/OliverBooth.Common.csproj
View File

@ -1,39 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
<ItemGroup>
<SupportedPlatform Include="browser"/>
</ItemGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
<PackageReference Include="Alexinea.Extensions.Configuration.Toml" Version="7.0.0"/>
<PackageReference Include="Humanizer.Core" Version="2.14.1"/>
<PackageReference Include="Markdig" Version="0.32.0"/>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.10"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.10"/>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10"/>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0"/>
<PackageReference Include="Serilog" Version="3.0.1"/>
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0"/>
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
<PackageReference Include="SmartFormat.NET" Version="3.2.2"/>
<PackageReference Include="X10D" Version="3.2.2"/>
<PackageReference Include="X10D.Hosting" Version="3.2.2"/>
<PackageReference Include="ZString" Version="2.5.0"/>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="wwwroot\**\*"/>
</ItemGroup>
</Project>

41
OliverBooth.Common/OliverBoothConfigureOptions.cs
View File

@ -1,41 +0,0 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Options;
namespace OliverBooth.Common;
/// <summary>
/// Represents the middleware to configure static file options.
/// </summary>
public sealed class OliverBoothConfigureOptions : IPostConfigureOptions<StaticFileOptions>
{
private readonly IWebHostEnvironment _environment;
/// <summary>
/// Initializes a new instance of the <see cref="OliverBoothConfigureOptions" /> class.
/// </summary>
/// <param name="environment">The <see cref="IWebHostEnvironment" />.</param>
public OliverBoothConfigureOptions(IWebHostEnvironment environment)
{
_environment = environment;
}
/// <inheritdoc />
public void PostConfigure(string? name, StaticFileOptions options)
{
// ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
options.ContentTypeProvider ??= new FileExtensionContentTypeProvider();
if (options.FileProvider == null && _environment.WebRootFileProvider == null)
{
throw new InvalidOperationException("Missing FileProvider.");
}
options.FileProvider ??= _environment.WebRootFileProvider;
var filesProvider = new ManifestEmbeddedFileProvider(GetType().Assembly, "wwwroot");
options.FileProvider = new CompositeFileProvider(options.FileProvider, filesProvider);
}
}

2
OliverBooth.Common/Pages/_ViewImports.cshtml
View File

@ -1,2 +0,0 @@
@namespace OliverBooth.Common.Pages
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

12
OliverBooth.sln
View File

@ -34,10 +34,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ts", "ts", "{BB9F76AC-292A-
src\ts\Input.ts = src\ts\Input.ts
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OliverBooth.Blog", "OliverBooth.Blog\OliverBooth.Blog.csproj", "{B114A2ED-3015-43C5-B0CE-B755B18F49D0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OliverBooth.Common", "OliverBooth.Common\OliverBooth.Common.csproj", "{38DEB2FA-3DF4-4D37-A12D-22CAEEA3A8AB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -48,14 +44,6 @@ Global
{A58A6FA3-480C-400B-822A-3786741BF39C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A58A6FA3-480C-400B-822A-3786741BF39C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A58A6FA3-480C-400B-822A-3786741BF39C}.Release|Any CPU.Build.0 = Release|Any CPU
{B114A2ED-3015-43C5-B0CE-B755B18F49D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B114A2ED-3015-43C5-B0CE-B755B18F49D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B114A2ED-3015-43C5-B0CE-B755B18F49D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B114A2ED-3015-43C5-B0CE-B755B18F49D0}.Release|Any CPU.Build.0 = Release|Any CPU
{38DEB2FA-3DF4-4D37-A12D-22CAEEA3A8AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{38DEB2FA-3DF4-4D37-A12D-22CAEEA3A8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38DEB2FA-3DF4-4D37-A12D-22CAEEA3A8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38DEB2FA-3DF4-4D37-A12D-22CAEEA3A8AB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{822F528E-3CA7-4B7D-9250-BD248ADA7BAE} = {8A323E64-E41E-4780-99FD-17BF58961FB5}

0
OliverBooth.Common/.gitignore → OliverBooth/.gitignore vendored
View File

89
OliverBooth/Controllers/Blog/BlogApiController.cs Normal file
View File

@ -0,0 +1,89 @@
using Humanizer;
using Microsoft.AspNetCore.Mvc;
using OliverBooth.Data.Blog;
using OliverBooth.Services;
namespace OliverBooth.Controllers.Blog;
/// <summary>
/// Represents a controller for the blog API.
/// </summary>
[ApiController]
[Route("api/blog")]
[Produces("application/json")]
public sealed class BlogApiController : ControllerBase
{
private readonly IBlogPostService _blogPostService;
private readonly IBlogUserService _userService;
/// <summary>
/// Initializes a new instance of the <see cref="BlogApiController" /> class.
/// </summary>
/// <param name="blogPostService">The <see cref="IBlogPostService" />.</param>
/// <param name="userService">The <see cref="IUserService" />.</param>
public BlogApiController(IBlogPostService blogPostService, IBlogUserService userService)
{
_blogPostService = blogPostService;
_userService = userService;
}
[Route("count")]
public IActionResult Count()
{
return Ok(new { count = _blogPostService.GetBlogPostCount() });
}
[HttpGet("posts/{page:int?}")]
public IActionResult GetAllBlogPosts(int page = 0)
{
const int itemsPerPage = 10;
IReadOnlyList<IBlogPost> allPosts = _blogPostService.GetBlogPosts(page, itemsPerPage);
return Ok(allPosts.Select(post => CreatePostObject(post)));
}
[HttpGet("author/{id:guid}")]
public IActionResult GetAuthor(Guid id)
{
if (!_userService.TryGetUser(id, out IUser? author)) return NotFound();
return Ok(new
{
id = author.Id,
name = author.DisplayName,
avatarUrl = author.AvatarUrl,
});
}
[HttpGet("post/{id:guid?}")]
public IActionResult GetPost(Guid id)
{
if (!_blogPostService.TryGetPost(id, out IBlogPost? post)) return NotFound();
return Ok(CreatePostObject(post, true));
}
private object CreatePostObject(IBlogPost post, bool includeContent = false)
{
return new
{
id = post.Id,
commentsEnabled = post.EnableComments,
identifier = post.GetDisqusIdentifier(),
author = post.Author.Id,
title = post.Title,
published = post.Published.ToUnixTimeSeconds(),
formattedDate = post.Published.ToString("dddd, d MMMM yyyy HH:mm"),
updated = post.Updated?.ToUnixTimeSeconds(),
humanizedTimestamp = post.Updated?.Humanize() ?? post.Published.Humanize(),
excerpt = _blogPostService.RenderExcerpt(post, out bool trimmed),
content = includeContent ? _blogPostService.RenderPost(post) : null,
trimmed,
url = new
{
year = post.Published.ToString("yyyy"),
month = post.Published.ToString("MM"),
day = post.Published.ToString("dd"),
slug = post.Slug
}
};
}
}

4
OliverBooth.Blog/Data/BlogContext.cs → OliverBooth/Data/Blog/BlogContext.cs
View File

@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using OliverBooth.Blog.Data.Configuration;
using OliverBooth.Data.Blog.Configuration;
namespace OliverBooth.Blog.Data;
namespace OliverBooth.Data.Blog;
/// <summary>
/// Represents a session with the blog database.

2
OliverBooth.Blog/Data/BlogPost.cs → OliverBooth/Data/Blog/BlogPost.cs
View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations.Schema;
using SmartFormat;
namespace OliverBooth.Blog.Data;
namespace OliverBooth.Data.Blog;
/// <inheritdoc />
internal sealed class BlogPost : IBlogPost

2
OliverBooth.Blog/Data/Configuration/BlogPostConfiguration.cs → OliverBooth/Data/Blog/Configuration/BlogPostConfiguration.cs
View File

@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace OliverBooth.Blog.Data.Configuration;
namespace OliverBooth.Data.Blog.Configuration;
internal sealed class BlogPostConfiguration : IEntityTypeConfiguration<BlogPost>
{

2
OliverBooth.Blog/Data/Configuration/TemplateConfiguration.cs → OliverBooth/Data/Blog/Configuration/TemplateConfiguration.cs
View File

@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace OliverBooth.Blog.Data.Configuration;
namespace OliverBooth.Data.Blog.Configuration;
/// <summary>
/// Represents the configuration for the <see cref="Template" /> entity.

2
OliverBooth.Blog/Data/Configuration/UserConfiguration.cs → OliverBooth/Data/Blog/Configuration/UserConfiguration.cs
View File

@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
namespace OliverBooth.Blog.Data.Configuration;
namespace OliverBooth.Data.Blog.Configuration;
internal sealed class UserConfiguration : IEntityTypeConfiguration<User>
{

2
OliverBooth.Blog/Data/IBlogAuthor.cs → OliverBooth/Data/Blog/IBlogAuthor.cs
View File

@ -1,4 +1,4 @@
namespace OliverBooth.Blog.Data;
namespace OliverBooth.Data.Blog;
/// <summary>
/// Represents the author of a blog post.

2
OliverBooth.Blog/Data/IBlogPost.cs → OliverBooth/Data/Blog/IBlogPost.cs
View File

@ -1,4 +1,4 @@
namespace OliverBooth.Blog.Data;
namespace OliverBooth.Data.Blog;
/// <summary>
/// Represents a blog post.

2
OliverBooth.Blog/Data/IUser.cs → OliverBooth/Data/Blog/IUser.cs
View File

@ -1,4 +1,4 @@
namespace OliverBooth.Blog.Data;
namespace OliverBooth.Data.Blog;
/// <summary>
/// Represents a user which can log in to the blog.

2
OliverBooth.Blog/Data/Rss/AtomLink.cs → OliverBooth/Data/Blog/Rss/AtomLink.cs
View File

@ -1,6 +1,6 @@
using System.Xml.Serialization;
namespace OliverBooth.Data.Rss;
namespace OliverBooth.Data.Blog.Rss;
public sealed class AtomLink
{

2
OliverBooth.Blog/Data/Rss/BlogChannel.cs → OliverBooth/Data/Blog/Rss/BlogChannel.cs
View File

@ -1,6 +1,6 @@
using System.Xml.Serialization;
namespace OliverBooth.Data.Rss;
namespace OliverBooth.Data.Blog.Rss;
public sealed class BlogChannel
{

2
OliverBooth.Blog/Data/Rss/BlogItem.cs → OliverBooth/Data/Blog/Rss/BlogItem.cs
View File

@ -1,6 +1,6 @@
using System.Xml.Serialization;
namespace OliverBooth.Data.Rss;
namespace OliverBooth.Data.Blog.Rss;
public sealed class BlogItem
{

2
OliverBooth.Blog/Data/Rss/BlogRoot.cs → OliverBooth/Data/Blog/Rss/BlogRoot.cs
View File

@ -1,6 +1,6 @@
using System.Xml.Serialization;
namespace OliverBooth.Data.Rss;
namespace OliverBooth.Data.Blog.Rss;
[XmlRoot("rss")]
public sealed class BlogRoot

4
OliverBooth.Blog/Data/Template.cs → OliverBooth/Data/Blog/Template.cs
View File

@ -1,6 +1,4 @@
using OliverBooth.Common.Data;
namespace OliverBooth.Blog.Data;
namespace OliverBooth.Data.Blog;
/// <summary>
/// Represents a MediaWiki-style template.

2
OliverBooth.Blog/Data/User.cs → OliverBooth/Data/Blog/User.cs
View File

@ -3,7 +3,7 @@ using System.Security.Cryptography;
using System.Text;
using Cysharp.Text;
namespace OliverBooth.Blog.Data;
namespace OliverBooth.Data.Blog;
/// <summary>
/// Represents a user.

2
OliverBooth.Common/Data/ITemplate.cs → OliverBooth/Data/ITemplate.cs
View File

@ -1,4 +1,4 @@
namespace OliverBooth.Common.Data;
namespace OliverBooth.Data;
/// <summary>
/// Represents a template.

2
OliverBooth/Data/Web/Template.cs
View File

@ -1,5 +1,3 @@
using OliverBooth.Common.Data;
namespace OliverBooth.Data.Web;
/// <summary>

3
OliverBooth/Data/WebContext.cs → OliverBooth/Data/Web/WebContext.cs
View File

@ -1,8 +1,7 @@
using Microsoft.EntityFrameworkCore;
using OliverBooth.Data.Web;
using OliverBooth.Data.Web.Configuration;
namespace OliverBooth.Data;
namespace OliverBooth.Data.Web;
/// <summary>
/// Represents a session with the web database.

40
OliverBooth.Common/Extensions/WebHostBuilderExtensions.cs → OliverBooth/Extensions/WebHostBuilderExtensions.cs
View File

@ -1,8 +1,6 @@
using System.Runtime.InteropServices;
using System.Security.Cryptography.X509Certificates;
using Microsoft.AspNetCore.Hosting;
namespace OliverBooth.Common.Extensions;
namespace OliverBooth.Extensions;
/// <summary>
/// Extension methods for <see cref="IWebHostBuilder" />.
@ -23,31 +21,35 @@ public static class WebHostBuilderExtensions
return builder.UseKestrel(options =>
{
string certPath = Environment.GetEnvironmentVariable("SSL_CERT_PATH")!;
if (string.IsNullOrWhiteSpace(certPath))
{
Console.WriteLine("Certificate path not specified. Using HTTP");
options.ListenAnyIP(httpPort);
return;
}
if (!File.Exists(certPath))
{
Console.Error.WriteLine("Certificate not found. Using HTTP");
options.ListenAnyIP(httpPort);
return;
}
string? keyPath = Environment.GetEnvironmentVariable("SSL_KEY_PATH");
if (string.IsNullOrWhiteSpace(keyPath) || !File.Exists(keyPath)) keyPath = null;
options.ListenAnyIP(httpsPort, options =>
if (string.IsNullOrWhiteSpace(keyPath))
{
X509Certificate2 cert = CreateCertFromPemFile(certPath, keyPath);
options.UseHttps(cert);
});
return;
static X509Certificate2 CreateCertFromPemFile(string certPath, string? keyPath)
{
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
return X509Certificate2.CreateFromPemFile(certPath, keyPath);
//workaround for windows issue https://github.com/dotnet/runtime/issues/23749#issuecomment-388231655
using var cert = X509Certificate2.CreateFromPemFile(certPath, keyPath);
return new X509Certificate2(cert.Export(X509ContentType.Pkcs12));
Console.WriteLine("Certificate found, but no key provided. Using certificate only");
keyPath = null;
}
else if (!File.Exists(keyPath))
{
Console.Error.WriteLine("Certificate found, but the provided key was not. Using certificate only");
keyPath = null;
}
Console.WriteLine($"Using HTTPS with certificate found at {certPath}:{keyPath}");
var certificate = X509Certificate2.CreateFromPemFile(certPath, keyPath);
options.ListenAnyIP(httpsPort, configure => configure.UseHttps(certificate));
});
}
}

2
OliverBooth.Common/Formatting/DateFormatter.cs → OliverBooth/Formatting/DateFormatter.cs
View File

@ -1,7 +1,7 @@
using System.Globalization;
using SmartFormat.Core.Extensions;
namespace OliverBooth.Common.Formatting;
namespace OliverBooth.Formatting;
/// <summary>
/// Represents a SmartFormat formatter that formats a date.

3
OliverBooth.Common/Formatting/MarkdownFormatter.cs → OliverBooth/Formatting/MarkdownFormatter.cs
View File

@ -1,8 +1,7 @@
using Markdig;
using Microsoft.Extensions.DependencyInjection;
using SmartFormat.Core.Extensions;
namespace OliverBooth.Common.Formatting;
namespace OliverBooth.Formatting;
/// <summary>
/// Represents a SmartFormat formatter that formats markdown.

4
OliverBooth.Common/Markdown/TemplateExtension.cs → OliverBooth/Markdown/Template/TemplateExtension.cs
View File

@ -1,8 +1,8 @@
using Markdig;
using Markdig.Renderers;
using OliverBooth.Common.Services;
using OliverBooth.Services;
namespace OliverBooth.Common.Markdown;
namespace OliverBooth.Markdown.Template;
/// <summary>
/// Represents a Markdown extension that adds support for MediaWiki-style templates.

2
OliverBooth.Common/Markdown/TemplateInline.cs → OliverBooth/Markdown/Template/TemplateInline.cs
View File

@ -1,6 +1,6 @@
using Markdig.Syntax.Inlines;
namespace OliverBooth.Common.Markdown;
namespace OliverBooth.Markdown.Template;
/// <summary>
/// Represents a Markdown inline element that represents a MediaWiki-style template.

2
OliverBooth.Common/Markdown/TemplateInlineParser.cs → OliverBooth/Markdown/Template/TemplateInlineParser.cs
View File

@ -2,7 +2,7 @@ using Cysharp.Text;
using Markdig.Helpers;
using Markdig.Parsers;
namespace OliverBooth.Common.Markdown;
namespace OliverBooth.Markdown.Template;
/// <summary>
/// Represents a Markdown inline parser that handles MediaWiki-style templates.

4
OliverBooth.Common/Markdown/TemplateRenderer.cs → OliverBooth/Markdown/Template/TemplateRenderer.cs
View File

@ -1,8 +1,8 @@
using Markdig.Renderers;
using Markdig.Renderers.Html;
using OliverBooth.Common.Services;
using OliverBooth.Services;
namespace OliverBooth.Common.Markdown;
namespace OliverBooth.Markdown.Template;
/// <summary>
/// Represents a Markdown object renderer that handles <see cref="TemplateInline" /> elements.

2
OliverBooth.Blog/Middleware/RssEndpointExtensions.cs → OliverBooth/Middleware/RssEndpointExtensions.cs
View File

@ -1,4 +1,4 @@
namespace OliverBooth.Blog.Middleware;
namespace OliverBooth.Middleware;
internal static class RssEndpointExtensions
{

8
OliverBooth.Blog/Middleware/RssMiddleware.cs → OliverBooth/Middleware/RssMiddleware.cs
View File

@ -1,10 +1,10 @@
using System.Diagnostics.CodeAnalysis;
using System.Xml.Serialization;
using OliverBooth.Blog.Data;
using OliverBooth.Blog.Services;
using OliverBooth.Data.Rss;
using OliverBooth.Data.Blog;
using OliverBooth.Data.Blog.Rss;
using OliverBooth.Services;
namespace OliverBooth.Blog.Middleware;
namespace OliverBooth.Middleware;
internal sealed class RssMiddleware
{

17
OliverBooth/OliverBooth.csproj
View File

@ -8,7 +8,22 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\OliverBooth.Common\OliverBooth.Common.csproj"/>
<PackageReference Include="Alexinea.Extensions.Configuration.Toml" Version="7.0.0"/>
<PackageReference Include="Humanizer.Core" Version="2.14.1"/>
<PackageReference Include="Markdig" Version="0.32.0"/>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.10"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.10"/>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.10"/>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0"/>
<PackageReference Include="Serilog" Version="3.0.1"/>
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0"/>
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
<PackageReference Include="SmartFormat.NET" Version="3.2.2"/>
<PackageReference Include="X10D" Version="3.2.2"/>
<PackageReference Include="X10D.Hosting" Version="3.2.2"/>
<PackageReference Include="ZString" Version="2.5.0"/>
</ItemGroup>
</Project>

7
OliverBooth.Blog/Pages/Article.cshtml → OliverBooth/Pages/Blog/Article.cshtml
View File

@ -1,6 +1,6 @@
@page "/{year:int}/{month:int}/{day:int}/{slug}"
@using Humanizer
@using OliverBooth.Blog.Data
@using OliverBooth.Data.Blog
@model Article
@if (Model.Post is not { } post)
@ -47,9 +47,8 @@
}
</p>
<article>
@* @Html.Raw(BlogService.GetContent(post)) *@
@Html.Raw(post.Body)
<article data-blog-post="true" data-blog-id="@post.Id.ToString("D")">
<p class="text-center">Loading ...</p>
</article>
<hr>

6
OliverBooth.Blog/Pages/Article.cshtml.cs → OliverBooth/Pages/Blog/Article.cshtml.cs
View File

@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using OliverBooth.Blog.Data;
using OliverBooth.Blog.Services;
using OliverBooth.Data.Blog;
using OliverBooth.Services;
namespace OliverBooth.Blog.Pages;
namespace OliverBooth.Pages.Blog;
/// <summary>
/// Represents the page model for the <c>Article</c> page.

0
OliverBooth.Blog/Pages/Index.cshtml → OliverBooth/Pages/Blog/Index.cshtml
View File

6
OliverBooth.Blog/Pages/Index.cshtml.cs → OliverBooth/Pages/Blog/Index.cshtml.cs
View File

@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using OliverBooth.Blog.Data;
using OliverBooth.Blog.Services;
using OliverBooth.Data.Blog;
using OliverBooth.Services;
namespace OliverBooth.Blog.Pages;
namespace OliverBooth.Pages.Blog;
[Area("blog")]
public class Index : PageModel

0
OliverBooth.Blog/Pages/RawArticle.cshtml → OliverBooth/Pages/Blog/RawArticle.cshtml
View File

6
OliverBooth.Blog/Pages/RawArticle.cshtml.cs → OliverBooth/Pages/Blog/RawArticle.cshtml.cs
View File

@ -1,10 +1,10 @@
using Cysharp.Text;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using OliverBooth.Blog.Data;
using OliverBooth.Blog.Services;
using OliverBooth.Data.Blog;
using OliverBooth.Services;
namespace OliverBooth.Blog.Pages;
namespace OliverBooth.Pages.Blog;
/// <summary>
/// Represents the page model for the <c>RawArticle</c> page.

0
OliverBooth.Common/Pages/Shared/_Layout.cshtml → OliverBooth/Pages/Shared/_Layout.cshtml
View File

0
OliverBooth.Common/Pages/Shared/_LoadingSpinner.cshtml → OliverBooth/Pages/Shared/_LoadingSpinner.cshtml
View File

31
OliverBooth/Program.cs
View File

@ -1,7 +1,9 @@
using OliverBooth.Common;
using OliverBooth.Common.Extensions;
using OliverBooth.Common.Services;
using OliverBooth.Data;
using Markdig;
using OliverBooth.Data.Blog;
using OliverBooth.Data.Web;
using OliverBooth.Extensions;
using OliverBooth.Markdown.Template;
using OliverBooth.Markdown.Timestamp;
using OliverBooth.Services;
using Serilog;
@ -15,15 +17,28 @@ builder.Configuration.AddTomlFile("data/config.toml", true, true);
builder.Logging.ClearProviders();
builder.Logging.AddSerilog();
builder.Services.AddMarkdownPipeline();
builder.Services.ConfigureOptions<OliverBoothConfigureOptions>();
builder.Services.AddSingleton<ITemplateService, TemplateService>();
builder.Services.AddSingleton(provider => new MarkdownPipelineBuilder()
.Use<TimestampExtension>()
.Use(new TemplateExtension(provider.GetRequiredService<ITemplateService>()))
.UseAdvancedExtensions()
.UseBootstrap()
.UseEmojiAndSmiley()
.UseSmartyPants()
.Build());
builder.Services.AddDbContextFactory<BlogContext>();
builder.Services.AddDbContextFactory<WebContext>();
builder.Services.AddSingleton<ITemplateService, TemplateService>();
builder.Services.AddSingleton<IBlogPostService, BlogPostService>();
builder.Services.AddSingleton<IBlogUserService, BlogUserService>();
builder.Services.AddRazorPages().AddRazorRuntimeCompilation();
builder.Services.AddControllersWithViews();
builder.Services.AddRouting(options => options.LowercaseUrls = true);
builder.WebHost.AddCertificateFromEnvironment(2845, 5049);
if (builder.Environment.IsProduction())
{
builder.WebHost.AddCertificateFromEnvironment(2845, 5049);
}
WebApplication app = builder.Build();

60
OliverBooth.Blog/Services/BlogPostService.cs → OliverBooth/Services/BlogPostService.cs
View File

@ -1,8 +1,10 @@
using System.Diagnostics.CodeAnalysis;
using Humanizer;
using Markdig;
using Microsoft.EntityFrameworkCore;
using OliverBooth.Blog.Data;
using OliverBooth.Data.Blog;
namespace OliverBooth.Blog.Services;
namespace OliverBooth.Services;
/// <summary>
/// Represents an implementation of <see cref="IBlogPostService" />.
@ -10,7 +12,8 @@ namespace OliverBooth.Blog.Services;
internal sealed class BlogPostService : IBlogPostService
{
private readonly IDbContextFactory<BlogContext> _dbContextFactory;
private readonly IUserService _userService;
private readonly IBlogUserService _blogUserService;
private readonly MarkdownPipeline _markdownPipeline;
/// <summary>
/// Initializes a new instance of the <see cref="BlogPostService" /> class.
@ -18,20 +21,35 @@ internal sealed class BlogPostService : IBlogPostService
/// <param name="dbContextFactory">
/// The <see cref="IDbContextFactory{TContext}" /> used to create a <see cref="BlogContext" />.
/// </param>
/// <param name="userService">The <see cref="IUserService" />.</param>
public BlogPostService(IDbContextFactory<BlogContext> dbContextFactory, IUserService userService)
/// <param name="blogUserService">The <see cref="IBlogUserService" />.</param>
/// <param name="markdownPipeline">The <see cref="MarkdownPipeline" />.</param>
public BlogPostService(IDbContextFactory<BlogContext> dbContextFactory,
IBlogUserService blogUserService,
MarkdownPipeline markdownPipeline)
{
_dbContextFactory = dbContextFactory;
_userService = userService;
_blogUserService = blogUserService;
_markdownPipeline = markdownPipeline;
}
/// <inheritdoc />
public int GetBlogPostCount()
{
using BlogContext context = _dbContextFactory.CreateDbContext();
return context.BlogPosts.Count();
}
/// <inheritdoc />
public IReadOnlyList<IBlogPost> GetAllBlogPosts(int limit = -1)
{
using BlogContext context = _dbContextFactory.CreateDbContext();
return context.BlogPosts
.OrderByDescending(post => post.Published)
.Take(limit)
.AsEnumerable().Select(CacheAuthor).ToArray();
IQueryable<BlogPost> ordered = context.BlogPosts.OrderByDescending(post => post.Published);
if (limit > -1)
{
ordered = ordered.Take(limit);
}
return ordered.AsEnumerable().Select(CacheAuthor).ToArray();
}
/// <inheritdoc />
@ -42,22 +60,30 @@ internal sealed class BlogPostService : IBlogPostService
.OrderByDescending(post => post.Published)
.Skip(page * pageSize)
.Take(pageSize)
.AsEnumerable().Select(CacheAuthor).ToArray();
.ToArray().Select(CacheAuthor).ToArray();
}
/// <inheritdoc />
public string RenderExcerpt(IBlogPost post, out bool wasTrimmed)
{
// TODO implement excerpt trimming
wasTrimmed = false;
return post.Body;
string body = post.Body;
int moreIndex = body.IndexOf("<!--more-->", StringComparison.Ordinal);
if (moreIndex == -1)
{
string excerpt = body.Truncate(255, "...");
wasTrimmed = body.Length > 255;
return Markdig.Markdown.ToHtml(excerpt, _markdownPipeline);
}
wasTrimmed = true;
return Markdig.Markdown.ToHtml(body[..moreIndex], _markdownPipeline);
}
/// <inheritdoc />
public string RenderPost(IBlogPost post)
{
// TODO render markdown
return post.Body;
return Markdig.Markdown.ToHtml(post.Body, _markdownPipeline);
}
/// <inheritdoc />
@ -114,7 +140,7 @@ internal sealed class BlogPostService : IBlogPostService
return post;
}
if (_userService.TryGetUser(post.AuthorId, out IUser? user) && user is IBlogAuthor author)
if (_blogUserService.TryGetUser(post.AuthorId, out IUser? user) && user is IBlogAuthor author)
{
post.Author = author;
}

12
OliverBooth.Blog/Services/UserService.cs → OliverBooth/Services/BlogUserService.cs
View File

@ -1,23 +1,23 @@
using System.Diagnostics.CodeAnalysis;
using Microsoft.EntityFrameworkCore;
using OliverBooth.Blog.Data;
using OliverBooth.Data.Blog;
namespace OliverBooth.Blog.Services;
namespace OliverBooth.Services;
/// <summary>
/// Represents an implementation of <see cref="IUserService" />.
/// Represents an implementation of <see cref="IBlogUserService" />.
/// </summary>
internal sealed class UserService : IUserService
internal sealed class BlogUserService : IBlogUserService
{
private readonly IDbContextFactory<BlogContext> _dbContextFactory;
/// <summary>
/// Initializes a new instance of the <see cref="UserService" /> class.
/// Initializes a new instance of the <see cref="BlogUserService" /> class.
/// </summary>
/// <param name="dbContextFactory">
/// The <see cref="IDbContextFactory{TContext}" /> used to create a <see cref="BlogContext" />.
/// </param>
public UserService(IDbContextFactory<BlogContext> dbContextFactory)
public BlogUserService(IDbContextFactory<BlogContext> dbContextFactory)
{
_dbContextFactory = dbContextFactory;
}

10
OliverBooth.Blog/Services/IBlogPostService.cs → OliverBooth/Services/IBlogPostService.cs
View File

@ -1,7 +1,7 @@
using System.Diagnostics.CodeAnalysis;
using OliverBooth.Blog.Data;
using OliverBooth.Data.Blog;
namespace OliverBooth.Blog.Services;
namespace OliverBooth.Services;
/// <summary>
/// Represents a service for managing blog posts.
@ -19,6 +19,12 @@ public interface IBlogPostService
/// </remarks>
IReadOnlyList<IBlogPost> GetAllBlogPosts(int limit = -1);
/// <summary>
/// Returns the total number of blog posts.
/// </summary>
/// <returns>The total number of blog posts.</returns>
int GetBlogPostCount();
/// <summary>
/// Returns a collection of blog posts from the specified page, optionally limiting the number of posts
/// returned per page.

6
OliverBooth.Blog/Services/IUserService.cs → OliverBooth/Services/IBlogUserService.cs
View File

@ -1,12 +1,12 @@
using System.Diagnostics.CodeAnalysis;
using OliverBooth.Blog.Data;
using OliverBooth.Data.Blog;
namespace OliverBooth.Blog.Services;
namespace OliverBooth.Services;
/// <summary>
/// Represents a service for managing users.
/// </summary>
public interface IUserService
public interface IBlogUserService
{
/// <summary>
/// Attempts to find a user with the specified ID.

4
OliverBooth.Common/Services/ITemplateService.cs → OliverBooth/Services/ITemplateService.cs
View File

@ -1,6 +1,6 @@
using OliverBooth.Common.Markdown;
using OliverBooth.Markdown.Template;
namespace OliverBooth.Common.Services;
namespace OliverBooth.Services;
/// <summary>
/// Represents a service that renders MediaWiki-style templates.

16
OliverBooth/Services/TemplateService.cs
View File

@ -1,10 +1,8 @@
using System.Buffers.Binary;
using Microsoft.EntityFrameworkCore;
using OliverBooth.Common.Formatting;
using OliverBooth.Common.Markdown;
using OliverBooth.Common.Services;
using OliverBooth.Data;
using OliverBooth.Data.Web;
using OliverBooth.Data.Blog;
using OliverBooth.Formatting;
using OliverBooth.Markdown.Template;
using SmartFormat;
using SmartFormat.Extensions;
@ -16,15 +14,15 @@ namespace OliverBooth.Services;
internal sealed class TemplateService : ITemplateService
{
private static readonly Random Random = new();
private readonly IDbContextFactory<WebContext> _webContextFactory;
private readonly IDbContextFactory<BlogContext> _webContextFactory;
private readonly SmartFormatter _formatter;
/// <summary>
/// Initializes a new instance of the <see cref="TemplateService" /> class.
/// </summary>
/// <param name="serviceProvider">The <see cref="IServiceProvider" />.</param>
/// <param name="webContextFactory">The <see cref="WebContext" /> factory.</param>
public TemplateService(IServiceProvider serviceProvider, IDbContextFactory<WebContext> webContextFactory)
/// <param name="webContextFactory">The <see cref="BlogContext" /> factory.</param>
public TemplateService(IServiceProvider serviceProvider, IDbContextFactory<BlogContext> webContextFactory)
{
_formatter = Smart.CreateDefaultSmartFormat();
_formatter.AddExtensions(new DefaultSource());
@ -40,7 +38,7 @@ internal sealed class TemplateService : ITemplateService
{
if (templateInline is null) throw new ArgumentNullException(nameof(templateInline));
using WebContext webContext = _webContextFactory.CreateDbContext();
using BlogContext webContext = _webContextFactory.CreateDbContext();
Template? template = webContext.Templates.Find(templateInline.Name);
if (template is null)
{

20
docker-compose.yml
View File

@ -16,20 +16,6 @@ services:
ports:
- "2845:2845"
restart: always
oliverbooth-blog:
container_name: blog.oliverbooth.dev
pull_policy: build
build:
context: .
dockerfile: OliverBooth/Dockerfile
volumes:
- type: bind
source: /var/log/oliverbooth/blog
target: /app/logs
- type: bind
source: /etc/oliverbooth/blog
target: /app/data
ports:
- "2846:2846"
restart: always
environment:
- SSL_CERT_PATH=${SSL_CERT_PATH}
- SSL_KEY_PATH=${SSL_KEY_PATH}

2
src/ts/API.ts
View File

@ -2,7 +2,7 @@ import BlogPost from "./BlogPost";
import Author from "./Author";
class API {
private static readonly BASE_URL: string = "https://api.oliverbooth.dev";
private static readonly BASE_URL: string = "/api";
private static readonly BLOG_URL: string = "/blog";
static async getBlogPostCount(): Promise<number> {

4
src/ts/UI.ts
View File

@ -7,6 +7,10 @@ declare const katex: any;
declare const Prism: any;
class UI {
public static get blogPost(): HTMLDivElement {
return document.querySelector("article[data-blog-post='true']");
}
public static get blogPostContainer(): HTMLDivElement {
return document.querySelector("#all-blog-posts");
}

9
src/ts/app.ts
View File

@ -34,6 +34,15 @@ declare const Prism: any;
window.open("https://www.youtube.com/watch?v=dQw4w9WgXcQ", "_blank");
});
const blogPost = UI.blogPost;
if (blogPost) {
const id = blogPost.dataset.blogId;
API.getBlogPost(id).then((post) => {
blogPost.innerHTML = post.content;
UI.updateUI(blogPost);
});
}
const blogPostContainer = UI.blogPostContainer;
if (blogPostContainer) {
const authors = [];