Fix merge

tranga-website/src/Components/Settings/LibraryConnectors/AddLibraryConnector.tsx

@@ -1,6 +1,6 @@
 import {Modal, ModalDialog, Tab, TabList, Tabs} from "@mui/joy";
 import ModalClose from "@mui/joy/ModalClose";
-import * as React from "react";
+import {Dispatch} from "react";
 
 export default function ({open, setOpen} : {open: boolean, setOpen: Dispatch<boolean>}) {
     return (

tranga-website/src/Components/Settings/NotificationConnectors/AddNotificationConnector.tsx

@@ -1,5 +1,5 @@
 import { ReactNode, useContext, useState } from "react";
-import { ApiContext } from "../../apiClient/ApiContext";
+import { ApiContext } from "../../../apiClient/ApiContext";
 import {
   Button,
   Input,
@@ -16,8 +16,8 @@ import {
   GotifyRecord,
   NtfyRecord,
   PushoverRecord,
-} from "../../apiClient/data-contracts.ts";
+} from "../../../apiClient/data-contracts.ts";
-import { LoadingState, StateColor, StateIndicator } from "../Loading.tsx";
+import { LoadingState, StateColor, StateIndicator } from "../../Loading.tsx";
 
 export default function ({
   open,

tranga-website/src/Components/Settings/Services.tsx

@@ -1,5 +1,4 @@
 import {SettingsItem} from "./Settings.tsx";
-import NotificationConnectors from "./NotificationConnectors/AddNotificationConnector.tsx";
 import FlareSolverr from "./FlareSolverr.tsx";
 import LibraryConnectors from "./LibraryConnectors/LibraryConnectors.tsx";
 
@@ -8,9 +7,8 @@ export default function(){
 
 
     return (
-        <SettingsItem title={"Services"} direction={"row"}>
+        <SettingsItem title={"Services"}>
             <FlareSolverr />
-            <NotificationConnectors />
             <LibraryConnectors />
         </SettingsItem>
     );

tranga-website/src/Components/Settings/Settings.tsx

@@ -24,7 +24,6 @@ import {
 } from "react";
 import { TrangaSettings } from "../../apiClient/data-contracts.ts";
 import { ApiContext } from "../../apiClient/ApiContext.tsx";
-import NotificationConnectors from "./NotificationConnectors.tsx";
 import { SxProps } from "@mui/joy/styles/types";
 import ImageCompression from "./ImageCompression.tsx";
 import FlareSolverr from "./FlareSolverr.tsx";
@@ -91,7 +90,6 @@ export default function Settings({
               <FlareSolverr />
               <DownloadLanguage />
               <ChapterNamingScheme />
-              <NotificationConnectors />
               <Maintenance />
             </AccordionGroup>
           </DialogContent>

tranga-website/src/apiClient/V2.ts

@@ -45,7 +45,7 @@ export class V2<
    * @request GET:/v2/FileLibrary
    */
   fileLibraryList = (params: RequestParams = {}) =>
-    this.request<FileLibrary[], any>({
+    this.request<FileLibrary[], void>({
       path: `/v2/FileLibrary`,
       method: "GET",
       format: "json",
@@ -56,7 +56,7 @@ export class V2<
    *
    * @tags FileLibrary
    * @name FileLibraryUpdate
-   * @summary Creates new !:FileLibraryId
+   * @summary Creates new API.Schema.MangaContext.FileLibrary
    * @request PUT:/v2/FileLibrary
    */
   fileLibraryUpdate = (data: FileLibrary, params: RequestParams = {}) =>
@@ -145,7 +145,7 @@ export class V2<
    * @request GET:/v2/LibraryConnector
    */
   libraryConnectorList = (params: RequestParams = {}) =>
-    this.request<LibraryConnector[], any>({
+    this.request<LibraryConnector[], void>({
       path: `/v2/LibraryConnector`,
       method: "GET",
       format: "json",
@@ -193,6 +193,7 @@ export class V2<
    *
    * @tags LibraryConnector
    * @name LibraryConnectorDelete
+   * @summary Deletes API.Schema.LibraryContext.LibraryConnectors.LibraryConnector with LibraryConnectorId
    * @request DELETE:/v2/LibraryConnector/{LibraryConnectorId}
    */
   libraryConnectorDelete = (
@@ -227,7 +228,7 @@ export class V2<
    * @request GET:/v2/Manga
    */
   mangaList = (params: RequestParams = {}) =>
-    this.request<Manga[], any>({
+    this.request<Manga[], void>({
       path: `/v2/Manga`,
       method: "GET",
       format: "json",
@@ -242,7 +243,7 @@ export class V2<
    * @request GET:/v2/Manga/Keys
    */
   mangaKeysList = (params: RequestParams = {}) =>
-    this.request<string[], any>({
+    this.request<string[], void>({
       path: `/v2/Manga/Keys`,
       method: "GET",
       format: "json",
@@ -257,7 +258,7 @@ export class V2<
    * @request GET:/v2/Manga/Downloading
    */
   mangaDownloadingList = (params: RequestParams = {}) =>
-    this.request<Manga[], any>({
+    this.request<Manga[], void>({
       path: `/v2/Manga/Downloading`,
       method: "GET",
       format: "json",
@@ -268,10 +269,11 @@ export class V2<
    *
    * @tags Manga
    * @name MangaWithIDsCreate
+   * @summary Returns all cached API.Schema.MangaContext.Manga with MangaIds
    * @request POST:/v2/Manga/WithIDs
    */
   mangaWithIDsCreate = (data: string[], params: RequestParams = {}) =>
-    this.request<Manga[], any>({
+    this.request<Manga[], void>({
       path: `/v2/Manga/WithIDs`,
       method: "POST",
       body: data,
@@ -653,7 +655,7 @@ export class V2<
    * @request GET:/v2/MetadataFetcher/Links
    */
   metadataFetcherLinksList = (params: RequestParams = {}) =>
-    this.request<MetadataEntry[], any>({
+    this.request<MetadataEntry[], void>({
       path: `/v2/MetadataFetcher/Links`,
       method: "GET",
       format: "json",
@@ -730,7 +732,7 @@ export class V2<
    * @request GET:/v2/NotificationConnector
    */
   notificationConnectorList = (params: RequestParams = {}) =>
-    this.request<NotificationConnector[], any>({
+    this.request<NotificationConnector[], void>({
       path: `/v2/NotificationConnector`,
       method: "GET",
       format: "json",
@@ -902,7 +904,7 @@ export class V2<
    * @request GET:/v2/Query/Manga/{MangaId}/SimilarName
    */
   queryMangaSimilarNameList = (mangaId: string, params: RequestParams = {}) =>
-    this.request<string[], ProblemDetails>({
+    this.request<string[], ProblemDetails | void>({
       path: `/v2/Query/Manga/${mangaId}/SimilarName`,
       method: "GET",
       format: "json",