Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 08:26:00 +01:00
Code Issues Projects Releases Wiki Activity

Update dependencies (again) (#3442)

Browse source 
* Update dependencies
* Upgrade rollup
* Remove all index.ts reexport files
This commit is contained in:
DingDongSoLong4 2023-02-17 00:42:44 +02:00 committed by GitHub
parent a1851b3713
commit bd747317d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
202 changed files with 1297 additions and 1406 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ui/v2.5/.stylelintrc
View file

@ -1,9 +1,7 @@
{
"plugins": ["stylelint-order"],
"extends": "stylelint-config-prettier",
"customSyntax": "postcss-scss",
"rules": {
"indentation": null,
"at-rule-empty-line-before": [
"always",
{
@ -13,14 +11,7 @@
],
"at-rule-no-vendor-prefix": true,
"selector-no-vendor-prefix": true,
"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always-multi-line",
"block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
"block-opening-brace-newline-after": "always-multi-line",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"color-hex-case": "lower",
"color-hex-length": "short",
"color-no-invalid-hex": true,
"comment-empty-line-before": [
@ -31,43 +22,18 @@
}
],
"comment-whitespace-inside": "always",
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-block-no-shorthand-property-overrides": true,
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
"declaration-block-trailing-semicolon": "always",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"declaration-no-important": true,
"font-family-name-quotes": "always-where-recommended",
"function-calc-no-unspaced-operator": true,
"function-comma-newline-after": "always-multi-line",
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
"function-parentheses-newline-inside": "always-multi-line",
"function-parentheses-space-inside": "never-single-line",
"function-url-quotes": "always",
"function-whitespace-after": "always",
"length-zero-no-unit": true,
"max-empty-lines": 1,
"max-nesting-depth": 4,
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-newline-after": "always-multi-line",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"media-feature-parentheses-space-inside": "never",
"no-descending-specificity": null,
"no-invalid-double-slash-comments": true,
"no-missing-end-of-source-newline": true,
"number-max-precision": 3,
"number-no-trailing-zeros": true,
"order/order": ["custom-properties", "declarations"],
"order/properties-alphabetical-order": true,
"rule-empty-line-before": [
@ -80,17 +46,10 @@
"selector-max-id": 1,
"selector-max-type": 2,
"selector-class-pattern": "^(\\.*[A-Z]*[a-z]+)+(-[a-z0-9]+)*$",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-list-comma-newline-after": "always",
"selector-list-comma-space-before": "never",
"selector-max-universal": 0,
"selector-type-case": "lower",
"selector-pseudo-element-colon-notation": "double",
"string-no-newline": true,
"string-quotes": "double",
"time-min-milliseconds": 100,
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never"
"time-min-milliseconds": 100
}
}

57
ui/v2.5/package.json
View file

@ -22,18 +22,18 @@
],
"dependencies": {
"@ant-design/react-slick": "^1.0.0",
"@apollo/client": "^3.7.4",
"@apollo/client": "^3.7.8",
"@formatjs/intl-getcanonicallocales": "^2.0.5",
"@formatjs/intl-locale": "^3.0.11",
"@formatjs/intl-numberformat": "^8.3.3",
"@formatjs/intl-pluralrules": "^5.1.8",
"@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-regular-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1",
"@fortawesome/fontawesome-svg-core": "^6.3.0",
"@fortawesome/free-brands-svg-icons": "^6.3.0",
"@fortawesome/free-regular-svg-icons": "^6.3.0",
"@fortawesome/free-solid-svg-icons": "^6.3.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"apollo-upload-client": "^17.0.0",
"axios": "^1.2.5",
"axios": "^1.3.3",
"base64-blob": "^1.4.1",
"bootstrap": "^4.6.2",
"classnames": "^2.3.2",
@ -42,7 +42,7 @@
"formik": "^2.2.9",
"graphql": "^16.6.0",
"graphql-tag": "^2.12.6",
"graphql-ws": "^5.11.2",
"graphql-ws": "^5.11.3",
"i18n-iso-countries": "^7.5.0",
"intersection-observer": "^0.12.2",
"localforage": "^1.10.0",
@ -54,12 +54,12 @@
"react-bootstrap": "^1.6.6",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
"react-intl": "^6.2.6",
"react-intl": "^6.2.8",
"react-markdown": "^8.0.5",
"react-router-bootstrap": "^0.25.0",
"react-router-dom": "^5.3.4",
"react-router-hash-link": "^2.4.3",
"react-select": "^5.6.1",
"react-select": "^5.7.0",
"remark-gfm": "^3.0.1",
"resize-observer-polyfill": "^1.5.1",
"slick-carousel": "^1.8.1",
@ -70,49 +70,48 @@
"videojs-mobile-ui": "^0.8.0",
"videojs-seek-buttons": "^3.0.1",
"videojs-vtt.js": "^0.15.4",
"yup": "^0.32.11"
"yup": "^1.0.0"
},
"devDependencies": {
"@babel/core": "^7.20.5",
"@graphql-codegen/cli": "^2.16.4",
"@graphql-codegen/time": "^3.2.3",
"@graphql-codegen/typescript": "^2.8.7",
"@graphql-codegen/typescript-operations": "^2.5.12",
"@babel/core": "^7.20.12",
"@graphql-codegen/cli": "^3.0.0",
"@graphql-codegen/time": "^4.0.0",
"@graphql-codegen/typescript": "^3.0.0",
"@graphql-codegen/typescript-operations": "^3.0.0",
"@graphql-codegen/typescript-react-apollo": "^3.3.7",
"@types/apollo-upload-client": "^17.0.2",
"@types/lodash-es": "^4.17.6",
"@types/mousetrap": "^1.6.11",
"@types/node": "^14.18.36",
"@types/node": "^18.13.0",
"@types/react": "^17.0.53",
"@types/react-dom": "^17.0.18",
"@types/react-dom": "^17.0.19",
"@types/react-helmet": "^6.1.6",
"@types/react-router-bootstrap": "^0.24.5",
"@types/react-router-hash-link": "^2.4.5",
"@types/video.js": "^7.3.50",
"@types/video.js": "^7.3.51",
"@types/videojs-mobile-ui": "^0.5.0",
"@types/videojs-seek-buttons": "^2.1.0",
"@typescript-eslint/eslint-plugin": "^5.49.0",
"@typescript-eslint/parser": "^5.49.0",
"@vitejs/plugin-react": "^3.0.1",
"eslint": "^8.32.0",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"@vitejs/plugin-react": "^3.1.0",
"eslint": "^8.34.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.32.1",
"eslint-plugin-react": "^7.32.2",
"eslint-plugin-react-hooks": "^4.6.0",
"extract-react-intl-messages": "^4.1.1",
"postcss": "^8.4.21",
"postcss-scss": "^4.0.6",
"prettier": "^2.8.3",
"sass": "^1.57.1",
"stylelint": "^14.16.1",
"stylelint-config-prettier": "^9.0.4",
"stylelint-order": "^6.0.1",
"prettier": "^2.8.4",
"sass": "^1.58.1",
"stylelint": "^15.1.0",
"stylelint-order": "^6.0.2",
"ts-node": "^10.9.1",
"typescript": "~4.8.4",
"vite": "^4.0.4",
"vite": "^4.1.1",
"vite-plugin-compression": "^0.5.1",
"vite-tsconfig-paths": "^4.0.5"
}

7
ui/v2.5/src/App.tsx
View file

@ -5,7 +5,7 @@ import { Helmet } from "react-helmet";
import cloneDeep from "lodash-es/cloneDeep";
import mergeWith from "lodash-es/mergeWith";
import { ToastProvider } from "src/hooks/Toast";
import LightboxProvider from "src/hooks/Lightbox/context";
import { LightboxProvider } from "src/hooks/Lightbox/context";
import { initPolyfills } from "src/polyfills";
import locales, { registerCountry } from "src/locales";
@ -14,14 +14,15 @@ import {
useConfigureUI,
useSystemStatus,
} from "src/core/StashService";
import { flattenMessages } from "src/utils";
import flattenMessages from "./utils/flattenMessages";
import Mousetrap from "mousetrap";
import MousetrapPause from "mousetrap-pause";
import { ErrorBoundary } from "./components/ErrorBoundary";
import { MainNavbar } from "./components/MainNavbar";
import { PageNotFound } from "./components/PageNotFound";
import * as GQL from "./core/generated-graphql";
import { LoadingIndicator, TITLE_SUFFIX } from "./components/Shared";
import { TITLE_SUFFIX } from "./components/Shared/constants";
import { LoadingIndicator } from "./components/Shared/LoadingIndicator";
import { ConfigurationProvider } from "./hooks/Config";
import { ManualProvider } from "./components/Help/context";

2
ui/v2.5/src/components/Changelog/Changelog.tsx
View file

@ -1,5 +1,5 @@
import React from "react";
import { useChangelogStorage } from "src/hooks";
import { useChangelogStorage } from "src/hooks/LocalForage";
import Version from "./Version";
import V010 from "src/docs/en/Changelog/v010.md";
import V011 from "src/docs/en/Changelog/v011.md";

2
ui/v2.5/src/components/Changelog/Version.tsx
View file

@ -2,7 +2,7 @@ import { faAngleDown, faAngleUp } from "@fortawesome/free-solid-svg-icons";
import React, { useState } from "react";
import { Button, Card, Collapse } from "react-bootstrap";
import { FormattedDate, FormattedMessage } from "react-intl";
import { Icon } from "src/components/Shared";
import { Icon } from "src/components/Shared/Icon";
interface IVersionProps {
version: string;

11
ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
View file

@ -1,13 +1,14 @@
import React, { useState, useEffect, useMemo } from "react";
import { Form, Button } from "react-bootstrap";
import { mutateMetadataGenerate } from "src/core/StashService";
import { Modal, Icon } from "src/components/Shared";
import { useToast } from "src/hooks";
import { ModalComponent } from "../Shared/Modal";
import { Icon } from "src/components/Shared/Icon";
import { useToast } from "src/hooks/Toast";
import * as GQL from "src/core/generated-graphql";
import { FormattedMessage, useIntl } from "react-intl";
import { ConfigurationContext } from "src/hooks/Config";
import { Manual } from "../Help/Manual";
import { withoutTypename } from "src/utils";
import { withoutTypename } from "src/utils/data";
import { GenerateOptions } from "../Settings/Tasks/GenerateOptions";
import { SettingSection } from "../Settings/SettingSection";
import { faCogs, faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
@ -169,7 +170,7 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
}
return (
<Modal
<ModalComponent
show
modalProps={{ animation, size: "lg" }}
icon={faCogs}
@ -203,7 +204,7 @@ export const GenerateDialog: React.FC<ISceneGenerateDialog> = ({
/>
</SettingSection>
</Form>
</Modal>
</ModalComponent>
);
};

2
ui/v2.5/src/components/Dialogs/IdentifyDialog/FieldOptions.tsx
View file

@ -1,6 +1,6 @@
import React, { useState, useEffect, useCallback } from "react";
import { Form, Button, Table } from "react-bootstrap";
import { Icon } from "src/components/Shared";
import { Icon } from "src/components/Shared/Icon";
import * as GQL from "src/core/generated-graphql";
import { FormattedMessage, useIntl } from "react-intl";
import {

12
ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
View file

@ -6,11 +6,13 @@ import {
useConfigureDefaults,
useListSceneScrapers,
} from "src/core/StashService";
import { Icon, Modal, OperationButton } from "src/components/Shared";
import { useToast } from "src/hooks";
import { Icon } from "src/components/Shared/Icon";
import { ModalComponent } from "src/components/Shared/Modal";
import { OperationButton } from "src/components/Shared/OperationButton";
import { useToast } from "src/hooks/Toast";
import * as GQL from "src/core/generated-graphql";
import { FormattedMessage, useIntl } from "react-intl";
import { withoutTypename } from "src/utils";
import { withoutTypename } from "src/utils/data";
import {
SCRAPER_PREFIX,
STASH_BOX_PREFIX,
@ -403,7 +405,7 @@ export const IdentifyDialog: React.FC<IIdentifyDialogProps> = ({
}
return (
<Modal
<ModalComponent
modalProps={{ animation, size: "lg" }}
show
icon={faCogs}
@ -451,7 +453,7 @@ export const IdentifyDialog: React.FC<IIdentifyDialogProps> = ({
setEditingField={(v) => setEditingField(v)}
/>
</Form>
</Modal>
</ModalComponent>
);
};

7
ui/v2.5/src/components/Dialogs/IdentifyDialog/Sources.tsx
View file

@ -1,6 +1,7 @@
import React, { useState, useEffect } from "react";
import { Form, Button, ListGroup } from "react-bootstrap";
import { Modal, Icon } from "src/components/Shared";
import { ModalComponent } from "src/components/Shared/Modal";
import { Icon } from "src/components/Shared/Icon";
import { FormattedMessage, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { IScraperSource } from "./constants";
@ -53,7 +54,7 @@ export const SourcesEditor: React.FC<ISourceEditor> = ({
}
return (
<Modal
<ModalComponent
dialogClassName="identify-source-editor"
modalProps={{ animation: false, size: "lg" }}
show
@ -107,7 +108,7 @@ export const SourcesEditor: React.FC<ISourceEditor> = ({
defaultOptions={defaultOptions}
/>
</Form>
</Modal>
</ModalComponent>
);
};

6
ui/v2.5/src/components/Dialogs/ReleaseNotesDialog.tsx
View file

@ -1,6 +1,6 @@
import React from "react";
import { Form } from "react-bootstrap";
import { Modal } from "src/components/Shared";
import { ModalComponent } from "../Shared/Modal";
import { faCogs } from "@fortawesome/free-solid-svg-icons";
import { useIntl } from "react-intl";
import { MarkdownPage } from "../Shared/MarkdownPage";
@ -17,7 +17,7 @@ export const ReleaseNotesDialog: React.FC<IReleaseNotesDialog> = ({
const intl = useIntl();
return (
<Modal
<ModalComponent
show
icon={faCogs}
header={intl.formatMessage({ id: "release_notes" })}
@ -31,7 +31,7 @@ export const ReleaseNotesDialog: React.FC<IReleaseNotesDialog> = ({
<MarkdownPage page={n} key={i} />
))}
</Form>
</Modal>
</ModalComponent>
);
};

8
ui/v2.5/src/components/Dialogs/SubmitDraft.tsx
View file

@ -2,8 +2,8 @@ import React, { useState } from "react";
import { useMutation, DocumentNode } from "@apollo/client";
import { Button, Form } from "react-bootstrap";
import * as GQL from "src/core/generated-graphql";
import { Modal } from "src/components/Shared";
import { getStashboxBase } from "src/utils";
import { ModalComponent } from "src/components/Shared/Modal";
import { getStashboxBase } from "src/utils/stashbox";
import { FormattedMessage, useIntl } from "react-intl";
import { faPaperPlane } from "@fortawesome/free-solid-svg-icons";
@ -78,7 +78,7 @@ export const SubmitStashBoxDraft: React.FC<IProps> = ({
undefined;
return (
<Modal
<ModalComponent
icon={faPaperPlane}
header={intl.formatMessage({ id: "actions.submit_stash_box" })}
isRunning={loading}
@ -153,7 +153,7 @@ export const SubmitStashBoxDraft: React.FC<IProps> = ({
<div>{error.message}</div>
</>
)}
</Modal>
</ModalComponent>
);
};

4
ui/v2.5/src/components/FrontPage/FrontPage.tsx
View file

@ -1,10 +1,10 @@
import React, { useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { useConfigureUI } from "src/core/StashService";
import { LoadingIndicator } from "src/components/Shared";
import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { Button } from "react-bootstrap";
import { FrontPageConfig } from "./FrontPageConfig";
import { useToast } from "src/hooks";
import { useToast } from "src/hooks/Toast";
import { Control } from "./Control";
import { ConfigurationContext } from "src/hooks/Config";
import {

2
ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
View file

@ -1,7 +1,7 @@
import React, { useEffect, useMemo, useState } from "react";
import { FormattedMessage, IntlShape, useIntl } from "react-intl";
import { useFindSavedFilters } from "src/core/StashService";
import { LoadingIndicator } from "src/components/Shared";
import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { Button, Form, Modal } from "react-bootstrap";
import {
FilterMode,

8
ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
View file

@ -2,8 +2,8 @@ import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { useGalleryDestroy } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { Modal } from "src/components/Shared";
import { useToast } from "src/hooks";
import { ModalComponent } from "../Shared/Modal";
import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@ -119,7 +119,7 @@ export const DeleteGalleriesDialog: React.FC<IDeleteGalleryDialogProps> = (
}
return (
<Modal
<ModalComponent
show
icon={faTrashAlt}
header={header}
@ -155,6 +155,6 @@ export const DeleteGalleriesDialog: React.FC<IDeleteGalleryDialogProps> = (
onChange={() => setDeleteGenerated(!deleteGenerated)}
/>
</Form>
</Modal>
</ModalComponent>
);
};

13
ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
View file

@ -4,10 +4,11 @@ import { FormattedMessage, useIntl } from "react-intl";
import isEqual from "lodash-es/isEqual";
import { useBulkGalleryUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { StudioSelect, Modal } from "src/components/Shared";
import { useToast } from "src/hooks";
import { FormUtils } from "src/utils";
import MultiSet from "../Shared/MultiSet";
import { StudioSelect } from "../Shared/Select";
import { ModalComponent } from "../Shared/Modal";
import { useToast } from "src/hooks/Toast";
import FormUtils from "src/utils/form";
import { MultiSet } from "../Shared/MultiSet";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputIDs,
@ -226,7 +227,7 @@ export const EditGalleriesDialog: React.FC<IListOperationProps> = (
function render() {
return (
<Modal
<ModalComponent
show
icon={faPencilAlt}
header={intl.formatMessage(
@ -300,7 +301,7 @@ export const EditGalleriesDialog: React.FC<IListOperationProps> = (
/>
</Form.Group>
</Form>
</Modal>
</ModalComponent>
);
}

2
ui/v2.5/src/components/Galleries/Galleries.tsx
View file

@ -2,7 +2,7 @@ import React from "react";
import { Route, Switch } from "react-router-dom";
import { useIntl } from "react-intl";
import { Helmet } from "react-helmet";
import { TITLE_SUFFIX } from "src/components/Shared";
import { TITLE_SUFFIX } from "../Shared/constants";
import { PersistanceLevel } from "src/hooks/ListHook";
import Gallery from "./GalleryDetails/Gallery";
import GalleryCreate from "./GalleryDetails/GalleryCreate";

18
ui/v2.5/src/components/Galleries/GalleryCard.tsx
View file

@ -2,17 +2,15 @@ import { Button, ButtonGroup } from "react-bootstrap";
import React from "react";
import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import {
GridCard,
HoverPopover,
Icon,
TagLink,
TruncatedText,
} from "src/components/Shared";
import { PopoverCountButton } from "src/components/Shared/PopoverCountButton";
import { NavUtils } from "src/utils";
import { ConfigurationContext } from "src/hooks/Config";
import { GridCard } from "../Shared/GridCard";
import { HoverPopover } from "../Shared/HoverPopover";
import { Icon } from "../Shared/Icon";
import { TagLink } from "../Shared/TagLink";
import { TruncatedText } from "../Shared/TruncatedText";
import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
import { PopoverCountButton } from "../Shared/PopoverCountButton";
import NavUtils from "src/utils/navigation";
import { ConfigurationContext } from "src/hooks/Config";
import { RatingBanner } from "../Shared/RatingBanner";
import { faBox, faPlayCircle, faTag } from "@fortawesome/free-solid-svg-icons";
import { galleryTitle } from "src/core/galleries";

12
ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
View file

@ -9,14 +9,12 @@ import {
useFindGallery,
useGalleryUpdate,
} from "src/core/StashService";
import {
ErrorMessage,
LoadingIndicator,
Icon,
Counter,
} from "src/components/Shared";
import { ErrorMessage } from "src/components/Shared/ErrorMessage";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { Icon } from "src/components/Shared/Icon";
import { Counter } from "src/components/Shared/Counter";
import Mousetrap from "mousetrap";
import { useToast } from "src/hooks";
import { useToast } from "src/hooks/Toast";
import { OrganizedButton } from "src/components/Scenes/SceneDetails/OrganizedButton";
import { GalleryEditPanel } from "./GalleryEditPanel";
import { GalleryDetailPanel } from "./GalleryDetailPanel";

2
ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
View file

@ -5,7 +5,7 @@ import { ListFilterModel } from "src/models/list-filter/filter";
import { ImageList } from "src/components/Images/ImageList";
import { showWhenSelected } from "src/hooks/ListHook";
import { mutateAddGalleryImages } from "src/core/StashService";
import { useToast } from "src/hooks";
import { useToast } from "src/hooks/Toast";
import { useIntl } from "react-intl";
import { faPlus } from "@fortawesome/free-solid-svg-icons";
import { galleryTitle } from "src/core/galleries";

5
ui/v2.5/src/components/Galleries/GalleryDetails/GalleryDetailPanel.tsx
View file

@ -2,8 +2,9 @@ import React from "react";
import { Link } from "react-router-dom";
import { FormattedDate, FormattedMessage, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { TextUtils } from "src/utils";
import { TagLink, TruncatedText } from "src/components/Shared";
import TextUtils from "src/utils/text";
import { TagLink } from "src/components/Shared/TagLink";
import { TruncatedText } from "src/components/Shared/TruncatedText";
import { PerformerCard } from "src/components/Performers/PerformerCard";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { sortPerformers } from "src/core/performers";

12
ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
View file

@ -25,13 +25,13 @@ import {
TagSelect,
SceneSelect,
StudioSelect,
Icon,
LoadingIndicator,
URLField,
} from "src/components/Shared";
import { useToast } from "src/hooks";
} from "src/components/Shared/Select";
import { Icon } from "src/components/Shared/Icon";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { URLField } from "src/components/Shared/URLField";
import { useToast } from "src/hooks/Toast";
import { useFormik } from "formik";
import { FormUtils } from "src/utils";
import FormUtils from "src/utils/form";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { GalleryScrapeDialog } from "./GalleryScrapeDialog";
import { faSyncAlt } from "@fortawesome/free-solid-svg-icons";

8
ui/v2.5/src/components/Galleries/GalleryDetails/GalleryFileInfoPanel.tsx
View file

@ -1,12 +1,12 @@
import React, { useMemo, useState } from "react";
import { Accordion, Button, Card } from "react-bootstrap";
import { FormattedMessage, FormattedTime } from "react-intl";
import { TruncatedText } from "src/components/Shared";
import DeleteFilesDialog from "src/components/Shared/DeleteFilesDialog";
import { TruncatedText } from "src/components/Shared/TruncatedText";
import { DeleteFilesDialog } from "src/components/Shared/DeleteFilesDialog";
import * as GQL from "src/core/generated-graphql";
import { mutateGallerySetPrimaryFile } from "src/core/StashService";
import { useToast } from "src/hooks";
import { TextUtils } from "src/utils";
import { useToast } from "src/hooks/Toast";
import TextUtils from "src/utils/text";
import { TextField, URLField } from "src/utils/field";
interface IFileInfoPanelProps {

2
ui/v2.5/src/components/Galleries/GalleryDetails/GalleryImagesPanel.tsx
View file

@ -5,7 +5,7 @@ import { ListFilterModel } from "src/models/list-filter/filter";
import { ImageList } from "src/components/Images/ImageList";
import { mutateRemoveGalleryImages } from "src/core/StashService";
import { showWhenSelected, PersistanceLevel } from "src/hooks/ListHook";
import { useToast } from "src/hooks";
import { useToast } from "src/hooks/Toast";
import { useIntl } from "react-intl";
import { faMinus } from "@fortawesome/free-solid-svg-icons";
import { galleryTitle } from "src/core/galleries";

9
ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
View file

@ -1,8 +1,11 @@
import React, { useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { StudioSelect, PerformerSelect } from "src/components/Shared";
import {
StudioSelect,
PerformerSelect,
TagSelect,
} from "src/components/Shared/Select";
import * as GQL from "src/core/generated-graphql";
import { TagSelect } from "src/components/Shared/Select";
import {
ScrapeDialog,
ScrapeDialogRow,
@ -17,7 +20,7 @@ import {
useTagCreate,
makePerformerCreateInput,
} from "src/core/StashService";
import { useToast } from "src/hooks";
import { useToast } from "src/hooks/Toast";
function renderScrapedStudio(
result: ScrapeResult<string>,

7
ui/v2.5/src/components/Galleries/GalleryList.tsx
View file

@ -8,8 +8,11 @@ import {
FindGalleriesQueryResult,
SlimGalleryDataFragment,
} from "src/core/generated-graphql";
import { useGalleriesList } from "src/hooks";
import { showWhenSelected, PersistanceLevel } from "src/hooks/ListHook";
import {
showWhenSelected,
PersistanceLevel,
useGalleriesList,
} from "src/hooks/ListHook";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
import { queryFindGalleries } from "src/core/StashService";

4
ui/v2.5/src/components/Galleries/GalleryViewer.tsx
View file

@ -1,6 +1,6 @@
import React, { useMemo } from "react";
import { useLightbox } from "src/hooks";
import { LoadingIndicator } from "src/components/Shared";
import { useLightbox } from "src/hooks/Lightbox/hooks";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import "flexbin/flexbin.css";
import {
CriterionModifier,

6
ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
View file

@ -2,9 +2,9 @@ import React from "react";
import { useIntl } from "react-intl";
import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import { TruncatedText } from "src/components/Shared";
import { TextUtils } from "src/utils";
import { useGalleryLightbox } from "src/hooks";
import { TruncatedText } from "src/components/Shared/TruncatedText";
import TextUtils from "src/utils/text";
import { useGalleryLightbox } from "src/hooks/Lightbox/hooks";
import { galleryTitle } from "src/core/galleries";
import { RatingSystem } from "../Shared/Rating/RatingSystem";

8
ui/v2.5/src/components/Images/DeleteImagesDialog.tsx
View file

@ -2,8 +2,8 @@ import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { useImagesDestroy } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { Modal } from "src/components/Shared";
import { useToast } from "src/hooks";
import { ModalComponent } from "src/components/Shared/Modal";
import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@ -112,7 +112,7 @@ export const DeleteImagesDialog: React.FC<IDeleteImageDialogProps> = (
}
return (
<Modal
<ModalComponent
show
icon={faTrashAlt}
header={header}
@ -146,6 +146,6 @@ export const DeleteImagesDialog: React.FC<IDeleteImageDialogProps> = (
onChange={() => setDeleteGenerated(!deleteGenerated)}
/>
</Form>
</Modal>
</ModalComponent>
);
};

13
ui/v2.5/src/components/Images/EditImagesDialog.tsx
View file

@ -4,10 +4,11 @@ import { FormattedMessage, useIntl } from "react-intl";
import isEqual from "lodash-es/isEqual";
import { useBulkImageUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { StudioSelect, Modal } from "src/components/Shared";
import { useToast } from "src/hooks";
import { FormUtils } from "src/utils";
import MultiSet from "../Shared/MultiSet";
import { StudioSelect } from "src/components/Shared/Select";
import { ModalComponent } from "src/components/Shared/Modal";
import { useToast } from "src/hooks/Toast";
import FormUtils from "src/utils/form";
import { MultiSet } from "../Shared/MultiSet";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputIDs,
@ -216,7 +217,7 @@ export const EditImagesDialog: React.FC<IListOperationProps> = (
function render() {
return (
<Modal
<ModalComponent
show
icon={faPencilAlt}
header={intl.formatMessage(
@ -290,7 +291,7 @@ export const EditImagesDialog: React.FC<IListOperationProps> = (
/>
</Form.Group>
</Form>
</Modal>
</ModalComponent>
);
}

11
ui/v2.5/src/components/Images/ImageCard.tsx
View file

@ -2,10 +2,13 @@ import React, { MouseEvent, useMemo } from "react";
import { Button, ButtonGroup } from "react-bootstrap";
import cx from "classnames";
import * as GQL from "src/core/generated-graphql";
import { Icon, TagLink, HoverPopover, SweatDrops } from "src/components/Shared";
import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
import { GridCard } from "../Shared/GridCard";
import { RatingBanner } from "../Shared/RatingBanner";
import { Icon } from "src/components/Shared/Icon";
import { TagLink } from "src/components/Shared/TagLink";
import { HoverPopover } from "src/components/Shared/HoverPopover";
import { SweatDrops } from "src/components/Shared/SweatDrops";
import { PerformerPopoverButton } from "src/components/Shared/PerformerPopoverButton";
import { GridCard } from "src/components/Shared/GridCard";
import { RatingBanner } from "src/components/Shared/RatingBanner";
import {
faBox,
faImages,

12
ui/v2.5/src/components/Images/ImageDetails/Image.tsx
View file

@ -11,13 +11,11 @@ import {
useImageUpdate,
mutateMetadataScan,
} from "src/core/StashService";
import {
ErrorMessage,
LoadingIndicator,
Icon,
Counter,
} from "src/components/Shared";
import { useToast } from "src/hooks";
import { ErrorMessage } from "src/components/Shared/ErrorMessage";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { Icon } from "src/components/Shared/Icon";
import { Counter } from "src/components/Shared/Counter";
import { useToast } from "src/hooks/Toast";
import * as Mousetrap from "mousetrap";
import { OCounterButton } from "src/components/Scenes/SceneDetails/OCounterButton";
import { OrganizedButton } from "src/components/Scenes/SceneDetails/OrganizedButton";

5
ui/v2.5/src/components/Images/ImageDetails/ImageDetailPanel.tsx
View file

@ -1,8 +1,9 @@
import React, { useMemo } from "react";
import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import { TextUtils } from "src/utils";
import { TagLink, TruncatedText } from "src/components/Shared";
import TextUtils from "src/utils/text";
import { TagLink } from "src/components/Shared/TagLink";
import { TruncatedText } from "src/components/Shared/TruncatedText";
import { PerformerCard } from "src/components/Performers/PerformerCard";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { sortPerformers } from "src/core/performers";

10
ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
View file

@ -9,11 +9,11 @@ import {
PerformerSelect,
TagSelect,
StudioSelect,
LoadingIndicator,
URLField,
} from "src/components/Shared";
import { useToast } from "src/hooks";
import { FormUtils } from "src/utils";
} from "src/components/Shared/Select";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { URLField } from "src/components/Shared/URLField";
import { useToast } from "src/hooks/Toast";
import FormUtils from "src/utils/form";
import { useFormik } from "formik";
import { Prompt } from "react-router-dom";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";

8
ui/v2.5/src/components/Images/ImageDetails/ImageFileInfoPanel.tsx
View file

@ -1,12 +1,12 @@
import React, { useState } from "react";
import { Accordion, Button, Card } from "react-bootstrap";
import { FormattedMessage, FormattedNumber, FormattedTime } from "react-intl";
import { TruncatedText } from "src/components/Shared";
import DeleteFilesDialog from "src/components/Shared/DeleteFilesDialog";
import { TruncatedText } from "src/components/Shared/TruncatedText";
import { DeleteFilesDialog } from "src/components/Shared/DeleteFilesDialog";
import * as GQL from "src/core/generated-graphql";
import { mutateImageSetPrimaryFile } from "src/core/StashService";
import { useToast } from "src/hooks";
import { TextUtils } from "src/utils";
import { useToast } from "src/hooks/Toast";
import TextUtils from "src/utils/text";
import { TextField, URLField } from "src/utils/field";
interface IFileInfoPanelProps {

3
ui/v2.5/src/components/Images/ImageList.tsx
View file

@ -9,13 +9,14 @@ import {
} from "src/core/generated-graphql";
import * as GQL from "src/core/generated-graphql";
import { queryFindImages } from "src/core/StashService";
import { useImagesList, useLightbox } from "src/hooks";
import { useLightbox } from "src/hooks/Lightbox/hooks";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
import {
IListHookOperation,
showWhenSelected,
PersistanceLevel,
useImagesList,
} from "src/hooks/ListHook";
import { ImageCard } from "./ImageCard";

2
ui/v2.5/src/components/Images/Images.tsx
View file

@ -2,7 +2,7 @@ import React from "react";
import { Route, Switch } from "react-router-dom";
import { useIntl } from "react-intl";
import { Helmet } from "react-helmet";
import { TITLE_SUFFIX } from "src/components/Shared";
import { TITLE_SUFFIX } from "../Shared/constants";
import { PersistanceLevel } from "src/hooks/ListHook";
import { Image } from "./ImageDetails/Image";
import { ImageList } from "./ImageList";

2
ui/v2.5/src/components/List/AddFilterDialog.tsx
View file

@ -36,7 +36,7 @@ import { InputFilter } from "./Filters/InputFilter";
import { DateFilter } from "./Filters/DateFilter";
import { TimestampFilter } from "./Filters/TimestampFilter";
import { CountryCriterion } from "src/models/list-filter/criteria/country";
import { CountrySelect } from "../Shared";
import { CountrySelect } from "../Shared/CountrySelect";
import { StashIDCriterion } from "src/models/list-filter/criteria/stash-ids";
import { StashIDFilter } from "./Filters/StashIDFilter";
import { ConfigurationContext } from "src/hooks/Config";

2
ui/v2.5/src/components/List/FilterTags.tsx
View file

@ -5,7 +5,7 @@ import {
CriterionValue,
} from "src/models/list-filter/criteria/criterion";
import { useIntl } from "react-intl";
import { Icon } from "../Shared";
import { Icon } from "../Shared/Icon";
import { faTimes } from "@fortawesome/free-solid-svg-icons";
interface IFilterTagsProps {

8
ui/v2.5/src/components/List/Filters/DurationFilter.tsx
View file

@ -1,10 +1,10 @@
import React from "react";
import { Form } from "react-bootstrap";
import { useIntl } from "react-intl";
import { CriterionModifier } from "../../../core/generated-graphql";
import { DurationInput } from "../../Shared";
import { INumberValue } from "../../../models/list-filter/types";
import { Criterion } from "../../../models/list-filter/criteria/criterion";
import { CriterionModifier } from "src/core/generated-graphql";
import { DurationInput } from "src/components/Shared/DurationInput";
import { INumberValue } from "src/models/list-filter/types";
import { Criterion } from "src/models/list-filter/criteria/criterion";
interface IDurationFilterProps {
criterion: Criterion<INumberValue>;

6
ui/v2.5/src/components/List/Filters/HierarchicalLabelValueFilter.tsx
View file

@ -1,9 +1,9 @@
import React from "react";
import { Form } from "react-bootstrap";
import { defineMessages, MessageDescriptor, useIntl } from "react-intl";
import { FilterSelect, ValidTypes } from "../../Shared";
import { Criterion } from "../../../models/list-filter/criteria/criterion";
import { IHierarchicalLabelValue } from "../../../models/list-filter/types";
import { FilterSelect, ValidTypes } from "src/components/Shared/Select";
import { Criterion } from "src/models/list-filter/criteria/criterion";
import { IHierarchicalLabelValue } from "src/models/list-filter/types";
interface IHierarchicalLabelValueFilterProps {
criterion: Criterion<IHierarchicalLabelValue>;

6
ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx
View file

@ -1,8 +1,8 @@
import React from "react";
import { Form } from "react-bootstrap";
import { FilterSelect, ValidTypes } from "../../Shared";
import { Criterion } from "../../../models/list-filter/criteria/criterion";
import { ILabeledId } from "../../../models/list-filter/types";
import { FilterSelect, ValidTypes } from "src/components/Shared/Select";
import { Criterion } from "src/models/list-filter/criteria/criterion";
import { ILabeledId } from "src/models/list-filter/types";
interface ILabeledIdFilterProps {
criterion: Criterion<ILabeledId[]>;

4
ui/v2.5/src/components/List/ListFilter.tsx
View file

@ -17,9 +17,9 @@ import {
Overlay,
} from "react-bootstrap";
import { Icon } from "src/components/Shared";
import { Icon } from "../Shared/Icon";
import { ListFilterModel } from "src/models/list-filter/filter";
import { useFocus } from "src/utils";
import useFocus from "src/utils/focus";
import { ListFilterOptions } from "src/models/list-filter/filter-options";
import { FormattedMessage, useIntl } from "react-intl";
import { PersistanceLevel } from "src/hooks/ListHook";

2
ui/v2.5/src/components/List/ListOperationButtons.tsx
View file

@ -9,7 +9,7 @@ import {
import Mousetrap from "mousetrap";
import { FormattedMessage, useIntl } from "react-intl";
import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
import { Icon } from "../Shared";
import { Icon } from "../Shared/Icon";
import {
faEllipsisH,
faPencilAlt,

2
ui/v2.5/src/components/List/ListViewOptions.tsx
View file

@ -9,7 +9,7 @@ import {
} from "react-bootstrap";
import { DisplayMode } from "src/models/list-filter/types";
import { useIntl } from "react-intl";
import { Icon } from "../Shared";
import { Icon } from "../Shared/Icon";
import {
faList,
faSquare,

6
ui/v2.5/src/components/List/SavedFilterList.tsx
View file

@ -15,13 +15,13 @@ import {
useSaveFilter,
useSetDefaultFilter,
} from "src/core/StashService";
import { useToast } from "src/hooks";
import { useToast } from "src/hooks/Toast";
import { ListFilterModel } from "src/models/list-filter/filter";
import { SavedFilterDataFragment } from "src/core/generated-graphql";
import { LoadingIndicator } from "src/components/Shared";
import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { PersistanceLevel } from "src/hooks/ListHook";
import { FormattedMessage, useIntl } from "react-intl";
import { Icon } from "../Shared";
import { Icon } from "../Shared/Icon";
import { faSave, faTimes } from "@fortawesome/free-solid-svg-icons";
interface ISavedFilterListProps {

4
ui/v2.5/src/components/MainNavbar.tsx
View file

@ -11,8 +11,8 @@ import { LinkContainer } from "react-router-bootstrap";
import { Link, NavLink, useLocation, useHistory } from "react-router-dom";
import Mousetrap from "mousetrap";
import { SessionUtils } from "src/utils";
import Icon from "src/components/Shared/Icon";
import SessionUtils from "src/utils/session";
import { Icon } from "src/components/Shared/Icon";
import { ConfigurationContext } from "src/hooks/Config";
import { ManualStateContext } from "./Help/context";
import { SettingsButton } from "./SettingsButton";

11
ui/v2.5/src/components/Movies/EditMoviesDialog.tsx
View file

@ -3,9 +3,10 @@ import { Form, Col, Row } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import { useBulkMovieUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { Modal, StudioSelect } from "src/components/Shared";
import { useToast } from "src/hooks";
import { FormUtils } from "src/utils";
import { ModalComponent } from "../Shared/Modal";
import { StudioSelect } from "../Shared/Select";
import { useToast } from "src/hooks/Toast";
import FormUtils from "src/utils/form";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputValue,
@ -100,7 +101,7 @@ export const EditMoviesDialog: React.FC<IListOperationProps> = (
function render() {
return (
<Modal
<ModalComponent
show
icon={faPencilAlt}
header={intl.formatMessage(
@ -158,7 +159,7 @@ export const EditMoviesDialog: React.FC<IListOperationProps> = (
/>
</Form.Group>
</Form>
</Modal>
</ModalComponent>
);
}

12
ui/v2.5/src/components/Movies/MovieCard.tsx
View file

@ -1,13 +1,11 @@
import React from "react";
import { Button, ButtonGroup } from "react-bootstrap";
import * as GQL from "src/core/generated-graphql";
import {
GridCard,
HoverPopover,
Icon,
TagLink,
TruncatedText,
} from "src/components/Shared";
import { GridCard } from "../Shared/GridCard";
import { HoverPopover } from "../Shared/HoverPopover";
import { Icon } from "../Shared/Icon";
import { TagLink } from "../Shared/TagLink";
import { TruncatedText } from "../Shared/TruncatedText";
import { FormattedMessage } from "react-intl";
import { RatingBanner } from "../Shared/RatingBanner";
import { faPlayCircle } from "@fortawesome/free-solid-svg-icons";

16
ui/v2.5/src/components/Movies/MovieDetails/Movie.tsx
View file

@ -9,13 +9,11 @@ import {
useMovieDestroy,
} from "src/core/StashService";
import { useParams, useHistory } from "react-router-dom";
import {
DetailsEditNavbar,
ErrorMessage,
LoadingIndicator,
Modal,
} from "src/components/Shared";
import { useToast } from "src/hooks";
import { DetailsEditNavbar } from "src/components/Shared/DetailsEditNavbar";
import { ErrorMessage } from "src/components/Shared/ErrorMessage";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { ModalComponent } from "src/components/Shared/Modal";
import { useToast } from "src/hooks/Toast";
import { MovieScenesPanel } from "./MovieScenesPanel";
import { MovieDetailsPanel } from "./MovieDetailsPanel";
import { MovieEditPanel } from "./MovieEditPanel";
@ -111,7 +109,7 @@ const MoviePage: React.FC<IProps> = ({ movie }) => {
function renderDeleteAlert() {
return (
<Modal
<ModalComponent
show={isDeleteAlertOpen}
icon={faTrashAlt}
accept={{
@ -131,7 +129,7 @@ const MoviePage: React.FC<IProps> = ({ movie }) => {
}}
/>
</p>
</Modal>
</ModalComponent>
);
}

4
ui/v2.5/src/components/Movies/MovieDetails/MovieCreate.tsx
View file

@ -2,8 +2,8 @@ import React, { useMemo, useState } from "react";
import * as GQL from "src/core/generated-graphql";
import { useMovieCreate } from "src/core/StashService";
import { useHistory, useLocation } from "react-router-dom";
import { LoadingIndicator } from "src/components/Shared";
import { useToast } from "src/hooks";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { useToast } from "src/hooks/Toast";
import { MovieEditPanel } from "./MovieEditPanel";
const MovieCreate: React.FC = () => {

3
ui/v2.5/src/components/Movies/MovieDetails/MovieDetailsPanel.tsx
View file

@ -1,7 +1,8 @@
import React from "react";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { DurationUtils, TextUtils } from "src/utils";
import DurationUtils from "src/utils/duration";
import TextUtils from "src/utils/text";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { TextField, URLField } from "src/utils/field";

18
ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
View file

@ -7,16 +7,16 @@ import {
queryScrapeMovieURL,
useListMovieScrapers,
} from "src/core/StashService";
import {
LoadingIndicator,
StudioSelect,
DetailsEditNavbar,
DurationInput,
URLField,
} from "src/components/Shared";
import { useToast } from "src/hooks";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { StudioSelect } from "src/components/Shared/Select";
import { DetailsEditNavbar } from "src/components/Shared/DetailsEditNavbar";
import { DurationInput } from "src/components/Shared/DurationInput";
import { URLField } from "src/components/Shared/URLField";
import { useToast } from "src/hooks/Toast";
import { Modal as BSModal, Form, Button, Col, Row } from "react-bootstrap";
import { DurationUtils, FormUtils, ImageUtils } from "src/utils";
import DurationUtils from "src/utils/duration";
import FormUtils from "src/utils/form";
import ImageUtils from "src/utils/image";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { useFormik } from "formik";
import { Prompt } from "react-router-dom";

6
ui/v2.5/src/components/Movies/MovieDetails/MovieScrapeDialog.tsx
View file

@ -9,10 +9,10 @@ import {
ScrapeDialogRow,
ScrapedTextAreaRow,
} from "src/components/Shared/ScrapeDialog";
import { StudioSelect } from "src/components/Shared";
import { DurationUtils } from "src/utils";
import { StudioSelect } from "src/components/Shared/Select";
import DurationUtils from "src/utils/duration";
import { useStudioCreate } from "src/core/StashService";
import { useToast } from "src/hooks";
import { useToast } from "src/hooks/Toast";
function renderScrapedStudio(
result: ScrapeResult<string>,

3
ui/v2.5/src/components/Movies/MovieList.tsx
View file

@ -16,7 +16,8 @@ import {
useMoviesList,
PersistanceLevel,
} from "src/hooks/ListHook";
import { ExportDialog, DeleteEntityDialog } from "src/components/Shared";
import { ExportDialog } from "../Shared/ExportDialog";
import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
import { MovieCard } from "./MovieCard";
import { EditMoviesDialog } from "./EditMoviesDialog";

2
ui/v2.5/src/components/Movies/Movies.tsx
View file

@ -2,7 +2,7 @@ import React from "react";
import { Route, Switch } from "react-router-dom";
import { useIntl } from "react-intl";
import { Helmet } from "react-helmet";
import { TITLE_SUFFIX } from "src/components/Shared";
import { TITLE_SUFFIX } from "src/components/Shared/constants";
import Movie from "./MovieDetails/Movie";
import MovieCreate from "./MovieDetails/MovieCreate";
import { MovieList } from "./MovieList";

12
ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
View file

@ -3,9 +3,9 @@ import { Col, Form, Row } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import { useBulkPerformerUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { Modal } from "src/components/Shared";
import { useToast } from "src/hooks";
import MultiSet from "../Shared/MultiSet";
import { ModalComponent } from "../Shared/Modal";
import { useToast } from "src/hooks/Toast";
import { MultiSet } from "../Shared/MultiSet";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputValue,
@ -20,7 +20,7 @@ import {
import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
import { FormUtils } from "../../utils";
import FormUtils from "src/utils/form";
interface IListOperationProps {
selected: GQL.SlimPerformerDataFragment[];
@ -181,7 +181,7 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
function render() {
return (
<Modal
<ModalComponent
show
icon={faPencilAlt}
header={intl.formatMessage(
@ -317,7 +317,7 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
/>
</Form.Group>
</Form>
</Modal>
</ModalComponent>
);
}

15
ui/v2.5/src/components/Performers/PerformerCard.tsx
View file

@ -2,14 +2,13 @@ import React from "react";
import { Link } from "react-router-dom";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { NavUtils, TextUtils } from "src/utils";
import {
GridCard,
CountryFlag,
HoverPopover,
Icon,
TagLink,
} from "src/components/Shared";
import NavUtils from "src/utils/navigation";
import TextUtils from "src/utils/text";
import { GridCard } from "../Shared/GridCard";
import { CountryFlag } from "../Shared/CountryFlag";
import { HoverPopover } from "../Shared/HoverPopover";
import { Icon } from "../Shared/Icon";
import { TagLink } from "../Shared/TagLink";
import { Button, ButtonGroup } from "react-bootstrap";
import {
Criterion,

19
ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
View file

@ -12,17 +12,16 @@ import {
usePerformerDestroy,
mutateMetadataAutoTag,
} from "src/core/StashService";
import {
Counter,
CountryFlag,
DetailsEditNavbar,
ErrorMessage,
Icon,
LoadingIndicator,
} from "src/components/Shared";
import { useLightbox, useToast } from "src/hooks";
import { Counter } from "src/components/Shared/Counter";
import { CountryFlag } from "src/components/Shared/CountryFlag";
import { DetailsEditNavbar } from "src/components/Shared/DetailsEditNavbar";
import { ErrorMessage } from "src/components/Shared/ErrorMessage";
import { Icon } from "src/components/Shared/Icon";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { useLightbox } from "src/hooks/Lightbox/hooks";
import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
import { TextUtils } from "src/utils";
import TextUtils from "src/utils/text";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { PerformerDetailsPanel } from "./PerformerDetailsPanel";
import { PerformerScenesPanel } from "./PerformerScenesPanel";

2
ui/v2.5/src/components/Performers/PerformerDetails/PerformerCreate.tsx
View file

@ -1,6 +1,6 @@
import React, { useMemo, useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { LoadingIndicator } from "src/components/Shared";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { PerformerEditPanel } from "./PerformerEditPanel";
import { useLocation } from "react-router-dom";

6
ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
View file

@ -1,8 +1,10 @@
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { TagLink } from "src/components/Shared";
import { TagLink } from "src/components/Shared/TagLink";
import * as GQL from "src/core/generated-graphql";
import { TextUtils, getStashboxBase, getCountryByISO } from "src/utils";
import TextUtils from "src/utils/text";
import { getStashboxBase } from "src/utils/stashbox";
import { getCountryByISO } from "src/utils/country";
import { TextField, URLField } from "src/utils/field";
import { cmToImperial, kgToLbs } from "src/utils/units";

25
ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
View file

@ -13,17 +13,17 @@ import {
useTagCreate,
queryScrapePerformerURL,
} from "src/core/StashService";
import {
Icon,
ImageInput,
LoadingIndicator,
CollapseButton,
TagSelect,
URLField,
CountrySelect,
} from "src/components/Shared";
import { ImageUtils, getStashIDs } from "src/utils";
import { useToast } from "src/hooks";
import { Icon } from "src/components/Shared/Icon";
import { ImageInput } from "src/components/Shared/ImageInput";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { CollapseButton } from "src/components/Shared/CollapseButton";
import { TagSelect } from "src/components/Shared/Select";
import { CountrySelect } from "src/components/Shared/CountrySelect";
import { URLField } from "src/components/Shared/URLField";
import ImageUtils from "src/utils/image";
import { getStashIDs } from "src/utils/stashIds";
import { stashboxDisplayName } from "src/utils/stashbox";
import { useToast } from "src/hooks/Toast";
import { Prompt, useHistory } from "react-router-dom";
import { useFormik } from "formik";
import {
@ -32,7 +32,6 @@ import {
stringToGender,
} from "src/utils/gender";
import { ConfigurationContext } from "src/hooks/Config";
import { stashboxDisplayName } from "src/utils/stashbox";
import { PerformerScrapeDialog } from "./PerformerScrapeDialog";
import PerformerScrapeModal from "./PerformerScrapeModal";
import PerformerStashBoxModal, { IStashBox } from "./PerformerStashBoxModal";
@ -68,7 +67,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
const isNew = performer.id === undefined;
// Editing state
// Editing stat
const [scraper, setScraper] = useState<GQL.Scraper | IStashBox>();
const [newTags, setNewTags] = useState<GQL.ScrapedTag[]>();
const [isScraperModalOpen, setIsScraperModalOpen] = useState<boolean>(false);

4
ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeDialog.tsx
View file

@ -12,8 +12,8 @@ import {
} from "src/components/Shared/ScrapeDialog";
import { useTagCreate } from "src/core/StashService";
import { Form } from "react-bootstrap";
import { TagSelect } from "src/components/Shared";
import { useToast } from "src/hooks";
import { TagSelect } from "src/components/Shared/Select";
import { useToast } from "src/hooks/Toast";
import clone from "lodash-es/clone";
import {
genderStrings,

7
ui/v2.5/src/components/Performers/PerformerDetails/PerformerScrapeModal.tsx
View file

@ -4,7 +4,8 @@ import { Button, Form } from "react-bootstrap";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { Modal, LoadingIndicator } from "src/components/Shared";
import { ModalComponent } from "src/components/Shared/Modal";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { useScrapePerformerList } from "src/core/StashService";
const CLASSNAME = "PerformerScrapeModal";
@ -39,7 +40,7 @@ const PerformerScrapeModal: React.FC<IProps> = ({
useEffect(() => inputRef.current?.focus(), []);
return (
<Modal
<ModalComponent
show
onHide={onHide}
header={`Scrape performer from ${scraper.name}`}
@ -77,7 +78,7 @@ const PerformerScrapeModal: React.FC<IProps> = ({
</ul>
)}
</div>
</Modal>
</ModalComponent>
);
};

7
ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
View file

@ -4,7 +4,8 @@ import { Button, Form } from "react-bootstrap";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { Modal, LoadingIndicator } from "src/components/Shared";
import { ModalComponent } from "src/components/Shared/Modal";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { stashboxDisplayName } from "src/utils/stashbox";
const CLASSNAME = "PerformerScrapeModal";
@ -50,7 +51,7 @@ const PerformerStashBoxModal: React.FC<IProps> = ({
useEffect(() => inputRef.current?.focus(), []);
return (
<Modal
<ModalComponent
show
onHide={onHide}
header={`Scrape performer from ${stashboxDisplayName(
@ -90,7 +91,7 @@ const PerformerStashBoxModal: React.FC<IProps> = ({
query !== "" && <h5 className="text-center">No results found.</h5>
)}
</div>
</Modal>
</ModalComponent>
);
};

12
ui/v2.5/src/components/Performers/PerformerList.tsx
View file

@ -11,12 +11,16 @@ import {
queryFindPerformers,
usePerformersDestroy,
} from "src/core/StashService";
import { usePerformersList } from "src/hooks";
import { showWhenSelected, PersistanceLevel } from "src/hooks/ListHook";
import {
showWhenSelected,
PersistanceLevel,
usePerformersList,
} from "src/hooks/ListHook";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
import { PerformerTagger } from "src/components/Tagger";
import { ExportDialog, DeleteEntityDialog } from "src/components/Shared";
import { PerformerTagger } from "../Tagger/performers/PerformerTagger";
import { ExportDialog } from "../Shared/ExportDialog";
import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
import { IPerformerCardExtraCriteria, PerformerCard } from "./PerformerCard";
import { PerformerListTable } from "./PerformerListTable";
import { EditPerformersDialog } from "./EditPerformersDialog";

4
ui/v2.5/src/components/Performers/PerformerListTable.tsx
View file

@ -5,8 +5,8 @@ import { useIntl } from "react-intl";
import { Button, Table } from "react-bootstrap";
import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import { Icon } from "src/components/Shared";
import { NavUtils } from "src/utils";
import { Icon } from "../Shared/Icon";
import NavUtils from "src/utils/navigation";
import { faHeart } from "@fortawesome/free-solid-svg-icons";
import { cmToImperial } from "src/utils/units";

2
ui/v2.5/src/components/Performers/Performers.tsx
View file

@ -2,7 +2,7 @@ import React from "react";
import { Route, Switch } from "react-router-dom";
import { useIntl } from "react-intl";
import { Helmet } from "react-helmet";
import { TITLE_SUFFIX } from "src/components/Shared";
import { TITLE_SUFFIX } from "src/components/Shared/constants";
import { PersistanceLevel } from "src/hooks/ListHook";
import Performer from "./PerformerDetails/Performer";
import PerformerCreate from "./PerformerDetails/PerformerCreate";

16
ui/v2.5/src/components/SceneDuplicateChecker/SceneDuplicateChecker.tsx
View file

@ -14,16 +14,14 @@ import { Link, useHistory } from "react-router-dom";
import { FormattedMessage, FormattedNumber, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import {
LoadingIndicator,
ErrorMessage,
HoverPopover,
Icon,
TagLink,
SweatDrops,
} from "src/components/Shared";
import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { ErrorMessage } from "../Shared/ErrorMessage";
import { HoverPopover } from "../Shared/HoverPopover";
import { Icon } from "../Shared/Icon";
import { TagLink } from "../Shared/TagLink";
import { SweatDrops } from "../Shared/SweatDrops";
import { Pagination } from "src/components/List/Pagination";
import { TextUtils } from "src/utils";
import TextUtils from "src/utils/text";
import { DeleteScenesDialog } from "src/components/Scenes/DeleteScenesDialog";
import { EditScenesDialog } from "../Scenes/EditScenesDialog";
import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";

4
ui/v2.5/src/components/SceneFilenameParser/SceneFilenameParser.tsx
View file

@ -9,8 +9,8 @@ import {
useScenesUpdate,
} from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { LoadingIndicator } from "src/components/Shared";
import { useToast } from "src/hooks";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { useToast } from "src/hooks/Toast";
import { Pagination } from "src/components/List/Pagination";
import { IParserInput, ParserInput } from "./ParserInput";
import { ParserField } from "./ParserField";

2
ui/v2.5/src/components/SceneFilenameParser/SceneParserRow.tsx
View file

@ -10,7 +10,7 @@ import {
PerformerSelect,
TagSelect,
StudioSelect,
} from "src/components/Shared";
} from "src/components/Shared/Select";
import cx from "classnames";
import { objectTitle } from "src/core/files";

2
ui/v2.5/src/components/SceneFilenameParser/ShowFields.tsx
View file

@ -7,7 +7,7 @@ import {
import React, { useState } from "react";
import { Button, Collapse } from "react-bootstrap";
import { useIntl } from "react-intl";
import { Icon } from "src/components/Shared";
import { Icon } from "src/components/Shared/Icon";
interface IShowFieldsProps {
fields: Map<string, boolean>;

2
ui/v2.5/src/components/ScenePlayer/ScenePlayerScrubber.tsx
View file

@ -8,7 +8,7 @@ import React, {
import { Button } from "react-bootstrap";
import axios from "axios";
import * as GQL from "src/core/generated-graphql";
import { TextUtils } from "src/utils";
import TextUtils from "src/utils/text";
import { WebVTT } from "videojs-vtt.js";
interface IScenePlayerScrubberProps {

1
ui/v2.5/src/components/ScenePlayer/index.ts
View file

@ -1 +0,0 @@
export * from "./ScenePlayer";

8
ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
View file

@ -2,8 +2,8 @@ import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { useScenesDestroy } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { Modal } from "src/components/Shared";
import { useToast } from "src/hooks";
import { ModalComponent } from "src/components/Shared/Modal";
import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@ -126,7 +126,7 @@ export const DeleteScenesDialog: React.FC<IDeleteSceneDialogProps> = (
}
return (
<Modal
<ModalComponent
show
icon={faTrashAlt}
header={header}
@ -162,7 +162,7 @@ export const DeleteScenesDialog: React.FC<IDeleteSceneDialogProps> = (
onChange={() => setDeleteGenerated(!deleteGenerated)}
/>
</Form>
</Modal>
</ModalComponent>
);
};

13
ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
View file

@ -4,10 +4,11 @@ import { FormattedMessage, useIntl } from "react-intl";
import isEqual from "lodash-es/isEqual";
import { useBulkSceneUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { StudioSelect, Modal } from "src/components/Shared";
import { useToast } from "src/hooks";
import { FormUtils } from "src/utils";
import MultiSet from "../Shared/MultiSet";
import { StudioSelect } from "../Shared/Select";
import { ModalComponent } from "../Shared/Modal";
import { MultiSet } from "../Shared/MultiSet";
import { useToast } from "src/hooks/Toast";
import FormUtils from "src/utils/form";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputIDs,
@ -241,7 +242,7 @@ export const EditScenesDialog: React.FC<IListOperationProps> = (
function render() {
return (
<Modal
<ModalComponent
show
icon={faPencilAlt}
header={intl.formatMessage(
@ -322,7 +323,7 @@ export const EditScenesDialog: React.FC<IListOperationProps> = (
/>
</Form.Group>
</Form>
</Modal>
</ModalComponent>
);
}

15
ui/v2.5/src/components/Scenes/SceneCard.tsx
View file

@ -3,14 +3,13 @@ import { Button, ButtonGroup } from "react-bootstrap";
import { Link } from "react-router-dom";
import cx from "classnames";
import * as GQL from "src/core/generated-graphql";
import {
Icon,
TagLink,
HoverPopover,
SweatDrops,
TruncatedText,
} from "src/components/Shared";
import { NavUtils, TextUtils } from "src/utils";
import { Icon } from "../Shared/Icon";
import { TagLink } from "../Shared/TagLink";
import { HoverPopover } from "../Shared/HoverPopover";
import { SweatDrops } from "../Shared/SweatDrops";
import { TruncatedText } from "../Shared/TruncatedText";
import NavUtils from "src/utils/navigation";
import TextUtils from "src/utils/text";
import { SceneQueue } from "src/models/sceneQueue";
import { ConfigurationContext } from "src/hooks/Config";
import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";

2
ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
View file

@ -2,7 +2,7 @@ import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
import React from "react";
import { Button } from "react-bootstrap";
import { useIntl } from "react-intl";
import Icon from "src/components/Shared/Icon";
import { Icon } from "src/components/Shared/Icon";
import { objectTitle } from "src/core/files";
import { SceneDataFragment } from "src/core/generated-graphql";

4
ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
View file

@ -2,7 +2,9 @@ import { faBan, faMinus } from "@fortawesome/free-solid-svg-icons";
import React, { useState } from "react";
import { Button, ButtonGroup, Dropdown, DropdownButton } from "react-bootstrap";
import { useIntl } from "react-intl";
import { Icon, LoadingIndicator, SweatDrops } from "src/components/Shared";
import { Icon } from "src/components/Shared/Icon";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { SweatDrops } from "src/components/Shared/SweatDrops";
export interface IOCounterButtonProps {
value: number;

2
ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
View file

@ -1,7 +1,7 @@
import React from "react";
import cx from "classnames";
import { Button, Spinner } from "react-bootstrap";
import Icon from "src/components/Shared/Icon";
import { Icon } from "src/components/Shared/Icon";
import { defineMessages, useIntl } from "react-intl";
import { faBox } from "@fortawesome/free-solid-svg-icons";

2
ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
View file

@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import cx from "classnames";
import { Button, Form, Spinner } from "react-bootstrap";
import Icon from "src/components/Shared/Icon";
import { Icon } from "src/components/Shared/Icon";
import { useIntl } from "react-intl";
import {
faChevronDown,

12
ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
View file

@ -23,13 +23,11 @@ import {
queryFindScenesByID,
} from "src/core/StashService";
import {
ErrorMessage,
LoadingIndicator,
Icon,
Counter,
} from "src/components/Shared";
import { useToast } from "src/hooks";
import { ErrorMessage } from "src/components/Shared/ErrorMessage";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { Icon } from "src/components/Shared/Icon";
import { Counter } from "src/components/Shared/Counter";
import { useToast } from "src/hooks/Toast";
import SceneQueue, { QueuedScene } from "src/models/sceneQueue";
import { ListFilterModel } from "src/models/list-filter/filter";
import Mousetrap from "mousetrap";

4
ui/v2.5/src/components/Scenes/SceneDetails/SceneCreate.tsx
View file

@ -3,8 +3,8 @@ import { FormattedMessage, useIntl } from "react-intl";
import { useLocation } from "react-router-dom";
import { SceneEditPanel } from "./SceneEditPanel";
import { useFindScene } from "src/core/StashService";
import { ImageUtils } from "src/utils";
import { LoadingIndicator } from "src/components/Shared";
import ImageUtils from "src/utils/image";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
const SceneCreate: React.FC = () => {
const intl = useIntl();

2
ui/v2.5/src/components/Scenes/SceneDetails/SceneDetailPanel.tsx
View file

@ -4,7 +4,7 @@ import { FormattedDate, FormattedMessage, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import TextUtils from "src/utils/text";
import { TagLink } from "src/components/Shared/TagLink";
import TruncatedText from "src/components/Shared/TruncatedText";
import { TruncatedText } from "src/components/Shared/TruncatedText";
import { PerformerCard } from "src/components/Performers/PerformerCard";
import { sortPerformers } from "src/core/performers";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";

18
ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
View file

@ -26,14 +26,16 @@ import {
TagSelect,
StudioSelect,
GallerySelect,
Icon,
LoadingIndicator,
ImageInput,
URLField,
} from "src/components/Shared";
import useToast from "src/hooks/Toast";
import { ImageUtils, FormUtils, getStashIDs } from "src/utils";
import { MovieSelect } from "src/components/Shared/Select";
MovieSelect,
} from "src/components/Shared/Select";
import { Icon } from "src/components/Shared/Icon";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { ImageInput } from "src/components/Shared/ImageInput";
import { URLField } from "src/components/Shared/URLField";
import { useToast } from "src/hooks/Toast";
import ImageUtils from "src/utils/image";
import FormUtils from "src/utils/form";
import { getStashIDs } from "src/utils/stashIds";
import { useFormik } from "formik";
import { Prompt, useHistory } from "react-router-dom";
import { ConfigurationContext } from "src/hooks/Config";

12
ui/v2.5/src/components/Scenes/SceneDetails/SceneFileInfoPanel.tsx
View file

@ -7,13 +7,15 @@ import {
useIntl,
} from "react-intl";
import { useHistory } from "react-router-dom";
import { TruncatedText } from "src/components/Shared";
import DeleteFilesDialog from "src/components/Shared/DeleteFilesDialog";
import ReassignFilesDialog from "src/components/Shared/ReassignFilesDialog";
import { TruncatedText } from "src/components/Shared/TruncatedText";
import { DeleteFilesDialog } from "src/components/Shared/DeleteFilesDialog";
import { ReassignFilesDialog } from "src/components/Shared/ReassignFilesDialog";
import * as GQL from "src/core/generated-graphql";
import { mutateSceneSetPrimaryFile } from "src/core/StashService";
import { useToast } from "src/hooks";
import { NavUtils, TextUtils, getStashboxBase } from "src/utils";
import { useToast } from "src/hooks/Toast";
import NavUtils from "src/utils/navigation";
import TextUtils from "src/utils/text";
import { getStashboxBase } from "src/utils/stashbox";
import { TextField, URLField } from "src/utils/field";
interface IFileInfoPanelProps {

9
ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
View file

@ -8,13 +8,10 @@ import {
useSceneMarkerUpdate,
useSceneMarkerDestroy,
} from "src/core/StashService";
import {
DurationInput,
TagSelect,
MarkerTitleSuggest,
} from "src/components/Shared";
import { DurationInput } from "src/components/Shared/DurationInput";
import { TagSelect, MarkerTitleSuggest } from "src/components/Shared/Select";
import { getPlayerPosition } from "src/components/ScenePlayer/util";
import useToast from "src/hooks/Toast";
import { useToast } from "src/hooks/Toast";
interface IFormFields {
title: string;

16
ui/v2.5/src/components/Scenes/SceneDetails/SceneQueryModal.tsx
View file

@ -3,14 +3,12 @@ import { Badge, Button, Col, Form, InputGroup, Row } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import {
Modal,
LoadingIndicator,
TruncatedText,
Icon,
} from "src/components/Shared";
import { ModalComponent } from "src/components/Shared/Modal";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { TruncatedText } from "src/components/Shared/TruncatedText";
import { Icon } from "src/components/Shared/Icon";
import { queryScrapeSceneQuery } from "src/core/StashService";
import useToast from "src/hooks/Toast";
import { useToast } from "src/hooks/Toast";
import { faSearch } from "@fortawesome/free-solid-svg-icons";
interface ISceneSearchResultDetailsProps {
@ -187,7 +185,7 @@ export const SceneQueryModal: React.FC<IProps> = ({
}
return (
<Modal
<ModalComponent
show
onHide={onHide}
modalProps={{ size: "lg", dialogClassName: "scrape-query-dialog" }}
@ -233,7 +231,7 @@ export const SceneQueryModal: React.FC<IProps> = ({
renderResults()
)}
</div>
</Modal>
</ModalComponent>
);
};

10
ui/v2.5/src/components/Scenes/SceneDetails/SceneScrapeDialog.tsx
View file

@ -1,7 +1,11 @@
import React, { useMemo, useState } from "react";
import { StudioSelect, PerformerSelect } from "src/components/Shared";
import * as GQL from "src/core/generated-graphql";
import { MovieSelect, TagSelect } from "src/components/Shared/Select";
import {
MovieSelect,
TagSelect,
StudioSelect,
PerformerSelect,
} from "src/components/Shared/Select";
import {
ScrapeDialog,
ScrapeDialogRow,
@ -19,7 +23,7 @@ import {
useTagCreate,
makePerformerCreateInput,
} from "src/core/StashService";
import useToast from "src/hooks/Toast";
import { useToast } from "src/hooks/Toast";
import DurationUtils from "src/utils/duration";
import { useIntl } from "react-intl";

2
ui/v2.5/src/components/Scenes/SceneDetails/SceneVideoFilterPanel.tsx
View file

@ -1,7 +1,7 @@
import React, { useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { Button, Form } from "react-bootstrap";
import TruncatedText from "src/components/Shared/TruncatedText";
import { TruncatedText } from "src/components/Shared/TruncatedText";
import { VIDEO_PLAYER_ID } from "src/components/ScenePlayer/util";
import * as GQL from "src/core/generated-graphql";

9
ui/v2.5/src/components/Scenes/SceneList.tsx
View file

@ -8,11 +8,14 @@ import {
SlimSceneDataFragment,
} from "src/core/generated-graphql";
import { queryFindScenes } from "src/core/StashService";
import { useScenesList } from "src/hooks";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
import { showWhenSelected, PersistanceLevel } from "src/hooks/ListHook";
import Tagger from "src/components/Tagger";
import {
showWhenSelected,
PersistanceLevel,
useScenesList,
} from "src/hooks/ListHook";
import { Tagger } from "../Tagger/scenes/SceneTagger";
import { IPlaySceneOptions, SceneQueue } from "src/models/sceneQueue";
import { WallPanel } from "../Wall/WallPanel";
import { SceneListTable } from "./SceneListTable";

5
ui/v2.5/src/components/Scenes/SceneListTable.tsx
View file

@ -4,8 +4,9 @@ import React from "react";
import { Table, Button, Form } from "react-bootstrap";
import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import { NavUtils, TextUtils } from "src/utils";
import { Icon } from "src/components/Shared";
import NavUtils from "src/utils/navigation";
import TextUtils from "src/utils/text";
import { Icon } from "src/components/Shared/Icon";
import { FormattedMessage } from "react-intl";
import { objectTitle } from "src/core/files";

7
ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
View file

@ -3,13 +3,12 @@ import React from "react";
import { useHistory } from "react-router-dom";
import { useIntl } from "react-intl";
import { Helmet } from "react-helmet";
import { TITLE_SUFFIX } from "src/components/Shared";
import { TITLE_SUFFIX } from "src/components/Shared/constants";
import Mousetrap from "mousetrap";
import { FindSceneMarkersQueryResult } from "src/core/generated-graphql";
import { queryFindSceneMarkers } from "src/core/StashService";
import { NavUtils } from "src/utils";
import { useSceneMarkersList } from "src/hooks";
import { PersistanceLevel } from "src/hooks/ListHook";
import NavUtils from "src/utils/navigation";
import { PersistanceLevel, useSceneMarkersList } from "src/hooks/ListHook";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
import { WallPanel } from "../Wall/WallPanel";

19
ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
View file

@ -1,18 +1,15 @@
import { Form, Col, Row, Button, FormControl } from "react-bootstrap";
import { Form, Col, Row, Button, FormControl, Modal } from "react-bootstrap";
import React, { useCallback, useEffect, useMemo, useState } from "react";
import * as GQL from "src/core/generated-graphql";
import {
GallerySelect,
Icon,
LoadingIndicator,
Modal,
SceneSelect,
StringListSelect,
} from "src/components/Shared";
import { FormUtils, ImageUtils, TextUtils } from "src/utils";
import { Icon } from "../Shared/Icon";
import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { StringListSelect, GallerySelect, SceneSelect } from "../Shared/Select";
import FormUtils from "src/utils/form";
import ImageUtils from "src/utils/image";
import TextUtils from "src/utils/text";
import { mutateSceneMerge, queryFindScenesByID } from "src/core/StashService";
import { FormattedMessage, useIntl } from "react-intl";
import { useToast } from "src/hooks";
import { useToast } from "src/hooks/Toast";
import { faExchangeAlt, faSignInAlt } from "@fortawesome/free-solid-svg-icons";
import {
hasScrapedValues,

2
ui/v2.5/src/components/Scenes/Scenes.tsx
View file

@ -2,7 +2,7 @@ import React, { lazy } from "react";
import { Route, Switch } from "react-router-dom";
import { useIntl } from "react-intl";
import { Helmet } from "react-helmet";
import { TITLE_SUFFIX } from "src/components/Shared";
import { TITLE_SUFFIX } from "src/components/Shared/constants";
import { PersistanceLevel } from "src/hooks/ListHook";
const SceneList = lazy(() => import("./SceneList"));

2
ui/v2.5/src/components/Settings/Inputs.tsx
View file

@ -2,7 +2,7 @@ import { faChevronDown, faChevronUp } from "@fortawesome/free-solid-svg-icons";
import React, { PropsWithChildren, useState } from "react";
import { Button, Collapse, Form, Modal, ModalProps } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import { Icon } from "../Shared";
import { Icon } from "../Shared/Icon";
import { StringListInput } from "../Shared/StringListInput";
interface ISetting {

2
ui/v2.5/src/components/Settings/Settings.tsx
View file

@ -3,7 +3,7 @@ import { Tab, Nav, Row, Col } from "react-bootstrap";
import { useHistory, useLocation } from "react-router-dom";
import { FormattedMessage, useIntl } from "react-intl";
import { Helmet } from "react-helmet";
import { TITLE_SUFFIX } from "src/components/Shared";
import { TITLE_SUFFIX } from "src/components/Shared/constants";
import { SettingsAboutPanel } from "./SettingsAboutPanel";
import { SettingsConfigurationPanel } from "./SettingsSystemPanel";
import { SettingsInterfacePanel } from "./SettingsInterfacePanel/SettingsInterfacePanel";

12
ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
View file

@ -1,11 +1,9 @@
import React from "react";
import { Button, Form } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import {
DurationInput,
PercentInput,
LoadingIndicator,
} from "src/components/Shared";
import { DurationInput } from "src/components/Shared/DurationInput";
import { PercentInput } from "src/components/Shared/PercentInput";
import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { CheckboxGroup } from "./CheckboxGroup";
import { SettingSection } from "../SettingSection";
import {
@ -16,13 +14,13 @@ import {
StringSetting,
} from "../Inputs";
import { SettingStateContext } from "../context";
import { DurationUtils } from "src/utils";
import DurationUtils from "src/utils/duration";
import * as GQL from "src/core/generated-graphql";
import {
imageLightboxDisplayModeIntlMap,
imageLightboxScrollModeIntlMap,
} from "src/core/enums";
import { useInterfaceLocalForage } from "src/hooks";
import { useInterfaceLocalForage } from "src/hooks/LocalForage";
import {
ConnectionState,
connectionStateLabel,

3
ui/v2.5/src/components/Settings/SettingsLibraryPanel.tsx
View file

@ -1,5 +1,6 @@
import React from "react";
import { Icon, LoadingIndicator } from "src/components/Shared";
import { Icon } from "../Shared/Icon";
import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { StashSetting } from "./StashConfiguration";
import { SettingSection } from "./SettingSection";
import { BooleanSetting, StringListSetting, StringSetting } from "./Inputs";

8
ui/v2.5/src/components/Settings/SettingsPluginsPanel.tsx
View file

@ -3,9 +3,11 @@ import { Button } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { mutateReloadPlugins, usePlugins } from "src/core/StashService";
import { useToast } from "src/hooks";
import { TextUtils } from "src/utils";
import { CollapseButton, Icon, LoadingIndicator } from "src/components/Shared";
import { useToast } from "src/hooks/Toast";
import TextUtils from "src/utils/text";
import { CollapseButton } from "../Shared/CollapseButton";
import { Icon } from "../Shared/Icon";
import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { SettingSection } from "./SettingSection";
import { Setting, SettingGroup } from "./Inputs";
import { faLink, faSyncAlt } from "@fortawesome/free-solid-svg-icons";

8
ui/v2.5/src/components/Settings/SettingsScrapingPanel.tsx
View file

@ -8,9 +8,11 @@ import {
useListSceneScrapers,
useListGalleryScrapers,
} from "src/core/StashService";
import { useToast } from "src/hooks";
import { TextUtils } from "src/utils";
import { CollapseButton, Icon, LoadingIndicator } from "src/components/Shared";
import { useToast } from "src/hooks/Toast";
import TextUtils from "src/utils/text";
import { CollapseButton } from "../Shared/CollapseButton";
import { Icon } from "../Shared/Icon";
import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { ScrapeType } from "src/core/generated-graphql";
import { SettingSection } from "./SettingSection";
import { BooleanSetting, StringListSetting, StringSetting } from "./Inputs";

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