diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 8a6b9c2f6..6aaef02d9 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -21,7 +21,7 @@ jobs: - name: Install Swashbuckle CLI shell: powershell - run: dotnet tool install -g --version 6.5.0 Swashbuckle.AspNetCore.Cli + run: dotnet tool install -g Swashbuckle.AspNetCore.Cli - name: Install dependencies run: dotnet restore diff --git a/API.Tests/API.Tests.csproj b/API.Tests/API.Tests.csproj index 12cf2b444..c00a93d46 100644 --- a/API.Tests/API.Tests.csproj +++ b/API.Tests/API.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/API.Tests/Services/WordCountAnalysisTests.cs b/API.Tests/Services/WordCountAnalysisTests.cs index 4d86ea2d3..d911bbcf0 100644 --- a/API.Tests/Services/WordCountAnalysisTests.cs +++ b/API.Tests/Services/WordCountAnalysisTests.cs @@ -74,7 +74,7 @@ public class WordCountAnalysisTests : AbstractDbTest var cacheService = new CacheHelper(new FileService()); var service = new WordCountAnalyzerService(Substitute.For>(), _unitOfWork, - Substitute.For(), cacheService, _readerService); + Substitute.For(), cacheService, _readerService, Substitute.For()); await service.ScanSeries(1, 1); @@ -126,7 +126,7 @@ public class WordCountAnalysisTests : AbstractDbTest var cacheService = new CacheHelper(new FileService()); var service = new WordCountAnalyzerService(Substitute.For>(), _unitOfWork, - Substitute.For(), cacheService, _readerService); + Substitute.For(), cacheService, _readerService, Substitute.For()); await service.ScanSeries(1, 1); var chapter2 = new ChapterBuilder("2") diff --git a/API/API.csproj b/API/API.csproj index 9767a0ec3..cc3c3aa38 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -12,9 +12,9 @@ latestmajor - - - + + + false @@ -95,13 +95,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + diff --git a/API/Data/ManualMigrations/ManualMigrateSwitchToWal.cs b/API/Data/ManualMigrations/ManualMigrateSwitchToWal.cs new file mode 100644 index 000000000..8e648b025 --- /dev/null +++ b/API/Data/ManualMigrations/ManualMigrateSwitchToWal.cs @@ -0,0 +1,48 @@ +using System; +using System.Threading.Tasks; +using API.Entities; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +/// +/// v0.8.2 switches Default Kavita installs to WAL +/// +public static class ManualMigrateSwitchToWal +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateSwitchToWal")) + { + return; + } + + logger.LogCritical("Running ManualMigrateSwitchToWal migration - Please be patient, this may take some time. This is not an error"); + try + { + var connection = context.Database.GetDbConnection(); + await connection.OpenAsync(); + await using var command = connection.CreateCommand(); + command.CommandText = "PRAGMA journal_mode=WAL;"; + await command.ExecuteNonQueryAsync(); + } + catch (Exception ex) + { + logger.LogError(ex, "Error setting WAL"); + /* Swallow */ + } + + await context.ManualMigrationHistory.AddAsync(new ManualMigrationHistory() + { + Name = "ManualMigrateSwitchToWal", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await context.SaveChangesAsync(); + + logger.LogCritical("Running ManualMigrateSwitchToWal migration - Completed. This is not an error"); + } + +} diff --git a/API/Data/ManualMigrations/ManualMigrateThemeDescription.cs b/API/Data/ManualMigrations/ManualMigrateThemeDescription.cs new file mode 100644 index 000000000..8ac000f0d --- /dev/null +++ b/API/Data/ManualMigrations/ManualMigrateThemeDescription.cs @@ -0,0 +1,49 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using API.Entities; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +/// +/// v0.8.2 introduced Theme repo viewer, this adds Description to existing SiteTheme defaults +/// +public static class ManualMigrateThemeDescription +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateThemeDescription")) + { + return; + } + + logger.LogCritical("Running ManualMigrateThemeDescription migration - Please be patient, this may take some time. This is not an error"); + + var theme = await context.SiteTheme.FirstOrDefaultAsync(t => t.Name == "Dark"); + if (theme != null) + { + theme.Description = Seed.DefaultThemes.First().Description; + } + + if (context.ChangeTracker.HasChanges()) + { + await context.SaveChangesAsync(); + } + + + + + await context.ManualMigrationHistory.AddAsync(new ManualMigrationHistory() + { + Name = "ManualMigrateThemeDescription", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await context.SaveChangesAsync(); + + logger.LogCritical("Running ManualMigrateThemeDescription migration - Completed. This is not an error"); + } +} diff --git a/API/Data/Repositories/SeriesRepository.cs b/API/Data/Repositories/SeriesRepository.cs index 5c8b91b19..73a52856e 100644 --- a/API/Data/Repositories/SeriesRepository.cs +++ b/API/Data/Repositories/SeriesRepository.cs @@ -1748,12 +1748,12 @@ public class SeriesRepository : ISeriesRepository { // This is due to v0.5.6 introducing bugs where we could have multiple series get duplicated and no way to delete them // This here will delete the 2nd one as the first is the one to likely be used. - var sId = _context.Series + var sId = await _context.Series .Where(s => s.Format == parsedSeries.Format && s.NormalizedName == parsedSeries.NormalizedName && s.LibraryId == libraryId) .Select(s => s.Id) .OrderBy(s => s) - .Last(); + .LastAsync(); if (sId > 0) { ids.Add(sId); diff --git a/API/Data/Seed.cs b/API/Data/Seed.cs index 955450a37..75715645c 100644 --- a/API/Data/Seed.cs +++ b/API/Data/Seed.cs @@ -35,6 +35,7 @@ public static class Seed Provider = ThemeProvider.System, FileName = "dark.scss", IsDefault = true, + Description = "Default theme shipped with Kavita" } }.ToArray() ]; diff --git a/API/Program.cs b/API/Program.cs index 46d8d6c6d..9668a06da 100644 --- a/API/Program.cs +++ b/API/Program.cs @@ -99,10 +99,13 @@ public class Program // Apply all migrations on startup logger.LogInformation("Running Migrations"); - // v0.7.14 try { + // v0.7.14 await MigrateWantToReadExport.Migrate(context, directoryService, logger); + + // v0.8.2 + await ManualMigrateSwitchToWal.Migrate(context, logger); } catch (Exception ex) { diff --git a/API/Services/BookService.cs b/API/Services/BookService.cs index 8c039e323..a6d978c67 100644 --- a/API/Services/BookService.cs +++ b/API/Services/BookService.cs @@ -73,7 +73,8 @@ public class BookService : IBookService { PackageReaderOptions = new PackageReaderOptions { - IgnoreMissingToc = true + IgnoreMissingToc = true, + SkipInvalidManifestItems = true } }; diff --git a/API/Services/CacheService.cs b/API/Services/CacheService.cs index 27641abd5..183dda6d3 100644 --- a/API/Services/CacheService.cs +++ b/API/Services/CacheService.cs @@ -1,8 +1,10 @@ using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; +using System.Threading; using System.Threading.Tasks; using API.Data; using API.DTOs.Reader; @@ -51,6 +53,8 @@ public class CacheService : ICacheService private readonly IReadingItemService _readingItemService; private readonly IBookmarkService _bookmarkService; + private static readonly ConcurrentDictionary ExtractLocks = new(); + public CacheService(ILogger logger, IUnitOfWork unitOfWork, IDirectoryService directoryService, IReadingItemService readingItemService, IBookmarkService bookmarkService) @@ -166,11 +170,19 @@ public class CacheService : ICacheService var chapter = await _unitOfWork.ChapterRepository.GetChapterAsync(chapterId); var extractPath = GetCachePath(chapterId); - if (_directoryService.Exists(extractPath)) return chapter; - var files = chapter?.Files.ToList(); - ExtractChapterFiles(extractPath, files, extractPdfToImages); + SemaphoreSlim extractLock = ExtractLocks.GetOrAdd(chapterId, id => new SemaphoreSlim(1,1)); - return chapter; + await extractLock.WaitAsync(); + try { + if(_directoryService.Exists(extractPath)) return chapter; + + var files = chapter?.Files.ToList(); + ExtractChapterFiles(extractPath, files, extractPdfToImages); + } finally { + extractLock.Release(); + } + + return chapter; } /// @@ -191,15 +203,25 @@ public class CacheService : ICacheService if (files.Count > 0 && files[0].Format == MangaFormat.Image) { - foreach (var file in files) + // Check if all the files are Images. If so, do a directory copy, else do the normal copy + if (files.All(f => f.Format == MangaFormat.Image)) { - if (fileCount > 1) - { - extraPath = file.Id + string.Empty; - } - _readingItemService.Extract(file.FilePath, Path.Join(extractPath, extraPath), MangaFormat.Image, files.Count); + _directoryService.ExistOrCreate(extractPath); + _directoryService.CopyFilesToDirectory(files.Select(f => f.FilePath), extractPath); } - _directoryService.Flatten(extractDi.FullName); + else + { + foreach (var file in files) + { + if (fileCount > 1) + { + extraPath = file.Id + string.Empty; + } + _readingItemService.Extract(file.FilePath, Path.Join(extractPath, extraPath), MangaFormat.Image, files.Count); + } + _directoryService.Flatten(extractDi.FullName); + } + } foreach (var file in files) diff --git a/API/Services/ImageService.cs b/API/Services/ImageService.cs index 36ba07ddc..815be6c86 100644 --- a/API/Services/ImageService.cs +++ b/API/Services/ImageService.cs @@ -439,18 +439,13 @@ public class ImageService : IImageService rows = 1; cols = 2; } - else if (coverImages.Count == 3) - { - rows = 2; - cols = 2; - } else { - // Default to 2x2 layout for more than 3 images rows = 2; cols = 2; } + var image = Image.Black(dims.Width, dims.Height); var thumbnailWidth = image.Width / cols; diff --git a/API/Services/Plus/ScrobblingService.cs b/API/Services/Plus/ScrobblingService.cs index 57dca5943..8383f1778 100644 --- a/API/Services/Plus/ScrobblingService.cs +++ b/API/Services/Plus/ScrobblingService.cs @@ -60,7 +60,6 @@ public interface IScrobblingService public class ScrobblingService : IScrobblingService { private readonly IUnitOfWork _unitOfWork; - private readonly ITokenService _tokenService; private readonly IEventHub _eventHub; private readonly ILogger _logger; private readonly ILicenseService _licenseService; @@ -99,12 +98,10 @@ public class ScrobblingService : IScrobblingService private const string AccessTokenErrorMessage = "Access Token needs to be rotated to continue scrobbling"; - public ScrobblingService(IUnitOfWork unitOfWork, ITokenService tokenService, - IEventHub eventHub, ILogger logger, ILicenseService licenseService, - ILocalizationService localizationService) + public ScrobblingService(IUnitOfWork unitOfWork, IEventHub eventHub, ILogger logger, + ILicenseService licenseService, ILocalizationService localizationService) { _unitOfWork = unitOfWork; - _tokenService = tokenService; _eventHub = eventHub; _logger = logger; _licenseService = licenseService; diff --git a/API/Services/Plus/SmartCollectionSyncService.cs b/API/Services/Plus/SmartCollectionSyncService.cs index 63cdb95b7..79a9c7a23 100644 --- a/API/Services/Plus/SmartCollectionSyncService.cs +++ b/API/Services/Plus/SmartCollectionSyncService.cs @@ -142,10 +142,15 @@ public class SmartCollectionSyncService : ISmartCollectionSyncService // For everything that's not there, link it up for this user. _logger.LogInformation("Starting Sync on {CollectionName} with {SeriesCount} Series", info.Title, info.TotalItems); + await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, + MessageFactory.SmartCollectionProgressEvent(info.Title, string.Empty, 0, info.TotalItems, ProgressEventType.Started)); + var missingCount = 0; var missingSeries = new StringBuilder(); + var counter = -1; foreach (var seriesInfo in info.Series.OrderBy(s => s.SeriesName)) { + counter++; try { // Normalize series name and localized name @@ -164,7 +169,12 @@ public class SmartCollectionSyncService : ISmartCollectionSyncService s.NormalizedLocalizedName == normalizedSeriesName) && formats.Contains(s.Format)); - if (existingSeries != null) continue; + if (existingSeries != null) + { + await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, + MessageFactory.SmartCollectionProgressEvent(info.Title, seriesInfo.SeriesName, counter, info.TotalItems, ProgressEventType.Updated)); + continue; + } // Series not found in the collection, try to find it in the server var newSeries = await _unitOfWork.SeriesRepository.GetSeriesByAnyName(seriesInfo.SeriesName, @@ -196,6 +206,8 @@ public class SmartCollectionSyncService : ISmartCollectionSyncService missingSeries.Append("
"); } + await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, + MessageFactory.SmartCollectionProgressEvent(info.Title, seriesInfo.SeriesName, counter, info.TotalItems, ProgressEventType.Updated)); } // At this point, all series in the info have been checked and added if necessary @@ -213,6 +225,9 @@ public class SmartCollectionSyncService : ISmartCollectionSyncService await _unitOfWork.CollectionTagRepository.UpdateCollectionAgeRating(collection); + await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, + MessageFactory.SmartCollectionProgressEvent(info.Title, string.Empty, info.TotalItems, info.TotalItems, ProgressEventType.Ended)); + await _eventHub.SendMessageAsync(MessageFactory.CollectionUpdated, MessageFactory.CollectionUpdatedEvent(collection.Id), false); diff --git a/API/Services/Tasks/Metadata/WordCountAnalyzerService.cs b/API/Services/Tasks/Metadata/WordCountAnalyzerService.cs index 333c5ef18..b03681613 100644 --- a/API/Services/Tasks/Metadata/WordCountAnalyzerService.cs +++ b/API/Services/Tasks/Metadata/WordCountAnalyzerService.cs @@ -33,17 +33,19 @@ public class WordCountAnalyzerService : IWordCountAnalyzerService private readonly IEventHub _eventHub; private readonly ICacheHelper _cacheHelper; private readonly IReaderService _readerService; + private readonly IMediaErrorService _mediaErrorService; private const int AverageCharactersPerWord = 5; public WordCountAnalyzerService(ILogger logger, IUnitOfWork unitOfWork, IEventHub eventHub, - ICacheHelper cacheHelper, IReaderService readerService) + ICacheHelper cacheHelper, IReaderService readerService, IMediaErrorService mediaErrorService) { _logger = logger; _unitOfWork = unitOfWork; _eventHub = eventHub; _cacheHelper = cacheHelper; _readerService = readerService; + _mediaErrorService = mediaErrorService; } @@ -188,7 +190,7 @@ public class WordCountAnalyzerService : IWordCountAnalyzerService await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.WordCountAnalyzerProgressEvent(series.LibraryId, progress, ProgressEventType.Updated, useFileName ? filePath : series.Name)); - sum += await GetWordCountFromHtml(bookPage); + sum += await GetWordCountFromHtml(bookPage, filePath); pageCounter++; } @@ -245,13 +247,23 @@ public class WordCountAnalyzerService : IWordCountAnalyzerService } - private static async Task GetWordCountFromHtml(EpubLocalTextContentFileRef bookFile) + private async Task GetWordCountFromHtml(EpubLocalTextContentFileRef bookFile, string filePath) { - var doc = new HtmlDocument(); - doc.LoadHtml(await bookFile.ReadContentAsync()); + try + { + var doc = new HtmlDocument(); + doc.LoadHtml(await bookFile.ReadContentAsync()); - var textNodes = doc.DocumentNode.SelectNodes("//body//text()[not(parent::script)]"); - return textNodes?.Sum(node => node.InnerText.Count(char.IsLetter)) / AverageCharactersPerWord ?? 0; + var textNodes = doc.DocumentNode.SelectNodes("//body//text()[not(parent::script)]"); + return textNodes?.Sum(node => node.InnerText.Count(char.IsLetter)) / AverageCharactersPerWord ?? 0; + } + catch (EpubContentException ex) + { + _logger.LogError(ex, "Error when counting words in epub {EpubPath}", filePath); + await _mediaErrorService.ReportMediaIssueAsync(filePath, MediaErrorProducer.BookService, + $"Invalid Epub Metadata, {bookFile.FilePath} does not exist", ex.Message); + return 0; + } } } diff --git a/API/Services/Tasks/SiteThemeService.cs b/API/Services/Tasks/SiteThemeService.cs index f71d97c7e..b2f81363d 100644 --- a/API/Services/Tasks/SiteThemeService.cs +++ b/API/Services/Tasks/SiteThemeService.cs @@ -178,7 +178,7 @@ public class ThemeService : IThemeService themeDtos.Add(dto); } - _cache.Set(themeDtos, themes, _cacheOptions); + _cache.Set(cacheKey, themeDtos, _cacheOptions); return themeDtos; } diff --git a/API/SignalR/MessageFactory.cs b/API/SignalR/MessageFactory.cs index 31a5c949f..ff04e3201 100644 --- a/API/SignalR/MessageFactory.cs +++ b/API/SignalR/MessageFactory.cs @@ -134,6 +134,10 @@ public static class MessageFactory /// A Theme was updated and UI should refresh to get the latest version /// public const string SiteThemeUpdated = "SiteThemeUpdated"; + /// + /// A Progress event when a smart collection is synchronizing + /// + public const string SmartCollectionSync = "SmartCollectionSync"; public static SignalRMessage DashboardUpdateEvent(int userId) { @@ -425,6 +429,31 @@ public static class MessageFactory }; } + /// + /// Represents a file being scanned by Kavita for processing and grouping + /// + /// Does not have a progress as it's unknown how many files there are. Instead sends -1 to represent indeterminate + /// + /// + /// + /// + public static SignalRMessage SmartCollectionProgressEvent(string collectionName, string seriesName, int currentItems, int totalItems, string eventType) + { + return new SignalRMessage() + { + Name = SmartCollectionSync, + Title = $"Synchronizing {collectionName}", + SubTitle = seriesName, + EventType = eventType, + Progress = ProgressType.Determinate, + Body = new + { + Progress = float.Min((currentItems / (totalItems * 1.0f)), 100f), + EventTime = DateTime.Now + } + }; + } + /// /// This informs the UI with details about what is being processed by the Scanner /// diff --git a/API/Startup.cs b/API/Startup.cs index 8d9e45fa5..a7eb490de 100644 --- a/API/Startup.cs +++ b/API/Startup.cs @@ -266,6 +266,9 @@ public class Startup // v0.8.1 await MigrateLowestSeriesFolderPath.Migrate(dataContext, unitOfWork, logger); + // v0.8.2 + await ManualMigrateThemeDescription.Migrate(dataContext, logger); + // Update the version in the DB after all migrations are run var installVersion = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallVersion); installVersion.Value = BuildInfo.Version.ToString(); diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d3735253f..5ccd27541 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Setup guides, FAQ, the more information we have on the [wiki](https://wiki.kavit - [Git](https://git-scm.com/downloads) - [NodeJS](https://nodejs.org/en/download/) (Node 18.13.X or higher) - .NET 8.0+ -- dotnet tool install -g --version 6.5.0 Swashbuckle.AspNetCore.Cli +- dotnet tool install -g Swashbuckle.AspNetCore.Cli ### Getting started ### diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj index 52d7d204a..a0b6c3995 100644 --- a/Kavita.Common/Kavita.Common.csproj +++ b/Kavita.Common/Kavita.Common.csproj @@ -14,7 +14,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/UI/Web/src/_manga-reader-common.scss b/UI/Web/src/_manga-reader-common.scss index 1f1af75fa..9b54a5fad 100644 --- a/UI/Web/src/_manga-reader-common.scss +++ b/UI/Web/src/_manga-reader-common.scss @@ -1,4 +1,4 @@ -$scrollbarHeight: 34px; +$scrollbarHeight: 35px; img { user-select: none; @@ -9,29 +9,31 @@ img { align-items: center; &.full-width { - height: calc(var(--vh)*100); + height: 100dvh; display: grid; } &.full-height { - height: calc(100vh); // We need to - $scrollbarHeight when there is a horizontal scroll on macos + height: calc(100dvh); // We need to - $scrollbarHeight when there is a horizontal scroll on macos display: flex; align-content: center; + overflow-y: hidden; } &.original { - height: 100vh; + height: calc(100dvh); display: grid; } .full-height { width: auto; margin: auto; - max-height: calc(var(--vh)*100); - overflow: hidden; // This technically will crop and make it just fit + max-height: calc(100dvh); + height: calc(100dvh); vertical-align: top; + object-fit: cover; &.wide { - height: 100vh; + height: calc(100dvh); } } @@ -46,12 +48,13 @@ img { width: 100%; margin: 0 auto; vertical-align: top; - max-width: fit-content; + object-fit: contain; + width: 100%; } .fit-to-screen.full-width { width: 100%; - max-height: calc(var(--vh)*100); + max-height: calc(100dvh); } } diff --git a/UI/Web/src/app/_services/action-factory.service.ts b/UI/Web/src/app/_services/action-factory.service.ts index 1e211d7f5..d103cf133 100644 --- a/UI/Web/src/app/_services/action-factory.service.ts +++ b/UI/Web/src/app/_services/action-factory.service.ts @@ -10,7 +10,6 @@ import { Volume } from '../_models/volume'; import { AccountService } from './account.service'; import { DeviceService } from './device.service'; import {SideNavStream} from "../_models/sidenav/sidenav-stream"; -import {User} from "../_models/user"; export enum Action { Submenu = -1, diff --git a/UI/Web/src/app/_services/message-hub.service.ts b/UI/Web/src/app/_services/message-hub.service.ts index a7f30fda2..7601ee437 100644 --- a/UI/Web/src/app/_services/message-hub.service.ts +++ b/UI/Web/src/app/_services/message-hub.service.ts @@ -103,7 +103,11 @@ export enum EVENTS { /** * A Theme was updated and UI should refresh to get the latest version */ - SiteThemeUpdated= 'SiteThemeUpdated' + SiteThemeUpdated = 'SiteThemeUpdated', + /** + * A Progress event when a smart collection is synchronizing + */ + SmartCollectionSync = 'SmartCollectionSync' } export interface Message { @@ -199,6 +203,13 @@ export class MessageHubService { }); }); + this.hubConnection.on(EVENTS.SmartCollectionSync, resp => { + this.messagesSource.next({ + event: EVENTS.NotificationProgress, + payload: resp.body + }); + }); + this.hubConnection.on(EVENTS.SiteThemeUpdated, resp => { this.messagesSource.next({ event: EVENTS.SiteThemeUpdated, diff --git a/UI/Web/src/app/_single-module/review-card/review-card.component.html b/UI/Web/src/app/_single-module/review-card/review-card.component.html index d2159033a..f9f8c53c3 100644 --- a/UI/Web/src/app/_single-module/review-card/review-card.component.html +++ b/UI/Web/src/app/_single-module/review-card/review-card.component.html @@ -24,11 +24,11 @@
@if (isMyReview) { - - + + {{review.username}} } @else { - + } {{(isMyReview ? '' : review.username | defaultValue:'')}} diff --git a/UI/Web/src/app/_single-module/review-card/review-card.component.scss b/UI/Web/src/app/_single-module/review-card/review-card.component.scss index 511e10a96..6fa132b84 100644 --- a/UI/Web/src/app/_single-module/review-card/review-card.component.scss +++ b/UI/Web/src/app/_single-module/review-card/review-card.component.scss @@ -42,4 +42,10 @@ max-width: 319px; justify-content: space-between; margin: 0 auto; + padding: .5rem 0; + + & > * { + margin: 0 5px; + display: inline-flex; + } } diff --git a/UI/Web/src/app/_single-module/user-scrobble-history/user-scrobble-history.component.html b/UI/Web/src/app/_single-module/user-scrobble-history/user-scrobble-history.component.html index b9cd26381..5387005d2 100644 --- a/UI/Web/src/app/_single-module/user-scrobble-history/user-scrobble-history.component.html +++ b/UI/Web/src/app/_single-module/user-scrobble-history/user-scrobble-history.component.html @@ -1,6 +1,7 @@
{{t('title')}}

{{t('description')}}

+

{{t('not-read-warning')}}

@@ -67,7 +68,11 @@ @switch (item.scrobbleEventType) { @case (ScrobbleEventType.ChapterRead) { @if(item.volumeNumber === LooseLeafOrDefaultNumber) { - {{t('chapter-num', {num: item.chapterNumber})}} + @if (item.chapterNumber === LooseLeafOrDefaultNumber) { + {{t('special')}} + } @else { + {{t('chapter-num', {num: item.chapterNumber})}} + } } @else if (item.chapterNumber === LooseLeafOrDefaultNumber) { {{t('volume-num', {num: item.volumeNumber})}} diff --git a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html index 5a98d7651..2e3916c2c 100644 --- a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html +++ b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.html @@ -3,8 +3,12 @@

{{t('title')}}

-

You must fill out both Host Name and SMTP settings to use email-based functionality within Kavita.

- +

{{t('setting-description')}}

+ @if (settingsForm.dirty) { + + {{t('test-warning')}} + + }
{{t('host-name-tooltip')}} diff --git a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.ts b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.ts index 2a67c60af..1ee93fdf6 100644 --- a/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.ts +++ b/UI/Web/src/app/admin/manage-email-settings/manage-email-settings.component.ts @@ -5,6 +5,7 @@ import {take} from 'rxjs'; import {SettingsService} from '../settings.service'; import {ServerSettings} from '../_models/server-settings'; import { + NgbAlert, NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; import {NgIf, NgTemplateOutlet, TitleCasePipe} from '@angular/common'; @@ -19,7 +20,7 @@ import {ManageAlertsComponent} from "../manage-alerts/manage-alerts.component"; standalone: true, changeDetection: ChangeDetectionStrategy.OnPush, imports: [NgIf, ReactiveFormsModule, NgbTooltip, NgTemplateOutlet, TranslocoModule, SafeHtmlPipe, - ManageAlertsComponent, TitleCasePipe] + ManageAlertsComponent, TitleCasePipe, NgbAlert] }) export class ManageEmailSettingsComponent implements OnInit { diff --git a/UI/Web/src/app/all-filters/all-filters.component.html b/UI/Web/src/app/all-filters/all-filters.component.html index 97a237886..ba5a7fca5 100644 --- a/UI/Web/src/app/all-filters/all-filters.component.html +++ b/UI/Web/src/app/all-filters/all-filters.component.html @@ -14,7 +14,7 @@
-
+
diff --git a/UI/Web/src/app/cards/series-info-cards/series-info-cards.component.html b/UI/Web/src/app/cards/series-info-cards/series-info-cards.component.html index 5cf1fcf75..da42c675d 100644 --- a/UI/Web/src/app/cards/series-info-cards/series-info-cards.component.html +++ b/UI/Web/src/app/cards/series-info-cards/series-info-cards.component.html @@ -1,7 +1,7 @@
-
+
{{seriesMetadata.releaseYear}} @@ -11,7 +11,7 @@ -
+
{{this.seriesMetadata.ageRating | ageRating}} @@ -20,7 +20,7 @@ -
+
{{seriesMetadata.language | defaultValue:'en' | languageName | async}} @@ -30,7 +30,7 @@ -
+
-
+
-
+
@@ -73,7 +73,7 @@ -
+
{{series.latestReadDate | timeAgo}} @@ -83,7 +83,7 @@ -
+
{{t('words-count', {num: series.wordCount | compactNumber})}} @@ -93,7 +93,7 @@ -
+
{{t('pages-count', {num: series.pages | compactNumber})}} @@ -102,7 +102,7 @@ -
+
{{t('less-than-hour')}} @@ -114,7 +114,7 @@
-
+
~{{readingTimeLeft.avgHours}} {{readingTimeLeft.avgHours > 1 ? t('hours') : t('hour')}} diff --git a/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.ts b/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.ts index de76916ac..89f683b0a 100644 --- a/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.ts +++ b/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.ts @@ -6,11 +6,13 @@ import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap"; import {CollectionTagService} from "../../../_services/collection-tag.service"; import {MalStack} from "../../../_models/collection/mal-stack"; import {UserCollection} from "../../../_models/collection-tag"; -import {ScrobbleProvider} from "../../../_services/scrobbling.service"; +import {ScrobbleProvider, ScrobblingService} from "../../../_services/scrobbling.service"; import {forkJoin} from "rxjs"; import {ToastrService} from "ngx-toastr"; import {DecimalPipe} from "@angular/common"; import {LoadingComponent} from "../../../shared/loading/loading.component"; +import {AccountService} from "../../../_services/account.service"; +import {ConfirmService} from "../../../shared/confirm.service"; @Component({ selector: 'app-import-mal-collection-modal', @@ -32,13 +34,25 @@ export class ImportMalCollectionModalComponent { private readonly collectionService = inject(CollectionTagService); private readonly cdRef = inject(ChangeDetectorRef); private readonly toastr = inject(ToastrService); + private readonly scrobblingService = inject(ScrobblingService); + private readonly confirmService = inject(ConfirmService); stacks: Array = []; isLoading = true; collectionMap: {[key: string]: UserCollection | MalStack} = {}; constructor() { + this.scrobblingService.getMalToken().subscribe(async token => { + if (token.accessToken === '') { + await this.confirmService.alert(translate('toasts.mal-token-required')); + this.ngbModal.dismiss(); + return; + } + this.setup(); + }); + } + setup() { forkJoin({ allCollections: this.collectionService.allCollections(true), malStacks: this.collectionService.getMalStacks() diff --git a/UI/Web/src/app/manga-reader/_components/double-renderer/double-renderer.component.scss b/UI/Web/src/app/manga-reader/_components/double-renderer/double-renderer.component.scss index f2d9d0f7c..e02dce50a 100644 --- a/UI/Web/src/app/manga-reader/_components/double-renderer/double-renderer.component.scss +++ b/UI/Web/src/app/manga-reader/_components/double-renderer/double-renderer.component.scss @@ -3,18 +3,25 @@ .image-container { #image-1 { &.double { - margin: 0 0 0 auto; } } } -.image-container.full-height { - display: inline-block !important; +.image-container { + &.full-height { + display: flex; + align-content: center; + justify-content: center; + } + + .full-height { + margin: unset; + object-fit: contain; + } } .full-width { width: 100%; - margin: 0 auto; vertical-align: top; max-width: fit-content; @@ -41,7 +48,7 @@ } .fit-to-height-double-offset { - height: 100vh; + height: calc(100dvh); object-fit: scale-down; top: 50%; left: 50%; diff --git a/UI/Web/src/app/manga-reader/_components/double-reverse-renderer/double-reverse-renderer.component.scss b/UI/Web/src/app/manga-reader/_components/double-reverse-renderer/double-reverse-renderer.component.scss index e0682758f..1f62cb7af 100644 --- a/UI/Web/src/app/manga-reader/_components/double-reverse-renderer/double-reverse-renderer.component.scss +++ b/UI/Web/src/app/manga-reader/_components/double-reverse-renderer/double-reverse-renderer.component.scss @@ -2,7 +2,7 @@ // Overrides for reverse .image-container { - height: calc(100vh); // override as on single, we -34px for the potential scrollbar + height: calc(100dvh); // override as on single, we -34px for the potential scrollbar &.reverse { overflow: unset; @@ -29,8 +29,16 @@ } } -.image-container.full-height { - display: inline-block; +.image-container { + display: flex; + align-content: center; + justify-content: center; + + + .full-height { + margin: unset; + object-fit: contain; + } } .full-width { @@ -62,7 +70,7 @@ } .fit-to-height-double-offset { - height: 100vh; + height: calc(100dvh); object-fit: scale-down; top: 50%; left: 50%; diff --git a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html index b9e3c2078..dabfeb095 100644 --- a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html +++ b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.html @@ -41,7 +41,7 @@
+ [ngStyle]="{'background-color': backgroundColor, 'height': readerMode === ReaderMode.Webtoon ? 'inherit' : '100dvh'}" #readingArea>
@@ -56,14 +56,14 @@
+ [ngStyle]="{'height': (readerMode === ReaderMode.LeftRight ? MaxHeight: '25%'), 'max-height': MaxHeight}">
diff --git a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.scss b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.scss index 1f4a6391d..ba8464259 100644 --- a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.scss +++ b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.scss @@ -16,7 +16,6 @@ $pointer-offset: 5px; .reading-area { - position: relative; overflow: auto; text-align: center; //height: calc(var(--vh)*100); // this needs to be applied on the DOM because it breaks infinite scroller diff --git a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts index 9fe413cb2..6648c6f33 100644 --- a/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts +++ b/UI/Web/src/app/manga-reader/_components/manga-reader/manga-reader.component.ts @@ -432,17 +432,7 @@ export class MangaReaderComponent implements OnInit, AfterViewInit, OnDestroy { // This is for the pagination area get MaxHeight() { - if (this.FittingOption === FITTING_OPTION.HEIGHT) { - return 'calc(var(--vh) * 100)'; - } - - const needsScrolling = this.readingArea?.nativeElement?.scrollHeight > this.readingArea?.nativeElement?.clientHeight; - if (this.readingArea?.nativeElement?.clientHeight <= this.mangaReaderService.getPageDimensions(this.pageNum)?.height!) { - if (needsScrolling) { - return Math.min(this.readingArea?.nativeElement?.scrollHeight, this.mangaReaderService.getPageDimensions(this.pageNum)?.height!) + 'px'; - } - } - return this.readingArea?.nativeElement?.clientHeight + 'px'; + return '100dvh'; } get RightPaginationOffset() { diff --git a/UI/Web/src/app/manga-reader/_components/single-renderer/single-renderer.component.ts b/UI/Web/src/app/manga-reader/_components/single-renderer/single-renderer.component.ts index 912877f4e..bf774c473 100644 --- a/UI/Web/src/app/manga-reader/_components/single-renderer/single-renderer.component.ts +++ b/UI/Web/src/app/manga-reader/_components/single-renderer/single-renderer.component.ts @@ -150,14 +150,14 @@ export class SingleRendererComponent implements OnInit, ImageRenderer { if (mode !== FITTING_OPTION.HEIGHT) return ''; const readingArea = this.document.querySelector('.reading-area'); - if (!readingArea) return 'calc(100vh)'; + if (!readingArea) return 'calc(100dvh)'; // If you ever see fit to height and a bit of scrollbar, it's due to currentImage not being ready on first load if (this.currentImage?.width - readingArea.scrollWidth > 0) { // we also need to check if this is FF or Chrome. FF doesn't require the -34px as it doesn't render a scrollbar - return 'calc(100vh - 34px)'; + return 'calc(100dvh)'; } - return 'calc(100vh)'; + return 'calc(100dvh)'; }), filter(_ => this.isValid()) ); diff --git a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts index 100790efb..7f073519a 100644 --- a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts +++ b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts @@ -118,7 +118,7 @@ export class EventsWidgetComponent implements OnInit, OnDestroy { this.cdRef.markForCheck(); break; case 'started': - // Sometimes we can receive 2 started on long running scans, so better to just treat as a merge then. + // Sometimes we can receive 2 started on long-running scans, so better to just treat as a merge then. data = this.mergeOrUpdate(this.progressEventsSource.getValue(), message); this.progressEventsSource.next(data); break; diff --git a/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html index 31a6a47de..ec5183141 100644 --- a/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html +++ b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html @@ -3,137 +3,145 @@

{{readingList?.title}} - () + @if (readingList?.promoted) { + () + }

{{t('item-count', {num: items.length | number})}}
-
-
-

{{t('page-settings-title')}}

- -
-
-
-
- +
+
+
+
+ +  {{t('remove-read')}} + -
-
- - -
+ @if (!(readingList.promoted && !this.isAdmin)) { +
+
+ + +
+
+ }
-
+ } -
-
-
- -
-
-
-
- -
- -
- -
- +
+ +
+ - + - + + +
-
-
-

- {{(readingList.startingMonth +'/01/2020')| date:'MMM'}} - , - {{readingList.startingYear}} - — - - {{(readingList.endingMonth +'/01/2020') | date:'MMM'}} - , - {{readingList.endingYear}} - +
+

+ {{(readingList.startingMonth +'/01/2020')| date:'MMM'}} + , + {{readingList.startingYear}} + — + + {{(readingList.endingMonth +'/01/2020') | date:'MMM'}} + , + {{readingList.endingYear}} + -

-
- -
- +

+
+ +
+ +
-
- -
-
-
{{t('characters-title')}}
- - - - - -
-
- - -
- -
- {{t('no-data')}} + +
+
+
{{t('characters-title')}}
+ + + + + +
- - - - - - +
+ +
+ {{t('no-data')}} +
+ + + - -
-
+ + + + + +
+
+ } diff --git a/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts index 23b1982a7..aab61cb5d 100644 --- a/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts +++ b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.ts @@ -3,7 +3,7 @@ import {ActivatedRoute, Router} from '@angular/router'; import {ToastrService} from 'ngx-toastr'; import {take} from 'rxjs/operators'; import {ConfirmService} from 'src/app/shared/confirm.service'; -import {UtilityService} from 'src/app/shared/_services/utility.service'; +import {Breakpoint, UtilityService} from 'src/app/shared/_services/utility.service'; import {LibraryType} from 'src/app/_models/library/library'; import {MangaFormat} from 'src/app/_models/manga-format'; import {ReadingList, ReadingListItem} from 'src/app/_models/reading-list'; @@ -32,7 +32,7 @@ import {AsyncPipe, DatePipe, DecimalPipe, NgClass, NgIf} from '@angular/common'; import { SideNavCompanionBarComponent } from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component'; -import {translate, TranslocoDirective, TranslocoService} from "@ngneat/transloco"; +import {translate, TranslocoDirective} from "@ngneat/transloco"; import {CardActionablesComponent} from "../../../_single-module/card-actionables/card-actionables.component"; import {FilterUtilitiesService} from "../../../shared/_services/filter-utilities.service"; import {FilterField} from "../../../_models/metadata/v2/filter-field"; @@ -53,6 +53,26 @@ import {Title} from "@angular/platform-browser"; MetadataDetailComponent] }) export class ReadingListDetailComponent implements OnInit { + + private route = inject(ActivatedRoute); + private router = inject(Router); + private readingListService = inject(ReadingListService); + private actionService = inject(ActionService); + private actionFactoryService = inject(ActionFactoryService); + public utilityService = inject(UtilityService); + public imageService = inject(ImageService); + private accountService = inject(AccountService); + private toastr = inject(ToastrService); + private confirmService = inject(ConfirmService); + private libraryService = inject(LibraryService); + private readerService = inject(ReaderService); + private cdRef = inject(ChangeDetectorRef); + private filterUtilityService = inject(FilterUtilitiesService); + private titleService = inject(Title); + + protected readonly MangaFormat = MangaFormat; + protected readonly Breakpoint = Breakpoint; + items: Array = []; listId!: number; readingList: ReadingList | undefined; @@ -65,15 +85,8 @@ export class ReadingListDetailComponent implements OnInit { libraryTypes: {[key: number]: LibraryType} = {}; characters$!: Observable; - private translocoService = inject(TranslocoService); - protected readonly MangaFormat = MangaFormat; - constructor(private route: ActivatedRoute, private router: Router, private readingListService: ReadingListService, - private actionService: ActionService, private actionFactoryService: ActionFactoryService, public utilityService: UtilityService, - public imageService: ImageService, private accountService: AccountService, private toastr: ToastrService, - private confirmService: ConfirmService, private libraryService: LibraryService, private readerService: ReaderService, - private readonly cdRef: ChangeDetectorRef, private filterUtilityService: FilterUtilitiesService, private titleService: Title) { - } + ngOnInit(): void { const listId = this.route.snapshot.paramMap.get('id'); @@ -86,6 +99,9 @@ export class ReadingListDetailComponent implements OnInit { this.listId = parseInt(listId, 10); this.characters$ = this.readingListService.getCharacters(this.listId); + this.accessibilityMode = this.utilityService.getActiveBreakpoint() < Breakpoint.Tablet; + this.cdRef.markForCheck(); + forkJoin([ this.libraryService.getLibraries(), this.readingListService.getReadingList(this.listId) @@ -165,10 +181,10 @@ export class ReadingListDetailComponent implements OnInit { } async deleteList(readingList: ReadingList) { - if (!await this.confirmService.confirm(this.translocoService.translate('toasts.confirm-delete-reading-list'))) return; + if (!await this.confirmService.confirm(translate('toasts.confirm-delete-reading-list'))) return; this.readingListService.delete(readingList.id).subscribe(() => { - this.toastr.success(this.translocoService.translate('toasts.reading-list-deleted')); + this.toastr.success(translate('toasts.reading-list-deleted')); this.router.navigateByUrl('/lists'); }); } @@ -186,7 +202,7 @@ export class ReadingListDetailComponent implements OnInit { this.items.splice(position, 1); this.items = [...this.items]; this.cdRef.markForCheck(); - this.toastr.success(this.translocoService.translate('toasts.item-removed')); + this.toastr.success(translate('toasts.item-removed')); }); } @@ -196,7 +212,7 @@ export class ReadingListDetailComponent implements OnInit { this.cdRef.markForCheck(); this.readingListService.removeRead(this.readingList.id).subscribe((resp) => { if (resp === 'Nothing to remove') { - this.toastr.info(this.translocoService.translate('toasts.nothing-to-remove')); + this.toastr.info(translate('toasts.nothing-to-remove')); return; } this.getListItems(); diff --git a/UI/Web/src/app/user-settings/theme-manager/theme-manager.component.html b/UI/Web/src/app/user-settings/theme-manager/theme-manager.component.html index fa493d0c8..7563ee311 100644 --- a/UI/Web/src/app/user-settings/theme-manager/theme-manager.component.html +++ b/UI/Web/src/app/user-settings/theme-manager/theme-manager.component.html @@ -8,7 +8,7 @@
-
+
    @@ -23,93 +23,95 @@
-
- @if (selectedTheme === undefined) { +
+
-
-
-
-
- @if (hasAdmin$ | async) { - {{t('preview-default-admin')}} - } @else { - {{t('preview-default')}} - } + @if (selectedTheme === undefined) { +
+
+
+
+ @if (hasAdmin$ | async) { + {{t('preview-default-admin')}} + } @else { + {{t('preview-default')}} + } +
-
- @if (files && files.length > 0) { - - } @else if (hasAdmin$ | async) { - + @if (files && files.length > 0) { + + } @else if (hasAdmin$ | async) { + - -
-
-
- -
+ +
+
+
+ +
-
-
- {{t('drag-n-drop')}} - • - {{t('upload')}} {{t('upload-continued')}} +
+
+ {{t('drag-n-drop')}} + • + {{t('upload')}} {{t('upload-continued')}} +
-
- + + + + } - } - - } - @else { -

- {{selectedTheme.name | sentenceCase}} -
- @if (selectedTheme.isSiteTheme) { - @if (selectedTheme.name !== 'Dark') { - + @else { +

+ {{selectedTheme.name | sentenceCase}} +
+ @if (selectedTheme.isSiteTheme) { + @if (selectedTheme.name !== 'Dark') { + + } + @if (hasAdmin$ | async) { + + } + + } @else { + } - @if (hasAdmin$ | async) { - - } - - } @else { - - } -
-

- @if(!selectedTheme.isSiteTheme) { -

{{selectedTheme.downloadable!.description | defaultValue}}

+
+

+ @if(!selectedTheme.isSiteTheme) { +

{{selectedTheme.downloadable!.description | defaultValue}}

- - - - - - - - } @else { -

{{selectedTheme.site!.description | defaultValue}}

+ + + + + + + + } @else { +

{{selectedTheme.site!.description | defaultValue}}

- - - - - - - + + + + + + + + } } - } +
@@ -122,12 +124,12 @@
{{item.name | sentenceCase}}
@if (item.hasOwnProperty('provider')) { - {{item.provider | siteThemeProvider}} + {{item.provider | siteThemeProvider}} } @else if (item.hasOwnProperty('lastCompatibleVersion')) { - {{ThemeProvider.Custom | siteThemeProvider}} • v{{item.lastCompatibleVersion}} + {{ThemeProvider.Custom | siteThemeProvider}}v{{item.lastCompatibleVersion}} } @if (currentTheme && item.name === currentTheme.name) { - • {{t('active-theme')}} + {{t('active-theme')}} }
@if (item.hasOwnProperty('isDefault') && item.isDefault) { diff --git a/UI/Web/src/app/user-settings/theme-manager/theme-manager.component.scss b/UI/Web/src/app/user-settings/theme-manager/theme-manager.component.scss index a333e8571..f7c255557 100644 --- a/UI/Web/src/app/user-settings/theme-manager/theme-manager.component.scss +++ b/UI/Web/src/app/user-settings/theme-manager/theme-manager.component.scss @@ -10,6 +10,25 @@ justify-content: space-around; } +.scroller { + max-height: calc(100dvh - 280px); + overflow-y: auto; +} + +.pill { + font-size: .8rem; + background-color: var(--card-bg-color); + border-radius: 0.375rem; + &.active { + background-color : var(--primary-color); + } +} + +.list-group-item, .list-group-item.active { + border-top-width: 0; + border-bottom-width: 0; +} + ngx-file-drop ::ng-deep > div { // styling for the outer drop box width: 100%; diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json index 1e6e61bc8..38e7dcaab 100644 --- a/UI/Web/src/assets/langs/en.json +++ b/UI/Web/src/assets/langs/en.json @@ -33,6 +33,7 @@ "user-scrobble-history": { "title": "Scrobble History", "description": "Here you will find any scrobble events linked with your account. In order for events to exist, you must have an active scrobble provider configured. All events that have been processed will clear after a month. If there are non-processed events, it is likely these cannot form matches upstream. Please reach out to your admin to get them corrected.", + "not-read-warning": "Upstream providers will always keep the highest number", "filter-label": "{{common.filter}}", "created-header": "Created", "last-modified-header": "Last Modified", @@ -47,7 +48,8 @@ "rating": "Rating {{r}}", "not-applicable": "Not Applicable", "processed": "Processed", - "not-processed": "Not Processed" + "not-processed": "Not Processed", + "special": "{{entity-title.special}}" }, "scrobble-event-type-pipe": { @@ -197,7 +199,8 @@ "upload": "{{cover-image-chooser.upload}}", "upload-continued": "a css file", "preview-default": "Select a theme first", - "preview-default-admin": "Select a theme first or upload one manually" + "preview-default-admin": "Select a theme first or upload one manually", + "preview-title": "Preview" }, "theme": { @@ -1122,6 +1125,8 @@ "manage-email-settings": { "title": "Email Services (SMTP)", "description": "In order to use some functions of Kavita like Forgot Password and Send To Device, an email provider must be setup. Other features like Password change are less secure without Email setup.", + "setting-description": "You must fill out both Host Name and SMTP settings to use email-based functionality within Kavita.", + "test-warning": "You must save before using Test button.", "send-to-warning": "If you want Send to Device to work you must setup your email settings", "email-url-label": "Email Service URL", "email-url-tooltip": "Use fully qualified URL of the email service. Do not include ending slash.", @@ -2199,8 +2204,8 @@ "collections-deleted": "Collections deleted", "pdf-book-mode-screen-size": "Screen too small for Book mode", "stack-imported": "Stack Imported", - "confirm-delete-theme": "Removing this theme will delete it from the disk. You can grab it from temp directory before removal" - + "confirm-delete-theme": "Removing this theme will delete it from the disk. You can grab it from temp directory before removal", + "mal-token-required": "MAL Token is required, set in User Settings" }, "actionable": { diff --git a/UI/Web/src/theme/components/_card.scss b/UI/Web/src/theme/components/_card.scss index 35786d643..40583ad8f 100644 --- a/UI/Web/src/theme/components/_card.scss +++ b/UI/Web/src/theme/components/_card.scss @@ -15,6 +15,7 @@ } $image-height: 230px; +$image-filter-height: 160px; $image-width: 160px; .card-item-container { @@ -62,6 +63,14 @@ $image-width: 160px; border-top-right-radius: 4px; z-index: 10; + &.filter { + height: $image-filter-height; + + .card-overlay { + height: $image-filter-height; + } + } + &:hover { visibility: visible; } diff --git a/openapi.json b/openapi.json index 2315d6b7d..e94dbbce1 100644 --- a/openapi.json +++ b/openapi.json @@ -7,7 +7,7 @@ "name": "GPL-3.0", "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" }, - "version": "0.8.1.3" + "version": "0.8.1.4" }, "servers": [ {