From 4da0444cccf6b99b846e324de50e6f0090889b29 Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:14:43 +0100 Subject: [PATCH 01/18] Dashboard fix Fix for responsive behaviour --- .../Elektrifikatsiya/Pages/Dashboard.razor | 162 +++++++++--------- 1 file changed, 82 insertions(+), 80 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index fa442fe..3faa8ed 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -3,88 +3,90 @@ @using Elektrifikatsiya.Models; @inject IVersionProvider VersionProvider - -
- - - - Plugs - - - - - - - - - - @context.Item.Name - - - - - User: @context.Item.User -
- Room: @context.Item.Room - - - @context.Item.PowerUsage W - - - - - - - - - - +
+ +
+ + + + Plugs + + + + + + + + + + @context.Item.Name + + + + + User: @context.Item.User +
+ Room: @context.Item.Room + + + @context.Item.PowerUsage W + + + + + + + + + + + + + + + Logs + + + + +
+ @context.Item.EventName + @context.Item.Date +
+ @context.Item.Description + + + +
+ + + + + - - - - Plugs - - - + +
- -
- @context.Item.EventName - @context.Item.Date -
- @context.Item.Description - - - -
- - - - - - - @code { //TODO: insert new event here if plug produces one From ca58a76594e6901ba940f9484dd16dfa81f494b1 Mon Sep 17 00:00:00 2001 From: Aldin296 <99395958+Aldin296@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:17:08 +0100 Subject: [PATCH 02/18] Settings Page Frontend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit weiter eingabe felder für die Settings Page hinzugefügt --- .../Elektrifikatsiya/Pages/Dashboard.razor | 2 +- .../Elektrifikatsiya/Pages/Settings.razor | 78 ++++++++++++++++-- .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 32768 -> 0 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 4 files changed, 74 insertions(+), 6 deletions(-) delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index fa442fe..858b2c4 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -88,7 +88,7 @@ @code { //TODO: insert new event here if plug produces one - List events = new List() { new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now) }; + List events = new List() { new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now) }; //TODO: insert new Device here if user adds one List plugs = new List() { new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF") }; diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor index 415044c..00e3089 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor @@ -23,7 +23,7 @@ - + @context.Item.Name @@ -35,21 +35,89 @@
Room: @context.Item.Room - - @context.Item.PowerUsage W - - + + + + + + + +
+ Plug Name +
+ + Here you can change the Name of your Plug + + + + +
+
+ + +
+ Change Max Output +
+ + Here you can limit how much Power your Plug uses + + + + +
+
+ + +
+ Electricity Price +
+ + Here you enter your electricity price. This is gonna calculate the overall Price of your System + + + + +
+
+ + +
+ Select Room +
+ + Here you select or change the Room where you use your Plug. + + +
+ + Rooms + + Room 1 + + Room 2 + + Room 3 + + + + + + + + diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm deleted file mode 100644 index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIuAr62r3 Date: Wed, 8 Mar 2023 10:17:08 +0100 Subject: [PATCH 03/18] Settings Page Frontend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit weiter eingabe felder für die Settings Page hinzugefügt --- .../Elektrifikatsiya/Pages/Dashboard.razor | 2 +- .../Elektrifikatsiya/Pages/Settings.razor | 78 ++++++++++++++++-- .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 32768 -> 0 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 4 files changed, 74 insertions(+), 6 deletions(-) delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index 049c64e..0991dfd 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -89,7 +89,7 @@ @code { //TODO: insert new event here if plug produces one - List events = new List() { new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now) }; + List events = new List() { new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now) }; //TODO: insert new Device here if user adds one List plugs = new List() { new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), }; //code for graph diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor index 415044c..00e3089 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor @@ -23,7 +23,7 @@ - + @context.Item.Name @@ -35,21 +35,89 @@
Room: @context.Item.Room - - @context.Item.PowerUsage W - - + + + + + + + +
+ Plug Name +
+ + Here you can change the Name of your Plug + + + + +
+
+ + +
+ Change Max Output +
+ + Here you can limit how much Power your Plug uses + + + + +
+
+ + +
+ Electricity Price +
+ + Here you enter your electricity price. This is gonna calculate the overall Price of your System + + + + +
+
+ + +
+ Select Room +
+ + Here you select or change the Room where you use your Plug. + + +
+ + Rooms + + Room 1 + + Room 2 + + Room 3 + + + + + + + + diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm deleted file mode 100644 index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIuAr62r3 Date: Wed, 8 Mar 2023 10:14:43 +0100 Subject: [PATCH 04/18] Dashboard fix Fix for responsive behaviour --- .../Elektrifikatsiya/Pages/Dashboard.razor | 162 +++++++++--------- 1 file changed, 82 insertions(+), 80 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index 0991dfd..3dc0ff8 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -4,88 +4,90 @@ @using System.Net @inject IVersionProvider VersionProvider - -
- - - - Plugs - - - - - - - - - - @context.Item.Name - - - - - User: @context.Item.User -
- Room: @context.Item.Room - - - @context.Item.PowerUsage W - - - - - - - - - - +
+ +
+ + + + Plugs + + + + + + + + + + @context.Item.Name + + + + + User: @context.Item.User +
+ Room: @context.Item.Room + + + @context.Item.PowerUsage W + + + + + + + + + + + + + + + Logs + + + + +
+ @context.Item.EventName + @context.Item.Date +
+ @context.Item.Description + + + +
+ + + + + - - - - Plugs - - - + +
- -
- @context.Item.EventName - @context.Item.Date -
- @context.Item.Description - - - -
- - - - - - - @code { //TODO: insert new event here if plug produces one From c06940b5ddc8f42fa699a87e981a752e2aab86e4 Mon Sep 17 00:00:00 2001 From: Stefan <32109571+Stefan-5422@users.noreply.github.com> Date: Wed, 8 Mar 2023 12:07:55 +0100 Subject: [PATCH 05/18] =?UTF-8?q?Beep=20boop=20=F0=9F=A4=96=F0=9F=A4=96?= =?UTF-8?q?=F0=9F=A4=96=F0=9F=A4=96=F0=9F=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Elektrifikatsiya/Pages/AddPlug.razor | 3 - .../Elektrifikatsiya/Pages/Dashboard.razor | 147 ++++++++---------- .../Elektrifikatsiya/Pages/Settings.razor | 3 +- 3 files changed, 66 insertions(+), 87 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor index 41cb0fb..f14522f 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor @@ -34,9 +34,6 @@ - - @context.Item - diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index 3dc0ff8..81adb33 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -4,96 +4,77 @@ @using System.Net @inject IVersionProvider VersionProvider -
- -
- - - - Plugs - - - - - - - - - - @context.Item.Name - - - - - User: @context.Item.User -
- Room: @context.Item.Room - - - @context.Item.PowerUsage W - - - - - - - - - - - - - - - Logs - - - - -
- @context.Item.EventName - @context.Item.Date -
- @context.Item.Description - - - -
- - - - - + +
+ + + + Plugs + + + + + + + + + + @context.Item.Name + + + + + User: @context.Item.User.Name +
+ Room: @context.Item.Room + + + @context.Item.PowerUsage W + + + + + + + + + + - -
+ + + + Logs + + + @code { //TODO: insert new event here if plug produces one List events = new List() { new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now) }; //TODO: insert new Device here if user adds one - List plugs = new List() { new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), }; + List plugs = new List() { new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "Josne", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), }; //code for graph LineChart lineChart; diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor index 00e3089..fa1eff0 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor @@ -1,6 +1,7 @@ @page "/Settings" @using Blazorise.Components; @using Elektrifikatsiya.Models; +@using System.Net plugs = new List() { new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF") }; + List plugs = new List() { new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "Josne", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), }; } From 2561a74b7f5dc456fb5b02e5d343469f8dc53ee8 Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:14:43 +0100 Subject: [PATCH 06/18] Dashboard fix Fix for responsive behaviour --- .../Elektrifikatsiya/Pages/Dashboard.razor | 147 ++++++++++-------- 1 file changed, 83 insertions(+), 64 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index 81adb33..bc6f13a 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -1,73 +1,92 @@ -@page "/" +@page "/" @using Blazorise.Components; @using Elektrifikatsiya.Models; @using System.Net @inject IVersionProvider VersionProvider - -
- - - - Plugs - - - - - - - - - - @context.Item.Name - - - - - User: @context.Item.User.Name -
- Room: @context.Item.Room - - - @context.Item.PowerUsage W - - - - - - - - - - +
+ +
+ + + + Plugs + + + + + + + + + + @context.Item.Name + + + + + User: @context.Item.User +
+ Room: @context.Item.Room + + + @context.Item.PowerUsage W + + + + + + + + + + + + + + + Logs + + + + +
+ @context.Item.EventName + @context.Item.Date +
+ @context.Item.Description + + + +
+ + + + + - - - - Logs - - - + +
@code { From f55ef88e14b7d55d2c97d9e9afdc03a1fa467b54 Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Wed, 15 Mar 2023 08:58:39 +0100 Subject: [PATCH 07/18] Rebase --- .../Elektrifikatsiya/DeviceManagement.sqlite | Bin 0 -> 4096 bytes .../DeviceManagement.sqlite-shm | Bin 0 -> 32768 bytes .../DeviceManagement.sqlite-wal | Bin 0 -> 24752 bytes .../Properties/launchSettings.json | 2 +- .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 0 -> 32768 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 6 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..81dae899f351f43f4e0ef4b510c62a2f6b578c80 GIT binary patch literal 4096 zcmWFz^vNtqRY=P(%1ta$FlG>7U}9o$P*7lCU|@t|AVoG{WYCM3;st3JAlr;ljiVtj n8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*O6ovo*DxU_5 literal 0 HcmV?d00001 diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm new file mode 100644 index 0000000000000000000000000000000000000000..69987d0f42d29ae6a46a1e437b19d668cf7fc743 GIT binary patch literal 32768 zcmeI)tqsCJ7zW_uH%J7cumc+)Sp-2+K|;y^48SN%!7K<&Z9Uv4n$#lUo;UfD_R?N+ zPyJgxx2ex4rR6-|#9Zs!rF$J8tM;%yx6ST!@Ah@GSyW#>-|roJz6Tku$94X88t0kh zndX`0iFbqm0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAVA=s1)_CA2$U%heJetsOo3<`5&~rkM8}p8 zC{rNX<%B?)0(uq8{O?XpfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ SfB*pk1PBlyK!Ct+3w!`uAtna^ literal 0 HcmV?d00001 diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal new file mode 100644 index 0000000000000000000000000000000000000000..f6e298cdd6f1408c04bdb250f88f38e9b0b75d9d GIT binary patch literal 24752 zcmeI)y>HV%7zbe6XV;S zhwZ^6*sLu&L(SHo58F-Gt#l9F{(RG|=krYiScObyO{&cp{8`(;h)JiZNsTnk6JL>Q zYDFc*g)>yAEDLEhpH?$87EO)!$q6+n3V!mu^)maYS+F2hBWlIeth7Mu+nW zGQ(zdh_*AcJjj8x5_Q4KY6gotPYo-~#D9{Uvpw&YTPx1m-dgu$DS5WSN^aG1uRGPS z3tMGjaNYLmx_hlu&DiySEhW<}v!>34!ZO6P`RDxBenE8dZR6?hJC|epW^*fnU!gz% z0uX=z1Rwwb2tWV=5P$##Akdov{QLgazQBvmA3l9~7x{yIf!<6uW(5HVKmY;|fB*y_ z009U<00I!`5b)mt2;VQ*{%F1W`u>T4eSr=oR3QKX2tWV=5P$##AOHafKmY>0DZpRf zX#HMbYGruy4cT6a@|$>%fGeOt00Izz00bZa0SG_<0uX=z1bSJ3{|`Yq{JlW!@!GvD i=f^MX3-ofzF*gW600Izz00bZa0SG_<0uX>eQ{XQt*f=); literal 0 HcmV?d00001 diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json b/src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json index fe359ad..356daf5 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json @@ -7,7 +7,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "dotnetRunMessages": true, - "applicationUrl": "https://localhost:56656;http://localhost:5255" + "applicationUrl": "https://localhost:5656;http://localhost:5255" }, "IIS Express": { "commandName": "IISExpress", diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm new file mode 100644 index 0000000000000000000000000000000000000000..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10 GIT binary patch literal 32768 zcmeIuAr62r3 Date: Wed, 22 Mar 2023 09:04:31 +0100 Subject: [PATCH 08/18] Design Improvements Addplug page new loading bar design, dashboard finetuning --- .../Components/Layout/SideMenu.razor | 12 ++- .../Elektrifikatsiya/DeviceManagement.sqlite | Bin 4096 -> 24576 bytes .../DeviceManagement.sqlite-shm | Bin 32768 -> 32768 bytes .../DeviceManagement.sqlite-wal | Bin 24752 -> 0 bytes .../Elektrifikatsiya/Elektrifikatsiya.csproj | 1 + .../Elektrifikatsiya/Pages/AddPlug.razor | 69 ++++++++++-------- .../Elektrifikatsiya/Pages/Dashboard.razor | 2 +- .../Elektrifikatsiya/Pages/_Host.cshtml | 1 + .../Elektrifikatsiya/_Imports.razor | 1 + 9 files changed, 51 insertions(+), 35 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor index c96b81f..01a573c 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor @@ -29,20 +29,24 @@ Add Plug - - Settings + + + + + + Logout + + @code { private bool pagesBarVisible = true; - - //TODO: replace logo png with transparent background one RenderFragment customIcon =@; } \ No newline at end of file diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite index 81dae899f351f43f4e0ef4b510c62a2f6b578c80..b7a73e251a9af12973c0b46e7f44df53659c3a0b 100644 GIT binary patch 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 delta 26 gcmZoTz}TQLL7J73fq{W>Vxv8fp%*W;Nnj2?097*u{{R30 diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm index 69987d0f42d29ae6a46a1e437b19d668cf7fc743..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10 100644 GIT binary patch delta 89 zcmZo@U}|V!;+1%$%K!t66BkO0TChv7nNGgVi7uf4lYpuIj|Mg_jCI<$LE9Dp%F!O} delta 205 zcmZo@U}|V!s+V}A%K!t63=9HnKn@7kWpovNd6s%WHV%7zbe6XV;S zhwZ^6*sLu&L(SHo58F-Gt#l9F{(RG|=krYiScObyO{&cp{8`(;h)JiZNsTnk6JL>Q zYDFc*g)>yAEDLEhpH?$87EO)!$q6+n3V!mu^)maYS+F2hBWlIeth7Mu+nW zGQ(zdh_*AcJjj8x5_Q4KY6gotPYo-~#D9{Uvpw&YTPx1m-dgu$DS5WSN^aG1uRGPS z3tMGjaNYLmx_hlu&DiySEhW<}v!>34!ZO6P`RDxBenE8dZR6?hJC|epW^*fnU!gz% z0uX=z1Rwwb2tWV=5P$##Akdov{QLgazQBvmA3l9~7x{yIf!<6uW(5HVKmY;|fB*y_ z009U<00I!`5b)mt2;VQ*{%F1W`u>T4eSr=oR3QKX2tWV=5P$##AOHafKmY>0DZpRf zX#HMbYGruy4cT6a@|$>%fGeOt00Izz00bZa0SG_<0uX=z1bSJ3{|`Yq{JlW!@!GvD i=f^MX3-ofzF*gW600Izz00bZa0SG_<0uX>eQ{XQt*f=); diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj b/src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj index 4dca5d7..287aa77 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj @@ -37,6 +37,7 @@ + diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor index f14522f..687d8b5 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor @@ -9,7 +9,7 @@ @inject IDeviceManagmentService DeviceManagmentService @inject IAuthenticationService AuthenticationService -
+
@@ -20,36 +20,42 @@ Shadow="Shadow.Remove" Border="Border.Is1.RoundedTop"> - Add a plug via wifi + + Add a plug via wifi + + + + + - - - - - - - - - - IP: @context.Item - - - - - - - - - - + + + + + + + + + + IP: @context.Item + + + + + + + + + + @@ -90,6 +96,8 @@ @code { List ipAddresses = new List(); + bool visible = true; + protected override void OnInitialized() { ipAddresses.AddRange(MdnsDiscovery.GetChachedDevices()); @@ -97,6 +105,7 @@ { ipAddresses.Add(address); InvokeAsync(StateHasChanged); + visible = false; }; } -} +} \ No newline at end of file diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index bc6f13a..9eccde6 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -83,7 +83,7 @@ - +
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Host.cshtml b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Host.cshtml index 3e71a2d..6f92073 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Host.cshtml +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Host.cshtml @@ -6,3 +6,4 @@ } + \ No newline at end of file diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/_Imports.razor b/src/Elektrifikatsiya/Elektrifikatsiya/_Imports.razor index 971248a..9dc4cde 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/_Imports.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/_Imports.razor @@ -10,3 +10,4 @@ @using Elektrifikatsiya @using Blazorise @using Blazorise.Charts +@using Blazorise.LoadingIndicator From 6ed83ad4aed1b02323213db688ed5b4433015e5a Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Wed, 22 Mar 2023 09:26:47 +0100 Subject: [PATCH 09/18] yes --- src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor index 687d8b5..1d92e85 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor @@ -9,7 +9,6 @@ @inject IDeviceManagmentService DeviceManagmentService @inject IAuthenticationService AuthenticationService -
@@ -91,7 +90,6 @@ -
@code { List ipAddresses = new List(); From ff37097c2f48a9c08ae511b6042f39f467543c5b Mon Sep 17 00:00:00 2001 From: Aldin296 <99395958+Aldin296@users.noreply.github.com> Date: Wed, 22 Mar 2023 09:27:28 +0100 Subject: [PATCH 10/18] Settings Page responisve --- .../Elektrifikatsiya/DeviceManagement.sqlite | Bin 4096 -> 24576 bytes .../DeviceManagement.sqlite-shm | Bin 32768 -> 32768 bytes .../DeviceManagement.sqlite-wal | Bin 24752 -> 0 bytes .../Elektrifikatsiya/Pages/Settings.razor | 230 +++++++++--------- 4 files changed, 120 insertions(+), 110 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite index 81dae899f351f43f4e0ef4b510c62a2f6b578c80..b7a73e251a9af12973c0b46e7f44df53659c3a0b 100644 GIT binary patch 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 delta 26 gcmZoTz}TQLL7J73fq{W>Vxv8fp%*W;Nnj2?097*u{{R30 diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm index 69987d0f42d29ae6a46a1e437b19d668cf7fc743..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10 100644 GIT binary patch delta 89 zcmZo@U}|V!;+1%$%K!t66BkO0TChv7nNGgVi7uf4lYpuIj|Mg_jCI<$LE9Dp%F!O} delta 205 zcmZo@U}|V!s+V}A%K!t63=9HnKn@7kWpovNd6s%WHV%7zbe6XV;S zhwZ^6*sLu&L(SHo58F-Gt#l9F{(RG|=krYiScObyO{&cp{8`(;h)JiZNsTnk6JL>Q zYDFc*g)>yAEDLEhpH?$87EO)!$q6+n3V!mu^)maYS+F2hBWlIeth7Mu+nW zGQ(zdh_*AcJjj8x5_Q4KY6gotPYo-~#D9{Uvpw&YTPx1m-dgu$DS5WSN^aG1uRGPS z3tMGjaNYLmx_hlu&DiySEhW<}v!>34!ZO6P`RDxBenE8dZR6?hJC|epW^*fnU!gz% z0uX=z1Rwwb2tWV=5P$##Akdov{QLgazQBvmA3l9~7x{yIf!<6uW(5HVKmY;|fB*y_ z009U<00I!`5b)mt2;VQ*{%F1W`u>T4eSr=oR3QKX2tWV=5P$##AOHafKmY>0DZpRf zX#HMbYGruy4cT6a@|$>%fGeOt00Izz00bZa0SG_<0uX=z1bSJ3{|`Yq{JlW!@!GvD i=f^MX3-ofzF*gW600Izz00bZa0SG_<0uX>eQ{XQt*f=); diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor index fa1eff0..b58022e 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor @@ -2,124 +2,134 @@ @using Blazorise.Components; @using Elektrifikatsiya.Models; @using System.Net - - - - - Plugs - - - - - - - +
+ +
+ + + + Plugs + + + + + + + + + + + @context.Item.Name + + + + + User: @context.Item.User +
+ Room: @context.Item.Room + + + + + + + +
+
- - @context.Item.Name - + + + - - - User: @context.Item.User -
- Room: @context.Item.Room - - - - - - - - - - - - - - - - - -
- Plug Name -
- - Here you can change the Name of your Plug - - - - -
-
- - -
- Change Max Output -
- - Here you can limit how much Power your Plug uses - - - - -
-
- - -
- Electricity Price -
- - Here you enter your electricity price. This is gonna calculate the overall Price of your System - - - - -
-
- - -
- Select Room -
- - Here you select or change the Room where you use your Plug. - - + + + + + + + + + +
+ Plug Name +
+ + Here you can change the Name of your Plug + + + +
- - Rooms - - Room 1 - - Room 2 - - Room 3 - - - +
+ + +
+ Change Max Output +
+ + Here you can limit how much Power your Plug uses + + + + +
+
+ + +
+ Electricity Price +
+ + Here you enter your electricity price. This is gonna calculate the overall Price of your System + + + + +
+
+ + +
+ Select Room +
+ + Here you select or change the Room where you use your Plug. + + +
+ + Rooms + + Room 1 + + Room 2 + + Room 3 + + + +
+ +
- @code { From 8c1c78d1454c75bab96c615cdfa5497581ac3add Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Wed, 22 Mar 2023 09:58:34 +0100 Subject: [PATCH 11/18] Update Addplug yes --- .../Elektrifikatsiya/Pages/AddPlug.razor | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor index 1d92e85..a779fc5 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor @@ -33,7 +33,8 @@ Data="@ipAddresses" TextField="@((_)=>(""))" ValueField="@((_)=>(""))" - Mode="ListGroupMode.Static"> + Mode="ListGroupMode.Static" + Style="border-radius: 0px 0px"> @@ -94,16 +95,33 @@ @code { List ipAddresses = new List(); - bool visible = true; + bool visible = false; + + DateTime time = DateTime.UtcNow; protected override void OnInitialized() { ipAddresses.AddRange(MdnsDiscovery.GetChachedDevices()); + + System.Timers.Timer aTimer = new System.Timers.Timer(1000); + aTimer.Elapsed += (_, _) => { + DateTime dateTime = DateTime.UtcNow; + if(dateTime >= time.AddSeconds(5)) + { + visible = false; + InvokeAsync(StateHasChanged); + } + }; + aTimer.Start(); + MdnsDiscovery.OnDeviceFound += address => { + visible = true; + ipAddresses.Add(address); InvokeAsync(StateHasChanged); - visible = false; + + time = DateTime.UtcNow; }; } } \ No newline at end of file From 0aff5026d306ec50b745a069f704d306fdfdadbe Mon Sep 17 00:00:00 2001 From: Aldin296 <99395958+Aldin296@users.noreply.github.com> Date: Wed, 22 Mar 2023 09:58:56 +0100 Subject: [PATCH 12/18] fixed responsive design in AddPlug page --- .../DeviceManagement.sqlite-shm | Bin 32768 -> 0 bytes .../DeviceManagement.sqlite-wal | 0 .../Elektrifikatsiya/Pages/AddPlug.razor | 4 ++-- .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 32768 -> 0 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 5 files changed, 2 insertions(+), 2 deletions(-) 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-shm delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal 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 + @@ -58,7 +58,7 @@ - + diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm deleted file mode 100644 index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIuAr62r3 Date: Wed, 22 Mar 2023 11:21:14 +0100 Subject: [PATCH 13/18] Settings improvement --- .../Components/Layout/SideMenu.razor | 12 +- .../DeviceManagement.sqlite-shm | Bin 0 -> 32768 bytes .../DeviceManagement.sqlite-wal | 0 .../Elektrifikatsiya/Pages/AddPlug.razor | 158 ++++++------ .../Elektrifikatsiya/Pages/Settings.razor | 240 +++++++++--------- .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 0 -> 32768 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 7 files changed, 208 insertions(+), 202 deletions(-) create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor index 01a573c..956a1a0 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor @@ -23,18 +23,18 @@ Admin - - - - Add Plug - - Settings + + + + Add Plug + + diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm new file mode 100644 index 0000000000000000000000000000000000000000..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10 GIT binary patch literal 32768 zcmeIuAr62r3 - - - - - - - Add a plug via wifi - - - - - - - - - - - - - - - - - IP: @context.Item - - - - - - - - - - - - - - + + - - - - - Add a plug via IP - - - - -
- - - -
- - - -
- - - - + + + + Add a plug via wifi + + + + + + + + + + + + + + + + + IP: @context.Item + + + + + + + + + + + + + + + + + + + Add a plug via IP + + + + +
+ + + +
+ + + +
+ + + + + + @code { List ipAddresses = new List(); @@ -106,7 +106,7 @@ System.Timers.Timer aTimer = new System.Timers.Timer(1000); aTimer.Elapsed += (_, _) => { DateTime dateTime = DateTime.UtcNow; - if(dateTime >= time.AddSeconds(5)) + if(dateTime >= time.AddSeconds(3)) { visible = false; InvokeAsync(StateHasChanged); diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor index b58022e..b9ba91d 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor @@ -3,129 +3,131 @@ @using Elektrifikatsiya.Models; @using System.Net
- +
- - - - Plugs - - - - - - - - - - - @context.Item.Name - - - - - User: @context.Item.User -
- Room: @context.Item.Room - - - - - - - -
-
+ + + + Plugs + + + + + + + + + + @context.Item.Name + + + + + User: @context.Item.User +
+ Room: @context.Item.Room + + + + + + + +
+
+ - - + - - - - - - - - -
- Plug Name -
- - Here you can change the Name of your Plug - - - - -
-
- - -
- Change Max Output -
- - Here you can limit how much Power your Plug uses - - - - -
-
- - -
- Electricity Price -
- - Here you enter your electricity price. This is gonna calculate the overall Price of your System - - - - -
-
- - -
- Select Room -
- - Here you select or change the Room where you use your Plug. - - -
- - Rooms - - Room 1 - - Room 2 - - Room 3 - - - - - + + + + + + + + + + + -
@@ -133,8 +135,12 @@ @code { - - List plugs = new List() { new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "Josne", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), }; + private bool hideButtonSettings = true; + + private void Toggle() + { + hideButtonSettings = !hideButtonSettings; + } } diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm new file mode 100644 index 0000000000000000000000000000000000000000..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10 GIT binary patch literal 32768 zcmeIuAr62r3 Date: Wed, 19 Apr 2023 08:27:04 +0200 Subject: [PATCH 14/18] yes --- .../DeviceManagement.sqlite-shm | Bin 32768 -> 0 bytes .../DeviceManagement.sqlite-wal | 0 .../Layouts/LoginLayout.razor | 21 +++++++++--------- .../Elektrifikatsiya/Pages/Settings.razor | 8 +++---- .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 32768 -> 0 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 6 files changed, 14 insertions(+), 15 deletions(-) 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-shm delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal 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 - - - - - - - + + + + + + + + + @code { - private void Clicked() - { - Debug.WriteLine("Button was clicked!"); - } + } \ No newline at end of file diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor index b9ba91d..89b851b 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor @@ -43,7 +43,7 @@
@@ -69,7 +69,7 @@ Plug Name - Here you can change the Name of your Plug + Here you can change the name of your plug @@ -82,7 +82,7 @@ Change Max Output - Here you can limit how much Power your Plug uses + Here you can limit how much power your plug uses @@ -95,7 +95,7 @@ Select Room - Here you select or change the Room where you use your Plug. + Here you select or change the room the plug belongs to.
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm deleted file mode 100644 index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32768 zcmeIuAr62r3 Date: Wed, 19 Apr 2023 09:46:32 +0200 Subject: [PATCH 15/18] verscuch button color zu wechseln, nicht geklappt (ignorieren) --- .../Elektrifikatsiya/Pages/Dashboard.razor | 12 +++++++++++- .../Elektrifikatsiya/Pages/Dashboard.razor.cs | 7 +------ .../Elektrifikatsiya/Pages/Settings.razor | 10 +++++++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index 9eccde6..a2b1a5e 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -44,7 +44,8 @@ - @@ -143,5 +144,14 @@ r.Next( 3, 50 ) * r.NextDouble(), r.Next( 3, 50 ) * r.NextDouble() }; } + + //private Background buttonColor = Background.Primary; + + private void ChangeButtonColor() + { + //device.on = !device.on; + } + + } diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs index ed25e93..fa4bbf2 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor.cs @@ -18,11 +18,6 @@ namespace Elektrifikatsiya.Pages { public partial class Dashboard { - string bgcolor { get; set; } = "00f"; // (starting value) - void SetColor() - { - bgcolor = "#fd7"; - StateHasChanged(); // may not be required, but I'm at work right now, so can't check - } + } } \ No newline at end of file diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor index b58022e..bb1bf15 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor @@ -42,8 +42,13 @@ -
@@ -136,5 +141,4 @@ List plugs = new List() { new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "Josne", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), }; - } From a96dbddf3be785c86a95676bcb793dc7984897da Mon Sep 17 00:00:00 2001 From: Silence Date: Wed, 19 Apr 2023 09:49:31 +0200 Subject: [PATCH 16/18] admin --- .../Elektrifikatsiya/Pages/Admin.razor | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/Pages/Admin.razor diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Admin.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Admin.razor new file mode 100644 index 0000000..af079a3 --- /dev/null +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Admin.razor @@ -0,0 +1,28 @@ +@page "/admin" +@using Blazorise.Components +@using Elektrifikatsiya.Models; +@using System.Net +
+ +
+ + + + Users + + + + + + +
+ +
+@code { +} From f54b70ef63b9d8b6cb898037c66608e504255c7f Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Wed, 19 Apr 2023 10:18:47 +0200 Subject: [PATCH 17/18] Settings fix --- .../DeviceManagement.sqlite-shm | Bin 0 -> 32768 bytes .../DeviceManagement.sqlite-wal | 0 .../Elektrifikatsiya/Pages/Settings.razor | 199 +++++++++++++----- .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 0 -> 32768 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 5 files changed, 148 insertions(+), 51 deletions(-) create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-shm new file mode 100644 index 0000000000000000000000000000000000000000..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10 GIT binary patch literal 32768 zcmeIuAr62r3 - - - - Plugs - - - - - - - - - - @context.Item.Name - - - - - User: @context.Item.User -
- Room: @context.Item.Room - - - @context.Item.PowerUsage W - - - - - - - - - - - - +
+ +
+ + + + Plugs + + + + + + + + + + @context.Item.Name + + + + + User: @context.Item.User +
+ Room: @context.Item.Room + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + +
+ +
@code { - - List plugs = new List() { new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "Josne", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), }; + private bool hideButtonSettings = true; + + private void Toggle() + { + hideButtonSettings = !hideButtonSettings; + } } \ No newline at end of file diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm new file mode 100644 index 0000000000000000000000000000000000000000..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10 GIT binary patch literal 32768 zcmeIuAr62r3 Date: Wed, 3 May 2023 09:30:19 +0200 Subject: [PATCH 18/18] Fix merge bugs --- .../Elektrifikatsiya/Pages/AddPlug.razor | 79 ++++++++++++------- .../Elektrifikatsiya/Pages/Dashboard.razor | 78 ++++++++++-------- 2 files changed, 97 insertions(+), 60 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor index 37fee70..d78020d 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor @@ -6,12 +6,12 @@ @using Elektrifikatsiya.Services.Implementations @using Elektrifikatsiya.Utilities @using FluentResults; +@using Blazorise.LoadingIndicator; @inject IVersionProvider VersionProvider @inject IDeviceManagmentService DeviceManagmentService @inject IAuthenticationService AuthenticationService @inject IMessageService MessageService -@inject IAuthenticationService AuthenticationService @@ -27,8 +27,8 @@ Add a plug via wifi - - + + @@ -97,36 +97,61 @@ @code { - List ipAddresses = new List(); - List ipAddresses = new List(); - bool visible = false; + Validation? ipValidation; - DateTime time = DateTime.UtcNow; + bool visible = true; + + string ipText = null!; protected override void OnInitialized() { - ipAddresses.AddRange(MdnsDiscovery.GetChachedDevices()); - - System.Timers.Timer aTimer = new System.Timers.Timer(1000); - aTimer.Elapsed += (_, _) => { - DateTime dateTime = DateTime.UtcNow; - if(dateTime >= time.AddSeconds(3)) - { - visible = false; - InvokeAsync(StateHasChanged); - } - }; - aTimer.Start(); - - MdnsDiscovery.OnDeviceFound += address => + MdnsDiscovery.OnDeviceFound += async ipAddress => { - visible = true; - - ipAddresses.Add(address); - InvokeAsync(StateHasChanged); - - time = DateTime.UtcNow; + visible = false; + if (!ipAddresses.Contains(ipAddress)) + { + ipAddresses.Add(ipAddress); + await InvokeAsync(StateHasChanged); + } }; + + MdnsDiscovery.FetchChachedDevices(); } + + private async Task RegisterDevice(IPAddress ipAddress) + { + Result result = await DeviceManagmentService.RegisterDevice(ipAddress, (await AuthenticationService.GetUserAsync()).ValueOrDefault); + + if (result.IsSuccess) + { + await MessageService.Success("Device added!"); + } + else + { + await MessageService.Error(string.Join(',', result.Errors.Select(e => e.Message)), "Adding device failed!"); + } + } + + public void ValidateIPv4(ValidatorEventArgs e) + { + string? input = Convert.ToString(e.Value); + + if (string.IsNullOrWhiteSpace(input)) + { + e.Status = ValidationStatus.None; + return; + } + + string[] splitValues = input.Split('.'); + if (splitValues.Length != 4) + { + e.Status = ValidationStatus.Error; + return; + } + + e.Status = splitValues.All(r => byte.TryParse(r, out _)) ? ValidationStatus.Success : ValidationStatus.Error; + } + +} \ No newline at end of file diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index a2b1a5e..5b11650 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -2,8 +2,13 @@ @using Blazorise.Components; @using Elektrifikatsiya.Models; @using System.Net +@using Elektrifikatsiya.Services +@using Elektrifikatsiya.Utilities +@using System.Diagnostics @inject IVersionProvider VersionProvider +@inject IDeviceStatusService DeviceStatusService; +
@@ -34,7 +39,7 @@ - User: @context.Item.User + User: @context.Item.User.Name
Room: @context.Item.Room @@ -44,7 +49,7 @@ - @@ -92,12 +97,22 @@ @code { //TODO: insert new event here if plug produces one - List events = new List() { new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now) }; + List events = new List() { new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now) }; //TODO: insert new Device here if user adds one - List plugs = new List() { new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "Josne", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Josne", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), }; + List plugs = new List(); //code for graph LineChart lineChart; + protected override void OnInitialized() + { + plugs = DeviceStatusService.GetDevices().ValueOrDefault ?? new List(); + + DeviceStatusService.OnDeviceStatusChanged += (_, e) => + { + InvokeAsync(StateHasChanged); + }; + } + protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -108,50 +123,47 @@ async Task HandleRedraw() { + labels.Clear(); await lineChart.Clear(); - - await lineChart.AddLabelsDatasetsAndUpdate(Labels, GetLineChartDataset()); + await lineChart.AddLabelsDatasetsAndUpdate(labels, await GetLineChartDataset()); } //TODO: insert dataset of current and last voltage usages - LineChartDataset GetLineChartDataset() + async Task> GetLineChartDataset() { return new LineChartDataset { - Label = "# of random number in thousands", - Data = RandomizeData(), - BackgroundColor = backgroundColors, - BorderColor = borderColors, + Label = "Wattage", + Data = await RandomizeData(), Fill = true, PointRadius = 3, CubicInterpolationMode = "monotone", }; } - string[] Labels = { "Red", "Blue", "Yellow", "Green", "Purple", "Orange" }; - List backgroundColors = new List { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) }; - List borderColors = new List { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) }; + List labels = new List(); - List RandomizeData() + async Task> RandomizeData() { + PrometheusQuery promQueryer = new PrometheusQuery("http://localhost:9090"); + + string plugnames = ""; + foreach (Device device in plugs) + { + plugnames += $"shellyplug-s-{device.MacAddress}/relay/0|"; + } + plugnames = plugnames[0..^1]; + + Debug.WriteLine($$"""sum(power{sensor=~"{{plugnames}}"})[1h:1m]"""); + + PrometheusDataWrapper? deviceData = (await promQueryer.Query($$"""sum(power{sensor=~"{{plugnames}}"})[1h:1m]"""))?.Data; + var r = new Random(DateTime.Now.Millisecond); - return new List { - r.Next( 3, 50 ) * r.NextDouble(), - r.Next( 3, 50 ) * r.NextDouble(), - r.Next( 3, 50 ) * r.NextDouble(), - r.Next( 3, 50 ) * r.NextDouble(), - r.Next( 3, 50 ) * r.NextDouble(), - r.Next( 3, 50 ) * r.NextDouble() }; + return deviceData?.MatrixTypeToTimestampFloatTuple().ValueOrDefault?.Select(x => + { + labels.Add(DateTimeOffset.FromUnixTimeSeconds(long.Parse($"1{x.Item1}0")).UtcDateTime.ToLocalTime().ToShortTimeString()); + return x.Item2; + }).ToList() ?? new List(); } - - //private Background buttonColor = Background.Primary; - - private void ChangeButtonColor() - { - //device.on = !device.on; - } - - -} - +} \ No newline at end of file