Compare commits

..

2 Commits

Author SHA1 Message Date
Matija Koželj
6725edb1ae Add Connected.Components as project reference instead of nuget reference
Fix imports
Update TaxRates/Components/TaxRateAdd to use Connected components
2023-02-09 12:34:29 +01:00
Matija Koželj
7d4b94bc9b Update Connected.Components dependency 2023-02-09 12:34:10 +01:00
5 changed files with 18 additions and 15 deletions

View File

@ -17,6 +17,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D1988217
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Types.Tests", "tests\Connected.Common.Types.Tests\Connected.Common.Types.Tests.csproj", "{B1C41076-5120-47DA-AEE7-D90E0EB7C038}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{D27CBC04-496C-4112-A2AF-786715AFEDE5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "dependencies\Connected.Components\src\Connected.Components\Connected.Components.csproj", "{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -47,12 +51,17 @@ Global
{B1C41076-5120-47DA-AEE7-D90E0EB7C038}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1C41076-5120-47DA-AEE7-D90E0EB7C038}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1C41076-5120-47DA-AEE7-D90E0EB7C038}.Release|Any CPU.Build.0 = Release|Any CPU
{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B1C41076-5120-47DA-AEE7-D90E0EB7C038} = {D1988217-0AF1-4A13-94AA-FF55337383D0}
{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4C661325-1729-4560-89F9-E2B51B111B72}

@ -1 +1 @@
Subproject commit 323c66fecd302e569171172b82ab52f8530bf472
Subproject commit 38d5bd01499f182bf5612a032d61c6de16619eb6

View File

@ -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'))" />

View File

@ -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>
</div>

View File

@ -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