mirror of
				https://github.com/Kareadita/Kavita.git
				synced 2025-11-03 19:17:05 -05:00 
			
		
		
		
	More Polish (#2686)
This commit is contained in:
		
							parent
							
								
									2ef266c676
								
							
						
					
					
						commit
						0b0e858f24
					
				@ -68,7 +68,6 @@
 | 
				
			|||||||
    <PackageReference Include="Hangfire" Version="1.8.9" />
 | 
					    <PackageReference Include="Hangfire" Version="1.8.9" />
 | 
				
			||||||
    <PackageReference Include="Hangfire.InMemory" Version="0.7.0" />
 | 
					    <PackageReference Include="Hangfire.InMemory" Version="0.7.0" />
 | 
				
			||||||
    <PackageReference Include="Hangfire.MaximumConcurrentExecutions" Version="1.1.0" />
 | 
					    <PackageReference Include="Hangfire.MaximumConcurrentExecutions" Version="1.1.0" />
 | 
				
			||||||
    <PackageReference Include="Hangfire.MemoryStorage.Core" Version="1.4.0" />
 | 
					 | 
				
			||||||
    <PackageReference Include="Hangfire.Storage.SQLite" Version="0.4.0" />
 | 
					    <PackageReference Include="Hangfire.Storage.SQLite" Version="0.4.0" />
 | 
				
			||||||
    <PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
 | 
					    <PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
 | 
				
			||||||
    <PackageReference Include="MarkdownDeep.NET.Core" Version="1.5.0.4" />
 | 
					    <PackageReference Include="MarkdownDeep.NET.Core" Version="1.5.0.4" />
 | 
				
			||||||
@ -102,7 +101,7 @@
 | 
				
			|||||||
    </PackageReference>
 | 
					    </PackageReference>
 | 
				
			||||||
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
 | 
					    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
 | 
				
			||||||
    <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.0" />
 | 
					    <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.0" />
 | 
				
			||||||
    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.0" />
 | 
					    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
 | 
				
			||||||
    <PackageReference Include="System.IO.Abstractions" Version="20.0.15" />
 | 
					    <PackageReference Include="System.IO.Abstractions" Version="20.0.15" />
 | 
				
			||||||
    <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
 | 
					    <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
 | 
				
			||||||
    <PackageReference Include="VersOne.Epub" Version="3.3.1" />
 | 
					    <PackageReference Include="VersOne.Epub" Version="3.3.1" />
 | 
				
			||||||
 | 
				
			|||||||
@ -44,7 +44,7 @@ public class ScrobblingController : BaseApiController
 | 
				
			|||||||
    /// </summary>
 | 
					    /// </summary>
 | 
				
			||||||
    /// <returns></returns>
 | 
					    /// <returns></returns>
 | 
				
			||||||
    [HttpGet("anilist-token")]
 | 
					    [HttpGet("anilist-token")]
 | 
				
			||||||
    public async Task<ActionResult> GetAniListToken()
 | 
					    public async Task<ActionResult<string>> GetAniListToken()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername());
 | 
					        var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername());
 | 
				
			||||||
        if (user == null) return Unauthorized();
 | 
					        if (user == null) return Unauthorized();
 | 
				
			||||||
 | 
				
			|||||||
@ -174,6 +174,8 @@ public class LicenseService(
 | 
				
			|||||||
        catch (Exception ex)
 | 
					        catch (Exception ex)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            logger.LogError(ex, "There was an issue connecting to Kavita+");
 | 
					            logger.LogError(ex, "There was an issue connecting to Kavita+");
 | 
				
			||||||
 | 
					            await provider.FlushAsync();
 | 
				
			||||||
 | 
					            await provider.SetAsync(CacheKey, false, _licenseCacheTimeout);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return false;
 | 
					        return false;
 | 
				
			||||||
 | 
				
			|||||||
@ -4,7 +4,13 @@
 | 
				
			|||||||
      <ng-container title>
 | 
					      <ng-container title>
 | 
				
			||||||
        <h2 class="title text-break">
 | 
					        <h2 class="title text-break">
 | 
				
			||||||
          <app-card-actionables (actionHandler)="performAction($event)" [actions]="seriesActions" [labelBy]="series.name" iconClass="fa-ellipsis-v"></app-card-actionables>
 | 
					          <app-card-actionables (actionHandler)="performAction($event)" [actions]="seriesActions" [labelBy]="series.name" iconClass="fa-ellipsis-v"></app-card-actionables>
 | 
				
			||||||
          <span>{{series.name}}</span>
 | 
					          <span>{{series.name}}
 | 
				
			||||||
 | 
					            @if(isLoadingExtra || isLoading) {
 | 
				
			||||||
 | 
					              <div class="spinner-border spinner-border-sm text-primary" role="status">
 | 
				
			||||||
 | 
					                <span class="visually-hidden">loading...</span>
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					          </span>
 | 
				
			||||||
        </h2>
 | 
					        </h2>
 | 
				
			||||||
      </ng-container>
 | 
					      </ng-container>
 | 
				
			||||||
      <ng-container subtitle *ngIf="series.localizedName !== series.name">
 | 
					      <ng-container subtitle *ngIf="series.localizedName !== series.name">
 | 
				
			||||||
 | 
				
			|||||||
@ -200,6 +200,7 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked {
 | 
				
			|||||||
  isAdmin = false;
 | 
					  isAdmin = false;
 | 
				
			||||||
  hasDownloadingRole = false;
 | 
					  hasDownloadingRole = false;
 | 
				
			||||||
  isLoading = true;
 | 
					  isLoading = true;
 | 
				
			||||||
 | 
					  isLoadingExtra = false;
 | 
				
			||||||
  showBook = true;
 | 
					  showBook = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  currentlyReadingChapter: Chapter | undefined = undefined;
 | 
					  currentlyReadingChapter: Chapter | undefined = undefined;
 | 
				
			||||||
@ -708,7 +709,11 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  loadPlusMetadata(seriesId: number, libraryType: LibraryType) {
 | 
					  loadPlusMetadata(seriesId: number, libraryType: LibraryType) {
 | 
				
			||||||
 | 
					    this.isLoadingExtra = true;
 | 
				
			||||||
 | 
					    this.cdRef.markForCheck();
 | 
				
			||||||
    this.metadataService.getSeriesMetadataFromPlus(seriesId, libraryType).subscribe(data => {
 | 
					    this.metadataService.getSeriesMetadataFromPlus(seriesId, libraryType).subscribe(data => {
 | 
				
			||||||
 | 
					      this.isLoadingExtra = false;
 | 
				
			||||||
 | 
					      this.cdRef.markForCheck();
 | 
				
			||||||
      if (data === null) return;
 | 
					      if (data === null) return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      // Reviews
 | 
					      // Reviews
 | 
				
			||||||
 | 
				
			|||||||
@ -19,6 +19,4 @@ export class LoadingComponent {
 | 
				
			|||||||
   * Uses absolute positioning to ensure it loads over content
 | 
					   * Uses absolute positioning to ensure it loads over content
 | 
				
			||||||
   */
 | 
					   */
 | 
				
			||||||
  @Input() absolute: boolean = false;
 | 
					  @Input() absolute: boolean = false;
 | 
				
			||||||
 | 
					 | 
				
			||||||
  constructor() { }
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										21
									
								
								openapi.json
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								openapi.json
									
									
									
									
									
								
							@ -7,7 +7,7 @@
 | 
				
			|||||||
      "name": "GPL-3.0",
 | 
					      "name": "GPL-3.0",
 | 
				
			||||||
      "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
 | 
					      "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "version": "0.7.13.17"
 | 
					    "version": "0.7.13.18"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "servers": [
 | 
					  "servers": [
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
@ -7238,7 +7238,24 @@
 | 
				
			|||||||
        "summary": "Get the current user's AniList token",
 | 
					        "summary": "Get the current user's AniList token",
 | 
				
			||||||
        "responses": {
 | 
					        "responses": {
 | 
				
			||||||
          "200": {
 | 
					          "200": {
 | 
				
			||||||
            "description": "Success"
 | 
					            "description": "Success",
 | 
				
			||||||
 | 
					            "content": {
 | 
				
			||||||
 | 
					              "text/plain": {
 | 
				
			||||||
 | 
					                "schema": {
 | 
				
			||||||
 | 
					                  "type": "string"
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					              },
 | 
				
			||||||
 | 
					              "application/json": {
 | 
				
			||||||
 | 
					                "schema": {
 | 
				
			||||||
 | 
					                  "type": "string"
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					              },
 | 
				
			||||||
 | 
					              "text/json": {
 | 
				
			||||||
 | 
					                "schema": {
 | 
				
			||||||
 | 
					                  "type": "string"
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					              }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
          }
 | 
					          }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user