From 310dcb658a6fc19a6061301de20172eb52f9f772 Mon Sep 17 00:00:00 2001 From: Harshith Mohan <26010946+harshithmohan@users.noreply.github.com> Date: Wed, 11 Dec 2024 01:07:05 +0530 Subject: [PATCH 1/2] Add more links to collection stats panel --- src/pages/dashboard/panels/CollectionStats.tsx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/pages/dashboard/panels/CollectionStats.tsx b/src/pages/dashboard/panels/CollectionStats.tsx index 5e0e3592..a3bcf1da 100644 --- a/src/pages/dashboard/panels/CollectionStats.tsx +++ b/src/pages/dashboard/panels/CollectionStats.tsx @@ -62,7 +62,12 @@ function CollectionStats() { title="Collection Size" value={`${prettyBytes(statsQuery.data?.FileSize ?? 0, { binary: true })}`} />, - , + , , + , - , ]; const childrenThird = [ From 3d81f13c4b4e99dbd755851ebebb0d78eb08bb11 Mon Sep 17 00:00:00 2001 From: Harshith Mohan <26010946+harshithmohan@users.noreply.github.com> Date: Wed, 11 Dec 2024 01:17:45 +0530 Subject: [PATCH 2/2] Fix utility titles, add first run titles --- src/components/ErrorBoundary.tsx | 149 +++++++++--------- src/pages/firstrun/Acknowledgement.tsx | 73 +++++---- src/pages/firstrun/AniDBAccount.tsx | 101 ++++++------ src/pages/firstrun/DataCollection.tsx | 61 +++---- src/pages/firstrun/ImportFolders.tsx | 1 + src/pages/firstrun/LocalAccount.tsx | 73 +++++---- src/pages/firstrun/MetadataSources.tsx | 67 ++++---- src/pages/firstrun/StartServer.tsx | 57 +++---- src/pages/login/LoginPage.tsx | 1 + src/pages/nomatch/index.tsx | 13 +- src/pages/unsupported/UnsupportedPage.tsx | 117 +++++++------- src/pages/utilities/FileSearch.tsx | 2 +- src/pages/utilities/ReleaseManagement.tsx | 2 +- src/pages/utilities/Renamer.tsx | 2 +- .../utilities/SeriesWithoutFilesUtility.tsx | 2 +- .../IgnoredFilesTab.tsx | 2 +- .../ManuallyLinkedTab.tsx | 2 +- .../UnrecognizedTab.tsx | 2 +- 18 files changed, 378 insertions(+), 349 deletions(-) diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx index 7fab2b00..03538b45 100644 --- a/src/components/ErrorBoundary.tsx +++ b/src/components/ErrorBoundary.tsx @@ -44,89 +44,92 @@ const ErrorBoundary = ({ error, resetError }: { error?: Error, resetError?: () = console.error(error, routeError); return ( -
-
-
Congratulations!
-
You Broke The Web UI!
-
-          The information below is absolutely (maybe) useless!
-          
-
- {error ? `${error.message}\n${error.stack}` : routeError.data} -
- {routeError?.status === 404 - ? ( - - ) - : ( - <> -
-
Lets get you back into the Web UI.
-
- If you are seeing this page after updating, select  - Force Update to Stable Web UI - , otherwise select  - Logout of Web UI -  to clear local storage. + <> + Error! | Shoko +
+
+
Congratulations!
+
You Broke The Web UI!
+
+            The information below is absolutely (maybe) useless!
+            
+
+ {error ? `${error.message}\n${error.stack}` : routeError.data} +
+ {routeError?.status === 404 + ? ( + + ) + : ( + <> +
+
Lets get you back into the Web UI.
+
+ If you are seeing this page after updating, select  + Force Update to Stable Web UI + , otherwise select  + Logout of Web UI +  to clear local storage. +
+
+ Still need help? Hop on our  + + Discord + +  server and provide the above error. +
-
- Still need help? Hop on our  - +
-
-
- + Force update to Stable Web UI + + + {versionQuery.data?.Server.ReleaseChannel !== 'Stable' && ( + + )} - {versionQuery.data?.Server.ReleaseChannel !== 'Stable' && ( - )} +
+ + )} +
- -
- - )} + mascot
- - mascot -
+ ); }; diff --git a/src/pages/firstrun/Acknowledgement.tsx b/src/pages/firstrun/Acknowledgement.tsx index e601ab34..403ef956 100644 --- a/src/pages/firstrun/Acknowledgement.tsx +++ b/src/pages/firstrun/Acknowledgement.tsx @@ -20,42 +20,45 @@ function Acknowledgement() { }; return ( - -
Acknowledgement
-
- It is important to clarify that Shoko is an anime cataloging program and not a standalone streaming service. - Therefore, it requires access to physical files for playback. Additionally, Shoko does not offer any services - for obtaining or downloading anime series. -
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT - LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT - SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -
-
- We are constantly seeking talented individuals to join our team! If you believe you have the skills and - expertise to contribute, we invite you to come and chat with us on  - + First Run > Acknowledgement | Shoko + +
Acknowledgement
+
+ It is important to clarify that Shoko is an anime cataloging program and not a standalone streaming service. + Therefore, it requires access to physical files for playback. Additionally, Shoko does not offer any services + for obtaining or downloading anime series. +
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO + EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE + OR OTHER DEALINGS IN THE SOFTWARE. +
+
+
- -
+ Continue + + + ); } diff --git a/src/pages/firstrun/AniDBAccount.tsx b/src/pages/firstrun/AniDBAccount.tsx index 0dc29906..944e8316 100644 --- a/src/pages/firstrun/AniDBAccount.tsx +++ b/src/pages/firstrun/AniDBAccount.tsx @@ -52,56 +52,59 @@ function AniDBAccount() { }; return ( - -
Adding Your AniDB Account
-
- Shoko utilizes AniDB to compare file hashes with its vast database, enabling a quick identification and addition - of series to your collection. Additionally, AniDB provides supplementary information about series and episodes, - enhancing your user experience. -
-
- An AniDB account is required to use Shoko. If you don‘t already have an account, - - {' '} - Click Here - {' '} - - to create one. Please note that, due to limitations with AniDB‘s API, your password must consist of only - {' alphanumeric '} - characters. Using any other characters will result in a ban when you attempt to log in. -
-
- + First Run > AniDB Account | Shoko + +
Adding Your AniDB Account
+
+ Shoko utilizes AniDB to compare file hashes with its vast database, enabling a quick identification and + addition of series to your collection. Additionally, AniDB provides supplementary information about series and + episodes, enhancing your user experience. +
+
+ An AniDB account is required to use Shoko. If you don‘t already have an account, + + {' '} + Click Here + {' '} + + to create one. Please note that, due to limitations with AniDB‘s API, your password must consist of only + {' alphanumeric '} + characters. Using any other characters will result in a ban when you attempt to log in. +
+ + + + + +