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

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

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

src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor

@@ -10,7 +10,7 @@
 		</LayoutSiderContent>
 	</LayoutSider>
 	<Layout>
-		<LayoutContent Padding="Padding.Is4.OnX.Is4.FromTop">
+		<LayoutContent Padding="Padding.Is4.OnDesktop.Is0">
 			@Body
 		</LayoutContent>
 	</Layout>

src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor

@@ -0,0 +1,84 @@
+@page "/addplug"
+@using Blazorise.Components;
+@using Elektrifikatsiya.Models;
+@inject IVersionProvider VersionProvider
+<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>
+			<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is12">
+				<Bar Breakpoint="Breakpoint.Desktop"
+					 Background="Background.White"
+					 ThemeContrast="ThemeContrast.None"
+					 Shadow="Shadow.Remove"
+					 Border="Border.Is1.RoundedTop">
+					<BarBrand>
+						Add a plug via wifi
+					</BarBrand>
+				</Bar>
+				<ListView Class="w-100"
+						  TItem="Device"
+						  Data="@plugs"
+						  TextField="@((_)=>(""))"
+						  ValueField="@((_)=>(""))"
+						  Mode="ListGroupMode.Static"
+						  Style="border-radius: 0px 0px">
+					<ItemTemplate>
+						<ListGroupItem>
+							<Row>
+								<Column ColumnSize="ColumnSize.Is7">
+									<Row Width="Width.Is100">
+										<Column>
+											<Small>IP: @context.Item.Address</Small>
+										</Column>
+									</Row>
+								</Column>
+								<Column ColumnSize="ColumnSize.Is4.Is1.WithOffset">
+									<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
+										<BarIcon IconName="IconName.Add" />
+									</Button>
+								</Column>
+							</Row>
+						</ListGroupItem>
+					</ItemTemplate>
+				</ListView>
+			</Column>
+		</Row>
+	</Row>
+	<Row Style="height:50%; width:100%; border-top-style:solid; border-top-color:#1a237e">
+		<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is1"></Column>
+		<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is12">
+			<Row Style="height:15%; width:100%"></Row>
+			<Row Style="height:10%; width:100%">
+				<Bar Breakpoint="Breakpoint.Desktop"
+					 Background="Background.White"
+					 ThemeContrast="ThemeContrast.None"
+					 Shadow="Shadow.Remove"
+					 Border="Border.Is1.RoundedTop"
+					 Style="width:100%">
+					<BarBrand>
+						Add a plug via IP
+					</BarBrand>
+				</Bar>
+				<ListGroup Style="width:100%; border-radius: 0px 0px">
+					<ListGroupItem Color="Color.Default">
+						<Form>
+							<Field Horizontal>
+								<FieldBody ColumnSize="ColumnSize.Is12">
+									<TextEdit Placeholder="Enter the Device IP here" />
+									<br>
+									<Button style="background-color:#1a237e; color:white" Type="ButtonType.Submit" PreventDefaultOnSubmit>CONNECT</Button>
+								</FieldBody>
+							</Field>
+						</Form>
+					</ListGroupItem>
+				</ListGroup>
+			</Row>
+			<Row Style="height:75%; width:100%"></Row>
+		</Column>
+	</Row>
+</Div>
+
+@code {
+	List<Device> plugs = new List<Device>() { 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") };
+}

src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor

@@ -4,8 +4,8 @@
 @inject IVersionProvider VersionProvider
 
 <Row Padding="Padding.Is3">
-	<Div Flex="Flex.AlignItems.Start" Margin="Margin.Is3.FromBottom" Width="Width.Is100">
+	<Div Display="Display.Flex.Row.OnDesktop" Margin="Margin.Is3.FromBottom" Width="Width.Is100">
-		<Column ColumnSize="ColumnSize.Is6">
+		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
 			<Bar Breakpoint="Breakpoint.Desktop"
 				 Background="Background.White"
 				 ThemeContrast="ThemeContrast.None"
@@ -22,7 +22,7 @@
 					  Mode="ListGroupMode.Static"
 					  Style="border-radius: 0px 0px">
 				<ItemTemplate>
-					<ListGroupItem>
+					<ListGroupItem Border="Border.OnBottom">
 						<Row>
 							<Column ColumnSize="ColumnSize.Is8">
 								<Row>
@@ -73,7 +73,7 @@
 						<Heading Size="HeadingSize.Is6" Margin="Margin.Is2.FromBottom">@context.Item.EventName</Heading>
 						<Small>@context.Item.Date</Small>
 					</Div>
-					<Paragraph Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph>
+					<Paragraph Border="Border.OnBottom" Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph>
 				</ItemTemplate>
 			</ListView>
 		</Column>