Merge branch 'master' of https://github.com/blazorhero/CleanArchitecture

fullstackhero · Mar 19, 2021 · 8579c70 · 8579c70
2 parents cdfacd2 + c58ab4b
commit 8579c70
Show file tree

Hide file tree

Showing 50 changed files with 209 additions and 20 deletions.
diff --git a/BlazorHero.CleanArchitecture.Application/Features/Brands/AddEdit/AddEditBrandCommand.cs b/BlazorHero.CleanArchitecture.Application/Features/Brands/AddEdit/AddEditBrandCommand.cs
@@ -34,13 +34,13 @@ public async Task<Result<int>> Handle(AddEditBrandCommand command, CancellationT
             {
                 await _unitOfWork.Repository<Brand>().AddAsync(brand);
                 await _unitOfWork.Commit(cancellationToken);
-                return Result<int>.Success(brand.Id, "Brand Saved!");
+                return Result<int>.Success(brand.Id, "Brand Saved");
             }
             else
             {
                 await _unitOfWork.Repository<Brand>().UpdateAsync(brand);
                 await _unitOfWork.Commit(cancellationToken);
-                return Result<int>.Success(brand.Id, "Brand Updated!");
+                return Result<int>.Success(brand.Id, "Brand Updated");
             }
         }
     }

diff --git a/BlazorHero.CleanArchitecture.Application/Features/Brands/Delete/DeleteBrandCommand.cs b/BlazorHero.CleanArchitecture.Application/Features/Brands/Delete/DeleteBrandCommand.cs
@@ -30,11 +30,11 @@ public async Task<Result<int>> Handle(DeleteBrandCommand command, CancellationTo
                     var brand = await _unitOfWork.Repository<Brand>().GetByIdAsync(command.Id);
                     await _unitOfWork.Repository<Brand>().DeleteAsync(brand);
                     await _unitOfWork.Commit(cancellationToken);
-                    return Result<int>.Success(brand.Id, "Brand Deleted!");
+                    return Result<int>.Success(brand.Id, "Brand Deleted");
                 }
                 else
                 {
-                    return Result<int>.Fail("Deletion Not Allowed!");
+                    return Result<int>.Fail("Deletion Not Allowed");
                 }
             }
         }

diff --git a/...CleanArchitecture.Application/Features/Products/Commands/AddEdit/AddEditProductCommand.cs b/...CleanArchitecture.Application/Features/Products/Commands/AddEdit/AddEditProductCommand.cs
@@ -37,13 +37,13 @@ public async Task<Result<int>> Handle(AddEditProductCommand command, Cancellatio
             {
                 await _unitOfWork.Repository<Product>().AddAsync(product);
                 await _unitOfWork.Commit(cancellationToken);
-                return Result<int>.Success(product.Id, "Product Saved!");
+                return Result<int>.Success(product.Id, "Product Saved");
             }
             else
             {
                 await _unitOfWork.Repository<Product>().UpdateAsync(product);
                 await _unitOfWork.Commit(cancellationToken);
-                return Result<int>.Success(product.Id, "Product Updated!");
+                return Result<int>.Success(product.Id, "Product Updated");
             }
         }
     }

diff --git a/...o.CleanArchitecture.Application/Features/Products/Commands/Delete/DeleteProductCommand.cs b/...o.CleanArchitecture.Application/Features/Products/Commands/Delete/DeleteProductCommand.cs
@@ -25,7 +25,7 @@ public async Task<Result<int>> Handle(DeleteProductCommand command, Cancellation
                 var product = await _unitOfWork.Repository<Product>().GetByIdAsync(command.Id);
                 await _unitOfWork.Repository<Product>().DeleteAsync(product);
                 await _unitOfWork.Commit(cancellationToken);
-                return Result<int>.Success(product.Id, "Product Deleted!");
+                return Result<int>.Success(product.Id, "Product Deleted");
             }
         }
     }

diff --git a/BlazorHero.CleanArchitecture.Infrastructure/Services/Identity/RoleService.cs b/BlazorHero.CleanArchitecture.Infrastructure/Services/Identity/RoleService.cs
@@ -115,7 +115,7 @@ public async Task<Result<string>> SaveAsync(RoleRequest request)
                 var existingRole = await _roleManager.FindByNameAsync(request.Name);
                 if (existingRole != null) return Result<string>.Fail($"Similar Role already exists.");
                 var response = await _roleManager.CreateAsync(new IdentityRole(request.Name));
-                return Result<string>.Success("Role Created.");
+                return Result<string>.Success("Role Created");
             }
             else
             {

diff --git a/BlazorHero.CleanArchitecture.Infrastructure/Services/Identity/UserService.cs b/BlazorHero.CleanArchitecture.Infrastructure/Services/Identity/UserService.cs
@@ -73,9 +73,9 @@ public async Task<IResult> RegisterAsync(RegisterRequest request, string origin)
                         var verificationUri = await SendVerificationEmail(user, origin);
                         //TODO: Attach Email Service here and configure it via appsettings
                         BackgroundJob.Enqueue(() => _mailService.SendAsync(new MailRequest() { From = "[email protected]", To = user.Email, Body = $"Please confirm your account by <a href='{verificationUri}'>clicking here</a>.", Subject = "Confirm Registration" }));
-                        return Result<string>.Success(user.Id, message: $"User Registered. Confirmation Mail has been delivered to the Mailbox.");
+                        return Result<string>.Success(user.Id, message: $"User Registered Mailbox");
                     }
-                    return Result<string>.Success(user.Id, message: $"User Registered!");
+                    return Result<string>.Success(user.Id, message: $"User Registered");
                 }
                 else
                 {
@@ -153,7 +153,7 @@ public async Task<IResult> UpdateRolesAsync(UpdateUserRolesRequest request)
             var roles = await _userManager.GetRolesAsync(user);
             var result = await _userManager.RemoveFromRolesAsync(user, roles);
             result = await _userManager.AddToRolesAsync(user, request.UserRoles.Where(x => x.Selected).Select(y => y.RoleName));
-            return Result.Success("Roles Updated.");
+            return Result.Success("Roles Updated");
         }
 
         public async Task<IResult<string>> ConfirmEmailAsync(string userId, string code)

diff --git a/BlazorHero.CleanArchitecture/Client/Pages/Catalog/AddEditBrandModal.razor.cs b/BlazorHero.CleanArchitecture/Client/Pages/Catalog/AddEditBrandModal.razor.cs
@@ -43,7 +43,7 @@ private async Task SaveAsync()
                 var response = await _brandManager.SaveAsync(request);
                 if (response.Succeeded)
                 {
-                    _snackBar.Add(response.Messages[0], Severity.Success);
+                    _snackBar.Add(localizer[response.Messages[0]], Severity.Success);
                     MudDialog.Close();
                 }
                 else

diff --git a/BlazorHero.CleanArchitecture/Client/Pages/Catalog/AddEditProductModal.razor.cs b/BlazorHero.CleanArchitecture/Client/Pages/Catalog/AddEditProductModal.razor.cs
@@ -66,7 +66,7 @@ private async Task SaveAsync()
                 var response = await _productManager.SaveAsync(request);
                 if (response.Succeeded)
                 {
-                    _snackBar.Add(response.Messages[0], Severity.Success);
+                    _snackBar.Add(localizer[response.Messages[0]], Severity.Success);
                     MudDialog.Close();
                 }
                 else

diff --git a/BlazorHero.CleanArchitecture/Client/Pages/Catalog/Brands.razor.cs b/BlazorHero.CleanArchitecture/Client/Pages/Catalog/Brands.razor.cs
@@ -46,7 +46,7 @@ private async Task Delete(int id)
                 if (response.Succeeded)
                 {
                     await Reset();
-                    _snackBar.Add(response.Messages[0], Severity.Success);
+                    _snackBar.Add(localizer[response.Messages[0]], Severity.Success);
                 }
                 else
                 {

diff --git a/BlazorHero.CleanArchitecture/Client/Pages/Identity/RegisterUserModal.razor.cs b/BlazorHero.CleanArchitecture/Client/Pages/Identity/RegisterUserModal.razor.cs
@@ -72,7 +72,7 @@ private async Task SaveAsync()
                 var response = await _userManager.RegisterUserAsync(request);
                 if (response.Succeeded)
                 {
-                    _snackBar.Add(response.Messages[0], Severity.Success);
+                    _snackBar.Add(localizer[response.Messages[0]], Severity.Success);
                     MudDialog.Close();
                 }
                 else

diff --git a/BlazorHero.CleanArchitecture/Client/Pages/Identity/Reset.razor.cs b/BlazorHero.CleanArchitecture/Client/Pages/Identity/Reset.razor.cs
@@ -54,7 +54,7 @@ private async Task SubmitAsync()
                     var result = await _userManager.ResetPasswordAsync(request);
                     if (result.Succeeded)
                     {
-                        _snackBar.Add(result.Messages[0], Severity.Success);
+                        _snackBar.Add(localizer[result.Messages[0]], Severity.Success);
                         _navigationManager.NavigateTo("/");
                     }
                     else

diff --git a/BlazorHero.CleanArchitecture/Client/Pages/Identity/RoleModal.razor.cs b/BlazorHero.CleanArchitecture/Client/Pages/Identity/RoleModal.razor.cs
@@ -35,7 +35,7 @@ private async Task SaveAsync()
                 var response = await _roleManager.SaveAsync(roleRequest);
                 if (response.Succeeded)
                 {
-                    _snackBar.Add(response.Messages[0], Severity.Success);
+                    _snackBar.Add(localizer[response.Messages[0]], Severity.Success);
                     MudDialog.Close();
                 }
                 else

diff --git a/BlazorHero.CleanArchitecture/Client/Pages/Identity/RolePermissions.razor.cs b/BlazorHero.CleanArchitecture/Client/Pages/Identity/RolePermissions.razor.cs
@@ -43,7 +43,7 @@ private async Task SaveAsync()
             var result = await _roleManager.UpdatePermissionsAsync(request);
             if (result.Succeeded)
             {
-                _snackBar.Add(result.Messages[0], Severity.Success);
+                _snackBar.Add(localizer[result.Messages[0]], Severity.Success);
                 _navigationManager.NavigateTo("/identity/roles");
             }
             else

diff --git a/BlazorHero.CleanArchitecture/Client/Pages/Identity/Roles.razor.cs b/BlazorHero.CleanArchitecture/Client/Pages/Identity/Roles.razor.cs
@@ -47,7 +47,7 @@ private async Task Delete(string id)
                 if (response.Succeeded)
                 {
                     await Reset();
-                    _snackBar.Add(response.Messages[0], Severity.Success);
+                    _snackBar.Add(localizer[response.Messages[0]], Severity.Success);
                 }
                 else
                 {

diff --git a/BlazorHero.CleanArchitecture/Client/Pages/Identity/UserRoles.razor.cs b/BlazorHero.CleanArchitecture/Client/Pages/Identity/UserRoles.razor.cs
@@ -51,7 +51,7 @@ private async Task SaveAsync()
             var result = await _userManager.UpdateRolesAsync(request);
             if (result.Succeeded)
             {
-                _snackBar.Add(result.Messages[0], Severity.Success);
+                _snackBar.Add(localizer[result.Messages[0]], Severity.Success);
                 _navigationManager.NavigateTo("/identity/users");
             }
             else

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditBrandModal.en.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditBrandModal.en.resx
@@ -120,6 +120,12 @@
   <data name="Add Brand" xml:space="preserve">
     <value>Add Brand</value>
   </data>
+  <data name="Brand Saved" xml:space="preserve">
+    <value>Brand Saved!</value>
+  </data>
+  <data name="Brand Updated" xml:space="preserve">
+    <value>Brand Updated!</value>
+  </data>
   <data name="Cancel" xml:space="preserve">
     <value>Cancel</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditBrandModal.es.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditBrandModal.es.resx
@@ -120,6 +120,12 @@
   <data name="Add Brand" xml:space="preserve">
     <value>Agregar Marca</value>
   </data>
+  <data name="Brand Saved" xml:space="preserve">
+    <value>Marca Guardada!</value>
+  </data>
+  <data name="Brand Updated" xml:space="preserve">
+    <value>Marca Actualizada!</value>
+  </data>
   <data name="Cancel" xml:space="preserve">
     <value>Cancelar</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditBrandModal.km.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditBrandModal.km.resx
@@ -120,6 +120,12 @@
   <data name="Add Brand" xml:space="preserve">
     <value>បន្ថែមម៉ាក</value>
   </data>
+  <data name="Brand Saved" xml:space="preserve">
+    <value>Brand Saved!</value>
+  </data>
+  <data name="Brand Updated" xml:space="preserve">
+    <value>Brand Updated!</value>
+  </data>
   <data name="Cancel" xml:space="preserve">
     <value>បោះបង់</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditProductModal.de.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditProductModal.de.resx
@@ -123,9 +123,15 @@
   <data name="Barcode" xml:space="preserve">
     <value>Strichcode</value>
   </data>
+  <data name="Brand" xml:space="preserve">
+    <value>Brand</value>
+  </data>
   <data name="Cancel" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
+  <data name="Delete" xml:space="preserve">
+    <value>Eliminar</value>
+  </data>
   <data name="Description" xml:space="preserve">
     <value>Beschreibung</value>
   </data>
@@ -135,6 +141,12 @@
   <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
+  <data name="Product Saved" xml:space="preserve">
+    <value>Product Saved</value>
+  </data>
+  <data name="Product Updated" xml:space="preserve">
+    <value>Product Updated</value>
+  </data>
   <data name="Rate" xml:space="preserve">
     <value>Bewertung</value>
   </data>
@@ -147,4 +159,7 @@
   <data name="Update Product" xml:space="preserve">
     <value>Produkt aktualisieren</value>
   </data>
+  <data name="Upload" xml:space="preserve">
+    <value>Upload</value>
+  </data>
 </root>
diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditProductModal.en.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditProductModal.en.resx
@@ -141,6 +141,12 @@
   <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
+  <data name="Product Saved" xml:space="preserve">
+    <value>Product Saved!</value>
+  </data>
+  <data name="Product Updated" xml:space="preserve">
+    <value>Product Updated!</value>
+  </data>
   <data name="Rate" xml:space="preserve">
     <value>Rate</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditProductModal.es.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditProductModal.es.resx
@@ -141,6 +141,12 @@
   <data name="Name" xml:space="preserve">
     <value>Nombre</value>
   </data>
+  <data name="Product Saved" xml:space="preserve">
+    <value>Producto Guardado!</value>
+  </data>
+  <data name="Product Updated" xml:space="preserve">
+    <value>Producto Actualizado!</value>
+  </data>
   <data name="Rate" xml:space="preserve">
     <value>Tarifa</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditProductModal.km.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/AddEditProductModal.km.resx
@@ -141,6 +141,12 @@
   <data name="Name" xml:space="preserve">
     <value>ឈ្មោះ</value>
   </data>
+  <data name="Product Saved" xml:space="preserve">
+    <value>Product Saved</value>
+  </data>
+  <data name="Product Updated" xml:space="preserve">
+    <value>Product Updated</value>
+  </data>
   <data name="Rate" xml:space="preserve">
     <value>អត្រា</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Brands.en.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Brands.en.resx
@@ -123,6 +123,9 @@
   <data name="Add Brand" xml:space="preserve">
     <value>Add Brand</value>
   </data>
+  <data name="Brand Deleted" xml:space="preserve">
+    <value>Brand Deleted!</value>
+  </data>
   <data name="Brands" xml:space="preserve">
     <value>Brands</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Brands.es.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Brands.es.resx
@@ -123,6 +123,9 @@
   <data name="Add Brand" xml:space="preserve">
     <value>Agregar Marca</value>
   </data>
+  <data name="Brand Deleted" xml:space="preserve">
+    <value>Marca Borrada!</value>
+  </data>
   <data name="Brands" xml:space="preserve">
     <value>Marcas</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Brands.km.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Brands.km.resx
@@ -123,6 +123,9 @@
   <data name="Add Brand" xml:space="preserve">
     <value>បន្ថែមម៉ាក</value>
   </data>
+  <data name="Brand Deleted" xml:space="preserve">
+    <value>Brand Deleted</value>
+  </data>
   <data name="Brands" xml:space="preserve">
     <value>ម៉ាក</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Products.de.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Products.de.resx
@@ -144,6 +144,9 @@
   <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
+  <data name="Product Deleted" xml:space="preserve">
+    <value>Product Deleted</value>
+  </data>
   <data name="Products" xml:space="preserve">
     <value>Produkte</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Products.en.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Products.en.resx
@@ -144,6 +144,9 @@
   <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
+  <data name="Product Deleted" xml:space="preserve">
+    <value>Product Deleted!</value>
+  </data>
   <data name="Products" xml:space="preserve">
     <value>Products</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Products.es.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Products.es.resx
@@ -144,6 +144,9 @@
   <data name="Name" xml:space="preserve">
     <value>Nombre</value>
   </data>
+  <data name="Product Deleted" xml:space="preserve">
+    <value>Producto Borrado</value>
+  </data>
   <data name="Products" xml:space="preserve">
     <value>Productos</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Products.km.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Catalog/Products.km.resx
@@ -144,6 +144,9 @@
   <data name="Name" xml:space="preserve">
     <value>ឈ្មោះ</value>
   </data>
+  <data name="Product Deleted" xml:space="preserve">
+    <value>Product Deleted</value>
+  </data>
   <data name="Products" xml:space="preserve">
     <value>ផលិតផល</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Content/Home.de.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Content/Home.de.resx
@@ -120,6 +120,12 @@
   <data name="Description" xml:space="preserve">
     <value>Clean Architecture Vorlage für Blazor Web-Assembly</value>
   </data>
+  <data name="Project Page" xml:space="preserve">
+    <value>Project Page</value>
+  </data>
+  <data name="Support Me" xml:space="preserve">
+    <value>Support Me!</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>Blazor Hero</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Content/Home.fr.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Content/Home.fr.resx
@@ -120,6 +120,12 @@
   <data name="Description" xml:space="preserve">
     <value>Modèle d'architecture propre pour l'assemblage Web Blazor</value>
   </data>
+  <data name="Project Page" xml:space="preserve">
+    <value>Project Page</value>
+  </data>
+  <data name="Support Me" xml:space="preserve">
+    <value>Support Me!</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>Héros Blazor</value>
   </data>

diff --git a/BlazorHero.CleanArchitecture/Client/Resources/Pages/Content/Home.km.resx b/BlazorHero.CleanArchitecture/Client/Resources/Pages/Content/Home.km.resx
@@ -120,6 +120,12 @@
   <data name="Description" xml:space="preserve">
     <value>គំរូកម្មវិធីដែលអភិវឌ្ឍតាមបច្ចេកវិទ្យា Blazor Web-Assembly</value>
   </data>
+  <data name="Project Page" xml:space="preserve">
+    <value>Project Page</value>
+  </data>
+  <data name="Support Me" xml:space="preserve">
+    <value>Support Me!</value>
+  </data>
   <data name="Title" xml:space="preserve">
     <value>ប្លេហ្សឺ ហេរ៉ូ</value>
   </data>