Merged main into develop

This commit is contained in:
Joseph Milazzo 2022-04-08 08:16:07 -05:00
commit 848885f103
15 changed files with 41 additions and 13 deletions

View File

@ -9,6 +9,7 @@ using Flurl.Http;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using NetVips;
namespace API.Controllers namespace API.Controllers
{ {

View File

@ -1,4 +1,5 @@
using API.Entities.Enums; using System;
using API.Entities.Enums;
namespace API.DTOs.Reader namespace API.DTOs.Reader
{ {

View File

@ -0,0 +1,10 @@
using System.Collections.Generic;
using MediatR;
namespace API.DTOs;
public class UpdateUserRole : IRequest<bool>
{
public string Username { get; init; }
public IList<string> Roles { get; init; }
}

View File

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.IO.Abstractions;
using System.Linq; using System.Linq;
using API.Services; using API.Services;
using Kavita.Common; using Kavita.Common;

View File

@ -1,4 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using API.DTOs.CollectionTags; using API.DTOs.CollectionTags;

View File

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using API.Entities.Interfaces; using API.Entities.Interfaces;
using Microsoft.EntityFrameworkCore;
namespace API.Entities namespace API.Entities
{ {

View File

@ -131,6 +131,7 @@ namespace API.Helpers
CreateMap<IEnumerable<ServerSetting>, ServerSettingDto>() CreateMap<IEnumerable<ServerSetting>, ServerSettingDto>()
.ConvertUsing<ServerSettingConverter>(); .ConvertUsing<ServerSettingConverter>();
} }
} }
} }

View File

@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.Common; using System.Data.Common;
using API.DTOs;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace API.Helpers namespace API.Helpers

View File

@ -19,6 +19,7 @@ using Hangfire;
using Hangfire.MemoryStorage; using Hangfire.MemoryStorage;
using Kavita.Common; using Kavita.Common;
using Kavita.Common.EnvironmentInfo; using Kavita.Common.EnvironmentInfo;
using MediatR;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
@ -131,6 +132,8 @@ namespace API
// Add IHostedService for startup tasks // Add IHostedService for startup tasks
// Any services that should be bootstrapped go here // Any services that should be bootstrapped go here
services.AddHostedService<StartupTasksHostedService>(); services.AddHostedService<StartupTasksHostedService>();
services.AddMediatR(typeof(Startup));
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

BIN
API/config/kavita.db.dik Normal file

Binary file not shown.

BIN
API/config/kavita.db.new Normal file

Binary file not shown.

View File

@ -0,0 +1,4 @@
export interface ScanLibraryEvent {
libraryId: number;
stage: 'complete';
}

View File

@ -31,6 +31,10 @@ img, .full-width {
height: auto; height: auto;
} }
// .img-container {
// overflow: auto;
// }
@keyframes move-up-down { @keyframes move-up-down {
0%, 100% { 0%, 100% {