diff --git a/JewelryStore/App.config b/JewelryStore/App.config
index da9f7ad..965007e 100644
--- a/JewelryStore/App.config
+++ b/JewelryStore/App.config
@@ -5,7 +5,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/JewelryStore/FormMails.Designer.cs b/JewelryStore/FormMails.Designer.cs
new file mode 100644
index 0000000..3be02f2
--- /dev/null
+++ b/JewelryStore/FormMails.Designer.cs
@@ -0,0 +1,62 @@
+namespace JewelryStore
+{
+ partial class FormMails
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.DataGridView = new System.Windows.Forms.DataGridView();
+ ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).BeginInit();
+ this.SuspendLayout();
+ //
+ // DataGridView
+ //
+ this.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.DataGridView.Location = new System.Drawing.Point(3, 3);
+ this.DataGridView.Name = "DataGridView";
+ this.DataGridView.RowTemplate.Height = 25;
+ this.DataGridView.Size = new System.Drawing.Size(794, 445);
+ this.DataGridView.TabIndex = 0;
+ //
+ // FormMails
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Controls.Add(this.DataGridView);
+ this.Name = "FormMails";
+ this.Text = "Эл. письма";
+ this.Load += new System.EventHandler(this.FormMails_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DataGridView DataGridView;
+ }
+}
\ No newline at end of file
diff --git a/JewelryStore/FormMails.cs b/JewelryStore/FormMails.cs
new file mode 100644
index 0000000..5e37d56
--- /dev/null
+++ b/JewelryStore/FormMails.cs
@@ -0,0 +1,55 @@
+using JewelryStoreContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace JewelryStore
+{
+ public partial class FormMails : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IMessageInfoLogic _logic;
+
+ public FormMails(ILogger logger, IMessageInfoLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ LoadData();
+ }
+
+ private void LoadData()
+ {
+ try
+ {
+ var list = _logic.ReadList(null);
+ if (list != null)
+ {
+ DataGridView.DataSource = list;
+ DataGridView.Columns["ClientId"].Visible = false;
+ DataGridView.Columns["MessageId"].Visible = false;
+ DataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ }
+ _logger.LogInformation("Загрузка писем");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки писем");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+
+ private void FormMails_Load(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+ }
+}
diff --git a/JewelryStore/FormMails.resx b/JewelryStore/FormMails.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/JewelryStore/FormMails.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/JewelryStore/FormMain.Designer.cs b/JewelryStore/FormMain.Designer.cs
index 251d535..5c00a81 100644
--- a/JewelryStore/FormMain.Designer.cs
+++ b/JewelryStore/FormMain.Designer.cs
@@ -45,7 +45,8 @@
this.компонентыПоИзделиямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.списокЗаказзовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.запускРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+ this.элПисьмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
this.menuStrip.SuspendLayout();
this.SuspendLayout();
//
@@ -115,7 +116,8 @@
this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.справочникиToolStripMenuItem,
this.отчетыToolStripMenuItem,
- this.запускРаботToolStripMenuItem});
+ this.запускРаботToolStripMenuItem,
+ this.элПисьмаToolStripMenuItem});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
this.menuStrip.Size = new System.Drawing.Size(1530, 33);
@@ -198,10 +200,17 @@
this.запускРаботToolStripMenuItem.Size = new System.Drawing.Size(136, 29);
this.запускРаботToolStripMenuItem.Text = "Запуск работ";
this.запускРаботToolStripMenuItem.Click += new System.EventHandler(this.запускРаботToolStripMenuItem_Click);
- //
- // FormMain
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
+ //
+ // элПисьмаToolStripMenuItem
+ //
+ this.элПисьмаToolStripMenuItem.Name = "элПисьмаToolStripMenuItem";
+ this.элПисьмаToolStripMenuItem.Size = new System.Drawing.Size(82, 20);
+ this.элПисьмаToolStripMenuItem.Text = "Эл. Письма";
+ this.элПисьмаToolStripMenuItem.Click += new System.EventHandler(this.элПисьмаToolStripMenuItem_Click);
+ //
+ // FormMain
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1530, 450);
this.Controls.Add(this.buttonRefresh);
@@ -242,5 +251,6 @@
private ToolStripMenuItem клиентыToolStripMenuItem;
private ToolStripMenuItem запускРаботToolStripMenuItem;
private ToolStripMenuItem исполнителиToolStripMenuItem;
- }
+ private ToolStripMenuItem элПисьмаToolStripMenuItem;
+ }
}
\ No newline at end of file
diff --git a/JewelryStore/FormMain.cs b/JewelryStore/FormMain.cs
index 1917875..1728e6f 100644
--- a/JewelryStore/FormMain.cs
+++ b/JewelryStore/FormMain.cs
@@ -262,5 +262,13 @@ namespace JewelryStore
form.ShowDialog();
}
}
- }
+ private void элПисьмаToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormMails));
+ if (service is FormMails form)
+ {
+ form.ShowDialog();
+ }
+ }
+ }
}
diff --git a/JewelryStoreRestApi/appsettings.json b/JewelryStoreRestApi/appsettings.json
index 422df8a..d7fc5e9 100644
--- a/JewelryStoreRestApi/appsettings.json
+++ b/JewelryStoreRestApi/appsettings.json
@@ -10,6 +10,6 @@
"SmtpClientPort": "587",
"PopHost": "pop.gmail.com",
"PopPort": "995",
- "MailLogin": "@gmail.com",
- "MailPassword": ""
+ "MailLogin": "labsrpp@gmail.com",
+ "MailPassword": "rty678_)"
}