Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/CD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.0.x
- name: Install WASM tools
run: dotnet workload install wasm-tools

- name: Publish Deployment artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: Deployment
path: ./CrohnsDiary.Deploy
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Publish App
run: dotnet publish ./CrohnsDiary.App/CrohnsDiary.App.csproj --no-build -o ./CrohnsDiary.App/publish
- name: Publish App artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: App
path: ./CrohnsDiary.App/publish
Expand All @@ -81,10 +81,10 @@ jobs:
environment: development
steps:
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.0.x
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: Deployment
path: ./deploy
Expand All @@ -94,7 +94,7 @@ jobs:
run: dotnet build ./deploy/CrohnsDiary.Deploy.csproj -c Release --no-restore

- name: Download App
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: App
path: ./app
Expand All @@ -120,12 +120,12 @@ jobs:
PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}

- name: Azure login
uses: azure/login@v2
uses: azure/login@v3
with:
creds: '{ "clientSecret": "${{ secrets.AZURE_CLIENT_SECRET }}", "subscriptionId": "${{ secrets.AZURE_SUBSCRIPTION_ID }}", "tenantId": "${{ secrets.AZURE_TENANT_ID }}", "clientId": "${{ secrets.AZURE_CLIENT_ID }}" }'

- name: Purge CDN cache
uses: azure/cli@v2
uses: azure/cli@v3
with:
azcliversion: latest
inlineScript: |
Expand All @@ -145,10 +145,10 @@ jobs:
environment: production
steps:
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.0.x
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: Deployment
path: ./deploy
Expand All @@ -158,7 +158,7 @@ jobs:
run: dotnet build ./deploy/CrohnsDiary.Deploy.csproj -c Release --no-restore

- name: Download App
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: App
path: ./app
Expand All @@ -184,12 +184,12 @@ jobs:
PULUMI_CONFIG_PASSPHRASE: ${{ secrets.PULUMI_CONFIG_PASSPHRASE }}

- name: Azure login
uses: azure/login@v2
uses: azure/login@v3
with:
creds: '{ "clientSecret": "${{ secrets.AZURE_CLIENT_SECRET }}", "subscriptionId": "${{ secrets.AZURE_SUBSCRIPTION_ID }}", "tenantId": "${{ secrets.AZURE_TENANT_ID }}", "clientId": "${{ secrets.AZURE_CLIENT_ID }}" }'

- name: Purge CDN cache
uses: azure/cli@v2
uses: azure/cli@v3
with:
azcliversion: latest
inlineScript: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Setup .NET
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.0.x
- name: Restore dependencies
Expand Down
10 changes: 5 additions & 5 deletions CrohnsDiary.App/CrohnsDiary.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BlazorDexie" Version="2.1.0" />
<PackageReference Include="BlazorDexie" Version="2.1.1" />
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.23" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.23" PrivateAssets="all" />
<PackageReference Include="MudBlazor" Version="8.15.0" />
<PackageReference Include="MudBlazor.Markdown" Version="8.11.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.5" PrivateAssets="all" />
<PackageReference Include="MudBlazor" Version="9.3.0" />
<PackageReference Include="MudBlazor.Markdown" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions CrohnsDiary.App/Pages/Reports.razor
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</div>
<div class="row">
<div class="col-12">
<MudChart ChartType="ChartType.Line" ChartSeries="Series" XAxisLabels="DayLabels" ChartOptions="Options" CanHideSeries Width="100%" Height="350px"></MudChart>
<MudChart T="double" ChartType="ChartType.Line" ChartSeries="Series" ChartLabels="DayLabels" ChartOptions="Options" CanHideSeries Width="100%" Height="350px"></MudChart>
</div>
</div>
<div class="row">
Expand All @@ -36,7 +36,7 @@
{
<div class="row mt-3">
<div class="col-12">
<MudChart ChartType="ChartType.Line" ChartSeries="BloodPressureSeries" XAxisLabels="BloodPressureDayLabels" ChartOptions="BloodPressureOptions" CanHideSeries Width="100%" Height="350px"></MudChart>
<MudChart T="double" ChartType="ChartType.Line" ChartSeries="BloodPressureSeries" ChartLabels="BloodPressureDayLabels" ChartOptions="BloodPressureOptions" CanHideSeries Width="100%" Height="350px"></MudChart>
</div>
</div>
}
Expand Down
24 changes: 12 additions & 12 deletions CrohnsDiary.App/Pages/Reports.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@ public partial class Reports

public DateRange Range { get; set; } = new(DateTime.Today.AddMonths(-1), DateTime.Today);

private ChartOptions Options { get; } = new ChartOptions
private LineChartOptions Options { get; } = new LineChartOptions
{
YAxisTicks = 1,
YAxisRequireZeroPoint = true,
YAxisLines = true
};
private string[] DayLabels { get; set; } = [];
private List<ChartSeries> Series { get; } = new();
private List<ChartSeries<double>> Series { get; } = new();

private ChartOptions BloodPressureOptions { get; } = new ChartOptions
private LineChartOptions BloodPressureOptions { get; } = new LineChartOptions
{
YAxisTicks = 10,
YAxisRequireZeroPoint = false,
YAxisLines = true
};
private string[] BloodPressureDayLabels { get; set; } = [];
private List<ChartSeries> BloodPressureSeries { get; } = new();
private List<ChartSeries<double>> BloodPressureSeries { get; } = new();

private IReadOnlyList<DailyReport> dailyReports = [];

Expand Down Expand Up @@ -103,7 +103,7 @@ private async Task FillChart()
var entryCounts = dailyEntries
.Select(d => (double)d.Entries.Length)
.ToArray();
Series.Add(new ChartSeries{Name = Loc["Count"], Data = entryCounts});
Series.Add(new ChartSeries<double>{Name = Loc["Count"], Data = new ChartData<double>(entryCounts)});

var consistencies = dailyEntries
.Select(d =>
Expand All @@ -115,7 +115,7 @@ private async Task FillChart()
.ToArray();
if (_showConsistency)
{
Series.Add(new ChartSeries { Name = Loc["AverageConsistency"], Data = consistencies });
Series.Add(new ChartSeries<double> { Name = Loc["AverageConsistency"], Data = new ChartData<double>(consistencies) });
}

var urgencies = dailyEntries
Expand All @@ -128,7 +128,7 @@ private async Task FillChart()
.ToArray();
if (_showUrgency)
{
Series.Add(new ChartSeries { Name = Loc["AverageUrgency"], Data = urgencies });
Series.Add(new ChartSeries<double> { Name = Loc["AverageUrgency"], Data = new ChartData<double>(urgencies) });
}

var airs = dailyEntries
Expand All @@ -141,7 +141,7 @@ private async Task FillChart()
.ToArray();
if (_showAir)
{
Series.Add(new ChartSeries { Name = Loc["AverageAir"], Data = airs });
Series.Add(new ChartSeries<double> { Name = Loc["AverageAir"], Data = new ChartData<double>(airs) });
}

// Add custom number metrics to the chart
Expand All @@ -160,7 +160,7 @@ private async Task FillChart()

if (customMetricValues.Any(v => v > 0))
{
Series.Add(new ChartSeries { Name = metric.Name, Data = customMetricValues });
Series.Add(new ChartSeries<double> { Name = metric.Name, Data = new ChartData<double>(customMetricValues) });
}
}

Expand Down Expand Up @@ -201,7 +201,7 @@ private async Task FillChart()
.ToArray();
if (systolicValues.Any(v => v > 0))
{
BloodPressureSeries.Add(new ChartSeries { Name = LocBloodPressure["Systolic"], Data = systolicValues });
BloodPressureSeries.Add(new ChartSeries<double> { Name = LocBloodPressure["Systolic"], Data = new ChartData<double>(systolicValues) });
}

var diastolicValues = dailyBloodPressure
Expand All @@ -214,7 +214,7 @@ private async Task FillChart()
.ToArray();
if (diastolicValues.Any(v => v > 0))
{
BloodPressureSeries.Add(new ChartSeries { Name = LocBloodPressure["Diastolic"], Data = diastolicValues });
BloodPressureSeries.Add(new ChartSeries<double> { Name = LocBloodPressure["Diastolic"], Data = new ChartData<double>(diastolicValues) });
}

var pulseRateValues = dailyBloodPressure
Expand All @@ -227,7 +227,7 @@ private async Task FillChart()
.ToArray();
if (pulseRateValues.Any(v => v > 0))
{
BloodPressureSeries.Add(new ChartSeries { Name = LocBloodPressure["PulseRate"], Data = pulseRateValues });
BloodPressureSeries.Add(new ChartSeries<double> { Name = LocBloodPressure["PulseRate"], Data = new ChartData<double>(pulseRateValues) });
}
}

Expand Down
Loading