From 6725edb1aef6500346ac24e2af2f3ab4e540f4a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= <matija.kozelj@tompit.net>
Date: Thu, 9 Feb 2023 12:34:29 +0100
Subject: [PATCH] Add Connected.Components as project reference instead of
 nuget reference Fix imports Update TaxRates/Components/TaxRateAdd to use
 Connected components

---
 .../Connected.Common.Types.UI.csproj              |  6 ++++--
 .../TaxRates/Components/TaxRateAdd.razor          | 15 ++++-----------
 src/Connected.Common.Types.UI/_Imports.razor      |  1 -
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj b/src/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
index 604ebf7..07eba40 100644
--- a/src/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
+++ b/src/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
@@ -26,7 +26,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Remove="C:\Users\koma.TOMPIT\.nuget\packages\connected.components\1.0.2-prerelease.gd7fe9a8908\contentFiles\any\net7.0\version.json" />
 	  <Content Remove="version.json" />
 	</ItemGroup>
 
@@ -37,7 +36,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.*-*" />
-		<PackageReference Include="Connected.Components" Version="1.0.*-*" />
 		<PackageReference Include="Connected.Client" Version="1.0.*-*" />
 		<PackageReference Include="Connected.UI" Version="1.0.*-*" />
 		<PackageReference Include="Connected" Version="1.0.*-*" />
@@ -57,6 +55,10 @@
 		<None Include="version.json" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <ProjectReference Include="..\..\dependencies\Connected.Components\src\Connected.Components\Connected.Components.csproj" />
+	</ItemGroup>
+
 	<Target Name="CopyPackages" AfterTargets="Pack">
 		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
 		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
diff --git a/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
index 5da15f3..2b57ccc 100644
--- a/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
+++ b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
@@ -2,23 +2,16 @@
 
 @inherits UIComposition
 
-<h3 class="important">TaxRateAdd</h3>
-
-<EditForm Model="@DataSource" OnValidSubmit="@OnInsert">
-	<DataAnnotationsValidator />
-	<ValidationSummary />
-
+<div>
 	<div>
-		<label for="name">Name</label>
 		<InputText id="name" @bind-Value="DataSource.Name" />
 	</div>
 	
 	<div>
-		<label for="rate">Rate</label>
 		<InputNumber id="rate" @bind-Value="DataSource.Rate" />
 	</div>
 
-	<button type="submit">Submit</button>
-	<button @onclick="OnCancel">Cancel</button>
+	<Button @onclick="OnInsert">Submit</Button>
+	<Button @onclick="OnCancel">Cancel</Button>
 
-</EditForm>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/Connected.Common.Types.UI/_Imports.razor b/src/Connected.Common.Types.UI/_Imports.razor
index b4ebe05..5bca5d9 100644
--- a/src/Connected.Common.Types.UI/_Imports.razor
+++ b/src/Connected.Common.Types.UI/_Imports.razor
@@ -1,6 +1,5 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Authorization
-@using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
\ No newline at end of file