chore(deps): upgrade prettier, and tailwind (#2351)

This commit is contained in:
fallenbagel
2026-01-29 11:48:34 +05:00
committed by GitHub
parent 5bd31040c0
commit 8b41685b31
159 changed files with 1022 additions and 910 deletions

View File

@@ -4,15 +4,17 @@ dist/
config/ config/
pnpm-lock.yaml pnpm-lock.yaml
cypress/config/settings.cypress.json cypress/config/settings.cypress.json
.github
.vscode
# assets # assets
src/assets/ src/assets/
public/
!public/sw.js
docs/ docs/
!/public/ public/*
/public/* !public/sw.js
!/public/sw.js
# helm charts # helm charts
**/charts **/charts
# Prettier breaks GitHub alert syntax in markdown
*.md

View File

@@ -1,5 +1,5 @@
module.exports = { module.exports = {
plugins: [require('./merged-prettier-plugin.js')], plugins: ['prettier-plugin-organize-imports', 'prettier-plugin-tailwindcss'],
singleQuote: true, singleQuote: true,
trailingComma: 'es5', trailingComma: 'es5',
overrides: [ overrides: [
@@ -27,5 +27,11 @@ module.exports = {
rangeEnd: 0, rangeEnd: 0,
}, },
}, },
{
files: 'public/offline.html',
options: {
rangeEnd: 0,
},
},
], ],
}; };

View File

@@ -1,21 +0,0 @@
/* eslint-disable */
const tailwind = require('prettier-plugin-tailwindcss');
const organizeImports = require('prettier-plugin-organize-imports');
const combinedFormatter = {
...tailwind,
parsers: {
...tailwind.parsers,
...Object.keys(organizeImports.parsers).reduce((acc, key) => {
acc[key] = {
...tailwind.parsers[key],
preprocess(code, options) {
return organizeImports.parsers[key].preprocess(code, options);
},
};
return acc;
}, {}),
},
};
module.exports = combinedFormatter;

View File

@@ -16,7 +16,7 @@
"migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts", "migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts",
"migration:create": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create -d server/datasource.ts", "migration:create": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create -d server/datasource.ts",
"migration:run": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run -d server/datasource.ts", "migration:run": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run -d server/datasource.ts",
"format": "prettier --loglevel warn --write --cache .", "format": "prettier --log-level warn --write --cache .",
"format:check": "prettier --check --cache .", "format:check": "prettier --check --cache .",
"typecheck": "pnpm typecheck:server && pnpm typecheck:client", "typecheck": "pnpm typecheck:server && pnpm typecheck:client",
"typecheck:server": "tsc --project server/tsconfig.json --noEmit", "typecheck:server": "tsc --project server/tsconfig.json --noEmit",
@@ -116,9 +116,9 @@
"devDependencies": { "devDependencies": {
"@commitlint/cli": "17.4.4", "@commitlint/cli": "17.4.4",
"@commitlint/config-conventional": "17.4.4", "@commitlint/config-conventional": "17.4.4",
"@tailwindcss/aspect-ratio": "0.4.2", "@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/forms": "0.5.10", "@tailwindcss/forms": "^0.5.10",
"@tailwindcss/typography": "0.5.16", "@tailwindcss/typography": "^0.5.16",
"@types/bcrypt": "6.0.0", "@types/bcrypt": "6.0.0",
"@types/cookie-parser": "1.4.10", "@types/cookie-parser": "1.4.10",
"@types/country-flag-icons": "1.2.2", "@types/country-flag-icons": "1.2.2",
@@ -144,7 +144,7 @@
"@types/yup": "0.29.14", "@types/yup": "0.29.14",
"@typescript-eslint/eslint-plugin": "7.18.0", "@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0", "@typescript-eslint/parser": "7.18.0",
"autoprefixer": "10.4.23", "autoprefixer": "^10.4.23",
"baseline-browser-mapping": "^2.8.32", "baseline-browser-mapping": "^2.8.32",
"commitizen": "4.3.1", "commitizen": "4.3.1",
"copyfiles": "2.4.1", "copyfiles": "2.4.1",
@@ -152,7 +152,7 @@
"cypress": "14.5.4", "cypress": "14.5.4",
"cz-conventional-changelog": "3.3.0", "cz-conventional-changelog": "3.3.0",
"eslint": "8.57.1", "eslint": "8.57.1",
"eslint-config-next": "^14.2.4", "eslint-config-next": "^14.2.35",
"eslint-config-prettier": "8.6.0", "eslint-config-prettier": "8.6.0",
"eslint-plugin-formatjs": "4.9.0", "eslint-plugin-formatjs": "4.9.0",
"eslint-plugin-jsx-a11y": "6.10.2", "eslint-plugin-jsx-a11y": "6.10.2",
@@ -163,11 +163,11 @@
"husky": "8.0.3", "husky": "8.0.3",
"lint-staged": "13.1.2", "lint-staged": "13.1.2",
"nodemon": "3.1.11", "nodemon": "3.1.11",
"postcss": "8.5.6", "postcss": "^8.5.6",
"prettier": "2.8.4", "prettier": "3.8.1",
"prettier-plugin-organize-imports": "3.2.2", "prettier-plugin-organize-imports": "4.3.0",
"prettier-plugin-tailwindcss": "0.2.3", "prettier-plugin-tailwindcss": "0.6.14",
"tailwindcss": "3.2.7", "tailwindcss": "3.4.19",
"ts-node": "10.9.2", "ts-node": "10.9.2",
"tsc-alias": "1.8.16", "tsc-alias": "1.8.16",
"tsconfig-paths": "4.2.0", "tsconfig-paths": "4.2.0",

568
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -57,7 +57,7 @@ interface GithubCommit {
sha: string; sha: string;
url: string; url: string;
html_url: string; html_url: string;
} },
]; ];
} }

View File

@@ -420,7 +420,7 @@ class JellyfinAPI extends ExternalAPI {
} }
public async getEpisodes< public async getEpisodes<
T extends { includeMediaInfo?: boolean } | undefined = undefined T extends { includeMediaInfo?: boolean } | undefined = undefined,
>( >(
seriesID: string, seriesID: string,
seasonID: string, seasonID: string,

View File

@@ -21,7 +21,7 @@ export const mapSounds = (sounds: {
({ ({
name, name,
description, description,
} as PushoverSound) }) as PushoverSound
); );
class PushoverAPI extends ExternalAPI { class PushoverAPI extends ExternalAPI {

View File

@@ -392,8 +392,10 @@ export interface TmdbPersonCombinedCredits {
crew: TmdbPersonCreditCrew[]; crew: TmdbPersonCreditCrew[];
} }
export interface TmdbSeasonWithEpisodes export interface TmdbSeasonWithEpisodes extends Omit<
extends Omit<TmdbTvSeasonResult, 'episode_count'> { TmdbTvSeasonResult,
'episode_count'
> {
episodes: TmdbTvEpisodeResult[]; episodes: TmdbTvEpisodeResult[];
external_ids: TmdbExternalIds; external_ids: TmdbExternalIds;
} }

View File

@@ -271,7 +271,7 @@ export class User {
}); });
const movieQuotaLimit = !canBypass const movieQuotaLimit = !canBypass
? this.movieQuotaLimit ?? defaultQuotas.movie.quotaLimit ? (this.movieQuotaLimit ?? defaultQuotas.movie.quotaLimit)
: 0; : 0;
const movieQuotaDays = this.movieQuotaDays ?? defaultQuotas.movie.quotaDays; const movieQuotaDays = this.movieQuotaDays ?? defaultQuotas.movie.quotaDays;
@@ -295,7 +295,7 @@ export class User {
: 0; : 0;
const tvQuotaLimit = !canBypass const tvQuotaLimit = !canBypass
? this.tvQuotaLimit ?? defaultQuotas.tv.quotaLimit ? (this.tvQuotaLimit ?? defaultQuotas.tv.quotaLimit)
: 0; : 0;
const tvQuotaDays = this.tvQuotaDays ?? defaultQuotas.tv.quotaDays; const tvQuotaDays = this.tvQuotaDays ?? defaultQuotas.tv.quotaDays;

View File

@@ -122,7 +122,7 @@ class WebhookAgent
`{{${keymapKey}}}`, `{{${keymapKey}}}`,
typeof keymapValue === 'function' typeof keymapValue === 'function'
? keymapValue(payload, type) ? keymapValue(payload, type)
: get(payload, keymapValue) ?? '' : (get(payload, keymapValue) ?? '')
); );
}); });
} else if (finalPayload[key] && typeof finalPayload[key] === 'object') { } else if (finalPayload[key] && typeof finalPayload[key] === 'object') {

View File

@@ -59,8 +59,7 @@ searchProviders.push({
const successfulResponses = responses.filter( const successfulResponses = responses.filter(
(r) => r.status === 'fulfilled' (r) => r.status === 'fulfilled'
) as ) as (
| (
| PromiseFulfilledResult<TmdbMovieDetails> | PromiseFulfilledResult<TmdbMovieDetails>
| PromiseFulfilledResult<TmdbTvDetails> | PromiseFulfilledResult<TmdbTvDetails>
| PromiseFulfilledResult<TmdbPersonDetails> | PromiseFulfilledResult<TmdbPersonDetails>
@@ -185,8 +184,7 @@ searchProviders.push({
const successfulResponses = responses.filter( const successfulResponses = responses.filter(
(r) => r.status === 'fulfilled' (r) => r.status === 'fulfilled'
) as ) as (
| (
| PromiseFulfilledResult<TmdbSearchMovieResponse> | PromiseFulfilledResult<TmdbSearchMovieResponse>
| PromiseFulfilledResult<TmdbSearchTvResponse> | PromiseFulfilledResult<TmdbSearchTvResponse>
)[]; )[];

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddTelegramMessageThreadId1734786596045 export class AddTelegramMessageThreadId1734786596045 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddTelegramMessageThreadId1734786596045'; name = 'AddTelegramMessageThreadId1734786596045';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddUserAvatarCacheFields1743107707465 export class AddUserAvatarCacheFields1743107707465 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddUserAvatarCacheFields1743107707465'; name = 'AddUserAvatarCacheFields1743107707465';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddUniqueConstraintToPushSubscription1765233385034 export class AddUniqueConstraintToPushSubscription1765233385034 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddUniqueConstraintToPushSubscription1765233385034'; name = 'AddUniqueConstraintToPushSubscription1765233385034';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddUserRequestDeleteCascades1608219049304 export class AddUserRequestDeleteCascades1608219049304 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddUserRequestDeleteCascades1608219049304'; name = 'AddUserRequestDeleteCascades1608219049304';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddLastSeasonChangeMedia1608477467935 export class AddLastSeasonChangeMedia1608477467935 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddLastSeasonChangeMedia1608477467935'; name = 'AddLastSeasonChangeMedia1608477467935';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class ForceDropImdbUniqueConstraint1608477467935 export class ForceDropImdbUniqueConstraint1608477467935 implements MigrationInterface {
implements MigrationInterface
{
name = 'ForceDropImdbUniqueConstraint1608477467936'; name = 'ForceDropImdbUniqueConstraint1608477467936';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class RemoveTmdbIdUniqueConstraint1609236552057 export class RemoveTmdbIdUniqueConstraint1609236552057 implements MigrationInterface {
implements MigrationInterface
{
name = 'RemoveTmdbIdUniqueConstraint1609236552057'; name = 'RemoveTmdbIdUniqueConstraint1609236552057';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddMediaAddedFieldToMedia1610522845513 export class AddMediaAddedFieldToMedia1610522845513 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddMediaAddedFieldToMedia1610522845513'; name = 'AddMediaAddedFieldToMedia1610522845513';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class SonarrRadarrSyncServiceFields1611757511674 export class SonarrRadarrSyncServiceFields1611757511674 implements MigrationInterface {
implements MigrationInterface
{
name = 'SonarrRadarrSyncServiceFields1611757511674'; name = 'SonarrRadarrSyncServiceFields1611757511674';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddResetPasswordGuidAndExpiryDate1612482778137 export class AddResetPasswordGuidAndExpiryDate1612482778137 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddResetPasswordGuidAndExpiryDate1612482778137'; name = 'AddResetPasswordGuidAndExpiryDate1612482778137';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class UpdateUserSettingsRegions1613955393450 export class UpdateUserSettingsRegions1613955393450 implements MigrationInterface {
implements MigrationInterface
{
name = 'UpdateUserSettingsRegions1613955393450'; name = 'UpdateUserSettingsRegions1613955393450';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddTelegramSettingsToUserSettings1614334195680 export class AddTelegramSettingsToUserSettings1614334195680 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddTelegramSettingsToUserSettings1614334195680'; name = 'AddTelegramSettingsToUserSettings1614334195680';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class CreateTagsFieldonMediaRequest1617624225464 export class CreateTagsFieldonMediaRequest1617624225464 implements MigrationInterface {
implements MigrationInterface
{
name = 'CreateTagsFieldonMediaRequest1617624225464'; name = 'CreateTagsFieldonMediaRequest1617624225464';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddUserSettingsNotificationAgentsField1617730837489 export class AddUserSettingsNotificationAgentsField1617730837489 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddUserSettingsNotificationAgentsField1617730837489'; name = 'AddUserSettingsNotificationAgentsField1617730837489';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class CreateUserPushSubscriptions1618912653565 export class CreateUserPushSubscriptions1618912653565 implements MigrationInterface {
implements MigrationInterface
{
name = 'CreateUserPushSubscriptions1618912653565'; name = 'CreateUserPushSubscriptions1618912653565';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddUserSettingsNotificationTypes1619339817343 export class AddUserSettingsNotificationTypes1619339817343 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddUserSettingsNotificationTypes1619339817343'; name = 'AddUserSettingsNotificationTypes1619339817343';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddPushbulletPushoverUserSettings1635079863457 export class AddPushbulletPushoverUserSettings1635079863457 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddPushbulletPushoverUserSettings1635079863457'; name = 'AddPushbulletPushoverUserSettings1635079863457';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddWatchlistSyncUserSetting1660632269368 export class AddWatchlistSyncUserSetting1660632269368 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddWatchlistSyncUserSetting1660632269368'; name = 'AddWatchlistSyncUserSetting1660632269368';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddMediaRequestIsAutoRequestedField1660714479373 export class AddMediaRequestIsAutoRequestedField1660714479373 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddMediaRequestIsAutoRequestedField1660714479373'; name = 'AddMediaRequestIsAutoRequestedField1660714479373';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddUserSettingsStreamingRegion1727907530757 export class AddUserSettingsStreamingRegion1727907530757 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddUserSettingsStreamingRegion1727907530757'; name = 'AddUserSettingsStreamingRegion1727907530757';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddTelegramMessageThreadId1734287582736 export class AddTelegramMessageThreadId1734287582736 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddTelegramMessageThreadId1734287582736'; name = 'AddTelegramMessageThreadId1734287582736';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddUserAvatarCacheFields1743107645301 export class AddUserAvatarCacheFields1743107645301 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddUserAvatarCacheFields1743107645301'; name = 'AddUserAvatarCacheFields1743107645301';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -1,8 +1,6 @@
import type { MigrationInterface, QueryRunner } from 'typeorm'; import type { MigrationInterface, QueryRunner } from 'typeorm';
export class AddUniqueConstraintToPushSubscription1765233385034 export class AddUniqueConstraintToPushSubscription1765233385034 implements MigrationInterface {
implements MigrationInterface
{
name = 'AddUniqueConstraintToPushSubscription1765233385034'; name = 'AddUniqueConstraintToPushSubscription1765233385034';
public async up(queryRunner: QueryRunner): Promise<void> { public async up(queryRunner: QueryRunner): Promise<void> {

View File

@@ -149,7 +149,7 @@ export const mapWatchProviders = (watchProvidersResult: {
link: provider.link, link: provider.link,
buy: mapWatchProviderDetails(provider.buy ?? []), buy: mapWatchProviderDetails(provider.buy ?? []),
flatrate: mapWatchProviderDetails(provider.flatrate ?? []), flatrate: mapWatchProviderDetails(provider.flatrate ?? []),
} as WatchProviders) }) as WatchProviders
); );
export const mapWatchProviderDetails = ( export const mapWatchProviderDetails = (
@@ -162,10 +162,10 @@ export const mapWatchProviderDetails = (
logoPath: provider.logo_path, logoPath: provider.logo_path,
id: provider.provider_id, id: provider.provider_id,
name: provider.provider_name, name: provider.provider_name,
} as WatchProviderDetails) }) as WatchProviderDetails
); );
const siteUrlCreator = (site: Video['site'], key: string): string => const siteUrlCreator = (site: Video['site'], key: string): string =>
({ ({
YouTube: `https://www.youtube.com/watch?v=${key}`, YouTube: `https://www.youtube.com/watch?v=${key}`,
}[site]); })[site];

View File

@@ -13,9 +13,7 @@ import type { EntitySubscriberInterface, InsertEvent } from 'typeorm';
import { EventSubscriber } from 'typeorm'; import { EventSubscriber } from 'typeorm';
@EventSubscriber() @EventSubscriber()
export class IssueCommentSubscriber export class IssueCommentSubscriber implements EntitySubscriberInterface<IssueComment> {
implements EntitySubscriberInterface<IssueComment>
{
public listenTo(): typeof IssueComment { public listenTo(): typeof IssueComment {
return IssueComment; return IssueComment;
} }

View File

@@ -40,9 +40,7 @@ const sanitizeDisplayName = (displayName: string): string => {
}; };
@EventSubscriber() @EventSubscriber()
export class MediaRequestSubscriber export class MediaRequestSubscriber implements EntitySubscriberInterface<MediaRequest> {
implements EntitySubscriberInterface<MediaRequest>
{
private async notifyAvailableMovie( private async notifyAvailableMovie(
entity: MediaRequest, entity: MediaRequest,
event?: UpdateEvent<MediaRequest> event?: UpdateEvent<MediaRequest>

View File

@@ -1,7 +1,10 @@
import type { ApiErrorCode } from '@server/constants/error'; import type { ApiErrorCode } from '@server/constants/error';
export class ApiError extends Error { export class ApiError extends Error {
constructor(public statusCode: number, public errorCode: ApiErrorCode) { constructor(
public statusCode: number,
public errorCode: ApiErrorCode
) {
super(); super();
this.name = 'apiError'; this.name = 'apiError';

View File

@@ -385,7 +385,7 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
</div> </div>
</div> </div>
<div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0"> <div className="z-10 ml-4 mt-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
<div className="card-field"> <div className="card-field">
<span className="card-field-name">Status</span> <span className="card-field-name">Status</span>
<Badge badgeType="danger"> <Badge badgeType="danger">

View File

@@ -329,7 +329,7 @@ const BlacklistedTagImportForm = forwardRef<
const VerifyClearIndicator = < const VerifyClearIndicator = <
Option, Option,
IsMuti extends boolean, IsMuti extends boolean,
Group extends GroupBase<Option> Group extends GroupBase<Option>,
>( >(
props: ClearIndicatorProps<Option, IsMuti, Group> props: ClearIndicatorProps<Option, IsMuti, Group>
) => { ) => {

View File

@@ -13,7 +13,7 @@ export type ButtonType =
// Helper type to override types (overrides onClick) // Helper type to override types (overrides onClick)
type MergeElementProps< type MergeElementProps<
T extends React.ElementType, T extends React.ElementType,
P extends Record<string, unknown> P extends Record<string, unknown>,
> = Omit<React.ComponentProps<T>, keyof P> & P; > = Omit<React.ComponentProps<T>, keyof P> & P;
type ElementTypes = 'button' | 'a'; type ElementTypes = 'button' | 'a';

View File

@@ -57,7 +57,7 @@ const DropdownItems = ({
> >
<Menu.Items <Menu.Items
className={[ className={[
'absolute right-0 z-40 mt-2 -mr-1 w-56 origin-top-right rounded-md p-1 shadow-lg', 'absolute right-0 z-40 -mr-1 mt-2 w-56 origin-top-right rounded-md p-1 shadow-lg',
dropdownType === 'ghost' dropdownType === 'ghost'
? 'border border-gray-700 bg-gray-800 bg-opacity-80 backdrop-blur' ? 'border border-gray-700 bg-gray-800 bg-opacity-80 backdrop-blur'
: 'bg-indigo-600', : 'bg-indigo-600',

View File

@@ -91,7 +91,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
<Transition.Child <Transition.Child
appear appear
as="div" as="div"
className="fixed top-0 bottom-0 left-0 right-0 z-50 flex h-full w-full items-center justify-center bg-gray-800 bg-opacity-70" className="fixed bottom-0 left-0 right-0 top-0 z-50 flex h-full w-full items-center justify-center bg-gray-800 bg-opacity-70"
enter="transition-opacity duration-300" enter="transition-opacity duration-300"
enterFrom="opacity-0" enterFrom="opacity-0"
enterTo="opacity-100" enterTo="opacity-100"
@@ -116,7 +116,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
</div> </div>
</Transition> </Transition>
<Transition <Transition
className={`hide-scrollbar relative inline-block w-full overflow-auto bg-gray-800 px-4 pt-4 pb-4 text-left align-bottom shadow-xl ring-1 ring-gray-700 transition-all sm:my-8 sm:max-w-3xl sm:rounded-lg sm:align-middle ${dialogClass}`} className={`hide-scrollbar relative inline-block w-full overflow-auto bg-gray-800 px-4 pb-4 pt-4 text-left align-bottom shadow-xl ring-1 ring-gray-700 transition-all sm:my-8 sm:max-w-3xl sm:rounded-lg sm:align-middle ${dialogClass}`}
role="dialog" role="dialog"
aria-modal="true" aria-modal="true"
aria-labelledby="modal-headline" aria-labelledby="modal-headline"
@@ -135,7 +135,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
ref={modalRef} ref={modalRef}
> >
{backdrop && ( {backdrop && (
<div className="absolute top-0 left-0 right-0 z-0 h-64 max-h-full w-full"> <div className="absolute left-0 right-0 top-0 z-0 h-64 max-h-full w-full">
<CachedImage <CachedImage
type="tmdb" type="tmdb"
alt="" alt=""

View File

@@ -83,7 +83,7 @@ const MultiRangeSlider = ({
max={max} max={max}
value={valueMax} value={valueMax}
step="1" step="1"
className={`pointer-events-none absolute top-0 left-0 right-0 z-20 h-2 w-full cursor-pointer appearance-none rounded-lg bg-transparent`} className={`pointer-events-none absolute left-0 right-0 top-0 z-20 h-2 w-full cursor-pointer appearance-none rounded-lg bg-transparent`}
onChange={(e) => { onChange={(e) => {
const value = Number(e.target.value); const value = Number(e.target.value);

View File

@@ -35,7 +35,7 @@ const SensitiveInput = ({ as = 'input', ...props }: SensitiveInputProps) => {
isHidden isHidden
? 'password' ? 'password'
: props.type !== 'password' : props.type !== 'password'
? props.type ?? 'text' ? (props.type ?? 'text')
: 'text' : 'text'
} }
/> />

View File

@@ -72,7 +72,7 @@ const SlideOver = ({
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}
> >
<div className="flex h-full flex-col rounded-lg bg-gray-800 bg-opacity-80 shadow-xl ring-1 ring-gray-700 backdrop-blur"> <div className="flex h-full flex-col rounded-lg bg-gray-800 bg-opacity-80 shadow-xl ring-1 ring-gray-700 backdrop-blur">
<header className="space-y-1 border-b border-gray-700 py-4 px-4"> <header className="space-y-1 border-b border-gray-700 px-4 py-4">
<div className="flex items-center justify-between space-x-3"> <div className="flex items-center justify-between space-x-3">
<h2 className="text-overseerr text-2xl font-bold leading-7"> <h2 className="text-overseerr text-2xl font-bold leading-7">
{title} {title}

View File

@@ -78,7 +78,7 @@ type TableProps = {
const Table = ({ children }: TableProps) => { const Table = ({ children }: TableProps) => {
return ( return (
<div className="flex flex-col"> <div className="flex flex-col">
<div className="my-2 -mx-4 overflow-x-auto md:mx-0 lg:mx-0"> <div className="-mx-4 my-2 overflow-x-auto md:mx-0 lg:mx-0">
<div className="inline-block min-w-full py-2 align-middle"> <div className="inline-block min-w-full py-2 align-middle">
<div className="overflow-hidden rounded-lg shadow md:mx-0 lg:mx-0"> <div className="overflow-hidden rounded-lg shadow md:mx-0 lg:mx-0">
<table className="min-w-full">{children}</table> <table className="min-w-full">{children}</table>

View File

@@ -43,7 +43,7 @@ const DiscoverMovieGenre = () => {
return ( return (
<> <>
<PageTitle title={title} /> <PageTitle title={title} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{title}</Header> <Header>{title}</Header>
</div> </div>
<ListView <ListView

View File

@@ -49,7 +49,7 @@ const DiscoverMovieKeyword = () => {
return ( return (
<> <>
<PageTitle title={title} /> <PageTitle title={title} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{title}</Header> <Header>{title}</Header>
</div> </div>
<ListView <ListView

View File

@@ -52,7 +52,7 @@ const DiscoverMovieLanguage = () => {
return ( return (
<> <>
<PageTitle title={title} /> <PageTitle title={title} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{title}</Header> <Header>{title}</Header>
</div> </div>
<ListView <ListView

View File

@@ -45,7 +45,7 @@ const DiscoverTvNetwork = () => {
return ( return (
<> <>
<PageTitle title={title} /> <PageTitle title={title} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header> <Header>
{firstResultData?.network.logoPath ? ( {firstResultData?.network.logoPath ? (
<div className="relative mb-6 flex h-24 justify-center sm:h-32"> <div className="relative mb-6 flex h-24 justify-center sm:h-32">

View File

@@ -195,7 +195,7 @@ const DiscoverSliderEdit = ({
className={`absolute -bottom-2 left-0 w-full border-t-4 border-indigo-500`} className={`absolute -bottom-2 left-0 w-full border-t-4 border-indigo-500`}
/> />
)} )}
<div className="flex w-full flex-col rounded-t-lg border-t border-l border-r border-gray-800 bg-gray-900 p-4 text-gray-400 md:flex-row md:items-center md:space-x-2"> <div className="flex w-full flex-col rounded-t-lg border-l border-r border-t border-gray-800 bg-gray-900 p-4 text-gray-400 md:flex-row md:items-center md:space-x-2">
<div <div
className={`${slider.data ? 'mb-4' : 'mb-0'} flex space-x-2 md:mb-0`} className={`${slider.data ? 'mb-4' : 'mb-0'} flex space-x-2 md:mb-0`}
> >
@@ -285,7 +285,7 @@ const DiscoverSliderEdit = ({
</Button> </Button>
</> </>
)} )}
<div className="absolute right-14 top-4 flex px-2 md:relative md:top-0 md:right-0"> <div className="absolute right-14 top-4 flex px-2 md:relative md:right-0 md:top-0">
<button <button
className={'hover:text-white disabled:text-gray-800'} className={'hover:text-white disabled:text-gray-800'}
onClick={() => onClick={() =>
@@ -305,7 +305,7 @@ const DiscoverSliderEdit = ({
<ChevronDownIcon className="h-7 w-7 md:h-6 md:w-6" /> <ChevronDownIcon className="h-7 w-7 md:h-6 md:w-6" />
</button> </button>
</div> </div>
<div className="absolute top-4 right-4 flex-1 text-right md:relative md:top-0 md:right-0"> <div className="absolute right-4 top-4 flex-1 text-right md:relative md:right-0 md:top-0">
<Tooltip content={intl.formatMessage(messages.enable)}> <Tooltip content={intl.formatMessage(messages.enable)}>
<div> <div>
<SlideCheckbox <SlideCheckbox

View File

@@ -45,7 +45,7 @@ const DiscoverMovieStudio = () => {
return ( return (
<> <>
<PageTitle title={title} /> <PageTitle title={title} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header> <Header>
{firstResultData?.studio.logoPath ? ( {firstResultData?.studio.logoPath ? (
<div className="relative mb-6 flex h-24 justify-center sm:h-32"> <div className="relative mb-6 flex h-24 justify-center sm:h-32">

View File

@@ -43,7 +43,7 @@ const DiscoverTvGenre = () => {
return ( return (
<> <>
<PageTitle title={title} /> <PageTitle title={title} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{title}</Header> <Header>{title}</Header>
</div> </div>
<ListView <ListView

View File

@@ -49,7 +49,7 @@ const DiscoverTvKeyword = () => {
return ( return (
<> <>
<PageTitle title={title} /> <PageTitle title={title} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{title}</Header> <Header>{title}</Header>
</div> </div>
<ListView <ListView

View File

@@ -52,7 +52,7 @@ const DiscoverTvLanguage = () => {
return ( return (
<> <>
<PageTitle title={title} /> <PageTitle title={title} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{title}</Header> <Header>{title}</Header>
</div> </div>
<ListView <ListView

View File

@@ -31,7 +31,7 @@ const DiscoverTvUpcoming = () => {
return ( return (
<> <>
<PageTitle title={intl.formatMessage(messages.upcomingtv)} /> <PageTitle title={intl.formatMessage(messages.upcomingtv)} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{intl.formatMessage(messages.upcomingtv)}</Header> <Header>{intl.formatMessage(messages.upcomingtv)}</Header>
</div> </div>
<ListView <ListView

View File

@@ -55,7 +55,7 @@ const DiscoverWatchlist = () => {
<PageTitle <PageTitle
title={[title, router.query.userId ? user?.displayName : '']} title={[title, router.query.userId ? user?.displayName : '']}
/> />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header <Header
subtext={ subtext={
router.query.userId ? ( router.query.userId ? (

View File

@@ -30,7 +30,7 @@ const MovieGenreList = () => {
return ( return (
<> <>
<PageTitle title={intl.formatMessage(messages.moviegenres)} /> <PageTitle title={intl.formatMessage(messages.moviegenres)} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{intl.formatMessage(messages.moviegenres)}</Header> <Header>{intl.formatMessage(messages.moviegenres)}</Header>
</div> </div>
<ul className="cards-horizontal"> <ul className="cards-horizontal">

View File

@@ -36,7 +36,7 @@ const Trending = () => {
return ( return (
<> <>
<PageTitle title={intl.formatMessage(messages.trending)} /> <PageTitle title={intl.formatMessage(messages.trending)} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{intl.formatMessage(messages.trending)}</Header> <Header>{intl.formatMessage(messages.trending)}</Header>
</div> </div>
<ListView <ListView

View File

@@ -30,7 +30,7 @@ const TvGenreList = () => {
return ( return (
<> <>
<PageTitle title={intl.formatMessage(messages.seriesgenres)} /> <PageTitle title={intl.formatMessage(messages.seriesgenres)} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{intl.formatMessage(messages.seriesgenres)}</Header> <Header>{intl.formatMessage(messages.seriesgenres)}</Header>
</div> </div>
<ul className="cards-horizontal"> <ul className="cards-horizontal">

View File

@@ -31,7 +31,7 @@ const UpcomingMovies = () => {
return ( return (
<> <>
<PageTitle title={intl.formatMessage(messages.upcomingmovies)} /> <PageTitle title={intl.formatMessage(messages.upcomingmovies)} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{intl.formatMessage(messages.upcomingmovies)}</Header> <Header>{intl.formatMessage(messages.upcomingmovies)}</Header>
</div> </div>
<ListView <ListView

View File

@@ -127,7 +127,7 @@ const Discover = () => {
<> <>
{isEditing && ( {isEditing && (
<div className="my-6 rounded-lg bg-gray-800"> <div className="my-6 rounded-lg bg-gray-800">
<div className="flex items-center space-x-2 rounded-t-lg border-t border-l border-r border-gray-800 bg-gray-900 p-4 text-lg font-semibold text-gray-400"> <div className="flex items-center space-x-2 rounded-t-lg border-l border-r border-t border-gray-800 bg-gray-900 p-4 text-lg font-semibold text-gray-400">
<PlusIcon className="w-6" /> <PlusIcon className="w-6" />
<span data-testid="create-slider-header"> <span data-testid="create-slider-header">
{intl.formatMessage(messages.createnewslider)} {intl.formatMessage(messages.createnewslider)}
@@ -172,7 +172,7 @@ const Discover = () => {
leave="transition duration-300" leave="transition duration-300"
leaveFrom="opacity-100 translate-y-0" leaveFrom="opacity-100 translate-y-0"
leaveTo="opacity-0 translate-y-6" leaveTo="opacity-0 translate-y-6"
className="safe-shift-edit-menu fixed right-0 left-0 z-50 flex flex-col items-center justify-end space-x-0 space-y-2 border-t border-gray-700 bg-gray-800 bg-opacity-80 p-4 backdrop-blur sm:bottom-0 sm:flex-row sm:space-y-0 sm:space-x-3" className="safe-shift-edit-menu fixed left-0 right-0 z-50 flex flex-col items-center justify-end space-x-0 space-y-2 border-t border-gray-700 bg-gray-800 bg-opacity-80 p-4 backdrop-blur sm:bottom-0 sm:flex-row sm:space-x-3 sm:space-y-0"
> >
<Button <Button
buttonType="default" buttonType="default"

View File

@@ -101,7 +101,7 @@ const IssueComment = ({
{(isActiveUser || hasPermission(Permission.MANAGE_ISSUES)) && ( {(isActiveUser || hasPermission(Permission.MANAGE_ISSUES)) && (
<Menu <Menu
as="div" as="div"
className="absolute top-2 right-1 z-40 inline-block text-left" className="absolute right-1 top-2 z-40 inline-block text-left"
> >
{({ open }) => ( {({ open }) => (
<> <>

View File

@@ -370,7 +370,7 @@ const IssueDetails = () => {
</span> </span>
</div> </div>
</div> </div>
<div className="mt-4 mb-6 flex flex-col space-y-2"> <div className="mb-6 mt-4 flex flex-col space-y-2">
{issueData?.media.mediaUrl && ( {issueData?.media.mediaUrl && (
<Button <Button
as="a" as="a"
@@ -483,7 +483,7 @@ const IssueDetails = () => {
/> />
))} ))}
{otherComments.length === 0 && ( {otherComments.length === 0 && (
<div className="mt-4 mb-10 text-gray-400"> <div className="mb-10 mt-4 text-gray-400">
<span>{intl.formatMessage(messages.nocomments)}</span> <span>{intl.formatMessage(messages.nocomments)}</span>
</div> </div>
)} )}
@@ -636,7 +636,7 @@ const IssueDetails = () => {
</span> </span>
</div> </div>
</div> </div>
<div className="mt-4 mb-6 flex flex-col space-y-2"> <div className="mb-6 mt-4 flex flex-col space-y-2">
{issueData?.media.mediaUrl && ( {issueData?.media.mediaUrl && (
<Button <Button
as="a" as="a"

View File

@@ -216,7 +216,7 @@ const IssueItem = ({ issue }: IssueItemProps) => {
)} )}
</div> </div>
</div> </div>
<div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0"> <div className="z-10 ml-4 mt-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
<div className="card-field"> <div className="card-field">
<span className="card-field-name"> <span className="card-field-name">
{intl.formatMessage(messages.issuestatus)} {intl.formatMessage(messages.issuestatus)}

View File

@@ -179,7 +179,7 @@ const MobileMenu = ({
leave="transition duration-500" leave="transition duration-500"
leaveFrom="opacity-100 -translate-y-full" leaveFrom="opacity-100 -translate-y-full"
leaveTo="opacity-0 translate-y-0" leaveTo="opacity-0 translate-y-0"
className="absolute top-0 left-0 right-0 flex w-full -translate-y-full flex-col space-y-6 border-t border-gray-600 bg-gray-900 bg-opacity-90 px-6 py-6 font-semibold text-gray-100 backdrop-blur" className="absolute left-0 right-0 top-0 flex w-full -translate-y-full flex-col space-y-6 border-t border-gray-600 bg-gray-900 bg-opacity-90 px-6 py-6 font-semibold text-gray-100 backdrop-blur"
> >
{filteredLinks.map((link) => { {filteredLinks.map((link) => {
const isActive = router.pathname.match(link.activeRegExp); const isActive = router.pathname.match(link.activeRegExp);
@@ -249,7 +249,7 @@ const MobileMenu = ({
{link.href === '/requests' && {link.href === '/requests' &&
pendingRequestsCount > 0 && pendingRequestsCount > 0 &&
hasPermission(Permission.MANAGE_REQUESTS) && ( hasPermission(Permission.MANAGE_REQUESTS) && (
<div className="absolute left-3 bottom-3"> <div className="absolute bottom-3 left-3">
<Badge <Badge
className={`bg-gradient-to-br ${ className={`bg-gradient-to-br ${
router.pathname.match(link.activeRegExp) router.pathname.match(link.activeRegExp)

View File

@@ -188,7 +188,7 @@ const Sidebar = ({
</div> </div>
<div <div
ref={navRef} ref={navRef}
className="flex flex-1 flex-col overflow-y-auto pt-4 pb-8 sm:pb-4" className="flex flex-1 flex-col overflow-y-auto pb-8 pt-4 sm:pb-4"
> >
<div className="flex flex-shrink-0 items-center px-2"> <div className="flex flex-shrink-0 items-center px-2">
<span className="w-full px-4 text-xl text-gray-50"> <span className="w-full px-4 text-xl text-gray-50">
@@ -218,13 +218,11 @@ const Sidebar = ({
}} }}
role="button" role="button"
tabIndex={0} tabIndex={0}
className={`flex items-center rounded-md px-2 py-2 text-base font-medium leading-6 text-white transition duration-150 ease-in-out focus:outline-none className={`flex items-center rounded-md px-2 py-2 text-base font-medium leading-6 text-white transition duration-150 ease-in-out focus:outline-none ${
${
router.pathname.match(sidebarLink.activeRegExp) router.pathname.match(sidebarLink.activeRegExp)
? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500' ? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500'
: 'hover:bg-gray-700 focus:bg-gray-700' : 'hover:bg-gray-700 focus:bg-gray-700'
} } `}
`}
data-testid={`${sidebarLink.dataTestId}-mobile`} data-testid={`${sidebarLink.dataTestId}-mobile`}
> >
{sidebarLink.svgIcon} {sidebarLink.svgIcon}
@@ -255,7 +253,7 @@ const Sidebar = ({
</Transition> </Transition>
</div> </div>
<div className="fixed top-0 bottom-0 left-0 z-30 hidden lg:flex lg:flex-shrink-0"> <div className="fixed bottom-0 left-0 top-0 z-30 hidden lg:flex lg:flex-shrink-0">
<div className="sidebar flex w-64 flex-col"> <div className="sidebar flex w-64 flex-col">
<div className="flex h-0 flex-1 flex-col"> <div className="flex h-0 flex-1 flex-col">
<div className="flex flex-1 flex-col overflow-y-auto pb-4"> <div className="flex flex-1 flex-col overflow-y-auto pb-4">
@@ -279,13 +277,11 @@ const Sidebar = ({
key={`desktop-${sidebarLink.messagesKey}`} key={`desktop-${sidebarLink.messagesKey}`}
href={sidebarLink.href} href={sidebarLink.href}
as={sidebarLink.as} as={sidebarLink.as}
className={`group flex items-center rounded-md px-2 py-2 text-lg font-medium leading-6 text-white transition duration-150 ease-in-out focus:outline-none className={`group flex items-center rounded-md px-2 py-2 text-lg font-medium leading-6 text-white transition duration-150 ease-in-out focus:outline-none ${
${
router.pathname.match(sidebarLink.activeRegExp) router.pathname.match(sidebarLink.activeRegExp)
? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500' ? 'bg-gradient-to-br from-indigo-600 to-purple-600 hover:from-indigo-500 hover:to-purple-500'
: 'hover:bg-gray-700 focus:bg-gray-700' : 'hover:bg-gray-700 focus:bg-gray-700'
} } `}
`}
data-testid={sidebarLink.dataTestId} data-testid={sidebarLink.dataTestId}
> >
{sidebarLink.svgIcon} {sidebarLink.svgIcon}

View File

@@ -39,7 +39,7 @@ const MiniQuotaDisplay = ({ userId }: MiniQuotaDisplayProps) => {
{intl.formatMessage(messages.movierequests)} {intl.formatMessage(messages.movierequests)}
</div> </div>
<div className="flex h-full items-center space-x-2 text-gray-200"> <div className="flex h-full items-center space-x-2 text-gray-200">
{data?.movie.limit ?? 0 > 0 ? ( {(data?.movie.limit ?? 0) > 0 ? (
<> <>
<ProgressCircle <ProgressCircle
className="h-8 w-8" className="h-8 w-8"
@@ -67,7 +67,7 @@ const MiniQuotaDisplay = ({ userId }: MiniQuotaDisplayProps) => {
{intl.formatMessage(messages.seriesrequests)} {intl.formatMessage(messages.seriesrequests)}
</div> </div>
<div className="flex h-full items-center space-x-2 text-gray-200"> <div className="flex h-full items-center space-x-2 text-gray-200">
{data?.tv.limit ?? 0 > 0 ? ( {(data?.tv.limit ?? 0) > 0 ? (
<> <>
<ProgressCircle <ProgressCircle
className="h-8 w-8" className="h-8 w-8"

View File

@@ -96,7 +96,7 @@ const Layout = ({ children }: LayoutProps) => {
WebkitBackdropFilter: isScrolled ? 'blur(5px)' : undefined, WebkitBackdropFilter: isScrolled ? 'blur(5px)' : undefined,
}} }}
> >
<div className="flex flex-1 items-center justify-between px-4 md:pr-4 md:pl-4"> <div className="flex flex-1 items-center justify-between px-4 md:pl-4 md:pr-4">
<button <button
className={`mr-2 hidden text-white sm:block ${ className={`mr-2 hidden text-white sm:block ${
isScrolled ? 'opacity-90' : 'opacity-70' isScrolled ? 'opacity-90' : 'opacity-70'

View File

@@ -11,7 +11,7 @@ interface BarProps {
const Bar = ({ progress, isFinished }: BarProps) => { const Bar = ({ progress, isFinished }: BarProps) => {
return ( return (
<div <div
className={`duration-400 fixed top-0 left-0 z-50 w-full transition-opacity ease-out ${ className={`duration-400 fixed left-0 top-0 z-50 w-full transition-opacity ease-out ${
isFinished ? 'opacity-0' : 'opacity-100' isFinished ? 'opacity-0' : 'opacity-100'
}`} }`}
> >

View File

@@ -95,7 +95,7 @@ const AddEmailModal: React.FC<AddEmailModalProps> = ({
<label htmlFor="email" className="text-label"> <label htmlFor="email" className="text-label">
{intl.formatMessage(messages.email)} {intl.formatMessage(messages.email)}
</label> </label>
<div className="mt-1 mb-2 sm:col-span-2 sm:mt-0"> <div className="mb-2 mt-1 sm:col-span-2 sm:mt-0">
<div className="flex rounded-md shadow-sm"> <div className="flex rounded-md shadow-sm">
<Field <Field
id="email" id="email"

View File

@@ -113,13 +113,13 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
<> <>
<Form data-form-type="login"> <Form data-form-type="login">
<div> <div>
<h2 className="mb-6 -mt-1 text-center text-lg font-bold text-neutral-200"> <h2 className="-mt-1 mb-6 text-center text-lg font-bold text-neutral-200">
{intl.formatMessage(messages.loginwithapp, { {intl.formatMessage(messages.loginwithapp, {
appName: mediaServerFormatValues.mediaServerName, appName: mediaServerFormatValues.mediaServerName,
})} })}
</h2> </h2>
<div className="mt-1 mb-4"> <div className="mb-4 mt-1">
<div className="form-input-field"> <div className="form-input-field">
<Field <Field
id="username" id="username"
@@ -135,7 +135,7 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
)} )}
</div> </div>
<div className="mt-1 mb-2"> <div className="mb-2 mt-1">
<div className="form-input-field"> <div className="form-input-field">
<SensitiveInput <SensitiveInput
as="field" as="field"

View File

@@ -71,13 +71,13 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
<> <>
<Form data-form-type="login"> <Form data-form-type="login">
<div> <div>
<h2 className="mb-6 -mt-1 text-center text-lg font-bold text-neutral-200"> <h2 className="-mt-1 mb-6 text-center text-lg font-bold text-neutral-200">
{intl.formatMessage(messages.loginwithapp, { {intl.formatMessage(messages.loginwithapp, {
appName: settings.currentSettings.applicationTitle, appName: settings.currentSettings.applicationTitle,
})} })}
</h2> </h2>
<div className="mt-1 mb-4"> <div className="mb-4 mt-1">
<div className="form-input-field"> <div className="form-input-field">
<Field <Field
id="email" id="email"
@@ -98,7 +98,7 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
<div className="error">{errors.email}</div> <div className="error">{errors.email}</div>
)} )}
</div> </div>
<div className="mt-1 mb-2"> <div className="mb-2 mt-1">
<div className="form-input-field"> <div className="form-input-field">
<SensitiveInput <SensitiveInput
as="field" as="field"
@@ -132,7 +132,7 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
</div> </div>
</div> </div>
{loginError && ( {loginError && (
<div className="mt-1 mb-2 sm:col-span-2 sm:mt-0"> <div className="mb-2 mt-1 sm:col-span-2 sm:mt-0">
<div className="error">{loginError}</div> <div className="error">{loginError}</div>
</div> </div>
)} )}

View File

@@ -42,7 +42,7 @@ const PlexLoginButton = ({
<FormattedMessage <FormattedMessage
{...messages.loginwithapp} {...messages.loginwithapp}
values={{ values={{
appName: <PlexIcon className="mt-[2px] ml-[0.35em] w-8" />, appName: <PlexIcon className="ml-[0.35em] mt-[2px] w-8" />,
}} }}
> >
{(chunks) => ( {(chunks) => (

View File

@@ -159,7 +159,7 @@ const Login = () => {
) ?? [] ) ?? []
} }
/> />
<div className="absolute top-4 right-4 z-50"> <div className="absolute right-4 top-4 z-50">
<LanguagePicker /> <LanguagePicker />
</div> </div>
<div className="relative z-40 mt-10 flex flex-col items-center px-4 sm:mx-auto sm:w-full sm:max-w-md"> <div className="relative z-40 mt-10 flex flex-col items-center px-4 sm:mx-auto sm:w-full sm:max-w-md">

View File

@@ -378,7 +378,7 @@ const ManageSlideOver = ({
</div> </div>
</div> </div>
{!!watchData.data.users.length && ( {!!watchData.data.users.length && (
<div className="flex flex-row space-x-2 px-4 pt-3 pb-2"> <div className="flex flex-row space-x-2 px-4 pb-2 pt-3">
<span className="shrink-0 font-bold leading-8"> <span className="shrink-0 font-bold leading-8">
{intl.formatMessage(messages.playedby)} {intl.formatMessage(messages.playedby)}
</span> </span>
@@ -391,7 +391,7 @@ const ManageSlideOver = ({
: `/users/${user.id}` : `/users/${user.id}`
} }
key={`watch-user-${user.id}`} key={`watch-user-${user.id}`}
className="z-0 mb-1 -mr-2 shrink-0 hover:z-50" className="z-0 -mr-2 mb-1 shrink-0 hover:z-50"
> >
<Tooltip <Tooltip
key={`watch-user-${user.id}`} key={`watch-user-${user.id}`}
@@ -540,7 +540,7 @@ const ManageSlideOver = ({
</div> </div>
</div> </div>
{!!watchData.data4k.users.length && ( {!!watchData.data4k.users.length && (
<div className="flex flex-row space-x-2 px-4 pt-3 pb-2"> <div className="flex flex-row space-x-2 px-4 pb-2 pt-3">
<span className="shrink-0 font-bold leading-8"> <span className="shrink-0 font-bold leading-8">
{intl.formatMessage(messages.playedby)} {intl.formatMessage(messages.playedby)}
</span> </span>
@@ -553,7 +553,7 @@ const ManageSlideOver = ({
: `/users/${user.id}` : `/users/${user.id}`
} }
key={`watch-user-${user.id}`} key={`watch-user-${user.id}`}
className="z-0 mb-1 -mr-2 shrink-0 hover:z-50" className="z-0 -mr-2 mb-1 shrink-0 hover:z-50"
> >
<Tooltip <Tooltip
key={`watch-user-${user.id}`} key={`watch-user-${user.id}`}

View File

@@ -48,8 +48,7 @@ const ShowMoreCard = ({ url, posters }: ShowMoreCardProps) => {
tabIndex={0} tabIndex={0}
> >
<div <div
className={`relative w-36 transform-gpu cursor-pointer className={`relative w-36 transform-gpu cursor-pointer overflow-hidden rounded-xl text-white shadow-lg ring-1 transition duration-150 ease-in-out sm:w-36 md:w-44 ${
overflow-hidden rounded-xl text-white shadow-lg ring-1 transition duration-150 ease-in-out sm:w-36 md:w-44 ${
isHovered isHovered
? 'scale-105 bg-gray-600 ring-gray-500' ? 'scale-105 bg-gray-600 ring-gray-500'
: 'scale-100 bg-gray-800 ring-gray-700' : 'scale-100 bg-gray-800 ring-gray-700'

View File

@@ -32,7 +32,7 @@ const MovieCast = () => {
return ( return (
<> <>
<PageTitle title={[intl.formatMessage(messages.fullcast), data.title]} /> <PageTitle title={[intl.formatMessage(messages.fullcast), data.title]} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header <Header
subtext={ subtext={
<Link href={`/movie/${data.id}`} className="hover:underline"> <Link href={`/movie/${data.id}`} className="hover:underline">

View File

@@ -32,7 +32,7 @@ const MovieCrew = () => {
return ( return (
<> <>
<PageTitle title={[intl.formatMessage(messages.fullcrew), data.title]} /> <PageTitle title={[intl.formatMessage(messages.fullcrew), data.title]} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header <Header
subtext={ subtext={
<Link href={`/movie/${data.id}`} className="hover:underline"> <Link href={`/movie/${data.id}`} className="hover:underline">

View File

@@ -42,7 +42,7 @@ const MovieRecommendations = () => {
<PageTitle <PageTitle
title={[intl.formatMessage(messages.recommendations), movieData?.title]} title={[intl.formatMessage(messages.recommendations), movieData?.title]}
/> />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header <Header
subtext={ subtext={
<Link href={`/movie/${movieData?.id}`} className="hover:underline"> <Link href={`/movie/${movieData?.id}`} className="hover:underline">

View File

@@ -40,7 +40,7 @@ const MovieSimilar = () => {
<PageTitle <PageTitle
title={[intl.formatMessage(messages.similar), movieData?.title]} title={[intl.formatMessage(messages.similar), movieData?.title]}
/> />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header <Header
subtext={ subtext={
<Link href={`/movie/${movieData?.id}`} className="hover:underline"> <Link href={`/movie/${movieData?.id}`} className="hover:underline">

View File

@@ -47,7 +47,7 @@ const PersonCard = ({
> >
<div style={{ paddingBottom: '150%' }}> <div style={{ paddingBottom: '150%' }}>
<div className="absolute inset-0 flex h-full w-full flex-col items-center p-2"> <div className="absolute inset-0 flex h-full w-full flex-col items-center p-2">
<div className="relative mt-2 mb-4 flex h-1/2 w-full justify-center"> <div className="relative mb-4 mt-2 flex h-1/2 w-full justify-center">
{profilePath ? ( {profilePath ? (
<div className="relative h-full w-3/4 overflow-hidden rounded-full ring-1 ring-gray-700"> <div className="relative h-full w-3/4 overflow-hidden rounded-full ring-1 ring-gray-700">
<CachedImage <CachedImage

View File

@@ -241,7 +241,7 @@ const PersonDetails = () => {
<> <>
<PageTitle title={data.name} /> <PageTitle title={data.name} />
{(sortedCrew || sortedCast) && ( {(sortedCrew || sortedCast) && (
<div className="absolute top-0 left-0 right-0 z-0 h-96"> <div className="absolute left-0 right-0 top-0 z-0 h-96">
<ImageFader <ImageFader
isDarker isDarker
backgroundImages={[...(sortedCast ?? []), ...(sortedCrew ?? [])] backgroundImages={[...(sortedCast ?? []), ...(sortedCrew ?? [])]
@@ -255,7 +255,7 @@ const PersonDetails = () => {
</div> </div>
)} )}
<div <div
className={`relative z-10 mt-4 mb-8 flex flex-col items-center lg:flex-row ${ className={`relative z-10 mb-8 mt-4 flex flex-col items-center lg:flex-row ${
data.biography ? 'lg:items-start' : '' data.biography ? 'lg:items-start' : ''
}`} }`}
> >
@@ -277,7 +277,7 @@ const PersonDetails = () => {
{mediaTypePicker} {mediaTypePicker}
</div> </div>
</div> </div>
<div className="mt-1 mb-2 space-y-1 text-xs text-white sm:text-sm lg:text-base"> <div className="mb-2 mt-1 space-y-1 text-xs text-white sm:text-sm lg:text-base">
<div>{personAttributes.join(' | ')}</div> <div>{personAttributes.join(' | ')}</div>
{(data.alsoKnownAs ?? []).length > 0 && ( {(data.alsoKnownAs ?? []).length > 0 && (
<div> <div>

View File

@@ -285,7 +285,7 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
)} )}
{(server || profile || rootFolder || languageProfile) && ( {(server || profile || rootFolder || languageProfile) && (
<> <>
<div className="mt-4 mb-1 text-sm"> <div className="mb-1 mt-4 text-sm">
{intl.formatMessage(messages.requestoverrides)} {intl.formatMessage(messages.requestoverrides)}
</div> </div>
<ul className="divide-y divide-gray-700 rounded-md bg-gray-800 px-2 text-xs"> <ul className="divide-y divide-gray-700 rounded-md bg-gray-800 px-2 text-xs">

View File

@@ -79,15 +79,16 @@ const RequestButton = ({
// Current user's pending request, or the first pending request // Current user's pending request, or the first pending request
const activeRequest = useMemo(() => { const activeRequest = useMemo(() => {
return activeRequests && activeRequests.length > 0 return activeRequests && activeRequests.length > 0
? activeRequests.find((request) => request.requestedBy.id === user?.id) ?? ? (activeRequests.find(
activeRequests[0] (request) => request.requestedBy.id === user?.id
) ?? activeRequests[0])
: undefined; : undefined;
}, [activeRequests, user]); }, [activeRequests, user]);
const active4kRequest = useMemo(() => { const active4kRequest = useMemo(() => {
return active4kRequests && active4kRequests.length > 0 return active4kRequests && active4kRequests.length > 0
? active4kRequests.find( ? (active4kRequests.find(
(request) => request.requestedBy.id === user?.id (request) => request.requestedBy.id === user?.id
) ?? active4kRequests[0] ) ?? active4kRequests[0])
: undefined; : undefined;
}, [active4kRequests, user]); }, [active4kRequests, user]);

View File

@@ -115,7 +115,7 @@ const RequestItemError = ({
</> </>
)} )}
</div> </div>
<div className="mt-4 ml-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0"> <div className="ml-4 mt-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
{requestData && ( {requestData && (
<> <>
<div className="card-field"> <div className="card-field">
@@ -486,7 +486,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
)} )}
</div> </div>
</div> </div>
<div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center gap-1 overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0"> <div className="z-10 ml-4 mt-4 flex w-full flex-col justify-center gap-1 overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
<div className="card-field"> <div className="card-field">
<span className="card-field-name"> <span className="card-field-name">
{intl.formatMessage(globalMessages.status)} {intl.formatMessage(globalMessages.status)}

View File

@@ -308,7 +308,7 @@ const AdvancedRequester = ({
return ( return (
<> <>
<div className="mt-4 mb-2 flex items-center text-lg font-semibold"> <div className="mb-2 mt-4 flex items-center text-lg font-semibold">
{intl.formatMessage(messages.advancedoptions)} {intl.formatMessage(messages.advancedoptions)}
</div> </div>
<div className="rounded-md"> <div className="rounded-md">

View File

@@ -52,7 +52,7 @@ const ResetPassword = () => {
'/images/rotate6.jpg', '/images/rotate6.jpg',
]} ]}
/> />
<div className="absolute top-4 right-4 z-50"> <div className="absolute right-4 top-4 z-50">
<LanguagePicker /> <LanguagePicker />
</div> </div>
<div className="relative z-40 mt-10 flex flex-col items-center px-4 sm:mx-auto sm:w-full sm:max-w-md"> <div className="relative z-40 mt-10 flex flex-col items-center px-4 sm:mx-auto sm:w-full sm:max-w-md">
@@ -112,7 +112,7 @@ const ResetPassword = () => {
> >
{intl.formatMessage(messages.email)} {intl.formatMessage(messages.email)}
</label> </label>
<div className="mt-1 mb-2 sm:col-span-2 sm:mt-0"> <div className="mb-2 mt-1 sm:col-span-2 sm:mt-0">
<div className="form-input-field"> <div className="form-input-field">
<Field <Field
id="email" id="email"

View File

@@ -62,7 +62,7 @@ const ResetPassword = () => {
'/images/rotate6.jpg', '/images/rotate6.jpg',
]} ]}
/> />
<div className="absolute top-4 right-4 z-50"> <div className="absolute right-4 top-4 z-50">
<LanguagePicker /> <LanguagePicker />
</div> </div>
<div className="relative z-40 mt-10 flex flex-col items-center px-4 sm:mx-auto sm:w-full sm:max-w-md"> <div className="relative z-40 mt-10 flex flex-col items-center px-4 sm:mx-auto sm:w-full sm:max-w-md">
@@ -122,7 +122,7 @@ const ResetPassword = () => {
> >
{intl.formatMessage(messages.password)} {intl.formatMessage(messages.password)}
</label> </label>
<div className="mt-1 mb-2 sm:col-span-2 sm:mt-0"> <div className="mb-2 mt-1 sm:col-span-2 sm:mt-0">
<div className="form-input-field"> <div className="form-input-field">
<SensitiveInput <SensitiveInput
as="field" as="field"
@@ -145,7 +145,7 @@ const ResetPassword = () => {
> >
{intl.formatMessage(messages.confirmpassword)} {intl.formatMessage(messages.confirmpassword)}
</label> </label>
<div className="mt-1 mb-2 sm:col-span-2 sm:mt-0"> <div className="mb-2 mt-1 sm:col-span-2 sm:mt-0">
<div className="form-input-field"> <div className="form-input-field">
<SensitiveInput <SensitiveInput
as="field" as="field"

View File

@@ -44,7 +44,7 @@ const Search = () => {
return ( return (
<> <>
<PageTitle title={intl.formatMessage(messages.search)} /> <PageTitle title={intl.formatMessage(messages.search)} />
<div className="mt-1 mb-5"> <div className="mb-5 mt-1">
<Header>{intl.formatMessage(messages.searchresults)}</Header> <Header>{intl.formatMessage(messages.searchresults)}</Header>
</div> </div>
<ListView <ListView

View File

@@ -476,7 +476,7 @@ export const WatchProviderSelector = ({
/> />
</div> </div>
{isActive && ( {isActive && (
<div className="pointer-events-none absolute -top-1 -left-1 flex items-center justify-center text-indigo-100 opacity-90"> <div className="pointer-events-none absolute -left-1 -top-1 flex items-center justify-center text-indigo-100 opacity-90">
<CheckCircleIcon className="h-6 w-6" /> <CheckCircleIcon className="h-6 w-6" />
</div> </div>
)} )}
@@ -519,7 +519,7 @@ export const WatchProviderSelector = ({
/> />
</div> </div>
{isActive && ( {isActive && (
<div className="pointer-events-none absolute -top-1 -left-1 flex items-center justify-center text-indigo-100 opacity-90"> <div className="pointer-events-none absolute -left-1 -top-1 flex items-center justify-center text-indigo-100 opacity-90">
<CheckCircleIcon className="h-6 w-6" /> <CheckCircleIcon className="h-6 w-6" />
</div> </div>
)} )}

View File

@@ -9,7 +9,7 @@ interface LibraryItemProps {
const LibraryItem = ({ isEnabled, name, onToggle }: LibraryItemProps) => { const LibraryItem = ({ isEnabled, name, onToggle }: LibraryItemProps) => {
return ( return (
<li className="col-span-1 flex rounded-md shadow-sm"> <li className="col-span-1 flex rounded-md shadow-sm">
<div className="flex flex-1 items-center justify-between truncate rounded-md border-t border-b border-r border-gray-700 bg-gray-600"> <div className="flex flex-1 items-center justify-between truncate rounded-md border-b border-r border-t border-gray-700 bg-gray-600">
<div className="flex-1 cursor-default truncate px-4 py-6 text-sm leading-5"> <div className="flex-1 cursor-default truncate px-4 py-6 text-sm leading-5">
{name} {name}
</div> </div>

View File

@@ -256,7 +256,7 @@ const NotificationsNtfy = () => {
</div> </div>
</div> </div>
{values.authMethodUsernamePassword && ( {values.authMethodUsernamePassword && (
<div className="mr-2 ml-4"> <div className="ml-4 mr-2">
<div className="form-row"> <div className="form-row">
<label htmlFor="username" className="text-label"> <label htmlFor="username" className="text-label">
{intl.formatMessage(messages.username)} {intl.formatMessage(messages.username)}
@@ -302,7 +302,7 @@ const NotificationsNtfy = () => {
</div> </div>
</div> </div>
{values.authMethodToken && ( {values.authMethodToken && (
<div className="form-row mr-2 ml-4"> <div className="form-row ml-4 mr-2">
<label htmlFor="token" className="text-label"> <label htmlFor="token" className="text-label">
{intl.formatMessage(messages.token)} {intl.formatMessage(messages.token)}
</label> </label>

View File

@@ -521,7 +521,9 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
? intl.formatMessage( ? intl.formatMessage(
messages.testFirstQualityProfiles messages.testFirstQualityProfiles
) )
: intl.formatMessage(messages.selectQualityProfile)} : intl.formatMessage(
messages.selectQualityProfile
)}
</option> </option>
{testResponse.profiles.length > 0 && {testResponse.profiles.length > 0 &&
testResponse.profiles.map((profile) => ( testResponse.profiles.map((profile) => (
@@ -558,7 +560,9 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
{isTesting {isTesting
? intl.formatMessage(messages.loadingrootfolders) ? intl.formatMessage(messages.loadingrootfolders)
: !isValidated : !isValidated
? intl.formatMessage(messages.testFirstRootFolders) ? intl.formatMessage(
messages.testFirstRootFolders
)
: intl.formatMessage(messages.selectRootFolder)} : intl.formatMessage(messages.selectRootFolder)}
</option> </option>
{testResponse.rootFolders.length > 0 && {testResponse.rootFolders.length > 0 &&

View File

@@ -61,7 +61,7 @@ const Release = ({ currentVersion, release, isLatest }: ReleaseProps) => {
const [isModalOpen, setModalOpen] = useState(false); const [isModalOpen, setModalOpen] = useState(false);
return ( return (
<div className="flex w-full flex-col space-y-3 rounded-md bg-gray-800 px-4 py-2 shadow-md ring-1 ring-gray-700 sm:flex-row sm:space-y-0 sm:space-x-3"> <div className="flex w-full flex-col space-y-3 rounded-md bg-gray-800 px-4 py-2 shadow-md ring-1 ring-gray-700 sm:flex-row sm:space-x-3 sm:space-y-0">
<Transition <Transition
as={Fragment} as={Fragment}
enter="transition-opacity duration-300" enter="transition-opacity duration-300"

View File

@@ -69,7 +69,7 @@ const SettingsAbout = () => {
<p className="text-sm leading-5 text-gray-100"> <p className="text-sm leading-5 text-gray-100">
{intl.formatMessage(messages.betawarning)} {intl.formatMessage(messages.betawarning)}
</p> </p>
<p className="mt-3 text-sm leading-5 md:mt-0 md:ml-6"> <p className="mt-3 text-sm leading-5 md:ml-6 md:mt-0">
<a <a
href="http://github.com/seerr-team/seerr" href="http://github.com/seerr-team/seerr"
className="whitespace-nowrap font-medium text-gray-100 transition duration-150 ease-in-out hover:text-white" className="whitespace-nowrap font-medium text-gray-100 transition duration-150 ease-in-out hover:text-white"

View File

@@ -308,7 +308,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
))} ))}
</ul> </ul>
</div> </div>
<div className="mt-10 mb-6"> <div className="mb-6 mt-10">
<h3 className="heading"> <h3 className="heading">
<FormattedMessage {...messages.manualscanJellyfin} /> <FormattedMessage {...messages.manualscanJellyfin} />
</h3> </h3>
@@ -424,7 +424,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
{intl.formatMessage(messages.scanbackground)} {intl.formatMessage(messages.scanbackground)}
</div> </div>
)} )}
<div className="mt-10 mb-6"> <div className="mb-6 mt-10">
<h3 className="heading"> <h3 className="heading">
{intl.formatMessage( {intl.formatMessage(
messages.jellyfinSettings, messages.jellyfinSettings,

View File

@@ -364,7 +364,7 @@ const SettingsJobs = () => {
<label className="text-label"> <label className="text-label">
{intl.formatMessage(messages.editJobScheduleCurrent)} {intl.formatMessage(messages.editJobScheduleCurrent)}
</label> </label>
<div className="form-input-area mt-2 mb-1"> <div className="form-input-area mb-1 mt-2">
<div> <div>
{jobModalState.job && {jobModalState.job &&
cronstrue.toString(jobModalState.job.cronSchedule, { cronstrue.toString(jobModalState.job.cronSchedule, {

Some files were not shown because too many files have changed in this diff Show More