winter-software/Wave
winter-software/Wave
1
0
Fork 0
Code Issues Wiki Activity

Implemented custom user links

Browse source
This commit is contained in:
Mia Rose Winter 2024-02-03 02:09:26 +01:00
parent ea738ebb04
commit 78f1d291f3
Signed by: miawinter
GPG key ID: 4B6F6A83178F595E
16 changed files with 833 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Wave/Components/Account/Pages/Manage/Index.razor
View file

@ -25,6 +25,11 @@
<ProfileFormPartial User="@User" />
}
</BoardCardComponent>
<BoardCardComponent Heading="@Localizer["Links"]">
@if (User is not null) {
<LinksPartial User="@User" />
}
</BoardCardComponent>
<BoardCardComponent Heading="@Localizer["AboutMe"]">
@if (User is not null) {
<AboutMeFormPartial User="@User" />

75
Wave/Components/Account/Pages/Manage/Partials/LinksPartial.razor Normal file
View file

@ -0,0 +1,75 @@
@using Wave.Data
@using System.ComponentModel.DataAnnotations
@using Microsoft.AspNetCore.Identity
@inject UserManager<ApplicationUser> UserManager
@inject NavigationManager Navigation
@inject IStringLocalizer<Wave.Components.Account.Pages.Manage.Index> Localizer
<ul class="flex flex-col gap-2 my-3">
@foreach (var link in User.Links) {
<li class="flex justify-between items-center">
<UserLinkComponent Link="link" class="link flex gap-2" />
<form action="/api/user/link/@link.Id" method="post">
<AntiforgeryToken />
<input type="hidden" name="linkId" value="@link.Id" />
<input type="hidden" name="ReturnUrl" value="~/@Navigation.ToBaseRelativePath(Navigation.Uri)" />
<input type="hidden" name="_method" value="delete" />
<button type="submit" class="btn btn-square btn-error btn-sm" title="@Localizer["Links_Delete_Label"]">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-6 h-6">
<path fill-rule="evenodd" d="M16.5 4.478v.227a48.816 48.816 0 0 1 3.878.512.75.75 0 1 1-.256 1.478l-.209-.035-1.005 13.07a3 3 0 0 1-2.991 2.77H8.084a3 3 0 0 1-2.991-2.77L4.087 6.66l-.209.035a.75.75 0 0 1-.256-1.478A48.567 48.567 0 0 1 7.5 4.705v-.227c0-1.564 1.213-2.9 2.816-2.951a52.662 52.662 0 0 1 3.369 0c1.603.051 2.815 1.387 2.815 2.951Zm-6.136-1.452a51.196 51.196 0 0 1 3.273 0C14.39 3.05 15 3.684 15 4.478v.113a49.488 49.488 0 0 0-6 0v-.113c0-.794.609-1.428 1.364-1.452Zm-.355 5.945a.75.75 0 1 0-1.5.058l.347 9a.75.75 0 1 0 1.499-.058l-.346-9Zm5.48.058a.75.75 0 1 0-1.498-.058l-.347 9a.75.75 0 0 0 1.5.058l.345-9Z" clip-rule="evenodd" />
</svg>
</button>
</form>
</li>
}
</ul>
<EditForm FormName="user-links" EditContext="@Context" OnValidSubmit="OnValidSubmit" method="post" class="w-full">
<DataAnnotationsValidator />
<InputLabelComponent LabelText="@Localizer["Links_Url_Label"]" For="() => Model.Url">
<div class="join join-vertical md:join-horizontal">
<InputText class="input input-bordered md:flex-1 join-item" maxlength="64" autocomplete="off" type="url"
@bind-Value="@Model.Url" placeholder="@Localizer["Links_Url_Placeholder"]" />
<button type="submit" class="btn btn-primary join-item">@Localizer["Links_Submit"]</button>
</div>
</InputLabelComponent>
</EditForm>
@code {
[Parameter]
public required ApplicationUser User { get; set; }
[SupplyParameterFromForm(FormName = "user-links")]
private InputModel Model { get; set; } = new();
private EditContext Context { get; set; } = null!;
private ValidationMessageStore Validation { get; set; } = null!;
[SupplyParameterFromForm(Name = "LinkId")]
private int? LinkId { get; set; }
protected override void OnInitialized() {
Context = new EditContext(Model);
Validation = new ValidationMessageStore(Context);
}
private async Task OnValidSubmit() {
var link = new UserLink { UrlString = Model.Url };
if (!link.Validate()) {
Validation.Add(() => Model.Url, "Url is invalid.");
Context.NotifyValidationStateChanged();
return;
}
link.UrlString = link.Url.AbsoluteUri;
User.Links.Add(link);
await UserManager.UpdateAsync(User);
Model = new InputModel();
}
private sealed class InputModel {
[Url, Required(AllowEmptyStrings = false), MaxLength(1024)]
public string Url { get; set; } = string.Empty;
}
}

5
Wave/Components/ArticleComponent.razor
View file

@ -55,6 +55,11 @@
<p>
@Article.Author.AboutTheAuthor
</p>
<div class="card-actions flex gap-2 flex-wrap">
@foreach (var link in Article.Author.Links) {
<UserLinkComponent Link="link" class="badge hover:badge-outline flex gap-2 p-4" />
}
</div>
</div>
</div>
</section>

2
Wave/Components/BoardCardComponent.razor
View file

@ -1,5 +1,5 @@
@using System.Globalization
<section class="w-80 max-w-xs">
<section class="w-80 max-w-full md:max-w-xs">
@if (!string.IsNullOrWhiteSpace(Heading)) {
<h2 class="text-2xl lg:hyphens-auto mb-3" lang="@CultureInfo.CurrentCulture">@Heading</h2>
}

13
Wave/Components/UserLinkComponent.razor Normal file
View file

@ -0,0 +1,13 @@
@using Wave.Data
<a href="@Link.UrlString" rel="me" target="_blank" @attributes="AdditionalAttributes">
<img src="@("https://" + Link.Url.Host + "/favicon.png")" alt="" width="16" height="16" data-errors="0" />
@(Link.Url.Host.LastIndexOf('.') > -1 ? Link.Url.Host[..Link.Url.Host.LastIndexOf('.')] : Link.Url.Host)
</a>
@code {
[Parameter]
public required UserLink Link { get; set; }
[Parameter(CaptureUnmatchedValues = true)]
public IDictionary<string, object>? AdditionalAttributes { get; set; }
}

55
Wave/Controllers/UserController.cs
View file

@ -1,4 +1,6 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Wave.Data;
using Wave.Services;
@ -6,24 +8,43 @@
namespace Wave.Controllers;
[ApiController]
[Route("/api/user")]
[Microsoft.AspNetCore.Mvc.Route("/api/[controller]")]
public class UserController(ImageService imageService, IDbContextFactory<ApplicationDbContext> contextFactory) : ControllerBase {
private ImageService ImageService { get; } = imageService;
private IDbContextFactory<ApplicationDbContext> ContextFactory { get; } = contextFactory;
private ImageService ImageService { get; } = imageService;
private IDbContextFactory<ApplicationDbContext> ContextFactory { get; } = contextFactory;
[HttpGet]
[Route("pfp/{userId}")]
public async Task<IActionResult> Get(string userId) {
await using var context = await ContextFactory.CreateDbContextAsync();
var user = await context.Users.Include(u => u.ProfilePicture).FirstOrDefaultAsync(u => u.Id == userId);
if (user is null) return NotFound();
if (user.ProfilePicture is null) {
return StatusCode(StatusCodes.Status204NoContent);
}
[HttpGet]
[Microsoft.AspNetCore.Mvc.Route("pfp/{userId}")]
public async Task<IActionResult> Get(string userId) {
await using var context = await ContextFactory.CreateDbContextAsync();
var user = await context.Users.Include(u => u.ProfilePicture).FirstOrDefaultAsync(u => u.Id == userId);
if (user is null) return NotFound();
if (user.ProfilePicture is null) {
return StatusCode(StatusCodes.Status204NoContent);
}
string? path = ImageService.GetPath(user.ProfilePicture.ImageId);
if (path is null) return NotFound();
string? path = ImageService.GetPath(user.ProfilePicture.ImageId);
if (path is null) return NotFound();
return File(System.IO.File.OpenRead(path), ImageService.ImageMimeType);
}
return File(System.IO.File.OpenRead(path), ImageService.ImageMimeType);
}
[HttpPost("link/{linkId:int}")]
[ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
public async Task<IActionResult> DeleteUserLink(int linkId, [FromServices] UserManager<ApplicationUser> userManager) {
if (!string.Equals(Request.Form["_method"], "delete", StringComparison.InvariantCultureIgnoreCase))
return BadRequest();
string returnUrl = Request.Form["ReturnUrl"].FirstOrDefault() ?? string.Empty;
var user = await userManager.GetUserAsync(User);
if (user is null) return Unauthorized();
var link = user.Links.FirstOrDefault(l => l.Id == linkId);
if (link is null) return NotFound();
user.Links.Remove(link);
await userManager.UpdateAsync(user);
return LocalRedirect(string.IsNullOrWhiteSpace(returnUrl) ? "/" : returnUrl);
}
}

113
Wave/Data/ApplicationDbContext.cs
View file

@ -5,71 +5,74 @@
namespace Wave.Data;
public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
: IdentityDbContext<ApplicationUser>(options) {
: IdentityDbContext<ApplicationUser>(options) {
protected override void OnModelCreating(ModelBuilder builder) {
base.OnModelCreating(builder);
protected override void OnModelCreating(ModelBuilder builder) {
base.OnModelCreating(builder);
var dateTimeOffsetUtcConverter = new ValueConverter<DateTimeOffset, DateTimeOffset>(
model => model.ToUniversalTime(),
utc => utc.ToLocalTime()
);
var dateTimeOffsetUtcConverter = new ValueConverter<DateTimeOffset, DateTimeOffset>(
model => model.ToUniversalTime(),
utc => utc.ToLocalTime()
);
builder.Entity<ApplicationUser>(user => {
user.Property(u => u.FullName).HasMaxLength(64);
user.Property(u => u.AboutTheAuthor).HasMaxLength(512);
user.Property(u => u.Biography).HasMaxLength(4096);
builder.Entity<ApplicationUser>(user => {
user.Property(u => u.FullName).HasMaxLength(64);
user.Property(u => u.AboutTheAuthor).HasMaxLength(512);
user.Property(u => u.Biography).HasMaxLength(4096);
user.HasOne(u => u.ProfilePicture).WithOne().HasForeignKey(typeof(ProfilePicture))
.OnDelete(DeleteBehavior.SetNull);
user.HasOne(u => u.ProfilePicture).WithOne().HasForeignKey(typeof(ProfilePicture))
.OnDelete(DeleteBehavior.SetNull);
user.HasMany(u => u.Links).WithOne().OnDelete(DeleteBehavior.Cascade);
user.Navigation(u => u.ProfilePicture).IsRequired(false);
});
builder.Entity<ProfilePicture>(pfp => {
pfp.HasKey(p => p.Id);
pfp.Property(p => p.ImageId).IsRequired();
pfp.ToTable("ProfilePictures");
});
user.Navigation(u => u.ProfilePicture).IsRequired(false);
user.Navigation(u => u.Links).AutoInclude();
});
builder.Entity<ProfilePicture>(pfp => {
pfp.HasKey(p => p.Id);
pfp.Property(p => p.ImageId).IsRequired();
pfp.ToTable("ProfilePictures");
});
builder.Entity<Article>(article => {
article.HasKey(a => a.Id);
article.Property(a => a.Title)
.IsRequired().HasMaxLength(256);
builder.Entity<Article>(article => {
article.HasKey(a => a.Id);
article.Property(a => a.Title)
.IsRequired().HasMaxLength(256);
article.HasOne(a => a.Author).WithMany()
.IsRequired().OnDelete(DeleteBehavior.Cascade);
article.HasOne(a => a.Reviewer).WithMany()
.IsRequired(false).OnDelete(DeleteBehavior.SetNull);
article.HasOne(a => a.Author).WithMany(a => a.Articles)
.IsRequired().OnDelete(DeleteBehavior.Cascade);
article.HasOne(a => a.Reviewer).WithMany()
.IsRequired(false).OnDelete(DeleteBehavior.SetNull);
article.Property(a => a.CreationDate)
.IsRequired().HasDefaultValueSql("now()")
.HasConversion(dateTimeOffsetUtcConverter);
article.Property(a => a.PublishDate)
.HasConversion(dateTimeOffsetUtcConverter);
article.Property(a => a.LastModified)
.IsRequired().HasDefaultValueSql("now()")
.HasConversion(dateTimeOffsetUtcConverter);
article.Property(a => a.CreationDate)
.IsRequired().HasDefaultValueSql("now()")
.HasConversion(dateTimeOffsetUtcConverter);
article.Property(a => a.PublishDate)
.HasConversion(dateTimeOffsetUtcConverter);
article.Property(a => a.LastModified)
.IsRequired().HasDefaultValueSql("now()")
.HasConversion(dateTimeOffsetUtcConverter);
article.HasQueryFilter(a => !a.IsDeleted);
article.ToTable("Articles");
});
article.HasQueryFilter(a => !a.IsDeleted);
article.ToTable("Articles");
});
builder.Entity<Category>(category => {
category.HasKey(c => c.Id);
category.Property(c => c.Name).IsRequired().HasMaxLength(128);
category.Property(c => c.Color).IsRequired().HasDefaultValue(CategoryColors.Default);
builder.Entity<Category>(category => {
category.HasKey(c => c.Id);
category.Property(c => c.Name).IsRequired().HasMaxLength(128);
category.Property(c => c.Color).IsRequired().HasSentinel(CategoryColors.Default)
.HasDefaultValue(CategoryColors.Default);
category.HasMany<Article>().WithMany(a => a.Categories)
.UsingEntity<ArticleCategory>(
ac => ac.HasOne(a => a.Article).WithMany().OnDelete(DeleteBehavior.NoAction),
ac => ac.HasOne(a => a.Category).WithMany().OnDelete(DeleteBehavior.NoAction),
articleCategory => {
articleCategory.HasKey(ac => ac.Id);
articleCategory.ToTable("ArticleCategories");
articleCategory.HasQueryFilter(ac => !ac.Article.IsDeleted);
});
category.HasMany<Article>().WithMany(a => a.Categories)
.UsingEntity<ArticleCategory>(
ac => ac.HasOne(a => a.Article).WithMany().OnDelete(DeleteBehavior.NoAction),
ac => ac.HasOne(a => a.Category).WithMany().OnDelete(DeleteBehavior.NoAction),
articleCategory => {
articleCategory.HasKey(ac => ac.Id);
articleCategory.ToTable("ArticleCategories");
articleCategory.HasQueryFilter(ac => !ac.Article.IsDeleted);
});
category.ToTable("Categories");
});
}
category.ToTable("Categories");
});
}
}

3
Wave/Data/ApplicationUser.cs
View file

@ -16,4 +16,7 @@ public class ApplicationUser : IdentityUser {
public string BiographyHtml { get; set; } = string.Empty;
public string Name => FullName ?? UserName ?? "Anon";
public IList<Article> Articles { get; set; } = [];
public IList<UserLink> Links { get; set; } = [];
}

3
Wave/Data/Migrations/postgres/20240113124101_InitialCreate.cs
View file

@ -7,6 +7,9 @@
namespace Wave.Data.Migrations.postgres;
// Add-Migration InitialCreate -OutputDir Data/Migrations/postgres -Project Wave -StartupProject Wave -Context ApplicationDbContext -Args "ConnectionStrings:DefaultConnection=Host=localhost;Port=5432;AllowAnonymousConnections=true"
// Remove-Migration -force -Project Wave -StartupProject Wave -Context ApplicationDbContext -Args "ConnectionStrings:DefaultConnection=Host=localhost;Port=5432;AllowAnonymousConnections=true"
/// <inheritdoc />
public partial class InitialCreate : Migration {
/// <inheritdoc />

500
Wave/Data/Migrations/postgres/20240202223047_UserLinks.Designer.cs generated Normal file
View file

@ -0,0 +1,500 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Wave.Data;
#nullable disable
namespace Wave.Data.Migrations.postgres
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20240202223047_UserLinks")]
partial class UserLinks
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
{
b.Property<string>("Id")
.HasColumnType("text");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("text");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ClaimType")
.HasColumnType("text");
b.Property<string>("ClaimValue")
.HasColumnType("text");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ClaimType")
.HasColumnType("text");
b.Property<string>("ClaimValue")
.HasColumnType("text");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("text");
b.Property<string>("ProviderKey")
.HasColumnType("text");
b.Property<string>("ProviderDisplayName")
.HasColumnType("text");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("text");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("text");
b.Property<string>("RoleId")
.HasColumnType("text");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("text");
b.Property<string>("LoginProvider")
.HasColumnType("text");
b.Property<string>("Name")
.HasColumnType("text");
b.Property<string>("Value")
.HasColumnType("text");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("Wave.Data.ApplicationUser", b =>
{
b.Property<string>("Id")
.HasColumnType("text");
b.Property<string>("AboutTheAuthor")
.IsRequired()
.HasMaxLength(512)
.HasColumnType("character varying(512)");
b.Property<int>("AccessFailedCount")
.HasColumnType("integer");
b.Property<string>("Biography")
.IsRequired()
.HasMaxLength(4096)
.HasColumnType("character varying(4096)");
b.Property<string>("BiographyHtml")
.IsRequired()
.HasColumnType("text");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("text");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<bool>("EmailConfirmed")
.HasColumnType("boolean");
b.Property<string>("FullName")
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<bool>("LockoutEnabled")
.HasColumnType("boolean");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("timestamp with time zone");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.Property<string>("PasswordHash")
.HasColumnType("text");
b.Property<string>("PhoneNumber")
.HasColumnType("text");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("boolean");
b.Property<string>("SecurityStamp")
.HasColumnType("text");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("boolean");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers", (string)null);
});
modelBuilder.Entity("Wave.Data.Article", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<string>("AuthorId")
.IsRequired()
.HasColumnType("text");
b.Property<string>("Body")
.IsRequired()
.HasColumnType("text");
b.Property<string>("BodyHtml")
.IsRequired()
.HasColumnType("text");
b.Property<DateTimeOffset>("CreationDate")
.ValueGeneratedOnAdd()
.HasColumnType("timestamp with time zone")
.HasDefaultValueSql("now()");
b.Property<bool>("IsDeleted")
.HasColumnType("boolean");
b.Property<DateTimeOffset>("LastModified")
.ValueGeneratedOnAdd()
.HasColumnType("timestamp with time zone")
.HasDefaultValueSql("now()");
b.Property<DateTimeOffset>("PublishDate")
.HasColumnType("timestamp with time zone");
b.Property<string>("ReviewerId")
.HasColumnType("text");
b.Property<int>("Status")
.HasColumnType("integer");
b.Property<string>("Title")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)");
b.HasKey("Id");
b.HasIndex("AuthorId");
b.HasIndex("ReviewerId");
b.ToTable("Articles", (string)null);
});
modelBuilder.Entity("Wave.Data.ArticleCategory", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<Guid>("ArticleId")
.HasColumnType("uuid");
b.Property<Guid>("CategoryId")
.HasColumnType("uuid");
b.HasKey("Id");
b.HasIndex("ArticleId");
b.HasIndex("CategoryId");
b.ToTable("ArticleCategories", (string)null);
});
modelBuilder.Entity("Wave.Data.Category", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<int>("Color")
.ValueGeneratedOnAdd()
.HasColumnType("integer")
.HasDefaultValue(25);
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(128)
.HasColumnType("character varying(128)");
b.HasKey("Id");
b.ToTable("Categories", (string)null);
});
modelBuilder.Entity("Wave.Data.ProfilePicture", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ApplicationUserId")
.HasColumnType("text");
b.Property<Guid>("ImageId")
.HasColumnType("uuid");
b.HasKey("Id");
b.HasIndex("ApplicationUserId")
.IsUnique();
b.ToTable("ProfilePictures", (string)null);
});
modelBuilder.Entity("Wave.Data.UserLink", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ApplicationUserId")
.HasColumnType("text");
b.Property<string>("UrlString")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("character varying(1024)");
b.HasKey("Id");
b.HasIndex("ApplicationUserId");
b.ToTable("UserLink");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("Wave.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("Wave.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Wave.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("Wave.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Wave.Data.Article", b =>
{
b.HasOne("Wave.Data.ApplicationUser", "Author")
.WithMany("Articles")
.HasForeignKey("AuthorId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Wave.Data.ApplicationUser", "Reviewer")
.WithMany()
.HasForeignKey("ReviewerId")
.OnDelete(DeleteBehavior.SetNull);
b.Navigation("Author");
b.Navigation("Reviewer");
});
modelBuilder.Entity("Wave.Data.ArticleCategory", b =>
{
b.HasOne("Wave.Data.Article", "Article")
.WithMany()
.HasForeignKey("ArticleId")
.OnDelete(DeleteBehavior.NoAction)
.IsRequired();
b.HasOne("Wave.Data.Category", "Category")
.WithMany()
.HasForeignKey("CategoryId")
.OnDelete(DeleteBehavior.NoAction)
.IsRequired();
b.Navigation("Article");
b.Navigation("Category");
});
modelBuilder.Entity("Wave.Data.ProfilePicture", b =>
{
b.HasOne("Wave.Data.ApplicationUser", null)
.WithOne("ProfilePicture")
.HasForeignKey("Wave.Data.ProfilePicture", "ApplicationUserId")
.OnDelete(DeleteBehavior.SetNull);
});
modelBuilder.Entity("Wave.Data.UserLink", b =>
{
b.HasOne("Wave.Data.ApplicationUser", null)
.WithMany("Links")
.HasForeignKey("ApplicationUserId")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Wave.Data.ApplicationUser", b =>
{
b.Navigation("Articles");
b.Navigation("Links");
b.Navigation("ProfilePicture");
});
#pragma warning restore 612, 618
}
}
}

42
Wave/Data/Migrations/postgres/20240202223047_UserLinks.cs Normal file
View file

@ -0,0 +1,42 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Wave.Data.Migrations.postgres;
/// <inheritdoc />
public partial class UserLinks : Migration {
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder) {
migrationBuilder.CreateTable(
name: "UserLink",
columns: table => new {
Id = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy",
NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
UrlString = table.Column<string>(type: "character varying(1024)", maxLength: 1024, nullable: false),
ApplicationUserId = table.Column<string>(type: "text", nullable: true)
},
constraints: table => {
table.PrimaryKey("PK_UserLink", x => x.Id);
table.ForeignKey(
name: "FK_UserLink_AspNetUsers_ApplicationUserId",
column: x => x.ApplicationUserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_UserLink_ApplicationUserId",
table: "UserLink",
column: "ApplicationUserId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder) {
migrationBuilder.DropTable(
name: "UserLink");
}
}

37
Wave/Data/Migrations/postgres/ApplicationDbContextModelSnapshot.cs
View file

@ -356,6 +356,29 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.ToTable("ProfilePictures", (string)null);
});
modelBuilder.Entity("Wave.Data.UserLink", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
b.Property<string>("ApplicationUserId")
.HasColumnType("text");
b.Property<string>("UrlString")
.IsRequired()
.HasMaxLength(1024)
.HasColumnType("character varying(1024)");
b.HasKey("Id");
b.HasIndex("ApplicationUserId");
b.ToTable("UserLink");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
@ -410,7 +433,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
modelBuilder.Entity("Wave.Data.Article", b =>
{
b.HasOne("Wave.Data.ApplicationUser", "Author")
.WithMany()
.WithMany("Articles")
.HasForeignKey("AuthorId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@ -452,8 +475,20 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.OnDelete(DeleteBehavior.SetNull);
});
modelBuilder.Entity("Wave.Data.UserLink", b =>
{
b.HasOne("Wave.Data.ApplicationUser", null)
.WithMany("Links")
.HasForeignKey("ApplicationUserId")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Wave.Data.ApplicationUser", b =>
{
b.Navigation("Articles");
b.Navigation("Links");
b.Navigation("ProfilePicture");
});
#pragma warning restore 612, 618

21
Wave/Data/UserLink.cs Normal file
View file

@ -0,0 +1,21 @@
using System.ComponentModel.DataAnnotations;
namespace Wave.Data;
public class UserLink {
[Key]
public int Id { get; set; }
[MaxLength(1024)]
public string UrlString { get; set; } = string.Empty;
public Uri Url => new(UrlString, UriKind.Absolute);
public bool Validate() {
try {
_ = Url;
return true;
} catch {
return false;
}
}
}

15
Wave/Resources/Components/Account/Pages/Manage/Index.de-DE.resx
View file

@ -150,4 +150,19 @@ Ich koche seit dem jungen Alter von 7...</value>
<data name="Submit" xml:space="preserve">
<value>Speichern</value>
</data>
<data name="Links_Delete_Label" xml:space="preserve">
<value>Link löschen</value>
</data>
<data name="Links" xml:space="preserve">
<value>Benutzerdefinierte Links</value>
</data>
<data name="Links_Url_Label" xml:space="preserve">
<value>Neuer Link</value>
</data>
<data name="Links_Url_Placeholder" xml:space="preserve">
<value>https://example.de/user/anna-muster</value>
</data>
<data name="Links_Submit" xml:space="preserve">
<value>Hinzufügen</value>
</data>
</root>

15
Wave/Resources/Components/Account/Pages/Manage/Index.resx
View file

@ -150,4 +150,19 @@ I started cooking at the young age of 7...</value>
<data name="Submit" xml:space="preserve">
<value>Save</value>
</data>
<data name="Links" xml:space="preserve">
<value>Custom Links</value>
</data>
<data name="Links_Delete_Label" xml:space="preserve">
<value>Delete link</value>
</data>
<data name="Links_Url_Label" xml:space="preserve">
<value>New Link</value>
</data>
<data name="Links_Url_Placeholder" xml:space="preserve">
<value>https://example.com/user/jane-smith</value>
</data>
<data name="Links_Submit" xml:space="preserve">
<value>Add</value>
</data>
</root>

2
Wave/wwwroot/css/main.min.css vendored
View file

File diff suppressed because one or more lines are too long