diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx index d35f01a09..fb955ccd1 100644 --- a/ui/v2.5/src/components/Changelog/Changelog.tsx +++ b/ui/v2.5/src/components/Changelog/Changelog.tsx @@ -1,7 +1,13 @@ import React from "react"; import { useChangelogStorage } from "src/hooks"; import Version from "./Version"; -import { V010, V011, V020, V021, V030 } from "./versions"; +import V010 from "./versions/v010.md"; +import V011 from "./versions/v011.md"; +import V020 from "./versions/v020.md"; +import V021 from "./versions/v021.md"; +import V030 from "./versions/v030.md"; +import V040 from "./versions/v040.md"; +import { MarkdownPage } from "../Shared/MarkdownPage"; const Changelog: React.FC = () => { const [{ data, loading }, setOpenState] = useChangelogStorage(); @@ -30,13 +36,21 @@ const Changelog: React.FC = () => { <>

Changelog:

- + + + + { openState={openState} setOpenState={setVersionOpenState} > - + { openState={openState} setOpenState={setVersionOpenState} > - + { openState={openState} setOpenState={setVersionOpenState} > - + { openState={openState} setOpenState={setVersionOpenState} > - + ); diff --git a/ui/v2.5/src/components/Changelog/versions/index.ts b/ui/v2.5/src/components/Changelog/versions/index.ts deleted file mode 100644 index 1d3060a63..000000000 --- a/ui/v2.5/src/components/Changelog/versions/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export { default as V010 } from "./v010"; -export { default as V011 } from "./v011"; -export { default as V020 } from "./v020"; -export { default as V021 } from "./v021"; -export { default as V030 } from "./v030"; diff --git a/ui/v2.5/src/components/Changelog/versions/v010.tsx b/ui/v2.5/src/components/Changelog/versions/v010.md similarity index 91% rename from ui/v2.5/src/components/Changelog/versions/v010.tsx rename to ui/v2.5/src/components/Changelog/versions/v010.md index b440f5bd3..78134ab82 100644 --- a/ui/v2.5/src/components/Changelog/versions/v010.tsx +++ b/ui/v2.5/src/components/Changelog/versions/v010.md @@ -1,7 +1,3 @@ -import React from "react"; -import ReactMarkdown from "react-markdown"; - -const markup = ` ### ✨ New Features * Configurable custom performer scrapers @@ -50,6 +46,3 @@ const markup = ` * Fix input fields losing focus when switching between windows * Fix VTT for chapter display in scene players * Fix usage of Box.Bytes causing depreciation message -`; - -export default () => ; diff --git a/ui/v2.5/src/components/Changelog/versions/v011.md b/ui/v2.5/src/components/Changelog/versions/v011.md new file mode 100644 index 000000000..8e0e81edf --- /dev/null +++ b/ui/v2.5/src/components/Changelog/versions/v011.md @@ -0,0 +1,2 @@ +### 🐛 Bug fixes +* Fix version checking. diff --git a/ui/v2.5/src/components/Changelog/versions/v011.tsx b/ui/v2.5/src/components/Changelog/versions/v011.tsx deleted file mode 100644 index 06867d0cd..000000000 --- a/ui/v2.5/src/components/Changelog/versions/v011.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from "react"; -import ReactMarkdown from "react-markdown"; - -const markup = ` -### 🐛 Bug fixes -Fix version checking. -`; - -export default () => ; diff --git a/ui/v2.5/src/components/Changelog/versions/v020.tsx b/ui/v2.5/src/components/Changelog/versions/v020.md similarity index 95% rename from ui/v2.5/src/components/Changelog/versions/v020.tsx rename to ui/v2.5/src/components/Changelog/versions/v020.md index 6848d6827..edfef4f47 100644 --- a/ui/v2.5/src/components/Changelog/versions/v020.tsx +++ b/ui/v2.5/src/components/Changelog/versions/v020.md @@ -1,7 +1,3 @@ -import React from "react"; -import ReactMarkdown from "react-markdown"; - -const markup = ` #### 💥 **Note: After upgrading performance will be degraded until a full [scan](/settings?tab=tasks) has been completed.** #### 💥 **Note: [Language](/settings?tab=interface) has been set to \`English (United States)\` by default, which affects number and date formatting.** @@ -61,7 +57,3 @@ const markup = ` * Fix redirect loops in login, migrate and setup pages. * Make studio, movies, tag, performers scrape/parser matching case insensitive. * Fix files with special characters in filename not being scanned. - -`; - -export default () => ; diff --git a/ui/v2.5/src/components/Changelog/versions/v021.md b/ui/v2.5/src/components/Changelog/versions/v021.md new file mode 100644 index 000000000..7ffb68080 --- /dev/null +++ b/ui/v2.5/src/components/Changelog/versions/v021.md @@ -0,0 +1,3 @@ +### 🐛 Bug fixes +* Fix max loop duration not working. +* Fix URL sanitization on non-Chrome browsers. diff --git a/ui/v2.5/src/components/Changelog/versions/v021.tsx b/ui/v2.5/src/components/Changelog/versions/v021.tsx deleted file mode 100644 index 1886d1df5..000000000 --- a/ui/v2.5/src/components/Changelog/versions/v021.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import React from "react"; -import ReactMarkdown from "react-markdown"; - -const markup = ` -### 🐛 Bug fixes -* Fix max loop duration not working. -* Fix URL sanitization on non-Chrome browsers. - -`; - -export default () => ; diff --git a/ui/v2.5/src/components/Changelog/versions/v030.tsx b/ui/v2.5/src/components/Changelog/versions/v030.md similarity index 93% rename from ui/v2.5/src/components/Changelog/versions/v030.tsx rename to ui/v2.5/src/components/Changelog/versions/v030.md index fa445bf52..d81c00d18 100644 --- a/ui/v2.5/src/components/Changelog/versions/v030.tsx +++ b/ui/v2.5/src/components/Changelog/versions/v030.md @@ -1,7 +1,3 @@ -import React from "react"; -import ReactMarkdown from "react-markdown"; - -const markup = ` #### 💥 **Note: After upgrading, the next scan will populate all scenes with oshash hashes. MD5 calculation can be disabled after populating the oshash for all scenes. See \`Hashing Algorithms\` in the \`Configuration\` section of the manual for details. ** ### ✨ New Features @@ -49,7 +45,3 @@ const markup = ` * Fix directories with video name extensions being detected as files to be scanned. * Fix issues moving generated files between file systems. * Fix formatted dates using incorrect timezone. - -`; - -export default () => ; diff --git a/ui/v2.5/src/components/Changelog/versions/v040.md b/ui/v2.5/src/components/Changelog/versions/v040.md new file mode 100644 index 000000000..88633c05d --- /dev/null +++ b/ui/v2.5/src/components/Changelog/versions/v040.md @@ -0,0 +1,15 @@ +### ✨ New Features +* Add selective scene export. + +### 🎨 Improvements +* Add missing scenes movie filter. +* Add gallery icon to scene cards. +* Add country query link to performer flag. +* Improved gallery layout. +* Add hover delay before scene preview is played. +* Re-show preview thumbnail when mousing away from scene card. + +### 🐛 Bug fixes +* Fix incorrect date timezone. +* Fix search filters not persisting for studios, markers and galleries. +* Fix pending thumbnail on wall items on mobile platforms. diff --git a/ui/v2.5/src/components/Help/Manual.tsx b/ui/v2.5/src/components/Help/Manual.tsx index ede75ff00..64c0e2cb3 100644 --- a/ui/v2.5/src/components/Help/Manual.tsx +++ b/ui/v2.5/src/components/Help/Manual.tsx @@ -13,7 +13,7 @@ import Contributing from "src/docs/en/Contributing.md"; import SceneFilenameParser from "src/docs/en/SceneFilenameParser.md"; import KeyboardShortcuts from "src/docs/en/KeyboardShortcuts.md"; import Help from "src/docs/en/Help.md"; -import { Page } from "./Page"; +import { MarkdownPage } from "../Shared/MarkdownPage"; interface IManualProps { show: boolean; @@ -151,7 +151,7 @@ export const Manual: React.FC = ({ show, onClose }) => { key={`${c.key}-pane`} onClick={interceptLinkClick} > - + ); })} diff --git a/ui/v2.5/src/components/Help/Page.tsx b/ui/v2.5/src/components/Shared/MarkdownPage.tsx similarity index 88% rename from ui/v2.5/src/components/Help/Page.tsx rename to ui/v2.5/src/components/Shared/MarkdownPage.tsx index 1ab94109a..175a1b1c1 100644 --- a/ui/v2.5/src/components/Help/Page.tsx +++ b/ui/v2.5/src/components/Shared/MarkdownPage.tsx @@ -7,7 +7,7 @@ interface IPageProps { page: any; } -export const Page: React.FC = ({ page }) => { +export const MarkdownPage: React.FC = ({ page }) => { const [markdown, setMarkdown] = useState(""); useEffect(() => {