Merge pull request #30 from Stefan-5422/feature-Dashboard

Indev: Merge Indev items to test code with multiple systems working together
This commit is contained in:
Stefan
2023-03-01 11:19:05 +01:00
committed by GitHub
8 changed files with 102 additions and 57 deletions
@@ -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="/" TextColor="TextColor.White">
<BarLink To="/settings" TextColor="TextColor.White">
<BarIcon Style="color:white" IconName="IconName.Wrench" />
Settings
</BarLink>
@@ -10,7 +10,7 @@
</LayoutSiderContent>
</LayoutSider>
<Layout>
<LayoutContent Padding="Padding.Is4.OnX.Is4.FromTop">
<LayoutContent Padding="Padding.Is4.OnDesktop.Is0">
@Body
</LayoutContent>
</Layout>
@@ -0,0 +1,43 @@
@page "/addplug"
@using Blazorise.Components;
@using Elektrifikatsiya.Models;
@inject IVersionProvider VersionProvider
<Row Height=Height.Is50 Padding="Padding.Is3.OnDesktop.Is0">
<Column ColumnSize="ColumnSize.Is12" style="border-bottom-style:solid; border-bottom-color:#1a237e">
<ListView Class="w-100"
TItem="Device"
Data="@plugs"
TextField="@((_)=>(""))"
ValueField="@((_)=>(""))"
Mode="ListGroupMode.Static">
<ItemTemplate>
<ListGroupItem>
<Row>
<Column ColumnSize="ColumnSize.Is6">
<Row>
<Column >
<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
</Column>
</Row>
<Row Width="Width.Is100">
<Column>
<Small>IP: @context.Item.Address</Small>
</Column>
</Row>
</Column>
<Column ColumnSize="ColumnSize.Is4.Is2.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>
@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") };
}
@@ -3,8 +3,9 @@
@using Elektrifikatsiya.Models;
@inject IVersionProvider VersionProvider
<Row Padding="Padding.Is3">
<Column ColumnSize="ColumnSize.Is6">
<Row Padding="Padding.Is3.OnDesktop.Is0">
<Div Display="Display.Flex.Row.OnDesktop" Margin="Margin.Is3.FromBottom" Width="Width.Is100">
<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
<ListView TItem="Device"
Data="@plugs"
TextField="@((_)=>(""))"
@@ -40,7 +41,7 @@
</ItemTemplate>
</ListView>
</Column>
<Column ColumnSize="ColumnSize.Is6">
<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
<ListView TItem="Event"
Data="@events"
TextField="@((_)=>(""))"
@@ -55,10 +56,11 @@
</ItemTemplate>
</ListView>
</Column>
</Div>
</Row>
<Row Padding="Padding.Is3">
<Column>
<Button Color="Color.Primary" Clicked="@(async () => await HandleRedraw())">Aktualisieren</Button>
<Button Color="Color.Primary" Style="border-radius: 0px" Clicked="@(async () => await HandleRedraw())">Aktualisieren</Button>
<LineChart @ref="lineChart" TItem="double" />
</Column>
</Row>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 119 KiB