Skip to content

Commit 5034816

Browse files
majora2007Fesaa
majora2007
and
Fesaa
authored
Last polish (#4102)
Co-authored-by: Amelia <[email protected]>
1 parent fb6218c commit 5034816

File tree

6 files changed

+39
-38
lines changed

6 files changed

+39
-38
lines changed

‎API.Tests/API.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.7" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.10" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1111
<PackageReference Include="NSubstitute" Version="5.3.0" />
1212
<PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="22.0.15" />

‎API/API.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<ItemGroup>
5353
<PackageReference Include="CsvHelper" Version="33.1.0" />
5454
<PackageReference Include="MailKit" Version="4.13.0" />
55-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
55+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
5656
<PrivateAssets>all</PrivateAssets>
5757
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5858
</PackageReference>
@@ -70,11 +70,11 @@
7070
<PackageReference Include="MarkdownDeep.NET.Core" Version="1.5.0.4" />
7171
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.20" />
7272
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
73-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
74-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.7" />
75-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.7" />
76-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
77-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
73+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.10" />
74+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10" />
75+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
76+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
77+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
7878
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
7979
<PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
8080
<PackageReference Include="Nager.ArticleNumber" Version="1.0.7" />

‎API/Services/AnnotationService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public async Task<string> ExportAnnotations(int userId, IList<int>? annotationId
178178

179179
// Get settings for hostname
180180
var settings = await unitOfWork.SettingsRepository.GetSettingsDtoAsync();
181-
var hostname = !string.IsNullOrWhiteSpace(settings.HostName) ? settings.HostName : "http://localhost:5000";
181+
var hostname = !string.IsNullOrWhiteSpace(settings.HostName) ? settings.HostName : $"http://localhost:{Configuration.Port}";
182182

183183
// Group annotations by series, then by volume
184184
var exportData = annotations

‎Kavita.Common/Kavita.Common.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<PackageReference Include="Cronos" Version="0.11.0" />
1313
<PackageReference Include="DotNet.Glob" Version="3.1.3" />
1414
<PackageReference Include="Flurl.Http" Version="4.0.2" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.7" />
16-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.10" />
16+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
1717
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎UI/Web/src/app/shared/circular-loader/circular-loader.component.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
@if (currentValue > 0) {
2-
@if (showIcon) {
3-
<div [ngClass]="{'number': center}" class="indicator">
4-
<i class="fa fa-angle-double-down" [ngStyle]="{'font-size': fontSize}" aria-hidden="true"></i>
5-
</div>
6-
}
7-
82
<div [ngStyle]="{'width': width, 'height': height}">
3+
@if (showIcon) {
4+
<div [ngClass]="{'number': center}" class="indicator d-flex justify-content-center">
5+
<i class="fa fa-angle-double-down" [ngStyle]="{'font-size': fontSize}" aria-hidden="true"></i>
6+
</div>
7+
}
8+
99
<circle-progress [percent]="currentValue"
10-
[radius]="100"
11-
[outerStrokeWidth]="15"
12-
[innerStrokeWidth]="0"
13-
[space] = "0"
14-
[backgroundPadding]="0"
15-
outerStrokeLinecap="butt"
16-
[outerStrokeColor]="outerStrokeColor"
17-
[innerStrokeColor]="innerStrokeColor"
18-
titleFontSize= "24"
19-
unitsFontSize= "24"
20-
[showSubtitle] = "false"
21-
[animation]="animation"
22-
[animationDuration]="300"
23-
[startFromZero]="false"
24-
[responsive]="true"
25-
[backgroundOpacity]="0.5"
26-
[backgroundColor]="backgroundColor"
27-
/>
10+
[radius]="100"
11+
[outerStrokeWidth]="15"
12+
[innerStrokeWidth]="0"
13+
[space] = "0"
14+
[backgroundPadding]="0"
15+
outerStrokeLinecap="butt"
16+
[outerStrokeColor]="outerStrokeColor"
17+
[innerStrokeColor]="innerStrokeColor"
18+
titleFontSize= "24"
19+
unitsFontSize= "24"
20+
[showSubtitle] = "false"
21+
[animation]="animation"
22+
[animationDuration]="300"
23+
[startFromZero]="false"
24+
[responsive]="true"
25+
[backgroundOpacity]="0.5"
26+
[backgroundColor]="backgroundColor"
27+
/>
2828
</div>
2929
}

‎UI/Web/src/app/shared/circular-loader/circular-loader.component.scss‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
.number {
22
position: absolute;
3-
top: 50%;
4-
left: 46%;
3+
top: 75%;
54
font-size: 18px;
5+
width: 100%;
6+
text-align: center;
67
}
78

89
.indicator {
10+
position: relative;
911
font-weight: 500;
10-
margin-left: 2px;
1112
z-index: 10;
1213
color: var(--primary-color);
1314
animation: MoveUpDown 1s linear infinite;
14-
}
15+
}

0 commit comments

Comments
 (0)