Stefan-5422/-T5-Elektrifikatsiya
1
0
Fork 0
mirror of https://github.com/Stefan-5422/-T5-Elektrifikatsiya.git synced 2026-09-10 07:36:02 +02:00
Code Issues 2 Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent cd898430ae fccd511fd3
commit d0aa87d3c9
8 changed files with 102 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor
+3 -3
View File
@@ -18,13 +18,13 @@
</BarLink> </BarLink>
</BarItem> </BarItem>
<BarItem> <BarItem>
<BarLink To="/" TextColor="TextColor.White"> <BarLink To="/admin" TextColor="TextColor.White">
<BarIcon Style="color:white" IconName="IconName.ShieldAlt" /> <BarIcon Style="color:white" IconName="IconName.ShieldAlt" />
Admin Admin
</BarLink> </BarLink>
</BarItem> </BarItem>
<BarItem> <BarItem>
<BarLink To="/" TextColor="TextColor.White"> <BarLink To="/addplug" TextColor="TextColor.White">
<BarIcon Style="color:white" IconName="IconName.Plug" /> <BarIcon Style="color:white" IconName="IconName.Plug" />
Add Plug Add Plug
</BarLink> </BarLink>
@@ -32,7 +32,7 @@
</BarStart> </BarStart>
<BarEnd> <BarEnd>
<BarItem> <BarItem>
<BarLink To="/" TextColor="TextColor.White"> <BarLink To="/settings" TextColor="TextColor.White">
<BarIcon Style="color:white" IconName="IconName.Wrench" /> <BarIcon Style="color:white" IconName="IconName.Wrench" />
Settings Settings
</BarLink> </BarLink>
src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
+1 -1
View File
@@ -10,7 +10,7 @@
</LayoutSiderContent> </LayoutSiderContent>
</LayoutSider> </LayoutSider>
<Layout> <Layout>
<LayoutContent Padding="Padding.Is4.OnX.Is4.FromTop"> <LayoutContent Padding="Padding.Is4.OnDesktop.Is0">
@Body @Body
</LayoutContent> </LayoutContent>
</Layout> </Layout>
src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
+43
View File
@@ -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") };
}
src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
+55 -53
View File
@@ -3,62 +3,64 @@
@using Elektrifikatsiya.Models; @using Elektrifikatsiya.Models;
@inject IVersionProvider VersionProvider @inject IVersionProvider VersionProvider
<Row Padding="Padding.Is3"> <Row Padding="Padding.Is3.OnDesktop.Is0">
<Column ColumnSize="ColumnSize.Is6"> <Div Display="Display.Flex.Row.OnDesktop" Margin="Margin.Is3.FromBottom" Width="Width.Is100">
<ListView TItem="Device" <Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
Data="@plugs" <ListView TItem="Device"
TextField="@((_)=>(""))" Data="@plugs"
ValueField="@((_)=>(""))" TextField="@((_)=>(""))"
Mode="ListGroupMode.Static"> ValueField="@((_)=>(""))"
<ItemTemplate> Mode="ListGroupMode.Static">
<ListGroupItem> <ItemTemplate>
<Row> <ListGroupItem>
<Column ColumnSize="ColumnSize.Is8"> <Row>
<Row> <Column ColumnSize="ColumnSize.Is8">
<Column ColumnSize="ColumnSize.Is7"> <Row>
<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading> <Column ColumnSize="ColumnSize.Is7">
</Column> <Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
</Row> </Column>
<Row> </Row>
<Column> <Row>
<Small>User: @context.Item.User</Small> <Column>
<br /> <Small>User: @context.Item.User</Small>
<Small>Room: @context.Item.Room</Small> <br />
</Column> <Small>Room: @context.Item.Room</Small>
<Column ColumnSize="ColumnSize.Is5"> </Column>
<Paragraph Margin="Margin.Is1.OnY">@context.Item.PowerUsage W</Paragraph> <Column ColumnSize="ColumnSize.Is5">
</Column> <Paragraph Margin="Margin.Is1.OnY">@context.Item.PowerUsage W</Paragraph>
</Row> </Column>
</Column> </Row>
<Column ColumnSize="ColumnSize.Is4"> </Column>
<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline> <Column ColumnSize="ColumnSize.Is4">
<BarIcon IconName="IconName.Bolt" /> <Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
</Button> <BarIcon IconName="IconName.Bolt" />
</Column> </Button>
</Row> </Column>
</ListGroupItem> </Row>
</ItemTemplate> </ListGroupItem>
</ListView> </ItemTemplate>
</Column> </ListView>
<Column ColumnSize="ColumnSize.Is6"> </Column>
<ListView TItem="Event" <Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
Data="@events" <ListView TItem="Event"
TextField="@((_)=>(""))" Data="@events"
ValueField="@((_)=>(""))" TextField="@((_)=>(""))"
Mode="ListGroupMode.Static"> ValueField="@((_)=>(""))"
<ItemTemplate> Mode="ListGroupMode.Static">
<Div Flex="Flex.InlineFlex.JustifyContent.Between" Width="Width.Is100"> <ItemTemplate>
<Heading Size="HeadingSize.Is6" Margin="Margin.Is2.FromBottom">@context.Item.EventName</Heading> <Div Flex="Flex.InlineFlex.JustifyContent.Between" Width="Width.Is100">
<Small>@context.Item.Date</Small> <Heading Size="HeadingSize.Is6" Margin="Margin.Is2.FromBottom">@context.Item.EventName</Heading>
</Div> <Small>@context.Item.Date</Small>
<Paragraph Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph> </Div>
</ItemTemplate> <Paragraph Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph>
</ListView> </ItemTemplate>
</Column> </ListView>
</Column>
</Div>
</Row> </Row>
<Row Padding="Padding.Is3"> <Row Padding="Padding.Is3">
<Column> <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" /> <LineChart @ref="lineChart" TItem="double" />
</Column> </Column>
</Row> </Row>
src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite
BIN
View File
Binary file not shown.
src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm
BIN
View File
Binary file not shown.
src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal
View File
src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 119 KiB