From bbcb0a2ce3028f5472ec7a0203ac93028d4735cc Mon Sep 17 00:00:00 2001 From: Mia Winter Date: Thu, 8 Feb 2024 15:58:29 +0100 Subject: [PATCH] Improved Drafts, Review, Future pages --- Wave/Components/Pages/Drafts.razor | 11 +- Wave/Components/Pages/Future.razor | 11 +- Wave/Components/Pages/Review.razor | 11 +- .../Components/Pages/Drafts.de-DE.resx | 104 ++++++++++++++++++ .../Components/Pages/Drafts.en-GB.resx | 101 +++++++++++++++++ Wave/Resources/Components/Pages/Drafts.resx | 104 ++++++++++++++++++ .../Components/Pages/Future.de-DE.resx | 104 ++++++++++++++++++ .../Components/Pages/Future.en-GB.resx | 101 +++++++++++++++++ Wave/Resources/Components/Pages/Future.resx | 104 ++++++++++++++++++ .../Components/Pages/Review.de-DE.resx | 104 ++++++++++++++++++ .../Components/Pages/Review.en-GB.resx | 101 +++++++++++++++++ Wave/Resources/Components/Pages/Review.resx | 104 ++++++++++++++++++ 12 files changed, 936 insertions(+), 24 deletions(-) create mode 100644 Wave/Resources/Components/Pages/Drafts.de-DE.resx create mode 100644 Wave/Resources/Components/Pages/Drafts.en-GB.resx create mode 100644 Wave/Resources/Components/Pages/Drafts.resx create mode 100644 Wave/Resources/Components/Pages/Future.de-DE.resx create mode 100644 Wave/Resources/Components/Pages/Future.en-GB.resx create mode 100644 Wave/Resources/Components/Pages/Future.resx create mode 100644 Wave/Resources/Components/Pages/Review.de-DE.resx create mode 100644 Wave/Resources/Components/Pages/Review.en-GB.resx create mode 100644 Wave/Resources/Components/Pages/Review.resx diff --git a/Wave/Components/Pages/Drafts.razor b/Wave/Components/Pages/Drafts.razor index 22d82ed..5927f0d 100644 --- a/Wave/Components/Pages/Drafts.razor +++ b/Wave/Components/Pages/Drafts.razor @@ -8,14 +8,8 @@ @inject UserManager UserManager @inject IStringLocalizer Localizer - - @foreach (var article in Articles) { - - } - @if (Articles.Count < 1) { -

@Localizer["NoArticles"]

- } -
+

@Localizer["Title"]

+ @code { [CascadingParameter] @@ -32,6 +26,7 @@ context.Set
() .IgnoreQueryFilters() .Include(a => a.Author) + .Include(a => a.Categories) .Where(a => !a.IsDeleted && a.Status == ArticleStatus.Draft && (admin || a.Author.Id == userId)) .OrderByDescending(a => a.PublishDate) .ToListAsync()); diff --git a/Wave/Components/Pages/Future.razor b/Wave/Components/Pages/Future.razor index b650573..28a64d4 100644 --- a/Wave/Components/Pages/Future.razor +++ b/Wave/Components/Pages/Future.razor @@ -6,14 +6,8 @@ @inject IDbContextFactory ContextFactory @inject IStringLocalizer Localizer - - @foreach (var article in Articles) { - - } - @if(Articles.Count < 1) { -

@Localizer["NoArticles"]

- } -
+

@Localizer["Title"]

+ @code { private List
Articles { get; } = []; @@ -26,6 +20,7 @@ context.Set
() .IgnoreQueryFilters() .Include(a => a.Author) + .Include(a => a.Categories) .Where(a => !a.IsDeleted && a.Status == ArticleStatus.Published && a.PublishDate > now) .OrderByDescending(a => a.PublishDate) .ToListAsync()); diff --git a/Wave/Components/Pages/Review.razor b/Wave/Components/Pages/Review.razor index 4de1719..1b1cd59 100644 --- a/Wave/Components/Pages/Review.razor +++ b/Wave/Components/Pages/Review.razor @@ -6,14 +6,8 @@ @inject IDbContextFactory ContextFactory @inject IStringLocalizer Localizer - - @foreach (var article in Articles) { - - } - @if(Articles.Count < 1) { -

@Localizer["NoArticles"]

- } -
+

@Localizer["Title"]

+ @code { private List
Articles { get; } = []; @@ -25,6 +19,7 @@ context.Set
() .IgnoreQueryFilters() .Include(a => a.Author) + .Include(a => a.Categories) .Where(a => !a.IsDeleted && a.Status == ArticleStatus.InReview) .OrderByDescending(a => a.PublishDate) .ToListAsync()); diff --git a/Wave/Resources/Components/Pages/Drafts.de-DE.resx b/Wave/Resources/Components/Pages/Drafts.de-DE.resx new file mode 100644 index 0000000..318808f --- /dev/null +++ b/Wave/Resources/Components/Pages/Drafts.de-DE.resx @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Entwürfe + + \ No newline at end of file diff --git a/Wave/Resources/Components/Pages/Drafts.en-GB.resx b/Wave/Resources/Components/Pages/Drafts.en-GB.resx new file mode 100644 index 0000000..4fdb1b6 --- /dev/null +++ b/Wave/Resources/Components/Pages/Drafts.en-GB.resx @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Wave/Resources/Components/Pages/Drafts.resx b/Wave/Resources/Components/Pages/Drafts.resx new file mode 100644 index 0000000..2e3ba1f --- /dev/null +++ b/Wave/Resources/Components/Pages/Drafts.resx @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Drafts + + \ No newline at end of file diff --git a/Wave/Resources/Components/Pages/Future.de-DE.resx b/Wave/Resources/Components/Pages/Future.de-DE.resx new file mode 100644 index 0000000..e08ee11 --- /dev/null +++ b/Wave/Resources/Components/Pages/Future.de-DE.resx @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + In Veröffentlichung + + \ No newline at end of file diff --git a/Wave/Resources/Components/Pages/Future.en-GB.resx b/Wave/Resources/Components/Pages/Future.en-GB.resx new file mode 100644 index 0000000..4fdb1b6 --- /dev/null +++ b/Wave/Resources/Components/Pages/Future.en-GB.resx @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Wave/Resources/Components/Pages/Future.resx b/Wave/Resources/Components/Pages/Future.resx new file mode 100644 index 0000000..8086cc3 --- /dev/null +++ b/Wave/Resources/Components/Pages/Future.resx @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Publishing + + \ No newline at end of file diff --git a/Wave/Resources/Components/Pages/Review.de-DE.resx b/Wave/Resources/Components/Pages/Review.de-DE.resx new file mode 100644 index 0000000..dadb5fb --- /dev/null +++ b/Wave/Resources/Components/Pages/Review.de-DE.resx @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + In Rezension + + \ No newline at end of file diff --git a/Wave/Resources/Components/Pages/Review.en-GB.resx b/Wave/Resources/Components/Pages/Review.en-GB.resx new file mode 100644 index 0000000..4fdb1b6 --- /dev/null +++ b/Wave/Resources/Components/Pages/Review.en-GB.resx @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Wave/Resources/Components/Pages/Review.resx b/Wave/Resources/Components/Pages/Review.resx new file mode 100644 index 0000000..b508892 --- /dev/null +++ b/Wave/Resources/Components/Pages/Review.resx @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + In Review + + \ No newline at end of file