mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-01 04:08:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'overseerr/develop' into develop

Browse Source
This commit is contained in:
notfakie
2023-01-27 17:55:55 +13:00
parent 2714cbcefd 51b05cd8fb
commit ad3d922440
158 changed files with 10835 additions and 4524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/UserProfile/ProfileHeader/index.tsx
View File

@@ -1,7 +1,7 @@
import Button from '@app/components/Common/Button';
import type { User } from '@app/hooks/useUser';
import { Permission, useUser } from '@app/hooks/useUser';
import { CogIcon, UserIcon } from '@heroicons/react/solid';
import { CogIcon, UserIcon } from '@heroicons/react/24/solid';
import Link from 'next/link';
import { defineMessages, useIntl } from 'react-intl';

4
src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
View File

@@ -12,7 +12,7 @@ import useSettings from '@app/hooks/useSettings';
import { Permission, UserType, 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 type { UserSettingsGeneralResponse } from '@server/interfaces/api/userSettingsInterfaces';
import axios from 'axios';
import { Field, Form, Formik } from 'formik';
@@ -566,7 +566,7 @@ const UserGeneralSettings = () => {
type="submit"
disabled={isSubmitting || !isValid}
>
<SaveIcon />
<ArrowDownOnSquareIcon />
<span>
{isSubmitting
? intl.formatMessage(globalMessages.saving)

4
src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsDiscord.tsx
View File

@@ -3,7 +3,7 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner';
import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
import { useUser } from '@app/hooks/useUser';
import globalMessages from '@app/i18n/globalMessages';
import { SaveIcon } from '@heroicons/react/outline';
import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
import type { UserSettingsNotificationsResponse } from '@server/interfaces/api/userSettingsInterfaces';
import axios from 'axios';
import { Field, Form, Formik } from 'formik';
@@ -156,7 +156,7 @@ const UserNotificationsDiscord = () => {
type="submit"
disabled={isSubmitting || !isValid}
>
<SaveIcon />
<ArrowDownOnSquareIcon />
<span>
{isSubmitting
? intl.formatMessage(globalMessages.saving)

4
src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsEmail.tsx
View File

@@ -8,7 +8,7 @@ import { OpenPgpLink } from '@app/components/Settings/Notifications/Notification
import SettingsBadge from '@app/components/Settings/SettingsBadge';
import { useUser } from '@app/hooks/useUser';
import globalMessages from '@app/i18n/globalMessages';
import { SaveIcon } from '@heroicons/react/outline';
import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
import type { UserSettingsNotificationsResponse } from '@server/interfaces/api/userSettingsInterfaces';
import axios from 'axios';
import { Form, Formik } from 'formik';
@@ -151,7 +151,7 @@ const UserEmailSettings = () => {
type="submit"
disabled={isSubmitting || !isValid}
>
<SaveIcon />
<ArrowDownOnSquareIcon />
<span>
{isSubmitting
? intl.formatMessage(globalMessages.saving)

4
src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsTelegram.tsx
View File

@@ -3,7 +3,7 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner';
import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
import { useUser } from '@app/hooks/useUser';
import globalMessages from '@app/i18n/globalMessages';
import { SaveIcon } from '@heroicons/react/outline';
import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
import type { UserSettingsNotificationsResponse } from '@server/interfaces/api/userSettingsInterfaces';
import axios from 'axios';
import { Field, Form, Formik } from 'formik';
@@ -185,7 +185,7 @@ const UserTelegramSettings = () => {
type="submit"
disabled={isSubmitting || !isValid}
>
<SaveIcon />
<ArrowDownOnSquareIcon />
<span>
{isSubmitting
? intl.formatMessage(globalMessages.saving)

4
src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush.tsx
View File

@@ -5,7 +5,7 @@ import NotificationTypeSelector, {
} from '@app/components/NotificationTypeSelector';
import { useUser } from '@app/hooks/useUser';
import globalMessages from '@app/i18n/globalMessages';
import { SaveIcon } from '@heroicons/react/outline';
import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
import type { UserSettingsNotificationsResponse } from '@server/interfaces/api/userSettingsInterfaces';
import axios from 'axios';
import { Form, Formik } from 'formik';
@@ -103,7 +103,7 @@ const UserWebPushSettings = () => {
type="submit"
disabled={isSubmitting || !isValid}
>
<SaveIcon />
<ArrowDownOnSquareIcon />
<span>
{isSubmitting
? intl.formatMessage(globalMessages.saving)

4
src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx
View File

@@ -9,7 +9,7 @@ import SettingsTabs from '@app/components/Common/SettingsTabs';
import { useUser } from '@app/hooks/useUser';
import globalMessages from '@app/i18n/globalMessages';
import Error from '@app/pages/_error';
import { CloudIcon, MailIcon } from '@heroicons/react/solid';
import { CloudIcon, EnvelopeIcon } from '@heroicons/react/24/solid';
import type { UserSettingsNotificationsResponse } from '@server/interfaces/api/userSettingsInterfaces';
import { useRouter } from 'next/router';
import { defineMessages, useIntl } from 'react-intl';
@@ -41,7 +41,7 @@ const UserNotificationSettings = ({
text: intl.formatMessage(messages.email),
content: (
<span className="flex items-center">
<MailIcon className="mr-2 h-4" />
<EnvelopeIcon className="mr-2 h-4" />
{intl.formatMessage(messages.email)}
</span>
),

4
src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx
View File

@@ -6,7 +6,7 @@ import SensitiveInput from '@app/components/Common/SensitiveInput';
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 axios from 'axios';
import { Form, Formik } from 'formik';
import { useRouter } from 'next/router';
@@ -233,7 +233,7 @@ const UserPasswordChange = () => {
type="submit"
disabled={isSubmitting || !isValid}
>
<SaveIcon />
<ArrowDownOnSquareIcon />
<span>
{isSubmitting
? intl.formatMessage(globalMessages.saving)

4
src/components/UserProfile/UserSettings/UserPermissions/index.tsx
View File

@@ -6,7 +6,7 @@ import PermissionEdit from '@app/components/PermissionEdit';
import { 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 axios from 'axios';
import { Form, Formik } from 'formik';
import { useRouter } from 'next/router';
@@ -120,7 +120,7 @@ const UserPermissions = () => {
type="submit"
disabled={isSubmitting}
>
<SaveIcon />
<ArrowDownOnSquareIcon />
<span>
{isSubmitting
? intl.formatMessage(globalMessages.saving)

6
src/components/UserProfile/index.tsx
View File

@@ -8,7 +8,7 @@ import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard';
import ProfileHeader from '@app/components/UserProfile/ProfileHeader';
import { Permission, UserType, useUser } from '@app/hooks/useUser';
import Error from '@app/pages/_error';
import { ArrowCircleRightIcon } from '@heroicons/react/outline';
import { ArrowRightCircleIcon } from '@heroicons/react/24/outline';
import type { WatchlistResponse } from '@server/interfaces/api/discoverInterfaces';
import type {
QuotaResponse,
@@ -291,7 +291,7 @@ const UserProfile = () => {
>
<a className="slider-title">
<span>{intl.formatMessage(messages.recentrequests)}</span>
<ArrowCircleRightIcon />
<ArrowRightCircleIcon />
</a>
</Link>
</div>
@@ -332,7 +332,7 @@ const UserProfile = () => {
>
<a className="slider-title">
<span>{intl.formatMessage(messages.plexwatchlist)}</span>
<ArrowCircleRightIcon />
<ArrowRightCircleIcon />
</a>
</Link>
</div>