Merge branch 'Development' into feature-DeviceRegistration

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

@@ -23,6 +23,12 @@
                     Admin
                 </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" />
@@ -32,9 +38,9 @@
         </BarStart>
         <BarEnd>
             <BarItem>
-                <BarLink To="/settings" TextColor="TextColor.White">
+                <BarLink To="/login" TextColor="TextColor.White">
-                    <BarIcon Style="color:white" IconName="IconName.Wrench" />
+                    <BarIcon Style="color:white" IconName="IconName.Running" />
-                    Settings
+                    Logout
                 </BarLink>
             </BarItem>
         </BarEnd>
@@ -42,7 +48,5 @@
 </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" />;
 }

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" />

src/Elektrifikatsiya/Elektrifikatsiya/Layouts/LoginLayout.razor

@@ -1,40 +1,17 @@
 @using System.Diagnostics;
-@using FluentResults
-@inject Elektrifikatsiya.Services.IAuthenticationService AuthenticationService
-@inject NavigationManager NavigationManager
 @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">
-        <TextEdit @bind-Text="username" Placeholder="Username" />
+        <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 @bind-Text="password" Role="TextRole.Password" Placeholder="Password" />
+            <TextEdit Role="TextRole.Password" Placeholder="Password" />
         </Field>
-    <Button Width="Width.Is25" Disabled="disabled"  Color="color" 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 string username = string.Empty;
-	private string password = string.Empty;
-	private Color color = Color.Primary;
-	private bool disabled;
-    private async Task Clicked()
-    {
-	    color = Color.Primary;
-	    disabled = true;
    
-	    Result loginResult = await AuthenticationService.LoginUserAsync(username, password);
-
-	    if (loginResult.IsSuccess)
-	    {
-            NavigationManager.NavigateTo("/", true);
-	    }
-	    else
-	    {
-		    color = Color.Danger;
-		    disabled = false;
-	    }
-    }
 }
-
-<!-- TODO: Put this into the Component once we are merging and refactoring -->

src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor

@@ -6,13 +6,14 @@
 @using Elektrifikatsiya.Services.Implementations
 @using Elektrifikatsiya.Utilities
 @using FluentResults;
+@using Blazorise.LoadingIndicator;
 @inject IVersionProvider VersionProvider
 @inject IDeviceManagmentService DeviceManagmentService
 @inject IAuthenticationService AuthenticationService
 @inject IMessageService MessageService
 
-<Div>
+
-    <Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is0">
+<Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is5.FromStart.OnMobile">
 	<Row Style="height:90%; width:100%">
 		<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is1"></Column>
 		<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is12">
@@ -22,7 +23,13 @@
 				 Shadow="Shadow.Remove"
 				 Border="Border.Is1.RoundedTop">
 				<BarBrand>
+					<Column ColumnSize="ColumnSize.Is9">
 						Add a plug via wifi
+					</Column>
+					<Column ColumnSize="ColumnSize.Is3.Is6.WithOffset">
+						<LoadingIndicator @bind-Visible="@visible"/>
+						
+					</Column>
 				</BarBrand>
 			</Bar>
 				<ListView Class="w-100"
@@ -30,11 +37,12 @@
 						  Data="@ipAddresses"
 						  TextField="@((_)=>(""))"
 						  ValueField="@((_)=>(""))"
-                          Mode="ListGroupMode.Static">
+						  Mode="ListGroupMode.Static"
+						  Style="border-radius: 0px 0px">
 					<ItemTemplate>
 						<ListGroupItem>
 								<Row>
-                                <Column ColumnSize="ColumnSize.Is6">
+									<Column ColumnSize="ColumnSize.Is8">
 										<Row>
 										</Row>
 										<Row Width="Width.Is100">
@@ -43,8 +51,8 @@
 											</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="@(()=>RegisterDevice(context.Item))" Outline>
+										<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>
@@ -54,8 +62,8 @@
 				</ListView>
 		</Column>
 	</Row>
-    </Row>
+</Row>
-    <Row Style="height:50%; width:100%; border-top-style:solid; border-top-color:#1a237e">
+<Row Style="height:50%; width:100%; border-top-style:solid; border-top-color:#1a237e" Padding="Padding.Is3.OnDesktop.Is5.FromStart.OnMobile">
 	<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is1"></Column>
 	<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is12">
 		<Row Style="height:15%; width:100%"></Row>
@@ -73,41 +81,35 @@
 			<ListGroup Style="width:100%; border-radius: 0px 0px">
 				<ListGroupItem Color="Color.Default">
 					<Form>
-                            <Validation @ref="ipValidation" Validator="ValidateIPv4">
 						<Field Horizontal>
 							<FieldBody ColumnSize="ColumnSize.Is12">
-                                        <TextEdit @bind-Text="ipText" Placeholder="Enter the Device IP here">
+								<TextEdit Placeholder="Enter the Device IP here" />
-                                            <Feedback>
-                                                <ValidationNone>Please enter a ip address.</ValidationNone>
-                                                <ValidationSuccess>Ip address is valid.</ValidationSuccess>
-                                                <ValidationError>Ip address is not valid!</ValidationError>
-                                            </Feedback>
-                                        </TextEdit>
 								<br>
-                                        <Button style="background-color:#1a237e; color:white" Type="ButtonType.Submit" Disabled="ipValidation?.Status != ValidationStatus.Success" Clicked="@(async (_)=> await RegisterDevice(IPAddress.Parse(ipText!)))" PreventDefaultOnSubmit>CONNECT</Button>
+								<Button style="background-color:#1a237e; color:white" Type="ButtonType.Submit" PreventDefaultOnSubmit>CONNECT</Button>
 							</FieldBody>
 						</Field>
-                            </Validation>
 					</Form>
 				</ListGroupItem>
 			</ListGroup>
 		</Row>
 		<Row Style="height:75%; width:100%"></Row>
 	</Column>
-    </Row>
+</Row>
-</Div>
 
 @code {
 	List<IPAddress> ipAddresses = new List<IPAddress>();
 
 	Validation? ipValidation;
 
+	bool visible = true;
+
 	string ipText = null!;
 
 	protected override void OnInitialized()
 	{
 		MdnsDiscovery.OnDeviceFound += async ipAddress =>
 		{
+			visible = false;
 			if (!ipAddresses.Contains(ipAddress))
 			{
 				ipAddresses.Add(ipAddress);
@@ -151,4 +153,5 @@
 
 		e.Status = splitValues.All(r => byte.TryParse(r, out _)) ? ValidationStatus.Success : ValidationStatus.Error;
 	}
+
 }

src/Elektrifikatsiya/Elektrifikatsiya/Pages/Admin.razor

@@ -0,0 +1,28 @@
+@page "/admin"
+@using Blazorise.Components
+@using Elektrifikatsiya.Models;
+@using System.Net
+<Div>
+	<Row Padding="Padding.Is3">
+		<Div Display="Display.Flex.Row.OnDesktop" Margin=" Margin.Is3.FromBottom" Width="Width.Is100">
+			<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
+				<Bar Breakpoint="Breakpoint.Desktop"
+					 Background="Background.White"
+					 ThemeContrast="ThemeContrast.None"
+					 Shadow="Shadow.Remove"
+					 Border="Border.Is1.RoundedTop">
+					<BarBrand>
+						Users
+					</BarBrand>
+					<Button Position="Position.Absolute.End" Padding="Padding.Is3" Outline>
+						<BarIcon IconName="IconName.Add" ></BarIcon>
+					</Button>
+				</Bar>
+				
+				
+			</Column>
+		</Div>
+	</Row>
+</Div>
+@code {
+}

src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor

@@ -1,4 +1,4 @@
-@page "/"
+@page "/"
 @using Blazorise.Components;
 @using Elektrifikatsiya.Models;
 @using System.Net
@@ -6,9 +6,12 @@
 @using Elektrifikatsiya.Utilities
 @using System.Diagnostics
 @inject IVersionProvider VersionProvider
-@inject IDeviceStatusService DeviceStatusService
+
-<Row Padding="Padding.Is3">
+@inject IDeviceStatusService DeviceStatusService;
-	<Div Display="Display.Flex.Row.OnDesktop" Margin="Margin.Is3.FromBottom" Width="Width.Is100">
+
+<Div>
+	<Row Padding="Padding.Is3">
+		<Div Display="Display.Flex.Row.OnDesktop" Margin=" Margin.Is3.FromBottom" Width="Width.Is100">
 			<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
 				<Bar Breakpoint="Breakpoint.Desktop"
 					 Background="Background.White"
@@ -25,8 +28,8 @@
 						  ValueField="@((_)=>(""))"
 						  Mode="ListGroupMode.Static"
 						  Style="border-radius: 0px 0px">
-				<ItemTemplate>
+					<ItemTemplate >
-					<ListGroupItem Border="Border.OnBottom">
+						<ListGroupItem>
 							<Row>
 								<Column ColumnSize="ColumnSize.Is8">
 									<Row>
@@ -46,7 +49,8 @@
 									</Row>
 								</Column>
 								<Column ColumnSize="ColumnSize.Is4">
-								<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
+									<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Primary"Primary Outline>
+										<!--TODO: This button should change color-->
 										<BarIcon IconName="IconName.Bolt" />
 									</Button>
 								</Column>
@@ -71,24 +75,25 @@
 						  ValueField="@((_)=>(""))"
 						  Mode="ListGroupMode.Static"
 						  Style="border-radius: 0px 0px">
-
 					<ItemTemplate>
 						<Div Flex="Flex.InlineFlex.JustifyContent.Between" Width="Width.Is100">
 							<Heading Size="HeadingSize.Is6" Margin="Margin.Is2.FromBottom">@context.Item.EventName</Heading>
 							<Small>@context.Item.Date</Small>
 						</Div>
-					<Paragraph Border="Border.OnBottom" Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph>
+						<Paragraph Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph>
 					</ItemTemplate>
 				</ListView>
 			</Column>
 		</Div>
-</Row>
+	</Row>
-<Row Padding="Padding.Is3">
+	<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>
+	</Row>
+</Div>
+
 
 @code {
 	//TODO: insert new event here if plug produces one

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
-        }
     }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor

@@ -2,8 +2,10 @@
 @using Blazorise.Components;
 @using Elektrifikatsiya.Models;
 @using System.Net
-<Row Style="width: 100%; height: 100%">
+<Div>
-	<Column ColumnSize="ColumnSize.Is4">
+	<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"
 					 Background="Background.White"
 					 ThemeContrast="ThemeContrast.None"
@@ -17,14 +19,14 @@
 						  Data="@plugs"
 						  TextField="@((_)=>(""))"
 						  ValueField="@((_)=>(""))"
-				  
 						  Style="border-radius: 0px 0px"
 						  Height="100%"
 						  MaxHeight="90%">
 					<ItemTemplate>
 						<ListGroupItem Border="Border.OnBottom">
 							<Row>
-						<Column ColumnSize="ColumnSize.Is8">
+
+								<Column ColumnSize="ColumnSize.Is6">
 									<Row>
 										<Column ColumnSize="ColumnSize.Is7">
 											<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
@@ -36,27 +38,121 @@
 											<br />
 											<Small>Room: @context.Item.Room</Small>
 										</Column>
-								<Column ColumnSize="ColumnSize.Is5">
-									<Paragraph Margin="Margin.Is1.OnY">@context.Item.PowerUsage W</Paragraph>
-								</Column>
 									</Row>
 								</Column>
-						<Column ColumnSize="ColumnSize.Is4">
+
+								<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 @onclick="Toggle" Position="Position.Absolute.Top.Is50.Start.Is100.Translate.Middle" Color="Color.Dark" Outline>
+											<BarIcon IconName="IconName.Pen" />
+										</Button>
+									</Column>
+								</Row>
+	
 							</Row>
 						</ListGroupItem>
 					</ItemTemplate>
 				</ListView>
 			</Column>
-</Row>
+			<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12.OnMobile" Margin="Margin.Is3.FromTop.OnMobile" Padding="Padding.Is4.FromStart.OnMobile">
-
+				<Div hidden="@hideButtonSettings">
+					<Field>
+						<FieldLabel>
+							<h2>
+								Plug Settings
+							</h2>
+						</FieldLabel>
+					</Field>
+					<Field>
+						<FieldLabel>
+							<h5>
+								Plug Name
+							</h5>
+							<Paragraph>
+								Here you can change the name of your plug
+							</Paragraph>
+						</FieldLabel>
+						<TextEdit Placeholder="Enter Name" />
+					</Field>
+					<br />
+					<br />
+					<Field>
+						<FieldLabel>
+							<h5>
+								Change Max Output
+							</h5>
+							<Paragraph>
+								Here you can limit how much power your plug uses
+							</Paragraph>
+						</FieldLabel>
+						<TextEdit Placeholder="Enter Max Output" />
+					</Field>
+					<br />
+					<br />
+					<Field>
+						<FieldLabel>
+							<h5>
+								Select Room
+							</h5>
+							<Paragraph>
+								Here you select or change the room the plug belongs to.
+							</Paragraph>
+						</FieldLabel>
+						<br />
+						<Dropdown Display="Display.InlineBlock">
+							<DropdownToggle Color="Color.Primary" Width="Width.Is100">Rooms</DropdownToggle>
+							<DropdownMenu>
+								<DropdownItem>Room 1</DropdownItem>
+								<DropdownDivider />
+								<DropdownItem>Room 2</DropdownItem>
+								<DropdownDivider />
+								<DropdownItem>Room 3</DropdownItem>
+							</DropdownMenu>
+						</Dropdown>
+					</Field>
+				</Div>
+				<Div hidden="@(!hideButtonSettings)">
+					<Field>
+						<FieldLabel>
+							<h2>
+								General Settings
+							</h2>
+						</FieldLabel>
+					</Field>
+					<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>
+			</Column>
+		</Div>
+	</Row>
+</Div>
 
 @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;
+	}
 }

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" />

src/Elektrifikatsiya/Elektrifikatsiya/_Imports.razor

@@ -10,3 +10,4 @@
 @using Elektrifikatsiya
 @using Blazorise
 @using Blazorise.Charts
+@using Blazorise.LoadingIndicator