@context.Item.EventName
@@ -55,5 +57,6 @@
@code {
List
events = new List() { new Event("Jude", "Alles kaputt", DateTime.Now), new Event("Jude", "Alles kaputt", DateTime.Now), new Event("Jude", "Alles kaputt", DateTime.Now) };
+ List plugs = new List() { 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") };
}
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json b/src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json
index 7111a52..71c02c5 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json
@@ -19,7 +19,7 @@
"Docker": {
"commandName": "Docker",
"launchBrowser": true,
- "launchUrl": "{Scheme}://{IPAdress}:{ServicePort}",
+ "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
"publishAllPorts": true,
"useSSL": true,
"DockerfileRunArguments": "-p 80:80 -p 443:443"
From 53cddb8ef9157d172e681cdcd0433c282279d10d Mon Sep 17 00:00:00 2001
From: Friend2868 <90833416+Friend2868@users.noreply.github.com>
Date: Wed, 8 Feb 2023 10:13:38 +0100
Subject: [PATCH 6/7] =?UTF-8?q?Yeet=20=F0=9F=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
🐱🐉🎉🙌🤞
---
.../Elektrifikatsiya/App.razor | 103 ++++++-----
.../Components/Layout/SideMenu.razor | 21 +--
.../Components/Layout/TopMenu.razor | 160 ------------------
.../Elektrifikatsiya/Elektrifikatsiya.csproj | 9 +-
.../Elektrifikatsiya/Layouts/MainLayout.razor | 77 ++-------
.../Elektrifikatsiya/Pages/Dashboard.razor | 64 ++++++-
.../Elektrifikatsiya/Pages/_Host.cshtml | 1 +
.../Elektrifikatsiya/Pages/_Layout.cshtml | 1 +
.../Elektrifikatsiya/_Imports.razor | 1 +
.../Elektrifikatsiya/wwwroot/brand-logo.png | Bin 13904 -> 0 bytes
.../Elektrifikatsiya/wwwroot/logo.png | Bin 0 -> 270080 bytes
11 files changed, 153 insertions(+), 284 deletions(-)
delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/TopMenu.razor
delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/brand-logo.png
create mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/wwwroot/logo.png
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/App.razor b/src/Elektrifikatsiya/Elektrifikatsiya/App.razor
index 9c0ed48..cf7da0a 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/App.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/App.razor
@@ -1,48 +1,63 @@
-
-
-
-
-
- Sorry, there's nothing at this address.
-
-
-
-
-
+
+
+
+
+
+ Sorry, there's nothing at this address.
+
+
+
+
+
@code {
- private Theme theme = new()
- {
- BarOptions = new()
- {
- HorizontalHeight = "72px"
- },
- ColorOptions = new()
- {
- Primary = "#0288D1",
- Secondary = "#A65529",
- Success = "#23C02E",
- Info = "#9BD8FE",
- Warning = "#F8B86C",
- Danger = "#F95741",
- Light = "#F0F0F0",
- Dark = "#535353",
- },
- BackgroundOptions = new()
- {
- Primary = "#0288D1",
- Secondary = "#A65529",
- Success = "#23C02E",
- Info = "#9BD8FE",
- Warning = "#F8B86C",
- Danger = "#F95741",
- Light = "#F0F0F0",
- Dark = "#535353",
- },
- InputOptions = new()
- {
- CheckColor = "#0288D1",
- }
- };
+ private Theme theme = new()
+ {
+ BarOptions = new()
+ {
+ HorizontalHeight = "72px",
+ DarkColors = new()
+ {
+ ItemColorOptions = new()
+ {
+ ActiveBackgroundColor = "#1a237e",
+ ActiveColor = "#1a237e",
+ HoverColor = "#1a237e",
+ }
+
+ }
+ },
+ ColorOptions = new()
+ {
+ Primary = "#1a237e",
+ Secondary = "#A65529",
+ Success = "#23C02E",
+ Info = "#9BD8FE",
+ Warning = "#F8B86C",
+ Danger = "#F95741",
+ Light = "#F0F0F0",
+ Dark = "#535353",
+ },
+ BackgroundOptions = new()
+ {
+ Primary = "#1a237e",
+ Secondary = "#A65529",
+ Success = "#23C02E",
+ Info = "#9BD8FE",
+ Warning = "#F8B86C",
+ Danger = "#F95741",
+ Light = "#F0F0F0",
+ Dark = "#535353",
+ },
+ InputOptions = new()
+ {
+ CheckColor = "#1a237e",
+ },
+ TextColorOptions = new()
+ {
+ Dark = "#000000",
+ Primary = "#1a237e"
+ }
+ };
}
\ No newline at end of file
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor
index ae54355..3691e03 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/SideMenu.razor
@@ -1,6 +1,6 @@
-
+
@@ -12,28 +12,28 @@
-
-
+
+
Dashboard
-
-
+
+
Admin
-
-
+
+
Add Plug
-
-
+
+
Settings
@@ -43,5 +43,6 @@
@code {
private bool pagesBarVisible = true;
- RenderFragment customIcon =@
;
+ //TODO: replace logo png with transparent background one
+ RenderFragment customIcon =@
;
}
\ No newline at end of file
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/TopMenu.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/TopMenu.razor
deleted file mode 100644
index 4422d54..0000000
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Components/Layout/TopMenu.razor
+++ /dev/null
@@ -1,160 +0,0 @@
-@using Blazorise.Localization
-
-
-
-
-
-
- Elektrifikatsiya
-
-
-
-
-
-
-
- Documentation
-
-
-
- More
-
-
- Quick-Start Guide
-
-
-
- Usage
-
-
-
-
-
-
- Layout
-
-
- @if ( LayoutType == "fixed-header" )
- {
-
- }
- Fixed Header
-
-
- @if ( LayoutType == "fixed-header-footer-only" )
- {
-
- }
- Fixed Header and Footer only
-
-
- @if ( LayoutType == "sider-with-header-on-top" )
- {
-
- }
- Sider with Header on top
-
-
-
-
-
-
-
-
-
-
-
-
- @foreach ( var cultureInfo in LocalizationService.AvailableCultures )
- {
-
- @if ( cultureInfo.IsNeutralCulture )
- {
- @cultureInfo.EnglishName
- }
- else
- {
- @cultureInfo.Parent.EnglishName
- }
-
- }
-
-
-
-
-
- Theme
-
-
-
-
- Theme enabled
-
-
-
-
-
-
- Gradient colors
-
-
- Rounded elements
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- GitHub
-
-
-
-
-@code {
- protected override async Task OnInitializedAsync()
- {
- await SelectCulture( "en-US" );
-
- await base.OnInitializedAsync();
- }
-
- Task SelectCulture( string name )
- {
- LocalizationService.ChangeLanguage( name );
-
- return Task.CompletedTask;
- }
-
- private bool topbarVisible = false;
-
- Task OnLayoutTypeChecked( string layoutType )
- {
- LayoutType = layoutType;
-
- return LayoutTypeChanged.InvokeAsync( layoutType );
- }
-
- [Parameter] public EventCallback ThemeEnabledChanged { get; set; }
-
- [Parameter] public EventCallback ThemeGradientChanged { get; set; }
-
- [Parameter] public EventCallback ThemeRoundedChanged { get; set; }
-
- [Parameter] public EventCallback ThemeColorChanged { get; set; }
-
- [Parameter] public string LayoutType { get; set; }
-
- [Parameter] public EventCallback LayoutTypeChanged { get; set; }
-
- [Inject] protected ITextLocalizerService LocalizationService { get; set; }
-
- [CascadingParameter] protected Theme Theme { get; set; }
-}
\ No newline at end of file
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj b/src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj
index 358f14e..d7b4d83 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Elektrifikatsiya.csproj
@@ -18,10 +18,11 @@
-
-
-
-
+
+
+
+
+
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
index 7d66732..362810d 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Layouts/MainLayout.razor
@@ -2,67 +2,16 @@
@inherits LayoutComponentBase
-@if ( layoutType == "fixed-header" )
-{
-
-
-
-
-
-
-
-
-
-
-
- @Body
-
-
-
-}
-else if ( layoutType == "fixed-header-footer-only" )
-{
-
-
-
-
-
- @Body
-
-
-
-
-
-}
-else if ( layoutType == "sider-with-header-on-top" )
-{
-
-
-
-
-
-
-
-
-
-
-
-
- @Body
-
-
-
-
-}
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+ @Body
+
+
+
\ No newline at end of file
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
index c8f9a64..3cd8102 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
@@ -2,7 +2,8 @@
@using Blazorise.Components;
@using Elektrifikatsiya.Models;
@inject IVersionProvider VersionProvider
-
+
+
+
+
+
+
+
+
+
@code {
- List events = new List() { new Event("Jude", "Alles kaputt", DateTime.Now), new Event("Jude", "Alles kaputt", DateTime.Now), new Event("Jude", "Alles kaputt", DateTime.Now) };
+ //TODO: insert new event here if plug produces one
+ List events = new List() { new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now) };
+ //TODO: insert new Device here if user adds one
List plugs = new List() { 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") };
+
+ //code for graph
+ LineChart lineChart;
+
+ protected override async Task OnAfterRenderAsync(bool firstRender)
+ {
+ if (firstRender)
+ {
+ await HandleRedraw();
+ }
+ }
+
+ async Task HandleRedraw()
+ {
+ await lineChart.Clear();
+
+ await lineChart.AddLabelsDatasetsAndUpdate(Labels, GetLineChartDataset());
+ }
+
+ //TODO: insert dataset of current and last voltage usages
+ LineChartDataset GetLineChartDataset()
+ {
+ return new LineChartDataset
+ {
+ Label = "# of random number in thousands",
+ Data = RandomizeData(),
+ BackgroundColor = backgroundColors,
+ BorderColor = borderColors,
+ Fill = true,
+ PointRadius = 3,
+ CubicInterpolationMode = "monotone",
+ };
+ }
+
+ string[] Labels = { "Red", "Blue", "Yellow", "Green", "Purple", "Orange" };
+ List backgroundColors = new List { ChartColor.FromRgba(255, 99, 132, 0.2f), ChartColor.FromRgba(54, 162, 235, 0.2f), ChartColor.FromRgba(255, 206, 86, 0.2f), ChartColor.FromRgba(75, 192, 192, 0.2f), ChartColor.FromRgba(153, 102, 255, 0.2f), ChartColor.FromRgba(255, 159, 64, 0.2f) };
+ List borderColors = new List { ChartColor.FromRgba(255, 99, 132, 1f), ChartColor.FromRgba(54, 162, 235, 1f), ChartColor.FromRgba(255, 206, 86, 1f), ChartColor.FromRgba(75, 192, 192, 1f), ChartColor.FromRgba(153, 102, 255, 1f), ChartColor.FromRgba(255, 159, 64, 1f) };
+
+ List RandomizeData()
+ {
+ var r = new Random(DateTime.Now.Millisecond);
+
+ return new List {
+ r.Next( 3, 50 ) * r.NextDouble(),
+ r.Next( 3, 50 ) * r.NextDouble(),
+ r.Next( 3, 50 ) * r.NextDouble(),
+ r.Next( 3, 50 ) * r.NextDouble(),
+ r.Next( 3, 50 ) * r.NextDouble(),
+ r.Next( 3, 50 ) * r.NextDouble() };
+ }
}
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Host.cshtml b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Host.cshtml
index 3e71a2d..2619d65 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Host.cshtml
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Host.cshtml
@@ -6,3 +6,4 @@
}
+
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Layout.cshtml b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Layout.cshtml
index a689909..3cc3b8d 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Layout.cshtml
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/_Layout.cshtml
@@ -40,5 +40,6 @@
+