Jobs List

tranga-website/src/App.tsx

@@ -10,21 +10,69 @@ import MangaList from "./Components/MangaList.tsx";
 import {MangaConnectorContext} from "./api/Contexts/MangaConnectorContext.tsx";
 import IMangaConnector from "./api/types/IMangaConnector.ts";
 import {GetAllConnectors} from "./api/MangaConnector.tsx";
+import JobsDrawer from "./Components/Jobs.tsx";
+import {MangaContext} from "./api/Contexts/MangaContext.tsx";
+import IManga from "./api/types/IManga.ts";
+import {GetMangaById} from "./api/Manga.tsx";
+import IChapter from "./api/types/IChapter.ts";
+import {GetChapterFromId} from "./api/Chapter.tsx";
+import {ChapterContext} from "./api/Contexts/ChapterContext.tsx";
 
 export default function App () {
 
     const [showSettings, setShowSettings] = useState<boolean>(false);
     const [showSearch, setShowSearch] = useState<boolean>(false);
+    const [showJobs, setShowJobs] = useState<boolean>(false);
     const [apiConnected, setApiConnected] = useState<boolean>(false);
 
     const apiUriStr = localStorage.getItem("apiUri") ?? window.location.href.substring(0, window.location.href.lastIndexOf("/"));
 
     const [apiUri, setApiUri] = useState<string>(apiUriStr);
+    const [mangas, setMangas] = useState<IManga[]>([]);
+    const [chapters, setChapters] = useState<IChapter[]>([]);
 
     useEffect(() => {
         localStorage.setItem("apiUri", apiUri);
     }, [apiUri]);
 
+    const [mangaPromises, setMangaPromises] = useState(new Map<string, Promise<IManga | undefined>>());
+    const GetManga = (mangaId: string) : Promise<IManga | undefined> => {
+        const promise = mangaPromises.get(mangaId);
+        if(promise) return promise;
+        const p = new Promise<IManga | undefined>((resolve, reject) => {
+            let ret = mangas?.find(m => m.mangaId == mangaId);
+            if (ret) resolve(ret);
+
+            console.log(`Fetching manga ${mangaId}`);
+            GetMangaById(apiUri, mangaId).then(manga => {
+                if(manga && mangas?.find(m => m.mangaId == mangaId) === undefined)
+                    setMangas([...mangas, manga]);
+                resolve(manga);
+            }).catch(reject);
+        });
+        setMangaPromises(mangaPromises.set(mangaId, p));
+        return p;
+    }
+
+    const [chapterPromises, setChapterPromises] = useState(new Map<string, Promise<IChapter | undefined>>());
+    const GetChapter = (chapterId: string) : Promise<IChapter | undefined> => {
+        const promise = chapterPromises.get(chapterId);
+        if(promise) return promise;
+        const p = new Promise<IChapter | undefined>((resolve, reject) => {
+            let ret = chapters?.find(c => c.chapterId == chapterId);
+            if (ret) resolve(ret);
+
+            console.log(`Fetching chapter ${chapterId}`);
+            GetChapterFromId(apiUri, chapterId).then(chapter => {
+                if(chapter && chapters?.find(c => c.chapterId == chapterId) === undefined)
+                    setChapters([...chapters, chapter]);
+                resolve(chapter);
+            }).catch(reject);
+        });
+        setChapterPromises(chapterPromises.set(chapterId, p));
+        return p;
+    }
+
     const [mangaConnectors, setMangaConnectors] = useState<IMangaConnector[]>([]);
 
     useEffect(() => {
@@ -35,18 +83,24 @@ export default function App () {
     return (
         <ApiUriContext.Provider value={apiUri}>
             <MangaConnectorContext value={mangaConnectors}>
-                <Sheet className={"app"}>
+                <MangaContext.Provider value={{mangas, GetManga}}>
-                    <Header>
+                    <ChapterContext.Provider value={{chapters, GetChapter}}>
-                        <Badge color={"danger"} invisible={apiConnected} badgeContent={"!"}>
+                        <Sheet className={"app"}>
-                            <Button onClick={() => setShowSettings(true)}>Settings</Button>
+                            <Header>
-                        </Badge>
+                                <Badge color={"danger"} invisible={apiConnected} badgeContent={"!"}>
-                    </Header>
+                                    <Button onClick={() => setShowSettings(true)}>Settings</Button>
-                    <Settings open={showSettings} setOpen={setShowSettings} setApiUri={setApiUri} setConnected={setApiConnected} />
+                                    <Button onClick={() => setShowJobs(true)}>Jobs</Button>
-                    <Search open={showSearch} setOpen={setShowSearch} />
+                                </Badge>
-                    <Sheet className={"app-content"}>
+                            </Header>
-                        <MangaList connected={apiConnected} setShowSearch={setShowSearch} />
+                            <Settings open={showSettings} setOpen={setShowSettings} setApiUri={setApiUri} setConnected={setApiConnected} />
-                    </Sheet>
+                            <Search open={showSearch} setOpen={setShowSearch} />
-                </Sheet>
+                            <JobsDrawer open={showJobs} connected={apiConnected} setOpen={setShowJobs} />
+                            <Sheet className={"app-content"}>
+                                <MangaList connected={apiConnected} setShowSearch={setShowSearch} />
+                            </Sheet>
+                        </Sheet>
+                    </ChapterContext.Provider>
+                </MangaContext.Provider>
             </MangaConnectorContext>
         </ApiUriContext.Provider>
     );

tranga-website/src/Components/Chapter.tsx

@@ -0,0 +1,61 @@
+import {ReactElement, useContext, useState} from "react";
+import IChapter from "../api/types/IChapter.ts";
+import {Card, CardActions, CardContent, Chip, Link, Stack, Tooltip, Typography} from "@mui/joy";
+import {MangaFromId} from "./Manga.tsx";
+import {ChapterContext} from "../api/Contexts/ChapterContext.tsx";
+import { Description } from "@mui/icons-material";
+
+export function ChapterFromId({chapterId, children} : { chapterId: string, children?: ReactElement<any, any> | ReactElement<any, any>[] | undefined }){
+    const chapterContext = useContext(ChapterContext);
+
+    const [chapter, setChapter] = useState<IChapter | undefined>(undefined);
+    chapterContext.GetChapter(chapterId).then(setChapter);
+
+    return (
+        chapter === undefined ?
+                <Card>
+                    <CardContent>
+                        <Stack direction={"row"} alignItems="center" spacing={2}>
+                            <Card>
+
+                            </Card>
+                            <Card>
+                                <CardContent>
+
+                                </CardContent>
+                                <CardActions>
+                                    {children}
+                                </CardActions>
+                            </Card>
+                        </Stack>
+                    </CardContent>
+                </Card>
+            :
+            <Chapter chapter={chapter}>{children}</Chapter>
+    );
+}
+
+export function Chapter({chapter, children} : { chapter: IChapter, children?: ReactElement<any, any> | ReactElement<any, any>[] | undefined }){
+    return (
+        <Card>
+            <CardContent>
+                <Stack direction={"row"} alignItems="center" spacing={2}>
+                    <MangaFromId mangaId={chapter.parentMangaId} />
+                    <Card>
+                        <CardContent>
+                                <Link level={"title-lg"} href={chapter.url}>{chapter.title}</Link>
+                                <Typography>Vol. <Chip>{chapter.volumeNumber}</Chip></Typography>
+                                <Typography>Ch. <Chip>{chapter.chapterNumber}</Chip></Typography>
+                                <Tooltip title={chapter.fileName}>
+                                    <Description />
+                                </Tooltip>
+                        </CardContent>
+                        <CardActions>
+                            {children}
+                        </CardActions>
+                    </Card>
+                </Stack>
+            </CardContent>
+        </Card>
+    );
+}

tranga-website/src/Components/Manga.tsx

@@ -1,12 +1,13 @@
 import {Badge, Box, Card, CardContent, CardCover, Skeleton, Typography,} from "@mui/joy";
 import IManga from "../api/types/IManga.ts";
 import {CSSProperties, ReactElement, useCallback, useContext, useEffect, useRef, useState} from "react";
-import {GetMangaById, GetMangaCoverImageUrl} from "../api/Manga.tsx";
+import {GetMangaCoverImageUrl} from "../api/Manga.tsx";
 import {ApiUriContext, getData} from "../api/fetchApi.tsx";
 import {MangaReleaseStatus, ReleaseStatusToPalette} from "../api/types/EnumMangaReleaseStatus.ts";
 import {SxProps} from "@mui/joy/styles/types";
 import MangaPopup from "./MangaPopup.tsx";
 import {MangaConnectorContext} from "../api/Contexts/MangaConnectorContext.tsx";
+import {MangaContext} from "../api/Contexts/MangaContext.tsx";
 
 export const CardWidth = 190;
 export const CardHeight = 300;
@@ -23,21 +24,13 @@ const coverCss : CSSProperties = {
 }
 
 export function MangaFromId({mangaId, children} : { mangaId: string, children?: ReactElement<any, any> | ReactElement<any, any>[] | undefined }){
-    const [manga, setManga] = useState<IManga>();
+    const mangaContext = useContext(MangaContext);
 
-    const apiUri = useContext(ApiUriContext);
+    const [manga, setManga] = useState<IManga | undefined>(undefined);
-
+    mangaContext.GetManga(mangaId).then(setManga);
-    const loadManga = useCallback(() => {
-        GetMangaById(apiUri, mangaId).then(setManga);
-    },[apiUri, mangaId]);
-
-    useEffect(() => {
-        loadManga();
-    }, []);
 
     return (
-        <>
+        manga === undefined ?
-            {manga === undefined ?
                 <Badge sx={{margin:"8px !important"}} badgeContent={<Skeleton><img width={"24pt"} height={"24pt"} src={"/blahaj.png"} /></Skeleton>} color={ReleaseStatusToPalette(MangaReleaseStatus.Completed)} size={"lg"}>
                     <Card sx={{height:"fit-content",width:"fit-content"}}>
                         <CardCover>
@@ -51,7 +44,7 @@ export function MangaFromId({mangaId, children} : { mangaId: string, children?:
                             <Box sx={coverSx}>
                                 <Typography level={"h3"} sx={{height:"min-content",width:"fit-content",color:"white",margin:"0 0 0 10px"}}>
                                     <Skeleton loading={true} animation={"wave"}>
-                                        {"x ".repeat(Math.random()*25+5)}
+                                        {mangaId.split("").splice(0,mangaId.length/2).join(" ")}
                                     </Skeleton>
                                 </Typography>
                             </Box>
@@ -59,8 +52,7 @@ export function MangaFromId({mangaId, children} : { mangaId: string, children?:
                     </Card>
                 </Badge>
                  :
-                <Manga manga={manga} children={children} /> }
+                <Manga manga={manga} children={children} />
-        </>
     );
 }
 
@@ -91,7 +83,8 @@ export function Manga({manga: manga, children} : { manga: IManga, children?: Rea
 
     const interactiveElements = ["button", "input", "textarea", "a", "select", "option", "li"];
 
-    const mangaName = manga.name.length > 30 ? manga.name.substring(0, 27) + "..." : manga.name;
+    const maxLength = 50;
+    const mangaName = manga.name.length > maxLength ? manga.name.substring(0, maxLength-3) + "..." : manga.name;
 
     return (
         <Badge sx={{margin:"8px !important"}} badgeContent={mangaConnector ? <img width={"24pt"} height={"24pt"} src={mangaConnector.iconUrl} /> : manga.mangaConnectorName} color={ReleaseStatusToPalette(manga.releaseStatus)} size={"lg"}>

tranga-website/src/api/Contexts/ChapterContext.tsx

@@ -0,0 +1,9 @@
+import {createContext} from "react";
+import IChapter from "../types/IChapter.ts";
+
+export const ChapterContext = createContext<{chapters: IChapter[], GetChapter: (chapterId: string) => Promise<IChapter | undefined>}>(
+    {
+        chapters : [],
+        GetChapter: _ => Promise.resolve(undefined)
+    }
+);

tranga-website/src/api/Contexts/MangaContext.tsx

@@ -0,0 +1,9 @@
+import {createContext} from "react";
+import IManga, {DefaultManga} from "../types/IManga.ts";
+
+export const MangaContext = createContext<{mangas: IManga[], GetManga: (mangaId: string) => Promise<IManga | undefined>}>(
+    {
+        mangas : [],
+        GetManga: _ => Promise.resolve(DefaultManga)
+    }
+);