From 236c2418c538487e8e64ffeb6220558129a1d4e0 Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Thu, 1 Jun 2023 15:18:57 +0200 Subject: [PATCH 1/4] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d5cce1e..a2dcdb0 100644 --- a/.gitignore +++ b/.gitignore @@ -351,4 +351,4 @@ MigrationBackup/ # Project specific *.sqlite* -/src/Elektrifikatsiya/Elektrifikatsiya/appsettings.Development.json +src/Elektrifikatsiya/Elektrifikatsiya/appsettings.Development.json From d5f5ec2d0e2000af9e481ecbf12f6df5d4f7cd88 Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Thu, 1 Jun 2023 15:21:37 +0200 Subject: [PATCH 2/4] Final --- src/Elektrifikatsiya/Elektrifikatsiya/Program.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Program.cs b/src/Elektrifikatsiya/Elektrifikatsiya/Program.cs index 1e6f44b..e291139 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Program.cs +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Program.cs @@ -34,6 +34,7 @@ builder.Services.AddSingleton(); builder.Services.AddSingleton(s => s.GetRequiredService()); builder.Services.AddSingleton(s=>s.GetRequiredService()); builder.Services.AddSingleton(); +builder.Services.AddSingleton(); builder.Services.AddSingleton((provider)=> { HiveMQClientOptions options = new() From 4ef3958da39d96618a4829502f6521325aee8556 Mon Sep 17 00:00:00 2001 From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com> Date: Thu, 1 Jun 2023 15:23:10 +0200 Subject: [PATCH 3/4] Fix .gitignore --- .../Elektrifikatsiya/DeviceManagement.sqlite | Bin 24576 -> 0 bytes .../DeviceManagement.sqlite-shm | Bin 32768 -> 0 bytes .../DeviceManagement.sqlite-wal | 0 .../Elektrifikatsiya/UserDatabase.sqlite | Bin 12288 -> 0 bytes .../appsettings.Development.json | 19 ------------------ 5 files changed, 19 deletions(-) delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/appsettings.Development.json diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite deleted file mode 100644 index b7a73e251a9af12973c0b46e7f44df53659c3a0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 zcmeI&&u-H&90%|u{WDapWtUNjUM!zhZGaFjKxo|&Elo?BO06_eg~g1BHepQ$T)0ed zDATP`y_Ml7ezMucumqon5$DkoENL>H@R z^X9y;S8p`*9}iRi-IU82@~bGLdgd#eEibQDh$yt{UzkBK=Sf0|$3`A;dZG?(o3wh) zz;jK@@d)josXbHDcdf4Jj>#DtpU5DNKjUl5)sXdRdw4Z24<09Wa{c&NALlud%MyNd%_EWdMHJO7 ztmJ5I@F)_vCt_;z=8?WvKRndGFY=tpWz|?&tH}2_gy77o{FLM ziy|^q&Abn?4-^PM00Izz00bZa0SG_<0uX=z1a?&b@BdxREY1Z12tWV=5P$##AOHaf zKmY;|xD&wp|IPv}2tWV=5P$##AOHafKmY;|fWWQ_RI-EN|Npz1UYrX85P$##AOHaf nKmY;|fB*y_kPG1bkBa~S2tWV=5P$##AOHafKmY;|*nNS2>qP#F diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm deleted file mode 100644 index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIuAr62r3$)9D$$NwY!ljvxECM7XY?sN zttn_x+?W5rOft8VnJ=s9Ux$;z(0#s`r3IaeLm{O&BN9SLE)_28aQJ0s-Qef4{a;9N zGCDrsS+e#nY9Cx7AOHafKmY;|fB*y_009U<00Q3xV!7uwo6fLEZ>Pr2r+i5rSu=k& z+1+Nd(oU4G6>0xGRJ1X-o~1L>;+2ipBWK@rUFU6gm2+Ut!mcX$W4*WP^Qc}W4lfvc z6hvBGs)VARrf3j`)b2%no%q~OUfda#E8-;R`pJ+wYDoS-_kxHMcU7cYU#TMAiAP%9 zaF#MtITEMVzT}JXRcar9pV2qgPV!9WPbOQ>;GLA~!_*dG{xHcd(&CR#B>9v_HcwJ* zEbr!g=|?~S0uX=z1Rwwb2tWV=5P$##Ah5*(xc_hQ&&AOo009U<00Izz00bZa0SG_< H0;Rwwql9r3 diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/appsettings.Development.json b/src/Elektrifikatsiya/Elektrifikatsiya/appsettings.Development.json deleted file mode 100644 index b1316c0..0000000 --- a/src/Elektrifikatsiya/Elektrifikatsiya/appsettings.Development.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "DetailedErrors": true, - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "EmailSettings": { - "User": "", - "Key": "", - "DefaultEmail": "", - "Templates": { - "DailyNotification": "../assets/DailyNotif.html" - }, - "SmtpServer": "", - "SmtpPort": - } -} From 889fc5e3ddf4e7d6e9e1c48ed2b97f03e5d0c1ff Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Thu, 1 Jun 2023 15:24:21 +0200 Subject: [PATCH 4/4] Final2 --- src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs b/src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs index 7052b93..01a91d3 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Models/Event.cs @@ -12,7 +12,6 @@ namespace Elektrifikatsiya.Models public string Description { get; set; } public DateTime Date { get; set; } public Device Plug { get; set; } - //if Plug Class implemented -> Property for which plug this event is from public Event() { } public Event(string eventName, string description, DateTime date, Device plug)