diff --git a/package.json b/package.json index 6d98f2edc..2bd8143ae 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@formatjs/intl-pluralrules": "5.1.8", "@formatjs/intl-utils": "3.8.4", "@headlessui/react": "1.7.7", - "@heroicons/react": "1.0.6", + "@heroicons/react": "2.0.13", "@supercharge/request-ip": "1.2.0", "@svgr/webpack": "6.5.1", "@tanem/react-nprogress": "5.0.22", diff --git a/src/components/CollectionDetails/index.tsx b/src/components/CollectionDetails/index.tsx index 60ce94053..0136113a9 100644 --- a/src/components/CollectionDetails/index.tsx +++ b/src/components/CollectionDetails/index.tsx @@ -10,7 +10,7 @@ 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 { DownloadIcon } from '@heroicons/react/outline'; +import { ArrowDownTrayIcon } from '@heroicons/react/24/outline'; import { MediaStatus } from '@server/constants/media'; import type { Collection } from '@server/models/Collection'; import { uniq } from 'lodash'; @@ -276,7 +276,7 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => { }} text={ <> - + {intl.formatMessage( hasRequestable @@ -295,7 +295,7 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => { setIs4k(true); }} > - + {intl.formatMessage(messages.requestcollection4k)} diff --git a/src/components/Common/Alert/index.tsx b/src/components/Common/Alert/index.tsx index 8ffb4a255..93ddd988f 100644 --- a/src/components/Common/Alert/index.tsx +++ b/src/components/Common/Alert/index.tsx @@ -1,8 +1,8 @@ import { - ExclamationIcon, + ExclamationTriangleIcon, InformationCircleIcon, XCircleIcon, -} from '@heroicons/react/solid'; +} from '@heroicons/react/24/solid'; interface AlertProps { title?: React.ReactNode; @@ -16,7 +16,7 @@ const Alert = ({ title, children, type }: AlertProps) => { 'border border-yellow-500 backdrop-blur bg-yellow-400 bg-opacity-20', titleColor: 'text-yellow-100', textColor: 'text-yellow-300', - svg: , + svg: , }; switch (type) { diff --git a/src/components/Common/ButtonWithDropdown/index.tsx b/src/components/Common/ButtonWithDropdown/index.tsx index be6815b94..b5bc0cb64 100644 --- a/src/components/Common/ButtonWithDropdown/index.tsx +++ b/src/components/Common/ButtonWithDropdown/index.tsx @@ -1,7 +1,7 @@ import useClickOutside from '@app/hooks/useClickOutside'; import { withProperties } from '@app/utils/typeHelpers'; import { Transition } from '@headlessui/react'; -import { ChevronDownIcon } from '@heroicons/react/solid'; +import { ChevronDownIcon } from '@heroicons/react/24/solid'; import type { AnchorHTMLAttributes, ButtonHTMLAttributes } from 'react'; import { Fragment, useRef, useState } from 'react'; diff --git a/src/components/Common/SensitiveInput/index.tsx b/src/components/Common/SensitiveInput/index.tsx index 6652f5519..ae11b9517 100644 --- a/src/components/Common/SensitiveInput/index.tsx +++ b/src/components/Common/SensitiveInput/index.tsx @@ -1,4 +1,4 @@ -import { EyeIcon, EyeOffIcon } from '@heroicons/react/solid'; +import { EyeIcon, EyeSlashIcon } from '@heroicons/react/24/solid'; import { Field } from 'formik'; import { useState } from 'react'; @@ -43,7 +43,7 @@ const SensitiveInput = ({ as = 'input', ...props }: SensitiveInputProps) => { type="button" className="input-action" > - {isHidden ? : } + {isHidden ? : } ); diff --git a/src/components/Common/SlideOver/index.tsx b/src/components/Common/SlideOver/index.tsx index e7ccf7063..fd0ecb37a 100644 --- a/src/components/Common/SlideOver/index.tsx +++ b/src/components/Common/SlideOver/index.tsx @@ -1,7 +1,7 @@ /* eslint-disable jsx-a11y/click-events-have-key-events */ import { useLockBodyScroll } from '@app/hooks/useLockBodyScroll'; import { Transition } from '@headlessui/react'; -import { XIcon } from '@heroicons/react/outline'; +import { XMarkIcon } from '@heroicons/react/24/outline'; import { Fragment, useEffect, useRef, useState } from 'react'; import ReactDOM from 'react-dom'; @@ -83,7 +83,7 @@ const SlideOver = ({ className="text-gray-200 transition duration-150 ease-in-out hover:text-white" onClick={() => onClose()} > - + diff --git a/src/components/Common/StatusBadgeMini/index.tsx b/src/components/Common/StatusBadgeMini/index.tsx index 0653c7d80..9404a93cb 100644 --- a/src/components/Common/StatusBadgeMini/index.tsx +++ b/src/components/Common/StatusBadgeMini/index.tsx @@ -1,9 +1,5 @@ -import { - BellIcon, - CheckIcon, - ClockIcon, - MinusSmIcon, -} from '@heroicons/react/solid'; +import { CheckCircleIcon } from '@heroicons/react/20/solid'; +import { BellIcon, ClockIcon, MinusSmallIcon } from '@heroicons/react/24/solid'; import { MediaStatus } from '@server/constants/media'; interface StatusBadgeMiniProps { @@ -22,7 +18,7 @@ const StatusBadgeMini = ({ status, is4k = false }: StatusBadgeMiniProps) => { break; case MediaStatus.AVAILABLE: badgeStyle.push('bg-green-500 ring-green-400'); - indicatorIcon = ; + indicatorIcon = ; break; case MediaStatus.PENDING: badgeStyle.push('bg-yellow-500 ring-yellow-400'); @@ -30,7 +26,7 @@ const StatusBadgeMini = ({ status, is4k = false }: StatusBadgeMiniProps) => { break; case MediaStatus.PARTIALLY_AVAILABLE: badgeStyle.push('bg-green-500 ring-green-400'); - indicatorIcon = ; + indicatorIcon = ; break; } diff --git a/src/components/Discover/MovieGenreSlider/index.tsx b/src/components/Discover/MovieGenreSlider/index.tsx index 4899d3496..b411a7d71 100644 --- a/src/components/Discover/MovieGenreSlider/index.tsx +++ b/src/components/Discover/MovieGenreSlider/index.tsx @@ -1,7 +1,7 @@ import { genreColorMap } from '@app/components/Discover/constants'; import GenreCard from '@app/components/GenreCard'; import Slider from '@app/components/Slider'; -import { ArrowCircleRightIcon } from '@heroicons/react/outline'; +import { ArrowRightCircleIcon } from '@heroicons/react/24/outline'; import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces'; import Link from 'next/link'; import React from 'react'; @@ -28,7 +28,7 @@ const MovieGenreSlider = () => { {intl.formatMessage(messages.moviegenres)} - + diff --git a/src/components/Discover/PlexWatchlistSlider/index.tsx b/src/components/Discover/PlexWatchlistSlider/index.tsx index 02f4a47fe..76fba57ca 100644 --- a/src/components/Discover/PlexWatchlistSlider/index.tsx +++ b/src/components/Discover/PlexWatchlistSlider/index.tsx @@ -1,7 +1,7 @@ import Slider from '@app/components/Slider'; import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard'; import { UserType, useUser } from '@app/hooks/useUser'; -import { ArrowCircleRightIcon } from '@heroicons/react/outline'; +import { ArrowRightCircleIcon } from '@heroicons/react/24/outline'; import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces'; import Link from 'next/link'; import { defineMessages, useIntl } from 'react-intl'; @@ -43,7 +43,7 @@ const PlexWatchlistSlider = () => { {intl.formatMessage(messages.plexwatchlist)} - + diff --git a/src/components/Discover/RecentRequestsSlider/index.tsx b/src/components/Discover/RecentRequestsSlider/index.tsx index 30f5e19f3..96309d613 100644 --- a/src/components/Discover/RecentRequestsSlider/index.tsx +++ b/src/components/Discover/RecentRequestsSlider/index.tsx @@ -1,7 +1,7 @@ import { sliderTitles } from '@app/components/Discover/constants'; import RequestCard from '@app/components/RequestCard'; import Slider from '@app/components/Slider'; -import { ArrowCircleRightIcon } from '@heroicons/react/outline'; +import { ArrowRightCircleIcon } from '@heroicons/react/24/outline'; import type { RequestResultsResponse } from '@server/interfaces/api/requestInterfaces'; import Link from 'next/link'; import { useIntl } from 'react-intl'; @@ -27,7 +27,7 @@ const RecentRequestsSlider = () => { {intl.formatMessage(sliderTitles.recentrequests)} - + diff --git a/src/components/Discover/TvGenreSlider/index.tsx b/src/components/Discover/TvGenreSlider/index.tsx index 820012c32..f8c74195d 100644 --- a/src/components/Discover/TvGenreSlider/index.tsx +++ b/src/components/Discover/TvGenreSlider/index.tsx @@ -1,7 +1,7 @@ import { genreColorMap } from '@app/components/Discover/constants'; import GenreCard from '@app/components/GenreCard'; import Slider from '@app/components/Slider'; -import { ArrowCircleRightIcon } from '@heroicons/react/outline'; +import { ArrowRightCircleIcon } from '@heroicons/react/24/outline'; import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces'; import Link from 'next/link'; import React from 'react'; @@ -28,7 +28,7 @@ const TvGenreSlider = () => { {intl.formatMessage(messages.tvgenres)} - + diff --git a/src/components/IssueBlock/index.tsx b/src/components/IssueBlock/index.tsx index c337c721c..d4cb9d0e0 100644 --- a/src/components/IssueBlock/index.tsx +++ b/src/components/IssueBlock/index.tsx @@ -3,10 +3,10 @@ import { issueOptions } from '@app/components/IssueModal/constants'; import { useUser } from '@app/hooks/useUser'; import { CalendarIcon, - ExclamationIcon, + ExclamationTriangleIcon, EyeIcon, UserIcon, -} from '@heroicons/react/solid'; +} from '@heroicons/react/24/solid'; import type Issue from '@server/entity/Issue'; import Link from 'next/link'; import { useIntl } from 'react-intl'; @@ -31,7 +31,7 @@ const IssueBlock = ({ issue }: IssueBlockProps) => {
- + {intl.formatMessage(issueOption.name)} diff --git a/src/components/IssueDetails/IssueComment/index.tsx b/src/components/IssueDetails/IssueComment/index.tsx index b941c9f31..e1e265b0e 100644 --- a/src/components/IssueDetails/IssueComment/index.tsx +++ b/src/components/IssueDetails/IssueComment/index.tsx @@ -2,7 +2,7 @@ import Button from '@app/components/Common/Button'; import Modal from '@app/components/Common/Modal'; import { Permission, useUser } from '@app/hooks/useUser'; import { Menu, Transition } from '@headlessui/react'; -import { DotsVerticalIcon } from '@heroicons/react/solid'; +import { EllipsisVerticalIcon } from '@heroicons/react/24/solid'; import type { default as IssueCommentType } from '@server/entity/IssueComment'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; @@ -104,7 +104,7 @@ const IssueComment = ({
Open options -
), instructionsPullToRefresh: ReactDOMServer.renderToString(
), diff --git a/src/components/RegionSelector/index.tsx b/src/components/RegionSelector/index.tsx index 5a714c742..d4ad76b56 100644 --- a/src/components/RegionSelector/index.tsx +++ b/src/components/RegionSelector/index.tsx @@ -1,6 +1,6 @@ import useSettings from '@app/hooks/useSettings'; import { Listbox, Transition } from '@headlessui/react'; -import { CheckIcon, ChevronDownIcon } from '@heroicons/react/solid'; +import { CheckIcon, ChevronDownIcon } from '@heroicons/react/24/solid'; import type { Region } from '@server/lib/settings'; import { hasFlag } from 'country-flag-icons'; import 'country-flag-icons/3x2/flags.css'; diff --git a/src/components/RequestBlock/index.tsx b/src/components/RequestBlock/index.tsx index e6a0c02bb..ca8cb5fa6 100644 --- a/src/components/RequestBlock/index.tsx +++ b/src/components/RequestBlock/index.tsx @@ -12,8 +12,8 @@ import { PencilIcon, TrashIcon, UserIcon, - XIcon, -} from '@heroicons/react/solid'; + XMarkIcon, +} from '@heroicons/react/24/solid'; import { MediaRequestStatus } from '@server/constants/media'; import type { MediaRequest } from '@server/entity/MediaRequest'; import axios from 'axios'; @@ -149,7 +149,7 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => { onClick={() => updateRequest('decline')} disabled={isUpdating} > - + diff --git a/src/components/RequestButton/index.tsx b/src/components/RequestButton/index.tsx index f71589448..56e91810b 100644 --- a/src/components/RequestButton/index.tsx +++ b/src/components/RequestButton/index.tsx @@ -3,12 +3,12 @@ import RequestModal from '@app/components/RequestModal'; import useSettings from '@app/hooks/useSettings'; import { Permission, useUser } from '@app/hooks/useUser'; import globalMessages from '@app/i18n/globalMessages'; -import { DownloadIcon } from '@heroicons/react/outline'; +import { ArrowDownTrayIcon } from '@heroicons/react/24/outline'; import { CheckIcon, InformationCircleIcon, - XIcon, -} from '@heroicons/react/solid'; + XMarkIcon, +} from '@heroicons/react/24/solid'; import { MediaRequestStatus, MediaStatus } from '@server/constants/media'; import type Media from '@server/entity/Media'; import type { MediaRequest } from '@server/entity/MediaRequest'; @@ -158,7 +158,7 @@ const RequestButton = ({ action: () => { modifyRequest(activeRequest, 'decline'); }, - svg: , + svg: , } ); } else if ( @@ -186,7 +186,7 @@ const RequestButton = ({ action: () => { modifyRequests(activeRequests, 'decline'); }, - svg: , + svg: , } ); } @@ -228,7 +228,7 @@ const RequestButton = ({ action: () => { modifyRequest(active4kRequest, 'decline'); }, - svg: , + svg: , } ); } else if ( @@ -256,7 +256,7 @@ const RequestButton = ({ action: () => { modifyRequests(active4kRequests, 'decline'); }, - svg: , + svg: , } ); } @@ -282,7 +282,7 @@ const RequestButton = ({ setEditRequest(false); setShowRequestModal(true); }, - svg: , + svg: , }); } else if ( mediaType === 'tv' && @@ -301,7 +301,7 @@ const RequestButton = ({ setEditRequest(false); setShowRequestModal(true); }, - svg: , + svg: , }); } @@ -327,7 +327,7 @@ const RequestButton = ({ setEditRequest(false); setShowRequest4kModal(true); }, - svg: , + svg: , }); } else if ( mediaType === 'tv' && @@ -347,7 +347,7 @@ const RequestButton = ({ setEditRequest(false); setShowRequest4kModal(true); }, - svg: , + svg: , }); } diff --git a/src/components/RequestCard/index.tsx b/src/components/RequestCard/index.tsx index 6efdb6a1f..a7a76beca 100644 --- a/src/components/RequestCard/index.tsx +++ b/src/components/RequestCard/index.tsx @@ -9,12 +9,12 @@ import { Permission, useUser } from '@app/hooks/useUser'; import globalMessages from '@app/i18n/globalMessages'; import { withProperties } from '@app/utils/typeHelpers'; import { + ArrowPathIcon, CheckIcon, PencilIcon, - RefreshIcon, TrashIcon, - XIcon, -} from '@heroicons/react/solid'; + XMarkIcon, +} from '@heroicons/react/24/solid'; import { MediaRequestStatus } from '@server/constants/media'; import type { MediaRequest } from '@server/entity/MediaRequest'; import type { MovieDetails } from '@server/models/Movie'; @@ -441,7 +441,7 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => { disabled={isRetrying} onClick={() => retryRequest()} > - @@ -483,7 +483,7 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => { className="hidden sm:block" onClick={() => modifyRequest('decline')} > - + {intl.formatMessage(globalMessages.decline)} { className="sm:hidden" onClick={() => modifyRequest('decline')} > - +
@@ -540,7 +540,7 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => { className="hidden sm:block" onClick={() => deleteRequest()} > - + {intl.formatMessage(globalMessages.cancel)} @@ -550,7 +550,7 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => { className="sm:hidden" onClick={() => deleteRequest()} > - +
diff --git a/src/components/RequestList/RequestItem/index.tsx b/src/components/RequestList/RequestItem/index.tsx index 864ca7e4f..dbce03e54 100644 --- a/src/components/RequestList/RequestItem/index.tsx +++ b/src/components/RequestList/RequestItem/index.tsx @@ -8,12 +8,12 @@ import useDeepLinks from '@app/hooks/useDeepLinks'; import { Permission, useUser } from '@app/hooks/useUser'; import globalMessages from '@app/i18n/globalMessages'; import { + ArrowPathIcon, CheckIcon, PencilIcon, - RefreshIcon, TrashIcon, - XIcon, -} from '@heroicons/react/solid'; + XMarkIcon, +} from '@heroicons/react/24/solid'; import { MediaRequestStatus } from '@server/constants/media'; import type { MediaRequest } from '@server/entity/MediaRequest'; import type { MovieDetails } from '@server/models/Movie'; @@ -601,7 +601,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => { disabled={isRetrying} onClick={() => retryRequest()} > - @@ -642,7 +642,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => { buttonType="danger" onClick={() => modifyRequest('decline')} > - + {intl.formatMessage(globalMessages.decline)} @@ -672,7 +672,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => { confirmText={intl.formatMessage(globalMessages.areyousure)} className="w-full" > - + {intl.formatMessage(messages.cancelRequest)} )} diff --git a/src/components/RequestList/index.tsx b/src/components/RequestList/index.tsx index 0fa94d05d..bffd7c067 100644 --- a/src/components/RequestList/index.tsx +++ b/src/components/RequestList/index.tsx @@ -7,11 +7,11 @@ import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams'; import { useUser } from '@app/hooks/useUser'; import globalMessages from '@app/i18n/globalMessages'; import { + BarsArrowDownIcon, ChevronLeftIcon, ChevronRightIcon, - FilterIcon, - SortDescendingIcon, -} from '@heroicons/react/solid'; + FunnelIcon, +} from '@heroicons/react/24/solid'; import type { RequestResultsResponse } from '@server/interfaces/api/requestInterfaces'; import Link from 'next/link'; import { useRouter } from 'next/router'; @@ -139,7 +139,7 @@ const RequestList = () => {
- + { type="submit" disabled={isSubmitting || !isValid} > - + {intl.formatMessage(messages.emailresetlink)} diff --git a/src/components/ResetPassword/index.tsx b/src/components/ResetPassword/index.tsx index dd6446424..4c8bcfa3a 100644 --- a/src/components/ResetPassword/index.tsx +++ b/src/components/ResetPassword/index.tsx @@ -3,7 +3,7 @@ import ImageFader from '@app/components/Common/ImageFader'; import SensitiveInput from '@app/components/Common/SensitiveInput'; import LanguagePicker from '@app/components/Layout/LanguagePicker'; import globalMessages from '@app/i18n/globalMessages'; -import { SupportIcon } from '@heroicons/react/outline'; +import { LifebuoyIcon } from '@heroicons/react/24/outline'; import axios from 'axios'; import { Form, Formik } from 'formik'; import Link from 'next/link'; @@ -168,7 +168,7 @@ const ResetPassword = () => { type="submit" disabled={isSubmitting || !isValid} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/CopyButton.tsx b/src/components/Settings/CopyButton.tsx index da48fe5db..c50213d3b 100644 --- a/src/components/Settings/CopyButton.tsx +++ b/src/components/Settings/CopyButton.tsx @@ -1,4 +1,4 @@ -import { ClipboardCopyIcon } from '@heroicons/react/solid'; +import { ClipboardDocumentIcon } from '@heroicons/react/24/solid'; import { useEffect } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { useToasts } from 'react-toast-notifications'; @@ -32,7 +32,7 @@ const CopyButton = ({ textToCopy }: { textToCopy: string }) => { }} className="input-action" > - + ); }; diff --git a/src/components/Settings/LibraryItem.tsx b/src/components/Settings/LibraryItem.tsx index eba0de403..29a1030b2 100644 --- a/src/components/Settings/LibraryItem.tsx +++ b/src/components/Settings/LibraryItem.tsx @@ -1,4 +1,4 @@ -import { CheckIcon, XIcon } from '@heroicons/react/solid'; +import { CheckIcon, XMarkIcon } from '@heroicons/react/24/solid'; interface LibraryItemProps { isEnabled?: boolean; @@ -41,7 +41,7 @@ const LibraryItem = ({ isEnabled, name, onToggle }: LibraryItemProps) => { : 'opacity-100 duration-200 ease-in' } absolute inset-0 flex h-full w-full items-center justify-center transition-opacity`} > - + { (values.enabled && !values.types) } > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/Notifications/NotificationsEmail.tsx b/src/components/Settings/Notifications/NotificationsEmail.tsx index 242c0b859..46d10d6cc 100644 --- a/src/components/Settings/Notifications/NotificationsEmail.tsx +++ b/src/components/Settings/Notifications/NotificationsEmail.tsx @@ -3,7 +3,7 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import SensitiveInput from '@app/components/Common/SensitiveInput'; import SettingsBadge from '@app/components/Settings/SettingsBadge'; import globalMessages from '@app/i18n/globalMessages'; -import { BeakerIcon, SaveIcon } from '@heroicons/react/outline'; +import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import { useState } from 'react'; @@ -460,7 +460,7 @@ const NotificationsEmail = () => { type="submit" disabled={isSubmitting || !isValid || isTesting} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/Notifications/NotificationsGotify/index.tsx b/src/components/Settings/Notifications/NotificationsGotify/index.tsx index 77fb21b8d..390d2ed94 100644 --- a/src/components/Settings/Notifications/NotificationsGotify/index.tsx +++ b/src/components/Settings/Notifications/NotificationsGotify/index.tsx @@ -2,7 +2,7 @@ import Button from '@app/components/Common/Button'; import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import NotificationTypeSelector from '@app/components/NotificationTypeSelector'; import globalMessages from '@app/i18n/globalMessages'; -import { BeakerIcon, SaveIcon } from '@heroicons/react/solid'; +import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/solid'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import { useState } from 'react'; @@ -242,7 +242,7 @@ const NotificationsGotify = () => { (values.enabled && !values.types) } > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/Notifications/NotificationsLunaSea/index.tsx b/src/components/Settings/Notifications/NotificationsLunaSea/index.tsx index 116363252..390cac3d2 100644 --- a/src/components/Settings/Notifications/NotificationsLunaSea/index.tsx +++ b/src/components/Settings/Notifications/NotificationsLunaSea/index.tsx @@ -2,7 +2,7 @@ import Button from '@app/components/Common/Button'; import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import NotificationTypeSelector from '@app/components/NotificationTypeSelector'; import globalMessages from '@app/i18n/globalMessages'; -import { BeakerIcon, SaveIcon } from '@heroicons/react/outline'; +import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import { useState } from 'react'; @@ -247,7 +247,7 @@ const NotificationsLunaSea = () => { (values.enabled && !values.types) } > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/Notifications/NotificationsPushbullet/index.tsx b/src/components/Settings/Notifications/NotificationsPushbullet/index.tsx index bf6a5956e..00cd179ae 100644 --- a/src/components/Settings/Notifications/NotificationsPushbullet/index.tsx +++ b/src/components/Settings/Notifications/NotificationsPushbullet/index.tsx @@ -3,7 +3,7 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import SensitiveInput from '@app/components/Common/SensitiveInput'; import NotificationTypeSelector from '@app/components/NotificationTypeSelector'; import globalMessages from '@app/i18n/globalMessages'; -import { BeakerIcon, SaveIcon } from '@heroicons/react/outline'; +import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import { useState } from 'react'; @@ -239,7 +239,7 @@ const NotificationsPushbullet = () => { (values.enabled && !values.types) } > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/Notifications/NotificationsPushover/index.tsx b/src/components/Settings/Notifications/NotificationsPushover/index.tsx index d2e90ac9c..93e4a285b 100644 --- a/src/components/Settings/Notifications/NotificationsPushover/index.tsx +++ b/src/components/Settings/Notifications/NotificationsPushover/index.tsx @@ -2,7 +2,7 @@ import Button from '@app/components/Common/Button'; import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import NotificationTypeSelector from '@app/components/NotificationTypeSelector'; import globalMessages from '@app/i18n/globalMessages'; -import { BeakerIcon, SaveIcon } from '@heroicons/react/outline'; +import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import { useState } from 'react'; @@ -272,7 +272,7 @@ const NotificationsPushover = () => { (values.enabled && !values.types) } > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/Notifications/NotificationsSlack/index.tsx b/src/components/Settings/Notifications/NotificationsSlack/index.tsx index 09c634437..ac31d3c1a 100644 --- a/src/components/Settings/Notifications/NotificationsSlack/index.tsx +++ b/src/components/Settings/Notifications/NotificationsSlack/index.tsx @@ -2,7 +2,7 @@ import Button from '@app/components/Common/Button'; import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import NotificationTypeSelector from '@app/components/NotificationTypeSelector'; import globalMessages from '@app/i18n/globalMessages'; -import { BeakerIcon, SaveIcon } from '@heroicons/react/outline'; +import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import { useState } from 'react'; @@ -225,7 +225,7 @@ const NotificationsSlack = () => { (values.enabled && !values.types) } > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/Notifications/NotificationsTelegram.tsx b/src/components/Settings/Notifications/NotificationsTelegram.tsx index 1959604e3..690731e6e 100644 --- a/src/components/Settings/Notifications/NotificationsTelegram.tsx +++ b/src/components/Settings/Notifications/NotificationsTelegram.tsx @@ -3,7 +3,7 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import SensitiveInput from '@app/components/Common/SensitiveInput'; import NotificationTypeSelector from '@app/components/NotificationTypeSelector'; import globalMessages from '@app/i18n/globalMessages'; -import { BeakerIcon, SaveIcon } from '@heroicons/react/outline'; +import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import { useState } from 'react'; @@ -321,7 +321,7 @@ const NotificationsTelegram = () => { type="submit" disabled={isSubmitting || !isValid || isTesting} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/Notifications/NotificationsWebPush/index.tsx b/src/components/Settings/Notifications/NotificationsWebPush/index.tsx index 0f56c0c94..5ff7ebf5f 100644 --- a/src/components/Settings/Notifications/NotificationsWebPush/index.tsx +++ b/src/components/Settings/Notifications/NotificationsWebPush/index.tsx @@ -2,7 +2,7 @@ import Alert from '@app/components/Common/Alert'; import Button from '@app/components/Common/Button'; import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import globalMessages from '@app/i18n/globalMessages'; -import { BeakerIcon, SaveIcon } from '@heroicons/react/outline'; +import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import { useEffect, useState } from 'react'; @@ -149,7 +149,7 @@ const NotificationsWebPush = () => { type="submit" disabled={isSubmitting || isTesting} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/Notifications/NotificationsWebhook/index.tsx b/src/components/Settings/Notifications/NotificationsWebhook/index.tsx index 375d869c8..14f1e672e 100644 --- a/src/components/Settings/Notifications/NotificationsWebhook/index.tsx +++ b/src/components/Settings/Notifications/NotificationsWebhook/index.tsx @@ -2,8 +2,11 @@ import Button from '@app/components/Common/Button'; import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import NotificationTypeSelector from '@app/components/NotificationTypeSelector'; import globalMessages from '@app/i18n/globalMessages'; -import { BeakerIcon, SaveIcon } from '@heroicons/react/outline'; -import { QuestionMarkCircleIcon, RefreshIcon } from '@heroicons/react/solid'; +import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline'; +import { + ArrowPathIcon, + QuestionMarkCircleIcon, +} from '@heroicons/react/24/solid'; import axios from 'axios'; import { Field, Form, Formik } from 'formik'; import dynamic from 'next/dynamic'; @@ -291,7 +294,7 @@ const NotificationsWebhook = () => { }} className="mr-2" > - + {intl.formatMessage(messages.resetPayload)} { (values.enabled && !values.types) } > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/Settings/SettingsAbout/Releases/index.tsx b/src/components/Settings/SettingsAbout/Releases/index.tsx index 601d4f449..93ffd6def 100644 --- a/src/components/Settings/SettingsAbout/Releases/index.tsx +++ b/src/components/Settings/SettingsAbout/Releases/index.tsx @@ -4,7 +4,7 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner'; import Modal from '@app/components/Common/Modal'; import globalMessages from '@app/i18n/globalMessages'; import { Transition } from '@headlessui/react'; -import { DocumentTextIcon } from '@heroicons/react/outline'; +import { DocumentTextIcon } from '@heroicons/react/24/outline'; import dynamic from 'next/dynamic'; import { Fragment, useState } from 'react'; import { defineMessages, FormattedRelativeTime, useIntl } from 'react-intl'; diff --git a/src/components/Settings/SettingsAbout/index.tsx b/src/components/Settings/SettingsAbout/index.tsx index 1d3f05663..5c2a17ddd 100644 --- a/src/components/Settings/SettingsAbout/index.tsx +++ b/src/components/Settings/SettingsAbout/index.tsx @@ -6,7 +6,7 @@ import PageTitle from '@app/components/Common/PageTitle'; import Releases from '@app/components/Settings/SettingsAbout/Releases'; import globalMessages from '@app/i18n/globalMessages'; import Error from '@app/pages/_error'; -import { InformationCircleIcon } from '@heroicons/react/solid'; +import { InformationCircleIcon } from '@heroicons/react/24/solid'; import type { SettingsAboutResponse, StatusResponse, diff --git a/src/components/Settings/SettingsJobsCache/index.tsx b/src/components/Settings/SettingsJobsCache/index.tsx index 2600115bc..cd9856195 100644 --- a/src/components/Settings/SettingsJobsCache/index.tsx +++ b/src/components/Settings/SettingsJobsCache/index.tsx @@ -9,8 +9,8 @@ import useLocale from '@app/hooks/useLocale'; import globalMessages from '@app/i18n/globalMessages'; import { formatBytes } from '@app/utils/numberHelpers'; import { Transition } from '@headlessui/react'; -import { PlayIcon, StopIcon, TrashIcon } from '@heroicons/react/outline'; -import { PencilIcon } from '@heroicons/react/solid'; +import { PlayIcon, StopIcon, TrashIcon } from '@heroicons/react/24/outline'; +import { PencilIcon } from '@heroicons/react/24/solid'; import type { CacheItem, CacheResponse, diff --git a/src/components/Settings/SettingsLogs/index.tsx b/src/components/Settings/SettingsLogs/index.tsx index fbf5d5e03..4b559e621 100644 --- a/src/components/Settings/SettingsLogs/index.tsx +++ b/src/components/Settings/SettingsLogs/index.tsx @@ -13,13 +13,13 @@ import { Transition } from '@headlessui/react'; import { ChevronLeftIcon, ChevronRightIcon, - ClipboardCopyIcon, - DocumentSearchIcon, - FilterIcon, + ClipboardDocumentIcon, + DocumentMagnifyingGlassIcon, + FunnelIcon, + MagnifyingGlassIcon, PauseIcon, PlayIcon, - SearchIcon, -} from '@heroicons/react/solid'; +} from '@heroicons/react/24/solid'; import type { LogMessage, LogsResultsResponse, @@ -252,7 +252,7 @@ const SettingsLogs = () => {
- + {
- + { type="submit" disabled={isSubmitting || !isValid} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsDiscord.tsx b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsDiscord.tsx index 121018fcc..841e5f77f 100644 --- a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsDiscord.tsx +++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsDiscord.tsx @@ -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} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsEmail.tsx b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsEmail.tsx index 942ea707d..137c7f65c 100644 --- a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsEmail.tsx +++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsEmail.tsx @@ -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} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsTelegram.tsx b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsTelegram.tsx index 5f665fa60..94109713e 100644 --- a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsTelegram.tsx +++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsTelegram.tsx @@ -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} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush.tsx b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush.tsx index 80a0ec72b..2c940d292 100644 --- a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush.tsx +++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush.tsx @@ -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} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx b/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx index 97f123699..b93c6da6c 100644 --- a/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx +++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/index.tsx @@ -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: ( - + {intl.formatMessage(messages.email)} ), diff --git a/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx b/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx index aea79f72d..bf65e8440 100644 --- a/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx +++ b/src/components/UserProfile/UserSettings/UserPasswordChange/index.tsx @@ -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} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/UserProfile/UserSettings/UserPermissions/index.tsx b/src/components/UserProfile/UserSettings/UserPermissions/index.tsx index 84b671b5f..889edaf75 100644 --- a/src/components/UserProfile/UserSettings/UserPermissions/index.tsx +++ b/src/components/UserProfile/UserSettings/UserPermissions/index.tsx @@ -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} > - + {isSubmitting ? intl.formatMessage(globalMessages.saving) diff --git a/src/components/UserProfile/index.tsx b/src/components/UserProfile/index.tsx index c8bf3b2a6..bb0f7504e 100644 --- a/src/components/UserProfile/index.tsx +++ b/src/components/UserProfile/index.tsx @@ -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 = () => { > {intl.formatMessage(messages.recentrequests)} - +
@@ -332,7 +332,7 @@ const UserProfile = () => { > {intl.formatMessage(messages.plexwatchlist)} - +
diff --git a/src/pages/404.tsx b/src/pages/404.tsx index 3df55fc1b..0b0a059f1 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -1,5 +1,5 @@ import PageTitle from '@app/components/Common/PageTitle'; -import { ArrowCircleRightIcon } from '@heroicons/react/outline'; +import { ArrowRightCircleIcon } from '@heroicons/react/24/outline'; import Link from 'next/link'; import { defineMessages, useIntl } from 'react-intl'; @@ -24,7 +24,7 @@ const Custom404 = () => { {intl.formatMessage(messages.returnHome)} - +
diff --git a/src/pages/_error.tsx b/src/pages/_error.tsx index 2d5102c49..66d85fdbf 100644 --- a/src/pages/_error.tsx +++ b/src/pages/_error.tsx @@ -1,6 +1,6 @@ import PageTitle from '@app/components/Common/PageTitle'; import type { Undefinable } from '@app/utils/typeHelpers'; -import { ArrowCircleRightIcon } from '@heroicons/react/outline'; +import { ArrowRightCircleIcon } from '@heroicons/react/24/outline'; import type { NextPage } from 'next'; import Link from 'next/link'; import { defineMessages, useIntl } from 'react-intl'; @@ -47,7 +47,7 @@ const Error: NextPage = ({ statusCode }) => { {intl.formatMessage(messages.returnHome)} - +
diff --git a/yarn.lock b/yarn.lock index 0f671095f..7faef2d0b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1598,10 +1598,10 @@ dependencies: client-only "^0.0.1" -"@heroicons/react@1.0.6": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@heroicons/react/-/react-1.0.6.tgz#35dd26987228b39ef2316db3b1245c42eb19e324" - integrity sha512-JJCXydOFWMDpCP4q13iEplA503MQO3xLoZiKum+955ZCtHINWnx26CUxVxxFQu/uLb4LW3ge15ZpzIkXKkJ8oQ== +"@heroicons/react@2.0.13": + version "2.0.13" + resolved "https://registry.yarnpkg.com/@heroicons/react/-/react-2.0.13.tgz#9b1cc54ff77d6625c9565efdce0054a4bcd9074c" + integrity sha512-iSN5XwmagrnirWlYEWNPdCDj9aRYVD/lnK3JlsC9/+fqGF80k8C7rl+1HCvBX0dBoagKqOFBs6fMhJJ1hOg1EQ== "@humanwhocodes/config-array@^0.11.8": version "0.11.8"