refactor!: move services and entities to common proj

OliverBooth.Common/Data/Blog/BlogContext.cs

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

OliverBooth.Common/Data/Blog/BlogPost.cs

@@ -1,14 +1,14 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using SmartFormat;
 
-namespace OliverBooth.Data.Blog;
+namespace OliverBooth.Common.Data.Blog;
 
 /// <inheritdoc />
 internal sealed class BlogPost : IBlogPost
 {
     /// <inheritdoc />
     [NotMapped]
-    public IBlogAuthor Author { get; internal set; } = null!;
+    public IAuthor Author { get; internal set; } = null!;
 
     /// <inheritdoc />
     public string Body { get; set; } = string.Empty;

OliverBooth.Common/Data/Blog/BlogPostDraft.cs

@@ -1,14 +1,14 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using SmartFormat;
 
-namespace OliverBooth.Data.Blog;
+namespace OliverBooth.Common.Data.Blog;
 
 /// <inheritdoc />
 internal sealed class BlogPostDraft : IBlogPostDraft
 {
     /// <inheritdoc />
     [NotMapped]
-    public IBlogAuthor Author { get; internal set; } = null!;
+    public IAuthor Author { get; internal set; } = null!;
 
     /// <inheritdoc />
     public string Body { get; set; } = string.Empty;

OliverBooth.Common/Data/Blog/BlogPostVisibility.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Blog;
+namespace OliverBooth.Common.Data.Blog;
 
 /// <summary>
 ///     An enumeration of the possible visibilities of a blog post.

OliverBooth.Common/Data/Blog/Configuration/BlogPostConfiguration.cs

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

OliverBooth.Common/Data/Blog/Configuration/BlogPostDraftConfiguration.cs

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

OliverBooth.Common/Data/Blog/IAuthor.cs

@@ -1,9 +1,9 @@
-namespace OliverBooth.Data.Blog;
+namespace OliverBooth.Common.Data.Blog;
 
 /// <summary>
 ///     Represents the author of a blog post.
 /// </summary>
-public interface IBlogAuthor
+public interface IAuthor
 {
     /// <summary>
     ///     Gets the URL of the author's avatar.

OliverBooth.Common/Data/Blog/IBlogPost.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Blog;
+namespace OliverBooth.Common.Data.Blog;
 
 /// <summary>
 ///     Represents a blog post.
@@ -9,7 +9,7 @@ public interface IBlogPost
     ///     Gets the author of the post.
     /// </summary>
     /// <value>The author of the post.</value>
-    IBlogAuthor Author { get; }
+    IAuthor Author { get; }
 
     /// <summary>
     ///     Gets or sets the body of the post.

OliverBooth.Common/Data/Blog/IBlogPostDraft.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Blog;
+namespace OliverBooth.Common.Data.Blog;
 
 /// <summary>
 ///     Represents a draft of a blog post.
@@ -9,7 +9,7 @@ public interface IBlogPostDraft
     ///     Gets the author of the post.
     /// </summary>
     /// <value>The author of the post.</value>
-    IBlogAuthor Author { get; }
+    IAuthor Author { get; }
 
     /// <summary>
     ///     Gets or sets the body of the post.

OliverBooth.Common/Data/Permission.cs

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

OliverBooth.Common/Data/ValueConverters/PermissionListConverter.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace OliverBooth.Data;
+namespace OliverBooth.Common.Data.ValueConverters;
 
 internal sealed class PermissionListConverter : ValueConverter<IReadOnlyList<Permission>, string>
 {

OliverBooth.Common/Data/Web/Books/Book.cs

@@ -3,7 +3,7 @@ using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.Processing;
 
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Books;
 
 /// <summary>
 ///     Represents a book.

OliverBooth.Common/Data/Web/Books/BookState.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Books;
 
 /// <summary>
 ///     Represents the state of a book.

OliverBooth.Common/Data/Web/Books/IBook.cs

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

OliverBooth.Common/Data/Web/Configuration/BlacklistEntryConfiguration.cs

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

OliverBooth.Common/Data/Web/Configuration/BookConfiguration.cs

@@ -1,8 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using OliverBooth.Common.Data.Web.Books;
 
-namespace OliverBooth.Data.Web.Configuration;
+namespace OliverBooth.Common.Data.Web.Configuration;
 
 /// <summary>
 ///     Represents the configuration for the <see cref="Book" /> entity.

OliverBooth.Common/Data/Web/Configuration/ProgrammingLanguageConfiguration.cs

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

OliverBooth.Common/Data/Web/Configuration/ProjectConfiguration.cs

@@ -1,8 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using OliverBooth.Common.Data.Web.Projects;
 
-namespace OliverBooth.Data.Web.Configuration;
+namespace OliverBooth.Common.Data.Web.Configuration;
 
 /// <summary>
 ///     Represents the configuration for the <see cref="Project" /> entity.

OliverBooth.Common/Data/Web/Configuration/SessionConfiguration.cs

@@ -1,8 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using OliverBooth.Common.Data.Web.Users;
 
-namespace OliverBooth.Data.Web.Configuration;
+namespace OliverBooth.Common.Data.Web.Configuration;
 
 internal sealed class SessionConfiguration : IEntityTypeConfiguration<Session>
 {

OliverBooth.Common/Data/Web/Configuration/SiteConfigurationConfiguration.cs

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

OliverBooth.Common/Data/Web/Configuration/TemplateConfiguration.cs

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

OliverBooth.Common/Data/Web/Configuration/UserConfiguration.cs

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

OliverBooth.Common/Data/Web/Contact/BlacklistEntry.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Contact;
 
 /// <inheritdoc cref="IBlacklistEntry"/>
 internal sealed class BlacklistEntry : IEquatable<BlacklistEntry>, IBlacklistEntry

OliverBooth.Common/Data/Web/Contact/IBlacklistEntry.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Contact;
 
 /// <summary>
 ///     Represents an entry in the blacklist.

OliverBooth.Common/Data/Web/ITemplate.cs

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

OliverBooth.Common/Data/Web/Projects/IProgrammingLanguage.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Projects;
 
 /// <summary>
 ///     Represents a programming language.

OliverBooth.Common/Data/Web/Projects/IProject.cs

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

OliverBooth.Common/Data/Web/Projects/ProgrammingLanguage.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Projects;
 
 /// <inheritdoc cref="IProgrammingLanguage" />
 internal sealed class ProgrammingLanguage : IEquatable<ProgrammingLanguage>, IProgrammingLanguage

OliverBooth.Common/Data/Web/Projects/Project.cs

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

OliverBooth.Common/Data/Web/Projects/ProjectStatus.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Projects;
 
 /// <summary>
 ///     Represents the status of a project.

OliverBooth.Common/Data/Web/SiteConfiguration.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web;
 
 /// <summary>
 ///     Represents a site configuration item.

OliverBooth.Common/Data/Web/Template.cs

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

OliverBooth.Common/Data/Web/Users/IMfaToken.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Users;
 
 /// <summary>
 ///     Represents a temporary token used to correlate MFA attempts with the user.
@@ -34,4 +34,4 @@ public interface IMfaToken
     /// </summary>
     /// <value>The user.</value>
     IUser User { get; }
-}
+}

OliverBooth.Common/Data/Web/Users/ISession.cs

@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Users;
 
 /// <summary>
 ///     Represents a login session.

OliverBooth.Common/Data/Web/Users/IUser.cs

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

OliverBooth.Common/Data/Web/Users/MfaRequestResult.cs

@@ -1,6 +1,6 @@
-using OliverBooth.Services;
+using OliverBooth.Common.Services;
 
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Users;
 
 /// <summary>
 ///     An enumeration of possible results for <see cref="IUserService.VerifyMfaRequest" />.

OliverBooth.Common/Data/Web/Users/MfaToken.cs

@@ -1,4 +1,4 @@
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Users;
 
 internal sealed class MfaToken : IMfaToken
 {

OliverBooth.Common/Data/Web/Users/Session.cs

@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Users;
 
 internal sealed class Session : ISession
 {

OliverBooth.Common/Data/Web/Users/User.cs

@@ -2,15 +2,15 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Security.Cryptography;
 using System.Text;
 using Cysharp.Text;
-using OliverBooth.Data.Blog;
+using OliverBooth.Common.Data.Blog;
 using OtpNet;
 
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web.Users;
 
 /// <summary>
 ///     Represents a user.
 /// </summary>
-internal sealed class User : IUser, IBlogAuthor
+internal sealed class User : IUser, IAuthor
 {
     /// <inheritdoc cref="IUser.AvatarUrl" />
     [NotMapped]

OliverBooth.Common/Data/Web/WebContext.cs

@@ -1,7 +1,12 @@
 using Microsoft.EntityFrameworkCore;
-using OliverBooth.Data.Web.Configuration;
+using Microsoft.Extensions.Configuration;
+using OliverBooth.Common.Data.Web.Books;
+using OliverBooth.Common.Data.Web.Configuration;
+using OliverBooth.Common.Data.Web.Contact;
+using OliverBooth.Common.Data.Web.Projects;
+using OliverBooth.Common.Data.Web.Users;
 
-namespace OliverBooth.Data.Web;
+namespace OliverBooth.Common.Data.Web;
 
 /// <summary>
 ///     Represents a session with the web database.

OliverBooth.Common/Extensions/DependencyInjectionExtensions.cs

@@ -0,0 +1,32 @@
+using Microsoft.Extensions.DependencyInjection;
+using OliverBooth.Common.Data.Blog;
+using OliverBooth.Common.Data.Web;
+using OliverBooth.Common.Services;
+using X10D.Hosting.DependencyInjection;
+
+namespace OliverBooth.Common.Extensions;
+
+/// <summary>
+///     Extension methods for dependency injection.
+/// </summary>
+public static class DependencyInjectionExtensions
+{
+    /// <summary>
+    ///     Adds all required services provided by the assembly to the current <see cref="IServiceCollection" />.
+    /// </summary>
+    /// <param name="collection">The <see cref="IServiceCollection" /> to add the service to.</param>
+    public static void AddCommonServices(this IServiceCollection collection)
+    {
+        collection.AddDbContextFactory<BlogContext>();
+        collection.AddDbContextFactory<WebContext>();
+
+        collection.AddSingleton<IBlogPostService, BlogPostService>();
+        collection.AddSingleton<IContactService, ContactService>();
+        collection.AddSingleton<IProjectService, ProjectService>();
+        collection.AddSingleton<IReadingListService, ReadingListService>();
+        collection.AddSingleton<ITemplateService, TemplateService>();
+
+        collection.AddHostedSingleton<ISessionService, SessionService>();
+        collection.AddHostedSingleton<IUserService, UserService>();
+    }
+}

OliverBooth.Common/Formatting/DateFormatter.cs

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

OliverBooth.Common/Formatting/MarkdownFormatter.cs

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

OliverBooth.Common/Markdown/Template/TemplateExtension.cs

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

OliverBooth.Common/Markdown/Template/TemplateInline.cs

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

OliverBooth.Common/Markdown/Template/TemplateInlineParser.cs

@@ -2,7 +2,7 @@ using Cysharp.Text;
 using Markdig.Helpers;
 using Markdig.Parsers;
 
-namespace OliverBooth.Markdown.Template;
+namespace OliverBooth.Common.Markdown.Template;
 
 /// <summary>
 ///     Represents a Markdown inline parser that handles MediaWiki-style templates.
@@ -17,7 +17,7 @@ public sealed class TemplateInlineParser : InlineParser
     /// </summary>
     public TemplateInlineParser()
     {
-        OpeningCharacters = new[] { '{' };
+        OpeningCharacters = ['{'];
     }
 
     /// <inheritdoc />

OliverBooth.Common/Markdown/Template/TemplateRenderer.cs

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

OliverBooth.Common/OliverBooth.Common.csproj

@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Alexinea.Extensions.Configuration.Toml" Version="7.0.0"/>
+        <PackageReference Include="Asp.Versioning.Mvc" Version="8.0.0"/>
+        <PackageReference Include="BCrypt.Net-Core" Version="1.6.0"/>
+        <PackageReference Include="Humanizer.Core" Version="2.14.1"/>
+        <PackageReference Include="Markdig" Version="0.35.0"/>
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
+        <PackageReference Include="NetBarcode" Version="1.7.0"/>
+        <PackageReference Include="Otp.NET" Version="1.3.0"/>
+        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0"/>
+        <PackageReference Include="Serilog" Version="3.1.1"/>
+        <PackageReference Include="Serilog.AspNetCore" Version="8.0.1"/>
+        <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0"/>
+        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1"/>
+        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
+        <PackageReference Include="SmartFormat.NET" Version="3.3.2"/>
+        <PackageReference Include="X10D" Version="3.3.1"/>
+        <PackageReference Include="X10D.Hosting" Version="3.3.1"/>
+        <PackageReference Include="ZString" Version="2.5.1"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Folder Include="Markdown\"/>
+    </ItemGroup>
+
+</Project>

OliverBooth.Common/Services/BlogPostService.cs

@@ -2,16 +2,28 @@ using System.Diagnostics.CodeAnalysis;
 using Humanizer;
 using Markdig;
 using Microsoft.EntityFrameworkCore;
-using OliverBooth.Data.Blog;
+using OliverBooth.Common.Data.Blog;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <summary>
 ///     Represents an implementation of <see cref="IBlogPostService" />.
 /// </summary>
 internal sealed class BlogPostService : IBlogPostService
 {
+    /*private static readonly JsonSerializerOptions EditorJsOptions = new()
+    {
+        ReferenceHandler = ReferenceHandler.Preserve,
+        Converters =
+        {
+            new ParagraphBlockConverter(),
+            new HeadingBlockConverter(),
+            new MarkdownDocumentConverter()
+        }
+    };
+    */
+
     private readonly IDbContextFactory<BlogContext> _dbContextFactory;
     private readonly IUserService _userService;
     private readonly MarkdownPipeline _markdownPipeline;
@@ -33,6 +45,19 @@ internal sealed class BlogPostService : IBlogPostService
         _markdownPipeline = markdownPipeline;
     }
 
+    /// <inheritdoc />
+    public string GetBlogPostEditorObject(IBlogPost post)
+    {
+        if (post is null)
+        {
+            throw new ArgumentNullException(nameof(post));
+        }
+
+        /*var document = (JsonDocument)Markdig.Markdown.Convert(post.Body, new JsonRenderer(), _markdownPipeline);
+        return JsonSerializer.Serialize(document, EditorJsOptions);*/
+        return """{"blocks":{}}""";
+    }
+
     /// <inheritdoc />
     public int GetBlogPostCount()
     {
@@ -196,7 +221,7 @@ internal sealed class BlogPostService : IBlogPostService
             return post;
         }
 
-        if (_userService.TryGetUser(post.AuthorId, out IUser? user) && user is IBlogAuthor author)
+        if (_userService.TryGetUser(post.AuthorId, out IUser? user) && user is IAuthor author)
         {
             post.Author = author;
         }

OliverBooth.Common/Services/ContactService.cs

@@ -1,7 +1,8 @@
 using Microsoft.EntityFrameworkCore;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web;
+using OliverBooth.Common.Data.Web.Contact;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <inheritdoc cref="IContactService" />
 internal sealed class ContactService : IContactService

OliverBooth.Common/Services/IBlogPostService.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
-using OliverBooth.Data.Blog;
+using OliverBooth.Common.Data.Blog;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <summary>
 ///     Represents a service for managing blog posts.
@@ -27,6 +27,14 @@ public interface IBlogPostService
     /// <returns>The total number of blog posts.</returns>
     int GetBlogPostCount();
 
+    /// <summary>
+    ///     Returns a JSON object representing the blog post block data.
+    /// </summary>
+    /// <param name="post">The blog post whose block data object should be returned.</param>
+    /// <returns>The JSON data of the blog post block data.</returns>
+    /// <exception cref="ArgumentNullException"><paramref name="post" /> is <see langword="null" />.</exception>
+    string GetBlogPostEditorObject(IBlogPost post);
+
     /// <summary>
     ///     Returns a collection of blog posts from the specified page, optionally limiting the number of posts
     ///     returned per page.

OliverBooth.Common/Services/IContactService.cs

@@ -1,6 +1,6 @@
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Contact;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <summary>
 ///     Represents a service for managing contact information.

OliverBooth.Common/Services/IProjectService.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Projects;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <summary>
 ///     Represents a service for interacting with projects.

OliverBooth.Common/Services/IReadingListService.cs

@@ -1,6 +1,6 @@
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Books;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <summary>
 ///     Represents a service which fetches books from the reading list.

OliverBooth.Common/Services/ISessionService.cs

@@ -1,9 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
-using ISession = OliverBooth.Data.Web.ISession;
+using ISession = OliverBooth.Common.Data.Web.Users.ISession;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 public interface ISessionService
 {

OliverBooth.Common/Services/ITemplateService.cs

@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web;
-using OliverBooth.Markdown.Template;
+using OliverBooth.Common.Markdown.Template;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <summary>
 ///     Represents a service that renders MediaWiki-style templates.

OliverBooth.Common/Services/IUserService.cs

@@ -1,10 +1,10 @@
 using System.Diagnostics.CodeAnalysis;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <summary>
-///     Represents a service for managing users.
+///     Represents a service which manages users.
 /// </summary>
 public interface IUserService
 {
@@ -34,15 +34,16 @@ public interface IUserService
     void DeleteToken(string token);
 
     /// <summary>
-    ///     Attempts to find a user with the specified ID.
+    ///     Attempts to find a user by their unique ID.
     /// </summary>
-    /// <param name="id">The ID of the user to find.</param>
+    /// <param name="id">The ID of the user to return.</param>
     /// <param name="user">
-    ///     When this method returns, contains the user with the specified ID, if the user is found; otherwise,
+    ///     When this method returns, contains the user whose ID is equal to the specified <paramref name="id" />, if
-    ///     <see langword="null" />.
+    ///     such a user exists; otherwise, <see langword="null" />.
     /// </param>
     /// <returns>
-    ///     <see langword="true" /> if a user with the specified ID is found; otherwise, <see langword="false" />.
+    ///     <see langword="true" /> if a user was found with the specified <paramref name="id" />; otherwise,
+    ///     <see langword="false" />.
     /// </returns>
     bool TryGetUser(Guid id, [NotNullWhen(true)] out IUser? user);
 

OliverBooth.Common/Services/ProjectService.cs

@@ -2,9 +2,10 @@ using System.Diagnostics.CodeAnalysis;
 using Humanizer;
 using Markdig;
 using Microsoft.EntityFrameworkCore;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web;
+using OliverBooth.Common.Data.Web.Projects;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <summary>
 ///     Represents a service for interacting with projects.

OliverBooth.Common/Services/ReadingListService.cs

@@ -1,7 +1,8 @@
 using Microsoft.EntityFrameworkCore;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web;
+using OliverBooth.Common.Data.Web.Books;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 internal sealed class ReadingListService : IReadingListService
 {

OliverBooth.Common/Services/SessionService.cs

@@ -1,13 +1,16 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
-using OliverBooth.Data.Blog;
+using Microsoft.Extensions.Hosting;
-using OliverBooth.Data.Web;
+using Microsoft.Extensions.Logging;
-using ISession = OliverBooth.Data.Web.ISession;
+using OliverBooth.Common.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
+using ISession = OliverBooth.Common.Data.Web.Users.ISession;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 internal sealed class SessionService : BackgroundService, ISessionService
 {
@@ -20,11 +23,9 @@ internal sealed class SessionService : BackgroundService, ISessionService
     /// </summary>
     /// <param name="logger">The logger.</param>
     /// <param name="userService">The user service.</param>
-    /// <param name="blogContextFactory">The <see cref="BlogContext" /> factory.</param>
     /// <param name="webContextFactory">The <see cref="WebContext" /> factory.</param>
     public SessionService(ILogger<SessionService> logger,
         IUserService userService,
-        IDbContextFactory<BlogContext> blogContextFactory,
         IDbContextFactory<WebContext> webContextFactory)
     {
         _logger = logger;

OliverBooth.Common/Services/TemplateService.cs

@@ -1,13 +1,13 @@
 using System.Buffers.Binary;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web;
-using OliverBooth.Formatting;
+using OliverBooth.Common.Formatting;
-using OliverBooth.Markdown.Template;
+using OliverBooth.Common.Markdown.Template;
 using SmartFormat;
 using SmartFormat.Extensions;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
 /// <summary>
 ///     Represents a service that renders MediaWiki-style templates.
@@ -22,7 +22,7 @@ internal sealed class TemplateService : ITemplateService
     ///     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>
+    /// <param name="webContextFactory">The <see cref="Data.Web.WebContext" /> factory.</param>
     public TemplateService(IServiceProvider serviceProvider,
         IDbContextFactory<WebContext> webContextFactory)
     {

OliverBooth.Common/Services/UserService.cs

@@ -2,15 +2,14 @@ using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Security.Cryptography;
 using Microsoft.EntityFrameworkCore;
-using OliverBooth.Data.Web;
+using Microsoft.Extensions.Hosting;
+using OliverBooth.Common.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
 using BC = BCrypt.Net.BCrypt;
 using Timer = System.Timers.Timer;
 
-namespace OliverBooth.Services;
+namespace OliverBooth.Common.Services;
 
-/// <summary>
-///     Represents an implementation of <see cref="IUserService" />.
-/// </summary>
 internal sealed class UserService : BackgroundService, IUserService
 {
     private static readonly RandomNumberGenerator RandomNumberGenerator = RandomNumberGenerator.Create();
@@ -117,19 +116,8 @@ internal sealed class UserService : BackgroundService, IUserService
     /// <inheritdoc />
     public bool TryGetUser(Guid id, [NotNullWhen(true)] out IUser? user)
     {
-        if (_userCache.TryGetValue(id, out user))
-        {
-            return true;
-        }
-
         using WebContext context = _dbContextFactory.CreateDbContext();
-        user = context.Users.Find(id);
+        user = context.Users.FirstOrDefault(u => u.Id == id);
-
-        if (user is not null)
-        {
-            _userCache.TryAdd(id, user);
-        }
-
         return user is not null;
     }
 
@@ -138,7 +126,12 @@ internal sealed class UserService : BackgroundService, IUserService
     {
         using WebContext context = _dbContextFactory.CreateDbContext();
         user = context.Users.FirstOrDefault(u => u.EmailAddress == email);
-        return user is not null && BC.Verify(password, ((User)user).Password);
+        if (user is not null && !BC.Verify(password, ((User)user).Password))
+        {
+            user = null;
+        }
+
+        return user is not null;
     }
 
     /// <inheritdoc />

OliverBooth.sln

@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Gulpfile.mjs = Gulpfile.mjs
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OliverBooth.Common", "OliverBooth.Common\OliverBooth.Common.csproj", "{77DC9941-E648-442F-935A-C66FC401ECBC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,10 @@ 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
+		{77DC9941-E648-442F-935A-C66FC401ECBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77DC9941-E648-442F-935A-C66FC401ECBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77DC9941-E648-442F-935A-C66FC401ECBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77DC9941-E648-442F-935A-C66FC401ECBC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection

OliverBooth/Controllers/Api/v1/AuthenticationController.cs

@@ -1,9 +1,9 @@
 using System.Diagnostics;
 using Asp.Versioning;
 using Microsoft.AspNetCore.Mvc;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
-using OliverBooth.Services;
+using OliverBooth.Common.Services;
-using ISession = OliverBooth.Data.Web.ISession;
+using ISession = OliverBooth.Common.Data.Web.Users.ISession;
 
 namespace OliverBooth.Controllers.Api.v1;
 

OliverBooth/Controllers/Api/v1/BlogApiController.cs

@@ -1,8 +1,9 @@
 using Asp.Versioning;
 using Humanizer;
 using Microsoft.AspNetCore.Mvc;
-using OliverBooth.Data.Blog;
+using OliverBooth.Common.Data.Blog;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
+using OliverBooth.Common.Services;
 using OliverBooth.Services;
 
 namespace OliverBooth.Controllers.Api.v1;

OliverBooth/Controllers/Blog/RssController.cs

@@ -1,6 +1,7 @@
 using System.Xml.Serialization;
 using Microsoft.AspNetCore.Mvc;
-using OliverBooth.Data.Blog;
+using OliverBooth.Common.Data.Blog;
+using OliverBooth.Common.Services;
 using OliverBooth.Data.Blog.Rss;
 using OliverBooth.Services;
 

OliverBooth/Controllers/FormattedBlacklist.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using Microsoft.AspNetCore.Mvc;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Contact;
-using OliverBooth.Services;
+using OliverBooth.Common.Services;
 
 namespace OliverBooth.Controllers;
 

OliverBooth/Markdown/Timestamp/TimestampInlineParser.cs

@@ -13,7 +13,7 @@ public sealed class TimestampInlineParser : InlineParser
     /// </summary>
     public TimestampInlineParser()
     {
-        OpeningCharacters = new[] { '<' };
+        OpeningCharacters = ['<'];
     }
 
     /// <inheritdoc />

OliverBooth/OliverBooth.csproj

@@ -27,32 +27,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Alexinea.Extensions.Configuration.Toml" Version="7.0.0"/>
-        <PackageReference Include="Asp.Versioning.Mvc" Version="8.0.0"/>
         <PackageReference Include="AspNetCore.ReCaptcha" Version="1.8.1"/>
-        <PackageReference Include="BCrypt.Net-Core" Version="1.6.0"/>
-        <PackageReference Include="FluentFTP" Version="49.0.2" />
-        <PackageReference Include="FluentFTP.Logging" Version="1.0.0" />
         <PackageReference Include="HtmlAgilityPack" Version="1.11.59"/>
-        <PackageReference Include="Humanizer.Core" Version="2.14.1"/>
         <PackageReference Include="MailKit" Version="4.3.0"/>
         <PackageReference Include="MailKitSimplified.Sender" Version="2.9.0"/>
-        <PackageReference Include="Markdig" Version="0.35.0"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.2"/>
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.2"/>
         <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.2"/>
-        <PackageReference Include="NetBarcode" Version="1.7.0"/>
+    </ItemGroup>
-        <PackageReference Include="Otp.NET" Version="1.3.0"/>
+
-        <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0"/>
+    <ItemGroup>
-        <PackageReference Include="Serilog" Version="3.1.1"/>
+        <ProjectReference Include="..\OliverBooth.Common\OliverBooth.Common.csproj"/>
-        <PackageReference Include="Serilog.AspNetCore" Version="8.0.1"/>
-        <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0"/>
-        <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1"/>
-        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
-        <PackageReference Include="SmartFormat.NET" Version="3.3.2"/>
-        <PackageReference Include="X10D" Version="3.3.1"/>
-        <PackageReference Include="X10D.Hosting" Version="3.3.1"/>
-        <PackageReference Include="ZString" Version="2.5.1"/>
     </ItemGroup>
 
 </Project>

OliverBooth/Pages/Admin/BlogPosts.cshtml

@@ -1,8 +1,10 @@
 @page "/admin/blog-posts"
 @using System.Diagnostics
-@using OliverBooth.Data
+@using Microsoft.AspNetCore.Mvc.TagHelpers
-@using OliverBooth.Data.Blog
+@using OliverBooth.Common.Data
-@using OliverBooth.Data.Web
+@using OliverBooth.Common.Data.Blog
+@using OliverBooth.Common.Data.Web.Users
+@using OliverBooth.Common.Services
 @using OliverBooth.Services
 @model OliverBooth.Pages.Admin.BlogPosts
 @inject IBlogPostService BlogPostService
@@ -52,7 +54,7 @@
         <th>Options</th>
     </tr>
     </thead>
-    
+
     <tbody>
     @foreach (IBlogPost post in BlogPostService.GetAllBlogPosts(visibility: (BlogPostVisibility)(-1)))
     {

OliverBooth/Pages/Admin/BlogPosts.cshtml.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
-using OliverBooth.Services;
+using OliverBooth.Common.Services;
 
 namespace OliverBooth.Pages.Admin;
 

OliverBooth/Pages/Admin/EditBlogPost.cshtml

@@ -1,6 +1,6 @@
 @page "/admin/blog-posts/edit/{id}"
 @using Markdig
-@using OliverBooth.Data.Blog
+@using OliverBooth.Common.Data.Blog
 @model OliverBooth.Pages.Admin.EditBlogPost
 @inject MarkdownPipeline MarkdownPipeline
 

OliverBooth/Pages/Admin/EditBlogPost.cshtml.cs

@@ -1,7 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using OliverBooth.Data.Blog;
+using OliverBooth.Common.Data.Blog;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
+using OliverBooth.Common.Services;
 using OliverBooth.Services;
 
 namespace OliverBooth.Pages.Admin;

OliverBooth/Pages/Admin/Index.cshtml.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Users;
-using OliverBooth.Services;
+using OliverBooth.Common.Services;
 
 namespace OliverBooth.Pages.Admin;
 

OliverBooth/Pages/Admin/Login.cshtml.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using OliverBooth.Services;
+using OliverBooth.Common.Services;
 
 namespace OliverBooth.Pages.Admin;
 

OliverBooth/Pages/Admin/MultiFactorStep.cshtml

@@ -1,5 +1,5 @@
 @page "/admin/login/mfa"
-@using OliverBooth.Data.Web
+@using OliverBooth.Common.Data.Web.Users
 @model OliverBooth.Pages.Admin.MultiFactorStep
 
 @{

OliverBooth/Pages/Admin/MultiFactorStep.cshtml.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using OliverBooth.Services;
+using OliverBooth.Common.Services;
 
 namespace OliverBooth.Pages.Admin;
 

OliverBooth/Pages/Blog/Article.cshtml

@@ -1,6 +1,7 @@
 @page "/blog/{year:int}/{month:int}/{day:int}/{slug}"
 @using Humanizer
-@using OliverBooth.Data.Blog
+@using OliverBooth.Common.Data.Blog
+@using OliverBooth.Common.Services
 @using OliverBooth.Services
 @inject IBlogPostService BlogPostService
 @model Article
@@ -29,7 +30,7 @@
 @{
     ViewData["Post"] = post;
     ViewData["Title"] = post.Title;
-    IBlogAuthor author = post.Author;
+    IAuthor author = post.Author;
     DateTimeOffset published = post.Published;
 }
 

OliverBooth/Pages/Blog/Article.cshtml.cs

@@ -1,7 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Primitives;
-using OliverBooth.Data.Blog;
+using OliverBooth.Common.Data.Blog;
+using OliverBooth.Common.Services;
 using OliverBooth.Services;
 using BC = BCrypt.Net.BCrypt;
 

OliverBooth/Pages/Blog/Index.cshtml.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using OliverBooth.Data.Blog;
+using OliverBooth.Common.Data.Blog;
+using OliverBooth.Common.Services;
 using OliverBooth.Services;
 
 namespace OliverBooth.Pages.Blog;

OliverBooth/Pages/Blog/RawArticle.cshtml.cs

@@ -1,7 +1,8 @@
 using Cysharp.Text;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using OliverBooth.Data.Blog;
+using OliverBooth.Common.Data.Blog;
+using OliverBooth.Common.Services;
 using OliverBooth.Services;
 
 namespace OliverBooth.Pages.Blog;

OliverBooth/Pages/Books.cshtml

@@ -1,5 +1,5 @@
 @page
-@using OliverBooth.Data.Web
+@using OliverBooth.Common.Data.Web.Books
 @model OliverBooth.Pages.Books
 @{
     ViewData["Title"] = "Reading List";

OliverBooth/Pages/Books.cshtml.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Books;
-using OliverBooth.Services;
+using OliverBooth.Common.Services;
 
 namespace OliverBooth.Pages;
 

OliverBooth/Pages/Contact/Blacklist.cshtml

@@ -1,6 +1,6 @@
 @page
-@using OliverBooth.Data.Web
+@using OliverBooth.Common.Data.Web.Contact
-@using OliverBooth.Services
+@using OliverBooth.Common.Services
 @inject IContactService ContactService
 @{
     ViewData["Title"] = "Blacklist";

OliverBooth/Pages/Projects/Index.cshtml

@@ -1,6 +1,6 @@
 @page
-@using OliverBooth.Data.Web
+@using OliverBooth.Common.Data.Web.Projects
-@using OliverBooth.Services
+@using OliverBooth.Common.Services
 @inject IProjectService ProjectService
 @{
     ViewData["Title"] = "Projects";

OliverBooth/Pages/Projects/Project.cshtml

@@ -1,7 +1,7 @@
 @page "/project/{slug}"
 @using Markdig
-@using OliverBooth.Data.Web
+@using OliverBooth.Common.Data.Web.Projects
-@using OliverBooth.Services
+@using OliverBooth.Common.Services
 @model Project
 @inject IProjectService ProjectService
 @inject MarkdownPipeline MarkdownPipeline

OliverBooth/Pages/Projects/Project.cshtml.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using OliverBooth.Data.Web;
+using OliverBooth.Common.Data.Web.Projects;
-using OliverBooth.Services;
+using OliverBooth.Common.Services;
 
 namespace OliverBooth.Pages.Projects;
 

OliverBooth/Pages/Shared/_AdminLayout.cshtml

@@ -1,6 +1,8 @@
 @using OliverBooth.Data.Blog
-@using OliverBooth.Data.Web
 @using OliverBooth.Services
+@using OliverBooth.Common.Data.Web.Users
+@using OliverBooth.Common.Services
+@using OliverBooth.Common.Data.Blog
 @inject IBlogPostService BlogPostService
 @inject IUserService UserService
 @inject ISessionService SessionService

OliverBooth/Pages/Shared/_Layout.cshtml

@@ -1,6 +1,8 @@
 @using OliverBooth.Data.Blog
-@using OliverBooth.Data.Web
 @using OliverBooth.Services
+@using OliverBooth.Common.Data.Web.Users
+@using OliverBooth.Common.Services
+@using OliverBooth.Common.Data.Blog
 @inject IBlogPostService BlogPostService
 @inject IUserService UserService
 @inject ISessionService SessionService

OliverBooth/Program.cs

@@ -4,15 +4,15 @@ using AspNetCore.ReCaptcha;
 using FluentFTP;
 using FluentFTP.Logging;
 using Markdig;
+using OliverBooth.Common.Extensions;
+using OliverBooth.Common.Markdown.Template;
+using OliverBooth.Common.Services;
 using OliverBooth.Data.Blog;
-using OliverBooth.Data.Web;
 using OliverBooth.Extensions;
-using OliverBooth.Markdown.Template;
 using OliverBooth.Markdown.Timestamp;
 using OliverBooth.Services;
 using Serilog;
 using Serilog.Extensions.Logging;
-using X10D.Hosting.DependencyInjection;
 
 Log.Logger = new LoggerConfiguration()
     .WriteTo.Console()
@@ -44,8 +44,7 @@ builder.Services.AddApiVersioning(options =>
     options.ApiVersionReader = new UrlSegmentApiVersionReader();
 });
 
-builder.Services.AddDbContextFactory<BlogContext>();
+builder.Services.AddCommonServices();
-builder.Services.AddDbContextFactory<WebContext>();
 builder.Services.AddHttpClient();
 builder.Services.AddTransient<IAsyncFtpClient, AsyncFtpClient>(provider =>
 {
@@ -66,14 +65,7 @@ builder.Services.AddTransient<IAsyncFtpClient, AsyncFtpClient>(provider =>
 });
 
 builder.Services.AddSingleton<ICdnService, CdnService>();
-builder.Services.AddSingleton<IContactService, ContactService>();
-builder.Services.AddSingleton<ITemplateService, TemplateService>();
-builder.Services.AddSingleton<IBlogPostService, BlogPostService>();
-builder.Services.AddSingleton<IProjectService, ProjectService>();
 builder.Services.AddSingleton<IMastodonService, MastodonService>();
-builder.Services.AddSingleton<IReadingListService, ReadingListService>();
-builder.Services.AddHostedSingleton<IUserService, UserService>();
-builder.Services.AddHostedSingleton<ISessionService, SessionService>();
 builder.Services.AddRazorPages().AddRazorRuntimeCompilation();
 builder.Services.AddControllersWithViews();
 builder.Services.AddRazorComponents().AddInteractiveServerComponents();