Nell/eShopOnWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed half of warnings having to do with allowing Null string objects. (#791)

Browse Source
This commit is contained in:
newenay
2022-09-08 16:48:47 -04:00
committed by GitHub
parent 60fe2dae60
commit 36dbc2f256
27 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Web/ViewModels/Account/LoginViewModel.cs
View File

@@ -6,11 +6,11 @@ public class LoginViewModel
{
[Required]
[EmailAddress]
public string Email { get; set; }
public string? Email { get; set; }
[Required]
[DataType(DataType.Password)]
public string Password { get; set; }
public string? Password { get; set; }
[Display(Name = "Remember me?")]
public bool RememberMe { get; set; }

2
src/Web/ViewModels/Account/LoginWith2faViewModel.cs
View File

@@ -8,7 +8,7 @@ public class LoginWith2faViewModel
[StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Text)]
[Display(Name = "Authenticator code")]
public string TwoFactorCode { get; set; }
public string? TwoFactorCode { get; set; }
[Display(Name = "Remember this machine")]
public bool RememberMachine { get; set; }

6
src/Web/ViewModels/Account/RegisterViewModel.cs
View File

@@ -7,16 +7,16 @@ public class RegisterViewModel
[Required]
[EmailAddress]
[Display(Name = "Email")]
public string Email { get; set; }
public string? Email { get; set; }
[Required]
[StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)]
[Display(Name = "Password")]
public string Password { get; set; }
public string? Password { get; set; }
[DataType(DataType.Password)]
[Display(Name = "Confirm password")]
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
public string? ConfirmPassword { get; set; }
}

8
src/Web/ViewModels/Account/ResetPasswordViewModel.cs
View File

@@ -6,17 +6,17 @@ public class ResetPasswordViewModel
{
[Required]
[EmailAddress]
public string Email { get; set; }
public string? Email { get; set; }
[Required]
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)]
public string Password { get; set; }
public string? Password { get; set; }
[DataType(DataType.Password)]
[Display(Name = "Confirm password")]
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
public string? ConfirmPassword { get; set; }
public string Code { get; set; }
public string? Code { get; set; }
}

8
src/Web/ViewModels/CatalogIndexViewModel.cs
View File

@@ -5,10 +5,10 @@ namespace Microsoft.eShopWeb.Web.ViewModels;
public class CatalogIndexViewModel
{
public List<CatalogItemViewModel> CatalogItems { get; set; }
public List<SelectListItem> Brands { get; set; }
public List<SelectListItem> Types { get; set; }
public List<CatalogItemViewModel>? CatalogItems { get; set; }
public List<SelectListItem>? Brands { get; set; }
public List<SelectListItem>? Types { get; set; }
public int? BrandFilterApplied { get; set; }
public int? TypesFilterApplied { get; set; }
public PaginationInfoViewModel PaginationInfo { get; set; }
public PaginationInfoViewModel? PaginationInfo { get; set; }
}

4
src/Web/ViewModels/CatalogItemViewModel.cs
View File

@@ -3,7 +3,7 @@
public class CatalogItemViewModel
{
public int Id { get; set; }
public string Name { get; set; }
public string PictureUri { get; set; }
public string? Name { get; set; }
public string? PictureUri { get; set; }
public decimal Price { get; set; }
}

6
src/Web/ViewModels/File/FileViewModel.cs
View File

@@ -2,7 +2,7 @@
public class FileViewModel
{
public string FileName { get; set; }
public string Url { get; set; }
public string DataBase64 { get; set; }
public string? FileName { get; set; }
public string? Url { get; set; }
public string? DataBase64 { get; set; }
}

8
src/Web/ViewModels/Manage/ChangePasswordViewModel.cs
View File

@@ -7,18 +7,18 @@ public class ChangePasswordViewModel
[Required]
[DataType(DataType.Password)]
[Display(Name = "Current password")]
public string OldPassword { get; set; }
public string? OldPassword { get; set; }
[Required]
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)]
[Display(Name = "New password")]
public string NewPassword { get; set; }
public string? NewPassword { get; set; }
[DataType(DataType.Password)]
[Display(Name = "Confirm new password")]
[Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
public string? ConfirmPassword { get; set; }
public string StatusMessage { get; set; }
public string? StatusMessage { get; set; }
}

6
src/Web/ViewModels/Manage/EnableAuthenticatorViewModel.cs
View File

@@ -10,11 +10,11 @@ public class EnableAuthenticatorViewModel
[StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Text)]
[Display(Name = "Verification Code")]
public string Code { get; set; }
public string? Code { get; set; }
[BindNever]
public string SharedKey { get; set; }
public string? SharedKey { get; set; }
[BindNever]
public string AuthenticatorUri { get; set; }
public string? AuthenticatorUri { get; set; }
}

6
src/Web/ViewModels/Manage/ExternalLoginsViewModel.cs
View File

@@ -6,8 +6,8 @@ namespace Microsoft.eShopWeb.Web.ViewModels.Manage;
public class ExternalLoginsViewModel
{
public IList<UserLoginInfo> CurrentLogins { get; set; }
public IList<AuthenticationScheme> OtherLogins { get; set; }
public IList<UserLoginInfo>? CurrentLogins { get; set; }
public IList<AuthenticationScheme>? OtherLogins { get; set; }
public bool ShowRemoveButton { get; set; }
public string StatusMessage { get; set; }
public string? StatusMessage { get; set; }
}

4
src/Web/ViewModels/Manage/IndexViewModel.cs
View File

@@ -10,11 +10,11 @@ public class IndexViewModel
[Required]
[EmailAddress]
public string Email { get; set; }
public string? Email { get; set; }
[Phone]
[Display(Name = "Phone number")]
public string PhoneNumber { get; set; }
public string? PhoneNumber { get; set; }
public string? StatusMessage { get; set; }
}

4
src/Web/ViewModels/Manage/RemoveLoginViewModel.cs
View File

@@ -2,6 +2,6 @@
public class RemoveLoginViewModel
{
public string LoginProvider { get; set; }
public string ProviderKey { get; set; }
public string? LoginProvider { get; set; }
public string? ProviderKey { get; set; }
}

6
src/Web/ViewModels/Manage/SetPasswordViewModel.cs
View File

@@ -8,12 +8,12 @@ public class SetPasswordViewModel
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
[DataType(DataType.Password)]
[Display(Name = "New password")]
public string NewPassword { get; set; }
public string? NewPassword { get; set; }
[DataType(DataType.Password)]
[Display(Name = "Confirm new password")]
[Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
public string ConfirmPassword { get; set; }
public string? ConfirmPassword { get; set; }
public string StatusMessage { get; set; }
public string? StatusMessage { get; set; }
}

2
src/Web/ViewModels/Manage/ShowRecoveryCodesViewModel.cs
View File

@@ -2,6 +2,6 @@
public class ShowRecoveryCodesViewModel
{
public string[] RecoveryCodes { get; set; }
public string[]? RecoveryCodes { get; set; }
}

4
src/Web/ViewModels/OrderItemViewModel.cs
View File

@@ -3,9 +3,9 @@
public class OrderItemViewModel
{
public int ProductId { get; set; }
public string ProductName { get; set; }
public string? ProductName { get; set; }
public decimal UnitPrice { get; set; }
public decimal Discount => 0;
public int Units { get; set; }
public string PictureUrl { get; set; }
public string? PictureUrl { get; set; }
}

2
src/Web/ViewModels/OrderViewModel.cs
View File

@@ -12,6 +12,6 @@ public class OrderViewModel
public DateTimeOffset OrderDate { get; set; }
public decimal Total { get; set; }
public string Status => DEFAULT_STATUS;
public Address ShippingAddress { get; set; }
public Address? ShippingAddress { get; set; }
public List<OrderItemViewModel> OrderItems { get; set; } = new List<OrderItemViewModel>();
}

4
src/Web/ViewModels/PaginationInfoViewModel.cs
View File

@@ -6,6 +6,6 @@ public class PaginationInfoViewModel
public int ItemsPerPage { get; set; }
public int ActualPage { get; set; }
public int TotalPages { get; set; }
public string Previous { get; set; }
public string Next { get; set; }
public string? Previous { get; set; }
public string? Next { get; set; }
}