From fccd511fd3ac226c81d276f7737efcd8661d8f65 Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Wed, 1 Mar 2023 11:14:58 +0100 Subject: [PATCH 1/4] wip --- .../Components/Layout/SideMenu.razor | 6 +-- .../Elektrifikatsiya/Layouts/MainLayout.razor | 2 +- .../Elektrifikatsiya/Pages/AddPlug.razor | 43 ++++++++++++++++++ .../Elektrifikatsiya/Pages/Dashboard.razor | 8 ++-- .../Elektrifikatsiya/UserDatabase.sqlite | Bin 0 -> 12288 bytes .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 0 -> 32768 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 7 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite 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 3691e03..c96b81f 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor @@ -18,13 +18,13 @@ - + Admin - + Add Plug @@ -32,7 +32,7 @@ - + Settings diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor index 362810d..08efa17 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor @@ -10,7 +10,7 @@ - + @Body diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor new file mode 100644 index 0000000..91ba629 --- /dev/null +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor @@ -0,0 +1,43 @@ +@page "/addplug" +@using Blazorise.Components; +@using Elektrifikatsiya.Models; +@inject IVersionProvider VersionProvider + + + + + + + + + + + @context.Item.Name + + + + + IP: @context.Item.Address + + + + + + + + + + + + + +@code { + 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/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index 2c3933f..de1ed5c 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -3,9 +3,9 @@ @using Elektrifikatsiya.Models; @inject IVersionProvider VersionProvider - -
- + +
+ - + $)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 literal 0 HcmV?d00001 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, 1 Mar 2023 12:00:29 +0100 Subject: [PATCH 2/4] wip --- .../Elektrifikatsiya/Pages/AddPlug.razor | 78 ++++++++++-------- .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 32768 -> 0 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 3 files changed, 45 insertions(+), 33 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/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor index 91ba629..5c459ad 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor @@ -3,39 +3,51 @@ @using Elektrifikatsiya.Models; @inject IVersionProvider VersionProvider - - - - - - - - - - @context.Item.Name - - - - - IP: @context.Item.Address - - - - - - - - - - - + + + + + + Add plug via wifi + + + + + + + + + + @context.Item.Name + + + + + IP: @context.Item.Address + + + + + + + + + + + + @code { 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, 1 Mar 2023 12:48:16 +0100 Subject: [PATCH 3/4] Addplug & Dashboard Minor adjustments in Dashboard and progress in Addplug --- .../Elektrifikatsiya/Pages/AddPlug.razor | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor index 5c459ad..4f9b7d4 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor @@ -5,7 +5,7 @@ - + - + @context.Item.Name @@ -37,7 +37,7 @@ - + @@ -49,6 +49,16 @@ + +
+ + + + + + +
+
@code { 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") }; From 1410fbe5af497d4bb028acf525c5d9cf10f79af4 Mon Sep 17 00:00:00 2001 From: Friend2868 <90833416+Friend2868@users.noreply.github.com> Date: Thu, 2 Mar 2023 16:42:13 +0100 Subject: [PATCH 4/4] AddPlug Progress AddPlug first prototype done + responsive --- .../Elektrifikatsiya/Pages/AddPlug.razor | 127 ++++++++++-------- .../Elektrifikatsiya/Pages/Dashboard.razor | 4 +- .../Elektrifikatsiya/UserDatabase.sqlite-shm | Bin 0 -> 32768 bytes .../Elektrifikatsiya/UserDatabase.sqlite-wal | 0 4 files changed, 75 insertions(+), 56 deletions(-) create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor index 4f9b7d4..fa1bb7a 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor @@ -2,63 +2,82 @@ @using Blazorise.Components; @using Elektrifikatsiya.Models; @inject IVersionProvider VersionProvider - - - - - - - Add plug via wifi - - - - - - - - - - @context.Item.Name - - - - - IP: @context.Item.Address - - - - - - - +
+ + + + + + + Add a plug via wifi + + + + + + + + + + IP: @context.Item.Address + + + + + + + + + + + + + + + + + + + + + Add a plug via IP + + + + +
+ + + +
+ +
+
+
- - +
+
+
- - -
- - - - - - -
-
+
@code { 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/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor index de1ed5c..bc39728 100644 --- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor +++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor @@ -12,7 +12,7 @@ ValueField="@((_)=>(""))" Mode="ListGroupMode.Static"> - + @@ -52,7 +52,7 @@ @context.Item.EventName @context.Item.Date
- @context.Item.Description + @context.Item.Description
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