diff --git a/GarmentFactory/App.config b/GarmentFactory/App.config
index cdd7638..055eb06 100644
--- a/GarmentFactory/App.config
+++ b/GarmentFactory/App.config
@@ -5,7 +5,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/GarmentFactoryBusinessLogic/BusinessLogics/MessageInfoLogic.cs b/GarmentFactoryBusinessLogic/BusinessLogics/MessageInfoLogic.cs
index 256fa73..6539fa0 100644
--- a/GarmentFactoryBusinessLogic/BusinessLogics/MessageInfoLogic.cs
+++ b/GarmentFactoryBusinessLogic/BusinessLogics/MessageInfoLogic.cs
@@ -61,7 +61,7 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics
}
if (string.IsNullOrEmpty(model.SenderName))
{
- throw new ArgumentNullException("Не указао почта", nameof(model.SenderName));
+ throw new ArgumentNullException("Не указана почта", nameof(model.SenderName));
}
if (string.IsNullOrEmpty(model.Subject))
{
diff --git a/GarmentFactoryBusinessLogic/MailWorker/AbstractMailWorker.cs b/GarmentFactoryBusinessLogic/MailWorker/AbstractMailWorker.cs
index f25025f..117cf6b 100644
--- a/GarmentFactoryBusinessLogic/MailWorker/AbstractMailWorker.cs
+++ b/GarmentFactoryBusinessLogic/MailWorker/AbstractMailWorker.cs
@@ -37,8 +37,7 @@ namespace GarmentFactoryBusinessLogic.MailWorker
public async void MailSendAsync(MailSendInfoBindingModel info)
{
- if (string.IsNullOrEmpty(_mailLogin) ||
- string.IsNullOrEmpty(_mailPassword))
+ if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
{
return;
}
@@ -46,20 +45,17 @@ namespace GarmentFactoryBusinessLogic.MailWorker
{
return;
}
- if (string.IsNullOrEmpty(info.MailAddress) ||
- string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
+ if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
{
return;
}
- _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress,
- info.Subject);
+ _logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject);
await SendMailAsync(info);
}
public async void MailCheck()
{
- if (string.IsNullOrEmpty(_mailLogin) ||
- string.IsNullOrEmpty(_mailPassword))
+ if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
{
return;
}
diff --git a/GarmentFactoryClientApp/Views/Home/Mails.cshtml b/GarmentFactoryClientApp/Views/Home/Mails.cshtml
index a0bf363..677575d 100644
--- a/GarmentFactoryClientApp/Views/Home/Mails.cshtml
+++ b/GarmentFactoryClientApp/Views/Home/Mails.cshtml
@@ -8,7 +8,7 @@
-
Заказы
+ Письма
diff --git a/GarmentFactoryClientApp/Views/Shared/_Layout.cshtml b/GarmentFactoryClientApp/Views/Shared/_Layout.cshtml
index 7721d7d..5593066 100644
--- a/GarmentFactoryClientApp/Views/Shared/_Layout.cshtml
+++ b/GarmentFactoryClientApp/Views/Shared/_Layout.cshtml
@@ -26,7 +26,7 @@
Личные данные
- Письма
+ Письма
Вход
diff --git a/GarmentFactoryDatabaseImplement/Implements/ClientStorage.cs b/GarmentFactoryDatabaseImplement/Implements/ClientStorage.cs
index 712204a..2136138 100644
--- a/GarmentFactoryDatabaseImplement/Implements/ClientStorage.cs
+++ b/GarmentFactoryDatabaseImplement/Implements/ClientStorage.cs
@@ -38,6 +38,7 @@ namespace GarmentFactoryDatabaseImplement.Implements
using var context = new GarmentFactoryDatabase();
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)) ||
(model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
}
diff --git a/GarmentFactoryDatabaseImplement/Models/MessageInfo.cs b/GarmentFactoryDatabaseImplement/Models/MessageInfo.cs
index d2518af..317cc89 100644
--- a/GarmentFactoryDatabaseImplement/Models/MessageInfo.cs
+++ b/GarmentFactoryDatabaseImplement/Models/MessageInfo.cs
@@ -55,7 +55,6 @@ namespace GarmentFactoryDatabaseImplement.Models
DateDelivery = model.DateDelivery,
Subject = model.Subject,
Body = model.Body,
-
};
}
diff --git a/GarmentFactoryRestApi/appsettings.json b/GarmentFactoryRestApi/appsettings.json
index cecbb9b..2a27180 100644
--- a/GarmentFactoryRestApi/appsettings.json
+++ b/GarmentFactoryRestApi/appsettings.json
@@ -11,6 +11,6 @@
"SmtpClientPort": "587",
"PopHost": "pop.gmail.com",
"PopPort": "995",
- "MailLogin": "ujijrujijr@gmail.com",
- "MailPassword": "twkn exbj fkua jrlw"
+ "MailLogin": "rpplab7chernyshev@gmail.com",
+ "MailPassword": "cojg axan axbk qtqb"
}