🛠 changed import to account for graphql

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.2.14 to 5.4.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.12/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Dockerfile

@@ -1,19 +1,36 @@
-FROM node:18.15.0-alpine
+# Use Node.js 22 as the base image
+FROM node:22-alpine
+
 LABEL maintainer="Rishi Ghan <rishi.ghan@gmail.com>"
 
+# Set the working directory inside the container
 WORKDIR /threetwo
 
-COPY package.json ./
+# Copy package.json and yarn.lock to leverage Docker cache
-COPY yarn.lock ./
+COPY package.json yarn.lock ./
-COPY nodemon.json ./
-COPY jsdoc.json ./
 
-# RUN apt-get update && apt-get install -y git python3 build-essential autoconf automake g++ libpng-dev make
+# Install build dependencies necessary for native modules (for node-sass)
-RUN apk --no-cache add g++ make libpng-dev git python3 libc6-compat autoconf automake libjpeg-turbo-dev libpng-dev mesa-dev mesa libxi build-base gcc libtool nasm
+RUN apk --no-cache add \
-RUN yarn --ignore-engines
+    g++ \
+    make \
+    python3 \
+    autoconf \
+    automake \
+    libtool \
+    nasm \
+    git
 
+# Install node modules
+RUN yarn install --ignore-engines
 
+# Explicitly install sass
+RUN yarn add -D sass
+
+# Copy the rest of the application files into the container
 COPY . .
+
+# Expose the application port (default for Vite)
 EXPOSE 5173
 
-ENTRYPOINT [ "npm", "start" ]
+# Start the application with yarn
+ENTRYPOINT ["yarn", "start"]

package.json

@@ -18,6 +18,8 @@
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
+    "@floating-ui/react": "^0.26.12",
+    "@floating-ui/react-dom": "^2.0.8",
     "@fortawesome/fontawesome-free": "^6.3.0",
     "@popperjs/core": "^2.11.8",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -27,20 +29,25 @@
     "@types/react-router-dom": "^5.3.3",
     "@vitejs/plugin-react": "^4.2.1",
     "airdcpp-apisocket": "^2.5.0-beta.2",
-    "axios": "^1.3.4",
+    "axios": "^1.8.2",
     "axios-cache-interceptor": "^1.0.1",
     "axios-rate-limit": "^1.3.0",
     "babel-plugin-styled-components": "^2.1.4",
     "date-fns": "^2.28.0",
     "dayjs": "^1.10.6",
     "ellipsize": "^0.5.1",
-    "express": "^4.17.1",
+    "express": "^4.20.0",
     "filename-parser": "^1.0.2",
     "final-form": "^4.20.2",
     "final-form-arrays": "^3.0.2",
     "focus-trap-react": "^10.2.3",
+    "graphql": "^16.0.0",
+    "graphql-request": "^7.2.0",
     "history": "^5.3.0",
     "html-to-text": "^8.1.0",
+    "i18next": "^23.11.1",
+    "i18next-browser-languagedetector": "^7.2.1",
+    "i18next-http-backend": "^2.5.0",
     "immer": "^10.0.3",
     "jsdoc": "^3.6.10",
     "keen-slider": "^6.8.6",
@@ -48,7 +55,7 @@
     "pretty-bytes": "^5.6.0",
     "prop-types": "^15.8.1",
     "qs": "^6.10.5",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-collapsible": "^2.9.0",
     "react-comic-viewer": "^0.4.0",
     "react-day-picker": "^8.10.0",
@@ -56,20 +63,20 @@
     "react-fast-compare": "^3.2.0",
     "react-final-form": "^6.5.9",
     "react-final-form-arrays": "^3.1.4",
+    "react-i18next": "^14.1.0",
     "react-loader-spinner": "^4.0.0",
     "react-modal": "^3.15.1",
-    "react-popper": "^2.3.0",
+    "react-router": "^7.5.2",
-    "react-router": "^6.9.0",
     "react-router-dom": "^6.9.0",
     "react-select": "^5.8.0",
     "react-select-async-paginate": "^0.7.2",
     "react-sliding-pane": "^7.1.0",
     "react-textarea-autosize": "^8.3.4",
-    "reapop": "^4.2.1",
+    "react-toastify": "^10.0.5",
     "socket.io-client": "^4.3.2",
     "styled-components": "^6.1.0",
     "threetwo-ui-typings": "^1.0.14",
-    "vite": "^5.0.5",
+    "vite": "^5.4.19",
     "vite-plugin-html": "^3.2.0",
     "websocket": "^1.0.34",
     "zustand": "^4.4.6"
@@ -108,7 +115,7 @@
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-storybook": "^0.6.13",
-    "express": "^4.17.1",
+    "express": "^4.20.0",
     "install": "^0.13.0",
     "jest": "^29.6.3",
     "nodemon": "^3.0.1",
@@ -117,7 +124,7 @@
     "prettier": "^2.2.1",
     "react-refresh": "^0.14.0",
     "rimraf": "^4.1.3",
-    "sass": "^1.69.5",
+    "sass": "^1.77.0",
     "storybook": "^7.3.2",
     "tailwindcss": "^3.4.1",
     "tui-jsdoc-template": "^1.2.2",

src/client/components/App.tsx

@@ -1,13 +1,20 @@
-import React, { ReactElement } from "react";
+import React, { ReactElement, useEffect } from "react";
 import { Outlet } from "react-router-dom";
 import { Navbar2 } from "./shared/Navbar2";
+import { ToastContainer } from "react-toastify";
 import "../assets/scss/App.scss";
+import { useStore } from "../store";
 
 export const App = (): ReactElement => {
+  useEffect(() => {
+    useStore.getState().getSocket("/"); // Connect to the base namespace
+  }, []);
+  
   return (
     <>
       <Navbar2 />
       <Outlet />
+      <ToastContainer stacked hideProgressBar />
     </>
   );
 };

src/client/components/ComicDetail/AcquisitionPanel.tsx

@@ -1,7 +1,11 @@
-import React, { useCallback, ReactElement, useEffect, useState } from "react";
+import React, {
-import { getBundlesForComic, sleep } from "../../actions/airdcpp.actions";
+  useCallback,
-import { SearchQuery, PriorityEnum, SearchResponse } from "threetwo-ui-typings";
+  ReactElement,
-import { RootState, SearchInstance } from "threetwo-ui-typings";
+  useEffect,
+  useRef,
+  useState,
+} from "react";
+import { SearchQuery, PriorityEnum, SearchResponse, SearchInstance } from "threetwo-ui-typings";
 import ellipsize from "ellipsize";
 import { Form, Field } from "react-final-form";
 import { difference } from "../../shared/utils/object.utils";
@@ -10,230 +14,315 @@ import { useStore } from "../../store";
 import { useShallow } from "zustand/react/shallow";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import axios from "axios";
+import { AIRDCPP_SERVICE_BASE_URI, SETTINGS_SERVICE_BASE_URI } from "../../constants/endpoints";
+import type { Socket } from "socket.io-client";
 
 interface IAcquisitionPanelProps {
   query: any;
-  comicObjectId: any;
+  comicObjectId: string;
   comicObject: any;
   settings: any;
 }
 
+interface AirDCPPConfig {
+  protocol: string;
+  hostname: string;
+  username: string;
+  password: string;
+}
+
+interface SearchResult {
+  id: string;
+  name: string;
+  type: {
+    id: string;
+    str: string;
+  };
+  size: number;
+  slots: {
+    total: number;
+    free: number;
+  };
+  users: {
+    user: {
+      nicks: string;
+      flags: string[];
+    };
+  };
+  dupe?: any;
+}
+
+interface SearchInstanceData {
+  id: number;
+  owner: string;
+  expires_in: number;
+}
+
+interface SearchInfo {
+  query: {
+    pattern: string;
+    extensions: string[];
+    file_type: string;
+  };
+}
+
+interface Hub {
+  hub_url: string;
+  identity: {
+    name: string;
+  };
+  value: string;
+}
+
+interface SearchFormValues {
+  issueName: string;
+}
+
 export const AcquisitionPanel = (
   props: IAcquisitionPanelProps,
 ): ReactElement => {
-  const {
+  const socketRef = useRef<Socket>();
-    airDCPPSocketInstance,
+  const queryClient = useQueryClient();
-    airDCPPClientConfiguration,
+  const searchTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-    airDCPPSessionInformation,
-    airDCPPDownloadTick,
-  } = useStore(
-    useShallow((state) => ({
-      airDCPPSocketInstance: state.airDCPPSocketInstance,
-      airDCPPClientConfiguration: state.airDCPPClientConfiguration,
-      airDCPPSessionInformation: state.airDCPPSessionInformation,
-      airDCPPDownloadTick: state.airDCPPDownloadTick,
-    })),
-  );
 
-  interface SearchData {
+  const [dcppQuery, setDcppQuery] = useState<SearchQuery | null>(null);
-    query: Pick<SearchQuery, "pattern"> & Partial<Omit<SearchQuery, "pattern">>;
+  const [airDCPPSearchResults, setAirDCPPSearchResults] = useState<SearchResult[]>([]);
-    hub_urls: string[] | undefined | null;
+  const [airDCPPSearchStatus, setAirDCPPSearchStatus] = useState(false);
-    priority: PriorityEnum;
+  const [isSearching, setIsSearching] = useState(false);
-  }
+  const [airDCPPSearchInstance, setAirDCPPSearchInstance] = useState<SearchInstanceData | null>(null);
+  const [airDCPPSearchInfo, setAirDCPPSearchInfo] = useState<SearchInfo | null>(null);
+  const [searchError, setSearchError] = useState<string | null>(null);
 
-  /**
-   * Get the hubs list from an AirDCPP Socket
-   */
-  const { data: hubs } = useQuery({
-    queryKey: ["hubs"],
-    queryFn: async () => await airDCPPSocketInstance.get(`hubs`),
-  });
   const { comicObjectId } = props;
   const issueName = props.query.issue.name || "";
   const sanitizedIssueName = issueName.replace(/[^a-zA-Z0-9 ]/g, " ");
 
-  const [dcppQuery, setDcppQuery] = useState({});
+  // Search timeout duration in milliseconds (30 seconds)
-  const [airDCPPSearchResults, setAirDCPPSearchResults] = useState([]);
+  const SEARCH_TIMEOUT_MS = 30000;
-  const [airDCPPSearchStatus, setAirDCPPSearchStatus] = useState(false);
-  const [airDCPPSearchInstance, setAirDCPPSearchInstance] = useState({});
-  const [airDCPPSearchInfo, setAirDCPPSearchInfo] = useState({});
-  const queryClient = useQueryClient();
 
-  // Construct a AirDC++ query based on metadata inferred, upon component mount
-  // Pre-populate the search input with the search string, so that
-  // All the user has to do is hit "Search AirDC++"
   useEffect(() => {
-    // AirDC++ search query
+    const socket = useStore.getState().getSocket("manual");
-    const dcppSearchQuery = {
+    socketRef.current = socket;
-      query: {
+
-        pattern: `${sanitizedIssueName.replace(/#/g, "")}`,
+    // --- Handlers ---
-        extensions: ["cbz", "cbr", "cb7"],
+    const handleResultAdded = ({ result }: { result: SearchResult }) => {
-      },
+      setAirDCPPSearchResults((prev) =>
-      hub_urls: map(hubs, (item) => item.value),
+        prev.some((r) => r.id === result.id) ? prev : [...prev, result],
-      priority: 5,
+      );
     };
-    setDcppQuery(dcppSearchQuery);
-  }, []);
 
-  /**
+    const handleResultUpdated = ({ result }: { result: SearchResult }) => {
-   * Method to perform a search via an AirDC++ websocket
+      setAirDCPPSearchResults((prev) => {
-   * @param {SearchData} data - a SearchData query
+        const idx = prev.findIndex((r) => r.id === result.id);
-   * @param {any} ADCPPSocket - an intialized AirDC++ socket instance
+        if (idx === -1) return prev;
-   */
+        if (JSON.stringify(prev[idx]) === JSON.stringify(result)) return prev;
-  const search = async (data: SearchData, ADCPPSocket: any) => {
+        const next = [...prev];
-    try {
+        next[idx] = result;
-      if (!ADCPPSocket.isConnected()) {
+        return next;
-        await ADCPPSocket();
+      });
+    };
+
+    const handleSearchInitiated = (data: { instance: SearchInstanceData }) => {
+      setAirDCPPSearchInstance(data.instance);
+      setIsSearching(true);
+      setSearchError(null);
+      
+      // Clear any existing timeout
+      if (searchTimeoutRef.current) {
+        clearTimeout(searchTimeoutRef.current);
       }
-      const instance: SearchInstance = await ADCPPSocket.post("search");
+      
-      setAirDCPPSearchStatus(true);
+      // Set a timeout to stop searching after SEARCH_TIMEOUT_MS
+      searchTimeoutRef.current = setTimeout(() => {
+        setIsSearching(false);
+        console.log(`Search timeout reached after ${SEARCH_TIMEOUT_MS / 1000} seconds`);
+      }, SEARCH_TIMEOUT_MS);
+    };
 
-      // We want to get notified about every new result in order to make the user experience better
+    const handleSearchesSent = (data: { searchInfo: SearchInfo }) => {
-      await ADCPPSocket.addListener(
+      setAirDCPPSearchInfo(data.searchInfo);
-        `search`,
+    };
-        "search_result_added",
+
-        async (groupedResult) => {
+    const handleSearchError = (error: { message: string }) => {
-          // ...add the received result in the UI
+      setSearchError(error.message || "Search failed");
-          // (it's probably a good idea to have some kind of throttling for the UI updates as there can be thousands of results)
+      setIsSearching(false);
-          setAirDCPPSearchResults((state) => [...state, groupedResult]);
+      
+      // Clear timeout on error
+      if (searchTimeoutRef.current) {
+        clearTimeout(searchTimeoutRef.current);
+        searchTimeoutRef.current = null;
+      }
+    };
+
+    const handleSearchCompleted = () => {
+      setIsSearching(false);
+      
+      // Clear timeout when search completes
+      if (searchTimeoutRef.current) {
+        clearTimeout(searchTimeoutRef.current);
+        searchTimeoutRef.current = null;
+      }
+    };
+
+    // --- Subscribe once ---
+    socket.on("searchResultAdded", handleResultAdded);
+    socket.on("searchResultUpdated", handleResultUpdated);
+    socket.on("searchInitiated", handleSearchInitiated);
+    socket.on("searchesSent", handleSearchesSent);
+    socket.on("searchError", handleSearchError);
+    socket.on("searchCompleted", handleSearchCompleted);
+
+    return () => {
+      socket.off("searchResultAdded", handleResultAdded);
+      socket.off("searchResultUpdated", handleResultUpdated);
+      socket.off("searchInitiated", handleSearchInitiated);
+      socket.off("searchesSent", handleSearchesSent);
+      socket.off("searchError", handleSearchError);
+      socket.off("searchCompleted", handleSearchCompleted);
+      
+      // Clean up timeout on unmount
+      if (searchTimeoutRef.current) {
+        clearTimeout(searchTimeoutRef.current);
+      }
+    };
+  }, [SEARCH_TIMEOUT_MS]);
+
+  const {
+    data: settings,
+    isLoading: isLoadingSettings,
+    isError: isSettingsError,
+  } = useQuery({
+    queryKey: ["settings"],
+    queryFn: async () =>
+      await axios({
+        url: `${SETTINGS_SERVICE_BASE_URI}/getAllSettings`,
+        method: "GET",
+      }),
+  });
+
+  const { data: hubs, isLoading: isLoadingHubs } = useQuery({
+    queryKey: ["hubs", settings?.data.directConnect?.client?.host],
+    queryFn: async () =>
+      await axios({
+        url: `${AIRDCPP_SERVICE_BASE_URI}/getHubs`,
+        method: "POST",
+        data: {
+          host: settings?.data.directConnect?.client?.host,
         },
-        instance.id,
+      }),
-      );
+    enabled: !!settings?.data?.directConnect?.client?.host,
+  });
 
-      // We also want to update the existing items in our list when new hits arrive for the previously listed files/directories
+  // Get AirDC++ config from settings
-      await ADCPPSocket.addListener(
+  const airDCPPConfig: AirDCPPConfig | null = settings?.data?.directConnect?.client
-        `search`,
+    ? {
-        "search_result_updated",
+        protocol: settings.data.directConnect.client.protocol || "ws",
-        async (groupedResult) => {
+        hostname: typeof settings.data.directConnect.client.host === 'string'
-          // ...update properties of the existing result in the UI
+          ? settings.data.directConnect.client.host
-          const bundleToUpdateIndex = airDCPPSearchResults?.findIndex(
+          : `${settings.data.directConnect.client.host?.hostname || 'localhost'}:${settings.data.directConnect.client.host?.port || '5600'}`,
-            (bundle) => bundle.result.id === groupedResult.result.id,
+        username: settings.data.directConnect.client.username || "admin",
-          );
+        password: settings.data.directConnect.client.password || "password",
-          const updatedState = [...airDCPPSearchResults];
+      }
-          if (
+    : null;
-            !isNil(difference(updatedState[bundleToUpdateIndex], groupedResult))
+
-          ) {
+  useEffect(() => {
-            updatedState[bundleToUpdateIndex] = groupedResult;
+    if (hubs?.data && Array.isArray(hubs.data) && hubs.data.length > 0) {
-          }
+      const dcppSearchQuery = {
-          setAirDCPPSearchResults((state) => [...state, ...updatedState]);
+        query: {
+          pattern: `${sanitizedIssueName.replace(/#/g, "")}`,
+          extensions: ["cbz", "cbr", "cb7"],
         },
-        instance.id,
+        hub_urls: map(hubs.data, (item) => item.value),
-      );
+        priority: 5,
-
+      };
-      // We need to show something to the user in case the search won't yield any results so that he won't be waiting forever)
+      setDcppQuery(dcppSearchQuery as any);
-      // Wait for 5 seconds for any results to arrive after the searches were sent to the hubs
-      await ADCPPSocket.addListener(
-        `search`,
-        "search_hub_searches_sent",
-        async (searchInfo) => {
-          await sleep(5000);
-
-          // Check the number of received results (in real use cases we should know that even without calling the API)
-          const currentInstance = await ADCPPSocket.get(
-            `search/${instance.id}`,
-          );
-          setAirDCPPSearchInstance(currentInstance);
-          setAirDCPPSearchInfo(searchInfo);
-          if (currentInstance.result_count === 0) {
-            // ...nothing was received, show an informative message to the user
-            console.log("No more search results.");
-          }
-
-          // The search can now be considered to be "complete"
-          // If there's an "in progress" indicator in the UI, that could also be disabled here
-          setAirDCPPSearchInstance(instance);
-          setAirDCPPSearchStatus(false);
-        },
-        instance.id,
-      );
-      // Finally, perform the actual search
-      await ADCPPSocket.post(`search/${instance.id}/hub_search`, data);
-    } catch (error) {
-      console.log(error);
-      throw error;
     }
+  }, [hubs, sanitizedIssueName]);
+
+  const search = async (searchData: any) => {
+    if (!airDCPPConfig) {
+      setSearchError("AirDC++ configuration not found in settings");
+      return;
+    }
+
+    if (!socketRef.current) {
+      setSearchError("Socket connection not available");
+      return;
+    }
+
+    setAirDCPPSearchResults([]);
+    setIsSearching(true);
+    setSearchError(null);
+    
+    socketRef.current.emit("call", "socket.search", {
+      query: searchData,
+      namespace: "/manual",
+      config: airDCPPConfig,
+    });
   };
 
-  /**
-   * Method to download a bundle associated with a search result from AirDC++
-   * @param {Number} searchInstanceId - description
-   * @param {String} resultId - description
-   * @param {String} comicObjectId - description
-   * @param {String} name - description
-   * @param {Number} size - description
-   * @param {any} type - description
-   * @param {any} ADCPPSocket - description
-   * @returns {void}  - description
-   */
   const download = async (
-    searchInstanceId: Number,
+    searchInstanceId: number,
-    resultId: String,
+    resultId: string,
-    comicObjectId: String,
+    comicObjectId: string,
-    name: String,
+    name: string,
-    size: Number,
+    size: number,
-    type: any,
+    type: SearchResult["type"],
-    ADCPPSocket: any,
+    config: AirDCPPConfig,
-  ): void => {
+  ): Promise<void> => {
-    try {
+    if (!socketRef.current) {
-      if (!ADCPPSocket.isConnected()) {
+      console.error("Socket connection not available");
-        await ADCPPSocket.connect();
+      return;
-      }
-      let bundleDBImportResult = {};
-      const downloadResult = await ADCPPSocket.post(
-        `search/${searchInstanceId}/results/${resultId}/download`,
-      );
-
-      if (!isNil(downloadResult)) {
-        bundleDBImportResult = await axios({
-          method: "POST",
-          url: `http://localhost:3000/api/library/applyAirDCPPDownloadMetadata`,
-          headers: {
-            "Content-Type": "application/json; charset=utf-8",
-          },
-          data: {
-            bundleId: downloadResult.bundle_info.id,
-            comicObjectId,
-            name,
-            size,
-            type,
-          },
-        });
-        console.log(bundleDBImportResult?.data);
-        queryClient.invalidateQueries({ queryKey: ["comicBookMetadata"] });
-
-        //         dispatch({
-        //           type: AIRDCPP_RESULT_DOWNLOAD_INITIATED,
-        //           downloadResult,
-        //           bundleDBImportResult,
-        //         });
-        //
-        //         dispatch({
-        //           type: IMS_COMIC_BOOK_DB_OBJECT_FETCHED,
-        //           comicBookDetail: bundleDBImportResult.data,
-        //           IMS_inProgress: false,
-        //         });
-      }
-    } catch (error) {
-      throw error;
     }
+
+    socketRef.current.emit(
+      "call",
+      "socket.download",
+      {
+        searchInstanceId,
+        resultId,
+        comicObjectId,
+        name,
+        size,
+        type,
+        config,
+      },
+      (data: any) => console.log("Download initiated:", data),
+    );
   };
-  const getDCPPSearchResults = async (searchQuery) => {
+
+  const getDCPPSearchResults = async (searchQuery: SearchFormValues) => {
+    if (!searchQuery.issueName || searchQuery.issueName.trim() === "") {
+      setSearchError("Please enter a search term");
+      return;
+    }
+
+    if (!hubs?.data || !Array.isArray(hubs.data) || hubs.data.length === 0) {
+      setSearchError("No hubs configured");
+      return;
+    }
+
     const manualQuery = {
       query: {
-        pattern: `${searchQuery.issueName}`,
+        pattern: `${searchQuery.issueName.trim()}`,
         extensions: ["cbz", "cbr", "cb7"],
       },
-      hub_urls: map(hubs, (hub) => hub.hub_url),
+      hub_urls: [hubs.data[0].hub_url],
       priority: 5,
     };
 
-    search(manualQuery, airDCPPSocketInstance);
+    search(manualQuery);
   };
 
   return (
     <>
-      <div className="mt-5">
+      <div className="mt-5 mb-3">
-        {!isEmpty(airDCPPSocketInstance) ? (
+        {isLoadingSettings || isLoadingHubs ? (
+          <div className="flex items-center gap-2 text-sm text-gray-600 dark:text-gray-400">
+            <i className="icon-[solar--refresh-bold-duotone] h-5 w-5 animate-spin" />
+            Loading configuration...
+          </div>
+        ) : !isEmpty(hubs?.data) ? (
           <Form
             onSubmit={getDCPPSearchResults}
             initialValues={{
@@ -253,20 +342,31 @@ export const AcquisitionPanel = (
                             {...input}
                             className="dark:bg-slate-400 bg-slate-300 py-2 px-2 rounded-l-md border-gray-300 h-10 min-w-full dark:text-slate-800 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
                             placeholder="Type an issue/volume name"
+                            disabled={isSearching}
                           />
 
                           <button
-                            className="sm:mt-0 min-w-fit rounded-r-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                            className="sm:mt-0 min-w-fit rounded-r-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500 disabled:opacity-50 disabled:cursor-not-allowed"
                             type="submit"
+                            disabled={isSearching}
                           >
-                            <div className="flex flex-row">
+                            <div className="flex flex-row items-center">
-                              Search DC++
+                              {isSearching ? (
-                              <div className="h-5 w-5 ml-2">
+                                <>
-                                <img
+                                  <i className="icon-[solar--refresh-bold-duotone] h-5 w-5 animate-spin mr-2" />
-                                  src="/src/client/assets/img/airdcpp_logo.svg"
+                                  Searching...
-                                  className="h-5 w-5"
+                                </>
-                                />
+                              ) : (
-                              </div>
+                                <>
+                                  Search DC++
+                                  <div className="h-5 w-5 ml-2">
+                                    <img
+                                      src="/src/client/assets/img/airdcpp_logo.svg"
+                                      className="h-5 w-5"
+                                    />
+                                  </div>
+                                </>
+                              )}
                             </div>
                           </button>
                         </div>
@@ -278,27 +378,45 @@ export const AcquisitionPanel = (
             )}
           />
         ) : (
-          <div className="">
+          <article
-            <article className="">
+            role="alert"
-              <div className="">
+            className="mt-4 rounded-lg text-sm max-w-screen-md border-s-4 border-yellow-500 bg-yellow-50 p-4 dark:border-s-4 dark:border-yellow-600 dark:bg-yellow-300 dark:text-slate-600"
-                AirDC++ is not configured. Please configure it in{" "}
+          >
-                <code>Settings &gt; AirDC++ &gt; Connection</code>.
+            No AirDC++ hub configured. Please configure it in{" "}
-              </div>
+            <code>Settings &gt; AirDC++ &gt; Hubs</code>.
-            </article>
+          </article>
-          </div>
         )}
       </div>
 
+      {/* Search Error Display */}
+      {searchError && (
+        <article
+          role="alert"
+          className="mt-4 rounded-lg text-sm max-w-screen-md border-s-4 border-red-500 bg-red-50 p-4 dark:border-s-4 dark:border-red-600 dark:bg-red-300 dark:text-slate-600"
+        >
+          <strong>Error:</strong> {searchError}
+        </article>
+      )}
+      {/* configured hub */}
+      {!isEmpty(hubs?.data) && hubs?.data[0] && (
+        <span className="inline-flex items-center bg-green-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-green-300">
+          <span className="pr-1 pt-1">
+            <i className="icon-[solar--server-2-bold-duotone] w-5 h-5"></i>
+          </span>
+          {hubs.data[0].hub_url}
+        </span>
+      )}
+
       {/* AirDC++ search instance details */}
-      {!isNil(airDCPPSearchInstance) &&
+      {airDCPPSearchInstance &&
-        !isEmpty(airDCPPSearchInfo) &&
+        airDCPPSearchInfo &&
-        !isNil(hubs) && (
+        hubs?.data && (
           <div className="flex flex-row gap-3 my-5 font-hasklig">
             <div className="block max-w-sm h-fit p-6 text-sm bg-white border border-gray-200 rounded-lg shadow dark:bg-slate-400 dark:border-gray-700">
               <dl>
                 <dt>
                   <div className="mb-1">
-                    {hubs.map((value, idx) => (
+                    {hubs.data.map((value: Hub, idx: number) => (
                       <span className="tag is-warning" key={idx}>
                         {value.identity.name}
                       </span>
@@ -337,138 +455,119 @@ export const AcquisitionPanel = (
         )}
 
       {/* AirDC++ results */}
-      <div className="columns">
+      <div className="">
-        {!isNil(airDCPPSearchResults) && !isEmpty(airDCPPSearchResults) ? (
+        {airDCPPSearchResults.length > 0 ? (
-          <div className="overflow-x-auto w-fit mt-4 rounded-lg border border-gray-200 dark:border-gray-500">
+          <div className="overflow-x-auto max-w-full mt-6">
-            <table className="min-w-full divide-y-2 divide-gray-200 dark:divide-gray-500 text-md">
+            <table className="w-full table-auto text-sm text-gray-900 dark:text-slate-100">
               <thead>
-                <tr>
+                <tr className="border-b border-gray-300 dark:border-slate-700">
-                  <th className="whitespace-nowrap px-2 py-2 font-medium text-gray-900 dark:text-slate-200">
+                  <th className="whitespace-nowrap px-3 py-2 text-left text-[11px] font-semibold tracking-wide text-gray-500 dark:text-slate-400 uppercase">
                     Name
                   </th>
-                  <th className="whitespace-nowrap py-2 font-medium text-gray-900 dark:text-slate-200">
+                  <th className="whitespace-nowrap px-3 py-2 text-left text-[11px] font-semibold tracking-wide text-gray-500 dark:text-slate-400 uppercase">
                     Type
                   </th>
-                  <th className="whitespace-nowrap py-2 font-medium text-gray-900 dark:text-slate-200">
+                  <th className="whitespace-nowrap px-3 py-2 text-left text-[11px] font-semibold tracking-wide text-gray-500 dark:text-slate-400 uppercase">
                     Slots
                   </th>
-                  <th className="whitespace-nowrap py-2 font-medium text-gray-900 dark:text-slate-200">
+                  <th className="whitespace-nowrap px-3 py-2 text-left text-[11px] font-semibold tracking-wide text-gray-500 dark:text-slate-400 uppercase">
                     Actions
                   </th>
                 </tr>
               </thead>
-              <tbody className="divide-y divide-slate-100 dark:divide-gray-500">
+              <tbody>
-                {map(airDCPPSearchResults, ({ result }, idx) => {
+                {map(
-                  return (
+                  airDCPPSearchResults,
+                  ({ dupe, type, name, id, slots, users, size }, idx) => (
                     <tr
                       key={idx}
                       className={
-                        !isNil(result.dupe)
+                        !isNil(dupe)
-                          ? "bg-gray-100 dark:bg-gray-700"
+                          ? "border-b border-gray-200 dark:border-slate-700 bg-gray-100 dark:bg-gray-700"
-                          : "w-fit text-sm"
+                          : "border-b border-gray-200 dark:border-slate-700 text-sm"
                       }
                     >
-                      <td className="whitespace-nowrap px-3 py-3 text-gray-700 dark:text-slate-300">
+                      {/* NAME */}
+                      <td className="whitespace-nowrap px-3 py-3 text-gray-700 dark:text-slate-300 max-w-xs">
                         <p className="mb-2">
-                          {result.type.id === "directory" ? (
+                          {type.id === "directory" && (
-                            <i className="fas fa-folder"></i>
+                            <i className="fas fa-folder mr-1"></i>
-                          ) : null}
+                          )}
-                          {ellipsize(result.name, 70)}
+                          {ellipsize(name, 45)}
                         </p>
-
                         <dl>
                           <dd>
-                            <div className="inline-flex flex-row gap-2">
+                            <div className="inline-flex flex-wrap gap-1">
-                              {!isNil(result.dupe) ? (
+                              {!isNil(dupe) && (
-                                <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                                <span className="inline-flex items-center gap-1 bg-slate-100 text-slate-800 text-xs font-medium py-0.5 px-2 rounded dark:bg-slate-400 dark:text-slate-900">
-                                  <span className="pr-1 pt-1">
+                                  <i className="icon-[solar--copy-bold-duotone] w-4 h-4"></i>
-                                    <i className="icon-[solar--copy-bold-duotone] w-5 h-5"></i>
+                                  Dupe
-                                  </span>
-
-                                  <span className="text-md text-slate-500 dark:text-slate-900">
-                                    Dupe
-                                  </span>
-                                </span>
-                              ) : null}
-
-                              {/* Nicks */}
-                              <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                                <span className="pr-1 pt-1">
-                                  <i className="icon-[solar--user-rounded-bold-duotone] w-5 h-5"></i>
-                                </span>
-
-                                <span className="text-md text-slate-500 dark:text-slate-900">
-                                  {result.users.user.nicks}
                                 </span>
+                              )}
+                              <span className="inline-flex items-center gap-1 bg-slate-100 text-slate-800 text-xs font-medium py-0.5 px-2 rounded dark:bg-slate-400 dark:text-slate-900">
+                                <i className="icon-[solar--user-rounded-bold-duotone] w-4 h-4"></i>
+                                {users.user.nicks}
                               </span>
-                              {/* Flags */}
+                              {users.user.flags.map((flag: string, flagIdx: number) => (
-                              {result.users.user.flags.map((flag, idx) => (
+                                <span
-                                <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                                  key={flagIdx}
-                                  <span className="pr-1 pt-1">
+                                  className="inline-flex items-center gap-1 bg-slate-100 text-slate-800 text-xs font-medium py-0.5 px-2 rounded dark:bg-slate-400 dark:text-slate-900"
-                                    <i className="icon-[solar--tag-horizontal-bold-duotone] w-5 h-5"></i>
+                                >
-                                  </span>
+                                  <i className="icon-[solar--tag-horizontal-bold-duotone] w-4 h-4"></i>
-
+                                  {flag}
-                                  <span className="text-md text-slate-500 dark:text-slate-900">
-                                    {flag}
-                                  </span>
                                 </span>
                               ))}
                             </div>
                           </dd>
                         </dl>
                       </td>
-                      <td>
-                        {/* Extension */}
-                        <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                          <span className="pr-1 pt-1">
-                            <i className="icon-[solar--zip-file-bold-duotone] w-5 h-5"></i>
-                          </span>
 
-                          <span className="text-md text-slate-500 dark:text-slate-900">
+                      {/* TYPE */}
-                            {result.type.str}
+                      <td className="px-2 py-3">
-                          </span>
+                        <span className="inline-flex items-center gap-1 bg-slate-100 text-slate-800 text-xs font-medium py-0.5 px-2 rounded dark:bg-slate-400 dark:text-slate-900">
+                          <i className="icon-[solar--zip-file-bold-duotone] w-4 h-4"></i>
+                          {type.str}
                         </span>
                       </td>
-                      <td className="px-2">
-                        {/* Slots */}
-                        <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                          <span className="pr-1 pt-1">
-                            <i className="icon-[solar--settings-minimalistic-bold-duotone] w-5 h-5"></i>
-                          </span>
 
-                          <span className="text-md text-slate-500 dark:text-slate-900">
+                      {/* SLOTS */}
-                            {result.slots.total} slots; {result.slots.free} free
+                      <td className="px-2 py-3">
-                          </span>
+                        <span className="inline-flex items-center gap-1 bg-slate-100 text-slate-800 text-xs font-medium py-0.5 px-2 rounded dark:bg-slate-400 dark:text-slate-900">
+                          <i className="icon-[solar--settings-minimalistic-bold-duotone] w-4 h-4"></i>
+                          {slots.total} slots; {slots.free} free
                         </span>
                       </td>
-                      <td className="px-2">
+
+                      {/* ACTIONS */}
+                      <td className="px-2 py-3">
                         <button
-                          className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                          className="inline-flex items-center gap-1 rounded border border-green-500 bg-green-500 px-2 py-1 text-xs font-medium text-white hover:bg-transparent hover:text-green-400 dark:border-green-300 dark:bg-green-300 dark:text-slate-900 dark:hover:bg-transparent disabled:opacity-50 disabled:cursor-not-allowed"
-                          onClick={() =>
+                          onClick={() => {
-                            download(
+                            if (airDCPPSearchInstance && airDCPPConfig) {
-                              airDCPPSearchInstance.id,
+                              download(
-                              result.id,
+                                airDCPPSearchInstance.id,
-                              comicObjectId,
+                                id,
-                              result.name,
+                                comicObjectId,
-                              result.size,
+                                name,
-                              result.type,
+                                size,
-                              airDCPPSocketInstance,
+                                type,
-                            )
+                                airDCPPConfig,
-                          }
+                              );
+                            }
+                          }}
+                          disabled={!airDCPPSearchInstance || !airDCPPConfig}
                         >
-                          <span className="text-xs">Download</span>
+                          Download
-                          <span className="w-5 h-5">
+                          <i className="icon-[solar--download-bold-duotone] w-4 h-4"></i>
-                            <i className="h-5 w-5 icon-[solar--download-bold-duotone]"></i>
-                          </span>
                         </button>
                       </td>
                     </tr>
-                  );
+                  ),
-                })}
+                )}
               </tbody>
             </table>
           </div>
-        ) : (
+        ) : !isSearching ? (
           <div className="">
             <article
               role="alert"
@@ -494,6 +593,11 @@ export const AcquisitionPanel = (
               </div>
             </article>
           </div>
+        ) : (
+          <div className="flex items-center justify-center gap-2 text-sm text-gray-600 dark:text-gray-400 mt-6 p-4">
+            <i className="icon-[solar--refresh-bold-duotone] h-6 w-6 animate-spin" />
+            Searching...
+          </div>
         )}
       </div>
     </>

src/client/components/ComicDetail/ActionMenu/Menu.tsx

@@ -1,7 +1,7 @@
 import React, { ReactElement } from "react";
 import Select from "react-select";
 
-export const Menu = (props): ReactElement => {
+export const Menu = (props: any): ReactElement => {
   const {
     filteredActionOptions,
     customStyles,
@@ -13,11 +13,11 @@ export const Menu = (props): ReactElement => {
     <Select
       components={{ Placeholder }}
       placeholder={
-        <span className="inline-flex flex-row items-center gap-2 pt-1">
+        <span className="inline-flex flex-row items-center gap-1.5 pt-1">
-          <div className="w-6 h-6">
+          <div className="w-4 h-4">
-            <i className="icon-[solar--cursor-bold-duotone] w-6 h-6"></i>
+            <i className="icon-[solar--cursor-bold-duotone] w-4 h-4"></i>
           </div>
-          <div>Select An Action</div>
+          <div className="text-sm">Select An Action</div>
         </span>
       }
       styles={customStyles}

src/client/components/ComicDetail/AirDCPPBundles.tsx

@@ -3,44 +3,55 @@ import prettyBytes from "pretty-bytes";
 import dayjs from "dayjs";
 import ellipsize from "ellipsize";
 import { map } from "lodash";
-
+import { DownloadProgressTick } from "./DownloadProgressTick";
 export const AirDCPPBundles = (props) => {
   return (
-    <div className="overflow-x-auto w-fit mt-4 rounded-lg border border-gray-200">
+    <div className="overflow-x-auto w-fit mt-6">
-      <table className="min-w-full divide-y-2 divide-gray-200 dark:divide-gray-200 text-md">
+      <table className="min-w-full text-sm text-gray-900 dark:text-slate-100">
         <thead>
-          <tr>
+          <tr className="border-b border-gray-300 dark:border-slate-700">
-            <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+            <th className="px-3 py-2 text-left text-[11px] font-semibold tracking-wide text-gray-500 dark:text-slate-400 uppercase">
               Filename
             </th>
-            <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+            <th className="px-3 py-2 text-left text-[11px] font-semibold tracking-wide text-gray-500 dark:text-slate-400 uppercase">
               Size
             </th>
-            <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+            <th className="px-3 py-2 text-left text-[11px] font-semibold tracking-wide text-gray-500 dark:text-slate-400 uppercase">
-              Download Time
+              Download Status
             </th>
-            <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+            <th className="px-3 py-2 text-left text-[11px] font-semibold tracking-wide text-gray-500 dark:text-slate-400 uppercase">
               Bundle ID
             </th>
           </tr>
         </thead>
-        <tbody className="divide-y divide-gray-200">
+        <tbody>
-          {map(props.data, (bundle) => (
+          {map(props.data, (bundle, index) => (
-            <tr key={bundle.id} className="text-sm">
+            <tr
-              <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+              key={bundle.id}
-                <h5>{ellipsize(bundle.name, 58)}</h5>
+              className={
-                <span className="text-xs">{ellipsize(bundle.target, 88)}</span>
+                Number(index) !== props.data.length - 1
+                  ? "border-b border-gray-200 dark:border-slate-700"
+                  : ""
+              }
+            >
+              <td className="px-3 py-2 align-top">
+                <h5 className="font-medium text-gray-800 dark:text-slate-200">
+                  {ellipsize(bundle.name, 58)}
+                </h5>
+                <p className="text-xs text-gray-500 dark:text-slate-400">
+                  {ellipsize(bundle.target, 88)}
+                </p>
               </td>
-              <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+              <td className="px-3 py-2 align-top">
                 {prettyBytes(bundle.size)}
               </td>
-              <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+              <td className="px-3 py-2 align-top">
-                {dayjs
+                <DownloadProgressTick bundleId={bundle.id} />
-                  .unix(bundle.time_finished)
-                  .format("h:mm on ddd, D MMM, YYYY")}
               </td>
-              <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+              <td className="px-3 py-2 align-top">
-                <span className="tag is-warning">{bundle.id}</span>
+                <span className="text-xs text-yellow-800 dark:text-yellow-300 font-medium">
+                  {bundle.id}
+                </span>
               </td>
             </tr>
           ))}

src/client/components/ComicDetail/AsyncSelectPaginate/AsyncSelectPaginate.tsx

@@ -1,11 +1,17 @@
 import React, { ReactElement, useCallback, useState } from "react";
-import PropTypes from "prop-types";
 import { fetchMetronResource } from "../../../actions/metron.actions";
 import Creatable from "react-select/creatable";
 import { withAsyncPaginate } from "react-select-async-paginate";
 const CreatableAsyncPaginate = withAsyncPaginate(Creatable);
 
-export const AsyncSelectPaginate = (props): ReactElement => {
+interface AsyncSelectPaginateProps {
+  metronResource: string;
+  placeholder?: string;
+  value?: object;
+  onChange?(...args: unknown[]): unknown;
+}
+
+export const AsyncSelectPaginate = (props: AsyncSelectPaginateProps): ReactElement => {
   const [value, setValue] = useState(null);
   const [isAddingInProgress, setIsAddingInProgress] = useState(false);
 
@@ -38,11 +44,4 @@ export const AsyncSelectPaginate = (props): ReactElement => {
   );
 };
 
-AsyncSelectPaginate.propTypes = {
-  metronResource: PropTypes.string.isRequired,
-  placeholder: PropTypes.string,
-  value: PropTypes.object,
-  onChange: PropTypes.func,
-};
-
 export default AsyncSelectPaginate;

src/client/components/ComicDetail/ComicDetail.tsx

@@ -18,7 +18,6 @@ import { VolumeInformation } from "./Tabs/VolumeInformation";
 
 import { isEmpty, isUndefined, isNil, filter } from "lodash";
 import { components } from "react-select";
-import { RootState } from "threetwo-ui-typings";
 
 import "react-sliding-pane/dist/react-sliding-pane.css";
 import "react-loader-spinner/dist/loader/css/react-spinner-loader.css";
@@ -34,7 +33,34 @@ import { styled } from "styled-components";
 import { COMICVINE_SERVICE_URI } from "../../constants/endpoints";
 import { refineQuery } from "filename-parser";
 
-type ComicDetailProps = {};
+interface ComicDetailProps {
+  data: {
+    _id: string;
+    rawFileDetails?: any;
+    inferredMetadata?: {
+      issue?: {
+        year?: string;
+        name?: string;
+        number?: number;
+        subtitle?: string;
+      };
+    };
+    sourcedMetadata: {
+      comicvine?: any;
+      locg?: any;
+      comicInfo?: any;
+    };
+    acquisition?: {
+      directconnect?: {
+        downloads?: any[];
+      };
+      torrent?: any[];
+    };
+    createdAt: string;
+    updatedAt: string;
+  };
+  userSettings?: any;
+}
 /**
  * Component for displaying the metadata for a comic in greater detail.
  *
@@ -68,7 +94,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
 
   // const dispatch = useDispatch();
 
-  const openModal = useCallback((filePath) => {
+  const openModal = useCallback((filePath: string) => {
     setIsOpen(true);
     // dispatch(
     //   extractComicArchive(filePath, {
@@ -85,7 +111,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
   const StyledSlidingPanel = styled(SlidingPane)`
     background: #ccc;
   `;
-  const afterOpenModal = useCallback((things) => {
+  const afterOpenModal = useCallback((things: any) => {
     // references are now sync'd and can be accessed.
     // subtitle.style.color = "#f00";
     console.log("kolaveri", things);
@@ -96,9 +122,9 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
   }, []);
 
   // sliding panel init
-  const contentForSlidingPanel = {
+  const contentForSlidingPanel: Record<string, { content: (props?: any) => JSX.Element }> = {
     CVMatches: {
-      content: (props) => (
+      content: (props?: any) => (
         <>
           <div>
             <ComicVineSearchForm data={rawFileDetails} />
@@ -106,7 +132,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
 
           <div className="border-slate-500 border rounded-lg p-2 mt-3">
             <p className="">Searching for:</p>
-            {inferredMetadata.issue ? (
+            {inferredMetadata?.issue ? (
               <>
                 <span className="">{inferredMetadata.issue.name} </span>
                 <span className=""> # {inferredMetadata.issue.number} </span>
@@ -131,9 +157,9 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
   // Actions
 
   const fetchComicVineMatches = async (
-    searchPayload,
+    searchPayload: any,
-    issueSearchQuery,
+    issueSearchQuery: any,
-    seriesSearchQuery,
+    seriesSearchQuery: any,
   ) => {
     try {
       const response = await axios({
@@ -153,7 +179,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
           },
           rawFileDetails: searchPayload,
         },
-        transformResponse: (r) => {
+        transformResponse: (r: string) => {
           const matches = JSON.parse(r);
           return matches;
           // return sortBy(matches, (match) => -match.score);
@@ -163,9 +189,9 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
       if (!isNil(response.data.results) && response.data.results.length === 1) {
         matches = response.data.results;
       } else {
-        matches = response.data.map((match) => match);
+        matches = response.data.map((match: any) => match);
       }
-      const scoredMatches = matches.sort((a, b) => b.score - a.score);
+      const scoredMatches = matches.sort((a: any, b: any) => b.score - a.score);
       setComicVineMatches(scoredMatches);
     } catch (err) {
       console.log(err);
@@ -174,13 +200,13 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
 
   // Action event handlers
   const openDrawerWithCVMatches = () => {
-    let seriesSearchQuery: IComicVineSearchQuery = {} as IComicVineSearchQuery;
+    let seriesSearchQuery: any = {};
-    let issueSearchQuery: IComicVineSearchQuery = {} as IComicVineSearchQuery;
+    let issueSearchQuery: any = {};
 
     if (!isUndefined(rawFileDetails)) {
-      issueSearchQuery = refineQuery(rawFileDetails.name);
+      issueSearchQuery = refineQuery((rawFileDetails as any).name);
     } else if (!isEmpty(comicvine)) {
-      issueSearchQuery = refineQuery(comicvine.name);
+      issueSearchQuery = refineQuery((comicvine as any).name);
     }
     fetchComicVineMatches(rawFileDetails, issueSearchQuery, seriesSearchQuery);
     setSlidingPanelContentId("CVMatches");
@@ -194,30 +220,30 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
 
   //  Actions menu options and handler
   const CVMatchLabel = (
-    <span className="inline-flex flex-row items-center gap-2">
+    <span className="inline-flex flex-row items-center gap-1.5">
-      <div className="w-6 h-6">
+      <div className="w-4 h-4">
-        <i className="icon-[solar--magic-stick-3-bold-duotone] w-6 h-6"></i>
+        <i className="icon-[solar--magic-stick-3-bold-duotone] w-4 h-4"></i>
       </div>
-      <div>Match on ComicVine</div>
+      <div className="text-sm">Match on ComicVine</div>
     </span>
   );
   const editLabel = (
-    <span className="inline-flex flex-row items-center gap-2">
+    <span className="inline-flex flex-row items-center gap-1.5">
-      <div className="w-6 h-6">
+      <div className="w-4 h-4">
-        <i className="icon-[solar--pen-2-bold-duotone] w-6 h-6"></i>
+        <i className="icon-[solar--pen-2-bold-duotone] w-4 h-4"></i>
       </div>
-      <div>Edit Metadata</div>
+      <div className="text-sm">Edit Metadata</div>
     </span>
   );
   const deleteLabel = (
-    <span className="inline-flex flex-row items-center gap-2">
+    <span className="inline-flex flex-row items-center gap-1.5">
-      <div className="w-6 h-6">
+      <div className="w-4 h-4">
-        <i className="icon-[solar--trash-bin-trash-bold-duotone] w-6 h-6"></i>
+        <i className="icon-[solar--trash-bin-trash-bold-duotone] w-4 h-4"></i>
       </div>
-      <div>Delete Comic</div>
+      <div className="text-sm">Delete Comic</div>
     </span>
   );
-  const Placeholder = (props) => {
+  const Placeholder = (props: any) => {
     return <components.Placeholder {...props} />;
   };
   const actionOptions = [
@@ -232,7 +258,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
     }
     return item;
   });
-  const handleActionSelection = (action) => {
+  const handleActionSelection = (action: any) => {
     switch (action.value) {
       case "match-on-comic-vine":
         openDrawerWithCVMatches();
@@ -246,23 +272,23 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
     }
   };
   const customStyles = {
-    menu: (base) => ({
+    menu: (base: any) => ({
       ...base,
       backgroundColor: "rgb(156, 163, 175)",
     }),
-    placeholder: (base) => ({
+    placeholder: (base: any) => ({
       ...base,
       color: "black",
     }),
-    option: (base, { data, isDisabled, isFocused, isSelected }) => ({
+    option: (base: any, { data, isDisabled, isFocused, isSelected }: any) => ({
       ...base,
       backgroundColor: isFocused ? "gray" : "rgb(156, 163, 175)",
     }),
-    singleValue: (base) => ({
+    singleValue: (base: any) => ({
       ...base,
       paddingTop: "0.4rem",
     }),
-    control: (base) => ({
+    control: (base: any) => ({
       ...base,
       backgroundColor: "rgb(156, 163, 175)",
       color: "black",
@@ -272,7 +298,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
 
   // check for the availability of CV metadata
   const isComicBookMetadataAvailable =
-    !isUndefined(comicvine) && !isUndefined(comicvine.volumeInformation);
+    !isUndefined(comicvine) && !isUndefined((comicvine as any)?.volumeInformation);
 
   // check for the availability of rawFileDetails
   const areRawFileDetailsAvailable =
@@ -337,7 +363,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
           query={airDCPPQuery}
           comicObjectId={_id}
           comicObject={data.data}
-          userSettings={userSettings}
+          settings={userSettings}
           key={4}
         />
       ),
@@ -359,8 +385,8 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
       name: "Downloads",
       icon: (
         <>
-          {acquisition?.directconnect?.downloads?.length +
+          {(acquisition?.directconnect?.downloads?.length || 0) +
-            acquisition?.torrent.length}
+            (acquisition?.torrent?.length || 0)}
         </>
       ),
       content:
@@ -397,11 +423,12 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
                   imageUrl={url}
                   orientation={"cover-only"}
                   hasDetails={false}
+                  cardContainerStyle={{ maxWidth: "290px", width: "100%" }}
                 />
 
                 {/* raw file details */}
                 {!isUndefined(rawFileDetails) &&
-                  !isEmpty(rawFileDetails.cover) && (
+                  !isEmpty((rawFileDetails as any)?.cover) && (
                     <div className="grid">
                       <RawFileDetails
                         data={{
@@ -451,7 +478,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
 
             <TabControls
               filteredTabs={filteredTabs}
-              downloadCount={acquisition?.directconnect?.downloads?.length}
+              downloadCount={acquisition?.directconnect?.downloads?.length || 0}
             />
 
             <StyledSlidingPanel

src/client/components/ComicDetail/ComicVineDetails.tsx

@@ -1,12 +1,21 @@
 import React, { ReactElement } from "react";
-import PropTypes from "prop-types";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
 import dayjs from "dayjs";
 import { isEmpty, isUndefined } from "lodash";
 import Card from "../shared/Carda";
 import { convert } from "html-to-text";
 
-export const ComicVineDetails = (props): ReactElement => {
+interface ComicVineDetailsProps {
+  updatedAt?: string;
+  data?: {
+    name?: string;
+    number?: string;
+    resource_type?: string;
+    id?: number;
+  };
+}
+
+export const ComicVineDetails = (props: ComicVineDetailsProps): ReactElement => {
   const { data, updatedAt } = props;
   return (
     <div className="text-slate-500 dark:text-gray-400">
@@ -107,13 +116,3 @@ export const ComicVineDetails = (props): ReactElement => {
 };
 
 export default ComicVineDetails;
-
-ComicVineDetails.propTypes = {
-  updatedAt: PropTypes.string,
-  data: PropTypes.shape({
-    name: PropTypes.string,
-    number: PropTypes.string,
-    resource_type: PropTypes.string,
-    id: PropTypes.number,
-  }),
-};

src/client/components/ComicDetail/DownloadProgressTick.tsx

@@ -1,32 +1,129 @@
 import prettyBytes from "pretty-bytes";
-import React, { ReactElement } from "react";
+import React, { ReactElement, useEffect, useRef, useState } from "react";
+import { useStore } from "../../store";
+import type { Socket } from "socket.io-client";
+
+/**
+ * @typedef {Object} DownloadProgressTickProps
+ * @property {string} bundleId    - The bundle ID to filter ticks by (as string)
+ */
+interface DownloadProgressTickProps {
+  bundleId: string;
+}
+
+/**
+ * Shape of the download tick data received over the socket.
+ *
+ * @typedef DownloadTickData
+ * @property {number} id                 - Unique download ID
+ * @property {string} name               - File name (e.g. "movie.mkv")
+ * @property {number} downloaded_bytes   - Bytes downloaded so far
+ * @property {number} size               - Total size in bytes
+ * @property {number} speed              - Current download speed (bytes/sec)
+ * @property {number} seconds_left       - Estimated seconds remaining
+ * @property {{ id: string; str: string; completed: boolean; downloaded: boolean; failed: boolean; hook_error: any }} status
+ *                                           - Status object (e.g. `{ id: "queued", str: "Running (15.1%)", ... }`)
+ * @property {{ online: number; total: number; str: string }} sources
+ *                                           - Peer count (e.g. `{ online: 1, total: 1, str: "1/1 online" }`)
+ * @property {string} target             - Download destination (e.g. "/Downloads/movie.mkv")
+ */
+interface DownloadTickData {
+  id: number;
+  name: string;
+  downloaded_bytes: number;
+  size: number;
+  speed: number;
+  seconds_left: number;
+  status: {
+    id: string;
+    str: string;
+    completed: boolean;
+    downloaded: boolean;
+    failed: boolean;
+    hook_error: any;
+  };
+  sources: {
+    online: number;
+    total: number;
+    str: string;
+  };
+  target: string;
+}
+
+export const DownloadProgressTick: React.FC<DownloadProgressTickProps> = ({
+  bundleId,
+}): ReactElement | null => {
+  const socketRef = useRef<Socket>();
+  const [tick, setTick] = useState<DownloadTickData | null>(null);
+  useEffect(() => {
+    const socket = useStore.getState().getSocket("manual");
+    socketRef.current = socket;
+
+    socket.emit("call", "socket.listenFileProgress", {
+      namespace: "/manual",
+      config: {
+        protocol: `ws`,
+        hostname: `192.168.1.119:5600`,
+        username: `admin`,
+        password: `password`,
+      },
+    });
+
+    /**
+     * Handler for each "downloadTick" event.
+     * Only update state if event.id matches bundleId.
+     *
+     * @param {DownloadTickData} data - Payload from the server
+     */
+    const onDownloadTick = (data: DownloadTickData) => {
+      // Compare numeric data.id to string bundleId
+      console.log(data.id);
+      console.log(`bundleId is ${bundleId}`)
+      if (data.id === parseInt(bundleId, 10)) {
+        setTick(data);
+      }
+    };
+
+    socket.on("downloadTick", onDownloadTick);
+    return () => {
+      socket.off("downloadTick", onDownloadTick);
+    };
+  }, [socketRef, bundleId]);
+
+  if (!tick) {
+    return <>Nothing detected.</>;
+  }
+
+  // Compute human-readable values and percentages
+  const downloaded = prettyBytes(tick.downloaded_bytes);
+  const total = prettyBytes(tick.size);
+  const percent = tick.size > 0
+    ? Math.round((tick.downloaded_bytes / tick.size) * 100)
+    : 0;
+  const speed = prettyBytes(tick.speed) + "/s";
+  const minutesLeft = Math.round(tick.seconds_left / 60);
 
-export const DownloadProgressTick = (props): ReactElement => {
   return (
-    <div>
+    <div className="mt-2 p-2 border rounded-md bg-white shadow-sm">
-      <h4 className="is-size-5">{props.data.name}</h4>
+      {/* Downloaded vs Total */}
-      <div>
+      <div className="mt-1 flex items-center space-x-2">
-        <span className="is-size-4 has-text-weight-semibold">
+        <span className="text-sm text-gray-700">{downloaded} of {total}</span>
-          {prettyBytes(props.data.downloaded_bytes)} of{" "}
-          {prettyBytes(props.data.size)}{" "}
-        </span>
-        <progress
-          className="progress is-small is-success"
-          value={props.data.downloaded_bytes}
-          max={props.data.size}
-        >
-          {(parseInt(props.data.downloaded_bytes) / parseInt(props.data.size)) *
-            100}
-          %
-        </progress>
-      </div>
-      <div className="is-size-6 mt-1 mb-2">
-        <p>{prettyBytes(props.data.speed)} per second.</p>
-        Time left:
-        {Math.round(parseInt(props.data.seconds_left) / 60)}
       </div>
 
-      <div>{props.data.target}</div>
+      {/* Progress bar */}
+      <div className="relative mt-2 h-2 bg-gray-200 rounded overflow-hidden">
+        <div
+          className="absolute inset-y-0 left-0 bg-green-500"
+          style={{ width: `${percent}%` }}
+        />
+      </div>
+      <div className="mt-1 text-xs text-gray-600">{percent}% complete</div>
+
+      {/* Speed and Time Left */}
+      <div className="mt-2 flex space-x-4 text-xs text-gray-600">
+        <span>Speed: {speed}</span>
+        <span>Time left: {minutesLeft} min</span>
+      </div>
     </div>
   );
 };

src/client/components/ComicDetail/DownloadsPanel.tsx

@@ -1,6 +1,5 @@
-import React, { useEffect, useContext, ReactElement, useState } from "react";
+import React, { useEffect, ReactElement, useState, useMemo } from "react";
-import { RootState } from "threetwo-ui-typings";
+import { isEmpty, isNil, isUndefined, map } from "lodash";
-import { isEmpty, map } from "lodash";
 import { AirDCPPBundles } from "./AirDCPPBundles";
 import { TorrentDownloads } from "./TorrentDownloads";
 import { useQuery } from "@tanstack/react-query";
@@ -14,134 +13,142 @@ import { useStore } from "../../store";
 import { useShallow } from "zustand/react/shallow";
 import { useParams } from "react-router-dom";
 
-interface IDownloadsPanelProps {
+export interface TorrentDetails {
-  key: number;
+  infoHash: string;
+  progress: number;
+  downloadSpeed?: number;
+  uploadSpeed?: number;
 }
 
-export const DownloadsPanel = (
+/**
-  props: IDownloadsPanelProps,
+ * DownloadsPanel displays two tabs of download information for a specific comic:
-): ReactElement | null => {
+ * - DC++ (AirDCPP) bundles
+ * - Torrent downloads
+ * It also listens for real-time torrent updates via a WebSocket.
+ *
+ * @component
+ * @returns {ReactElement | null} The rendered DownloadsPanel or null if no socket is available.
+ */
+export const DownloadsPanel = (): ReactElement | null => {
   const { comicObjectId } = useParams<{ comicObjectId: string }>();
-  const [bundles, setBundles] = useState([]);
   const [infoHashes, setInfoHashes] = useState<string[]>([]);
-  const [torrentDetails, setTorrentDetails] = useState([]);
+  const [torrentDetails, setTorrentDetails] = useState<TorrentDetails[]>([]);
-  const [activeTab, setActiveTab] = useState("torrents");
+  const [activeTab, setActiveTab] = useState<"directconnect" | "torrents">(
-  const { airDCPPSocketInstance, socketIOInstance } = useStore(
+    "directconnect",
-    useShallow((state: any) => ({
-      airDCPPSocketInstance: state.airDCPPSocketInstance,
-      socketIOInstance: state.socketIOInstance,
-    })),
   );
 
-  // React to torrent progress data sent over websockets
+  const { socketIOInstance } = useStore(
-  socketIOInstance.on("AS_TORRENT_DATA", (data) => {
+    useShallow((state: any) => ({ socketIOInstance: state.socketIOInstance })),
-    const torrents = data.torrents
+  );
-      .flatMap(({ _id, details }) => {
+
-        if (_id === comicObjectId) {
+  /**
-          return details;
+   * Registers socket listeners on mount and cleans up on unmount.
+   */
+  useEffect(() => {
+    if (!socketIOInstance) return;
+
+    /**
+     * Handler for incoming torrent data events.
+     * Merges new entries or updates existing ones by infoHash.
+     *
+     * @param {TorrentDetails} data - Payload from the socket event.
+     */
+    const handleTorrentData = (data: TorrentDetails) => {
+      setTorrentDetails((prev) => {
+        const idx = prev.findIndex((t) => t.infoHash === data.infoHash);
+        if (idx === -1) {
+          return [...prev, data];
         }
-      })
+        const next = [...prev];
-      .filter((item) => item !== undefined);
+        next[idx] = { ...next[idx], ...data };
-    setTorrentDetails(torrents);
+        return next;
-  });
+      });
-  // Fetch the downloaded files and currently-downloading file(s) from AirDC++
+    };
-  const { data: comicObject, isSuccess } = useQuery({
+
-    queryKey: ["bundles"],
+    socketIOInstance.on("AS_TORRENT_DATA", handleTorrentData);
+
+    return () => {
+      socketIOInstance.off("AS_TORRENT_DATA", handleTorrentData);
+    };
+  }, [socketIOInstance]);
+
+  // ————— DC++ Bundles (via REST) —————
+  const { data: bundles } = useQuery({
+    queryKey: ["bundles", comicObjectId],
     queryFn: async () =>
       await axios({
-        url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookById`,
+        url: `${LIBRARY_SERVICE_BASE_URI}/getBundles`,
         method: "POST",
-        headers: {
-          "Content-Type": "application/json; charset=utf-8",
-        },
         data: {
-          id: `${comicObjectId}`,
+          comicObjectId,
-        },
+          config: {
-      }),
+            protocol: `ws`,
-  });
+            hostname: `192.168.1.119:5600`,
-
+            username: `admin`,
-  const getBundles = async (comicObject) => {
+            password: `password`,
-    if (comicObject?.data.acquisition.directconnect) {
-      const filteredBundles =
-        comicObject.data.acquisition.directconnect.downloads.map(
-          async ({ bundleId }) => {
-            return await airDCPPSocketInstance.get(`queue/bundles/${bundleId}`);
           },
-        );
-      return await Promise.all(filteredBundles);
-    }
-  };
-
-  // Call the scheduled job for fetching torrent data
-  // triggered by the active tab been set to "torrents"
-  const { data: torrentData } = useQuery({
-    queryFn: () =>
-      axios({
-        url: `${TORRENT_JOB_SERVICE_BASE_URI}/getTorrentData`,
-        method: "GET",
-        params: {
-          trigger: activeTab,
         },
       }),
-    queryKey: [activeTab],
   });
 
+  // ————— Torrent Jobs (via REST) —————
+  const { data: rawJobs = [] } = useQuery<any[]>({
+    queryKey: ["torrents", comicObjectId],
+    queryFn: async () => {
+      const { data } = await axios.get(
+        `${TORRENT_JOB_SERVICE_BASE_URI}/getTorrentData`,
+        { params: { trigger: activeTab } },
+      );
+      return Array.isArray(data) ? data : [];
+    },
+    initialData: [],
+    enabled: activeTab === "torrents",
+  });
+
+  // Only when rawJobs changes *and* activeTab === "torrents" should we update infoHashes:
   useEffect(() => {
-    getBundles(comicObject).then((result) => {
+    if (activeTab !== "torrents") return;
-      setBundles(result);
+    setInfoHashes(rawJobs.map((j: any) => j.infoHash));
-    });
+  }, [activeTab]);
-  }, [comicObject]);
 
   return (
-    <div className="columns is-multiline">
+    <>
-      {!isEmpty(airDCPPSocketInstance) &&
+      <div className="mt-5 mb-3">
-        !isEmpty(bundles) &&
+        <nav className="flex space-x-2">
-        activeTab === "directconnect" && <AirDCPPBundles data={bundles} />}
+          <button
+            onClick={() => setActiveTab("directconnect")}
+            className={`px-4 py-1 rounded-full text-sm font-medium transition-colors ${
+              activeTab === "directconnect"
+                ? "bg-green-500 text-white"
+                : "bg-gray-200 text-gray-700 hover:bg-gray-300"
+            }`}
+          >
+            DC++
+          </button>
+          <button
+            onClick={() => setActiveTab("torrents")}
+            className={`px-4 py-1 rounded-full text-sm font-medium transition-colors ${
+              activeTab === "torrents"
+                ? "bg-blue-500 text-white"
+                : "bg-gray-200 text-gray-700 hover:bg-gray-300"
+            }`}
+          >
+            Torrents
+          </button>
+        </nav>
 
-      <div>
+        <div className="mt-4">
-        <div className="sm:hidden">
+          {activeTab === "torrents" ? (
-          <label htmlFor="Download Type" className="sr-only">
+            <TorrentDownloads data={torrentDetails} />
-            Download Type
+          ) : !isNil(bundles?.data) && bundles.data.length > 0 ? (
-          </label>
+            <AirDCPPBundles data={bundles.data} />
-
+          ) : (
-          <select id="Tab" className="w-full rounded-md border-gray-200">
+            <p>No DC++ bundles found.</p>
-            <option>DC++ Downloads</option>
+          )}
-            <option>Torrents</option>
-          </select>
-        </div>
-
-        <div className="hidden sm:block">
-          <nav className="flex gap-6" aria-label="Tabs">
-            <a
-              href="#"
-              className={`shrink-0 rounded-lg p-2 text-sm font-medium hover:bg-gray-50 hover:text-gray-700 ${
-                activeTab === "directconnect"
-                  ? "bg-slate-200 dark:text-slate-200 dark:bg-slate-400 text-slate-800"
-                  : "dark:text-slate-400 text-slate-800"
-              }`}
-              aria-current="page"
-              onClick={() => setActiveTab("directconnect")}
-            >
-              DC++ Downloads
-            </a>
-
-            <a
-              href="#"
-              className={`shrink-0 rounded-lg p-2 text-sm font-medium hover:bg-gray-50 hover:text-gray-700 ${
-                activeTab === "torrents"
-                  ? "bg-slate-200 text-slate-800"
-                  : "dark:text-slate-400 text-slate-800"
-              }`}
-              onClick={() => setActiveTab("torrents")}
-            >
-              Torrents
-            </a>
-          </nav>
         </div>
       </div>
-
+    </>
-      {activeTab === "torrents" && <TorrentDownloads data={torrentDetails} />}
-    </div>
   );
 };
+
 export default DownloadsPanel;

src/client/components/ComicDetail/RawFileDetails.tsx

@@ -1,127 +1,157 @@
 import React, { ReactElement } from "react";
-import PropTypes from "prop-types";
 import prettyBytes from "pretty-bytes";
 import { isEmpty } from "lodash";
 import { format, parseISO } from "date-fns";
 
-export const RawFileDetails = (props): ReactElement => {
+interface RawFileDetailsProps {
+  data?: {
+    rawFileDetails?: {
+      containedIn?: string;
+      name?: string;
+      fileSize?: number;
+      path?: string;
+      extension?: string;
+      mimeType?: string;
+      cover?: {
+        filePath?: string;
+      };
+    };
+    inferredMetadata?: {
+      issue?: {
+        year?: string;
+        name?: string;
+        number?: number;
+        subtitle?: string;
+      };
+    };
+    created_at?: string;
+    updated_at?: string;
+  };
+  children?: any;
+}
+
+export const RawFileDetails = (props: RawFileDetailsProps): ReactElement | null => {
   const { rawFileDetails, inferredMetadata, created_at, updated_at } =
-    props.data;
+    props.data || {};
+  if (!rawFileDetails) return null;
+
   return (
     <>
       <div className="max-w-2xl ml-5">
-        <div className="px-4 sm:px-6">
+        {/* Title */}
+        <div className="px-4 sm:px-6 mb-6">
           <p className="text-gray-500 dark:text-gray-400">
-            <span className="text-xl">{rawFileDetails.name}</span>
+            <span className="text-xl font-semibold">{rawFileDetails?.name}</span>
           </p>
         </div>
-        <div className="px-4 py-5 sm:px-6">
+
-          <dl className="grid grid-cols-1 gap-x-4 gap-y-4 sm:grid-cols-2">
+        {/* File Binary Details Section */}
-            <div className="sm:col-span-1">
+        <div className="mb-8 px-4 pb-8 border-b border-gray-200 dark:border-gray-700">
-              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
+          <div className="mb-4">
-                Raw File Details
+            <h3 className="text-sm font-medium text-gray-600 dark:text-gray-300 uppercase tracking-wide flex items-center gap-1">
-              </dt>
+              <i className="icon-[solar--document-bold-duotone] w-5 h-5"></i>
-              <dd className="mt-1 text-sm text-gray-900 dark:text-gray-400">
+              File Binary Details
-                {rawFileDetails.containedIn +
+            </h3>
-                  "/" +
+          </div>
-                  rawFileDetails.name +
+          <div className="pl-6">
-                  rawFileDetails.extension}
+            <dl className="space-y-4">
-              </dd>
+              <div>
-            </div>
+                <dt className="text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wide mb-1">
-            <div className="sm:col-span-1">
+                  File Path
-              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
+                </dt>
-                Inferred Issue Metadata
+                <dd className="text-sm text-gray-900 dark:text-gray-300 font-mono break-all">
-              </dt>
+                  {rawFileDetails?.containedIn}/{rawFileDetails?.name}{rawFileDetails?.extension}
-              <dd className="mt-1 text-sm text-gray-900 dark:text-gray-400">
+                </dd>
-                Series Name: {inferredMetadata.issue.name}
+              </div>
-                {!isEmpty(inferredMetadata.issue.number) ? (
+              
-                  <span className="tag is-primary is-light">
+              <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
-                    {inferredMetadata.issue.number}
+                <div>
-                  </span>
+                  <dt className="text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wide mb-1">
-                ) : null}
+                    MIME Type
-              </dd>
+                  </dt>
-            </div>
+                  <dd className="text-sm text-gray-700 dark:text-gray-300 flex items-center gap-1">
-            <div className="sm:col-span-1">
-              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
-                MIMEType
-              </dt>
-              <dd className="mt-1 text-sm text-gray-500 dark:text-slate-900">
-                {/* File extension */}
-                <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                  <span className="pt-1">
                     <i className="icon-[solar--zip-file-bold-duotone] w-5 h-5"></i>
-                  </span>
+                    {rawFileDetails?.mimeType}
-
+                  </dd>
-                  <span className="text-md text-slate-500 dark:text-slate-900">
+                </div>
-                    {rawFileDetails.mimeType}
+                
-                  </span>
+                <div>
-                </span>
+                  <dt className="text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wide mb-1">
-              </dd>
+                    File Size
-            </div>
+                  </dt>
-            <div className="sm:col-span-1">
+                  <dd className="text-sm text-gray-700 dark:text-gray-300 flex items-center gap-1">
-              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
-                File Size
-              </dt>
-              <dd className="mt-1 text-sm text-gray-500 dark:text-slate-900">
-                {/* size */}
-                <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                  <span className="pr-1 pt-1">
                     <i className="icon-[solar--mirror-right-bold-duotone] w-5 h-5"></i>
-                  </span>
+                    {rawFileDetails?.fileSize ? prettyBytes(rawFileDetails.fileSize) : 'N/A'}
-
+                  </dd>
-                  <span className="text-md text-slate-500 dark:text-slate-900">
+                </div>
-                    {prettyBytes(rawFileDetails.fileSize)}
+              </div>
-                  </span>
+            </dl>
-                </span>
+          </div>
-              </dd>
-            </div>
-            <div className="sm:col-span-2">
-              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
-                Import Details
-              </dt>
-              <dd className="mt-1 text-sm text-gray-900 dark:text-gray-400">
-                {format(parseISO(created_at), "dd MMMM, yyyy")},{" "}
-                {format(parseISO(created_at), "h aaaa")}
-              </dd>
-            </div>
-            <div className="sm:col-span-2">
-              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
-                Actions
-              </dt>
-              <dd className="mt-1 text-sm text-gray-900">{props.children}</dd>
-            </div>
-          </dl>
         </div>
+
+        {/* Import Details Section */}
+        <div className="mb-8 px-4">
+          <div className="mb-4">
+            <h3 className="text-sm font-medium text-gray-600 dark:text-gray-300 uppercase tracking-wide flex items-center gap-1">
+              <i className="icon-[solar--import-bold-duotone] w-5 h-5"></i>
+              Import Details
+            </h3>
+          </div>
+          <div className="pl-6">
+            <dl className="space-y-4">
+              <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+                <div>
+                  <dt className="text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wide mb-1">
+                    Imported On
+                  </dt>
+                  <dd className="text-sm text-gray-700 dark:text-gray-300">
+                    {created_at ? format(parseISO(created_at), "dd MMMM, yyyy 'at' h:mm aaaa") : 'N/A'}
+                  </dd>
+                </div>
+                
+                <div>
+                  <dt className="text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wide mb-1">
+                    Last Updated
+                  </dt>
+                  <dd className="text-sm text-gray-700 dark:text-gray-300">
+                    {updated_at ? format(parseISO(updated_at), "dd MMMM, yyyy 'at' h:mm aaaa") : 'N/A'}
+                  </dd>
+                </div>
+              </div>
+
+              {inferredMetadata?.issue && (
+                <div>
+                  <dt className="text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wide mb-1">
+                    Inferred Metadata
+                  </dt>
+                  <dd className="text-sm text-gray-700 dark:text-gray-300">
+                    <span className="font-medium">{inferredMetadata.issue.name}</span>
+                    {!isEmpty(inferredMetadata.issue.number) && (
+                      <span className="ml-2 text-xs text-gray-500 dark:text-gray-400">
+                        #{inferredMetadata.issue.number}
+                      </span>
+                    )}
+                  </dd>
+                </div>
+              )}
+            </dl>
+          </div>
+        </div>
+
+        {/* Actions Section */}
+        {props.children && (
+          <div className="px-4">
+            <div className="mb-3">
+              <h4 className="text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wide">
+                Actions
+              </h4>
+            </div>
+            <div>{props.children}</div>
+          </div>
+        )}
       </div>
     </>
   );
 };
 
 export default RawFileDetails;
-
-RawFileDetails.propTypes = {
-  data: PropTypes.shape({
-    rawFileDetails: PropTypes.shape({
-      containedIn: PropTypes.string,
-      name: PropTypes.string,
-      fileSize: PropTypes.number,
-      path: PropTypes.string,
-      extension: PropTypes.string,
-      mimeType: PropTypes.string,
-      cover: PropTypes.shape({
-        filePath: PropTypes.string,
-      }),
-    }),
-    inferredMetadata: PropTypes.shape({
-      issue: PropTypes.shape({
-        year: PropTypes.string,
-        name: PropTypes.string,
-        number: PropTypes.number,
-        subtitle: PropTypes.string,
-      }),
-    }),
-    created_at: PropTypes.string,
-    updated_at: PropTypes.string,
-  }),
-  children: PropTypes.any,
-};

src/client/components/ComicDetail/Tabs/ArchiveOperations.tsx

@@ -14,12 +14,16 @@ import { useStore } from "../../../store";
 import { useShallow } from "zustand/react/shallow";
 import { escapePoundSymbol } from "../../../shared/utils/formatting.utils";
 
-export const ArchiveOperations = (props): ReactElement => {
+interface ArchiveOperationsProps {
+  data: any;
+}
+
+export const ArchiveOperations = (props: ArchiveOperationsProps): ReactElement => {
   const { data } = props;
 
-  const { socketIOInstance } = useStore(
+  const { getSocket } = useStore(
     useShallow((state) => ({
-      socketIOInstance: state.socketIOInstance,
+      getSocket: state.getSocket,
     })),
   );
   const queryClient = useQueryClient();
@@ -27,21 +31,32 @@ export const ArchiveOperations = (props): ReactElement => {
   const [visible, setVisible] = useState(false);
   const [slidingPanelContentId, setSlidingPanelContentId] = useState("");
   // current image
-  const [currentImage, setCurrentImage] = useState([]);
+  const [currentImage, setCurrentImage] = useState<string>("");
-  const [uncompressedArchive, setUncompressedArchive] = useState([]);
+  const [uncompressedArchive, setUncompressedArchive] = useState<string[]>([]);
-  const [imageAnalysisResult, setImageAnalysisResult] = useState({});
+  const [imageAnalysisResult, setImageAnalysisResult] = useState<any>({});
   const [shouldRefetchComicBookData, setShouldRefetchComicBookData] =
     useState(false);
-  const constructImagePaths = (data): Array<string> => {
+  const constructImagePaths = (data: string[]): Array<string> => {
     return data?.map((path: string) =>
       escapePoundSymbol(encodeURI(`${LIBRARY_SERVICE_HOST}/${path}`)),
     );
   };
 
   // Listen to the uncompression complete event and orchestrate the final payload
-  socketIOInstance.on("LS_UNCOMPRESSION_JOB_COMPLETE", (data) => {
+  useEffect(() => {
-    setUncompressedArchive(constructImagePaths(data?.uncompressedArchive));
+    const socket = getSocket("/");
-  });
+    
+    const handleUncompressionComplete = (data: any) => {
+      setUncompressedArchive(constructImagePaths(data?.uncompressedArchive));
+    };
+
+    socket.on("LS_UNCOMPRESSION_JOB_COMPLETE", handleUncompressionComplete);
+
+    // Cleanup listener on unmount
+    return () => {
+      socket.off("LS_UNCOMPRESSION_JOB_COMPLETE", handleUncompressionComplete);
+    };
+  }, [getSocket]);
 
   useEffect(() => {
     let isMounted = true;
@@ -58,7 +73,7 @@ export const ArchiveOperations = (props): ReactElement => {
             },
             transformResponse: async (responseData) => {
               const parsedData = JSON.parse(responseData);
-              const paths = parsedData.map((pathObject) => {
+              const paths = parsedData.map((pathObject: any) => {
                 return `${pathObject.containedIn}/${pathObject.name}${pathObject.extension}`;
               });
               const uncompressedArchive = constructImagePaths(paths);
@@ -131,7 +146,7 @@ export const ArchiveOperations = (props): ReactElement => {
   }
 
   // sliding panel init
-  const contentForSlidingPanel = {
+  const contentForSlidingPanel: Record<string, { content: () => JSX.Element }> = {
     imageAnalysis: {
       content: () => {
         return (
@@ -143,7 +158,7 @@ export const ArchiveOperations = (props): ReactElement => {
               </pre>
             ) : null}
             <pre className="font-hasklig mt-3 text-sm">
-              {JSON.stringify(imageAnalysisResult.analyzedData, null, 2)}
+              {JSON.stringify(imageAnalysisResult?.analyzedData, null, 2)}
             </pre>
           </div>
         );
@@ -152,7 +167,7 @@ export const ArchiveOperations = (props): ReactElement => {
   };
 
   // sliding panel handlers
-  const openImageAnalysisPanel = useCallback((imageFilePath) => {
+  const openImageAnalysisPanel = useCallback((imageFilePath: string) => {
     setSlidingPanelContentId("imageAnalysis");
     analyzeImage(imageFilePath);
     setCurrentImage(imageFilePath);

src/client/components/ComicDetail/TorrentSearchPanel.tsx

@@ -23,15 +23,17 @@ export const TorrentSearchPanel = (props) => {
         url: `${PROWLARR_SERVICE_BASE_URI}/search`,
         method: "POST",
         data: {
-          port: "9696",
+          prowlarrQuery: {
-          apiKey: "c4f42e265fb044dc81f7e88bd41c3367",
+            port: "9696",
-          offset: 0,
+            apiKey: "38c2656e8f5d4790962037b8c4416a8f",
-          categories: [7030],
+            offset: 0,
-          query: searchTerm.issueName,
+            categories: [7030],
-          host: "localhost",
+            query: searchTerm.issueName,
-          limit: 100,
+            host: "localhost",
-          type: "search",
+            limit: 100,
-          indexerIds: [2],
+            type: "search",
+            indexerIds: [2],
+          },
         },
       });
     },

src/client/components/Dashboard/Dashboard.tsx

@@ -21,13 +21,15 @@ export const Dashboard = (): ReactElement => {
             limit: 5,
             sort: { updatedAt: "-1" },
           },
-          predicate: { "acquisition.source.wanted": false },
+          predicate: {
+            wanted: { $exists: false },
+          },
           comicStatus: "recent",
         },
       }),
     queryKey: ["recentComics"],
   });
-
+  // Wanted Comics
   const { data: wantedComics } = useQuery({
     queryFn: async () =>
       await axios({
@@ -39,7 +41,9 @@ export const Dashboard = (): ReactElement => {
             limit: 5,
             sort: { updatedAt: "-1" },
           },
-          predicate: { "acquisition.source.wanted": true },
+          predicate: {
+            wanted: { $exists: true, $ne: null },
+          },
         },
       }),
     queryKey: ["wantedComics"],

src/client/components/Dashboard/PullList.tsx

@@ -1,4 +1,4 @@
-import React, { ReactElement, useState } from "react";
+import React, { ReactElement, useState, useEffect } from "react";
 import { map } from "lodash";
 import Card from "../shared/Carda";
 import Header from "../shared/Header";
@@ -31,27 +31,38 @@ export const PullList = (): ReactElement => {
   // datepicker
   const date = new Date();
   const [inputValue, setInputValue] = useState<string>(
-    format(date, "M-dd-yyyy"),
+    format(date, "yyyy/M/dd"),
   );
 
+  // Responsive slides per view
+  const [slidesPerView, setSlidesPerView] = useState(1);
+
+
+
   // keen slider
-  const [sliderRef, instanceRef] = useKeenSlider(
+  const [sliderRef, instanceRef] = useKeenSlider({
-    {
+    loop: true,
-      loop: true,
+    mode: "free-snap",
-      slides: {
+    slides: {
-        origin: "auto",
+      perView: slidesPerView,
-        number: 15,
+      spacing: 15,
-        perView: 5,
-        spacing: 15,
-      },
-      slideChanged() {
-        console.log("slide changed");
-      },
     },
-    [
+    slideChanged() {
-      // add plugins here
+      console.log("slide changed");
-    ],
+    },
-  );
+  });
+
+  // Update slider when slidesPerView changes
+  useEffect(() => {
+    if (instanceRef.current) {
+      instanceRef.current.update({
+        slides: {
+          perView: slidesPerView,
+          spacing: 15,
+        },
+      });
+    }
+  }, [slidesPerView, instanceRef]);
 
   const {
     data: pullList,
@@ -80,79 +91,81 @@ export const PullList = (): ReactElement => {
   return (
     <>
       <div className="content">
-        <Header
+        <div className="mx-auto">
-          headerContent="Discover"
+          <Header
-          subHeaderContent={
+            headerContent="Discover"
-            <span className="text-md">
+            subHeaderContent={
-              Pull List aggregated for the week from{" "}
+              <span className="text-md">
-              <span className="underline">
+                Pull List aggregated for the week from{" "}
-                <a href="https://leagueofcomicgeeks.com/comics/new-comics">
+                <span className="underline">
-                  League Of Comic Geeks
+                  <a href="https://leagueofcomicgeeks.com">
-                </a>
+                    League Of Comic Geeks
-                <i className="icon-[solar--arrow-right-up-outline] w-4 h-4" />
+                  </a>
+                  <i className="icon-[solar--arrow-right-up-outline] w-4 h-4" />
+                </span>
               </span>
-            </span>
+            }
-          }
+            iconClassNames="fa-solid fa-binoculars mr-2"
-          iconClassNames="fa-solid fa-binoculars mr-2"
+            link="/pull-list/all/"
-          link="/pull-list/all/"
+          />
-        />
+          <div className="flex flex-row gap-5 mb-3">
-        <div className="flex flex-row gap-5 mb-3">
+            {/* select week */}
-          {/* select week */}
+            <div className="flex flex-row gap-4 my-3">
-          <div className="flex flex-row gap-4 my-3">
+              <Form
-            <Form
+                onSubmit={() => {}}
-              onSubmit={() => {}}
+                render={({ handleSubmit }) => (
-              render={({ handleSubmit }) => (
+                  <form>
-                <form>
+                    <div className="flex flex-col gap-2">
-                  <div className="flex flex-col gap-2">
+                      {/* week selection for pull list */}
-                    {/* week selection for pull list */}
+                      <DatePickerDialog
-                    <DatePickerDialog
+                        inputValue={inputValue}
-                      inputValue={inputValue}
+                        setter={setInputValue}
-                      setter={setInputValue}
+                      />
-                    />
+                      {inputValue && (
-                    {inputValue && (
+                        <div className="text-sm">
-                      <div className="text-sm">
+                          Showing pull list for{" "}
-                        Showing pull list for{" "}
+                          <span className="inline-flex mb-2 items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-1 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                        <span className="inline-flex mb-2 items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-1 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                            {inputValue}
-                          {inputValue}
+                          </span>
-                        </span>
+                        </div>
-                      </div>
+                      )}
-                    )}
+                    </div>
-                  </div>
+                  </form>
-                </form>
+                )}
-              )}
+              />
-            />
+            </div>
           </div>
         </div>
       </div>
 
       {isSuccess && !isLoading && (
-        <div ref={sliderRef} className="keen-slider flex flex-row">
+        <div ref={sliderRef} className="keen-slider">
           {map(pullList?.data.result, (issue, idx) => {
-            return (
+          return (
-              <div key={idx} className="keen-slider__slide">
+            <div key={idx} className="keen-slider__slide">
-                <Card
+              <Card
-                  orientation={"vertical-2"}
+                orientation={"vertical-2"}
-                  imageUrl={issue.cover}
+                imageUrl={issue.coverImageUrl}
-                  hasDetails
+                hasDetails
-                  title={ellipsize(issue.name, 25)}
+                title={ellipsize(issue.issueName, 25)}
-                >
+              >
-                  <div className="px-1">
+                <div className="px-1">
-                    <span className="inline-flex mb-2 items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-1 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                  <span className="inline-flex mb-2 items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-1 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                      {issue.publisher}
+                    {issue.publicationDate}
-                    </span>
+                  </span>
-                    <div className="flex flex-row justify-end">
+                  <div className="flex flex-row justify-end">
-                      <button
+                    <button
-                        className="flex space-x-1 mb-2 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-2 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                      className="flex space-x-1 mb-2 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-2 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
-                        onClick={() => addToLibrary("locg", issue)}
+                      onClick={() => addToLibrary("locg", issue)}
-                      >
+                    >
-                        <i className="icon-[solar--add-square-bold-duotone] w-5 h-5 mr-2"></i>{" "}
+                      <i className="icon-[solar--add-square-bold-duotone] w-5 h-5 mr-2"></i>{" "}
-                        Want
+                      Want
-                      </button>
+                    </button>
-                    </div>
                   </div>
-                </Card>
+                </div>
-              </div>
+              </Card>
-            );
+            </div>
+          );
           })}
         </div>
       )}

src/client/components/Dashboard/RecentlyImported.tsx

@@ -18,14 +18,16 @@ type RecentlyImportedProps = {
 export const RecentlyImported = (
   comics: RecentlyImportedProps,
 ): ReactElement => {
+  console.log(comics);
   return (
     <div>
-      <Header
+      <div className="mx-auto" style={{ maxWidth: '1400px' }}>
-        headerContent="Recently Imported"
+        <Header
-        subHeaderContent="Recent Library activity such as imports, tagging, etc."
+          headerContent="Recently Imported"
-        iconClassNames="fa-solid fa-binoculars mr-2"
+          subHeaderContent="Recent Library activity such as imports, tagging, etc."
-      />
+          iconClassNames="fa-solid fa-binoculars mr-2"
-      <div className="grid grid-cols-5 gap-6 mt-3">
+        />
+        <div className="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-5 xl:grid-cols-5 gap-6 mt-3">
         {comics?.comics.map(
           (
             {
@@ -33,9 +35,7 @@ export const RecentlyImported = (
               rawFileDetails,
               sourcedMetadata: { comicvine, comicInfo, locg },
               inferredMetadata,
-              acquisition: {
+              wanted: { source } = {},
-                source: { name },
-              },
             },
             idx,
           ) => {
@@ -45,11 +45,14 @@ export const RecentlyImported = (
               comicInfo,
               locg,
             });
-            const { issue, coverURL, icon } = determineExternalMetadata(name, {
+            const { issue, coverURL, icon } = determineExternalMetadata(
-              comicvine,
+              source,
-              comicInfo,
+              {
-              locg,
+                comicvine,
-            });
+                comicInfo,
+                locg,
+              },
+            );
             const isComicVineMetadataAvailable =
               !isUndefined(comicvine) &&
               !isUndefined(comicvine.volumeInformation);
@@ -123,6 +126,7 @@ export const RecentlyImported = (
             );
           },
         )}
+        </div>
       </div>
     </div>
   );

src/client/components/Dashboard/WantedComicsList.tsx

@@ -6,6 +6,7 @@ import { isEmpty, isNil, isUndefined, map } from "lodash";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
 import { determineCoverFile } from "../../shared/utils/metadata.utils";
 import Header from "../shared/Header";
+import useEmblaCarousel from "embla-carousel-react";
 
 type WantedComicsListProps = {
   comics: any;
@@ -16,91 +17,126 @@ export const WantedComicsList = ({
 }: WantedComicsListProps): ReactElement => {
   const navigate = useNavigate();
 
+  // embla carousel
+  const [emblaRef, emblaApi] = useEmblaCarousel({
+    loop: false,
+    align: "start",
+    containScroll: "trimSnaps",
+    slidesToScroll: 1,
+  });
+
   return (
-    <>
+    <div>
       <Header
         headerContent="Wanted Comics"
         subHeaderContent="Comics marked as wanted from various sources"
         iconClassNames="fa-solid fa-binoculars mr-2"
         link={"/wanted"}
       />
-      <div className="grid grid-cols-5 gap-6 mt-3">
+      <div className="overflow-hidden -mr-4 sm:-mr-8 lg:-mr-16 xl:-mr-20 2xl:-mr-24 mt-3">
-        {map(
+        <div className="overflow-hidden" ref={emblaRef}>
-          comics,
+          <div className="flex">
-          ({
+            {map(
-            _id,
+              comics,
-            rawFileDetails,
+              (
-            sourcedMetadata: { comicvine, comicInfo, locg },
+                {
-          }) => {
+                  _id,
-            const isComicBookMetadataAvailable =
+                  rawFileDetails,
-              !isUndefined(comicvine) &&
+                  sourcedMetadata: { comicvine, comicInfo, locg },
-              !isUndefined(comicvine.volumeInformation);
+                  wanted,
-            const consolidatedComicMetadata = {
+                },
-              rawFileDetails,
+                idx,
-              comicvine,
+              ) => {
-              comicInfo,
+                const isComicBookMetadataAvailable = !isUndefined(comicvine);
-              locg,
+                const consolidatedComicMetadata = {
-            };
+                  rawFileDetails,
+                  comicvine,
+                  comicInfo,
+                  locg,
+                };
 
-            const { issueName, url } = determineCoverFile(
+                const {
-              consolidatedComicMetadata,
+                  issueName,
-            );
+                  url,
-            const titleElement = (
+                  publisher = null,
-              <Link to={"/comic/details/" + _id}>
+                } = determineCoverFile(consolidatedComicMetadata);
-                {ellipsize(issueName, 20)}
+                const titleElement = (
-              </Link>
+                  <Link to={"/comic/details/" + _id}>
-            );
+                    {ellipsize(issueName, 20)}
-            return (
+                    <p>{publisher}</p>
-              <Card
+                  </Link>
-                key={_id}
+                );
-                orientation={"vertical-2"}
+                return (
-                imageUrl={url}
+                  <div
-                hasDetails
+                    key={idx}
-                title={issueName ? titleElement : <span>No Name</span>}
+                    className="flex-[0_0_200px] min-w-0 sm:flex-[0_0_220px] md:flex-[0_0_240px] lg:flex-[0_0_260px] xl:flex-[0_0_280px] pr-[15px]"
-              >
+                  >
-                <div className="pb-1">
+                    <Card
-                  {/* Issue type */}
+                      orientation={"vertical-2"}
-                  {isComicBookMetadataAvailable &&
+                      imageUrl={url}
-                  !isNil(
+                      hasDetails
-                    detectIssueTypes(comicvine.volumeInformation.description),
+                      title={issueName ? titleElement : <span>No Name</span>}
-                  ) ? (
+                    >
-                    <div className="my-2">
+                      <div className="pb-1">
-                      <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                        <div className="flex flex-row gap-2">
-                        <span className="pr-1 pt-1">
+                          {/* Issue type */}
-                          <i className="icon-[solar--book-2-line-duotone] w-5 h-5"></i>
+                          {isComicBookMetadataAvailable &&
-                        </span>
+                          !isNil(detectIssueTypes(comicvine.description)) ? (
+                            <div className="my-2">
+                              <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                                <span className="pr-1 pt-1">
+                                  <i className="icon-[solar--book-2-line-duotone] w-5 h-5"></i>
+                                </span>
 
-                        <span className="text-md text-slate-500 dark:text-slate-900">
+                                <span className="text-md text-slate-500 dark:text-slate-900">
-                          {
+                                  {
-                            detectIssueTypes(
+                                    detectIssueTypes(comicvine.description)
-                              comicvine.volumeInformation.description,
+                                      .displayName
-                            ).displayName
+                                  }
-                          }
+                                </span>
-                        </span>
+                              </span>
-                      </span>
+                            </div>
-                    </div>
+                          ) : null}
-                  ) : null}
+                          {/* issues marked as wanted, part of this volume */}
+                          {wanted?.markEntireVolumeWanted ? (
+                            <div className="text-sm">sagla volume pahije</div>
+                          ) : (
+                            <div className="my-2">
+                              <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                                <span className="pr-1 pt-1">
+                                  <i className="icon-[solar--documents-bold-duotone] w-5 h-5"></i>
+                                </span>
 
-                  {/* comicVine metadata presence */}
+                                <span className="text-md text-slate-500 dark:text-slate-900">
-                  {isComicBookMetadataAvailable && (
+                                  {wanted.issues.length}
-                    <img
+                                </span>
-                      src="/src/client/assets/img/cvlogo.svg"
+                              </span>
-                      alt={"ComicVine metadata detected."}
+                            </div>
-                      className="w-7 h-7"
+                          )}
-                    />
+                        </div>
-                  )}
+                        {/* comicVine metadata presence */}
-                  {!isEmpty(locg) && (
+                        {isComicBookMetadataAvailable && (
-                    <img
+                          <img
-                      src="/src/client/assets/img/locglogo.svg"
+                            src="/src/client/assets/img/cvlogo.svg"
-                      className="w-7 h-7"
+                            alt={"ComicVine metadata detected."}
-                    />
+                            className="inline-block w-6 h-6 md:w-7 md:h-7 flex-shrink-0 object-contain"
-                  )}
+                          />
-                </div>
+                        )}
-              </Card>
+                        {!isEmpty(locg) && (
-            );
+                          <img
-          },
+                            src="/src/client/assets/img/locglogo.svg"
-        )}
+                            className="w-7 h-7"
+                          />
+                        )}
+                      </div>
+                    </Card>
+                  </div>
+                );
+              },
+            )}
+          </div>
+        </div>
       </div>
-    </>
+    </div>
   );
 };

src/client/components/Import/Import.tsx

@@ -1,4 +1,4 @@
-import React, { ReactElement, useCallback, useEffect } from "react";
+import React, { ReactElement, useCallback, useEffect, useRef } from "react";
 import "react-loader-spinner/dist/loader/css/react-spinner-loader.css";
 import { format } from "date-fns";
 import Loader from "react-loader-spinner";
@@ -27,12 +27,21 @@ interface IProps {
 
 export const Import = (props: IProps): ReactElement => {
   const queryClient = useQueryClient();
-  const { importJobQueue, socketIOInstance } = useStore(
+  const { importJobQueue, getSocket, setQueryClientRef } = useStore(
     useShallow((state) => ({
       importJobQueue: state.importJobQueue,
-      socketIOInstance: state.socketIOInstance,
+      getSocket: state.getSocket,
+      setQueryClientRef: state.setQueryClientRef,
     })),
   );
+  
+  const previousResultCountRef = useRef<number>(0);
+  const pollingIntervalRef = useRef<NodeJS.Timeout | null>(null);
+
+  // Set the queryClient reference in the store so socket events can use it
+  useEffect(() => {
+    setQueryClientRef({ current: queryClient });
+  }, [queryClient, setQueryClientRef]);
 
   const sessionId = localStorage.getItem("sessionId");
   const { mutate: initiateImport } = useMutation({
@@ -44,24 +53,91 @@ export const Import = (props: IProps): ReactElement => {
       }),
   });
 
-  const { data, isError, isLoading } = useQuery({
+  const { data, isError, isLoading, refetch } = useQuery({
     queryKey: ["allImportJobResults"],
-    queryFn: async () =>
+    queryFn: async () => {
-      await axios({
+      const response = await axios({
         method: "GET",
         url: "http://localhost:3000/api/jobqueue/getJobResultStatistics",
-      }),
+        params: {
+          _t: Date.now(), // Cache buster
+        },
+        headers: {
+          'Cache-Control': 'no-cache',
+          'Pragma': 'no-cache',
+        },
+      });
+      
+      // Track the result count
+      if (response.data?.length) {
+        previousResultCountRef.current = response.data.length;
+      }
+      
+      return response;
+    },
+    refetchOnMount: true,
+    refetchOnWindowFocus: false,
+    staleTime: 0, // Always consider data stale
+    gcTime: 0, // Don't cache the data (replaces cacheTime in newer versions)
+    // Poll every 5 seconds when import is running
+    refetchInterval: importJobQueue.status === "running" || importJobQueue.status === "paused" ? 5000 : false,
   });
 
+  // Listen for import queue drained event to refresh the table
+  useEffect(() => {
+    const socket = getSocket("/");
+    
+    const handleQueueDrained = () => {
+      const initialCount = previousResultCountRef.current;
+      let attempts = 0;
+      const maxAttempts = 20; // Poll for up to 20 seconds
+      
+      // Clear any existing polling interval
+      if (pollingIntervalRef.current) {
+        clearInterval(pollingIntervalRef.current);
+      }
+      
+      // Poll every second until we see new data or hit max attempts
+      pollingIntervalRef.current = setInterval(async () => {
+        attempts++;
+        
+        const result = await refetch();
+        const newCount = result.data?.data?.length || 0;
+        
+        if (newCount > initialCount) {
+          if (pollingIntervalRef.current) {
+            clearInterval(pollingIntervalRef.current);
+            pollingIntervalRef.current = null;
+          }
+        } else if (attempts >= maxAttempts) {
+          if (pollingIntervalRef.current) {
+            clearInterval(pollingIntervalRef.current);
+            pollingIntervalRef.current = null;
+          }
+        }
+      }, 1000);
+    };
+
+    socket.on("LS_IMPORT_QUEUE_DRAINED", handleQueueDrained);
+
+    return () => {
+      socket.off("LS_IMPORT_QUEUE_DRAINED", handleQueueDrained);
+      if (pollingIntervalRef.current) {
+        clearInterval(pollingIntervalRef.current);
+      }
+    };
+  }, [getSocket, queryClient, refetch]);
+
   const toggleQueue = (queueAction: string, queueStatus: string) => {
-    socketIOInstance.emit(
+    const socket = getSocket("/");
+    socket.emit(
       "call",
       "socket.setQueueStatus",
       {
         queueAction,
         queueStatus,
       },
-      (data) => console.log(data),
+      (data: any) => console.log(data),
     );
   };
   /**
@@ -246,7 +322,7 @@ export const Import = (props: IProps): ReactElement => {
                   </thead>
 
                   <tbody className="divide-y divide-gray-200">
-                    {data?.data.map((jobResult, id) => {
+                    {data?.data.map((jobResult: any, id: number) => {
                       return (
                         <tr key={id}>
                           <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">

src/client/components/Library/Library.tsx

@@ -152,10 +152,10 @@ export const Library = (): ReactElement => {
             accessorKey: "_source.createdAt",
             cell: (info) => {
               return !isNil(info.getValue()) ? (
-                <div className="text-sm w-max ml-3 my-3 text-slate-600 dark:text-slate-900">
+                <span className="inline-flex items-center bg-slate-300 dark:bg-slate-500 text-xs font-medium text-slate-700 dark:text-slate-200 px-3 py-1 rounded-md shadow-sm whitespace-nowrap ml-3 my-3">
-                  <p>{format(parseISO(info.getValue()), "dd MMMM, yyyy")} </p>
+                  <i className="icon-[solar--file-download-bold] w-4 h-4 mr-2 opacity-70" />
-                  {format(parseISO(info.getValue()), "h aaaa")}
+                  {format(parseISO(info.getValue()), "dd MMM yyyy, h:mm a")}
-                </div>
+                </span>
               ) : null;
             },
           },
@@ -164,23 +164,25 @@ export const Library = (): ReactElement => {
             accessorKey: "_source.acquisition",
             cell: (info) => (
               <div className="flex flex-col gap-2 ml-3 my-3">
-                <span className="inline-flex items-center w-fit bg-slate-50 text-slate-800 text-xs px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                {/* DC++ Downloads */}
-                  <span className="pr-1 pt-1">
+                {info.getValue().directconnect?.downloads?.length > 0 ? (
-                    <i className="icon-[solar--folder-path-connect-bold-duotone] w-5 h-5"></i>
+                  <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-1 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                    <i className="icon-[solar--folder-path-connect-bold-duotone] w-4 h-4 mr-1 opacity-70" />
+                    <span>
+                      DC++: {info.getValue().directconnect.downloads.length}
+                    </span>
                   </span>
-                  <span className="text-md text-slate-900 dark:text-slate-900">
+                ) : null}
-                    DC++: {info.getValue().directconnect.downloads.length}
-                  </span>
-                </span>
 
-                <span className="inline-flex w-fit items-center bg-slate-50 text-slate-800 text-xs px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                {/* Torrent Downloads */}
-                  <span className="pr-1 pt-1">
+                {info.getValue().torrent.length > 0 ? (
-                    <i className="icon-[solar--magnet-bold-duotone] w-5 h-5"></i>
+                  <span className="inline-flex items-center whitespace-nowrap bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-1 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                    <i className="icon-[solar--magnet-bold-duotone] w-4 h-4 mr-1 opacity-70" />
+                    <span className="whitespace-nowrap">
+                      Torrent: {info.getValue().torrent.length}
+                    </span>
                   </span>
-                  <span className="text-md text-slate-900 dark:text-slate-900">
+                ) : null}
-                    Torrent: {info.getValue().torrent.length}
-                  </span>
-                </span>
               </div>
             ),
           },

src/client/components/Search/Search.tsx

@@ -1,13 +1,16 @@
-import React, { useCallback, ReactElement, useState } from "react";
+import React, { ReactElement, useState } from "react";
-import { isNil, isEmpty } from "lodash";
+import { isNil, isEmpty, isUndefined } from "lodash";
 import { IExtractedComicBookCoverFile, RootState } from "threetwo-ui-typings";
-
+import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
 import { Form, Field } from "react-final-form";
 import Card from "../shared/Carda";
 import ellipsize from "ellipsize";
 import { convert } from "html-to-text";
+import { useTranslation } from "react-i18next";
+import "../../shared/utils/i18n.util";
+import PopoverButton from "../shared/PopoverButton";
 import dayjs from "dayjs";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
 import {
   COMICVINE_SERVICE_URI,
   LIBRARY_SERVICE_BASE_URI,
@@ -20,64 +23,121 @@ export const Search = ({}: ISearchProps): ReactElement => {
   const formData = {
     search: "",
   };
-  const queryClient = useQueryClient();
-  const [searchQuery, setSearchQuery] = useState("");
   const [comicVineMetadata, setComicVineMetadata] = useState({});
-  const getCVSearchResults = (searchQuery) => {
+  const [selectedResource, setSelectedResource] = useState("volume");
-    setSearchQuery(searchQuery.search);
+  const { t } = useTranslation();
+  const handleResourceChange = (value) => {
+    setSelectedResource(value);
   };
 
   const {
+    mutate,
     data: comicVineSearchResults,
-    isLoading,
+    isPending,
     isSuccess,
-  } = useQuery({
+  } = useMutation({
-    queryFn: async () =>
+    mutationFn: async (data: { search: string; resource: string }) => {
-      await axios({
+      const { search, resource } = data;
+      return await axios({
         url: `${COMICVINE_SERVICE_URI}/search`,
         method: "GET",
         params: {
           api_key: "a5fa0663683df8145a85d694b5da4b87e1c92c69",
-          query: searchQuery,
+          query: search,
           format: "json",
           limit: "10",
           offset: "0",
           field_list:
-            "id,name,deck,api_detail_url,image,description,volume,cover_date",
+            "id,name,deck,api_detail_url,image,description,volume,cover_date,start_year,count_of_issues,publisher,issue_number",
-          resources: "issue",
+          resources: resource,
         },
-      }),
+      });
-    queryKey: ["comicvineSearchResults", searchQuery],
+    },
-    enabled: !isNil(searchQuery),
   });
 
   // add to library
-  const { data: additionResult } = useQuery({
+  const { data: additionResult, mutate: addToWantedList } = useMutation({
-    queryFn: async () =>
+    mutationFn: async ({
-      await axios({
+      source,
+      comicObject,
+      markEntireVolumeWanted,
+      resourceType,
+    }) => {
+      let volumeInformation = {};
+      let issues = [];
+      switch (resourceType) {
+        case "issue":
+          const { id, api_detail_url, image, cover_date, issue_number } =
+            comicObject;
+          // Add issue metadata
+          issues.push({
+            id,
+            url: api_detail_url,
+            image,
+            coverDate: cover_date,
+            issueNumber: issue_number,
+          });
+          console.log(issues);
+          // Get volume metadata from CV
+          const response = await axios({
+            url: `${COMICVINE_SERVICE_URI}/getVolumes`,
+            method: "POST",
+            data: {
+              volumeURI: comicObject.volume.api_detail_url,
+              fieldList:
+                "id,name,deck,api_detail_url,image,description,start_year,year,count_of_issues,publisher,first_issue,last_issue",
+            },
+          });
+          // set volume metadata key
+          volumeInformation = response.data?.results;
+          break;
+
+        case "volume":
+          const {
+            id: volumeId,
+            api_detail_url: apiUrl,
+            image: volumeImage,
+            name,
+            publisher,
+          } = comicObject;
+          volumeInformation = {
+            id: volumeId,
+            url: apiUrl,
+            image: volumeImage,
+            name,
+            publisher,
+          };
+          break;
+
+        default:
+          console.log("Invalid resource type.");
+          break;
+      }
+      // Add to wanted list
+      return await axios({
         url: `${LIBRARY_SERVICE_BASE_URI}/rawImportToDb`,
         method: "POST",
         data: {
           importType: "new",
           payload: {
-            rawFileDetails: {
-              name: "",
-            },
             importStatus: {
-              isImported: true,
+              isImported: false, // wanted, but not acquired yet.
               tagged: false,
               matchedResult: {
                 score: "0",
               },
             },
-            sourcedMetadata:
+            wanted: {
-              { comicvine: comicVineMetadata?.comicData } || null,
+              source,
-            acquisition: { source: { wanted: true, name: "comicvine" } },
+              markEntireVolumeWanted,
+              issues,
+              volume: volumeInformation,
+            },
+            sourcedMetadata: { comicvine: volumeInformation },
           },
         },
-      }),
+      });
-    queryKey: ["additionResult"],
+    },
-    enabled: !isNil(comicVineMetadata.comicData),
   });
 
   const addToLibrary = (sourceName: string, comicData) =>
@@ -87,6 +147,15 @@ export const Search = ({}: ISearchProps): ReactElement => {
     return { __html: html };
   };
 
+  const onSubmit = async (values) => {
+    const formData = { ...values, resource: selectedResource };
+    try {
+      mutate(formData);
+    } catch (error) {
+      // Handle error
+    }
+  };
+
   return (
     <div>
       <section>
@@ -107,7 +176,7 @@ export const Search = ({}: ISearchProps): ReactElement => {
         </header>
         <div className="mx-auto max-w-screen-sm px-4 py-4 sm:px-6 sm:py-8 lg:px-8">
           <Form
-            onSubmit={getCVSearchResults}
+            onSubmit={onSubmit}
             initialValues={{
               ...formData,
             }}
@@ -139,78 +208,254 @@ export const Search = ({}: ISearchProps): ReactElement => {
                     Search
                   </button>
                 </div>
+                {/* resource type selection: volume, issue etc. */}
+                <div className="flex flex-row gap-3 mt-4">
+                  <Field name="resource" type="radio" value="volume">
+                    {({ input: volumesInput, meta }) => (
+                      <div className="w-fit rounded-xl">
+                        <div>
+                          <input
+                            {...volumesInput}
+                            type="radio"
+                            id="volume"
+                            checked={selectedResource === "volume"}
+                            onChange={() => handleResourceChange("volume")}
+                            className="peer hidden"
+                          />
+                          <label
+                            htmlFor="volume"
+                            className="block cursor-pointer select-none rounded-xl p-2 text-center peer-checked:bg-blue-500 peer-checked:font-bold peer-checked:text-white"
+                          >
+                            Volumes
+                          </label>
+                        </div>
+                      </div>
+                    )}
+                  </Field>
+
+                  <Field name="resource" type="radio" value="issue">
+                    {({ input: issuesInput, meta }) => (
+                      <div className="w-fit rounded-xl">
+                        <div>
+                          <input
+                            {...issuesInput}
+                            type="radio"
+                            id="issue"
+                            checked={selectedResource === "issue"}
+                            onChange={() => handleResourceChange("issue")}
+                            className="peer hidden"
+                          />
+                          <label
+                            htmlFor="issue"
+                            className="block cursor-pointer select-none rounded-xl p-2 text-center peer-checked:bg-blue-500 peer-checked:font-bold peer-checked:text-white"
+                          >
+                            Issues
+                          </label>
+                        </div>
+                      </div>
+                    )}
+                  </Field>
+                </div>
               </form>
             )}
           />
         </div>
-        {isLoading && <>Loading kaka...</>}
+        {isPending && (
-        {!isNil(comicVineSearchResults?.data.results) &&
+          <div className="max-w-screen-xl px-4 py-4 sm:px-6 sm:py-8 lg:px-8">
-        !isEmpty(comicVineSearchResults?.data.results) ? (
+            Loading results...
-          <div className="mx-auto max-w-screen-xl px-4 py-4 sm:px-6 sm:py-8 lg:px-8">
+          </div>
+        )}
+        {!isEmpty(comicVineSearchResults?.data?.results) ? (
+          <div className="mx-auto w-full sm:w-[90vw] md:w-[80vw] lg:w-[70vw] max-w-6xl px-4 py-6">
             {comicVineSearchResults.data.results.map((result) => {
-              return isSuccess ? (
+              return result.resource_type === "issue" ? (
-                <div key={result.id} className="mb-5">
+                <div
-                  <div className="flex flex-row">
+                  key={result.id}
-                    <div className="mr-5">
+                  className="relative flex gap-4 py-6 px-3 border-b border-slate-200 dark:border-slate-700 hover:bg-slate-100/50 dark:hover:bg-slate-800/30 transition-colors duration-150 group"
-                      <Card
+                >
-                        key={result.id}
+                  {/* IMAGE */}
-                        orientation={"cover-only"}
+                  <div className="flex-shrink-0">
-                        imageUrl={result.image.small_url}
+                    <Card
-                        hasDetails={false}
+                      orientation="cover-only"
-                      />
+                      imageUrl={result.image.small_url}
+                      hasDetails={false}
+                      cardContainerStyle={{ width: "120px", maxWidth: "150px" }}
+                    />
+                  </div>
+
+                  {/* RIGHT-SIDE CONTENT */}
+                  <div className="flex-1 min-w-0">
+                    {/* TITLE */}
+                    <div className="text-base font-medium text-slate-800 dark:text-white tracking-tight truncate">
+                      {result.volume?.name || <span>No Name</span>}
                     </div>
-                    <div className="column">
-                      <div className="text-xl">
-                        {!isEmpty(result.volume.name) ? (
-                          result.volume.name
-                        ) : (
-                          <span className="is-size-3">No Name</span>
-                        )}
-                      </div>
-                      <div className="field is-grouped mt-1">
-                        <div className="control">
-                          <div className="tags has-addons">
-                            <span className="tag is-light">Cover date</span>
-                            <span className="tag is-info is-light">
-                              {dayjs(result.cover_date).format("MMM D, YYYY")}
-                            </span>
-                          </div>
-                        </div>
 
-                        <div className="control">
+                    {/* SUBMETA */}
-                          <div className="tags has-addons">
+                    <div className="flex flex-wrap gap-2 mt-2">
-                            <span className="tag is-warning">{result.id}</span>
+                      {/* Cover Date Token */}
-                          </div>
+                      {result.cover_date && (
-                        </div>
+                        <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                      </div>
+                          <span className="pr-1 pt-1">
+                            <i className="icon-[solar--calendar-bold-duotone] w-4 h-4"></i>
+                          </span>
+                          <span className="text-xs text-slate-500 dark:text-slate-900">
+                            {dayjs(result.cover_date).format("MMM YYYY")}
+                          </span>
+                        </span>
+                      )}
 
-                      <a href={result.api_detail_url}>
+                      {/* ID Token */}
-                        {result.api_detail_url}
+                      <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                      </a>
+                        <span className="pr-1 pt-1">
-                      <p>
+                          <i className="icon-[solar--hashtag-bold-duotone] w-4 h-4"></i>
+                        </span>
+                        <span className="text-xs text-slate-500 dark:text-slate-900">
+                          {result.id}
+                        </span>
+                      </span>
+                    </div>
+
+                    {/* LINK */}
+                    <a
+                      href={result.api_detail_url}
+                      className="text-xs text-blue-500 underline mt-1 inline-block break-all"
+                    >
+                      {result.api_detail_url}
+                    </a>
+
+                    {/* DESCRIPTION */}
+                    {result.description && (
+                      <p className="text-sm text-slate-600 dark:text-slate-200 mt-2 line-clamp-3">
                         {ellipsize(
-                          convert(result.description, {
+                          convert(result.description ?? "", {
-                            baseElements: {
+                            baseElements: { selectors: ["p", "div"] },
-                              selectors: ["p", "div"],
-                            },
                           }),
-                          320,
+                          300,
                         )}
                       </p>
-                      <div className="mt-2">
+                    )}
-                        <button
+
-                          className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-2 py-2 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                    {/* CTA BUTTON */}
-                          onClick={() => addToLibrary("comicvine", result)}
+                    {result.volume.name && (
-                        >
+                      <div className="absolute bottom-4 right-4">
-                          <i className="icon-[solar--add-square-bold-duotone] w-6 h-6 mr-2"></i>{" "}
+                        <PopoverButton
-                          Mark as Wanted
+                          content={`This will add ${result?.volume?.name} to your wanted list.`}
-                        </button>
+                          clickHandler={() =>
+                            addToWantedList({
+                              source: "comicvine",
+                              comicObject: result,
+                              markEntireVolumeWanted: false,
+                              resourceType: "issue",
+                            })
+                          }
+                        />
                       </div>
-                    </div>
+                    )}
                   </div>
                 </div>
               ) : (
-                <div>Loading</div>
+                result.resource_type === "volume" && (
+                  <div
+                    key={result.id}
+                    className="relative flex gap-4 py-6 px-3 border-b border-slate-200 dark:border-slate-700 hover:bg-slate-100/50 dark:hover:bg-slate-800/30 transition-colors duration-150 group"
+                  >
+                    {/* LEFT COLUMN: COVER */}
+                    <Card
+                      orientation="cover-only"
+                      imageUrl={result.image.small_url}
+                      hasDetails={false}
+                      cardContainerStyle={{
+                        width: "120px",
+                        maxWidth: "150px",
+                      }}
+                    />
+
+                    {/* RIGHT COLUMN */}
+                    <div className="flex-1 min-w-0">
+                      {/* TITLE */}
+                      <div className="text-lg font-bold text-gray-900 dark:text-white">
+                        {result.name || <span>No Name</span>}
+                        {result.start_year && <> ({result.start_year})</>}
+                      </div>
+
+                      {/* TOKENS */}
+                      <div className="flex flex-wrap gap-2 mt-2">
+                        {/* ISSUE COUNT */}
+                        {result.count_of_issues && (
+                          <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                            <span className="pr-1 pt-1">
+                              <i className="icon-[solar--documents-minimalistic-bold-duotone] w-4 h-4" />
+                            </span>
+                            <span>
+                              {t("issueWithCount", {
+                                count: result.count_of_issues,
+                              })}
+                            </span>
+                          </span>
+                        )}
+
+                        {/* FORMAT DETECTED */}
+                        {result.description &&
+                          !isEmpty(detectIssueTypes(result.description)) && (
+                            <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                              <span className="pr-1 pt-1">
+                                <i className="icon-[solar--book-2-line-duotone] w-4 h-4" />
+                              </span>
+                              <span>
+                                {
+                                  detectIssueTypes(result.description)
+                                    .displayName
+                                }
+                              </span>
+                            </span>
+                          )}
+
+                        {/* ID */}
+                        <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                          <span className="pr-1 pt-1">
+                            <i className="icon-[solar--hashtag-bold-duotone] w-4 h-4" />
+                          </span>
+                          <span>{result.id}</span>
+                        </span>
+                      </div>
+
+                      {/* LINK */}
+                      <a
+                        href={result.api_detail_url}
+                        className="text-sm text-blue-500 underline mt-2 break-all"
+                      >
+                        {result.api_detail_url}
+                      </a>
+
+                      {/* DESCRIPTION */}
+                      {result.description && (
+                        <p className="text-sm mt-2 text-slate-700 dark:text-slate-200 break-words line-clamp-3">
+                          {ellipsize(
+                            convert(result.description, {
+                              baseElements: { selectors: ["p", "div"] },
+                            }),
+                            320,
+                          )}
+                        </p>
+                      )}
+                      {result.name ? (
+                        <div className="mt-4 justify-self-end">
+                          <PopoverButton
+                            content={`This will add ${result.count_of_issues} issues your wanted list.`}
+                            clickHandler={() =>
+                              addToWantedList({
+                                source: "comicvine",
+                                comicObject: result,
+                                markEntireVolumeWanted: false,
+                                resourceType: "issue",
+                              })
+                            }
+                          />
+                        </div>
+                      ) : null}
+                    </div>
+                  </div>
+                )
               );
             })}
           </div>

src/client/components/Settings/AirDCPPSettings/AirDCPPHubsForm.tsx

@@ -1,27 +1,20 @@
-import React, { ReactElement, useEffect, useState, useContext } from "react";
+import React, { ReactElement, useState } from "react";
 import { Form, Field } from "react-final-form";
 import { isEmpty, isNil, isUndefined } from "lodash";
 import Select from "react-select";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
-import { useStore } from "../../../store";
 import axios from "axios";
+import { produce } from "immer";
+import { AIRDCPP_SERVICE_BASE_URI } from "../../../constants/endpoints";
 
 export const AirDCPPHubsForm = (): ReactElement => {
   const queryClient = useQueryClient();
-  const {
-    airDCPPSocketInstance,
-    airDCPPClientConfiguration,
-    airDCPPSessionInformation,
-  } = useStore((state) => ({
-    airDCPPSocketInstance: state.airDCPPSocketInstance,
-    airDCPPClientConfiguration: state.airDCPPClientConfiguration,
-    airDCPPSessionInformation: state.airDCPPSessionInformation,
-  }));
 
   const {
     data: settings,
     isLoading,
     isError,
+    refetch,
   } = useQuery({
     queryKey: ["settings"],
     queryFn: async () =>
@@ -29,23 +22,31 @@ export const AirDCPPHubsForm = (): ReactElement => {
         url: "http://localhost:3000/api/settings/getAllSettings",
         method: "GET",
       }),
+    staleTime: Infinity,
   });
 
-  /**
-   * Get the hubs list from an AirDCPP Socket
-   */
   const { data: hubs } = useQuery({
     queryKey: ["hubs"],
-    queryFn: async () => await airDCPPSocketInstance.get(`hubs`),
+    queryFn: async () =>
+      await axios({
+        url: `${AIRDCPP_SERVICE_BASE_URI}/getHubs`,
+        method: "POST",
+        data: {
+          host: settings?.data.directConnect?.client?.host,
+        },
+      }),
+    enabled: !isEmpty(settings?.data.directConnect?.client?.host),
   });
-  let hubList = {};
+
+  let hubList: any[] = [];
   if (!isNil(hubs)) {
-    hubList = hubs.map(({ hub_url, identity }) => ({
+    hubList = hubs?.data.map(({ hub_url, identity }) => ({
       value: hub_url,
       label: identity.name,
     }));
   }
-  const { mutate } = useMutation({
+
+  const mutation = useMutation({
     mutationFn: async (values) =>
       await axios({
         url: `http://localhost:3000/api/settings/saveSettings`,
@@ -56,79 +57,112 @@ export const AirDCPPHubsForm = (): ReactElement => {
           settingsKey: "directConnect",
         },
       }),
-    onSuccess: () => {
+    onSuccess: (data) => {
-      queryClient.invalidateQueries({ queryKey: ["settings"] });
+      queryClient.setQueryData(["settings"], (oldData: any) =>
+        produce(oldData, (draft: any) => {
+          draft.data.directConnect.client = {
+            ...draft.data.directConnect.client,
+            ...data.data.directConnect.client,
+          };
+        }),
+      );
     },
   });
-  const validate = async () => {};
+
+  const validate = async (values) => {
+    const errors = {};
+    // Add any validation logic here if needed
+    return errors;
+  };
 
   const SelectAdapter = ({ input, ...rest }) => {
     return <Select {...input} {...rest} isClearable isMulti />;
   };
 
+  if (isLoading) {
+    return <div>Loading...</div>;
+  }
+
+  if (isError) {
+    return <div>Error loading settings.</div>;
+  }
+
   return (
     <>
       {!isEmpty(hubList) && !isUndefined(hubs) ? (
         <Form
-          onSubmit={mutate}
+          onSubmit={(values) => {
+            mutation.mutate(values);
+          }}
           validate={validate}
           render={({ handleSubmit }) => (
-            <form onSubmit={handleSubmit}>
+            <form onSubmit={handleSubmit} className="mt-10">
-              <div>
+              <h2 className="text-xl">Configure DC++ Hubs</h2>
-                <h3 className="title">Hubs</h3>
+              <article
+                role="alert"
+                className="mt-4 rounded-lg max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
+              >
                 <h6 className="subtitle has-text-grey-light">
-                  Select the hubs you want to perform searches against.
+                  Select the hubs you want to perform searches against. Your
+                  selection in the dropdown <strong>will replace</strong> the
+                  existing selection.
                 </h6>
-              </div>
+              </article>
-              <div className="field">
-                <label className="label">AirDC++ Host</label>
-                <div className="control">
-                  <Field
-                    name="hubs"
-                    component={SelectAdapter}
-                    className="basic-multi-select"
-                    placeholder="Select Hubs to Search Against"
-                    options={hubList}
-                  />
-                </div>
-              </div>
 
-              <button type="submit" className="button is-primary">
+              <div className="field">
+                <label className="block py-1 mt-3">AirDC++ Host</label>
+                <Field
+                  name="hubs"
+                  component={SelectAdapter}
+                  className="basic-multi-select"
+                  placeholder="Select Hubs to Search Against"
+                  options={hubList}
+                />
+              </div>
+              <button
+                type="submit"
+                className="flex space-x-1 sm:mt-5 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-4 py-2 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+              >
                 Submit
               </button>
             </form>
           )}
         />
       ) : (
-        <>
+        <article
-          <article className="message">
+          role="alert"
-            <div className="message-body">
+          className="mt-4 rounded-lg max-w-screen-md border-s-4 border-yellow-500 bg-yellow-50 p-4 dark:border-s-4 dark:border-yellow-600 dark:bg-yellow-300 dark:text-slate-600"
-              No configured hubs detected in AirDC++. <br />
+        >
-              Configure to a hub in AirDC++ and then select a default hub here.
+          <div className="message-body">
-            </div>
+            No configured hubs detected in AirDC++. <br />
-          </article>
+            Configure to a hub in AirDC++ and then select a default hub here.
-        </>
+          </div>
+        </article>
       )}
       {!isEmpty(settings?.data.directConnect?.client.hubs) ? (
         <>
           <div className="mt-4">
             <article className="message is-warning">
-              <div className="message-body is-size-6 is-family-secondary">
+              <div className="message-body is-size-6 is-family-secondary"></div>
-                Your selection in the dropdown <strong>will replace</strong> the
-                existing selection.
-              </div>
             </article>
           </div>
-          <div className="box mt-3">
+          <div>
-            <h6>Default Hub For Searches:</h6>
+            <span className="flex items-center mt-10 mb-4">
-            {settings?.data.directConnect?.client.hubs.map(
+              <span className="text-xl text-slate-500 dark:text-slate-200 pr-5">
-              ({ value, label }) => (
+                Default Hub for Searches
-                <div key={value}>
+              </span>
-                  <div>{label}</div>
+              <span className="h-px flex-1 bg-slate-200 dark:bg-slate-400"></span>
-                  <span className="is-size-7">{value}</span>
+            </span>
-                </div>
+            <div className="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow dark:bg-slate-400 dark:border-gray-700">
-              ),
+              {settings?.data.directConnect?.client.hubs.map(
-            )}
+                ({ value, label }) => (
+                  <div key={value}>
+                    <div>{label}</div>
+                    <span className="is-size-7">{value}</span>
+                  </div>
+                ),
+              )}
+            </div>
           </div>
         </>
       ) : null}

src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsForm.tsx

@@ -1,76 +1,65 @@
-import React, { ReactElement, useCallback } from "react";
+import React, { useState, useEffect } from "react";
 import { AirDCPPSettingsConfirmation } from "./AirDCPPSettingsConfirmation";
-import { isUndefined, isEmpty } from "lodash";
 import { ConnectionForm } from "../../shared/ConnectionForm/ConnectionForm";
-import { initializeAirDCPPSocket, useStore } from "../../../store/index";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { useShallow } from "zustand/react/shallow";
-import { useMutation } from "@tanstack/react-query";
 import axios from "axios";
+import {
+  AIRDCPP_SERVICE_BASE_URI,
+  SETTINGS_SERVICE_BASE_URI,
+} from "../../../constants/endpoints";
 
-export const AirDCPPSettingsForm = (): ReactElement => {
+export const AirDCPPSettingsForm = () => {
-  // cherry-picking selectors for:
+  const [airDCPPSessionInformation, setAirDCPPSessionInformation] =
-  // 1. initial values for the form
+    useState(null);
-  // 2. If initial values are present, get the socket information to display
+  // Fetching all settings
-  const { setState } = useStore;
+  const { data: settingsData, isSuccess: settingsSuccess } = useQuery({
-  const {
+    queryKey: ["airDCPPSettings"],
-    airDCPPSocketConnected,
+    queryFn: () => axios.get(`${SETTINGS_SERVICE_BASE_URI}/getAllSettings`),
-    airDCPPDisconnectionInfo,
+  });
-    airDCPPSessionInformation,
-    airDCPPClientConfiguration,
-    airDCPPSocketInstance,
-    setAirDCPPSocketInstance,
-  } = useStore(
-    useShallow((state) => ({
-      airDCPPSocketConnected: state.airDCPPSocketConnected,
-      airDCPPDisconnectionInfo: state.airDCPPDisconnectionInfo,
-      airDCPPClientConfiguration: state.airDCPPClientConfiguration,
-      airDCPPSessionInformation: state.airDCPPSessionInformation,
-      airDCPPSocketInstance: state.airDCPPSocketInstance,
-      setAirDCPPSocketInstance: state.setAirDCPPSocketInstance,
-    })),
-  );
 
-  /**
+  // Fetch session information
-   * Mutation to update settings and subsequently initialize
+  const fetchSessionInfo = (host) => {
-   * AirDC++ socket with those settings
+    return axios.post(`${AIRDCPP_SERVICE_BASE_URI}/initialize`, { host });
-   */
+  };
+
+  // Use effect to trigger side effects on settings fetch success
+  useEffect(() => {
+    if (settingsSuccess && settingsData?.data?.directConnect?.client?.host) {
+      const host = settingsData.data.directConnect.client.host;
+      fetchSessionInfo(host).then((response) => {
+        setAirDCPPSessionInformation(response.data);
+      });
+    }
+  }, [settingsSuccess, settingsData]);
+
+  // Handle setting update and subsequent AirDC++ initialization
   const { mutate } = useMutation({
-    mutationFn: async (values) =>
+    mutationFn: (values) => {
-      await axios({
+      console.log(values);
-        url: `http://localhost:3000/api/settings/saveSettings`,
+      return axios.post("http://localhost:3000/api/settings/saveSettings", {
-        method: "POST",
+        settingsPayload: values,
-        data: { settingsPayload: values, settingsKey: "directConnect" },
+        settingsKey: "directConnect",
-      }),
-    onSuccess: async (values) => {
-      const {
-        data: {
-          directConnect: {
-            client: { host },
-          },
-        },
-      } = values;
-      const dcppSocketInstance = await initializeAirDCPPSocket(host);
-      setState({
-        airDCPPClientConfiguration: host,
-        airDCPPSocketInstance: dcppSocketInstance,
       });
     },
+    onSuccess: async (response) => {
+      const host = response?.data?.directConnect?.client?.host;
+      if (host) {
+        const response = await fetchSessionInfo(host);
+        setAirDCPPSessionInformation(response.data);
+        // setState({ airDCPPClientConfiguration: host });
+      }
+    },
   });
-  const deleteSettingsMutation = useMutation(
+
-    async () =>
+  const deleteSettingsMutation = useMutation(() =>
-      await axios.post("http://localhost:3000/api/settings/saveSettings", {
+    axios.post("http://localhost:3000/api/settings/saveSettings", {
-        settingsPayload: {},
+      settingsPayload: {},
-        settingsKey: "directConnect",
+      settingsKey: "directConnect",
-      }),
+    }),
   );
 
-  // const removeSettings = useCallback(async () => {
+  const initFormData = settingsData?.data?.directConnect?.client?.host ?? {};
-  //   // airDCPPSettings.setSettings({});
+
-  // }, []);
-  //
-  const initFormData = !isUndefined(airDCPPClientConfiguration)
-    ? airDCPPClientConfiguration
-    : {};
   return (
     <>
       <ConnectionForm
@@ -79,13 +68,12 @@ export const AirDCPPSettingsForm = (): ReactElement => {
         formHeading={"Configure AirDC++"}
       />
 
-      {!isEmpty(airDCPPSessionInformation) ? (
+      {airDCPPSessionInformation && (
         <AirDCPPSettingsConfirmation settings={airDCPPSessionInformation} />
-      ) : null}
+      )}
 
-      {!isEmpty(airDCPPClientConfiguration) ? (
+      {settingsData?.data && (
         <p className="control mt-4">
-          as
           <button
             className="button is-danger"
             onClick={() => deleteSettingsMutation.mutate()}
@@ -93,7 +81,7 @@ export const AirDCPPSettingsForm = (): ReactElement => {
             Delete
           </button>
         </p>
-      ) : null}
+      )}
     </>
   );
 };

src/client/components/Settings/DockerVars/DockerVars.tsx

@@ -0,0 +1,38 @@
+import React from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import axios from "axios";
+
+export const DockerVars = (): React.ReactElement => {
+  const [environmentVariables, setEnvironmentVariables] = React.useState<
+    Record<string, string>
+  >({});
+  const { data } = useQuery({
+    queryKey: ["docker-vars"],
+    queryFn: async () => {
+      await axios({
+        method: "GET",
+        url: "http://localhost:3000/api/settings/getEnvironmentVariables",
+      }).then((response) => {
+        setEnvironmentVariables(response.data);
+      });
+    },
+    refetchOnWindowFocus: false,
+    refetchOnReconnect: false,
+  });
+  console.log("Docker Vars: ", environmentVariables);
+  return (
+    <div className="flex flex-col gap-4">
+      <h2 className="text-xl font-semibold">Docker Environment Variables</h2>
+      <p className="text-gray-600 dark:text-gray-400">
+        <pre>
+          {Object.entries(environmentVariables).length > 0
+            ? JSON.stringify(environmentVariables, null, 2)
+            : "No environment variables found."}
+        </pre>
+      </p>
+      {/* Add your form or content for Docker environment variables here */}
+    </div>
+  );
+};
+
+export default DockerVars;

src/client/components/Settings/Settings.tsx

@@ -4,6 +4,7 @@ import { AirDCPPHubsForm } from "./AirDCPPSettings/AirDCPPHubsForm";
 import { QbittorrentConnectionForm } from "./QbittorrentSettings/QbittorrentConnectionForm";
 import { SystemSettingsForm } from "./SystemSettings/SystemSettingsForm";
 import ProwlarrSettingsForm from "./ProwlarrSettings/ProwlarrSettingsForm";
+import DockerVars from "./DockerVars/DockerVars";
 import { ServiceStatuses } from "../ServiceStatuses/ServiceStatuses";
 import settingsObject from "../../constants/settings/settingsMenu.json";
 import { isUndefined, map } from "lodash";
@@ -12,139 +13,130 @@ interface ISettingsProps {}
 
 export const Settings = (props: ISettingsProps): ReactElement => {
   const [active, setActive] = useState("gen-db");
-  console.log(active);
+  const [expanded, setExpanded] = useState<Record<string, boolean>>({});
+
+  const toggleExpanded = (id: string) => {
+    setExpanded((prev) => ({
+      ...prev,
+      [id]: !prev[id],
+    }));
+  };
+
   const settingsContent = [
-    {
+    { id: "adc-hubs", content: <AirDCPPHubsForm /> },
-      id: "adc-hubs",
+    { id: "adc-connection", content: <AirDCPPSettingsForm /> },
-      content: (
+    {id: "gen-docker-vars", content: <DockerVars />},
-        <div key="adc-hubs">
+    { id: "qbt-connection", content: <QbittorrentConnectionForm /> },
-          <AirDCPPHubsForm />
+    { id: "prwlr-connection", content: <ProwlarrSettingsForm /> },
-        </div>
+    { id: "core-service", content: <>a</> },
-      ),
+    { id: "flushdb", content: <SystemSettingsForm /> },
-    },
-    {
-      id: "adc-connection",
-      content: (
-        <div key="adc-connection">
-          <AirDCPPSettingsForm />
-        </div>
-      ),
-    },
-    {
-      id: "qbt-connection",
-      content: (
-        <div key="qbt-connection">
-          <QbittorrentConnectionForm />
-        </div>
-      ),
-    },
-    {
-      id: "prwlr-connection",
-      content: (
-        <>
-          <ProwlarrSettingsForm />
-        </>
-      ),
-    },
-    {
-      id: "core-service",
-      content: <>a</>,
-    },
-    {
-      id: "flushdb",
-      content: (
-        <div key="flushdb">
-          <SystemSettingsForm />
-        </div>
-      ),
-    },
   ];
+
   return (
     <div>
       <section>
+        {/* Header */}
         <header className="bg-slate-200 dark:bg-slate-500">
-          <div className="mx-auto max-w-screen-xl px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
+          <div className="mx-auto max-w-screen-xl px-4 py-6 sm:px-6 lg:px-8">
             <div className="sm:flex sm:items-center sm:justify-between">
               <div className="text-center sm:text-left">
-                <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
+                <h1 className="text-2xl sm:text-3xl font-bold text-gray-900 dark:text-white">
                   Settings
                 </h1>
-
+                <p className="mt-1 text-sm text-gray-500 dark:text-white">
-                <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
                   Import comics into the ThreeTwo library.
                 </p>
               </div>
             </div>
           </div>
         </header>
-        <div className="flex flex-row">
+
-          <div className="inset-y-0 w-80 dark:bg-gray-800 bg-slate-300 text-white overflow-y-auto">
+        {/* Main Layout */}
-            <aside className="px-4 py-4 sm:px-6 sm:py-8 lg:px-8">
+        <div className="flex gap-8 px-12 py-6">
-              {map(settingsObject, (settingObject, idx) => {
+          {/* Sidebar */}
-                return (
+          <div className="relative z-30">
+            <aside
+              className="sticky top-6 w-72 max-h-[90vh]
+             rounded-2xl shadow-xl backdrop-blur-md
+             bg-white/70 dark:bg-slate-800/60
+             border border-slate-200 dark:border-slate-700
+             overflow-hidden"
+            >
+              <div className="px-4 py-6 overflow-y-auto">
+                {map(settingsObject, (settingObject, idx) => (
                   <div
-                    className="w-64 py-2 text-slate-700 dark:text-slate-400"
                     key={idx}
+                    className="mb-6 text-slate-700 dark:text-slate-300"
                   >
-                    <h3 className="text-l pb-2">
+                    <h3 className="text-xs font-semibold text-slate-500 dark:text-slate-400 tracking-wide mb-3">
                       {settingObject.category.toUpperCase()}
                     </h3>
-                    {/* First level children */}
+
-                    {!isUndefined(settingObject.children) ? (
+                    {!isUndefined(settingObject.children) && (
-                      <ul key={settingObject.id}>
+                      <ul>
                         {map(settingObject.children, (item, idx) => {
+                          const isOpen = expanded[item.id];
+
                           return (
-                            <li key={idx} className="mb-2">
+                            <li key={idx} className="mb-1">
-                              <a
+                              <div
-                                className={
+                                onClick={() => toggleExpanded(item.id)}
-                                  item.id.toString() === active
+                                className={`cursor-pointer flex justify-between items-center px-1 py-1 rounded-md transition-colors hover:bg-white/50 dark:hover:bg-slate-700 ${
-                                    ? "is-active flex items-center"
+                                  item.id === active
-                                    : "flex items-center"
+                                    ? "font-semibold text-blue-600 dark:text-blue-400"
-                                }
+                                    : ""
-                                onClick={() => setActive(item.id.toString())}
+                                }`}
                               >
-                                {item.displayName}
+                                <span
-                              </a>
+                                  onClick={() => setActive(item.id.toString())}
-                              {/* Second level children */}
+                                  className="flex-1"
-                              {!isUndefined(item.children) ? (
+                                >
-                                <ul className="pl-4 mt-2">
+                                  {item.displayName}
-                                  {map(item.children, (item, idx) => (
+                                </span>
-                                    <li key={item.id} className="mb-2">
+                                {!isUndefined(item.children) && (
+                                  <span className="text-xs opacity-60">
+                                    {isOpen ? "−" : "+"}
+                                  </span>
+                                )}
+                              </div>
+
+                              {!isUndefined(item.children) && isOpen && (
+                                <ul className="pl-4 mt-1">
+                                  {map(item.children, (subItem) => (
+                                    <li key={subItem.id} className="mb-1">
                                       <a
-                                        className={
-                                          item.id.toString() === active
-                                            ? "is-active flex items-center"
-                                            : "flex items-center"
-                                        }
                                         onClick={() =>
-                                          setActive(item.id.toString())
+                                          setActive(subItem.id.toString())
                                         }
+                                        className={`cursor-pointer flex items-center px-1 py-1 rounded-md transition-colors hover:bg-white/50 dark:hover:bg-slate-700 ${
+                                          subItem.id.toString() === active
+                                            ? "font-semibold text-blue-600 dark:text-blue-400"
+                                            : ""
+                                        }`}
                                       >
-                                        {item.displayName}
+                                        {subItem.displayName}
                                       </a>
                                     </li>
                                   ))}
                                 </ul>
-                              ) : null}
+                              )}
                             </li>
                           );
                         })}
                       </ul>
-                    ) : null}
+                    )}
                   </div>
-                );
+                ))}
-              })}
+              </div>
             </aside>
           </div>
 
-          {/* content for settings */}
+          {/* Content */}
-          <div className="flex mx-12">
+          <main className="flex-1 px-2 py-2">
-            <div className="">
+            {settingsContent.map(({ id, content }) =>
-              {map(settingsContent, ({ id, content }) =>
+              active === id ? <div key={id}>{content}</div> : null,
-                active === id ? content : null,
+            )}
-              )}
+          </main>
-            </div>
-          </div>
         </div>
       </section>
     </div>

src/client/components/Settings/SystemSettings/SystemSettingsForm.tsx

@@ -48,13 +48,11 @@ export const SystemSettingsForm = (): ReactElement => {
         </article>
 
         <button
-          className={
+          className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-red-400 dark:border-red-200 bg-red-200 px-2 py-1 text-gray-500 hover:bg-transparent hover:text-red-600 focus:outline-none focus:ring active:text-indigo-500"
-            isLoading ? "button is-danger is-loading" : "button is-danger"
-          }
           onClick={() => flushDb()}
         >
-          <span className="icon">
+          <span className="pt-1 px-1">
-            <i className="fas fa-eraser"></i>
+            <i className="icon-[solar--trash-bin-trash-bold-duotone] w-7 h-7"></i>
           </span>
           <span>Flush DB & Temporary Folders</span>
         </button>

src/client/components/VolumeDetail/VolumeDetail.tsx

@@ -1,30 +1,25 @@
-import { isEmpty, isUndefined, map, partialRight, pick } from "lodash";
+import { isEmpty, isNil, isUndefined, map, partialRight, pick } from "lodash";
-import React, { useEffect, ReactElement, useState, useCallback } from "react";
+import React, { ReactElement, useState, useCallback } from "react";
-import { useDispatch, useSelector } from "react-redux";
 import { useParams } from "react-router";
-import {
+import { analyzeLibrary } from "../../actions/comicinfo.actions";
-  getComicBookDetailById,
+import { useQuery, useMutation, QueryClient } from "@tanstack/react-query";
-  getIssuesForSeries,
-  analyzeLibrary,
-} from "../../actions/comicinfo.actions";
 import PotentialLibraryMatches from "./PotentialLibraryMatches";
-import Masonry from "react-masonry-css";
 import { Card } from "../shared/Carda";
 import SlidingPane from "react-sliding-pane";
 import { convert } from "html-to-text";
 import ellipsize from "ellipsize";
+import {
+  COMICVINE_SERVICE_URI,
+  LIBRARY_SERVICE_BASE_URI,
+} from "../../constants/endpoints";
+import axios from "axios";
 
 const VolumeDetails = (props): ReactElement => {
-  const breakpointColumnsObj = {
-    default: 6,
-    1100: 4,
-    700: 3,
-    500: 2,
-  };
   // sliding panel config
   const [visible, setVisible] = useState(false);
   const [slidingPanelContentId, setSlidingPanelContentId] = useState("");
   const [matches, setMatches] = useState([]);
+  const [storyArcsData, setStoryArcsData] = useState([]);
   const [active, setActive] = useState(1);
 
   // sliding panel init
@@ -33,7 +28,9 @@ const VolumeDetails = (props): ReactElement => {
       content: () => {
         const ids = map(matches, partialRight(pick, "_id"));
         const matchIds = ids.map((id: any) => id._id);
-        return <PotentialLibraryMatches matches={matchIds} />;
+        {
+          /* return <PotentialLibraryMatches matches={matchIds} />; */
+        }
       },
     },
   };
@@ -45,68 +42,145 @@ const VolumeDetails = (props): ReactElement => {
     setVisible(true);
   }, []);
 
-  const analyzeIssues = useCallback((issues) => {
+  //   const analyzeIssues = useCallback((issues) => {
-    dispatch(analyzeLibrary(issues));
+  //     dispatch(analyzeLibrary(issues));
-  }, []);
+  //   }, []);
-
+  //
-  const comicBookDetails = useSelector(
-    (state: RootState) => state.comicInfo.comicBookDetail,
-  );
-  const issuesForVolume = useSelector(
-    (state: RootState) => state.comicInfo.issuesForVolume,
-  );
-
-  const dispatch = useDispatch();
-  useEffect(() => {
-    dispatch(getIssuesForSeries(comicObjectId));
-    dispatch(getComicBookDetailById(comicObjectId));
-  }, []);
 
   const { comicObjectId } = useParams<{ comicObjectId: string }>();
 
+  const { data: comicObject, isSuccess: isComicObjectFetchedSuccessfully } =
+    useQuery({
+      queryFn: async () =>
+        axios({
+          url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookById`,
+          method: "POST",
+          data: {
+            id: comicObjectId,
+          },
+        }),
+      queryKey: ["comicObject"],
+    });
+
+  // get issues for a series
+  const {
+    data: issuesForSeries,
+    isSuccess,
+    isFetching,
+  } = useQuery({
+    queryFn: async () =>
+      await axios({
+        url: `${COMICVINE_SERVICE_URI}/getIssuesForVolume`,
+        method: "POST",
+        data: {
+          volumeId:
+            comicObject?.data?.sourcedMetadata.comicvine.volumeInformation.id,
+        },
+      }),
+    queryKey: ["issuesForSeries", comicObject?.data],
+    enabled: !isUndefined(comicObject?.data),
+  });
+  // get story arcs
+  const useGetStoryArcs = () => {
+    return useMutation({
+      mutationFn: async (comicObject) =>
+        axios({
+          url: `${COMICVINE_SERVICE_URI}/getResource`,
+          method: "POST",
+          data: {
+            comicObject,
+            resource: "issue",
+            filter: `id:${comicObject?.sourcedMetadata.comicvine.id}`,
+          },
+        }),
+      onSuccess: (data) => {
+        setStoryArcsData(data?.data.results);
+      },
+    });
+  };
+
+  const {
+    mutate: getStoryArcs,
+    isIdle,
+    isError,
+    data,
+    error,
+    status,
+  } = useGetStoryArcs();
+
   const IssuesInVolume = () => (
     <>
-      {!isUndefined(issuesForVolume) ? (
+      {!isUndefined(issuesForSeries) ? (
-        <div className="button" onClick={() => analyzeIssues(issuesForVolume)}>
+        <div className="button" onClick={() => analyzeIssues(issuesForSeries)}>
           Analyze Library
         </div>
       ) : null}
-      <Masonry
+      <>
-        breakpointCols={breakpointColumnsObj}
+        {isSuccess &&
-        className="issues-container"
+          issuesForSeries.data.map((issue) => {
-        columnClassName="issues-column"
+            return (
-      >
+              <>
-        {!isUndefined(issuesForVolume) && !isEmpty(issuesForVolume)
-          ? issuesForVolume.map((issue) => {
-              return (
                 <Card
                   key={issue.id}
-                  imageUrl={issue.image.thumb_url}
+                  imageUrl={issue.image.small_url}
-                  orientation={"vertical"}
+                  orientation={"cover-only"}
-                  hasDetails
+                  hasDetails={false}
-                  borderColorClass={
+                />
-                    !isEmpty(issue.matches) ? "green-border" : ""
+                <span className="tag is-warning mr-1">
-                  }
+                  {issue.issue_number}
-                  backgroundColor={!isEmpty(issue.matches) ? "beige" : ""}
+                </span>
-                  onClick={() =>
+                {!isEmpty(issue.matches) ? (
-                    openPotentialLibraryMatchesPanel(issue.matches)
+                  <>
-                  }
+                    <span className="icon has-text-success">
-                >
+                      <i className="fa-regular fa-asterisk"></i>
-                  <span className="tag is-warning mr-1">
+                    </span>
-                    {issue.issue_number}
+                  </>
-                  </span>
+                ) : null}
-                  {!isEmpty(issue.matches) ? (
+              </>
-                    <>
+            );
-                      <span className="icon has-text-success">
+          })}
-                        <i className="fa-regular fa-asterisk"></i>
+      </>
-                      </span>
+    </>
-                    </>
+  );
-                  ) : null}
+
-                </Card>
+  const Issues = () => (
-              );
+    <>
-            })
+      <article
-          : "loading"}
+        role="alert"
-      </Masonry>
+        className="mt-4 rounded-lg text-sm max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
+      >
+        <div>
+          You can add a single issue or the whole volume, and it will be added
+          to the list of `Wanted` items.
+        </div>
+      </article>
+      <div className="flex flex-wrap">
+        {isSuccess &&
+          issuesForSeries?.data.map((issue) => {
+            return (
+              <div className="my-3 dark:bg-slate-400 bg-slate-300 p-4 rounded-lg w-3/4">
+                <div className="flex flex-row gap-4 mb-2">
+                  <div className="w-fit">
+                    <img
+                      src={issue.image.thumb_url}
+                      className="w-full rounded-md"
+                    />
+                  </div>
+                  <div className="w-3/4">
+                    <p className="text-xl">{issue.name}</p>
+                    <p className="text-sm">
+                      {convert(issue.description, {
+                        baseElements: {
+                          selectors: ["p"],
+                        },
+                      })}
+                    </p>
+                  </div>
+                </div>
+              </div>
+            );
+          })}
+      </div>
     </>
   );
 
@@ -115,20 +189,44 @@ const VolumeDetails = (props): ReactElement => {
     {
       id: 1,
       name: "Issues in Volume",
-      icon: <i className="fa-solid fa-layer-group"></i>,
+      icon: <i className="icon-[solar--documents-bold-duotone] w-6 h-6"></i>,
-      content: <IssuesInVolume key={1} />,
+      content: <Issues />,
     },
     {
       id: 2,
-      icon: <i className="fa-regular fa-mask"></i>,
+      icon: (
+        <i className="icon-[solar--users-group-rounded-bold-duotone] w-6 h-6"></i>
+      ),
       name: "Characters",
-      content: <div key={2}>asdasd</div>,
+      content: <div key={2}>Characters</div>,
     },
     {
       id: 3,
-      icon: <i className="fa-solid fa-scroll"></i>,
+      icon: (
-      name: "Arcs",
+        <i className="icon-[solar--book-bookmark-bold-duotone] w-6 h-6"></i>
-      content: <div key={3}>asdasd</div>,
+      ),
+      name: "Story Arcs",
+      content: (
+        <div key={3}>
+          <button className="" onClick={() => getStoryArcs(comicObject?.data)}>
+            Get story arcs
+          </button>
+          {status === "pending" && <>{status}</>}
+          {!isEmpty(storyArcsData) && status === "success" && (
+            <>
+              <ul>
+                {storyArcsData.map((storyArc) => {
+                  return (
+                    <li>
+                      <span className="text-lg">{storyArc?.name}</span>
+                    </li>
+                  );
+                })}
+              </ul>
+            </>
+          )}
+        </div>
+      ),
     },
   ];
 
@@ -136,21 +234,26 @@ const VolumeDetails = (props): ReactElement => {
   const MetadataTabGroup = () => {
     return (
       <>
-        <div className="tabs">
+        <div className="hidden sm:block mt-7 mb-3 w-fit">
-          <ul>
+          <div className="border-b border-gray-200">
-            {tabGroup.map(({ id, name, icon }) => (
+            <nav className="flex gap-4" aria-label="Tabs">
-              <li
+              {tabGroup.map(({ id, name, icon }) => (
-                key={id}
+                <a
-                className={id === active ? "is-active" : ""}
+                  key={id}
-                onClick={() => setActive(id)}
+                  className={`inline-flex shrink-0 items-center gap-2 px-1 py-1 text-md font-medium text-gray-500 dark:text-gray-400 hover:border-gray-300 hover:border-b hover:dark:text-slate-200 ${
-              >
+                    active === id
-                <a>
+                      ? "border-b border-cyan-50 dark:text-slate-200"
-                  <span className="icon is-small">{icon}</span>
+                      : "border-b border-transparent"
+                  }`}
+                  aria-current="page"
+                  onClick={() => setActive(id)}
+                >
+                  <span className="pt-1">{icon}</span>
                   {name}
                 </a>
-              </li>
+              ))}
-            ))}
+            </nav>
-          </ul>
+          </div>
         </div>
         {tabGroup.map(({ id, content }) => {
           return active === id ? content : null;
@@ -158,97 +261,103 @@ const VolumeDetails = (props): ReactElement => {
       </>
     );
   };
-
+  if (isComicObjectFetchedSuccessfully && !isUndefined(comicObject.data)) {
-  if (
+    const { sourcedMetadata } = comicObject.data;
-    !isUndefined(comicBookDetails.sourcedMetadata) &&
-    !isUndefined(comicBookDetails.sourcedMetadata.comicvine.volumeInformation)
-  ) {
     return (
-      <div className="container volume-details">
+      <>
-        <div className="section">
+        <header className="bg-slate-200 dark:bg-slate-500">
-          {/* Title */}
+          <div className="mx-auto max-w-screen-xl px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
-          <h1 className="title">
+            <div className="sm:flex sm:items-center sm:justify-between">
-            {comicBookDetails.sourcedMetadata.comicvine.volumeInformation.name}
+              <div className="text-center sm:text-left">
-          </h1>
+                <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
-          <div className="columns is-multiline">
+                  Volumes
-            {/* Volume cover */}
+                </h1>
-            <div className="column is-narrow">
+
+                <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
+                  Browse your collection of volumes.
+                </p>
+              </div>
+            </div>
+          </div>
+        </header>
+        <div className="container mx-auto mt-4">
+          <div>
+            <div className="flex flex-row gap-4">
+              {/* Volume cover */}
               <Card
                 imageUrl={
-                  comicBookDetails.sourcedMetadata.comicvine.volumeInformation
+                  sourcedMetadata.comicvine.volumeInformation.image.small_url
-                    .image.small_url
                 }
-                cardContainerStyle={{ maxWidth: 275 }}
+                orientation={"cover-only"}
-                orientation={"vertical"}
                 hasDetails={false}
               />
-            </div>
 
-            <div className="column is-three-fifths">
-              <div className="field is-grouped mt-2">
-                {/* Comicvine Id */}
-                <div className="control">
-                  <div className="tags has-addons">
-                    <span className="tag">ComicVine Id</span>
-                    <span className="tag is-info is-light">
-                      {
-                        comicBookDetails.sourcedMetadata.comicvine
-                          .volumeInformation.id
-                      }
-                    </span>
-                  </div>
-                </div>
-                {/* Publisher */}
-                <div className="control">
-                  <div className="tags has-addons">
-                    <span className="tag is-warning is-light">Publisher</span>
-                    <span className="tag is-volume-related">
-                      {
-                        comicBookDetails.sourcedMetadata.comicvine
-                          .volumeInformation.publisher.name
-                      }
-                    </span>
-                  </div>
-                </div>
-              </div>
-
-              {/* Deck */}
               <div>
-                {!isEmpty(
+                <div className="field is-grouped">
-                  comicBookDetails.sourcedMetadata.comicvine.volumeInformation
+                  {/* Title */}
-                    .description,
+                  <span className="text-2xl">
-                )
+                    {sourcedMetadata.comicvine.volumeInformation.name}
-                  ? ellipsize(
+                  </span>
-                      convert(
+                  {/* Comicvine Id */}
-                        comicBookDetails.sourcedMetadata.comicvine
+                  <div className="control">
-                          .volumeInformation.description,
+                    <div className="tags has-addons">
+                      <span className="tag">ComicVine Id</span>
+                      <span className="tag is-info is-light">
+                        {sourcedMetadata.comicvine.volumeInformation.id}
+                      </span>
+                    </div>
+                  </div>
+                  {/* Publisher */}
+                  <div className="control">
+                    <div className="tags has-addons">
+                      <span className="tag is-warning is-light">Publisher</span>
+                      <span className="tag is-volume-related">
                         {
-                          baseElements: {
+                          sourcedMetadata.comicvine.volumeInformation.publisher
-                            selectors: ["p"],
+                            .name
+                        }
+                      </span>
+                    </div>
+                  </div>
+                </div>
+
+                {/* Deck */}
+                <div>
+                  {!isEmpty(
+                    sourcedMetadata.comicvine.volumeInformation.description,
+                  )
+                    ? ellipsize(
+                        convert(
+                          sourcedMetadata.comicvine.volumeInformation
+                            .description,
+                          {
+                            baseElements: {
+                              selectors: ["p"],
+                            },
                           },
-                        },
+                        ),
-                      ),
+                        300,
-                      300,
+                      )
-                    )
+                    : null}
-                  : null}
+                </div>
               </div>
+
+              {/* <pre>{JSON.stringify(issuesForVolume, undefined, 2)}</pre> */}
             </div>
-
+            <MetadataTabGroup />
-            {/* <pre>{JSON.stringify(issuesForVolume, undefined, 2)}</pre> */}
           </div>
-          <MetadataTabGroup />
-        </div>
 
-        <SlidingPane
+          <SlidingPane
-          isOpen={visible}
+            isOpen={visible}
-          onRequestClose={() => setVisible(false)}
+            onRequestClose={() => setVisible(false)}
-          title={"Potential Matches in Library"}
+            title={"Potential Matches in Library"}
-          width={"600px"}
+            width={"600px"}
-        >
+          >
-          {slidingPanelContentId !== "" &&
+            {slidingPanelContentId !== "" &&
-            contentForSlidingPanel[slidingPanelContentId].content()}
+              contentForSlidingPanel[slidingPanelContentId].content()}
-        </SlidingPane>
+          </SlidingPane>
-      </div>
+        </div>
+      </>
     );
   } else {
     return <></>;

src/client/components/Volumes/Volumes.tsx

@@ -4,6 +4,7 @@ import Card from "../shared/Carda";
 import T2Table from "../shared/T2Table";
 import ellipsize from "ellipsize";
 import { convert } from "html-to-text";
+import { Link } from "react-router-dom";
 import { useQuery } from "@tanstack/react-query";
 import axios from "axios";
 import { SEARCH_SERVICE_BASE_URI } from "../../constants/endpoints";
@@ -39,35 +40,39 @@ export const Volumes = (props): ReactElement => {
         header: "Volume Details",
         id: "volumeDetails",
         minWidth: 450,
-        accessorKey: "_source",
+        accessorFn: (row) => row,
         cell: (row): any => {
-          const foo = row.getValue();
+          const comicObject = row.getValue();
+          const {
+            _source: { sourcedMetadata },
+          } = comicObject;
+          console.log("jaggu", row.getValue());
           return (
             <div className="flex flex-row gap-3 mt-5">
-              <Card
+              <Link to={`/volume/details/${comicObject._id}`}>
-                imageUrl={
+                <Card
-                  foo.sourcedMetadata.comicvine.volumeInformation.image
+                  imageUrl={
-                    .small_url
+                    sourcedMetadata.comicvine.volumeInformation.image.small_url
-                }
+                  }
-                orientation={"cover-only"}
+                  orientation={"cover-only"}
-                hasDetails={false}
+                  hasDetails={false}
-              />
+                />
-              <div className="dark:bg-[#647587] bg-slate-200 p-3 rounded-lg h-fit">
+              </Link>
-                <span className="text-xl mb-1">
+              <div className="dark:bg-[#647587] bg-slate-200 rounded-lg w-3/4 h-fit p-3">
-                  {foo.sourcedMetadata.comicvine.volumeInformation.name}
+                <div className="text-xl mb-1 w-fit">
-                </span>
+                  {sourcedMetadata.comicvine.volumeInformation.name}
+                </div>
                 <p>
                   {ellipsize(
                     convert(
-                      foo.sourcedMetadata.comicvine.volumeInformation
+                      sourcedMetadata.comicvine.volumeInformation.description,
-                        .description,
                       {
                         baseElements: {
                           selectors: ["p"],
                         },
                       },
                     ),
-                    120,
+                    180,
                   )}
                 </p>
               </div>
@@ -162,6 +167,7 @@ export const Volumes = (props): ReactElement => {
                   nextPage: () => {},
                   previousPage: () => {},
                 }}
+                rowClickHandler={() => {}}
                 columns={columnData}
               />
             </div>

src/client/components/WantedComics/WantedComics.tsx

@@ -1,37 +1,87 @@
-import React, { ReactElement, useCallback, useEffect, useMemo } from "react";
+import React from "react";
-import SearchBar from "../Library/SearchBar";
+import { useQuery } from "@tanstack/react-query";
+import { gql, GraphQLClient } from "graphql-request";
 import T2Table from "../shared/T2Table";
 import MetadataPanel from "../shared/MetadataPanel";
-import { useQuery } from "@tanstack/react-query";
-import axios from "axios";
-import { SEARCH_SERVICE_BASE_URI } from "../../constants/endpoints";
 
-export const WantedComics = (props): ReactElement => {
+/**
-  const {
+ * GraphQL client for interfacing with Moleculer Apollo server.
-    data: wantedComics,
+ */
-    isSuccess,
+const client = new GraphQLClient("http://localhost:3000/graphql");
-    isFetched,
-    isError,
-    isLoading,
-  } = useQuery({
-    queryFn: async () =>
-      await axios({
-        url: `${SEARCH_SERVICE_BASE_URI}/searchIssue`,
-        method: "POST",
-        data: {
-          query: {},
 
-          pagination: {
+/**
-            size: 25,
+ * GraphQL query to fetch wanted comics.
-            from: 0,
+ */
-          },
+const WANTED_COMICS_QUERY = gql`
-          type: "wanted",
+  query {
-          trigger: "wantedComicsPage",
+    wantedComics(limit: 25, offset: 0) {
-        },
+      total
-      }),
+      comics
+    }
+  }
+`;
+
+/**
+ * Shape of an individual comic returned by the backend.
+ */
+type Comic = {
+  _id: string;
+  sourcedMetadata?: {
+    comicvine?: {
+      name?: string;
+      start_year?: string;
+      publisher?: {
+        name?: string;
+      };
+    };
+  };
+  acquisition?: {
+    directconnect?: {
+      downloads?: Array<{
+        name: string;
+      }>;
+    };
+  };
+};
+
+/**
+ * Shape of the GraphQL response returned for wanted comics.
+ */
+type WantedComicsResponse = {
+  wantedComics: {
+    total: number;
+    comics: Comic[];
+  };
+};
+
+/**
+ * React component rendering the "Wanted Comics" table using T2Table.
+ * Fetches data from GraphQL backend via graphql-request + TanStack Query.
+ *
+ * @component
+ * @returns {JSX.Element} React component
+ */
+const WantedComics = (): JSX.Element => {
+  const { data, isLoading, isError, isSuccess, error } = useQuery<
+    WantedComicsResponse["wantedComics"]
+  >({
     queryKey: ["wantedComics"],
-    enabled: true,
+    queryFn: async () => {
+      const res = await client.request<WantedComicsResponse>(
+        WANTED_COMICS_QUERY,
+      );
+
+      if (!res?.wantedComics?.comics) {
+        throw new Error("No comics returned");
+      }
+
+      return res.wantedComics;
+    },
+    retry: false,
+    refetchOnWindowFocus: false,
+    refetchOnReconnect: false,
   });
+
   const columnData = [
     {
       header: "Comic Information",
@@ -40,11 +90,11 @@ export const WantedComics = (props): ReactElement => {
           header: "Details",
           id: "comicDetails",
           minWidth: 350,
-          accessorFn: (data) => data,
+          accessorFn: (data: Comic) => data,
-          cell: (value) => {
+          cell: (value: any) => {
-            console.log("ASDASd", value);
+            const row = value.getValue();
-            const row = value.getValue()._source;
+            console.log("Comic row data:", row);
-            return row && <MetadataPanel data={row} />;
+            return row ? <MetadataPanel data={row} /> : null;
           },
         },
       ],
@@ -55,148 +105,73 @@ export const WantedComics = (props): ReactElement => {
         {
           header: "Files",
           align: "right",
-          accessorKey: "_source.acquisition",
+          accessorFn: (row: Comic) =>
-          cell: (props) => {
+            row?.acquisition?.directconnect?.downloads || [],
-            const {
+          cell: (props: any) => {
-              directconnect: { downloads },
+            const downloads = props.getValue();
-            } = props.getValue();
+            return downloads?.length > 0 ? (
-            return (
+              <span className="tag is-warning">{downloads.length}</span>
-              <div
+            ) : null;
-                style={{
-                  display: "flex",
-                  // flexDirection: "column",
-                  justifyContent: "center",
-                }}
-              >
-                {downloads.length > 0 ? (
-                  <span className="tag is-warning">{downloads.length}</span>
-                ) : null}
-              </div>
-            );
           },
         },
         {
           header: "Download Details",
           id: "downloadDetails",
-          accessorKey: "_source.acquisition",
+          accessorFn: (row: Comic) =>
-          cell: (data) => (
+            row?.acquisition?.directconnect?.downloads || [],
+          cell: (data: any) => (
             <ol>
-              {data.getValue().directconnect.downloads.map((download, idx) => {
+              {data.getValue()?.map((download: any, idx: number) => (
-                return (
+                <li className="is-size-7" key={idx}>
-                  <li className="is-size-7" key={idx}>
+                  {download.name}
-                    {download.name}
+                </li>
-                  </li>
+              ))}
-                );
-              })}
             </ol>
           ),
         },
-        {
-          header: "Type",
-          id: "dcc",
-        },
       ],
     },
   ];
 
-  /**
-   * Pagination control that fetches the next x (pageSize) items
-   * based on the y (pageIndex) offset from the Elasticsearch index
-   * @param {number} pageIndex
-   * @param {number} pageSize
-   * @returns void
-   *
-   **/
-  // const nextPage = useCallback((pageIndex: number, pageSize: number) => {
-  //   dispatch(
-  //     searchIssue(
-  //       {
-  //         query: {},
-  //       },
-  //       {
-  //         pagination: {
-  //           size: pageSize,
-  //           from: pageSize * pageIndex + 1,
-  //         },
-  //         type: "wanted",
-  //         trigger: "wantedComicsPage",
-  //       },
-  //     ),
-  //   );
-  // }, []);
-
-  /**
-   * Pagination control that fetches the previous x (pageSize) items
-   * based on the y (pageIndex) offset from the Elasticsearch index
-   * @param {number} pageIndex
-   * @param {number} pageSize
-   * @returns void
-   **/
-  // const previousPage = useCallback((pageIndex: number, pageSize: number) => {
-  //   let from = 0;
-  //   if (pageIndex === 2) {
-  //     from = (pageIndex - 1) * pageSize + 2 - 17;
-  //   } else {
-  //     from = (pageIndex - 1) * pageSize + 2 - 16;
-  //   }
-  //   dispatch(
-  //     searchIssue(
-  //       {
-  //         query: {},
-  //       },
-  //       {
-  //         pagination: {
-  //           size: pageSize,
-  //           from,
-  //         },
-  //         type: "wanted",
-  //         trigger: "wantedComicsPage",
-  //       },
-  //     ),
-  //   );
-  // }, []);
-
   return (
-    <div className="">
+    <section>
-      <section className="">
+      <header className="bg-slate-200 dark:bg-slate-500">
-        <header className="bg-slate-200 dark:bg-slate-500">
+        <div className="mx-auto max-w-screen-xl px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
-          <div className="mx-auto max-w-screen-xl px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
+          <div className="sm:flex sm:items-center sm:justify-between">
-            <div className="sm:flex sm:items-center sm:justify-between">
+            <div className="text-center sm:text-left">
-              <div className="text-center sm:text-left">
+              <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
-                <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
+                Wanted Comics
-                  Wanted Comics
+              </h1>
-                </h1>
+              <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
+                Browse through comics you marked as "wanted."
+              </p>
+            </div>
+          </div>
+        </div>
+      </header>
 
-                <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
+      {isLoading && (
-                  Browse through comics you marked as "wanted."
+        <div className="animate-pulse p-4 space-y-4">
-                </p>
+          {Array.from({ length: 5 }).map((_, idx) => (
-              </div>
+            <div
-            </div>
+              key={idx}
-          </div>
+              className="h-24 bg-slate-300 dark:bg-slate-600 rounded-md"
-        </header>
+            />
-        {isSuccess && wantedComics?.data.hits?.hits ? (
+          ))}
-          <div>
+        </div>
-            <div className="library">
+      )}
-              <T2Table
+      {isError && <div>Error fetching wanted comics. {error?.message}</div>}
-                sourceData={wantedComics?.data.hits.hits}
+      {isSuccess && data?.comics?.length > 0 ? (
-                totalPages={wantedComics?.data.hits.hits.length}
+        <T2Table
-                columns={columnData}
+          sourceData={data.comics}
-                paginationHandlers={{
+          totalPages={data.comics.length}
-                  nextPage: () => {},
+          columns={columnData}
-                  previousPage: () => {},
+          paginationHandlers={{}}
-                }}
+        />
-                // rowClickHandler={navigateToComicDetail}
+      ) : isSuccess ? (
-              />
+        <div>No comics found.</div>
-              {/* pagination controls */}
+      ) : null}
-            </div>
+    </section>
-          </div>
-        ) : null}
-        {isLoading ? <div>Loading...</div> : null}
-        {isError ? (
-          <div>An error occurred while retrieving the pull list.</div>
-        ) : null}
-      </section>
-    </div>
   );
 };
 

src/client/components/shared/Card.tsx

@@ -1,70 +0,0 @@
-import * as React from "react";
-import { IExtractedComicBookCoverFile } from "threetwo-ui-typings";
-import {
-  removeLeadingPeriod,
-  escapePoundSymbol,
-} from "../shared/utils/formatting.utils";
-import { isUndefined, isEmpty, isNil } from "lodash";
-import { Link } from "react-router-dom";
-import { LIBRARY_SERVICE_HOST } from "../constants/endpoints";
-import ellipsize from "ellipsize";
-
-interface IProps {
-  comicBookCoversMetadata?: IExtractedComicBookCoverFile;
-  mongoObjId?: number;
-  hasTitle: boolean;
-  title?: string;
-  isHorizontal: boolean;
-}
-interface IState {}
-
-class Card extends React.Component<IProps, IState> {
-  constructor(props: IProps) {
-    super(props);
-  }
-
-  public drawCoverCard = (
-    metadata: IExtractedComicBookCoverFile,
-  ): JSX.Element => {
-    const encodedFilePath = encodeURI(
-      `${LIBRARY_SERVICE_HOST}` + removeLeadingPeriod(metadata.path),
-    );
-    const filePath = escapePoundSymbol(encodedFilePath);
-    return (
-      <div>
-        <div className="card generic-card">
-          <div className={this.props.isHorizontal ? "is-horizontal" : ""}>
-            <div className="card-image">
-              <figure className="image">
-                <img src={filePath} alt="Placeholder image" />
-              </figure>
-            </div>
-            {this.props.hasTitle && (
-              <div className="card-content">
-                <ul>
-                  <Link to={"/comic/details/" + this.props.mongoObjId}>
-                    <li className="has-text-weight-semibold">
-                      {ellipsize(metadata.name, 18)}
-                    </li>
-                  </Link>
-                </ul>
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    );
-  };
-
-  public render() {
-    return (
-      <>
-        {!isUndefined(this.props.comicBookCoversMetadata) &&
-          !isEmpty(this.props.comicBookCoversMetadata) &&
-          this.drawCoverCard(this.props.comicBookCoversMetadata)}
-      </>
-    );
-  }
-}
-
-export default Card;

src/client/components/shared/Carda.tsx

@@ -11,8 +11,8 @@ interface ICardProps {
   borderColorClass?: string;
   backgroundColor?: string;
   onClick?: (event: React.MouseEvent<HTMLElement>) => void;
-  cardContainerStyle?: PropTypes.object;
+  cardContainerStyle?: any;
-  imageStyle?: PropTypes.object;
+  imageStyle?: any;
 }
 
 const renderCard = (props: ICardProps): ReactElement => {
@@ -83,11 +83,11 @@ const renderCard = (props: ICardProps): ReactElement => {
 
     case "vertical-2":
       return (
-        <div className="block rounded-md w-64 h-fit shadow-md shadow-white-400 bg-gray-200 dark:bg-slate-500">
+        <div className="block rounded-md max-w-64 h-fit shadow-md shadow-white-400 bg-gray-200 dark:bg-slate-500">
           <img
             alt="Home"
             src={props.imageUrl}
-            className="rounded-t-md object-cover"
+            className="rounded-t-md object-cover w-full"
           />
 
           {props.title ? (
@@ -140,14 +140,31 @@ const renderCard = (props: ICardProps): ReactElement => {
       );
 
     case "cover-only":
+      const containerStyle = {
+        width: props.cardContainerStyle?.width || "100%",
+        height: props.cardContainerStyle?.height || "auto",
+        maxWidth: props.cardContainerStyle?.maxWidth || "none",
+        ...props.cardContainerStyle,
+      };
+
+      const imageStyle = {
+        width: "100%",
+        height: "100%",
+        objectFit: "cover",
+        ...props.imageStyle,
+      };
+
       return (
-        <>
+        <div
-          {/* thumbnail */}
+          className={`rounded-2xl overflow-hidden shadow-md bg-white dark:bg-slate-800 ${
-          <div className="rounded-lg shadow-lg overflow-hidden w-fit h-fit">
+            props.cardContainerStyle?.height ? "" : "aspect-[2/3]"
-            <img src={props.imageUrl} />
+          }`}
-          </div>
+          style={containerStyle}
-        </>
+        >
+          <img src={props.imageUrl} alt="Comic cover" style={imageStyle} />
+        </div>
       );
+      
     case "card-with-info-panel":
       return (
         <>

src/client/components/shared/DatePicker.tsx

@@ -1,71 +1,42 @@
-import React, { ChangeEventHandler, useRef, useState } from "react";
+import React, { useRef, useState } from "react";
-
+import { format } from "date-fns";
-import { format, isValid, parse, parseISO } from "date-fns";
 import FocusTrap from "focus-trap-react";
-import { DayPicker, SelectSingleEventHandler } from "react-day-picker";
+import { ClassNames, DayPicker } from "react-day-picker";
-import { usePopper } from "react-popper";
+import { useFloating, offset, flip, autoUpdate } from "@floating-ui/react-dom";
+import styles from "react-day-picker/dist/style.module.css";
 
 export const DatePickerDialog = (props) => {
   const { setter, apiAction } = props;
   const [selected, setSelected] = useState<Date>();
   const [isPopperOpen, setIsPopperOpen] = useState(false);
 
-  const popperRef = useRef<HTMLDivElement>(null);
+  const classNames: ClassNames = {
-  const buttonRef = useRef<HTMLButtonElement>(null);
+    ...styles,
-  const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(
+    head: "custom-head",
-    null,
-  );
-
-  const customStyles = {
-    container: {
-      // Style for the entire container
-      border: "1px solid #ccc",
-      borderRadius: "4px",
-      padding: "10px",
-      width: "300px",
-    },
-    day: {
-      // Style for individual days
-
-      padding: "5px",
-      margin: "2px",
-    },
-    selected: {
-      // Style for selected days
-      backgroundColor: "#007bff",
-      color: "#fff",
-    },
-    disabled: {
-      // Style for disabled days
-      color: "#ccc",
-    },
-    today: {
-      // Style for today's date
-      backgroundColor: "#f0f0f0",
-    },
-    dayWrapper: {
-      // Style for the wrapper around each day
-      display: "inline-block",
-    },
   };
-
+  const buttonRef = useRef<HTMLButtonElement>(null);
-  const popper = usePopper(popperRef.current, popperElement, {
+  const { x, y, reference, floating, strategy, refs, update } = useFloating({
-    placement: "bottom-start",
+    placement: "bottom-end",
+    middleware: [offset(10), flip()],
+    strategy: "absolute",
   });
 
   const closePopper = () => {
     setIsPopperOpen(false);
-    buttonRef?.current?.focus();
+    buttonRef.current?.focus();
   };
 
   const handleButtonClick = () => {
     setIsPopperOpen(true);
+    if (refs.reference.current && refs.floating.current) {
+      autoUpdate(refs.reference.current, refs.floating.current, update);
+    }
   };
 
-  const handleDaySelect: SelectSingleEventHandler = (date) => {
+  const handleDaySelect = (date) => {
     setSelected(date);
     if (date) {
-      setter(format(date, "M-dd-yyyy"));
+      setter(format(date, "yyyy/MM/dd"));
       apiAction();
       closePopper();
     } else {
@@ -75,17 +46,14 @@ export const DatePickerDialog = (props) => {
 
   return (
     <div>
-      <div ref={popperRef}>
+      <div ref={reference}>
         <button
           ref={buttonRef}
           type="button"
           aria-label="Pick a date"
           onClick={handleButtonClick}
-          className="flex space-x-1 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-2 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+          className="flex space-x-1 mb-2 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-2 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
         >
-          <span className="pr-1 pt-0.5 h-8">
-            <span className="icon-[solar--calendar-date-bold-duotone] w-6 h-6"></span>
-          </span>
           Pick a date
         </button>
       </div>
@@ -101,11 +69,14 @@ export const DatePickerDialog = (props) => {
           }}
         >
           <div
-            tabIndex={-1}
+            ref={floating}
-            style={popper.styles.popper}
+            style={{
-            className="bg-slate-200 mt-3 p-2 rounded-lg z-50"
+              position: strategy,
-            {...popper.attributes.popper}
+              zIndex: "999",
-            ref={setPopperElement}
+              borderRadius: "10px",
+              boxShadow: "0 4px 6px rgba(0,0,0,0.1)", // Example of adding a shadow
+            }}
+            className="bg-slate-400 dark:bg-slate-500"
             role="dialog"
             aria-label="DayPicker calendar"
           >
@@ -115,7 +86,7 @@ export const DatePickerDialog = (props) => {
               defaultMonth={selected}
               selected={selected}
               onSelect={handleDaySelect}
-              styles={customStyles}
+              classNames={classNames}
             />
           </div>
         </FocusTrap>

src/client/components/shared/MetadataPanel.tsx

@@ -1,5 +1,4 @@
 import React, { ReactElement } from "react";
-import PropTypes from "prop-types";
 import ellipsize from "ellipsize";
 import prettyBytes from "pretty-bytes";
 import { Card } from "../shared/Carda";
@@ -7,26 +6,48 @@ import { convert } from "html-to-text";
 import { determineCoverFile } from "../../shared/utils/metadata.utils";
 import { find, isUndefined } from "lodash";
 
-interface IMetadatPanelProps {
+/**
-  value: any;
+ * Props for the MetadataPanel component.
-  children: any;
+ */
-  imageStyle: any;
+interface MetadataPanelProps {
-  titleStyle: any;
+  /**
-  tagsStyle: any;
+   * Comic metadata object passed into the panel.
-  containerStyle: any;
+   */
+  data: any;
+
+  /**
+   * Optional custom styling for the cover image.
+   */
+  imageStyle?: React.CSSProperties;
+
+  /**
+   * Optional custom styling for the title section.
+   */
+  titleStyle?: React.CSSProperties;
 }
-export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
+
+/**
+ * MetadataPanel component
+ *
+ * Displays structured comic metadata based on the best available source
+ * (raw file data, ComicVine, or League of Comic Geeks).
+ *
+ * @component
+ * @param {MetadataPanelProps} props
+ * @returns {ReactElement}
+ */
+export const MetadataPanel = (props: MetadataPanelProps): ReactElement => {
   const {
     rawFileDetails,
     inferredMetadata,
     sourcedMetadata: { comicvine, locg },
   } = props.data;
+
   const { issueName, url, objectReference } = determineCoverFile({
     comicvine,
     locg,
     rawFileDetails,
   });
-
   const metadataContentPanel = [
     {
       name: "rawFileDetails",
@@ -43,48 +64,29 @@ export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
             </span>
           </dd>
 
-          {/* Issue number */}
           {inferredMetadata.issue.number && (
             <dd className="my-2">
-              <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+              <span className="inline-flex items-center bg-slate-100 dark:bg-slate-400 text-slate-800 dark:text-slate-900 text-xs font-medium px-2 py-1 rounded-md">
-                <span className="pr-1 pt-1">
+                <i className="icon-[solar--hashtag-bold-duotone] w-4 h-4 mr-1 opacity-70"></i>
-                  <i className="icon-[solar--hashtag-outline] w-3.5 h-3.5"></i>
+                <span>{inferredMetadata.issue.number}</span>
-                </span>
-                <span className="text-md text-slate-900 dark:text-slate-900">
-                  {inferredMetadata.issue.number}
-                </span>
               </span>
             </dd>
           )}
+
           <dd className="flex flex-row gap-2 w-max">
-            {/* File extension */}
+            <span className="inline-flex items-center bg-slate-100 dark:bg-slate-400 text-slate-800 dark:text-slate-900 text-xs font-medium px-2 py-1 rounded-md">
-            <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+              <i className="icon-[solar--file-text-bold-duotone] w-4 h-4 mr-1 opacity-70" />
-              <span className="pr-1 pt-1">
+              {rawFileDetails.mimeType}
-                <i className="icon-[solar--zip-file-bold-duotone] w-5 h-5"></i>
-              </span>
-
-              <span className="text-md text-slate-500 dark:text-slate-900">
-                {rawFileDetails.mimeType}
-              </span>
             </span>
 
-            {/* size */}
+            <span className="inline-flex items-center bg-slate-100 dark:bg-slate-400 text-slate-800 dark:text-slate-900 text-xs font-medium px-2 py-1 rounded-md">
-            <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+              <i className="icon-[solar--database-bold-duotone] w-4 h-4 mr-1 opacity-70" />
-              <span className="pr-1 pt-1">
+              {prettyBytes(rawFileDetails.fileSize)}
-                <i className="icon-[solar--mirror-right-bold-duotone] w-5 h-5"></i>
-              </span>
-
-              <span className="text-md text-slate-500 dark:text-slate-900">
-                {prettyBytes(rawFileDetails.fileSize)}
-              </span>
             </span>
 
-            {/* Uncompressed version available? */}
             {rawFileDetails.archive?.uncompressed && (
               <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
-                <span className="pr-1 pt-1">
+                <i className="icon-[solar--bookmark-bold-duotone] w-3.5 h-3.5 pr-1 pt-1" />
-                  <i className="icon-[solar--bookmark-bold-duotone] w-3.5 h-3.5"></i>
-                </span>
               </span>
             )}
           </dd>
@@ -94,49 +96,56 @@ export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
 
     {
       name: "comicvine",
-      content: () =>
+      content: () => {
-        !isUndefined(comicvine) &&
+        return (
-        !isUndefined(comicvine.volumeInformation) && (
+          !isUndefined(comicvine?.volumeInformation) && (
-          <dl>
+            <dl className="space-y-1 text-sm text-slate-700 dark:text-slate-200">
-            <dt>
+              {/* Title */}
-              <h6
+              <dt className="text-base font-semibold text-slate-900 dark:text-white">
-                className="name has-text-weight-medium mb-1"
+                {ellipsize(issueName, 28)}
-                style={props.titleStyle}
+              </dt>
-              >
+
-                {ellipsize(issueName, 18)}
+              {/* Volume Name */}
-              </h6>
+              <dd>
-            </dt>
+                <span className="text-sm text-slate-600 dark:text-slate-300">
-            <dd>
+                  Part of{" "}
-              <span className="is-size-7">
+                  <span className="font-medium text-slate-800 dark:text-white">
-                Is a part of{" "}
+                    {comicvine.volumeInformation.name}
-                <span className="has-text-weight-semibold">
+                  </span>
-                  {comicvine.volumeInformation.name}
                 </span>
-              </span>
+              </dd>
-            </dd>
+
-            <dd className="is-size-7">
+              {/* Description */}
-              <span>
+              <dd className="text-slate-600 dark:text-slate-300">
                 {ellipsize(
-                  convert(comicvine.description, {
+                  convert(comicvine.description || "", {
-                    baseElements: {
+                    baseElements: { selectors: ["p"] },
-                      selectors: ["p"],
-                    },
                   }),
-                  120,
+                  160,
                 )}
-              </span>
+              </dd>
-            </dd>
+
-            <dd className="is-size-7 mt-2">
+              {/* Misc Info */}
-              <span className="my-3 mx-2">
+              <dd className="flex flex-wrap items-center gap-2 pt-2 text-xs text-slate-500 dark:text-slate-300">
-                {comicvine.volumeInformation.start_year}
+                <span className="inline-flex items-center bg-slate-100 dark:bg-slate-600 px-2 py-0.5 rounded-md">
-              </span>
+                  <i className="icon-[solar--calendar-bold-duotone] w-4 h-4 mr-1 opacity-70" />
-              {comicvine.volumeInformation.count_of_issues}
+                  {comicvine.volumeInformation.start_year}
-              ComicVine ID
+                </span>
-              {comicvine.id}
+                <span className="inline-flex items-center bg-slate-100 dark:bg-slate-600 px-2 py-0.5 rounded-md">
-            </dd>
+                  <i className="icon-[solar--book-bold-duotone] w-4 h-4 mr-1 opacity-70" />
-          </dl>
+                  {comicvine.volumeInformation.count_of_issues} issues
-        ),
+                </span>
+                <span className="inline-flex items-center bg-slate-100 dark:bg-slate-600 px-2 py-0.5 rounded-md">
+                  <i className="icon-[solar--hashtag-bold-duotone] w-4 h-4 mr-1 opacity-70" />
+                  ID: {comicvine.id}
+                </span>
+              </dd>
+            </dl>
+          )
+        );
+      },
     },
+
     {
       name: "locg",
       content: () => (
@@ -147,23 +156,22 @@ export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
             </h6>
           </dt>
           <dd className="is-size-7">
-            <span>{ellipsize(locg.description, 120)}</span>
+            <span>{ellipsize(locg?.description || "", 120)}</span>
           </dd>
-
           <dd className="is-size-7 mt-2">
             <div className="field is-grouped is-grouped-multiline">
               <div className="control">
                 <span className="tags">
                   <span className="tag is-success is-light has-text-weight-semibold">
-                    {locg.price}
+                    {locg?.price}
                   </span>
-                  <span className="tag is-success is-light">{locg.pulls}</span>
+                  <span className="tag is-success is-light">{locg?.pulls}</span>
                 </span>
               </div>
               <div className="control">
                 <div className="tags has-addons">
                   <span className="tag is-primary is-light">rating</span>
-                  <span className="tag is-info is-light">{locg.rating}</span>
+                  <span className="tag is-info is-light">{locg?.rating}</span>
                 </div>
               </div>
             </div>
@@ -173,20 +181,19 @@ export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
     },
   ];
 
-  // Find the panel to display
   const metadataPanel = find(metadataContentPanel, {
     name: objectReference,
   });
-
   return (
     <div className="flex gap-5 my-3">
       <Card
         imageUrl={url}
-        orientation={"cover-only"}
+        orientation="cover-only"
         hasDetails={false}
         imageStyle={props.imageStyle}
+        cardContainerStyle={{ width: "190px", maxWidth: "230px" }}
       />
-      <div>{metadataPanel.content()}</div>
+      <div>{metadataPanel?.content()}</div>
     </div>
   );
 };

src/client/components/shared/Navbar.tsx

@@ -1,312 +0,0 @@
-import React from "react";
-import { SearchBar } from "../GlobalSearchBar/SearchBar";
-import { DownloadProgressTick } from "../ComicDetail/DownloadProgressTick";
-import { Link } from "react-router-dom";
-import { isEmpty, isNil, isUndefined } from "lodash";
-import { format, fromUnixTime } from "date-fns";
-import { useStore } from "../../store/index";
-import { useShallow } from "zustand/react/shallow";
-
-const Navbar: React.FunctionComponent = (props) => {
-  const {
-    airDCPPSocketConnected,
-    airDCPPDisconnectionInfo,
-    airDCPPSessionInformation,
-    airDCPPDownloadTick,
-    importJobQueue,
-  } = useStore(
-    useShallow((state) => ({
-      airDCPPSocketConnected: state.airDCPPSocketConnected,
-      airDCPPDisconnectionInfo: state.airDCPPDisconnectionInfo,
-      airDCPPSessionInformation: state.airDCPPSessionInformation,
-      airDCPPDownloadTick: state.airDCPPDownloadTick,
-      importJobQueue: state.importJobQueue,
-    })),
-  );
-  //   const downloadProgressTick = useSelector(
-  //     (state: RootState) => state.airdcpp.downloadProgressData,
-  //   );
-  //
-  //   const airDCPPSocketConnectionStatus = useSelector(
-  //     (state: RootState) => state.airdcpp.isAirDCPPSocketConnected,
-  //   );
-  //   const airDCPPSessionInfo = useSelector(
-  //     (state: RootState) => state.airdcpp.airDCPPSessionInfo,
-  //   );
-  //   const socketDisconnectionReason = useSelector(
-  //     (state: RootState) => state.airdcpp.socketDisconnectionReason,
-  //   );
-
-  return (
-    <nav className="navbar is-fixed-top">
-      <div className="navbar-brand">
-        <Link to="/dashboard" className="navbar-item">
-          <img
-            src="/src/client/assets/img/threetwo.svg"
-            alt="ThreeTwo! A comic book curator"
-            width="112"
-            height="28"
-          />
-        </Link>
-
-        <a className="navbar-item is-hidden-desktop">
-          <span className="icon">
-            <i className="fas fa-github"></i>
-          </span>
-        </a>
-
-        <a className="navbar-item is-hidden-desktop">
-          <span className="icon">
-            <i className="fas fa-twitter"></i>
-          </span>
-        </a>
-
-        <div className="navbar-burger burger" data-target="navMenubd-example">
-          <span></span>
-          <span></span>
-          <span></span>
-        </div>
-      </div>
-
-      <div id="navMenubd-example" className="navbar-menu">
-        <div className="navbar-start">
-          <Link to="/" className="navbar-item">
-            Dashboard
-          </Link>
-
-          <Link to="/import" className="navbar-item">
-            Import
-          </Link>
-
-          <Link to="/library" className="navbar-item">
-            Library
-          </Link>
-
-          <Link to="/downloads" className="navbar-item">
-            Downloads
-          </Link>
-
-          {/* <SearchBar /> */}
-
-          <Link to="/search" className="navbar-item">
-            Search ComicVine
-          </Link>
-        </div>
-
-        <div className="navbar-end">
-          <a className="navbar-item is-hidden-desktop-only"></a>
-
-          <div className="navbar-item has-dropdown is-hoverable">
-            <a className="navbar-link is-arrowless">
-              <i className="fa-solid fa-download"></i>
-              {!isEmpty(airDCPPDownloadTick) && (
-                <div className="pulsating-circle"></div>
-              )}
-            </a>
-            {!isEmpty(airDCPPDownloadTick) ? (
-              <div className="navbar-dropdown is-right is-boxed">
-                <a className="navbar-item">
-                  <DownloadProgressTick data={airDCPPDownloadTick} />
-                </a>
-              </div>
-            ) : null}
-          </div>
-
-          {!isUndefined(importJobQueue.status) &&
-          location.hash !== "#/import" ? (
-            <div className="navbar-item has-dropdown is-hoverable">
-              <a className="navbar-link is-arrowless">
-                <i className="fa-solid fa-file-import has-text-warning-dark"></i>
-              </a>
-
-              <div className="navbar-dropdown is-right is-boxed">
-                <a className="navbar-item">
-                  <ul>
-                    {importJobQueue.successfulJobCount > 0 ? (
-                      <li className="mb-2">
-                        <span className="tag is-success mr-2">
-                          {importJobQueue.successfulJobCount}
-                        </span>
-                        imported.
-                      </li>
-                    ) : null}
-                    {importJobQueue.failedJobCount > 0 ? (
-                      <li>
-                        <span className="tag is-danger mr-2">
-                          {importJobQueue.failedJobCount}
-                        </span>
-                        failed to import.
-                      </li>
-                    ) : null}
-                  </ul>
-                </a>
-              </div>
-            </div>
-          ) : null}
-
-          {/* AirDC++ socket connection status */}
-          <div className="navbar-item has-dropdown is-hoverable">
-            {!isUndefined(airDCPPSessionInformation.user) ? (
-              <>
-                <a className="navbar-link is-arrowless has-text-success">
-                  <i className="fa-solid fa-bolt"></i>
-                </a>
-                <div className="navbar-dropdown pr-2 pl-2 is-right airdcpp-status is-boxed">
-                  {/* AirDC++ Session Information */}
-
-                  <p>
-                    Last login was{" "}
-                    <span className="tag">
-                      {format(
-                        fromUnixTime(
-                          airDCPPSessionInformation?.user.last_login,
-                        ),
-                        "dd MMMM, yyyy",
-                      )}
-                    </span>
-                  </p>
-                  <hr className="navbar-divider" />
-                  <p>
-                    <span className="tag has-text-success">
-                      {airDCPPSessionInformation.user.username}
-                    </span>
-                    connected to{" "}
-                    <span className="tag has-text-success">
-                      {airDCPPSessionInformation.system_info.client_version}
-                    </span>{" "}
-                    with session ID{" "}
-                    <span className="tag has-text-success">
-                      {airDCPPSessionInformation.session_id}
-                    </span>
-                  </p>
-                </div>
-              </>
-            ) : (
-              <>
-                <a className="navbar-link is-arrowless has-text-danger">
-                  <i className="fa-solid fa-bolt"></i>
-                </a>
-                <div className="navbar-dropdown pr-2 pl-2 is-right is-boxed">
-                  <pre>{JSON.stringify(airDCPPDisconnectionInfo, null, 2)}</pre>
-                </div>
-              </>
-            )}
-          </div>
-
-          <div className="navbar-item has-dropdown is-hoverable is-mega">
-            <div className="navbar-link flex">Blog</div>
-            <div id="blogDropdown" className="navbar-dropdown">
-              <div className="container is-fluid">
-                <div className="columns">
-                  <div className="column">
-                    <h1 className="title is-6 is-mega-menu-title">
-                      Sub Menu Title
-                    </h1>
-                    <a className="navbar-item" href="/2017/08/03/list-of-tags/">
-                      <div className="navbar-content">
-                        <p>
-                          <small className="has-text-info">03 Aug 2017</small>
-                        </p>
-                        <p>New feature: list of tags</p>
-                      </div>
-                    </a>
-                    <a className="navbar-item" href="/2017/08/03/list-of-tags/">
-                      <div className="navbar-content">
-                        <p>
-                          <small className="has-text-info">03 Aug 2017</small>
-                        </p>
-                        <p>New feature: list of tags</p>
-                      </div>
-                    </a>
-                    <a className="navbar-item" href="/2017/08/03/list-of-tags/">
-                      <div className="navbar-content">
-                        <p>
-                          <small className="has-text-info">03 Aug 2017</small>
-                        </p>
-                        <p>New feature: list of tags</p>
-                      </div>
-                    </a>
-                  </div>
-                  <div className="column">
-                    <h1 className="title is-6 is-mega-menu-title">
-                      Sub Menu Title
-                    </h1>
-
-                    <a
-                      className="navbar-item "
-                      href="http://bulma.io/documentation/columns/basics/"
-                    >
-                      Columns
-                    </a>
-                  </div>
-                  <div className="column">
-                    <h1 className="title is-6 is-mega-menu-title">
-                      Sub Menu Title
-                    </h1>
-
-                    <a className="navbar-item" href="/2017/08/03/list-of-tags/">
-                      <div className="navbar-content">
-                        <p>
-                          <small className="has-text-info">03 Aug 2017</small>
-                        </p>
-                        <p>New feature: list of tags</p>
-                      </div>
-                    </a>
-                  </div>
-                  <div className="column">
-                    <h1 className="title is-6 is-mega-menu-title">
-                      Sub Menu Title
-                    </h1>
-                    <a
-                      className="navbar-item "
-                      href="/documentation/overview/start/"
-                    >
-                      Overview
-                    </a>
-                  </div>
-                </div>
-              </div>
-
-              <hr className="navbar-divider" />
-              <div className="navbar-item">
-                <div className="navbar-content">
-                  <div className="level is-mobile">
-                    <div className="level-left">
-                      <div className="level-item">
-                        <strong>Stay up to date!</strong>
-                      </div>
-                    </div>
-                    <div className="level-right">
-                      <div className="level-item">
-                        <a
-                          className="button bd-is-rss is-small"
-                          href="http://bulma.io/atom.xml"
-                        >
-                          <span className="icon is-small">
-                            <i className="fa fa-rss"></i>
-                          </span>
-                          <span>Subscribe</span>
-                        </a>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div className="navbar-item">
-            <div className="field is-grouped">
-              <p className="control">
-                <Link to="/settings" className="navbar-item">
-                  Settings
-                </Link>
-              </p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-  );
-};
-
-export default Navbar;

src/client/components/shared/Navbar2.tsx

@@ -98,7 +98,7 @@ export const Navbar2 = (): ReactElement => {
               <li>
                 {/* Light/Dark Mode toggle */}
                 <div className="flex items-center space-x-2">
-                  <span className="text-gray-600 dark:text-white">Light</span>
+                  <span className="text-gray-600 dark:text-white">Dark</span>
                   <label
                     htmlFor="toggle"
                     className="relative inline-flex items-center"
@@ -117,7 +117,7 @@ export const Navbar2 = (): ReactElement => {
                       }`}
                     ></span>
                   </label>
-                  <span className="text-gray-600 dark:text-white">Dark</span>
+                  <span className="text-gray-600 dark:text-white">Light</span>
                 </div>
               </li>
             </ul>

src/client/components/shared/PopoverButton.tsx

@@ -0,0 +1,45 @@
+import React, { useState } from "react";
+import { useFloating, offset, flip } from "@floating-ui/react-dom";
+import { useTranslation } from "react-i18next";
+import "../../shared/utils/i18n.util"; // Ensure you import your i18n configuration
+
+const PopoverButton = ({ content, clickHandler }) => {
+  const [isVisible, setIsVisible] = useState(false);
+  // Use destructuring to obtain the reference and floating setters, among other values.
+  const { x, y, refs, strategy, floatingStyles } = useFloating({
+    placement: "right",
+    middleware: [offset(8), flip()],
+    strategy: "absolute",
+  });
+  const { t } = useTranslation();
+  return (
+    <div>
+      {/* Apply the reference setter directly to the ref prop */}
+      <button
+        ref={refs.setReference}
+        onMouseEnter={() => setIsVisible(true)}
+        onMouseLeave={() => setIsVisible(false)}
+        onFocus={() => setIsVisible(true)}
+        onBlur={() => setIsVisible(false)}
+        aria-describedby="popover"
+        className="flex text-sm space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-1.5 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+        onClick={clickHandler}
+      >
+        <i className="icon-[solar--add-square-bold-duotone] w-6 h-6 mr-2"></i>{" "}
+        Mark as Wanted
+      </button>
+      {isVisible && (
+        <div
+          ref={refs.setFloating} // Apply the floating setter directly to the ref prop
+          style={floatingStyles}
+          className="text-xs bg-slate-400 p-1.5 rounded-md"
+          role="tooltip"
+        >
+          {content}
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default PopoverButton;

src/client/components/shared/T2Table.tsx

@@ -1,5 +1,4 @@
 import React, { ReactElement, useMemo, useState } from "react";
-import PropTypes from "prop-types";
 import {
   ColumnDef,
   flexRender,
@@ -9,7 +8,19 @@ import {
   PaginationState,
 } from "@tanstack/react-table";
 
-export const T2Table = (tableOptions): ReactElement => {
+interface T2TableProps {
+  sourceData?: unknown[];
+  totalPages?: number;
+  columns?: unknown[];
+  paginationHandlers?: {
+    nextPage?(...args: unknown[]): unknown;
+    previousPage?(...args: unknown[]): unknown;
+  };
+  rowClickHandler?(...args: unknown[]): unknown;
+  children?: any;
+}
+
+export const T2Table = (tableOptions: T2TableProps): ReactElement => {
   const {
     sourceData,
     columns,
@@ -60,7 +71,7 @@ export const T2Table = (tableOptions): ReactElement => {
     columns,
     manualPagination: true,
     getCoreRowModel: getCoreRowModel(),
-    pageCount: sourceData.length ?? -1,
+    pageCount: sourceData?.length ?? -1,
     state: {
       pagination,
     },
@@ -70,42 +81,47 @@ export const T2Table = (tableOptions): ReactElement => {
   return (
     <div className="container max-w-fit mx-14">
       <div>
-        <div className="flex flex-row gap-2 justify-between mt-7">
+        <div className="flex flex-row gap-2 justify-between mt-6 mb-4">
           {/* Search bar */}
           {tableOptions.children}
-          {/* pagination controls */}
+
-          <div>
+          {/* Pagination controls */}
-            Page {pageIndex} of {Math.ceil(totalPages / pageSize)}
+          <div className="text-sm text-gray-800 dark:text-slate-200">
-            <p>{totalPages} comics in all</p>
+            <div className="mb-1">
-            {/* Prev/Next buttons */}
+              Page {pageIndex} of {Math.ceil(totalPages / pageSize)}
-            <div className="inline-flex flex-row mt-4 mb-4">
+            </div>
+            <p className="text-xs text-gray-600 dark:text-slate-400">
+              {totalPages} comics in all
+            </p>
+            <div className="inline-flex flex-row mt-3">
               <button
                 onClick={() => goToPreviousPage()}
                 disabled={pageIndex === 1}
-                className="dark:bg-slate-500 bg-slate-400 rounded-l border-slate-600 border-r pt-2 px-2"
+                className="dark:bg-slate-400 bg-gray-300 rounded-l px-2 py-1 border-r border-slate-600"
               >
-                <i className="icon-[solar--arrow-left-linear] h-6 w-6"></i>
+                <i className="icon-[solar--arrow-left-linear] h-5 w-5"></i>
               </button>
               <button
-                className="dark:bg-slate-500 bg-slate-400 rounded-r pt-2 px-2"
+                className="dark:bg-slate-400 bg-gray-300 rounded-r px-2 py-1"
                 onClick={() => goToNextPage()}
                 disabled={pageIndex > Math.floor(totalPages / pageSize)}
               >
-                <i className="icon-[solar--arrow-right-linear] h-6 w-6"></i>
+                <i className="icon-[solar--arrow-right-linear] h-5 w-5"></i>
               </button>
             </div>
           </div>
         </div>
       </div>
-      <table className="table-auto overflow-auto">
+
-        <thead className="sticky top-0 bg-slate-200 dark:bg-slate-500">
+      <table className="table-auto w-full text-sm text-gray-900 dark:text-slate-100 border-separate border-spacing-0">
-          {table.getHeaderGroups().map((headerGroup, idx) => (
+        <thead className="sticky top-0 bg-white dark:bg-slate-900 z-10 border-b border-gray-300 dark:border-slate-700">
+          {table.getHeaderGroups().map((headerGroup) => (
             <tr key={headerGroup.id}>
-              {headerGroup.headers.map((header, idx) => (
+              {headerGroup.headers.map((header) => (
                 <th
                   key={header.id}
                   colSpan={header.colSpan}
-                  className="px-3 py-3"
+                  className="px-3 py-2 text-[11px] font-semibold tracking-wide uppercase text-left text-gray-500 dark:text-slate-400"
                 >
                   {header.isPlaceholder
                     ? null
@@ -120,37 +136,23 @@ export const T2Table = (tableOptions): ReactElement => {
         </thead>
 
         <tbody>
-          {table.getRowModel().rows.map((row, idx) => {
+          {table.getRowModel().rows.map((row) => (
-            return (
+            <tr
-              <tr key={row.id} onClick={() => rowClickHandler(row)}>
+              key={row.id}
-                {row.getVisibleCells().map((cell) => {
+              onClick={() => rowClickHandler(row)}
-                  return (
+              className="border-b border-gray-200 dark:border-slate-700 hover:bg-gray-50 dark:hover:bg-slate-800 transition-colors"
-                    <td key={cell.id} className="align-top">
+            >
-                      {flexRender(
+              {row.getVisibleCells().map((cell) => (
-                        cell.column.columnDef.cell,
+                <td key={cell.id} className="px-3 py-2 align-top">
-                        cell.getContext(),
+                  {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                      )}
+                </td>
-                    </td>
+              ))}
-                  );
+            </tr>
-                })}
+          ))}
-              </tr>
-            );
-          })}
         </tbody>
       </table>
     </div>
   );
 };
 
-T2Table.propTypes = {
-  sourceData: PropTypes.array,
-  totalPages: PropTypes.number,
-  columns: PropTypes.array,
-  paginationHandlers: PropTypes.shape({
-    nextPage: PropTypes.func,
-    previousPage: PropTypes.func,
-  }),
-  rowClickHandler: PropTypes.func,
-  children: PropTypes.any,
-};
 export default T2Table;

src/client/constants/endpoints.ts

@@ -104,3 +104,10 @@ export const TORRENT_JOB_SERVICE_BASE_URI = hostURIBuilder({
   port: "3000",
   apiPath: `/api/torrentjobs`,
 });
+
+export const AIRDCPP_SERVICE_BASE_URI = hostURIBuilder({
+  protocol: "http",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  port: "3000",
+  apiPath: `/api/airdcpp`,
+});

src/client/constants/settings/settingsMenu.json

@@ -9,8 +9,8 @@
         "displayName": "Dashboard"
       },
       {
-        "id": "gen-gls",
+        "id": "gen-docker-vars",
-        "displayName": "Global Search"
+        "displayName": "Docker ENV vars"
       }
     ]
   },

src/client/context/SocketIOContext.tsx

@@ -1,11 +0,0 @@
-import React, { createContext } from "react";
-
-export const SocketIOContext = createContext({});
-
-export const SocketIOProvider = ({ children, socket }) => {
-  return (
-    <SocketIOContext.Provider value={socket}>
-      {children}
-    </SocketIOContext.Provider>
-  );
-};

src/client/hooks/useBlazeSlider.tsx

@@ -1,16 +0,0 @@
-import React, { useEffect } from "react";
-import BlazeSlider from "blaze-slider";
-
-export const useBlazeSlider = (config) => {
-  const sliderRef = React.useRef();
-  const elRef = React.useRef();
-
-  useEffect(() => {
-    // if not already initialized
-    if (!sliderRef.current) {
-      sliderRef.current = new BlazeSlider(elRef.current, config);
-    }
-  }, []);
-
-  return elRef;
-};

src/client/index.tsx

@@ -7,6 +7,7 @@ import Settings from "./components/Settings/Settings";
 import { ErrorPage } from "./components/shared/ErrorPage";
 const rootEl = document.getElementById("root");
 const root = createRoot(rootEl);
+import i18n from "./shared/utils/i18n.util";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import Import from "./components/Import/Import";
 import Dashboard from "./components/Dashboard/Dashboard";
@@ -14,6 +15,7 @@ import Search from "./components/Search/Search";
 import TabulatedContentContainer from "./components/Library/TabulatedContentContainer";
 import { ComicDetailContainer } from "./components/ComicDetail/ComicDetailContainer";
 import Volumes from "./components/Volumes/Volumes";
+import VolumeDetails from "./components/VolumeDetail/VolumeDetail";
 import WantedComics from "./components/WantedComics/WantedComics";
 
 const queryClient = new QueryClient();
@@ -37,6 +39,7 @@ const router = createBrowserRouter([
       },
       { path: "import", element: <Import path={"./comics"} /> },
       { path: "search", element: <Search /> },
+      { path: "volume/details/:comicObjectId", element: <VolumeDetails /> },
       { path: "volumes", element: <Volumes /> },
       { path: "wanted", element: <WantedComics /> },
     ],

src/client/locales/en/translation.json

@@ -0,0 +1,4 @@
+{
+  "issueWithCount_one": "{{count}} issue",
+  "issueWithCount_other": "{{count}} issues"
+}

src/client/reducers/airdcpp.reducer.ts

@@ -1,133 +0,0 @@
-import {
-  AIRDCPP_SEARCH_IN_PROGRESS,
-  AIRDCPP_SEARCH_RESULTS_ADDED,
-  AIRDCPP_SEARCH_RESULTS_UPDATED,
-  AIRDCPP_HUB_SEARCHES_SENT,
-  AIRDCPP_RESULT_DOWNLOAD_INITIATED,
-  AIRDCPP_DOWNLOAD_PROGRESS_TICK,
-  AIRDCPP_FILE_DOWNLOAD_COMPLETED,
-  AIRDCPP_BUNDLES_FETCHED,
-  AIRDCPP_TRANSFERS_FETCHED,
-  LIBRARY_ISSUE_BUNDLES,
-  AIRDCPP_SOCKET_CONNECTED,
-  AIRDCPP_SOCKET_DISCONNECTED,
-} from "../constants/action-types";
-import { LOCATION_CHANGE } from "redux-first-history";
-import { isNil, isUndefined } from "lodash";
-import { difference } from "../shared/utils/object.utils";
-
-const initialState = {
-  searchResults: [],
-  isAirDCPPSearchInProgress: false,
-  searchInfo: null,
-  searchInstance: null,
-  downloadResult: null,
-  bundleDBImportResult: null,
-  downloadFileStatus: {},
-  bundles: [],
-  transfers: [],
-  isAirDCPPSocketConnected: false,
-  airDCPPSessionInfo: {},
-  socketDisconnectionReason: {},
-};
-
-function airdcppReducer(state = initialState, action) {
-  switch (action.type) {
-    case AIRDCPP_SEARCH_RESULTS_ADDED:
-      return {
-        ...state,
-        searchResults: [...state.searchResults, action.groupedResult],
-        isAirDCPPSearchInProgress: true,
-      };
-    case AIRDCPP_SEARCH_RESULTS_UPDATED:
-      const bundleToUpdateIndex = state.searchResults.findIndex(
-        (bundle) => bundle.result.id === action.groupedResult.result.id,
-      );
-      const updatedState = [...state.searchResults];
-
-      if (
-        !isNil(
-          difference(updatedState[bundleToUpdateIndex], action.groupedResult),
-        )
-      ) {
-        updatedState[bundleToUpdateIndex] = action.groupedResult;
-      }
-
-      return {
-        ...state,
-        searchResults: updatedState,
-      };
-    case AIRDCPP_SEARCH_IN_PROGRESS:
-      return {
-        ...state,
-        isAirDCPPSearchInProgress: true,
-      };
-    case AIRDCPP_HUB_SEARCHES_SENT:
-      return {
-        ...state,
-        isAirDCPPSearchInProgress: false,
-        searchInfo: action.searchInfo,
-        searchInstance: action.instance,
-      };
-    case AIRDCPP_RESULT_DOWNLOAD_INITIATED:
-      return {
-        ...state,
-        downloadResult: action.downloadResult,
-        bundleDBImportResult: action.bundleDBImportResult,
-      };
-    case AIRDCPP_DOWNLOAD_PROGRESS_TICK:
-      return {
-        ...state,
-        downloadProgressData: action.downloadProgressData,
-      };
-    case AIRDCPP_BUNDLES_FETCHED:
-      return {
-        ...state,
-        bundles: action.bundles,
-      };
-    case LIBRARY_ISSUE_BUNDLES:
-      return {
-        ...state,
-        issue_bundles: action.issue_bundles,
-      };
-    case AIRDCPP_FILE_DOWNLOAD_COMPLETED:
-      console.log("COMPLETED", action);
-      return {
-        ...state,
-      };
-    case AIRDCPP_TRANSFERS_FETCHED:
-      return {
-        ...state,
-        transfers: action.bundles,
-      };
-
-    case AIRDCPP_SOCKET_CONNECTED:
-      return {
-        ...state,
-        isAirDCPPSocketConnected: true,
-        airDCPPSessionInfo: action.data,
-      };
-
-    case AIRDCPP_SOCKET_DISCONNECTED:
-      return {
-        ...state,
-        isAirDCPPSocketConnected: false,
-        socketDisconnectionReason: action.data,
-      };
-    case LOCATION_CHANGE:
-      return {
-        ...state,
-        searchResults: [],
-        isAirDCPPSearchInProgress: false,
-        searchInfo: null,
-        searchInstance: null,
-        downloadResult: null,
-        bundleDBImportResult: null,
-        // bundles: [],
-      };
-    default:
-      return state;
-  }
-}
-
-export default airdcppReducer;

src/client/reducers/comicinfo.reducer.ts

@@ -1,138 +0,0 @@
-import { isEmpty } from "lodash";
-import {
-  CV_API_CALL_IN_PROGRESS,
-  CV_SEARCH_SUCCESS,
-  CV_CLEANUP,
-  IMS_COMIC_BOOK_DB_OBJECT_FETCHED,
-  IMS_COMIC_BOOKS_DB_OBJECTS_FETCHED,
-  IMS_COMIC_BOOK_DB_OBJECT_CALL_IN_PROGRESS,
-  CV_ISSUES_METADATA_CALL_IN_PROGRESS,
-  CV_ISSUES_MATCHES_IN_LIBRARY_FETCHED,
-  CV_ISSUES_FOR_VOLUME_IN_LIBRARY_SUCCESS,
-  CV_WEEKLY_PULLLIST_FETCHED,
-  CV_WEEKLY_PULLLIST_CALL_IN_PROGRESS,
-  LIBRARY_STATISTICS_CALL_IN_PROGRESS,
-  LIBRARY_STATISTICS_FETCHED,
-} from "../constants/action-types";
-
-const initialState = {
-  pullList: [],
-  libraryStatistics: [],
-  searchResults: [],
-  searchQuery: {},
-  inProgress: false,
-  comicBookDetail: {},
-  comicBooksDetails: [],
-  issuesForVolume: [],
-  IMS_inProgress: false,
-};
-
-function comicinfoReducer(state = initialState, action) {
-  switch (action.type) {
-    case CV_API_CALL_IN_PROGRESS:
-      return {
-        ...state,
-        inProgress: true,
-      };
-    case CV_SEARCH_SUCCESS:
-      return {
-        ...state,
-        searchResults: action.searchResults,
-        searchQuery: action.searchQueryObject,
-        inProgress: false,
-      };
-    case IMS_COMIC_BOOK_DB_OBJECT_CALL_IN_PROGRESS:
-      return {
-        ...state,
-        IMS_inProgress: true,
-      };
-
-    case IMS_COMIC_BOOK_DB_OBJECT_FETCHED:
-      return {
-        ...state,
-        comicBookDetail: action.comicBookDetail,
-        IMS_inProgress: false,
-      };
-    case IMS_COMIC_BOOKS_DB_OBJECTS_FETCHED:
-      return {
-        ...state,
-        comicBooksDetails: action.comicBooks,
-        IMS_inProgress: false,
-      };
-    case CV_CLEANUP:
-      return {
-        ...state,
-        searchResults: [],
-        searchQuery: {},
-        issuesForVolume: [],
-      };
-    case CV_ISSUES_METADATA_CALL_IN_PROGRESS:
-      return {
-        inProgress: true,
-        ...state,
-      };
-
-    case CV_ISSUES_FOR_VOLUME_IN_LIBRARY_SUCCESS:
-      return {
-        ...state,
-        issuesForVolume: action.issues,
-        inProgress: false,
-      };
-
-    case CV_ISSUES_MATCHES_IN_LIBRARY_FETCHED:
-      const updatedState = [...state.issuesForVolume];
-      action.matches.map((match) => {
-        updatedState.map((issue, idx) => {
-          const matches = [];
-          if (!isEmpty(match.hits.hits)) {
-            return match.hits.hits.map((hit) => {
-              if (
-                parseInt(issue.issue_number, 10) ===
-                hit._source.inferredMetadata.issue.number
-              ) {
-                matches.push(hit);
-                const updatedIssueResult = { ...issue, matches };
-                updatedState[idx] = updatedIssueResult;
-              }
-            });
-          }
-        });
-      });
-      return {
-        ...state,
-        issuesForVolume: updatedState,
-      };
-
-    case CV_WEEKLY_PULLLIST_CALL_IN_PROGRESS:
-      return {
-        inProgress: true,
-        ...state,
-      };
-    case CV_WEEKLY_PULLLIST_FETCHED: {
-      const foo = [];
-      action.data.map((item) => {
-        foo.push({issue: item})
-      });
-      return {
-        ...state,
-        inProgress: false,
-        pullList: foo,
-      };
-    }
-    case LIBRARY_STATISTICS_CALL_IN_PROGRESS:
-      return {
-        inProgress: true,
-        ...state,
-      };
-    case LIBRARY_STATISTICS_FETCHED:
-      return {
-        ...state,
-        inProgress: false,
-        libraryStatistics: action.data,
-      };
-    default:
-      return state;
-  }
-}
-
-export default comicinfoReducer;

src/client/reducers/fileops.reducer.ts

@@ -1,334 +0,0 @@
-import { isUndefined, map } from "lodash";
-import { LOCATION_CHANGE } from "redux-first-history";
-import { determineCoverFile } from "../shared/utils/metadata.utils";
-import {
-  IMS_COMICBOOK_METADATA_FETCHED,
-  IMS_RAW_IMPORT_SUCCESSFUL,
-  IMS_RAW_IMPORT_FAILED,
-  IMS_RECENT_COMICS_FETCHED,
-  IMS_WANTED_COMICS_FETCHED,
-  WANTED_COMICS_FETCHED,
-  IMS_CV_METADATA_IMPORT_SUCCESSFUL,
-  IMS_CV_METADATA_IMPORT_FAILED,
-  IMS_CV_METADATA_IMPORT_CALL_IN_PROGRESS,
-  IMS_COMIC_BOOK_GROUPS_CALL_IN_PROGRESS,
-  IMS_COMIC_BOOK_GROUPS_FETCHED,
-  IMS_COMIC_BOOK_GROUPS_CALL_FAILED,
-  IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_IN_PROGRESS,
-  LS_IMPORT,
-  LS_COVER_EXTRACTED,
-  LS_COVER_EXTRACTION_FAILED,
-  LS_COMIC_ADDED,
-  IMG_ANALYSIS_CALL_IN_PROGRESS,
-  IMG_ANALYSIS_DATA_FETCH_SUCCESS,
-  SS_SEARCH_RESULTS_FETCHED,
-  SS_SEARCH_IN_PROGRESS,
-  FILEOPS_STATE_RESET,
-  LS_IMPORT_CALL_IN_PROGRESS,
-  SS_SEARCH_FAILED,
-  SS_SEARCH_RESULTS_FETCHED_SPECIAL,
-  VOLUMES_FETCHED,
-  COMICBOOK_EXTRACTION_SUCCESS,
-  LIBRARY_SERVICE_HEALTH,
-  LS_IMPORT_QUEUE_DRAINED,
-  LS_SET_QUEUE_STATUS,
-  RESTORE_JOB_COUNTS_AFTER_SESSION_RESTORATION,
-  LS_IMPORT_JOB_STATISTICS_FETCHED,
-} from "../constants/action-types";
-import { removeLeadingPeriod } from "../shared/utils/formatting.utils";
-import { LIBRARY_SERVICE_HOST } from "../constants/endpoints";
-
-const initialState = {
-  IMSCallInProgress: false,
-  IMGCallInProgress: false,
-  SSCallInProgress: false,
-  imageAnalysisResults: {},
-  comicBookExtractionInProgress: false,
-  LSQueueImportStatus: undefined,
-  comicBookMetadata: [],
-  comicVolumeGroups: [],
-  isSocketConnected: false,
-  isComicVineMetadataImportInProgress: false,
-  comicVineMetadataImportError: {},
-  rawImportError: {},
-  extractedComicBookArchive: {
-    reading: [],
-    analysis: [],
-  },
-  recentComics: [],
-  wantedComics: [],
-  libraryComics: [],
-  volumes: [],
-  librarySearchResultsFormatted: [],
-  lastQueueJob: "",
-  successfulJobCount: 0,
-  failedJobCount: 0,
-  importJobStatistics: [],
-  libraryQueueResults: [],
-  librarySearchError: {},
-  libraryServiceStatus: {},
-};
-function fileOpsReducer(state = initialState, action) {
-  switch (action.type) {
-    case IMS_COMICBOOK_METADATA_FETCHED:
-      return {
-        ...state,
-        comicBookMetadata: [...state.comicBookMetadata, action.data],
-        IMSCallInProgress: false,
-      };
-
-    case LS_IMPORT_CALL_IN_PROGRESS: {
-      return {
-        ...state,
-        IMSCallInProgress: true,
-      };
-    }
-    case IMS_RAW_IMPORT_SUCCESSFUL:
-      return {
-        ...state,
-        rawImportDetails: action.rawImportDetails,
-      };
-    case IMS_RAW_IMPORT_FAILED:
-      return {
-        ...state,
-        rawImportErorr: action.rawImportError,
-      };
-    case IMS_RECENT_COMICS_FETCHED:
-      return {
-        ...state,
-        recentComics: action.data.docs,
-      };
-    case IMS_WANTED_COMICS_FETCHED:
-      return {
-        ...state,
-        wantedComics: action.data,
-      };
-    case IMS_CV_METADATA_IMPORT_SUCCESSFUL:
-      return {
-        ...state,
-        isComicVineMetadataImportInProgress: false,
-        comicVineMetadataImportDetails: action.importResult,
-      };
-    case IMS_CV_METADATA_IMPORT_CALL_IN_PROGRESS:
-      return {
-        ...state,
-        isComicVineMetadataImportInProgress: true,
-      };
-    case IMS_CV_METADATA_IMPORT_FAILED:
-      return {
-        ...state,
-        isComicVineMetadataImportInProgress: false,
-        comicVineMetadataImportError: action.importError,
-      };
-    case IMS_COMIC_BOOK_GROUPS_CALL_IN_PROGRESS: {
-      return {
-        ...state,
-        IMSCallInProgress: true,
-      };
-    }
-    case IMS_COMIC_BOOK_GROUPS_FETCHED: {
-      return {
-        ...state,
-        comicVolumeGroups: action.data,
-        IMSCallInProgress: false,
-      };
-    }
-    case IMS_COMIC_BOOK_GROUPS_CALL_FAILED: {
-      return {
-        ...state,
-        IMSCallInProgress: false,
-        error: action.error,
-      };
-    }
-    case IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_IN_PROGRESS: {
-      return {
-        ...state,
-        comicBookExtractionInProgress: true,
-      };
-    }
-
-    case LOCATION_CHANGE: {
-      return {
-        ...state,
-        extractedComicBookArchive: [],
-      };
-    }
-
-    case LS_IMPORT: {
-      return {
-        ...state,
-        LSQueueImportStatus: "running",
-      };
-    }
-
-    case LS_COVER_EXTRACTED: {
-      if (state.recentComics.length === 5) {
-        state.recentComics.pop();
-      }
-      return {
-        ...state,
-        successfulJobCount: action.completedJobCount,
-        lastQueueJob: action.importResult.rawFileDetails.name,
-        recentComics: [...state.recentComics, action.importResult],
-      };
-    }
-
-    case LS_COVER_EXTRACTION_FAILED: {
-      return {
-        ...state,
-        failedJobCount: action.failedJobCount,
-      };
-    }
-
-    case LS_IMPORT_QUEUE_DRAINED: {
-      localStorage.removeItem("sessionId");
-      return {
-        ...state,
-        LSQueueImportStatus: "drained",
-      };
-    }
-
-    case RESTORE_JOB_COUNTS_AFTER_SESSION_RESTORATION: {
-      console.log("Restoring state for an active import in progress...");
-      return {
-        ...state,
-        successfulJobCount: action.completedJobCount,
-        failedJobCount: action.failedJobCount,
-        LSQueueImportStatus: action.queueStatus,
-      };
-    }
-
-    case LS_SET_QUEUE_STATUS: {
-      return {
-        ...state,
-        LSQueueImportStatus: action.data.queueStatus,
-      };
-    }
-
-    case LS_IMPORT_JOB_STATISTICS_FETCHED: {
-      return {
-        ...state,
-        importJobStatistics: action.data,
-      };
-    }
-
-    case COMICBOOK_EXTRACTION_SUCCESS: {
-      const comicBookPages: string[] = [];
-      map(action.result.files, (page) => {
-        const pageFilePath = removeLeadingPeriod(page);
-        const imagePath = encodeURI(`${LIBRARY_SERVICE_HOST}${pageFilePath}`);
-        comicBookPages.push(imagePath);
-      });
-
-      switch (action.result.purpose) {
-        case "reading":
-          return {
-            ...state,
-            extractedComicBookArchive: {
-              reading: comicBookPages,
-            },
-            comicBookExtractionInProgress: false,
-          };
-
-        case "analysis":
-          return {
-            ...state,
-            extractedComicBookArchive: {
-              analysis: comicBookPages,
-            },
-            comicBookExtractionInProgress: false,
-          };
-      }
-    }
-
-    case LS_COMIC_ADDED: {
-      return {
-        ...state,
-      };
-    }
-    case IMG_ANALYSIS_CALL_IN_PROGRESS: {
-      return {
-        ...state,
-        IMGCallInProgress: true,
-      };
-    }
-    case IMG_ANALYSIS_DATA_FETCH_SUCCESS: {
-      return {
-        ...state,
-        imageAnalysisResults: action.result,
-      };
-    }
-
-    case SS_SEARCH_IN_PROGRESS: {
-      return {
-        ...state,
-        SSCallInProgress: true,
-      };
-    }
-
-    case SS_SEARCH_RESULTS_FETCHED: {
-      return {
-        ...state,
-        libraryComics: action.data,
-        SSCallInProgress: false,
-      };
-    }
-    case SS_SEARCH_RESULTS_FETCHED_SPECIAL: {
-      const foo = [];
-      if (!isUndefined(action.data.hits)) {
-        map(action.data.hits, ({ _source }) => {
-          foo.push(_source);
-        });
-      }
-      return {
-        ...state,
-        librarySearchResultsFormatted: foo,
-        SSCallInProgress: false,
-      };
-    }
-    case WANTED_COMICS_FETCHED: {
-      const foo = [];
-      if (!isUndefined(action.data.hits)) {
-        map(action.data.hits, ({ _source }) => {
-          foo.push(_source);
-        });
-      }
-      return {
-        ...state,
-        wantedComics: foo,
-        SSCallInProgress: false,
-      };
-    }
-
-    case VOLUMES_FETCHED:
-      return {
-        ...state,
-        volumes: action.data,
-        SSCallInProgress: false,
-      };
-
-    case SS_SEARCH_FAILED: {
-      return {
-        ...state,
-        librarySearchError: action.data,
-        SSCallInProgress: false,
-      };
-    }
-    case LIBRARY_SERVICE_HEALTH: {
-      return {
-        ...state,
-        libraryServiceStatus: action.status,
-      };
-    }
-    case FILEOPS_STATE_RESET: {
-      return {
-        ...state,
-        imageAnalysisResults: {},
-      };
-    }
-    default:
-      return state;
-  }
-}
-
-export default fileOpsReducer;

src/client/reducers/index.js

@@ -1,11 +0,0 @@
-import comicinfoReducer from "../reducers/comicinfo.reducer";
-import fileOpsReducer from "../reducers/fileops.reducer";
-import airdcppReducer from "../reducers/airdcpp.reducer";
-// import settingsReducer from "../reducers/settings.reducer";
-
-export const reducers = {
-  comicInfo: comicinfoReducer,
-  fileOps: fileOpsReducer,
-  airdcpp: airdcppReducer,
-  // settings: settingsReducer,
-};

src/client/reducers/settings.reducer.ts

@@ -1,67 +0,0 @@
-import { createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
-import { RootState } from "../store";
-import { isUndefined } from "lodash";
-import { SETTINGS_SERVICE_BASE_URI } from "../constants/endpoints";
-
-export interface InitialState {
-  data: object;
-  inProgress: boolean;
-  dbFlushed: boolean;
-  torrentsList: Array<any>;
-}
-const initialState: InitialState = {
-  data: {},
-  inProgress: false,
-  dbFlushed: false,
-  torrentsList: [],
-};
-
-export const settingsSlice = createSlice({
-  name: "settings",
-  initialState,
-  reducers: {
-    SETTINGS_CALL_IN_PROGRESS: (state) => {
-      state.inProgress = true;
-    },
-
-    SETTINGS_OBJECT_FETCHED: (state, action) => {
-      state.data = action.payload;
-      state.inProgress = false;
-    },
-
-    SETTINGS_OBJECT_DELETED: (state, action) => {
-      state.data = action.payload;
-      state.inProgress = false;
-    },
-
-    SETTINGS_DB_FLUSH_SUCCESS: (state, action) => {
-      state.dbFlushed = action.payload;
-      state.inProgress = false;
-    },
-
-    SETTINGS_QBITTORRENT_TORRENTS_LIST_FETCHED: (state, action) => {
-      console.log(state);
-      console.log(action);
-      state.torrentsList = action.payload;
-    },
-  },
-});
-
-export const {
-  SETTINGS_CALL_IN_PROGRESS,
-  SETTINGS_OBJECT_FETCHED,
-  SETTINGS_OBJECT_DELETED,
-  SETTINGS_DB_FLUSH_SUCCESS,
-  SETTINGS_QBITTORRENT_TORRENTS_LIST_FETCHED,
-} = settingsSlice.actions;
-
-// Other code such as selectors can use the imported `RootState` type
-export const torrentsList = (state: RootState) => state.settings.torrentsList;
-export const qBittorrentSettings = (state: RootState) => {
-  console.log(state);
-  if (!isUndefined(state.settings?.data?.bittorrent)) {
-    return state.settings?.data?.bittorrent.client.host;
-  }
-};
-export default settingsSlice.reducer;

src/client/shared/middleware/SocketIOMiddleware.tsx

@@ -1,11 +0,0 @@
-const socketIOMiddleware = (socket) => {
-  return (store) => (next) => (action) => {
-    if (action.type === "EMIT_SOCKET_EVENT") {
-      const { event, data } = action.payload;
-      socket.emit(event, data);
-    }
-    return next(action);
-  };
-};
-
-export default socketIOMiddleware;

src/client/shared/socket.io/instance.tsx

@@ -1,10 +0,0 @@
-import io from "socket.io-client";
-import { SOCKET_BASE_URI } from "../../constants/endpoints";
-const sessionId = localStorage.getItem("sessionId");
-const socketIOConnectionInstance = io(SOCKET_BASE_URI, {
-  transports: ["websocket"],
-  withCredentials: true,
-  query: { sessionId },
-});
-
-export default socketIOConnectionInstance;

src/client/shared/utils/i18n.util.ts

@@ -0,0 +1,25 @@
+// i18n.js
+import i18n from "i18next";
+import { initReactI18next } from "react-i18next";
+import HttpBackend from "i18next-http-backend";
+import LanguageDetector from "i18next-browser-languagedetector";
+
+i18n
+  // Learn more about options: https://www.i18next.com/overview/configuration-options
+  .use(HttpBackend) // Load translations over http
+  .use(LanguageDetector) // Detect language automatically
+  .use(initReactI18next) // Pass i18n instance to react-i18next
+  .init({
+    lng: "en", // Specify the language
+    fallbackLng: "en",
+    debug: true,
+    interpolation: {
+      escapeValue: false, // Not needed for React
+    },
+    backend: {
+      // path where resources get loaded from
+      loadPath: "./src/client/locales/en/translation.json",
+    },
+  });
+
+export default i18n;

src/client/shared/utils/metadata.utils.ts

@@ -1,11 +1,12 @@
-import { filter, isEmpty, isUndefined, min, minBy } from "lodash";
+import { filter, isEmpty, isNil, isUndefined, min, minBy } from "lodash";
 import { LIBRARY_SERVICE_HOST } from "../../constants/endpoints";
 import { escapePoundSymbol } from "./formatting.utils";
 
-export const determineCoverFile = (data) => {
+export const determineCoverFile = (data): any => {
   /* For a payload like this:
   const foo = {
     rawFileDetails: {}, // #1
+    wanted: {}, 
     comicInfo: {},
     comicvine: {}, // #2
     locg: {}, // #3
@@ -19,36 +20,44 @@ export const determineCoverFile = (data) => {
       issueName: "",
       publisher: "",
     },
+    wanted: {
+      objectReference: "wanted",
+      priority: 2,
+      url: "",
+      issueName: "",
+      publisher: "",
+    },
     comicvine: {
       objectReference: "comicvine",
-      priority: 2,
+      priority: 3,
       url: "",
       issueName: "",
       publisher: "",
     },
     locg: {
       objectReference: "locg",
-      priority: 3,
+      priority: 4,
       url: "",
       issueName: "",
       publisher: "",
     },
   };
-  if (
+  // comicvine
-    !isUndefined(data.comicvine) &&
+  if (!isEmpty(data.comicvine)) {
-    !isUndefined(data.comicvine.volumeInformation)
+    coverFile.comicvine.url = data?.comicvine?.image.small_url;
-  ) {
+    coverFile.comicvine.issueName = data.comicvine?.name;
-    coverFile.comicvine.url = data.comicvine.image.small_url;
+    coverFile.comicvine.publisher = data.comicvine?.publisher?.name;
-    coverFile.comicvine.issueName = data.comicvine.name;
-    coverFile.comicvine.publisher = data.comicvine.volumeInformation.publisher;
   }
-  if (!isEmpty(data.rawFileDetails.cover)) {
+  // rawFileDetails
+  if (!isEmpty(data.rawFileDetails)) {
     const encodedFilePath = encodeURI(
       `${LIBRARY_SERVICE_HOST}/${data.rawFileDetails.cover.filePath}`,
     );
     coverFile.rawFile.url = escapePoundSymbol(encodedFilePath);
     coverFile.rawFile.issueName = data.rawFileDetails.name;
   }
+  // wanted
+
   if (!isUndefined(data.locg)) {
     coverFile.locg.url = data.locg.cover;
     coverFile.locg.issueName = data.locg.name;
@@ -69,25 +78,30 @@ export const determineCoverFile = (data) => {
 
 export const determineExternalMetadata = (
   metadataSource: string,
-  source: any
+  source: any,
-) => {
+): any => {
-  switch (metadataSource) {
+  if (!isNil(source)) {
-    case "comicvine":
+    switch (metadataSource) {
-      return {
+      case "comicvine":
-        coverURL: source.comicvine.image.small_url,
+        return {
-        issue: source.comicvine.name,
+          coverURL:
-        icon: "cvlogo.svg",
+            source.comicvine?.image.small_url ||
-      };
+            source.comicvine.volumeInformation?.image.small_url,
-    case "locg":
+          issue: source.comicvine.name,
-      return {
+          icon: "cvlogo.svg",
-        coverURL: source.locg.cover,
+        };
-        issue: source.locg.name,
+      case "locg":
-        icon: "locglogo.svg",
+        return {
-      };
+          coverURL: source.locg.cover,
-    case undefined:
+          issue: source.locg.name,
-      return {};
+          icon: "locglogo.svg",
+        };
+      case undefined:
+        return {};
 
-    default:
+      default:
-      break;
+        break;
+    }
   }
-};
+  return null;
+};

src/client/shared/utils/tradepaperback.utils.ts

@@ -16,6 +16,7 @@ export const detectIssueTypes = (deck: string): any => {
   const matches = map(issueTypeMatchers, (matcher) => {
     return getIssueTypeDisplayName(deck, matcher.regex, matcher.displayName);
   });
+
   return compact(matches)[0];
 };
 

src/client/store/index.ts

@@ -1,271 +1,177 @@
 import { create } from "zustand";
-import { isNil } from "lodash";
+import io, { Socket } from "socket.io-client";
-import io from "socket.io-client";
 import { SOCKET_BASE_URI } from "../constants/endpoints";
-import { produce } from "immer";
+import { isNil } from "lodash";
-import AirDCPPSocket from "../services/DcppSearchService";
+import { toast } from "react-toastify";
-import axios from "axios";
+import "react-toastify/dist/ReactToastify.min.css";
-import { QueryClient } from "@tanstack/react-query";
 
-/*  Broadly, this file sets up:
+// Type for global state
- *    1. The zustand-based global client state
+interface StoreState {
- *    2. socket.io client
+  socketInstances: Record<string, Socket>;
- *    3. AirDC++ websocket connection
+  getSocket: (namespace?: string) => Socket;
- */
+  disconnectSocket: (namespace: string) => void;
-export const useStore = create((set, get) => ({
+  queryClientRef: { current: any } | null;
-  // AirDC++ state
+  setQueryClientRef: (ref: any) => void;
-  airDCPPSocketInstance: {},
+
-  airDCPPSocketConnected: false,
+  comicvine: {
-  airDCPPDisconnectionInfo: {},
+    scrapingStatus: string;
-  airDCPPClientConfiguration: {},
+  };
-  airDCPPSessionInformation: {},
+
-  setAirDCPPSocketConnectionStatus: () =>
+  importJobQueue: {
-    set((value) => ({
+    successfulJobCount: number;
-      airDCPPSocketConnected: value,
+    failedJobCount: number;
-    })),
+    status: string | undefined;
-  airDCPPDownloadTick: {},
+    mostRecentImport: string | null;
-  airDCPPTransfers: {},
+
-  // Socket.io state
+    setStatus: (status: string) => void;
-  socketIOInstance: {},
+    setJobCount: (jobType: string, count: number) => void;
+    setMostRecentImport: (fileName: string) => void;
+  };
+}
+
+export const useStore = create<StoreState>((set, get) => ({
+  socketInstances: {},
+  queryClientRef: null,
+  setQueryClientRef: (ref: any) => set({ queryClientRef: ref }),
+
+  getSocket: (namespace = "/") => {
+    const fullNamespace = namespace === "/" ? "" : namespace;
+    const existing = get().socketInstances[namespace];
+
+    if (existing && existing.connected) return existing;
+
+    const sessionId = localStorage.getItem("sessionId");
+    const socket = io(`${SOCKET_BASE_URI}${fullNamespace}`, {
+      transports: ["websocket"],
+      withCredentials: true,
+      query: { sessionId },
+    });
+
+    socket.on("connect", () => {
+      console.log(`✅ Connected to ${namespace}:`, socket.id);
+    });
+
+    if (sessionId) {
+      socket.emit("call", "socket.resumeSession", { sessionId, namespace });
+    } else {
+      socket.on("sessionInitialized", (id) => {
+        localStorage.setItem("sessionId", id);
+      });
+    }
+
+    socket.on("RESTORE_JOB_COUNTS_AFTER_SESSION_RESTORATION", (data) => {
+      const { completedJobCount, failedJobCount, queueStatus } = data;
+      set((state) => ({
+        importJobQueue: {
+          ...state.importJobQueue,
+          successfulJobCount: completedJobCount,
+          failedJobCount,
+          status: queueStatus,
+        },
+      }));
+    });
+
+    socket.on("LS_COVER_EXTRACTED", ({ completedJobCount, importResult }) => {
+      set((state) => ({
+        importJobQueue: {
+          ...state.importJobQueue,
+          successfulJobCount: completedJobCount,
+          mostRecentImport: importResult.data.rawFileDetails.name,
+        },
+      }));
+    });
+
+    socket.on("LS_COVER_EXTRACTION_FAILED", ({ failedJobCount }) => {
+      set((state) => ({
+        importJobQueue: {
+          ...state.importJobQueue,
+          failedJobCount,
+        },
+      }));
+    });
+
+    socket.on("LS_IMPORT_QUEUE_DRAINED", () => {
+      localStorage.removeItem("sessionId");
+      set((state) => ({
+        importJobQueue: {
+          ...state.importJobQueue,
+          status: "drained",
+        },
+      }));
+      const queryClientRef = get().queryClientRef;
+      if (queryClientRef?.current) {
+        queryClientRef.current.invalidateQueries({ queryKey: ["allImportJobResults"] });
+      }
+    });
+
+    socket.on("CV_SCRAPING_STATUS", (data) => {
+      set((state) => ({
+        comicvine: {
+          ...state.comicvine,
+          scrapingStatus: data.message,
+        },
+      }));
+    });
+
+    socket.on("searchResultsAvailable", (data) => {
+      toast(`Results found for query: ${JSON.stringify(data.query, null, 2)}`);
+    });
+
+    set((state) => ({
+      socketInstances: {
+        ...state.socketInstances,
+        [namespace]: socket,
+      },
+    }));
+
+    return socket;
+  },
+
+  disconnectSocket: (namespace: string) => {
+    const socket = get().socketInstances[namespace];
+    if (socket) {
+      socket.disconnect();
+      set((state) => {
+        const { [namespace]: _, ...rest } = state.socketInstances;
+        return { socketInstances: rest };
+      });
+    }
+  },
 
-  // ComicVine Scraping status
   comicvine: {
     scrapingStatus: "",
   },
 
-  // Import job queue and associated statuses
   importJobQueue: {
     successfulJobCount: 0,
     failedJobCount: 0,
     status: undefined,
-    setStatus: (status: string) =>
-      set(
-        produce((draftState) => {
-          draftState.importJobQueue.status = status;
-        }),
-      ),
-    setJobCount: (jobType: string, count: Number) => {
-      switch (jobType) {
-        case "successful":
-          set(
-            produce((draftState) => {
-              draftState.importJobQueue.successfulJobCount = count;
-            }),
-          );
-          break;
-
-        case "failed":
-          set(
-            produce((draftState) => {
-              draftState.importJobQueue.failedJobCount = count;
-            }),
-          );
-          break;
-      }
-    },
     mostRecentImport: null,
-    setMostRecentImport: (fileName: string) => {
+
-      set(
+    setStatus: (status: string) =>
-        produce((state) => {
+      set((state) => ({
-          state.importJobQueue.mostRecentImport = fileName;
+        importJobQueue: {
-        }),
+          ...state.importJobQueue,
-      );
+          status,
-    },
+        },
+      })),
+
+    setJobCount: (jobType: string, count: number) =>
+      set((state) => ({
+        importJobQueue: {
+          ...state.importJobQueue,
+          ...(jobType === "successful"
+            ? { successfulJobCount: count }
+            : { failedJobCount: count }),
+        },
+      })),
+
+    setMostRecentImport: (fileName: string) =>
+      set((state) => ({
+        importJobQueue: {
+          ...state.importJobQueue,
+          mostRecentImport: fileName,
+        },
+      })),
   },
 }));
-
-const { getState, setState } = useStore;
-const queryClient = new QueryClient();
-
-/** Socket.IO initialization **/
-// 1. Fetch sessionId from localStorage
-const sessionId = localStorage.getItem("sessionId");
-// 2. socket.io instantiation
-const socketIOInstance = io(SOCKET_BASE_URI, {
-  transports: ["websocket"],
-  withCredentials: true,
-  query: { sessionId },
-});
-// 3. Set the instance in global state
-setState({
-  socketIOInstance,
-});
-
-// Socket.io-based session restoration
-if (!isNil(sessionId)) {
-  // 1. Resume the session
-  socketIOInstance.emit(
-    "call",
-    "socket.resumeSession",
-    {
-      sessionId,
-    },
-    (data) => console.log(data),
-  );
-} else {
-  // 1. Inititalize the session and persist the sessionId to localStorage
-  socketIOInstance.on("sessionInitialized", (sessionId) => {
-    localStorage.setItem("sessionId", sessionId);
-  });
-}
-// 2. If a job is in progress, restore the job counts and persist those to global state
-socketIOInstance.on("RESTORE_JOB_COUNTS_AFTER_SESSION_RESTORATION", (data) => {
-  console.log("Active import in progress detected; restoring counts...");
-  const { completedJobCount, failedJobCount, queueStatus } = data;
-  setState((state) => ({
-    importJobQueue: {
-      ...state.importJobQueue,
-      successfulJobCount: completedJobCount,
-      failedJobCount,
-      status: queueStatus,
-    },
-  }));
-});
-
-// 1a.  Act on each comic issue successfully imported/failed, as indicated
-//      by the LS_COVER_EXTRACTED/LS_COVER_EXTRACTION_FAILED events
-socketIOInstance.on("LS_COVER_EXTRACTED", (data) => {
-  const { completedJobCount, importResult } = data;
-  setState((state) => ({
-    importJobQueue: {
-      ...state.importJobQueue,
-      successfulJobCount: completedJobCount,
-      mostRecentImport: importResult.rawFileDetails.name,
-    },
-  }));
-});
-socketIOInstance.on("LS_COVER_EXTRACTION_FAILED", (data) => {
-  const { failedJobCount } = data;
-  setState((state) => ({
-    importJobQueue: {
-      ...state.importJobQueue,
-      failedJobCount,
-    },
-  }));
-});
-
-// 1b.  Clear the localStorage sessionId upon receiving the
-//      LS_IMPORT_QUEUE_DRAINED event
-socketIOInstance.on("LS_IMPORT_QUEUE_DRAINED", (data) => {
-  localStorage.removeItem("sessionId");
-  setState((state) => ({
-    importJobQueue: {
-      ...state.importJobQueue,
-      status: "drained",
-    },
-  }));
-  console.log("a", queryClient);
-  queryClient.invalidateQueries({ queryKey: ["allImportJobResults"] });
-});
-
-// ComicVine Scraping status
-socketIOInstance.on("CV_SCRAPING_STATUS", (data) => {
-  setState((state) => ({
-    comicvine: {
-      ...state.comicvine,
-      scrapingStatus: data.message,
-    },
-  }));
-});
-
-/**
- * Method to init AirDC++ Socket with supplied settings
- * @param configuration - credentials, and hostname details to init AirDC++ connection
- * @returns Initialized AirDC++ connection socket instance
- */
-export const initializeAirDCPPSocket = async (configuration): Promise<any> => {
-  try {
-    console.log("[AirDCPP]: Initializing socket...");
-
-    const initializedAirDCPPSocket = new AirDCPPSocket({
-      protocol: `${configuration.protocol}`,
-      hostname: `${configuration.hostname}:${configuration.port}`,
-      username: `${configuration.username}`,
-      password: `${configuration.password}`,
-    });
-
-    // Set up connect and disconnect handlers
-    initializedAirDCPPSocket.onConnected = (sessionInfo) => {
-      // update global state with socket connection status
-      setState({
-        airDCPPSocketConnected: true,
-      });
-    };
-    initializedAirDCPPSocket.onDisconnected = async (
-      reason,
-      code,
-      wasClean,
-    ) => {
-      // update global state with socket connection status
-      setState({
-        disconnectionInfo: { reason, code, wasClean },
-        airDCPPSocketConnected: false,
-      });
-    };
-    // AirDC++ Socket-related connection and post-connection
-    // Attempt connection
-    const airDCPPSessionInformation = await initializedAirDCPPSocket.connect();
-    setState({
-      airDCPPSessionInformation,
-    });
-
-    // Set up event listeners
-    initializedAirDCPPSocket.addListener(
-      `queue`,
-      "queue_bundle_tick",
-      async (downloadProgressData) => {
-        console.log(downloadProgressData);
-        setState({
-          airDCPPDownloadTick: downloadProgressData,
-        });
-      },
-    );
-    initializedAirDCPPSocket.addListener(
-      "queue",
-      "queue_bundle_added",
-      async (data) => {
-        console.log("JEMEN:", data);
-      },
-    );
-
-    initializedAirDCPPSocket.addListener(
-      `queue`,
-      "queue_bundle_status",
-      async (bundleData) => {
-        let count = 0;
-        if (bundleData.status.completed && bundleData.status.downloaded) {
-          // dispatch the action for raw import, with the metadata
-          if (count < 1) {
-            console.log(`[AirDCPP]: Download complete.`);
-
-            count += 1;
-          }
-        }
-      },
-    );
-    return initializedAirDCPPSocket;
-  } catch (error) {
-    console.error(error);
-  }
-};
-
-// 1. get settings from mongo
-const { data } = await axios({
-  url: "http://localhost:3000/api/settings/getAllSettings",
-  method: "GET",
-});
-
-const directConnectConfiguration = data?.directConnect?.client.host;
-
-// 2. If available, init AirDC++ Socket with those settings
-if (!isNil(directConnectConfiguration)) {
-  const airDCPPSocketInstance = await initializeAirDCPPSocket(
-    directConnectConfiguration,
-  );
-  setState({
-    airDCPPSocketInstance,
-    airDCPPClientConfiguration: directConnectConfiguration,
-  });
-} else {
-  console.log("problem");
-}