From fc07db50ad8e19e7581772d105882a8f65973139 Mon Sep 17 00:00:00 2001
From: Friend2868 <90833416+Friend2868@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:04:31 +0100
Subject: [PATCH 1/2] 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
                 </BarLink>
             </BarItem>
-        </BarStart>
-        <BarEnd>
             <BarItem>
                 <BarLink To="/settings" TextColor="TextColor.White">
                     <BarIcon Style="color:white" IconName="IconName.Wrench" />
                     Settings
                 </BarLink>
             </BarItem>
+        </BarStart>
+        <BarEnd>
+            <BarItem>
+                <BarLink To="/login" TextColor="TextColor.White">
+                    <BarIcon Style="color:white" IconName="IconName.Running" />
+                    Logout
+                </BarLink>
+            </BarItem>
         </BarEnd>
     </BarMenu>
 </Bar>
 @code {
     private bool pagesBarVisible = true;
-
-    //TODO: replace logo png with transparent background one
     RenderFragment customIcon =@<img src="/logo.png" style="width:32px; height: 32px" />;
 }
\ 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
z<j4c?bUX$)slD~zc!26_$*nEhzuKRlFP1uZV}~gx@8kK*Pst1IKr;;OB_W!o8KRa&
zRiz*rMb#1C`cnJ8rlCEZJg(M$YNh?(TJ2Bm*Z$wyThT;;00bZa0SG_<0uX=z1R$^}
za9%3cpEdMvVHEJM)@ah^pTi5DOoj=cTY>DATP`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<SzNu~X*W{=6D@<9N0`
z^z!~XxBJUYB`hVKp3AILC)?{17;#yLxy)&?0m&6JO)H?yOt{T#CbG~n2Q9PBs+H!G
zV!3WMbS+O_ay1oC&53`V#(7_{OrA^clF0sp><09Wa{c&NALlud%MyNd%_EWdMHJO7
ztmJ5I@F)_vCt_;z=8?WvKRndGFY=tpWz|?&t<EDeBTltJyPnxB$Vys?IrMs#BjR?M
z<Ec#iC&_(3NxsDM;I*H8*q$sp5H~E0BQO5QBQ-_bG8NqRlhlqc!>H}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%W<aMHC{_8@UoK;_3G76<QNL3Fr
z8)W8xBmfnc16u~-04--=0%B$$W&vVWAZFXxnCQgFxUums6C)FtWCoKgV3HL~0@ZNq
F0RW%AHsb&Q

diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal b/src/Elektrifikatsiya/Elektrifikatsiya/DeviceManagement.sqlite-wal
index f6e298cdd6f1408c04bdb250f88f38e9b0b75d9d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 24752
zcmeI)y>HV%7zbe6X<ZaGfq@cAmXjA6wWUG~9q52buB}zq366_escK{zLnD%y#wi~I
zAVo0nHL@bnfgJ`0Bt(T6x*=8;qzb`MsS}K-+&OlXrhz{o`kiFi=ev9Bd)`}ei92~;
zZV2N$Ck5e{z{~Mnd)VDwpW2(<JH4~{`aHWOw%?!l{%C9Uo0QC7(o1!RTy<*|yH3ur
z(UK%wAcXam*dg;VL5Z+)Usz#hKVDnC+odF&DV&PMp9%egFNOHe`18U2_zJs3fdB*`
z009U<00Izz00ba#SYWwdPD~`lyQON;xvec0GS1D?s^b+FJg24=gPNQ+scKQ885z1r
zltbMVk~N4DbXLfS(j2X%8q1M^L^3HpJX*J}l%1eQaOw-9TIxlewhxa*2`kFHy{Z<A
zHOKQ5V$ns57+H2K=sHPfjl5;5nqd(oHy1v$LUN`yubN9_jxLP_K@7X%bPNxhv>V;S
zhwZ^6*sLu&L(SHo58F-Gt#l9F{(RG|=krYiScObyO{&cp{8`(;h)JiZNsTnk6JL>Q
zYDFc*g)>yAEDLEhpH?$87EO)!$q6+n3V!mu^)maYS+F<iu3ryX3TFfFewO_sd<Enr
zIWamaF8MhLhI!8VhErvkZ$=5LkpnsEXdJ0B+%eWQ)i@yzB!-5>2hBWlIeth7Mu+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 @@
 		<PackageReference Include="Blazorise" Version="1.2.0" />
 		<PackageReference Include="Blazorise.Charts" Version="1.2.0" />
 		<PackageReference Include="Blazorise.Components" Version="1.2.0" />
+		<PackageReference Include="Blazorise.LoadingIndicator" Version="1.2.0" />
 		<PackageReference Include="Blazorise.Material" Version="1.2.0" />
 		<PackageReference Include="Blazorise.Icons.Material" Version="1.2.0" />
 		<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
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 
 
-<Div >
+<Div>
 	<Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is0">
 		<Row Style="height:90%; width:100%">
 			<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is1"></Column>
@@ -20,36 +20,42 @@
 					 Shadow="Shadow.Remove"
 					 Border="Border.Is1.RoundedTop">
 					<BarBrand>
-						Add a plug via wifi
+						<Column ColumnSize="ColumnSize.Is9">
+							Add a plug via wifi
+						</Column>
+						<Column ColumnSize="ColumnSize.Is3.Is1.WithOffset">
+							<LoadingIndicator @bind-Visible="@visible">
+							</LoadingIndicator>
+						</Column>
 					</BarBrand>
 				</Bar>
-<ListView  Class="w-100"
-				  TItem="IPAddress"
-				  Data="@ipAddresses"
-				  TextField="@((_)=>(""))"
-				  ValueField="@((_)=>(""))"
-				  Mode="ListGroupMode.Static">
-			<ItemTemplate>
-				<ListGroupItem>
-					<Row>
-						<Column ColumnSize="ColumnSize.Is6">
-							<Row>
-							</Row>
-							<Row Width="Width.Is100">
-								<Column>
-									<Small>IP: @context.Item</Small>
-								</Column>
-							</Row>
-						</Column>
-						<Column ColumnSize="ColumnSize.Is4.Is2.WithOffset">
-							<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Clicked="@(async () => await DeviceManagmentService.RegisterDevice(context.Item,(await AuthenticationService.GetUserAsync()).ValueOrDefault))" Outline>
-								<BarIcon IconName="IconName.Add" />
-							</Button>
-						</Column>
-					</Row>
-				</ListGroupItem>
-			</ItemTemplate>
-		</ListView>
+					<ListView Class="w-100"
+							  TItem="IPAddress"
+							  Data="@ipAddresses"
+							  TextField="@((_)=>(""))"
+							  ValueField="@((_)=>(""))"
+							  Mode="ListGroupMode.Static">
+						<ItemTemplate>
+							<ListGroupItem>
+									<Row>
+										<Column ColumnSize="ColumnSize.Is6">
+											<Row>
+											</Row>
+											<Row Width="Width.Is100">
+												<Column>
+													<Small>IP: @context.Item</Small>
+												</Column>
+											</Row>
+										</Column>
+										<Column ColumnSize="ColumnSize.Is4.Is2.WithOffset">
+											<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Clicked="@(async () => await DeviceManagmentService.RegisterDevice(context.Item,(await AuthenticationService.GetUserAsync()).ValueOrDefault))" Outline>
+												<BarIcon IconName="IconName.Add" />
+											</Button>
+										</Column>
+									</Row>
+							</ListGroupItem>
+						</ItemTemplate>
+					</ListView>
 			</Column>
 		</Row>
 	</Row>
@@ -90,6 +96,8 @@
 @code {
 	List<IPAddress> ipAddresses = new List<IPAddress>();
 
+	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 @@
 	<Row Padding="Padding.Is3">
 		<Column>
 			<Button Color="Color.Primary" Style="border-radius: 0px" Clicked="@(async () => await HandleRedraw())">Aktualisieren</Button>
-			<LineChart @ref="lineChart" TItem="double" />
+			<LineChart Height="Height.Is100" Width="Width.Is100" @ref="lineChart" TItem="double" />
 		</Column>
 	</Row>
 </Div>
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 @@
 }
 
 <component type="typeof(App)" render-mode="Server" />
+<link href="_content/Blazorise.LoadingIndicator/blazorise.loadingindicator.css" rel="stylesheet" />
\ 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 2/2] 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 
 
-<Div>
 	<Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is0">
 		<Row Style="height:90%; width:100%">
 			<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is1"></Column>
@@ -91,7 +90,6 @@
 			<Row Style="height:75%; width:100%"></Row>
 		</Column>
 	</Row>
-</Div>
 
 @code {
 	List<IPAddress> ipAddresses = new List<IPAddress>();