+
+
- @if (string.IsNullOrEmpty(_resetPasswordMessage) is false)
+ @if (string.IsNullOrEmpty(_resetPasswordMessage) is false)
{
@if (string.IsNullOrEmpty(_signInMessage) is false)
- {
-
- @_signInMessage
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @Localizer[nameof(AppStrings.SignIn)]
-
-
-
}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.cs
index a30794be5a..47f52032e8 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.cs
@@ -11,7 +11,7 @@ public partial class SignUpPage
private SignUpRequestDto _signUpModel = new();
- protected async override Task OnAfterFirstRenderAsync()
+ protected override async Task OnAfterFirstRenderAsync()
{
await base.OnAfterFirstRenderAsync();
@@ -37,7 +37,7 @@ private async Task DoSignUp()
catch (ResourceValidationException e)
{
_signUpMessageType = BitMessageBarType.Error;
- _signUpMessage = string.Join(Environment.NewLine, e.Payload.Details.SelectMany(p => p.Errors).Select(e => e.Message));
+ _signUpMessage = string.Join(Environment.NewLine, e.Payload.Details.SelectMany(d => d.Errors).Select(e => e.Message));
}
catch (KnownException e)
{
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.scss b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.scss
index b86ae7a5a2..65b7a6f5af 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.scss
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Identity/SignUpPage.razor.scss
@@ -31,6 +31,11 @@
width: 100%;
max-width: rem2(340px);
+ .label {
+ text-align: start;
+ align-items: start;
+ }
+
@include lt-xl {
max-width: rem2(300px);
}
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor
index 2a5726870d..e548080d47 100644
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/NotAuthorizedPage.razor
@@ -6,11 +6,11 @@
-
+
@Localizer[nameof(AppStrings.ForbiddenException)]
-
You're signed in as @_user.GetUserName()
+
@Localizer[nameof(AppStrings.YouAreSignInAs)] @_user.GetUserName()
- Sign in as different user
+ @Localizer[nameof(AppStrings.SignInAsDifferentUser)]
-
+
\ No newline at end of file
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/PrivacyPage.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/PrivacyPage.razor
deleted file mode 100644
index 191213153c..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/PrivacyPage.razor
+++ /dev/null
@@ -1,22 +0,0 @@
-@page "/privacy"
-@inherits AppComponentBase
-
-
@Localizer[nameof(AppStrings.PrivacyPolicyTitle)]
-
-
-
-
- @Localizer[nameof(AppStrings.PrivacyPolicyTitle)]
-
- @Localizer[nameof(AppStrings.PrivacyPolicySectionMessage)]
-
-
-
-
- @Localizer[nameof(AppStrings.PrivacyPolicyTitle)]
-
- @Localizer[nameof(AppStrings.PrivacyPolicyPageMessage)]
-
-
-
-
diff --git a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/PrivacyPage.razor.scss b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/PrivacyPage.razor.scss
deleted file mode 100644
index 20cbcb79bc..0000000000
--- a/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/PrivacyPage.razor.scss
+++ /dev/null
@@ -1,59 +0,0 @@
-@import '../Styles/abstracts/_functions.scss';
-@import '../Styles/abstracts/_media-queries.scss';
-
-.page-container {
- width: 100%;
- display: flex;
- align-items: center;
- align-self: flex-start;
- flex-flow: column nowrap;
- justify-content: flex-start;
- padding: rem2(88px) rem2(32px);
-}
-
-.page-content {
- width: 100%;
- display: flex;
- align-items: center;
- max-width: rem2(1128px);
- flex-flow: column nowrap;
- justify-content: flex-start;
-}
-
-.main-section {
- width: 100%;
- margin-bottom: rem2(24px);
-}
-
-.main-section-title {
- width: 100%;
- text-align: left;
- font-weight: bold;
- font-size: rem2(34px);
- line-height: rem2(56px);
- margin-bottom: rem2(24px);
-}
-
-.section-desc {
- width: 100%;
- font-size: rem2(18px);
- line-height: rem2(28px);
-}
-
-.sub-section {
- width: 100%;
- margin-bottom: rem2(24px);
-
- &:last-child {
- margin-bottom: 0;
- }
-}
-
-.sub-section-title {
- width: 100%;
- text-align: left;
- font-weight: 600;
- font-size: rem2(24px);
- line-height: rem2(36px);
- margin-bottom: rem2(16px);
-}
diff --git a/src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/Pages/Products/AddOrEditProductModal.razor b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/AddOrEditProductModal.razor
similarity index 99%
rename from src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/Pages/Products/AddOrEditProductModal.razor
rename to src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/AddOrEditProductModal.razor
index ec6be653af..94c3d51440 100644
--- a/src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/Pages/Products/AddOrEditProductModal.razor
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/AddOrEditProductModal.razor
@@ -31,7 +31,7 @@
IsMultiSelect="false"
Items="_allCategoryList"
OnSelectItem="((BitDropdownItem
item) => { _product.CategoryId = int.Parse(item.Value!); _product.CategoryName = item.Text; })"
- Placeholder="@Localizer[(nameof(AppStrings.SelectACategory))]"
+ Placeholder="@Localizer[(nameof(AppStrings.SelectCategory))]"
Label="@Localizer[(nameof(AppStrings.SelectCategory))]" />
diff --git a/src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/Pages/Products/AddOrEditProductModal.razor.cs b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/AddOrEditProductModal.razor.cs
similarity index 86%
rename from src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/Pages/Products/AddOrEditProductModal.razor.cs
rename to src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/AddOrEditProductModal.razor.cs
index bfe35c864e..313ce6ee30 100644
--- a/src/Templates/AdminPanel/Bit.AdminPanel/src/Client/Core/Pages/Products/AddOrEditProductModal.razor.cs
+++ b/src/Templates/BlazorWeb/Bit.BlazorWeb/src/BlazorWeb.Client/Pages/Products/AddOrEditProductModal.razor.cs
@@ -1,6 +1,6 @@
-using AdminPanel.Shared.Dtos.Products;
+using BlazorWeb.Shared.Dtos.Products;
-namespace AdminPanel.Client.Core.Pages.Products;
+namespace BlazorWeb.Client.Pages.Products;
public partial class AddOrEditProductModal
{
@@ -9,7 +9,7 @@ public partial class AddOrEditProductModal
private bool _isLoading;
private bool _isSaving;
private ProductDto _product = new();
- private List