open-source-mirrors
/
overseerr
mirror of https://github.com/sct/overseerr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflicts and errors after rebase

Browse Source
pull/3015/head
sct 3 weeks ago
parent 30c363bff5
commit 4a7ea72d5d
No known key found for this signature in database
9 changed files with 67 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
server/routes/settings/index.ts
Unescape View File

@ -17,7 +17,7 @@ import cacheManager from '@server/lib/cache';
import ImageProxy from '@server/lib/imageproxy';
import { Permission } from '@server/lib/permissions';
import { plexFullScanner } from '@server/lib/scanners/plex';
import type { MainSettings, PlexSetings, JobId } from '@server/lib/settings';
import type { JobId, MainSettings, PlexSettings } from '@server/lib/settings';
import { getSettings } from '@server/lib/settings';
import logger from '@server/logger';
import { isAuthenticated } from '@server/middleware/auth';

6
src/components/Discover/PlexWatchlistSlider/index.tsx
Unescape View File

@ -1,6 +1,6 @@
import Slider from '@app/components/Slider';
import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard';
import { UserType, useUser } from '@app/hooks/useUser';
import { useUser } from '@app/hooks/useUser';
import { ArrowRightCircleIcon } from '@heroicons/react/24/outline';
import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces';
import Link from 'next/link';
@ -22,12 +22,12 @@ const PlexWatchlistSlider = () => {
totalPages: number;
totalResults: number;
results: WatchlistItem[];
}>(user?.userType === UserType.PLEX ? '/api/v1/discover/watchlist' : null, {
}>(user?.isPlexUser ? '/api/v1/discover/watchlist' : null, {
revalidateOnMount: true,
});
if (
user?.userType !== UserType.PLEX ||
!user?.isPlexUser ||
(watchlistItems &&
watchlistItems.results.length === 0 &&
!user?.settings?.watchlistSyncMovies &&

17
src/components/Discover/index.tsx
Unescape View File

@ -14,15 +14,6 @@ import RecentRequestsSlider from '@app/components/Discover/RecentRequestsSlider'
import StudioSlider from '@app/components/Discover/StudioSlider';
import TvGenreSlider from '@app/components/Discover/TvGenreSlider';
import MediaSlider from '@app/components/MediaSlider';
import RequestCard from '@app/components/RequestCard';
import Slider from '@app/components/Slider';
import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard';
import { Permission, useUser } from '@app/hooks/useUser';
import { ArrowCircleRightIcon } from '@heroicons/react/outline';
import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces';
import type { MediaResultsResponse } from '@server/interfaces/api/mediaInterfaces';
import type { RequestResultsResponse } from '@server/interfaces/api/requestInterfaces';
import Link from 'next/link';
import { encodeURIExtraParams } from '@app/hooks/useDiscover';
import { Permission, useUser } from '@app/hooks/useUser';
import globalMessages from '@app/i18n/globalMessages';
@ -82,14 +73,6 @@ const Discover = () => {
const hasChanged = () => !Object.is(discoverData, sliders);
const { data: watchlistItems, error: watchlistError } = useSWR<{
page: number;
totalPages: number;
totalResults: number;
results: WatchlistItem[];
}>(user?.isPlexUser ? '/api/v1/discover/watchlist' : null, {
revalidateOnMount: true,
});
const updateSliders = async () => {
try {
await axios.post('/api/v1/settings/discover', sliders);

6
src/components/Login/LocalLogin.tsx
Unescape View File

@ -2,7 +2,6 @@ import Button from '@app/components/Common/Button';
import SensitiveInput from '@app/components/Common/SensitiveInput';
import useSettings from '@app/hooks/useSettings';
import { useUser } from '@app/hooks/useUser';
import { LoginIcon, SupportIcon } from '@heroicons/react/outline';
import {
ArrowLeftOnRectangleIcon,
LifebuoyIcon,
@ -113,7 +112,6 @@ const LocalLogin = ({ onError }: LocalLoginProps) => {
data-lpignore="false"
data-bwignore="false"
/>
</div>
{errors.password &&
touched.password &&
@ -131,7 +129,7 @@ const LocalLogin = ({ onError }: LocalLoginProps) => {
disabled={isSubmitting || !isValid}
data-testid="local-signin-button"
>
<LoginIcon />
<ArrowLeftOnRectangleIcon />
<span>
{isSubmitting
? intl.formatMessage(messages.signingin)
@ -143,7 +141,7 @@ const LocalLogin = ({ onError }: LocalLoginProps) => {
<span className="inline-flex rounded-md shadow-sm">
<Link href="/resetpassword" passHref>
<Button as="a" buttonType="ghost">
<SupportIcon />
<LifebuoyIcon />
<span>
{intl.formatMessage(messages.forgotpassword)}
</span>

2
src/components/PlexLoginButton/index.tsx
Unescape View File

@ -62,7 +62,7 @@ const PlexLoginButton = ({
buttonType={buttonType}
buttonSize={buttonSize}
>
{svgIcon ?? <LoginIcon />}
{svgIcon ?? <ArrowLeftOnRectangleIcon />}
<span>
{loading
? intl.formatMessage(globalMessages.loading)

2
src/components/Setup/CreateAccount/index.tsx
Unescape View File

@ -2,7 +2,7 @@ import Button from '@app/components/Common/Button';
import SensitiveInput from '@app/components/Common/SensitiveInput';
import LoginWithPlex from '@app/components/Setup/LoginWithPlex';
import { useUser } from '@app/hooks/useUser';
import { ArrowLeftIcon, UserIcon } from '@heroicons/react/solid';
import { ArrowLeftIcon, UserIcon } from '@heroicons/react/24/solid';
import axios from 'axios';
import { Field, Form, Formik } from 'formik';
import { useState } from 'react';

8
src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
Unescape View File

@ -14,12 +14,12 @@ import useSettings from '@app/hooks/useSettings';
import { Permission, useUser } from '@app/hooks/useUser';
import globalMessages from '@app/i18n/globalMessages';
import Error from '@app/pages/_error';
import { SaveIcon } from '@heroicons/react/outline';
import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
import {
ArrowPathIcon,
CheckCircleIcon,
RefreshIcon,
XCircleIcon,
} from '@heroicons/react/solid';
} from '@heroicons/react/24/solid';
import type { UserSettingsGeneralResponse } from '@server/interfaces/api/userSettingsInterfaces';
import axios from 'axios';
import { Field, Form, Formik } from 'formik';
@ -272,7 +272,7 @@ const UserGeneralSettings = () => {
);
revalidateUser();
}}
svgIcon={<RefreshIcon />}
svgIcon={<ArrowPathIcon />}
textOverride={intl.formatMessage(
messages.refreshtoken
)}

2
src/pages/_app.tsx
Unescape View File

@ -157,7 +157,7 @@ const CoreApp: Omit<NextAppComponentType, 'origGetInitialProps'> = ({
}
}, [hasPermission, router.pathname]);
if (router.pathname.match(/(login|setup|resetpassword)/)) {
if (router.pathname.match(/(login|setup|resetpassword|loading)/)) {
component = <Component {...pageProps} />;
} else {
component = (

55
yarn.lock
Unescape View File

@ -5254,6 +5254,11 @@ cidr-regex@^3.1.1:
dependencies:
ip-regex "^4.1.0"
classnames@^2.2.5:
version "2.5.1"
resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
clean-stack@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
@ -11279,7 +11284,7 @@ promzard@^0.3.0:
dependencies:
read "1"
prop-types@^15.0.0, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
prop-types@^15.0.0, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
version "15.8.1"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@ -11538,6 +11543,54 @@ react-ace@10.1.0:
lodash.isequal "^4.5.0"
prop-types "^15.7.2"
react-animate-height@2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/react-animate-height/-/react-animate-height-2.1.2.tgz#9b450fc64d46f10f5e07da8d0d5e2c47b9f15030"
integrity sha512-A9jfz/4CTdsIsE7WCQtO9UkOpMBcBRh8LxyHl2eoZz1ki02jpyUL5xt58gabd0CyeLQ8fRyQ+s2lyV2Ufu8Owg==
dependencies:
classnames "^2.2.5"
prop-types "^15.6.1"
react-aria@3.23.0:
version "3.23.0"
resolved "https://registry.yarnpkg.com/react-aria/-/react-aria-3.23.0.tgz#8829ae47373793a7b48e19aa8af1b581021b2a9a"
integrity sha512-CMem/+XnL3yuNHU94usRHS2+rdKLuyUzxRmQ/ndVXresflzKdaLYCH7Dtb2Um4rUEjD0BCz33hiNZPsJ7jBVQQ==
dependencies:
"@react-aria/breadcrumbs" "^3.5.0"
"@react-aria/button" "^3.7.0"
"@react-aria/calendar" "^3.1.0"
"@react-aria/checkbox" "^3.8.0"
"@react-aria/combobox" "^3.5.0"
"@react-aria/datepicker" "^3.3.0"
"@react-aria/dialog" "^3.5.0"
"@react-aria/dnd" "^3.1.0"
"@react-aria/focus" "^3.11.0"
"@react-aria/gridlist" "^3.2.0"
"@react-aria/i18n" "^3.7.0"
"@react-aria/interactions" "^3.14.0"
"@react-aria/label" "^3.5.0"
"@react-aria/link" "^3.4.0"
"@react-aria/listbox" "^3.8.0"
"@react-aria/menu" "^3.8.0"
"@react-aria/meter" "^3.4.0"
"@react-aria/numberfield" "^3.4.0"
"@react-aria/overlays" "^3.13.0"
"@react-aria/progress" "^3.4.0"
"@react-aria/radio" "^3.5.0"
"@react-aria/searchfield" "^3.5.0"
"@react-aria/select" "^3.9.0"
"@react-aria/selection" "^3.13.0"
"@react-aria/separator" "^3.3.0"
"@react-aria/slider" "^3.3.0"
"@react-aria/ssr" "^3.5.0"
"@react-aria/switch" "^3.4.0"
"@react-aria/table" "^3.8.0"
"@react-aria/tabs" "^3.4.0"
"@react-aria/textfield" "^3.9.0"
"@react-aria/tooltip" "^3.4.0"
"@react-aria/utils" "^3.15.0"
"@react-aria/visually-hidden" "^3.7.0"
react-dom@18.2.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"

Write Preview
Loading…
Cancel
Save