Merge remote-tracking branch 'origin/feature-DeviceRegistration' into feature-DeviceRegistration

This commit is contained in:
Stefan
2023-06-01 15:27:48 +02:00
8 changed files with 2 additions and 22 deletions
+1 -1
View File
@@ -351,4 +351,4 @@ MigrationBackup/
# Project specific # Project specific
*.sqlite* *.sqlite*
/src/Elektrifikatsiya/Elektrifikatsiya/appsettings.Development.json src/Elektrifikatsiya/Elektrifikatsiya/appsettings.Development.json
@@ -12,7 +12,6 @@ namespace Elektrifikatsiya.Models
public string Description { get; set; } public string Description { get; set; }
public DateTime Date { get; set; } public DateTime Date { get; set; }
public Device Plug { get; set; } public Device Plug { get; set; }
//if Plug Class implemented -> Property for which plug this event is from
public Event() { } public Event() { }
public Event(string eventName, string description, DateTime date, Device plug) public Event(string eventName, string description, DateTime date, Device plug)
@@ -34,7 +34,7 @@ builder.Services.AddSingleton<IScheduledService>(s => s.GetRequiredService<IUpda
builder.Services.AddSingleton<IScheduledService>(s => s.GetRequiredService<INotificationService>()); builder.Services.AddSingleton<IScheduledService>(s => s.GetRequiredService<INotificationService>());
builder.Services.AddSingleton<IEmailService, EmailService>(); builder.Services.AddSingleton<IEmailService, EmailService>();
builder.Services.AddSingleton<IEventService, EventService>(); builder.Services.AddSingleton<IEventService, EventService>();
builder.Services.AddSingleton<IHiveMQClient, HiveMQClient>((provider) => builder.Services.AddSingleton<IHiveMQClient, HiveMQClient>((provider)=>
{ {
HiveMQClientOptions options = new() HiveMQClientOptions options = new()
{ {
@@ -1,19 +0,0 @@
{
"DetailedErrors": true,
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
},
"EmailSettings": {
"User": "<SMTP_USER>",
"Key": "<SMTP_KEY>",
"DefaultEmail": "<SMTP_EMAIL_ADDRESS>",
"Templates": {
"DailyNotification": "../assets/DailyNotif.html"
},
"SmtpServer": "<SMTP_SERVER>",
"SmtpPort": <SMTP_PORT>
}
}