diff --git a/Lieb/Data/DbInitializer.cs b/Lieb/Data/DbInitializer.cs index b3d68ca..02a19ac 100644 --- a/Lieb/Data/DbInitializer.cs +++ b/Lieb/Data/DbInitializer.cs @@ -12,11 +12,11 @@ namespace Lieb.Data return; // DB has been seeded } - var users = new LiebUser[] + var users = new User[] { - new LiebUser{DiscordUserId=0, Name="Sarah",Birthday=DateTime.Parse("1992-01-15")}, - new LiebUser{DiscordUserId=0, Name="Lisa",Birthday=DateTime.Parse("1991-02-15")}, - new LiebUser{DiscordUserId=0, Name="Simon",Birthday=DateTime.Parse("2019-09-01")} + new User{DiscordUserId=0, Name="Sarah",Birthday=DateTime.Parse("1992-01-15")}, + new User{DiscordUserId=0, Name="Lisa",Birthday=DateTime.Parse("1991-02-15")}, + new User{DiscordUserId=0, Name="Simon",Birthday=DateTime.Parse("2019-09-01")} }; context.Users.AddRange(users); diff --git a/Lieb/Data/LiebContext.cs b/Lieb/Data/LiebContext.cs index 772d33f..629a211 100644 --- a/Lieb/Data/LiebContext.cs +++ b/Lieb/Data/LiebContext.cs @@ -6,18 +6,17 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Lieb.Models; using Lieb.Models.Raid; -using Microsoft.AspNetCore.Identity.EntityFrameworkCore; namespace Lieb.Data { - public class LiebContext : IdentityDbContext -{ - public LiebContext (DbContextOptions options) + public class LiebContext : DbContext + { + public LiebContext (DbContextOptions options) : base(options) { } - public DbSet Users { get; set; } + public DbSet Users { get; set; } public DbSet GuildWars2Account { get; set; } public DbSet Equipped { get; set; } public DbSet RaidRoles { get; set; } @@ -32,8 +31,7 @@ namespace Lieb.Data protected override void OnModelCreating(ModelBuilder modelBuilder) { - base.OnModelCreating(modelBuilder); - modelBuilder.Entity().ToTable("User"); + modelBuilder.Entity().ToTable("User"); modelBuilder.Entity().ToTable("GuildWars2Account"); modelBuilder.Entity().ToTable("Equipped"); modelBuilder.Entity().ToTable("RaidRole"); diff --git a/Lieb/Lieb.csproj b/Lieb/Lieb.csproj index 6934c1a..5cfee68 100644 --- a/Lieb/Lieb.csproj +++ b/Lieb/Lieb.csproj @@ -12,8 +12,6 @@ - - all diff --git a/Lieb/Models/Raid/RaidSignUp.cs b/Lieb/Models/Raid/RaidSignUp.cs index c862a3c..b7fcab8 100644 --- a/Lieb/Models/Raid/RaidSignUp.cs +++ b/Lieb/Models/Raid/RaidSignUp.cs @@ -21,7 +21,7 @@ public SignUpType SignUpType { get; set; } public Raid Raid { get; set; } - public LiebUser User { get; set; } = new LiebUser(); + public User User { get; set; } = new User(); public GuildWars2Account GuildWars2Account { get; set; } = new GuildWars2Account(); public PlannedRaidRole PlannedRaidRole { get; set; } = new PlannedRaidRole(); } diff --git a/Lieb/Models/Raid/RandomRaid.cs b/Lieb/Models/Raid/RandomRaid.cs index 9339fe2..c9add95 100644 --- a/Lieb/Models/Raid/RandomRaid.cs +++ b/Lieb/Models/Raid/RandomRaid.cs @@ -6,7 +6,7 @@ public short Quickness { get; set; } public short Alacrity { get; set; } public short Heal { get; set; } - public LiebUser Tank { get; set; } = new LiebUser(); + public User Tank { get; set; } = new User(); public bool RandomClass { get; set; } public bool RandomEliteSpecialization { get; set; } diff --git a/Lieb/Models/LiebUser.cs b/Lieb/Models/User.cs similarity index 69% rename from Lieb/Models/LiebUser.cs rename to Lieb/Models/User.cs index 0b7017e..3ba9080 100644 --- a/Lieb/Models/LiebUser.cs +++ b/Lieb/Models/User.cs @@ -1,10 +1,8 @@ -using Microsoft.AspNetCore.Identity; - -namespace Lieb.Models +namespace Lieb.Models { - public class LiebUser : IdentityUser + public class User { - public int LiebUserId { get; set; } + public int UserId { get; set; } public ulong DiscordUserId { get; set; } public string Name { get; set; } = string.Empty; public string Pronouns { get; set; } = string.Empty; diff --git a/Lieb/Pages/Users/Create.cshtml.cs b/Lieb/Pages/Users/Create.cshtml.cs index 3d749af..5b93e17 100644 --- a/Lieb/Pages/Users/Create.cshtml.cs +++ b/Lieb/Pages/Users/Create.cshtml.cs @@ -26,7 +26,7 @@ namespace Lieb.Pages.Users } [BindProperty] - public LiebUser User { get; set; } + public User User { get; set; } // To protect from overposting attacks, see https://aka.ms/RazorPagesCRUD public async Task OnPostAsync() diff --git a/Lieb/Pages/Users/Delete.cshtml.cs b/Lieb/Pages/Users/Delete.cshtml.cs index 9f8856c..0cf2f96 100644 --- a/Lieb/Pages/Users/Delete.cshtml.cs +++ b/Lieb/Pages/Users/Delete.cshtml.cs @@ -21,7 +21,7 @@ namespace Lieb.Pages.Users } [BindProperty] - public LiebUser User { get; set; } + public User User { get; set; } public async Task OnGetAsync(int? id) { diff --git a/Lieb/Pages/Users/Details.cshtml.cs b/Lieb/Pages/Users/Details.cshtml.cs index 3b5a22a..0a6140d 100644 --- a/Lieb/Pages/Users/Details.cshtml.cs +++ b/Lieb/Pages/Users/Details.cshtml.cs @@ -20,7 +20,7 @@ namespace Lieb.Pages.Users _context = context; } - public LiebUser User { get; set; } + public User User { get; set; } public async Task OnGetAsync(int? id) { diff --git a/Lieb/Pages/Users/Edit.cshtml.cs b/Lieb/Pages/Users/Edit.cshtml.cs index c5126d9..692c222 100644 --- a/Lieb/Pages/Users/Edit.cshtml.cs +++ b/Lieb/Pages/Users/Edit.cshtml.cs @@ -22,7 +22,7 @@ namespace Lieb.Pages.Users } [BindProperty] - public LiebUser User { get; set; } + public User User { get; set; } public async Task OnGetAsync(int? id) { diff --git a/Lieb/Pages/Users/Index.cshtml.cs b/Lieb/Pages/Users/Index.cshtml.cs index 046e32a..5857ba2 100644 --- a/Lieb/Pages/Users/Index.cshtml.cs +++ b/Lieb/Pages/Users/Index.cshtml.cs @@ -20,7 +20,7 @@ namespace Lieb.Pages.Users _context = context; } - public IList User { get;set; } + public IList User { get;set; } public async Task OnGetAsync() { diff --git a/Lieb/Program.cs b/Lieb/Program.cs index 862e3da..9869132 100644 --- a/Lieb/Program.cs +++ b/Lieb/Program.cs @@ -1,11 +1,10 @@ -using Discord.OAuth2; +using Discord.OAuth2; using Lieb.Data; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -using Microsoft.AspNetCore.Identity; var builder = WebApplication.CreateBuilder(args); @@ -14,10 +13,6 @@ builder.Services.AddRazorPages(); builder.Services.AddDbContext(options => options.UseSqlServer(builder.Configuration.GetConnectionString("LiebContext"))); -/* -builder.Services.AddDefaultIdentity(options => options.SignIn.RequireConfirmedAccount = true) - .AddEntityFrameworkStores();builder.Services.AddDbContext(options => - options.UseSqlServer(connectionString));*/ builder.Services.AddDatabaseDeveloperPageExceptionFilter();