From d0ff8251a27b8ec21f4eae124c7da5e3581189e0 Mon Sep 17 00:00:00 2001 From: Sarah Faey Date: Wed, 16 Nov 2022 22:23:53 +0100 Subject: [PATCH] reorganized Raid pages --- .../Raids/RaidEdit/DiscordMessageEdit.razor | 71 +++++++++++++ .../Pages/Raids/{ => RaidEdit}/RaidEdit.razor | 56 +--------- .../Raids/{ => RaidEdit}/RaidEdit.razor.css | 0 .../{ => RaidEdit}/RaidTemplateEdit.razor | 0 Lieb/Pages/Raids/RaidEdit/ReminderEdit.razor | 100 ++++++++++++++++++ .../{ => RaidOverview}/RaidDetails.razor | 0 .../{ => RaidOverview}/RaidDetails.razor.css | 0 .../{ => RaidOverview}/RaidOverview.razor | 0 .../{ => RaidOverview}/RaidOverview.razor.css | 0 .../Raids/{ => RaidOverview}/RaidRoles.razor | 0 .../{ => RaidOverview}/RaidRoles.razor.css | 0 .../RaidTemplateDetails.razor | 0 .../RaidTemplateDetails.razor.css | 0 .../RaidTemplateOverview.razor | 0 .../{ => RaidOverview}/SignedUpUsers.razor | 0 .../SignedUpUsers.razor.css | 0 16 files changed, 174 insertions(+), 53 deletions(-) create mode 100644 Lieb/Pages/Raids/RaidEdit/DiscordMessageEdit.razor rename Lieb/Pages/Raids/{ => RaidEdit}/RaidEdit.razor (80%) rename Lieb/Pages/Raids/{ => RaidEdit}/RaidEdit.razor.css (100%) rename Lieb/Pages/Raids/{ => RaidEdit}/RaidTemplateEdit.razor (100%) create mode 100644 Lieb/Pages/Raids/RaidEdit/ReminderEdit.razor rename Lieb/Pages/Raids/{ => RaidOverview}/RaidDetails.razor (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/RaidDetails.razor.css (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/RaidOverview.razor (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/RaidOverview.razor.css (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/RaidRoles.razor (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/RaidRoles.razor.css (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/RaidTemplateDetails.razor (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/RaidTemplateDetails.razor.css (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/RaidTemplateOverview.razor (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/SignedUpUsers.razor (100%) rename Lieb/Pages/Raids/{ => RaidOverview}/SignedUpUsers.razor.css (100%) diff --git a/Lieb/Pages/Raids/RaidEdit/DiscordMessageEdit.razor b/Lieb/Pages/Raids/RaidEdit/DiscordMessageEdit.razor new file mode 100644 index 0000000..ee8f20f --- /dev/null +++ b/Lieb/Pages/Raids/RaidEdit/DiscordMessageEdit.razor @@ -0,0 +1,71 @@ +@using Lieb.Data +@using Lieb.Models +@using Lieb.Models.GuildWars2.Raid +@using SharedClasses.SharedModels + +

+ + + + + + + + @foreach( DiscordRaidMessage message in _raid.DiscordRaidMessages) + { + bool disableEdit = message.DiscordRaidMessageId != 0; + + + + + + } +
ServerChannel
+ + @foreach(DiscordServer item in _discordServers) + { + + } + + + + @if(message.DiscordGuildId > 0) + { + List channels = _discordServers.Where(s => s.Id == message.DiscordGuildId).FirstOrDefault(new DiscordServer()).Channels; + @foreach(DiscordChannel item in channels) + { + + } + } + +
+

+ + +@code { + + [Parameter] + public Raid _raid { get; set; } + + [Parameter] + public List _discordServers {get; set; } + + [Parameter] + public List _messagesToDelete {get; set; } + + async Task AddDiscordMessageClicked() + { + _raid.DiscordRaidMessages.Add(new DiscordRaidMessage()); + } + + async Task DeleteMessageClicked(DiscordRaidMessage message) + { + if(message.DiscordRaidMessageId != 0) + { + _messagesToDelete.Add(message); + } + _raid.DiscordRaidMessages.Remove(message); + } +} \ No newline at end of file diff --git a/Lieb/Pages/Raids/RaidEdit.razor b/Lieb/Pages/Raids/RaidEdit/RaidEdit.razor similarity index 80% rename from Lieb/Pages/Raids/RaidEdit.razor rename to Lieb/Pages/Raids/RaidEdit/RaidEdit.razor index 086383a..ccbbfc5 100644 --- a/Lieb/Pages/Raids/RaidEdit.razor +++ b/Lieb/Pages/Raids/RaidEdit/RaidEdit.razor @@ -145,45 +145,9 @@

} -

- - - - - - - - @foreach( DiscordRaidMessage message in _raid.DiscordRaidMessages) - { - bool disableEdit = message.DiscordRaidMessageId != 0; - - - - - - } -
ServerChannel
- - @foreach(DiscordServer item in _discordServers) - { - - } - - - - @if(message.DiscordGuildId > 0) - { - List channels = _discordServers.Where(s => s.Id == message.DiscordGuildId).FirstOrDefault(new DiscordServer()).Channels; - @foreach(DiscordChannel item in channels) - { - - } - } - -
-

+ + + @@ -270,20 +234,6 @@ } _raid.Roles.Remove(role); } - - async Task AddDiscordMessageClicked() - { - _raid.DiscordRaidMessages.Add(new DiscordRaidMessage()); - } - - async Task DeleteMessageClicked(DiscordRaidMessage message) - { - if(message.DiscordRaidMessageId != 0) - { - _messagesToDelete.Add(message); - } - _raid.DiscordRaidMessages.Remove(message); - } async Task DeleteRaidClicked() { diff --git a/Lieb/Pages/Raids/RaidEdit.razor.css b/Lieb/Pages/Raids/RaidEdit/RaidEdit.razor.css similarity index 100% rename from Lieb/Pages/Raids/RaidEdit.razor.css rename to Lieb/Pages/Raids/RaidEdit/RaidEdit.razor.css diff --git a/Lieb/Pages/Raids/RaidTemplateEdit.razor b/Lieb/Pages/Raids/RaidEdit/RaidTemplateEdit.razor similarity index 100% rename from Lieb/Pages/Raids/RaidTemplateEdit.razor rename to Lieb/Pages/Raids/RaidEdit/RaidTemplateEdit.razor diff --git a/Lieb/Pages/Raids/RaidEdit/ReminderEdit.razor b/Lieb/Pages/Raids/RaidEdit/ReminderEdit.razor new file mode 100644 index 0000000..113be4f --- /dev/null +++ b/Lieb/Pages/Raids/RaidEdit/ReminderEdit.razor @@ -0,0 +1,100 @@ +@using Lieb.Data +@using Lieb.Models +@using Lieb.Models.GuildWars2.Raid +@using SharedClasses.SharedModels + +

+ + + + + + + @if(_raid.Reminders.Where(r => r.Type == RaidReminder.ReminderType.Channel).Any()) + { + + + } + else + { + + + } + + + @foreach( RaidReminder reminder in _raid.Reminders) + { + bool hidden = reminder.Type == RaidReminder.ReminderType.User; + + + + + + + + + } +
TimeTypeServerChannelMessage
+ TODO: Time + + + @foreach(RaidReminder.ReminderType type in Enum.GetValues(typeof(RaidReminder.ReminderType))) + { + + } + + + + + + + +
+

+ + +@code { + + [Parameter] + public Raid _raid { get; set; } + + [Parameter] + public List _discordServers {get; set; } + + [Parameter] + public List _remindersToDelete {get; set; } + + async Task AddReminderClicked() + { + _raid.Reminders.Add(new RaidReminder() + { + RaidId = _raid.RaidId, + Type = RaidReminder.ReminderType.User + }); + } + + async Task DeleteReminderClicked(RaidReminder reminder) + { + if(reminder.RaidReminderId != 0) + { + _remindersToDelete.Add(reminder); + } + _raid.Reminders.Remove(reminder); + } +} \ No newline at end of file diff --git a/Lieb/Pages/Raids/RaidDetails.razor b/Lieb/Pages/Raids/RaidOverview/RaidDetails.razor similarity index 100% rename from Lieb/Pages/Raids/RaidDetails.razor rename to Lieb/Pages/Raids/RaidOverview/RaidDetails.razor diff --git a/Lieb/Pages/Raids/RaidDetails.razor.css b/Lieb/Pages/Raids/RaidOverview/RaidDetails.razor.css similarity index 100% rename from Lieb/Pages/Raids/RaidDetails.razor.css rename to Lieb/Pages/Raids/RaidOverview/RaidDetails.razor.css diff --git a/Lieb/Pages/Raids/RaidOverview.razor b/Lieb/Pages/Raids/RaidOverview/RaidOverview.razor similarity index 100% rename from Lieb/Pages/Raids/RaidOverview.razor rename to Lieb/Pages/Raids/RaidOverview/RaidOverview.razor diff --git a/Lieb/Pages/Raids/RaidOverview.razor.css b/Lieb/Pages/Raids/RaidOverview/RaidOverview.razor.css similarity index 100% rename from Lieb/Pages/Raids/RaidOverview.razor.css rename to Lieb/Pages/Raids/RaidOverview/RaidOverview.razor.css diff --git a/Lieb/Pages/Raids/RaidRoles.razor b/Lieb/Pages/Raids/RaidOverview/RaidRoles.razor similarity index 100% rename from Lieb/Pages/Raids/RaidRoles.razor rename to Lieb/Pages/Raids/RaidOverview/RaidRoles.razor diff --git a/Lieb/Pages/Raids/RaidRoles.razor.css b/Lieb/Pages/Raids/RaidOverview/RaidRoles.razor.css similarity index 100% rename from Lieb/Pages/Raids/RaidRoles.razor.css rename to Lieb/Pages/Raids/RaidOverview/RaidRoles.razor.css diff --git a/Lieb/Pages/Raids/RaidTemplateDetails.razor b/Lieb/Pages/Raids/RaidOverview/RaidTemplateDetails.razor similarity index 100% rename from Lieb/Pages/Raids/RaidTemplateDetails.razor rename to Lieb/Pages/Raids/RaidOverview/RaidTemplateDetails.razor diff --git a/Lieb/Pages/Raids/RaidTemplateDetails.razor.css b/Lieb/Pages/Raids/RaidOverview/RaidTemplateDetails.razor.css similarity index 100% rename from Lieb/Pages/Raids/RaidTemplateDetails.razor.css rename to Lieb/Pages/Raids/RaidOverview/RaidTemplateDetails.razor.css diff --git a/Lieb/Pages/Raids/RaidTemplateOverview.razor b/Lieb/Pages/Raids/RaidOverview/RaidTemplateOverview.razor similarity index 100% rename from Lieb/Pages/Raids/RaidTemplateOverview.razor rename to Lieb/Pages/Raids/RaidOverview/RaidTemplateOverview.razor diff --git a/Lieb/Pages/Raids/SignedUpUsers.razor b/Lieb/Pages/Raids/RaidOverview/SignedUpUsers.razor similarity index 100% rename from Lieb/Pages/Raids/SignedUpUsers.razor rename to Lieb/Pages/Raids/RaidOverview/SignedUpUsers.razor diff --git a/Lieb/Pages/Raids/SignedUpUsers.razor.css b/Lieb/Pages/Raids/RaidOverview/SignedUpUsers.razor.css similarity index 100% rename from Lieb/Pages/Raids/SignedUpUsers.razor.css rename to Lieb/Pages/Raids/RaidOverview/SignedUpUsers.razor.css