diff --git a/Moonlight/Shared/Components/Forms/SmartForm.razor b/Moonlight/Shared/Components/Forms/SmartForm.razor index e71c4030..f78d4fa5 100644 --- a/Moonlight/Shared/Components/Forms/SmartForm.razor +++ b/Moonlight/Shared/Components/Forms/SmartForm.razor @@ -15,7 +15,7 @@ { if (ErrorMessages.Any()) { -
+
@foreach (var msg in ErrorMessages) { @(msg) diff --git a/Moonlight/Shared/Components/Navigations/CommunityNavigation.razor b/Moonlight/Shared/Components/Navigations/CommunityNavigation.razor index 4000e033..8a428389 100644 --- a/Moonlight/Shared/Components/Navigations/CommunityNavigation.razor +++ b/Moonlight/Shared/Components/Navigations/CommunityNavigation.razor @@ -10,7 +10,7 @@
- Announcements + News
diff --git a/Moonlight/Shared/Components/Partials/SoftErrorHandler.razor b/Moonlight/Shared/Components/Partials/SoftErrorHandler.razor index 4668a9ea..e4504dc9 100644 --- a/Moonlight/Shared/Components/Partials/SoftErrorHandler.razor +++ b/Moonlight/Shared/Components/Partials/SoftErrorHandler.razor @@ -33,7 +33,7 @@ else { foreach (var errorMessage in ErrorMessages) { -
+
@errorMessage
} @@ -65,6 +65,10 @@ else { Exception = exception; Crashed = true; + + var username = IdentityService.IsSignedIn ? IdentityService.CurrentUser.Username : "Guest"; + Logger.Warn($"A crash occured in the view of the user '{username}'"); + Logger.Warn(exception); } Recover(); diff --git a/Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor b/Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor index f4411697..1227dcb8 100644 --- a/Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor +++ b/Moonlight/Shared/Components/TicketPopup/TicketPopupMain.razor @@ -3,7 +3,7 @@ @if (ViewIndex == 0) { - } diff --git a/Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor b/Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor index 735345f8..0441a218 100644 --- a/Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor +++ b/Moonlight/Shared/Components/TicketPopup/TicketPopupOverview.razor @@ -51,6 +51,11 @@ @(Formatter.FormatAgoFromDateTime(ticket.CreatedAt))
+ + if (ticket.Id != Tickets.Last().Id) + { + + } } } else diff --git a/Moonlight/Shared/Views/Account/Index.razor b/Moonlight/Shared/Views/Account/Index.razor index 8ec07b5b..bf28559e 100644 --- a/Moonlight/Shared/Views/Account/Index.razor +++ b/Moonlight/Shared/Views/Account/Index.razor @@ -29,12 +29,12 @@
-

+
Your avatar -

- - PNG or JPG no bigger than 1000px wide and tall. - +
+
+ PNG or JPG no bigger than 1000px wide and tall +
diff --git a/Moonlight/Shared/Views/Account/Payments.razor b/Moonlight/Shared/Views/Account/Payments.razor index 72a0d5a1..9bf4dd2a 100644 --- a/Moonlight/Shared/Views/Account/Payments.razor +++ b/Moonlight/Shared/Views/Account/Payments.razor @@ -16,7 +16,7 @@
-
+

Redeem gift code

@@ -29,7 +29,7 @@
-
+
@@ -61,7 +61,7 @@ diff --git a/Moonlight/Shared/Views/Account/Security.razor b/Moonlight/Shared/Views/Account/Security.razor index 98b6cc76..1f4f2936 100644 --- a/Moonlight/Shared/Views/Account/Security.razor +++ b/Moonlight/Shared/Views/Account/Security.razor @@ -1,6 +1,5 @@ @page "/account/security" -@using Moonlight.App.Models.Forms @using Moonlight.App.Services @using Moonlight.App.Services.Users @using OtpNet @@ -17,6 +16,9 @@
+
+ Change password +
@@ -45,44 +47,49 @@
@if (IdentityService.Flags[UserFlag.TotpEnabled]) { -
- Your account is secured with 2fa -
- +
+
+ Your account is secured with 2fa +
+
+
+
+ +
} else if (!IdentityService.Flags[UserFlag.TotpEnabled] && IdentityService.CurrentUser.TotpKey != null) { -
-
-

- Scan the qr code and enter the code generated by the app you have scanned it in -

+
+
+ Scan the qr code and enter the code generated by the app you have scanned it in +
+
@{ QRCodeGenerator qrGenerator = new QRCodeGenerator(); var qrCodeData = qrGenerator.CreateQrCode - ( - $"otpauth://totp/{Uri.EscapeDataString(IdentityService.CurrentUser.Email)}?secret={IdentityService.CurrentUser.TotpKey}&issuer={Uri.EscapeDataString("Moonlight")}", - QRCodeGenerator.ECCLevel.Q - ); + ( + $"otpauth://totp/{Uri.EscapeDataString(IdentityService.CurrentUser.Email)}?secret={IdentityService.CurrentUser.TotpKey}&issuer={Uri.EscapeDataString("Moonlight")}", + QRCodeGenerator.ECCLevel.Q + ); PngByteQRCode qrCode = new PngByteQRCode(qrCodeData); byte[] qrCodeAsPngByteArr = qrCode.GetGraphic(5); var base64 = Convert.ToBase64String(qrCodeAsPngByteArr); }
- QR Code + QR Code
-
- @(IdentityService.CurrentUser.TotpKey) +
+ @(IdentityService.CurrentUser.TotpKey)
- +
@@ -91,22 +98,28 @@ } else { -
- Secure your account using 2fa -

- Make sure you have installed one of the following apps on your smartphone and continue -

+
+
+ Secure your account using 2fa +
+
+

+ Make sure you have installed one of the following apps on your smartphone and continue +

- Google Authenticator -
- Microsoft Authenticator -
- Authy -
- 1Password -
-
- + Google Authenticator +
+ Microsoft Authenticator +
+ Authy +
+ 1Password +
+
+
+
+ +
} diff --git a/Moonlight/Shared/Views/Admin/Sys/Diagnose.razor b/Moonlight/Shared/Views/Admin/Sys/Diagnose.razor index ff5969a9..22f0403b 100644 --- a/Moonlight/Shared/Views/Admin/Sys/Diagnose.razor +++ b/Moonlight/Shared/Views/Admin/Sys/Diagnose.razor @@ -10,14 +10,18 @@ - - Dont share this file with random people. - We do our best to clear this file from sensitive information but it can still contain some. - Its safe to share with official moonlight panel developers - - -
- +
+
+ + Dont share this file with random people. + We do our best to clear this file from sensitive information but it can still contain some. + Its safe to share with official moonlight panel developers + + +
+ +
+
@code diff --git a/Moonlight/Shared/Views/Admin/Sys/Settings.razor b/Moonlight/Shared/Views/Admin/Sys/Settings.razor index 40c0f0c0..9f4cfe1e 100644 --- a/Moonlight/Shared/Views/Admin/Sys/Settings.razor +++ b/Moonlight/Shared/Views/Admin/Sys/Settings.razor @@ -18,7 +18,7 @@ else {
-
+
@{ string title; diff --git a/Moonlight/Shared/Views/Index.razor b/Moonlight/Shared/Views/Index.razor index 11f04b92..4444fe71 100644 --- a/Moonlight/Shared/Views/Index.razor +++ b/Moonlight/Shared/Views/Index.razor @@ -11,28 +11,44 @@
-
-
-
- Do you want to order new services? Are you searching for our service specifications and prices? +
+ + Shopping +
+
+ Do you want to order new services? Are you searching for our service specifications and prices? +
- Go to store -
+
-
-
-
- Do you want to order new services? Are you searching for our service specifications and prices? +
+ + Manage services +
+
+ You want to see your services? Do you want to renew them? Or just take a quick look? +
- Go to store -
+
-
-
-
- Do you want to order new services? Are you searching for our service specifications and prices? +
+ + News +
+
+ You want to see the latest news? Do you want to join our events? Having a project to share with the community? +
- Go to store -
+ +
+
+ + User settings +
+
+ Searching for you settings? Want to add balance to your account? Do you want to change your profile picture? +
+
+
\ No newline at end of file diff --git a/Moonlight/Shared/Views/Store/Order.razor b/Moonlight/Shared/Views/Store/Order.razor index 3a1f6474..dc08e4c0 100644 --- a/Moonlight/Shared/Views/Store/Order.razor +++ b/Moonlight/Shared/Views/Store/Order.razor @@ -4,7 +4,6 @@ @using Moonlight.App.Services @using Moonlight.App.Database.Entities.Store @using Moonlight.App.Repositories -@using Moonlight.App.Services.ServiceManage @inject ConfigService ConfigService @inject StoreService StoreService @@ -33,17 +32,17 @@
- +

@(SelectedProduct.Duration * 1) days
- +

@(SelectedProduct.Duration * 2) days
- +

@(SelectedProduct.Duration * 3) days
diff --git a/Moonlight/wwwroot/svg/manageServices.svg b/Moonlight/wwwroot/svg/manageServices.svg new file mode 100644 index 00000000..4ad89937 --- /dev/null +++ b/Moonlight/wwwroot/svg/manageServices.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Moonlight/wwwroot/svg/news.svg b/Moonlight/wwwroot/svg/news.svg new file mode 100644 index 00000000..cf7c2ebf --- /dev/null +++ b/Moonlight/wwwroot/svg/news.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Moonlight/wwwroot/svg/userSettings.svg b/Moonlight/wwwroot/svg/userSettings.svg new file mode 100644 index 00000000..e7477c79 --- /dev/null +++ b/Moonlight/wwwroot/svg/userSettings.svg @@ -0,0 +1 @@ + \ No newline at end of file