From 15608f0e31c335fb005e7577891b7afbcf53c42c Mon Sep 17 00:00:00 2001 From: "t.ruspekhofer" Date: Mon, 21 Feb 2022 00:27:26 +0100 Subject: [PATCH] renamed User to LiebUser --- Lieb/Data/DbInitializer.cs | 8 ++++---- Lieb/Data/LiebContext.cs | 4 ++-- Lieb/Models/{User.cs => LiebUser.cs} | 4 ++-- Lieb/Models/Raid/RaidSignUp.cs | 2 +- Lieb/Models/Raid/RandomRaid.cs | 2 +- Lieb/Pages/Users/Create.cshtml.cs | 2 +- Lieb/Pages/Users/Delete.cshtml.cs | 2 +- Lieb/Pages/Users/Details.cshtml.cs | 2 +- Lieb/Pages/Users/Edit.cshtml.cs | 2 +- Lieb/Pages/Users/Index.cshtml.cs | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) rename Lieb/Models/{User.cs => LiebUser.cs} (84%) diff --git a/Lieb/Data/DbInitializer.cs b/Lieb/Data/DbInitializer.cs index 02a19ac..b3d68ca 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 User[] + var users = new LiebUser[] { - 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")} + 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")} }; context.Users.AddRange(users); diff --git a/Lieb/Data/LiebContext.cs b/Lieb/Data/LiebContext.cs index 629a211..2c199fd 100644 --- a/Lieb/Data/LiebContext.cs +++ b/Lieb/Data/LiebContext.cs @@ -16,7 +16,7 @@ namespace Lieb.Data { } - 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; } @@ -31,7 +31,7 @@ namespace Lieb.Data protected override void OnModelCreating(ModelBuilder 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/Models/User.cs b/Lieb/Models/LiebUser.cs similarity index 84% rename from Lieb/Models/User.cs rename to Lieb/Models/LiebUser.cs index 3ba9080..d319e09 100644 --- a/Lieb/Models/User.cs +++ b/Lieb/Models/LiebUser.cs @@ -1,8 +1,8 @@ namespace Lieb.Models { - public class User + public class LiebUser { - public int UserId { get; set; } + public int LiebUserId { 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/Models/Raid/RaidSignUp.cs b/Lieb/Models/Raid/RaidSignUp.cs index b7fcab8..c862a3c 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 User User { get; set; } = new User(); + public LiebUser User { get; set; } = new LiebUser(); 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 c9add95..9339fe2 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 User Tank { get; set; } = new User(); + public LiebUser Tank { get; set; } = new LiebUser(); public bool RandomClass { get; set; } public bool RandomEliteSpecialization { get; set; } diff --git a/Lieb/Pages/Users/Create.cshtml.cs b/Lieb/Pages/Users/Create.cshtml.cs index 5b93e17..3d749af 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 User User { get; set; } + public LiebUser 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 0cf2f96..9f8856c 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 User User { get; set; } + public LiebUser 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 0a6140d..3b5a22a 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 User User { get; set; } + public LiebUser 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 692c222..c5126d9 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 User User { get; set; } + public LiebUser 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 5857ba2..046e32a 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() {