mirror of
https://github.com/Stefan-5422/-T5-Elektrifikatsiya.git
synced 2026-09-10 07:36:02 +02:00
Merge branch 'feature-Dashboard' of https://github.com/Stefan-5422/-T5-Elektrifikatsiya into feature-Dashboard
This commit is contained in:
Aldin296
@@ -23,18 +23,18 @@
|
|||||||
Admin
|
Admin
|
||||||
</BarLink>
|
</BarLink>
|
||||||
</BarItem>
|
</BarItem>
|
||||||
<BarItem>
|
|
||||||
<BarLink To="/addplug" TextColor="TextColor.White">
|
|
||||||
<BarIcon Style="color:white" IconName="IconName.Plug" />
|
|
||||||
Add Plug
|
|
||||||
</BarLink>
|
|
||||||
</BarItem>
|
|
||||||
<BarItem>
|
<BarItem>
|
||||||
<BarLink To="/settings" 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>
|
||||||
</BarItem>
|
</BarItem>
|
||||||
|
<BarItem>
|
||||||
|
<BarLink To="/addplug" TextColor="TextColor.White">
|
||||||
|
<BarIcon Style="color:white" IconName="IconName.Plug" />
|
||||||
|
Add Plug
|
||||||
|
</BarLink>
|
||||||
|
</BarItem>
|
||||||
</BarStart>
|
</BarStart>
|
||||||
<BarEnd>
|
<BarEnd>
|
||||||
<BarItem>
|
<BarItem>
|
||||||
|
|||||||
@@ -2,17 +2,16 @@
|
|||||||
@inherits LayoutComponentBase
|
@inherits LayoutComponentBase
|
||||||
<Image Source="logo.png" Width="Width.Is50" Height="Height.Is50"> </Image>
|
<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">
|
<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 Placeholder="Username" />
|
<Field Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
|
||||||
</Field>
|
<TextEdit Placeholder="Username" />
|
||||||
<Field Width="Width.Is25" Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
|
</Field>
|
||||||
<TextEdit Role="TextRole.Password" Placeholder="Password" />
|
<Field Position="Position.Relative.Top.Is50.Start.Is50.Translate.Middle">
|
||||||
</Field>
|
<TextEdit Role="TextRole.Password" Placeholder="Password" />
|
||||||
<Button Width="Width.Is25" Color="Color.Primary" Clicked="Clicked" Position="Position.Relative.Bottom.Is50.Start.Is50.Translate.MiddleX" >Login</Button>
|
</Field>
|
||||||
|
<Button Color="Color.Primary" Position="Position.Relative.Bottom.Is50.Start.Is50.Translate.MiddleX">Login</Button>
|
||||||
|
</Column>
|
||||||
</Card>
|
</Card>
|
||||||
@code {
|
@code {
|
||||||
private void Clicked()
|
|
||||||
{
|
|
||||||
Debug.WriteLine("Button was clicked!");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -9,88 +9,88 @@
|
|||||||
@inject IDeviceManagmentService DeviceManagmentService
|
@inject IDeviceManagmentService DeviceManagmentService
|
||||||
@inject IAuthenticationService AuthenticationService
|
@inject IAuthenticationService AuthenticationService
|
||||||
|
|
||||||
<Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is5.FromStart.OnMobile">
|
<Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is5.FromStart.OnMobile">
|
||||||
<Row Style="height:90%; width:100%">
|
<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>
|
|
||||||
<Column ColumnSize="ColumnSize.Is9">
|
|
||||||
Add a plug via wifi
|
|
||||||
</Column>
|
|
||||||
<Column ColumnSize="ColumnSize.Is3.Is1.WithOffset">
|
|
||||||
<LoadingIndicator @bind-Visible="@visible">
|
|
||||||
</LoadingIndicator>
|
|
||||||
</Column>
|
|
||||||
</BarBrand>
|
|
||||||
</Bar>
|
|
||||||
<ListView Class="w-100"
|
|
||||||
TItem="IPAddress"
|
|
||||||
Data="@ipAddresses"
|
|
||||||
TextField="@((_)=>(""))"
|
|
||||||
ValueField="@((_)=>(""))"
|
|
||||||
Mode="ListGroupMode.Static"
|
|
||||||
Style="border-radius: 0px 0px">
|
|
||||||
<ItemTemplate>
|
|
||||||
<ListGroupItem>
|
|
||||||
<Row>
|
|
||||||
<Column ColumnSize="ColumnSize.Is6">
|
|
||||||
<Row>
|
|
||||||
</Row>
|
|
||||||
<Row Width="Width.Is100">
|
|
||||||
<Column>
|
|
||||||
<Small>IP: @context.Item</Small>
|
|
||||||
</Column>
|
|
||||||
</Row>
|
|
||||||
</Column>
|
|
||||||
<Column ColumnSize="ColumnSize.Is4.Is2.WithOffset">
|
|
||||||
<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>
|
|
||||||
</Row>
|
|
||||||
</ListGroupItem>
|
|
||||||
</ItemTemplate>
|
|
||||||
</ListView>
|
|
||||||
</Column>
|
|
||||||
</Row>
|
|
||||||
</Row>
|
|
||||||
<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.Is1"></Column>
|
||||||
<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is12">
|
<Column ColumnSize="ColumnSize.Is4.OnDesktop.Is12">
|
||||||
<Row Style="height:15%; width:100%"></Row>
|
<Bar Breakpoint="Breakpoint.Desktop"
|
||||||
<Row Style="height:10%; width:100%">
|
Background="Background.White"
|
||||||
<Bar Breakpoint="Breakpoint.Desktop"
|
ThemeContrast="ThemeContrast.None"
|
||||||
Background="Background.White"
|
Shadow="Shadow.Remove"
|
||||||
ThemeContrast="ThemeContrast.None"
|
Border="Border.Is1.RoundedTop">
|
||||||
Shadow="Shadow.Remove"
|
<BarBrand>
|
||||||
Border="Border.Is1.RoundedTop"
|
<Column ColumnSize="ColumnSize.Is9">
|
||||||
Style="width:100%">
|
Add a plug via wifi
|
||||||
<BarBrand>
|
</Column>
|
||||||
Add a plug via IP
|
<Column ColumnSize="ColumnSize.Is3.Is6.WithOffset">
|
||||||
</BarBrand>
|
<LoadingIndicator @bind-Visible="@visible">
|
||||||
</Bar>
|
</LoadingIndicator>
|
||||||
<ListGroup Style="width:100%; border-radius: 0px 0px">
|
</Column>
|
||||||
<ListGroupItem Color="Color.Default">
|
</BarBrand>
|
||||||
<Form>
|
</Bar>
|
||||||
<Field Horizontal>
|
<ListView Class="w-100"
|
||||||
<FieldBody ColumnSize="ColumnSize.Is12">
|
TItem="IPAddress"
|
||||||
<TextEdit Placeholder="Enter the Device IP here" />
|
Data="@ipAddresses"
|
||||||
<br>
|
TextField="@((_)=>(""))"
|
||||||
<Button style="background-color:#1a237e; color:white" Type="ButtonType.Submit" PreventDefaultOnSubmit>CONNECT</Button>
|
ValueField="@((_)=>(""))"
|
||||||
</FieldBody>
|
Mode="ListGroupMode.Static"
|
||||||
</Field>
|
Style="border-radius: 0px 0px">
|
||||||
</Form>
|
<ItemTemplate>
|
||||||
</ListGroupItem>
|
<ListGroupItem>
|
||||||
</ListGroup>
|
<Row>
|
||||||
</Row>
|
<Column ColumnSize="ColumnSize.Is8">
|
||||||
<Row Style="height:75%; width:100%"></Row>
|
<Row>
|
||||||
|
</Row>
|
||||||
|
<Row Width="Width.Is100">
|
||||||
|
<Column>
|
||||||
|
<Small>IP: @context.Item</Small>
|
||||||
|
</Column>
|
||||||
|
</Row>
|
||||||
|
</Column>
|
||||||
|
<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>
|
||||||
|
</Column>
|
||||||
|
</Row>
|
||||||
|
</ListGroupItem>
|
||||||
|
</ItemTemplate>
|
||||||
|
</ListView>
|
||||||
</Column>
|
</Column>
|
||||||
</Row>
|
</Row>
|
||||||
|
</Row>
|
||||||
|
<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>
|
||||||
|
<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>
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
List<IPAddress> ipAddresses = new List<IPAddress>();
|
List<IPAddress> ipAddresses = new List<IPAddress>();
|
||||||
@@ -106,7 +106,7 @@
|
|||||||
System.Timers.Timer aTimer = new System.Timers.Timer(1000);
|
System.Timers.Timer aTimer = new System.Timers.Timer(1000);
|
||||||
aTimer.Elapsed += (_, _) => {
|
aTimer.Elapsed += (_, _) => {
|
||||||
DateTime dateTime = DateTime.UtcNow;
|
DateTime dateTime = DateTime.UtcNow;
|
||||||
if(dateTime >= time.AddSeconds(5))
|
if(dateTime >= time.AddSeconds(3))
|
||||||
{
|
{
|
||||||
visible = false;
|
visible = false;
|
||||||
InvokeAsync(StateHasChanged);
|
InvokeAsync(StateHasChanged);
|
||||||
|
|||||||
@@ -2,143 +2,60 @@
|
|||||||
@using Blazorise.Components;
|
@using Blazorise.Components;
|
||||||
@using Elektrifikatsiya.Models;
|
@using Elektrifikatsiya.Models;
|
||||||
@using System.Net
|
@using System.Net
|
||||||
<Div>
|
<Row Style="width: 100%; height: 100%">
|
||||||
<Row Style="width: 100%; height: 100%">
|
<Column ColumnSize="ColumnSize.Is4">
|
||||||
<Div Display="Display.Flex.Row.OnDesktop" Margin=" Margin.Is3.FromBottom" Width="Width.Is100">
|
<Bar Breakpoint="Breakpoint.Desktop"
|
||||||
<Column ColumnSize="ColumnSize.Is5.OnDesktop.Is12.OnMobile">
|
Background="Background.White"
|
||||||
<Bar Breakpoint="Breakpoint.Desktop"
|
ThemeContrast="ThemeContrast.None"
|
||||||
Background="Background.White"
|
Shadow="Shadow.Remove"
|
||||||
ThemeContrast="ThemeContrast.None"
|
Border="Border.Is1.RoundedTop">
|
||||||
Shadow="Shadow.Remove"
|
<BarBrand>
|
||||||
Border="Border.Is1.RoundedTop">
|
Plugs
|
||||||
<BarBrand>
|
</BarBrand>
|
||||||
Plugs
|
</Bar>
|
||||||
</BarBrand>
|
<ListView TItem="Device"
|
||||||
</Bar>
|
Data="@plugs"
|
||||||
<ListView TItem="Device"
|
TextField="@(()=>(""))"
|
||||||
Data="@plugs"
|
ValueField="@(()=>(""))"
|
||||||
TextField="@((_)=>(""))"
|
Style="border-radius: 0px 0px"
|
||||||
ValueField="@((_)=>(""))"
|
Height="100%"
|
||||||
Style="border-radius: 0px 0px"
|
MaxHeight="90%">
|
||||||
Height="100%"
|
<ItemTemplate>
|
||||||
MaxHeight="90%">
|
<ListGroupItem Border="Border.OnBottom">
|
||||||
<ItemTemplate>
|
<Row>
|
||||||
<ListGroupItem Border="Border.OnBottom">
|
<Column ColumnSize="ColumnSize.Is8">
|
||||||
<Row>
|
<Row>
|
||||||
|
<Column ColumnSize="ColumnSize.Is7">
|
||||||
<Column ColumnSize="ColumnSize.Is6">
|
<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
|
||||||
<Row>
|
</Column>
|
||||||
<Column ColumnSize="ColumnSize.Is7">
|
</Row>
|
||||||
<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
|
<Row>
|
||||||
</Column>
|
<Column>
|
||||||
</Row>
|
<Small>User: @context.Item.User</Small>
|
||||||
<Row>
|
<br />
|
||||||
<Column>
|
<Small>Room: @context.Item.Room</Small>
|
||||||
<Small>User: @context.Item.User</Small>
|
</Column>
|
||||||
<br />
|
<Column ColumnSize="ColumnSize.Is5">
|
||||||
<Small>Room: @context.Item.Room</Small>
|
<Paragraph Margin="Margin.Is1.OnY">@context.Item.PowerUsage W</Paragraph>
|
||||||
</Column>
|
</Column>
|
||||||
</Row>
|
</Row>
|
||||||
</Column>
|
</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>
|
||||||
<Button class="btn1" Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
|
<BarIcon IconName="IconName.Bolt" />
|
||||||
<style>
|
</Button>
|
||||||
.btn1:hover {
|
</Column>
|
||||||
background: #E50000;
|
</Row>
|
||||||
}
|
</ListGroupItem>
|
||||||
</style>
|
</ItemTemplate>
|
||||||
<BarIcon IconName="IconName.Delete" />
|
</ListView>
|
||||||
</Button>
|
</Column>
|
||||||
</Column>
|
</Row>
|
||||||
<br />
|
|
||||||
<br />
|
|
||||||
<Row>
|
|
||||||
<Column ColumnSize="ColumnSize.Is1.OnDesktop">
|
|
||||||
<Button 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>
|
|
||||||
<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12.OnMobile" Margin="Margin.Is3.OnMobile">
|
|
||||||
<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>
|
|
||||||
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.
|
|
||||||
</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>
|
|
||||||
<Column ColumnSize="ColumnSize.IsFull" TextAlignment="TextAlignment.End">
|
|
||||||
<Button Color="Color.Primary">Save</Button>
|
|
||||||
</Column>
|
|
||||||
</Column>
|
|
||||||
</Div>
|
|
||||||
</Row>
|
|
||||||
</Div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@code {
|
@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"), };
|
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"), };
|
||||||
}
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user