Skip to content

Commit 888a6ba

Browse files
neozhuneozhu
committed
Refactor contact pages to remove unnecessary MudContainer elements for cleaner layout
1 parent 083c31f commit 888a6ba

4 files changed

Lines changed: 60 additions & 56 deletions

File tree

‎src/Server.UI/Pages/Contacts/CreateContact.razor‎

Lines changed: 55 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,51 @@
88

99
<PageTitle>@Title</PageTitle>
1010
<Breadcrumbs OnSaveButtonClick="OnSubmit" Saving="_saving" BreadcrumbItems="_breadcrumbItems"></Breadcrumbs>
11-
<MudContainer Class="mt-3" MaxWidth="MaxWidth.Large">
12-
<MudCard Class="pa-2">
13-
<MudCardHeader>
14-
<CardHeaderContent>
15-
<MudText Typo="Typo.h6">@Title</MudText>
16-
</CardHeaderContent>
17-
</MudCardHeader>
18-
<MudCardContent>
11+
12+
<MudCard Class="pa-2">
13+
<MudCardHeader>
14+
<CardHeaderContent>
15+
<MudText Typo="Typo.h6">@Title</MudText>
16+
</CardHeaderContent>
17+
</MudCardHeader>
18+
<MudCardContent>
1919
<MudForm Model="@_model" @ref="@_contactForm" Validation="@(Validator.ValidateValue(_model))">
2020
<MudGrid Spacing="2">
21-
<MudItem xs="12" md="6">
22-
<MudTextField Label="@L[_model.GetMemberDescription(x=>x.Name)]" @bind-Value="_model.Name" For="@(() => _model.Name)" Required="true" RequiredError="@L["name is required!"]"></MudTextField>
23-
</MudItem>
24-
<MudItem xs="12" md="6">
25-
<MudTextField Label="@L[_model.GetMemberDescription(x=>x.Description)]" For="@(() => _model.Description)" @bind-Value="_model.Description"></MudTextField>
26-
</MudItem>
27-
<MudItem xs="12" md="6">
28-
<MudTextField Label="@L[_model.GetMemberDescription(x=>x.Email)]" @bind-Value="_model.Email" For="@(() => _model.Email)" Required="false" RequiredError="@L["email is required!"]"></MudTextField>
29-
</MudItem>
30-
<MudItem xs="12" md="6">
31-
<MudTextField Label="@L[_model.GetMemberDescription(x=>x.PhoneNumber)]" @bind-Value="_model.PhoneNumber" For="@(() => _model.PhoneNumber)" Required="false" RequiredError="@L["phone number is required!"]"></MudTextField>
32-
</MudItem>
33-
<MudItem xs="12" md="6">
34-
<MudTextField Label="@L[_model.GetMemberDescription(x=>x.Country)]" @bind-Value="_model.Country" For="@(() => _model.Country)" Required="false" RequiredError="@L["country is required!"]"></MudTextField>
35-
</MudItem>
21+
<MudItem xs="12" md="6">
22+
<MudTextField Label="@L[_model.GetMemberDescription(x => x.Name)]" @bind-Value="_model.Name"
23+
For="@(() => _model.Name)" Required="true" RequiredError="@L["name is required!"]">
24+
</MudTextField>
25+
</MudItem>
26+
<MudItem xs="12" md="6">
27+
<MudTextField Label="@L[_model.GetMemberDescription(x => x.Description)]"
28+
For="@(() => _model.Description)" @bind-Value="_model.Description"></MudTextField>
29+
</MudItem>
30+
<MudItem xs="12" md="6">
31+
<MudTextField Label="@L[_model.GetMemberDescription(x => x.Email)]" @bind-Value="_model.Email"
32+
For="@(() => _model.Email)" Required="false" RequiredError="@L["email is required!"]">
33+
</MudTextField>
34+
</MudItem>
35+
<MudItem xs="12" md="6">
36+
<MudTextField Label="@L[_model.GetMemberDescription(x => x.PhoneNumber)]"
37+
@bind-Value="_model.PhoneNumber" For="@(() => _model.PhoneNumber)" Required="false"
38+
RequiredError="@L["phone number is required!"]"></MudTextField>
39+
</MudItem>
40+
<MudItem xs="12" md="6">
41+
<MudTextField Label="@L[_model.GetMemberDescription(x => x.Country)]" @bind-Value="_model.Country"
42+
For="@(() => _model.Country)" Required="false" RequiredError="@L["country is required!"]">
43+
</MudTextField>
44+
</MudItem>
3645

3746
</MudGrid>
3847
</MudForm>
39-
</MudCardContent>
40-
<MudCardActions Class="d-flex justify-end gap-2">
41-
<MudLoadingButton Color="Color.Primary" DropShadow="false" Loading="@_saving" OnClick="OnSubmit">@AppStrings.Save</MudLoadingButton>
42-
</MudCardActions>
43-
</MudCard>
44-
</MudContainer>
45-
48+
</MudCardContent>
49+
<MudCardActions Class="d-flex justify-end gap-2">
50+
<MudLoadingButton Color="Color.Primary" DropShadow="false" Loading="@_saving" OnClick="OnSubmit">
51+
@AppStrings.Save</MudLoadingButton>
52+
</MudCardActions>
53+
</MudCard>
54+
55+
4656

4757
@code {
4858
public string? Title { get; private set; }
@@ -54,11 +64,11 @@
5464
{
5565
Title = L["New Contact"];
5666
_breadcrumbItems = new List<BreadcrumbItem>
57-
{
58-
new BreadcrumbItem(L["Home"], href: "/"),
59-
new BreadcrumbItem(L["Contacts"], href: "/pages/contacts"),
60-
new BreadcrumbItem(L["Create Contact"], href:null, disabled:true)
61-
};
67+
{
68+
new BreadcrumbItem(L["Home"], href: "/"),
69+
new BreadcrumbItem(L["Contacts"], href: "/pages/contacts"),
70+
new BreadcrumbItem(L["Create Contact"], href:null, disabled:true)
71+
};
6272
return Task.CompletedTask;
6373
}
6474
async Task OnSubmit()
@@ -71,19 +81,19 @@
7181
return;
7282
var result = await Mediator.Send(_model);
7383
result.Match(
74-
data=>
75-
{
76-
Snackbar.Add(AppStrings.SaveSuccess, MudBlazor.Severity.Info);
77-
Navigation.NavigateTo($"/pages/Contacts");
78-
},
79-
errors=>
80-
{
81-
Snackbar.Add(errors, MudBlazor.Severity.Error);
82-
});
84+
data =>
85+
{
86+
Snackbar.Add(AppStrings.SaveSuccess, MudBlazor.Severity.Info);
87+
Navigation.NavigateTo($"/pages/Contacts");
88+
},
89+
errors =>
90+
{
91+
Snackbar.Add(errors, MudBlazor.Severity.Error);
92+
});
8393
}
8494
finally
8595
{
8696
_saving = false;
8797
}
8898
}
89-
}
99+
}

‎src/Server.UI/Pages/Contacts/EditContact.razor‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<PageTitle>@Title</PageTitle>
1212
<Breadcrumbs OnSaveButtonClick="OnSubmit" Saving="_saving" BreadcrumbItems="_breadcrumbItems"></Breadcrumbs>
13-
<MudContainer Class="mt-3" MaxWidth="MaxWidth.Large">
13+
1414
@if (_model != null)
1515
{
1616
<MudCard Class="pa-2">
@@ -47,8 +47,7 @@
4747
</MudCardActions>
4848
</MudCard>
4949
}
50-
</MudContainer>
51-
50+
5251

5352
@code {
5453
public string? Title { get; private set; }

‎src/Server.UI/Pages/Contacts/ViewContact.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@attribute [Authorize(Policy = Permissions.Contacts.View)]
88
<PageTitle>@Title</PageTitle>
99
<Breadcrumbs OnGoEditClick="GoEdit" OnDeleteClick="Delete" BreadcrumbItems="_breadcrumbItems"></Breadcrumbs>
10-
<MudContainer Class="mt-3" MaxWidth="MaxWidth.Large">
10+
1111
@if (_model != null)
1212
{
1313
<MudCard Class="pa-2">
@@ -39,7 +39,7 @@
3939
<MudCardActions></MudCardActions>
4040
</MudCard>
4141
}
42-
</MudContainer>
42+
4343

4444

4545
@code {

‎src/Server.UI/Pages/Identity/Roles/Roles.razor‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
@using CleanArchitecture.Blazor.Domain.Identity
55
@using CleanArchitecture.Blazor.Application.Features.Identity.DTOs
66
@using System.Security.Claims
7-
87
@using CleanArchitecture.Blazor.Server.UI.Pages.Identity.Roles.Components
98
@using System.Linq.Expressions
109
@using ZiggyCreatures.Caching.Fusion
1110
@using CleanArchitecture.Blazor.Application.Common.Constants
1211
@using CleanArchitecture.Blazor.Application.Common.Security
13-
@using System.Data
1412
@using CleanArchitecture.Blazor.Server.UI.Services.Identity
1513

1614
@attribute [Authorize(Policy = Permissions.Roles.View)]
@@ -20,10 +18,7 @@
2018
@inject IStringLocalizer<Roles> _localizer
2119
@inject IExcelService ExcelService
2220
@inject BlazorDownloadFileService BlazorDownloadFileService
23-
@inject IExcelService ExcelService
24-
@inject BlazorDownloadFileService BlazorDownloadFileService
25-
@inject IExcelService ExcelService
26-
@inject BlazorDownloadFileService BlazorDownloadFileService
21+
2722

2823
<PageTitle>@_title</PageTitle>
2924

0 commit comments

Comments
 (0)