ujijrujijr/PIbd-22_Chernyshev_G.J._30_GarmentFactory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

После изменения лаб 7

Browse Source
This commit is contained in:
ujijrujijr 2024-05-13 23:53:04 +04:00
commit aaec7a7b61
8 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GarmentFactory/App.config
View File

@ -5,7 +5,7 @@
<add key="SmtpClientPort" value="587" /> <add key="SmtpClientPort" value="587" />
<add key="PopHost" value="pop.gmail.com" /> <add key="PopHost" value="pop.gmail.com" />
<add key="PopPort" value="995" /> <add key="PopPort" value="995" />
<add key="MailLogin" value="ujijrujijr@gmail.com" /> <add key="MailLogin" value="rpplab7chernyshev@gmail.com" />
<add key="MailPassword" value="twkn exbj fkua jrlw" /> <add key="MailPassword" value="cojg axan axbk qtqb" />
</appSettings> </appSettings>
</configuration> </configuration>

2
GarmentFactoryBusinessLogic/BusinessLogics/MessageInfoLogic.cs
View File

@ -61,7 +61,7 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics
} }
if (string.IsNullOrEmpty(model.SenderName)) if (string.IsNullOrEmpty(model.SenderName))
{ {
throw new ArgumentNullException("Не указао почта", nameof(model.SenderName)); throw new ArgumentNullException("Не указана почта", nameof(model.SenderName));
} }
if (string.IsNullOrEmpty(model.Subject)) if (string.IsNullOrEmpty(model.Subject))
{ {

12
GarmentFactoryBusinessLogic/MailWorker/AbstractMailWorker.cs
View File

@ -37,8 +37,7 @@ namespace GarmentFactoryBusinessLogic.MailWorker
public async void MailSendAsync(MailSendInfoBindingModel info) public async void MailSendAsync(MailSendInfoBindingModel info)
{ {
if (string.IsNullOrEmpty(_mailLogin) || if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
string.IsNullOrEmpty(_mailPassword))
{ {
return; return;
} }
@ -46,20 +45,17 @@ namespace GarmentFactoryBusinessLogic.MailWorker
{ {
return; return;
} }
if (string.IsNullOrEmpty(info.MailAddress) || if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
{ {
return; return;
} }
_logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject);
info.Subject);
await SendMailAsync(info); await SendMailAsync(info);
} }
public async void MailCheck() public async void MailCheck()
{ {
if (string.IsNullOrEmpty(_mailLogin) || if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
string.IsNullOrEmpty(_mailPassword))
{ {
return; return;
} }

2
GarmentFactoryClientApp/Views/Home/Mails.cshtml
View File

@ -8,7 +8,7 @@
<div class="text-center"> <div class="text-center">
<h1 class="display-4">Заказы</h1> <h1 class="display-4">Письма</h1>
</div> </div>

2
GarmentFactoryClientApp/Views/Shared/_Layout.cshtml
View File

@ -26,7 +26,7 @@
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Mails">Письма</a> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Mails">Письма</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a> <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a>

1
GarmentFactoryDatabaseImplement/Implements/ClientStorage.cs
View File

@ -38,6 +38,7 @@ namespace GarmentFactoryDatabaseImplement.Implements
using var context = new GarmentFactoryDatabase(); using var context = new GarmentFactoryDatabase();
return context.Clients.FirstOrDefault(x => return context.Clients.FirstOrDefault(x =>
(!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) || (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) ||
(!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && string.IsNullOrEmpty(model.Password)) ||
(model.Id.HasValue && x.Id == model.Id))?.GetViewModel; (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
} }

1
GarmentFactoryDatabaseImplement/Models/MessageInfo.cs
View File

@ -55,7 +55,6 @@ namespace GarmentFactoryDatabaseImplement.Models
DateDelivery = model.DateDelivery, DateDelivery = model.DateDelivery,
Subject = model.Subject, Subject = model.Subject,
Body = model.Body, Body = model.Body,
}; };
} }

4
GarmentFactoryRestApi/appsettings.json
View File

@ -11,6 +11,6 @@
"SmtpClientPort": "587", "SmtpClientPort": "587",
"PopHost": "pop.gmail.com", "PopHost": "pop.gmail.com",
"PopPort": "995", "PopPort": "995",
"MailLogin": "ujijrujijr@gmail.com", "MailLogin": "rpplab7chernyshev@gmail.com",
"MailPassword": "twkn exbj fkua jrlw" "MailPassword": "cojg axan axbk qtqb"
} }