Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ProjectTracker to target CSLA 9.0.0 #3894

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Update ProjectTracker to target CSLA 9.0.0 #3894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd2f08f
Update to target CSLA 8.1.0
rockfordlhotka Apr 30, 2024
bca1041
Merge branch 'main' into ptracker
rockfordlhotka Apr 30, 2024
6bcff41
Add busy animation during static-render
rockfordlhotka May 1, 2024
5bb2aff
Merge branch 'ptracker' of https://github.com/rockfordlhotka/csla int…
rockfordlhotka May 1, 2024
812214c
Merge branch 'main' into ptracker
rockfordlhotka May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Samples/ProjectTracker/ProjectTracker.AppServer/ProjectTracker.AppServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Csla.AspNetCore" Version="8.0.0-R24032502" />
<PackageReference Include="Csla.AspNetCore" Version="8.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
15 changes: 9 additions & 6 deletions ...ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/Pages/EditProject.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
@if (!IsInteractive)
{
<h1>Edit Project</h1>
<p>Loading app...</p>
<p class="animated-box"></p>
<p class="animated-box"></p>
<p class="animated-box"></p>
<p class="animated-box"></p>
}
else if (vm.Model == null)
{
Expand Down Expand Up @@ -173,13 +176,13 @@ else
// Every page _must_ initialize the state manager
await StateManager.InitializeAsync();

vm.Saved += () => NavigationManager.NavigateTo("projects");
vm.ModelPropertyChanged += async (s, e) => await InvokeAsync(() => StateHasChanged());

var renderMode = renderModeProvider.GetRenderMode(this);
if (renderMode == RenderModes.WasmInteractive || renderMode == RenderModes.ServerInteractive)
IsInteractive = renderMode == RenderModes.WasmInteractive || renderMode == RenderModes.ServerInteractive;
if (IsInteractive)
{
IsInteractive = true;
vm.Saved += () => NavigationManager.NavigateTo("projects");
vm.ModelPropertyChanged += async (s, e) => await InvokeAsync(() => StateHasChanged());

if (Id.HasValue)
await vm.RefreshAsync(() => projectEditPortal.FetchAsync(Id));
else
Expand Down
6 changes: 3 additions & 3 deletions ...er/ProjectTracker.Blazor/ProjectTracker.Blazor.Client/ProjectTracker.Blazor.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

<ItemGroup>
<ProjectReference Include="..\..\ProjectTracker.BusinessLibrary\ProjectTracker.BusinessLibrary.csproj" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.2" />
<PackageReference Include="Csla.Blazor" Version="8.0.0-R24032502" />
<PackageReference Include="Csla.Blazor.WebAssembly" Version="8.0.0-R24032502" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.4" />
<PackageReference Include="Csla.Blazor" Version="8.1.0" />
<PackageReference Include="Csla.Blazor.WebAssembly" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
Expand Down
2 changes: 0 additions & 2 deletions ...es/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/Components/Pages/Home.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

@code
{
private bool IsStateReady;

protected override async Task OnInitializedAsync()
{
// Every page _must_ initialize the state manager
Expand Down
7 changes: 4 additions & 3 deletions ...s/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/ProjectTracker.Blazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
<ProjectReference Include="..\..\ProjectTracker.DalMock\ProjectTracker.DalMock.csproj" />
<ProjectReference Include="..\..\ProjectTracker.Dal\ProjectTracker.Dal.csproj" />
<ProjectReference Include="..\ProjectTracker.Blazor.Client\ProjectTracker.Blazor.Client.csproj" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.2" />
<PackageReference Include="Csla.AspNetCore" Version="8.0.0-R24032502" />
<PackageReference Include="Csla.Blazor" Version="8.0.0-R24032502" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.4" />
<PackageReference Include="Csla.AspNetCore" Version="8.1.0" />
<PackageReference Include="Csla.Blazor" Version="8.1.0" />
</ItemGroup>

<ItemGroup>
<Folder Include="Identity\" />
<Folder Include="wwwroot\images\" />
</ItemGroup>

</Project>
18 changes: 18 additions & 0 deletions Samples/ProjectTracker/ProjectTracker.Blazor/ProjectTracker.Blazor/wwwroot/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,21 @@ h1:focus {
.darker-border-checkbox.form-check-input {
border-color: #929292;
}

.animated-box {
width: 200px;
height: 20px;
background: linear-gradient(to right, lightgrey 50%, darkgrey 50%);
background-size: 200% 50%;
animation: gradient 2s infinite linear;
}

@keyframes gradient {
0% {
background-position: 100% 0;
}

100% {
background-position: 0 0;
}
}
4 changes: 2 additions & 2 deletions Samples/ProjectTracker/ProjectTracker.BusinessLibrary/ProjectTracker.BusinessLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Csla" Version="8.0.0-R24032502" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Csla" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Samples/ProjectTracker/ProjectTracker.Dal/ProjectTracker.Dal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Csla" Version="8.0.0-R24032502" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Csla" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions Samples/ProjectTracker/ProjectTracker.DalEfCore/ProjectTracker.DalEfCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Samples/ProjectTracker/ProjectTracker.DalMock/ProjectTracker.DalMock.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Csla" Version="8.0.0-R24032502" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Csla" Version="8.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down