From 4da0444cccf6b99b846e324de50e6f0090889b29 Mon Sep 17 00:00:00 2001
From: Friend2868 <90833416+Friend2868@users.noreply.github.com>
Date: Wed, 8 Mar 2023 10:14:43 +0100
Subject: [PATCH 1/2] Dashboard fix

Fix for responsive behaviour
---
 .../Elektrifikatsiya/Pages/Dashboard.razor    | 162 +++++++++---------
 1 file changed, 82 insertions(+), 80 deletions(-)

diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
index fa442fe..3faa8ed 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
@@ -3,88 +3,90 @@
 @using Elektrifikatsiya.Models;
 @inject IVersionProvider VersionProvider
 
-<Row Padding="Padding.Is3">
-	<Div Display="Display.Flex.Row.OnDesktop" Margin="Margin.Is3.FromBottom" Width="Width.Is100">
-		<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
-			<Bar Breakpoint="Breakpoint.Desktop"
-				 Background="Background.White"
-				 ThemeContrast="ThemeContrast.None"
-				 Shadow="Shadow.Remove"
-				 Border="Border.Is1.RoundedTop">
-				<BarBrand>
-					Plugs
-				</BarBrand>
-			</Bar>
-			<ListView TItem="Device"
-					  Data="@plugs"
-					  TextField="@((_)=>(""))"
-					  ValueField="@((_)=>(""))"
-					  Mode="ListGroupMode.Static"
-					  Style="border-radius: 0px 0px">
-				<ItemTemplate>
-					<ListGroupItem Border="Border.OnBottom">
-						<Row>
-							<Column ColumnSize="ColumnSize.Is8">
-								<Row>
-									<Column ColumnSize="ColumnSize.Is7">
-										<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
-									</Column>
-								</Row>
-								<Row>
-									<Column>
-										<Small>User: @context.Item.User</Small>
-										<br />
-										<Small>Room: @context.Item.Room</Small>
-									</Column>
-									<Column ColumnSize="ColumnSize.Is5">
-										<Paragraph Margin="Margin.Is1.OnY">@context.Item.PowerUsage W</Paragraph>
-									</Column>
-								</Row>
-							</Column>
-							<Column ColumnSize="ColumnSize.Is4">
-								<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
-									<BarIcon IconName="IconName.Bolt" />
-								</Button>
-							</Column>
-						</Row>
-					</ListGroupItem>
-				</ItemTemplate>
-			</ListView>
+<Div>
+	<Row Padding="Padding.Is3">
+		<Div Display="Display.Flex.Row.OnDesktop" Margin=" Margin.Is3.FromBottom" Width="Width.Is100">
+			<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
+				<Bar Breakpoint="Breakpoint.Desktop"
+					 Background="Background.White"
+					 ThemeContrast="ThemeContrast.None"
+					 Shadow="Shadow.Remove"
+					 Border="Border.Is1.RoundedTop">
+					<BarBrand>
+						Plugs
+					</BarBrand>
+				</Bar>
+				<ListView TItem="Device"
+						  Data="@plugs"
+						  TextField="@((_)=>(""))"
+						  ValueField="@((_)=>(""))"
+						  Mode="ListGroupMode.Static"
+						  Style="border-radius: 0px 0px">
+					<ItemTemplate >
+						<ListGroupItem>
+							<Row>
+								<Column ColumnSize="ColumnSize.Is8">
+									<Row>
+										<Column ColumnSize="ColumnSize.Is7">
+											<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
+										</Column>
+									</Row>
+									<Row>
+										<Column>
+											<Small>User: @context.Item.User</Small>
+											<br />
+											<Small>Room: @context.Item.Room</Small>
+										</Column>
+										<Column ColumnSize="ColumnSize.Is5">
+											<Paragraph Margin="Margin.Is1.OnY">@context.Item.PowerUsage W</Paragraph>
+										</Column>
+									</Row>
+								</Column>
+								<Column ColumnSize="ColumnSize.Is4">
+									<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
+										<BarIcon IconName="IconName.Bolt" />
+									</Button>
+								</Column>
+							</Row>
+						</ListGroupItem>
+					</ItemTemplate>
+				</ListView>
+			</Column>
+			<Column ColumnSize="ColumnSize.Is6.OnDesktop.Is12">
+				<Bar Breakpoint="Breakpoint.Desktop"
+					 Background="Background.White"
+					 ThemeContrast="ThemeContrast.None"
+					 Shadow="Shadow.Remove"
+					 Border="Border.Is1.Rounded.RoundedTop">
+					<BarBrand>
+						Logs
+					</BarBrand>
+				</Bar>
+				<ListView TItem="Event"
+						  Data="@events"
+						  TextField="@((_)=>(""))"
+						  ValueField="@((_)=>(""))"
+						  Mode="ListGroupMode.Static"
+						  Style="border-radius: 0px 0px">
+					<ItemTemplate>
+						<Div Flex="Flex.InlineFlex.JustifyContent.Between" Width="Width.Is100">
+							<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>
+					</ItemTemplate>
+				</ListView>
+			</Column>
+		</Div>
+	</Row>
+	<Row Padding="Padding.Is3">
+		<Column>
+			<Button Color="Color.Primary" Style="border-radius: 0px" Clicked="@(async () => await HandleRedraw())">Aktualisieren</Button>
+			<LineChart @ref="lineChart" TItem="double" />
 		</Column>
-		<Column ColumnSize="ColumnSize.Is6">
-			<Bar Breakpoint="Breakpoint.Desktop"
-				 Background="Background.White"
-				 ThemeContrast="ThemeContrast.None"
-				 Shadow="Shadow.Remove"
-				 Border="Border.Is1.Rounded.RoundedTop">
-				<BarBrand>
-					Plugs
-				</BarBrand>
-			</Bar>
-			<ListView TItem="Event"
-					  Data="@events"
-					  TextField="@((_)=>(""))"
-					  ValueField="@((_)=>(""))"
-					  Mode="ListGroupMode.Static"
-					  Style="border-radius: 0px 0px">
+	</Row>
+</Div>
 
-				<ItemTemplate>
-					<Div Flex="Flex.InlineFlex.JustifyContent.Between" Width="Width.Is100">
-						<Heading Size="HeadingSize.Is6" Margin="Margin.Is2.FromBottom">@context.Item.EventName</Heading>
-						<Small>@context.Item.Date</Small>
-					</Div>
-					<Paragraph Border="Border.OnBottom" Margin="Margin.Is2.FromBottom">@context.Item.Description</Paragraph>
-				</ItemTemplate>
-			</ListView>
-		</Column>
-	</Div>
-</Row>
-<Row Padding="Padding.Is3">
-	<Column>
-		<Button Color="Color.Primary" Style="border-radius: 0px" Clicked="@(async () => await HandleRedraw())">Aktualisieren</Button>
-		<LineChart @ref="lineChart" TItem="double" />
-	</Column>
-</Row>
 
 @code {
 	//TODO: insert new event here if plug produces one

From ca58a76594e6901ba940f9484dd16dfa81f494b1 Mon Sep 17 00:00:00 2001
From: Aldin296 <99395958+Aldin296@users.noreply.github.com>
Date: Wed, 8 Mar 2023 10:17:08 +0100
Subject: [PATCH 2/2] Settings Page Frontend
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

weiter eingabe felder für die Settings Page hinzugefügt
---
 .../Elektrifikatsiya/Pages/Dashboard.razor    |   2 +-
 .../Elektrifikatsiya/Pages/Settings.razor     |  78 ++++++++++++++++--
 .../Elektrifikatsiya/UserDatabase.sqlite-shm  | Bin 32768 -> 0 bytes
 .../Elektrifikatsiya/UserDatabase.sqlite-wal  |   0
 4 files changed, 74 insertions(+), 6 deletions(-)
 delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm
 delete mode 100644 src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal

diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
index fa442fe..858b2c4 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
@@ -88,7 +88,7 @@
 
 @code {
 	//TODO: insert new event here if plug produces one
-	List<Event> events = new List<Event>() { new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now) };
+	List<Event> events = new List<Event>() { new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now), new Event("Placeholder", "Event", DateTime.Now) };
 	//TODO: insert new Device here if user adds one
 	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") };
 
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
index 415044c..00e3089 100644
--- a/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
+++ b/src/Elektrifikatsiya/Elektrifikatsiya/Pages/Settings.razor
@@ -23,7 +23,7 @@
 			<ItemTemplate>
 				<ListGroupItem Border="Border.OnBottom">
 					<Row>
-						<Column ColumnSize="ColumnSize.Is8">
+						<Column ColumnSize="ColumnSize.Is5">
 							<Row>
 								<Column ColumnSize="ColumnSize.Is7">
 									<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item.Name</Heading>
@@ -35,21 +35,89 @@
 									<br />
 									<Small>Room: @context.Item.Room</Small>
 								</Column>
-								<Column ColumnSize="ColumnSize.Is5">
-									<Paragraph Margin="Margin.Is1.OnY">@context.Item.PowerUsage W</Paragraph>
-								</Column>
 							</Row>
 						</Column>
-						<Column ColumnSize="ColumnSize.Is4">
+						<Column ColumnSize="ColumnSize.Is2">
 							<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
 								<BarIcon IconName="IconName.Bolt" />
 							</Button>
 						</Column>
+						<Column ColumnSize="ColumnSize.Is5">
+							<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
+								<BarIcon IconName="IconName.Pen" />
+							</Button>
+						</Column>
 					</Row>
 				</ListGroupItem>
 			</ItemTemplate>
 		</ListView>
 	</Column>
+	<Column ColumnSize="ColumnSize.Is6">
+		<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>
+
 </Row>
 
 
diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-shm
deleted file mode 100644
index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeIuAr62r3<XeTSayS60=Z=O-0|kP2&fu@!6Du^ziFC^7w55MN)9hQYV3Wk79a2P
z)%8g3H30$y2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
w0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5cq?@4dk5`Qvd(}

diff --git a/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal b/src/Elektrifikatsiya/Elektrifikatsiya/UserDatabase.sqlite-wal
deleted file mode 100644
index e69de29..0000000