diff --git a/Components/ActionBar.razor b/Components/ActionBar.razor index 02d8b88..30f823d 100644 --- a/Components/ActionBar.razor +++ b/Components/ActionBar.razor @@ -1,51 +1,47 @@ @inherits LocalizableComponentBase -
+
@if (isPosting) { -
+
} -
+
-
+
@if (OnTimelineChanged.HasDelegate) { -
- + + - - - - @foreach (var timelineType in Enum.GetValues()) - { - - } - - -
+ + + @foreach (var timelineType in Enum.GetValues()) + { + + } + + } @if (OnTimeSortingChanged.HasDelegate) { -
- + + - - - - @foreach (var timeSortingType in Enum.GetValues()) - { - - } - - -
+ + + @foreach (var timeSortingType in Enum.GetValues()) + { + + } + + }
@@ -53,13 +49,10 @@ @if (OnMessageSubmit.HasDelegate) {
- +
} else diff --git a/Components/Content.razor b/Components/Content.razor index dfd284d..e4b51fa 100644 --- a/Components/Content.razor +++ b/Components/Content.razor @@ -1,29 +1,29 @@ @inherits LocalizableComponentBase -
+
+ style="background-image:linear-gradient(to left, var(--color-base-100), transparent), url('@(Message.User?.BackgroundUrl)');"> - @Message.User.UserName + @Message.User.UserName
-
+
-
+
@if (Message.BoostingUser != null) { -

+

@Message.BoostingUser.DisplayName - + @Localizer["boosted"]

} -

- +

+ @Message.User.DisplayName @@ -31,11 +31,11 @@ @Message.User.UserName - + @Message.CreatedAt.GetPassedTime(Localizer._pLocalizer) - @@ -65,7 +65,7 @@ } else if (media.ContentType.StartsWith("video")) { -

+
-
+

@media.FileName

@@ -89,11 +89,9 @@ @media.ContentType

- + + +
} } @@ -102,106 +100,76 @@
-
-
+
+
@if (OnMessageReply.HasDelegate) { - + + + } @if (OnMessageBoost.HasDelegate) { - + } @if (OnMessageFavourite.HasDelegate) { - + + + }
-
- - - - - +
+ + + + + @if (OnUserDirectMessage.HasDelegate) { -
- -
+ + + @Localizer["Direct message"] + } @if (OnUserSilence.HasDelegate) { -
- -
+ + + @Localizer["Mute"] + } @if (OnUserBlock.HasDelegate) { -
- -
+ + + @Localizer["Block"] + } @if (@*Message.User.UserName == CurrentUserName &&*@ OnMessageDelete.HasDelegate) { -
- -
+ + + @Localizer["Delete"] + } - - + + @if (IncludeExpand) { - - - - + + }
@@ -228,6 +196,8 @@ [Parameter] public EventCallback OnUserBlock { get; set; } [Parameter] public EventCallback OnUserSilence { get; set; } [Parameter] public string CssContainer { get; set; } + /// Deeper shadow, for the message a thread page is about. + [Parameter] public bool Highlighted { get; set; } [Parameter] public bool IncludeExpand { get; set; } = true; bool isAnswering { get; set; } = false; diff --git a/Components/DropdownButton.razor b/Components/DropdownButton.razor deleted file mode 100644 index 6e7b6d4..0000000 --- a/Components/DropdownButton.razor +++ /dev/null @@ -1,23 +0,0 @@ -
-
- @DropdownTrigger -
- -
- -@code { - [Parameter] public RenderFragment DropdownTrigger { get; set; } - [Parameter] public RenderFragment DropdownContent { get; set; } - [Parameter] public bool IsOpen { get; set; } = false; - [Parameter] public string CssDirection { get; set; } = "is-right"; - - void OpenCloseOptions() - { - IsOpen = !IsOpen; - } - -} diff --git a/Components/LoadingData.razor b/Components/LoadingData.razor deleted file mode 100644 index 81870a6..0000000 --- a/Components/LoadingData.razor +++ /dev/null @@ -1,10 +0,0 @@ -@inherits LocalizableComponentBase -

- . - . - . - @Localizer["loading"] - . - . - . -

diff --git a/Components/MessageUpsertForm.razor b/Components/MessageUpsertForm.razor index 374dc91..b6f89b2 100644 --- a/Components/MessageUpsertForm.razor +++ b/Components/MessageUpsertForm.razor @@ -3,24 +3,21 @@ -
-
- -
-
- +
+ +
+ @(MessageForm.Content?.Length ?? 0)/5000
@if (showPreviewButton && isPreviewOpen && MessageForm.Content is { Length: > 0 }) { -
-
+
+
@switch (MessageForm.ContentType) { case ContentType.Markdown: @@ -33,22 +30,22 @@
} -
+
@contentError
-
+
@foreach (var media in MessageForm.Media) { switch (MessageForm.MediaType) { case MediaType.Images: -
- @media.AltText -
-
+
+ @media.AltText +
+

@media.FileName @@ -57,28 +54,22 @@ @media.ContentType @media.Size.GetFileSize(Localizer._pLocalizer)

- -
-
-
- -
+ + +
+
break; case MediaType.Video: case MediaType.Documents: -
+
-
+

@media.FileName

@@ -86,19 +77,17 @@ @media.ContentType @media.Size.GetFileSize(Localizer._pLocalizer)

- + + +
break; case MediaType.Audio: -
+
-
+

@media.FileName

@@ -109,11 +98,9 @@
- + + +
break; } @@ -123,124 +110,94 @@ @if (fileInputErrorMessage is { Length: > 0 }) { -
+
@((MarkupString)fileInputErrorMessage)
} -
-
- - - - - -
- - - - -
- - +
+
+ + + + + + + + + + + + + + + + + + + -
- -
+ @* A label styled as a button opens the hidden file input. *@ + -
-
-
- - @foreach (var mediaType in Enum.GetValues()) - { - - } - -
- - - -
-
+ + + + + + @foreach (var mediaType in Enum.GetValues()) + { + + } + + -
-
-
- - @foreach (var contentType in Enum.GetValues()) - { - - } - -
- +
+ + - -
- -
+ + + @foreach (var contentType in Enum.GetValues()) + { + + } + + +
+
@if (showPreviewButton) { - + + + }
-
- - - -
+ + @Localizer["Post"] + +
@@ -258,11 +215,6 @@ bool showPreviewButton { get; set; } = false; bool isPreviewOpen { get; set; } = false; - void OpenCloseMessageType() - { - MessageForm.IsScopeOptionsOpen = !MessageForm.IsScopeOptionsOpen; - } - void UpdateMessageType(MessageType messageType) { MessageForm.MessageType = messageType; diff --git a/Components/OpenDownContainer.razor b/Components/OpenDownContainer.razor deleted file mode 100644 index 99d22c8..0000000 --- a/Components/OpenDownContainer.razor +++ /dev/null @@ -1,36 +0,0 @@ -
- -
- @TitleChildren - -
- -
- @InnerContent -
- -
- -@code { - [Parameter] public RenderFragment TitleChildren { get; set; } - [Parameter] public RenderFragment InnerContent { get; set; } - [Parameter] public bool HasInnerContent { get; set; } = true; - [Parameter] public string InnerContentContainerCss { get; set; } = "block w-auto ml-5 md:ml-10 rounded-lg neomorph is-nxsmall"; - - [Parameter] - public bool IsOpen { get; set; } = false; - string Hidden { get; set; } = VConstants.HideClass; - string ButtonCss => $"{(HasInnerContent ? default : "cursor-not-allowed")} neoBtnSmall"; - string LeftIconCss => IsOpen ? "ion-md-arrow-dropup" : "ion-md-arrow-dropdown"; - - void OpenCloseInnerContent() - { - IsOpen = !IsOpen; - Hidden = IsOpen ? default : VConstants.HideClass; - } -} \ No newline at end of file diff --git a/Extensions/ExtensionMethods.cs b/Extensions/ExtensionMethods.cs index 07d1a21..10222bc 100644 --- a/Extensions/ExtensionMethods.cs +++ b/Extensions/ExtensionMethods.cs @@ -1,4 +1,4 @@ -using Blazored.LocalStorage; +using Blazored.LocalStorage; using collAnon.Client.Services; @@ -85,11 +85,11 @@ namespace decePubClient.Extensions public static string GetLogLevelClass(this string logType) => logType switch { - "Debug" => "has-text-grey", - "Information" => "has-text-info", - "Warning" => "has-text-warning-dark", - "Error" => "has-text-danger", - "Fatal" => "has-text-danger-dark", + "Debug" => "text-base-content/60", + "Information" => "text-info", + "Warning" => "text-warning", + "Error" => "text-error", + "Fatal" => "text-error font-bold", _ => string.Empty }; diff --git a/Pages/Administration.razor b/Pages/Administration.razor index 8fef687..2323425 100644 --- a/Pages/Administration.razor +++ b/Pages/Administration.razor @@ -3,174 +3,174 @@ @Localizer["Settings"] -
+
-
+
- - -

+ +

+

@Localizer["Users"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Reports"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["ActivityPub?"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Authentication"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Emoji?"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Frontend"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Instance"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Link formatter"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Metadata"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Policies"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Upload"]

- - +
+

@Localizer["Empty"]

- - + +
diff --git a/Pages/Authentication.razor b/Pages/Authentication.razor index 79683f4..38a0a65 100644 --- a/Pages/Authentication.razor +++ b/Pages/Authentication.razor @@ -2,9 +2,9 @@ @inherits PagesBase -
+
-
+
diff --git a/Pages/ExpandMessage.razor b/Pages/ExpandMessage.razor index bd68820..346d215 100644 --- a/Pages/ExpandMessage.razor +++ b/Pages/ExpandMessage.razor @@ -2,14 +2,17 @@ @page "/expand/{messageId}" @inherits LocalizableComponentBase -
+
-
-
+
+
@if (IsLoading) { - +

+ + @Localizer["loading"] +

} @foreach (var message in Ancestors) @@ -21,7 +24,7 @@ OnUserBlock="async (u) => await OnUserBlock(u)" OnUserDirectMessage="async (u) => await OnUserDirectMessage(u)" OnUserSilence="async (u) => await OnUserSilence(u)" /> } - @Localizer["Index"] -
+
-
-
+
+
@if (IsLoading) { - +

+ + @Localizer["loading"] +

} else if (Messages.Count == 0) { diff --git a/Pages/Login.razor b/Pages/Login.razor index 5097e6d..734b4d3 100644 --- a/Pages/Login.razor +++ b/Pages/Login.razor @@ -2,9 +2,9 @@ @inherits LocalizableComponentBase @Localizer["Login"] -
+
-
+
diff --git a/Pages/Logout.razor b/Pages/Logout.razor index 70e1f23..fd2c693 100644 --- a/Pages/Logout.razor +++ b/Pages/Logout.razor @@ -2,9 +2,9 @@ @inherits LocalizableComponentBase @Localizer["Logout"] -
+
-
+

@Localizer["Logging out..."]

diff --git a/Pages/Settings.razor b/Pages/Settings.razor index a1a9013..480a953 100644 --- a/Pages/Settings.razor +++ b/Pages/Settings.razor @@ -2,69 +2,69 @@ @inherits LocalizableComponentBase @Localizer["Settings"] -
+
-
+
- - -

+ +

+

@Localizer["General"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Profile"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Data import/export"]

- - +
+

@Localizer["Empty"]

- - + + - - -

+ +

+

@Localizer["Mutes/Blocks"]

- - +
+

@Localizer["Empty"]

- - + +
diff --git a/Shared/LoginDisplay.razor b/Shared/LoginDisplay.razor index 8ec819e..e8aa3cc 100644 --- a/Shared/LoginDisplay.razor +++ b/Shared/LoginDisplay.razor @@ -3,12 +3,12 @@ - + - + @Localizer["Login"] diff --git a/Shared/NavMenu.razor b/Shared/NavMenu.razor index f93415b..5399a67 100644 --- a/Shared/NavMenu.razor +++ b/Shared/NavMenu.razor @@ -1,19 +1,19 @@ @inherits LocalizableComponentBase -