Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard

src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor

@@ -23,18 +23,18 @@
                     Admin
                 </BarLink>
             </BarItem>
-            <BarItem>
-                <BarLink To="/addplug" TextColor="TextColor.White">
-                    <BarIcon Style="color:white" IconName="IconName.Plug" />
-                    Add Plug
-                </BarLink>
-            </BarItem>
             <BarItem>
                 <BarLink To="/settings" TextColor="TextColor.White">
                     <BarIcon Style="color:white" IconName="IconName.Wrench" />
                     Settings
                 </BarLink>
             </BarItem>
+            <BarItem>
+                <BarLink To="/addplug" TextColor="TextColor.White">
+                    <BarIcon Style="color:white" IconName="IconName.Plug" />
+                    Add Plug
+                </BarLink>
+            </BarItem>
         </BarStart>
         <BarEnd>
             <BarItem>

src/Elektrifikatsiya/Elektrifikatsiya/Layouts/LoginLayout.razor

@@ -2,17 +2,16 @@
 @inherits LayoutComponentBase
 <Image Source="logo.png" Width="Width.Is50" Height="Height.Is50"> </Image>
 <Card Width="Width.Is50" Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Padding="Padding.Is5">
-    <Field Width="Width.Is25" Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
+    <Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12.Is3.WithOffset">
+        <Field Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
             <TextEdit Placeholder="Username" />
         </Field>
-    <Field  Width="Width.Is25" Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
+        <Field Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
             <TextEdit Role="TextRole.Password" Placeholder="Password" />
         </Field>
-    <Button Width="Width.Is25"  Color="Color.Primary" Clicked="Clicked" Position="Position.Relative.Bottom.Is50.Start.Is50.Translate.MiddleX" >Login</Button>
+        <Button Color="Color.Primary" Position="Position.Relative.Bottom.Is50.Start.Is50.Translate.MiddleX">Login</Button>
+    </Column>
 </Card>
 @code {
-    private void Clicked()
+   
-    {
-        Debug.WriteLine("Button was clicked!");
-    }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor

@@ -22,7 +22,7 @@
 					<Column ColumnSize="ColumnSize.Is9">
 						Add a plug via wifi
 					</Column>
-						<Column ColumnSize="ColumnSize.Is3.Is1.WithOffset">
+					<Column ColumnSize="ColumnSize.Is3.Is6.WithOffset">
 						<LoadingIndicator @bind-Visible="@visible">
 						</LoadingIndicator>
 					</Column>
@@ -38,7 +38,7 @@
 					<ItemTemplate>
 						<ListGroupItem>
 								<Row>
-										<Column ColumnSize="ColumnSize.Is6">
+									<Column ColumnSize="ColumnSize.Is8">
 										<Row>
 										</Row>
 										<Row Width="Width.Is100">
@@ -47,7 +47,7 @@
 											</Column>
 										</Row>
 									</Column>
-										<Column ColumnSize="ColumnSize.Is4.Is2.WithOffset">
+									<Column ColumnSize="ColumnSize.Is4">
 										<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>
@@ -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);

src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor

@@ -3,7 +3,7 @@
 @using Elektrifikatsiya.Models;
 @using System.Net
 <Div>
-	<Row Style="width: 100%; height: 100%">
+	<Row Style="width: 100%; height: 100%" Margin="Margin.Is3.FromTop.OnMobile" Padding="Padding.Is4.FromStart.OnMobile">
 		<Div Display="Display.Flex.Row.OnDesktop" Margin=" Margin.Is3.FromBottom" Width="Width.Is100">
 			<Column ColumnSize="ColumnSize.Is5.OnDesktop.Is12.OnMobile">
 				<Bar Breakpoint="Breakpoint.Desktop"
@@ -43,14 +43,14 @@
 
 								<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is7.OnMobile">
 									<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
-									<BarIcon IconName="IconName.Bolt" />
+										<BarIcon IconName="IconName.Delete" />
 									</Button>
 								</Column>
 									<br />
 									<br />
 								<Row>
 									<Column ColumnSize="ColumnSize.Is1.OnDesktop">
-										<Button Position="Position.Absolute.Top.Is50.Start.Is100.Translate.Middle" Color="Color.Dark" Outline>
+									<Button @onclick="Toggle" Position="Position.Absolute.Top.Is50.Start.Is100.Translate.Middle" Color="Color.Dark" Outline>
 											<BarIcon IconName="IconName.Pen" />
 										</Button>
 									</Column>
@@ -61,14 +61,15 @@
 					</ItemTemplate>
 				</ListView>
 			</Column>
-		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12.OnMobile" Margin="Margin.Is3.OnMobile">
+			<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12.OnMobile" Margin="Margin.Is3.FromTop.OnMobile" Padding="Padding.Is4.FromStart.OnMobile">
+				<Div hidden="@hideButtonSettings">
 					<Field>
 						<FieldLabel>
 							<h5>
 								Plug Name
 							</h5>
 							<Paragraph>
-						Here you can change the Name of your Plug
+								Here you can change the name of your plug
 							</Paragraph>
 						</FieldLabel>
 						<TextEdit Placeholder="Enter Name" />
@@ -81,33 +82,20 @@
 								Change Max Output
 							</h5>
 							<Paragraph>
-						Here you can limit how much Power your Plug uses
+								Here you can limit how much power your plug uses
 							</Paragraph>
 						</FieldLabel>
 						<TextEdit Placeholder="Enter Max Output" />
 					</Field>
 					<br />
 					<br />
-			<Field>
-				<FieldLabel>
-					<h5>
-						Electricity Price
-					</h5>
-					<Paragraph>
-						Here you enter your electricity price. This is gonna calculate the overall Price of your System
-					</Paragraph>
-				</FieldLabel>
-				<TextEdit Placeholder="Enter Electricity Price" />
-			</Field>
-			<br />
-			<br />
 					<Field>
 						<FieldLabel>
 							<h5>
 								Select Room
 							</h5>
 							<Paragraph>
-						Here you select or change the Room where you use your Plug.
+								Here you select or change the room the plug belongs to.
 							</Paragraph>
 						</FieldLabel>
 						<br />
@@ -122,6 +110,20 @@
 							</DropdownMenu>
 						</Dropdown>
 					</Field>
+				</Div>
+				<Div hidden="@(!hideButtonSettings)">
+					<Field>
+						<FieldLabel>
+							<h5>
+								Electricity Price
+							</h5>
+							<Paragraph>
+								Here you enter your electricity price. This is gonna calculate the overall Price of your System
+							</Paragraph>
+						</FieldLabel>
+						<TextEdit Placeholder="Enter Electricity Price" />
+					</Field>
+				</Div>
 				<Column ColumnSize="ColumnSize.IsFull" TextAlignment="TextAlignment.End">
 					<Button Color="Color.Primary">Save</Button>
 				</Column>
@@ -133,8 +135,12 @@
 
 
 @code {
-
-
 	List<Device> plugs = new List<Device>() { 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;
+	}
 }