🖼️ Adding screenshots as of December 2022

2022-12-06 13:51:25 -08:00
53 changed files with 9162 additions and 4096 deletions
--- a/.babelrc
+++ b/.babelrc
@@ -0,0 +1,17 @@
+{
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react",
+    "@babel/preset-typescript"
+  ],
+  "plugins": [
+    "@babel/transform-runtime",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-syntax-top-level-await"
+  ],
+  "env": {
+    "production": {
+      "presets": ["minify"]
+    }
+  }
+}
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,14 +1,14 @@
 module.exports = {
-  extends: ["plugin:react/recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", "plugin:css-modules/recommended", "plugin:storybook/recommended", "plugin:storybook/recommended", "plugin:storybook/recommended", "plugin:storybook/recommended"],
+  extends: ["plugin:react/recommended", "plugin:@typescript-eslint/recommended", "plugin:prettier/recommended", "plugin:css-modules/recommended", "plugin:storybook/recommended", "plugin:storybook/recommended", "plugin:storybook/recommended"],
  parser: "@typescript-eslint/parser",
  parserOptions: {
    sourceType: "module",
    ecmaVersion: 2020,
    ecmaFeatures: {
      jsx: true // Allows for the parsing of JSX
+
    }
  },
-
  plugins: ["@typescript-eslint", "css-modules"],
  settings: {
    "import/resolver": {
@@ -18,9 +18,9 @@ module.exports = {
    },
    react: {
      version: "detect" // Tells eslint-plugin-react to automatically detect the version of React to use
+
    }
  },
-
  // Fine tune rules
  rules: {
    "@typescript-eslint/no-var-requires": 0
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -0,0 +1,19 @@
+module.exports = {
+  stories: [
+    "../src/client/stories/*.stories.mdx",
+    "../src/client/stories/*.stories.@(js|jsx|ts|tsx)",
+  ],
+  staticDirs: [
+    "../src/client/stories/assets"
+  ],
+  addons: [
+    "@storybook/addon-links",
+    "@storybook/preset-scss",
+    "@storybook/addon-essentials",
+    "@storybook/addon-interactions",
+  ],
+  framework: "@storybook/react",
+  core: {
+    builder: "webpack5",
+  },
+};
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -1,17 +0,0 @@
-import type { StorybookConfig } from "@storybook/react-vite";
-const config: StorybookConfig = {
-  stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
-  addons: [
-    "@storybook/addon-links",
-    "@storybook/addon-essentials",
-    "@storybook/addon-interactions",
-  ],
-  framework: {
-    name: "@storybook/react-vite",
-    options: {},
-  },
-  docs: {
-    autodocs: "tag",
-  },
-};
-export default config;
--- a/.storybook/preview-head.html
+++ b/.storybook/preview-head.html
@@ -1,3 +0,0 @@
-<script>
-  window.global = window;
-</script>
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -0,0 +1,9 @@
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  controls: {
+    matchers: {
+      color: /(background|color)$/i,
+      date: /Date$/,
+    },
+  },
+}
--- a/.storybook/preview.ts
+++ b/.storybook/preview.ts
@@ -1,18 +0,0 @@
-import type { Preview } from "@storybook/react";
-
-const preview: Preview = {
-  parameters: {
-    backgrounds: {
-      default: "light",
-    },
-    actions: { argTypesRegex: "^on[A-Z].*" },
-    controls: {
-      matchers: {
-        color: /(background|color)$/i,
-        date: /Date$/,
-      },
-    },
-  },
-};
-
-export default preview;
--- a/Matching.png
+++ b/Matching.png
--- a/integration.png
+++ b/integration.png
--- a/Dashboard.png
+++ b/Dashboard.png
--- a/Library.png
+++ b/Library.png
--- a/README.md
+++ b/README.md
@@ -4,16 +4,6 @@ ThreeTwo! _aims to be_ a comic book curation app.

 [![Docker Image CI](https://github.com/rishighan/threetwo/actions/workflows/docker-image.yml/badge.svg)](https://github.com/rishighan/threetwo/actions/workflows/docker-image.yml)

-### Screenshots
-
-![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/Dashboard.png)
-
-![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/Library.png)
-
-![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/DC%2B%2B%20integration.png)
-
-![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/ComicVine%20Matching.png)
-

 ### 🦄 Early Development Support Channel

--- a/funding.yml
+++ b/funding.yml
@@ -1 +0,0 @@
-github: [rishighan]
--- a/package.json
+++ b/package.json
@@ -5,12 +5,15 @@
  "main": "server/index.js",
  "typings": "server/index.js",
  "scripts": {
-    "build": "vite build",
-    "dev": "rimraf dist && npm run build && vite",
-    "prod": "npm run build && vite",
+    "build": "webpack --mode production",
+    "start": "npm run build && npm run server",
+    "client": "webpack serve --mode development --devtool inline-source-map --hot",
+    "server": "tsc -p tsconfig.server.json && node server/",
+    "dev": "concurrently \"nodemon\" \"npm run client\"",
+    "server-dev": "nodemon",
    "docs": "jsdoc -c jsdoc.json",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
+    "storybook": "start-storybook -p 6006",
+    "build-storybook": "build-storybook"
  },
  "author": "Rishi Ghan",
  "license": "MIT",
@@ -20,68 +23,79 @@
    "@dnd-kit/core": "^4.0.0",
    "@dnd-kit/sortable": "^5.0.0",
    "@dnd-kit/utilities": "^3.2.0",
-    "@fortawesome/fontawesome-free": "^6.3.0",
+    "@fortawesome/fontawesome-free": "^6.1.1",
+    "@parcel/config-default": "^2.6.0",
    "@redux-devtools/extension": "^3.2.2",
-    "@rollup/plugin-node-resolve": "^15.0.1",
-    "@tanstack/react-table": "^8.8.0",
-    "@types/axios": "^0.14.0",
+    "@tanstack/react-table": "^8.5.11",
    "@types/mime-types": "^2.1.0",
-    "@types/react-router-dom": "^5.3.3",
+    "@types/react": "^17.0.3",
+    "@types/react-dom": "^17.0.2",
+    "@types/react-redux": "^7.1.16",
+    "@types/react-router-dom": "^5.1.7",
+    "@types/sharp": "^0.28.0",
    "@types/socket.io": "^3.0.2",
    "@types/socket.io-client": "^3.0.0",
-    "@vitejs/plugin-react": "^3.1.0",
-    "airdcpp-apisocket": "2.4.5-beta.1",
-    "axios": "^1.3.4",
-    "axios-cache-interceptor": "^1.0.1",
+    "airdcpp-apisocket": "^2.4.4",
+    "array-sort-by": "^1.2.1",
+    "axios": "^0.27.2",
    "axios-rate-limit": "^1.3.0",
+    "axios-simple-cache-adapter": "^1.1.0",
    "babel-polyfill": "^6.26.0",
    "babel-preset-minify": "^0.5.2",
    "better-docs": "^2.7.2",
+    "comlink-loader": "^2.0.0",
+    "compromise": "^13.11.3",
+    "compromise-dates": "^2.2.1",
+    "compromise-numbers": "^1.4.0",
+    "compromise-sentences": "^0.3.0",
    "date-fns": "^2.28.0",
    "dayjs": "^1.10.6",
-    "ellipsize": "^0.5.1",
+    "ellipsize": "^0.1.0",
    "express": "^4.17.1",
+    "fastest-validator": "^1.11.0",
    "filename-parser": "^1.0.2",
    "final-form": "^4.20.2",
    "final-form-arrays": "^3.0.2",
-    "history": "^5.3.0",
    "html-to-text": "^8.1.0",
    "jsdoc": "^3.6.10",
    "lodash": "^4.17.21",
-    "node-sass": "npm:sass",
+    "opds-extra": "^3.0.9",
    "pretty-bytes": "^5.6.0",
    "prop-types": "^15.8.1",
    "qs": "^6.10.5",
-    "react": "^18.2.0",
+    "react": "^18.1.0",
    "react-collapsible": "^2.9.0",
-    "react-comic-viewer": "^0.4.0",
-    "react-day-picker": "^8.6.0",
+    "react-comic-viewer": "^0.3.5",
+    "react-day-picker": "^8.0.6",
    "react-dom": "^18.1.0",
    "react-fast-compare": "^3.2.0",
    "react-final-form": "^6.5.9",
-    "react-final-form-arrays": "^3.1.4",
+    "react-final-form-arrays": "^3.1.3",
    "react-loader-spinner": "^4.0.0",
    "react-masonry-css": "^1.0.16",
    "react-modal": "^3.15.1",
-    "react-redux": "^8.0.5",
-    "react-router": "^6.9.0",
-    "react-router-dom": "^6.9.0",
+    "react-redux": "^7.2.6",
+    "react-router": "^6.2.2",
+    "react-router-dom": "^6.2.2",
    "react-select": "^5.3.2",
-    "react-select-async-paginate": "^0.7.2",
+    "react-select-async-paginate": "^0.6.1",
    "react-slick": "^0.29.0",
    "react-sliding-pane": "^7.1.0",
-    "react-stickynode": "^4.1.0",
+    "react-stickynode": "^4.0.0",
    "react-textarea-autosize": "^8.3.4",
-    "reapop": "^4.2.1",
-    "redux-first-history": "^5.1.1",
+    "reapop": "^4.0.5",
+    "redux-first-history": "^5.0.9",
    "redux-socket.io-middleware": "^1.0.4",
-    "redux-thunk": "^2.4.2",
+    "redux-thunk": "^2.4.1",
+    "sharp": "^0.30.5",
    "slick-carousel": "^1.8.1",
    "socket.io-client": "^4.3.2",
-    "styled-components": "^5.3.9",
+    "styled-components": "^5.3.5",
    "threetwo-ui-typings": "^1.0.14",
-    "vite-plugin-html": "^3.2.0",
+    "voca": "^1.4.0",
    "websocket": "^1.0.34",
+    "ws": "^7.5.3",
+    "xml2js": "^0.4.23",
    "xregexp": "^5.0.2"
  },
  "devDependencies": {
@@ -89,30 +103,45 @@
    "@babel/core": "^7.13.10",
    "@babel/plugin-syntax-top-level-await": "^7.14.5",
    "@babel/plugin-transform-runtime": "^7.13.15",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-env": "^7.13.10",
+    "@babel/preset-react": "^7.12.13",
    "@babel/preset-typescript": "^7.13.0",
-    "@storybook/addon-essentials": "^7.0.0-rc.3",
-    "@storybook/addon-interactions": "^7.0.0-rc.3",
-    "@storybook/addon-links": "^7.0.0-rc.3",
-    "@storybook/blocks": "^7.0.0-rc.3",
-    "@storybook/react": "^7.0.0-rc.3",
-    "@storybook/react-vite": "^7.0.0-rc.3",
-    "@storybook/testing-library": "^0.0.14-next.1",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
+    "@storybook/addon-actions": "^6.5.9",
+    "@storybook/addon-essentials": "^6.5.9",
+    "@storybook/addon-interactions": "^6.5.9",
+    "@storybook/addon-links": "^6.5.9",
+    "@storybook/builder-webpack4": "^6.5.9",
+    "@storybook/builder-webpack5": "^6.5.9",
+    "@storybook/manager-webpack4": "^6.5.9",
+    "@storybook/manager-webpack5": "^6.5.9",
+    "@storybook/preset-scss": "^1.0.3",
+    "@storybook/react": "^6.5.9",
+    "@storybook/testing-library": "^0.0.13",
+    "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
    "@tsconfig/node14": "^1.0.0",
-    "@types/ellipsize": "^0.1.1",
    "@types/express": "^4.17.8",
    "@types/jest": "^26.0.20",
    "@types/lodash": "^4.14.168",
    "@types/node": "^14.14.34",
-    "@types/react": "^18.0.28",
-    "@types/react-dom": "^18.0.11",
-    "@types/react-redux": "^7.1.25",
+    "@types/react": "^17.0.3",
+    "@types/react-dom": "^17.0.2",
+    "@types/react-redux": "^7.1.16",
    "@typescript-eslint/eslint-plugin": "^4.17.0",
    "@typescript-eslint/parser": "^4.17.0",
+    "awesome-typescript-loader": "^5.2.1",
    "babel-eslint": "^10.0.0",
+    "babel-loader": "^8.2.2",
+    "babel-plugin-transform-class-properties": "^6.24.1",
    "body-parser": "^1.19.0",
-    "bulma": "^0.9.4",
+    "buffer": "^6.0.3",
+    "bulma": "^0.9.3",
+    "clean-webpack-plugin": "^1.0.0",
+    "comlink": "^4.3.0",
+    "compromise-strict": "^0.0.2",
+    "concurrently": "^4.0.0",
+    "copy-webpack-plugin": "^9.0.1",
+    "css-loader": "^5.1.2",
    "eslint": "^7.22.0",
    "eslint-config-airbnb": "^18.2.1",
    "eslint-config-airbnb-base": "^14.2.1",
@@ -122,19 +151,35 @@
    "eslint-plugin-jsx-a11y": "^6.0.3",
    "eslint-plugin-prettier": "^3.3.1",
    "eslint-plugin-react": "^7.22.0",
-    "eslint-plugin-storybook": "^0.6.11",
    "express": "^4.17.1",
+    "file-loader": "^6.2.0",
+    "fs-extra": "^9.1.0",
+    "html-webpack-plugin": "^5.3.1",
+    "http-response-stream": "^1.0.9",
+    "image-webpack-loader": "^8.1.0",
    "install": "^0.13.0",
    "jest": "^26.6.3",
+    "mini-css-extract-plugin": "^1.4.1",
+    "node-sass": "^7.0.1",
    "nodemon": "^1.17.3",
    "npm": "^8.11.0",
    "prettier": "^2.2.1",
    "react-refresh": "^0.14.0",
-    "rimraf": "^4.1.3",
-    "sass": "^1.58.1",
-    "storybook": "^7.0.0-rc.3",
+    "rimraf": "^3.0.2",
+    "sass-loader": "^11.0.1",
+    "source-map-loader": "^0.2.4",
+    "string-similarity": "^4.0.4",
+    "style-loader": "^2.0.0",
    "tslint": "^6.1.3",
-    "typescript": "^5.0.2",
-    "vite": "^4.2.0"
+    "typescript": "^4.2.3",
+    "url-loader": "^1.0.1",
+    "webpack": "^5.73.0",
+    "webpack-bundle-analyzer": "^4.4.2",
+    "webpack-cli": "^4.6.0",
+    "webpack-dev-server": "^4.7.4",
+    "webpack-merge": "^5.7.3"
+  },
+  "resolutions": {
+    "@storybook/react/webpack": "^5"
  }
 }
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@@ -10,7 +10,6 @@

 <body>
    <div id="root"></div>
-    <script type="module" src="/src/client/index.tsx"></script>
 </body>

 </html>
--- a/src/client/actions/airdcpp.actions.tsx
+++ b/src/client/actions/airdcpp.actions.tsx
@@ -4,10 +4,7 @@ import {
  PriorityEnum,
  SearchResponse,
 } from "threetwo-ui-typings";
-import {
-  LIBRARY_SERVICE_BASE_URI,
-  SEARCH_SERVICE_BASE_URI,
-} from "../constants/endpoints";
+import { LIBRARY_SERVICE_BASE_URI, SEARCH_SERVICE_BASE_URI } from "../constants/endpoints";
 import {
  AIRDCPP_SEARCH_RESULTS_ADDED,
  AIRDCPP_SEARCH_RESULTS_UPDATED,
@@ -21,8 +18,6 @@ import {
  IMS_COMIC_BOOK_DB_OBJECT_FETCHED,
  AIRDCPP_TRANSFERS_FETCHED,
  LIBRARY_ISSUE_BUNDLES,
-  AIRDCPP_SOCKET_CONNECTED,
-  AIRDCPP_SOCKET_DISCONNECTED,
 } from "../constants/action-types";
 import { isNil } from "lodash";
 import axios from "axios";
@@ -37,199 +32,190 @@ function sleep(ms: number): Promise<NodeJS.Timeout> {
  return new Promise((resolve) => setTimeout(resolve, ms));
 }

-export const toggleAirDCPPSocketConnectionStatus =
-  (status: String, payload?: any) => async (dispatch) => {
-    switch (status) {
-      case "connected":
-        dispatch({
-          type: AIRDCPP_SOCKET_CONNECTED,
-          data: payload,
-        });
-        break;
-
-      case "disconnected":
-        dispatch({
-          type: AIRDCPP_SOCKET_DISCONNECTED,
-          data: payload,
-        });
-        break;
-
-      default:
-        console.log("Can't set AirDC++ socket status.");
-        break;
-    }
-  };
 export const search =
  (data: SearchData, ADCPPSocket: any, credentials: any) =>
-  async (dispatch) => {
-    try {
-      if (!ADCPPSocket.isConnected()) {
-        await ADCPPSocket();
-      }
-      const instance: SearchInstance = await ADCPPSocket.post("search");
-      dispatch({
-        type: AIRDCPP_SEARCH_IN_PROGRESS,
-      });
-
-      // We want to get notified about every new result in order to make the user experience better
-      await ADCPPSocket.addListener(
-        `search`,
-        "search_result_added",
-        async (groupedResult) => {
-          // ...add the received result in the UI
-          // (it's probably a good idea to have some kind of throttling for the UI updates as there can be thousands of results)
-
-          dispatch({
-            type: AIRDCPP_SEARCH_RESULTS_ADDED,
-            groupedResult,
-          });
-        },
-        instance.id,
-      );
-
-      // We also want to update the existing items in our list when new hits arrive for the previously listed files/directories
-      await ADCPPSocket.addListener(
-        `search`,
-        "search_result_updated",
-        async (groupedResult) => {
-          // ...update properties of the existing result in the UI
-          dispatch({
-            type: AIRDCPP_SEARCH_RESULTS_UPDATED,
-            groupedResult,
-          });
-        },
-        instance.id,
-      );
-
-      // 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)
-      // 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}`,
+    async (dispatch) => {
+      try {
+        if (!ADCPPSocket.isConnected()) {
+          await ADCPPSocket.connect(
+            credentials.username,
+            credentials.password,
+            true,
          );
-          if (currentInstance.result_count === 0) {
-            // ...nothing was received, show an informative message to the user
-            console.log("No more search results.");
-          }
+        }
+        const instance: SearchInstance = await ADCPPSocket.post("search");
+        dispatch({
+          type: AIRDCPP_SEARCH_IN_PROGRESS,
+        });

-          // 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
-          dispatch({
-            type: AIRDCPP_HUB_SEARCHES_SENT,
-            searchInfo,
-            instance,
-          });
-        },
-        instance.id,
-      );
-      // Finally, perform the actual search
-      await ADCPPSocket.post(`search/${instance.id}/hub_search`, data);
-    } catch (error) {
-      console.log(error);
-      throw error;
-    }
-  };
+        // We want to get notified about every new result in order to make the user experience better
+        await ADCPPSocket.addListener(
+          `search`,
+          "search_result_added",
+          async (groupedResult) => {
+            // ...add the received result in the UI
+            // (it's probably a good idea to have some kind of throttling for the UI updates as there can be thousands of results)
+
+            dispatch({
+              type: AIRDCPP_SEARCH_RESULTS_ADDED,
+              groupedResult,
+            });
+          },
+          instance.id,
+        );
+
+        // We also want to update the existing items in our list when new hits arrive for the previously listed files/directories
+        await ADCPPSocket.addListener(
+          `search`,
+          "search_result_updated",
+          async (groupedResult) => {
+            // ...update properties of the existing result in the UI
+            dispatch({
+              type: AIRDCPP_SEARCH_RESULTS_UPDATED,
+              groupedResult,
+            });
+          },
+          instance.id,
+        );
+
+        // 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)
+        // 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}`,
+            );
+            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
+            dispatch({
+              type: AIRDCPP_HUB_SEARCHES_SENT,
+              searchInfo,
+              instance,
+            });
+          },
+          instance.id,
+        );
+        // Finally, perform the actual search
+        await ADCPPSocket.post(`search/${instance.id}/hub_search`, data);
+      } catch (error) {
+        console.log(error);
+        throw error;
+      }
+    };

 export const downloadAirDCPPItem =
-  (
-    searchInstanceId: Number,
+  (searchInstanceId: Number,
    resultId: String,
    comicObjectId: String,
-    name: String,
-    size: Number,
-    type: any,
+    name: String, size: Number, type: any,
    ADCPPSocket: any,
    credentials: any,
  ): void =>
-  async (dispatch) => {
-    try {
-      if (!ADCPPSocket.isConnected()) {
-        await ADCPPSocket.connect();
-      }
-      let bundleDBImportResult = {};
-      const downloadResult = await ADCPPSocket.post(
-        `search/${searchInstanceId}/results/${resultId}/download`,
-      );
+    async (dispatch) => {
+      try {
+        if (!ADCPPSocket.isConnected()) {
+          await ADCPPSocket.connect(
+            `${credentials.username}`,
+            `${credentials.password}`,
+            true,
+          );
+        }
+        let bundleDBImportResult = {};
+        const downloadResult = await ADCPPSocket.post(
+          `search/${searchInstanceId}/results/${resultId}/download`,
+        );

-      if (!isNil(downloadResult)) {
-        bundleDBImportResult = await axios({
+        if (!isNil(downloadResult)) {
+          bundleDBImportResult = await axios({
+            method: "POST",
+            url: `${LIBRARY_SERVICE_BASE_URI}/applyAirDCPPDownloadMetadata`,
+            headers: {
+              "Content-Type": "application/json; charset=utf-8",
+            },
+            data: {
+              bundleId: downloadResult.bundle_info.id,
+              comicObjectId,
+              name,
+              size,
+              type,
+            },
+          });
+
+          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;
+      }
+    };
+
+export const getBundlesForComic =
+  (comicObjectId: string, ADCPPSocket: any, credentials: any) =>
+    async (dispatch) => {
+      try {
+        if (!ADCPPSocket.isConnected()) {
+          await ADCPPSocket.connect(
+            `${credentials.username}`,
+            `${credentials.password}`,
+            true,
+          );
+        }
+        const comicObject = await axios({
          method: "POST",
-          url: `${LIBRARY_SERVICE_BASE_URI}/applyAirDCPPDownloadMetadata`,
+          url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookById`,
          headers: {
            "Content-Type": "application/json; charset=utf-8",
          },
          data: {
-            bundleId: downloadResult.bundle_info.id,
-            comicObjectId,
-            name,
-            size,
-            type,
+            id: `${comicObjectId}`,
          },
        });
-
-        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;
-    }
-  };
-
-export const getBundlesForComic =
-  (comicObjectId: string, ADCPPSocket: any, credentials: any) =>
-  async (dispatch) => {
-    try {
-      if (!ADCPPSocket.isConnected()) {
-        await ADCPPSocket.connect();
-      }
-      const comicObject = await axios({
-        method: "POST",
-        url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookById`,
-        headers: {
-          "Content-Type": "application/json; charset=utf-8",
-        },
-        data: {
-          id: `${comicObjectId}`,
-        },
-      });
-      // get only the bundles applicable for the comic
-      if (comicObject.data.acquisition.directconnect) {
-        const filteredBundles =
-          comicObject.data.acquisition.directconnect.downloads.map(
+        // get only the bundles applicable for the comic
+        if (comicObject.data.acquisition.directconnect) {
+          const filteredBundles = comicObject.data.acquisition.directconnect.downloads.map(
            async ({ bundleId }) => {
              return await ADCPPSocket.get(`queue/bundles/${bundleId}`);
            },
          );
-        dispatch({
-          type: AIRDCPP_BUNDLES_FETCHED,
-          bundles: await Promise.all(filteredBundles),
-        });
+          dispatch({
+            type: AIRDCPP_BUNDLES_FETCHED,
+            bundles: await Promise.all(filteredBundles),
+          });
+        }
+      } catch (error) {
+        throw error;
      }
-    } catch (error) {
-      throw error;
-    }
-  };
+    };

 export const getTransfers =
  (ADCPPSocket: any, credentials: any) => async (dispatch) => {
    try {
      if (!ADCPPSocket.isConnected()) {
-        await ADCPPSocket.connect();
+        await ADCPPSocket.connect(
+          `${credentials.username}`,
+          `${credentials.password}`,
+          true,
+        );
      }
      const bundles = await ADCPPSocket.get("queue/bundles/1/85", {});
      if (!isNil(bundles)) {
@@ -248,6 +234,7 @@ export const getTransfers =
          type: LIBRARY_ISSUE_BUNDLES,
          issue_bundles,
        });
+
      }
    } catch (err) {
      throw err;
--- a/src/client/actions/comicinfo.actions.tsx
+++ b/src/client/actions/comicinfo.actions.tsx
@@ -1,6 +1,9 @@
 import axios from "axios";
 import rateLimiter from "axios-rate-limit";
-import { setupCache } from "axios-cache-interceptor";
+import {
+  AxiosCacheRequestConfig,
+  createCacheAdapter,
+} from "axios-simple-cache-adapter";
 import qs from "qs";
 import {
  CV_SEARCH_SUCCESS,
@@ -23,22 +26,25 @@ import {
  LIBRARY_SERVICE_BASE_URI,
 } from "../constants/endpoints";

+const axiosCacheAdapter = createCacheAdapter();
 const http = rateLimiter(axios.create(), {
  maxRequests: 1,
  perMilliseconds: 1000,
  maxRPS: 1,
 });
-const cachedAxios = setupCache(axios);
+
 export const getWeeklyPullList = (options) => async (dispatch) => {
  try {
    dispatch({
      type: CV_WEEKLY_PULLLIST_CALL_IN_PROGRESS,
    });

-    await cachedAxios(`${COMICVINE_SERVICE_URI}/getWeeklyPullList`, {
+    await axios(`${COMICVINE_SERVICE_URI}/getWeeklyPullList`, {
      method: "get",
      params: options,
-    }).then((response) => {
+      axiosCacheAdapter,
+      cache: 1000, // value in MS
+    } as AxiosCacheRequestConfig).then((response) => {
      dispatch({
        type: CV_WEEKLY_PULLLIST_FETCHED,
        data: response.data.result,
@@ -55,7 +61,6 @@ export const comicinfoAPICall = (options) => async (dispatch) => {
      type: CV_API_CALL_IN_PROGRESS,
      inProgress: true,
    });
-    console.log(options);
    const serviceURI = `${COMICVINE_SERVICE_URI}/${options.callURIAction}`;
    const response = await http(serviceURI, {
      method: options.callMethod,
@@ -65,11 +70,9 @@ export const comicinfoAPICall = (options) => async (dispatch) => {
        "Content-Type": "application/json",
        "Access-Control-Allow-Origin": "*",
      },
-      paramsSerializer: {
-        indexes: null,
+      paramsSerializer: (params) => {
+        return qs.stringify(params, { arrayFormat: "repeat" });
      },
-      // (params) =>
-      // qs.stringify(params, { arrayFormat: "repeat" }),
    });

    switch (options.callURIAction) {
@@ -84,7 +87,7 @@ export const comicinfoAPICall = (options) => async (dispatch) => {
        console.log("Could not complete request.");
    }
  } catch (error) {
-    console.error(error);
+    console.log(error);
    dispatch({
      type: CV_API_GENERIC_FAILURE,
      error,
--- a/src/client/actions/fileops.actions.tsx
+++ b/src/client/actions/fileops.actions.tsx
@@ -36,7 +36,7 @@ import {
  CV_WEEKLY_PULLLIST_FETCHED,
 } from "../constants/action-types";
 import { success } from "react-notification-system-redux";
-
+import { removeLeadingPeriod } from "../shared/utils/formatting.utils";
 import { isNil, map } from "lodash";

 export async function walkFolder(path: string): Promise<Array<IFolderData>> {
@@ -60,6 +60,15 @@ export async function walkFolder(path: string): Promise<Array<IFolderData>> {
 * @return the comic book metadata
 */
 export const fetchComicBookMetadata = () => async (dispatch) => {
+  const extractionOptions = {
+    extractTarget: "cover",
+    targetExtractionFolder: "./userdata/covers",
+    extractionMode: "bulk",
+    paginationOptions: {
+      pageLimit: 25,
+      page: 1,
+    },
+  };
  dispatch({
    type: LS_IMPORT_CALL_IN_PROGRESS,
  });
@@ -77,7 +86,7 @@ export const fetchComicBookMetadata = () => async (dispatch) => {
  dispatch({
    type: LS_IMPORT,
    meta: { remote: true },
-    data: {},
+    data: { extractionOptions },
  });
 };
 export const toggleImportQueueStatus = (options) => async (dispatch) => {
@@ -127,24 +136,21 @@ export const getComicBooks = (options) => async (dispatch) => {
 * @returns Nothing.
 * @param payload
 */
-export const importToDB = (sourceName: string, metadata?: any) => (dispatch) => {
+export const importToDB = (sourceName: string, payload?: any) => (dispatch) => {
  try {
    const comicBookMetadata = {
-      importType: "new",
-      payload: {
-        rawFileDetails: {
-          name: "",
+      rawFileDetails: {
+        name: "",
+      },
+      importStatus: {
+        isImported: true,
+        tagged: false,
+        matchedResult: {
+          score: "0",
        },
-        importStatus: {
-          isImported: true,
-          tagged: false,
-          matchedResult: {
-            score: "0",
-          },
-        },
-        sourcedMetadata: metadata || null,
-        acquisition: { source: { wanted: true, name: sourceName } },
-      }
+      },
+      sourcedMetadata: payload || null,
+      acquisition: { source: { wanted: true, name: sourceName } },
    };
    dispatch({
      type: IMS_CV_METADATA_IMPORT_CALL_IN_PROGRESS,
@@ -250,35 +256,36 @@ export const fetchComicVineMatches =
 /**
 * This method is a proxy to `uncompressFullArchive` which uncompresses complete `rar` or `zip` archives
 * @param {string} path The path to the compressed archive
- * @param {any} options Options object
+ * @param {any} options Options object 
 * @returns {any}
 */
-export const extractComicArchive =
+export const extractComicArchive = (path: string, options: any) => async (dispatch) => {
+  const comicBookPages: string[] = [];
+  dispatch({
+    type: IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_IN_PROGRESS,
+  });
+  const extractedComicBookArchive = await axios({
+    method: "POST",
+    url: `${LIBRARY_SERVICE_BASE_URI}/uncompressFullArchive`,
+    headers: {
+      "Content-Type": "application/json; charset=utf-8",
+    },
+    data: {
+      filePath: path,
+    },
+  });
+  map(extractedComicBookArchive.data, (page) => {
+    console.log(page);
+    const pageFilePath = removeLeadingPeriod(page);
+    const imagePath = encodeURI(`${LIBRARY_SERVICE_HOST}${pageFilePath}`);
+    comicBookPages.push(imagePath);
+  });
+  dispatch({
+    type: IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_SUCCESS,
+    extractedComicBookArchive: comicBookPages,
+  });
+};

-  (path: string, options: any): any =>
-    async (dispatch) => {
-      dispatch({
-        type: IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_IN_PROGRESS,
-      });
-      await axios({
-        method: "POST",
-        url: `${LIBRARY_SERVICE_BASE_URI}/uncompressFullArchive`,
-        headers: {
-          "Content-Type": "application/json; charset=utf-8",
-        },
-        data: {
-          filePath: path,
-          options,
-        },
-      });
-    };
-
-/**
- * Description
- * @param {any} query
- * @param {any} options
- * @returns {any}
- */
 export const searchIssue = (query, options) => async (dispatch) => {
  dispatch({
    type: SS_SEARCH_IN_PROGRESS,
@@ -301,26 +308,26 @@ export const searchIssue = (query, options) => async (dispatch) => {
    case "wantedComicsPage":
      dispatch({
        type: WANTED_COMICS_FETCHED,
-        data: response.data.hits,
+        data: response.data.body,
      });
      break;
    case "globalSearchBar":
      dispatch({
        type: SS_SEARCH_RESULTS_FETCHED_SPECIAL,
-        data: response.data.hits,
+        data: response.data.body,
      });
      break;

    case "libraryPage":
      dispatch({
        type: SS_SEARCH_RESULTS_FETCHED,
-        data: response.data.hits,
+        data: response.data.body,
      });
      break;
    case "volumesPage":
      dispatch({
        type: VOLUMES_FETCHED,
-        data: response.data.hits,
+        data: response.data.body,
      });
      break;

@@ -349,4 +356,4 @@ export const analyzeImage =
      type: IMG_ANALYSIS_DATA_FETCH_SUCCESS,
      result: foo.data,
    });
-  };
+  };
--- a/src/client/assets/scss/App.scss
+++ b/src/client/assets/scss/App.scss
@@ -1,8 +1,8 @@
-@import "/node_modules/bulma/bulma.sass";
-$fa-font-path: "/node_modules/@fortawesome/fontawesome-free/webfonts";
-@import "/node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
-@import "/node_modules/@fortawesome/fontawesome-free/scss/regular.scss";
-@import "/node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
+@import "../../../../node_modules/bulma/bulma.sass";
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
+@import "../../../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
+@import "../../../../node_modules/@fortawesome/fontawesome-free/scss/regular.scss";
+@import "../../../../node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
 $bg-color: yellow;
 $border-color: red;

@@ -62,10 +62,6 @@ pre {
    margin-left: -300px;
    min-width: 500px;
  }
-  .airdcpp-status {
-    min-width: 300px;
-    line-height: 1.7rem;
-  }
  body {
    background: #454a59;
  }
@@ -360,10 +356,6 @@ pre {
  border-radius: 0.5rem;
 }

-.comic-viewer {
-  border: 1px solid red;
-}
-
 // comicvine metadata
 .comicvine-metadata {
  background-color: #f2f1f9;
--- a/src/client/components/App.tsx
+++ b/src/client/components/App.tsx
@@ -18,22 +18,18 @@ import {
  AirDCPPSocketContext,
 } from "../context/AirDCPPSocket";
 import { isEmpty, isUndefined } from "lodash";
-import {
-  AIRDCPP_DOWNLOAD_PROGRESS_TICK,
-  LS_SINGLE_IMPORT,
-} from "../constants/action-types";
-import { useDispatch, useSelector } from "react-redux";
+import { AIRDCPP_DOWNLOAD_PROGRESS_TICK } from "../constants/action-types";
+import { useDispatch } from "react-redux";

 /**
 * Method that initializes an AirDC++ socket connection
 * 1. Initializes event listeners for download init, tick and complete events
- * 2. Handles errors in case the connection to AirDC++ is not established or terminated
- * @returns void
+ * 2. Handles errors in case the connection to AirDC++ is not established or terminated 
+ * @returns void 
 */
 const AirDCPPSocketComponent = (): ReactElement => {
  const airDCPPConfiguration = useContext(AirDCPPSocketContext);
  const dispatch = useDispatch();
-
  useEffect(() => {
    const initializeAirDCPPEventListeners = async () => {
      if (
@@ -46,7 +42,9 @@ const AirDCPPSocketComponent = (): ReactElement => {
          "queue_bundle_added",
          async (data) => {
            console.log("JEMEN:", data);
-          },
+
+
+          }
        );
        // download tick listener
        await airDCPPConfiguration.airDCPPState.socket.addListener(
@@ -64,18 +62,9 @@ const AirDCPPSocketComponent = (): ReactElement => {
          `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.`);
-                dispatch({
-                  type: LS_SINGLE_IMPORT,
-                  meta: { remote: true },
-                  data: bundleData,
-                });
-                count += 1;
-              }
+              console.log("IM THE MAN UP IN THIS")
            }
          },
        );
@@ -103,10 +92,7 @@ export const App = (): ReactElement => {
        <Routes>
          <Route path="/" element={<Dashboard />} />
          <Route path="/import" element={<Import path={"./comics"} />} />
-          <Route
-            path="/library"
-            element={<TabulatedContentContainer category="library" />}
-          />
+          <Route path="/library" element={<TabulatedContentContainer category="library" />} />
          <Route path="/library-grid" element={<LibraryGrid />} />
          <Route path="/downloads" element={<Downloads data={{}} />} />
          <Route path="/search" element={<Search />} />
@@ -119,18 +105,9 @@ export const App = (): ReactElement => {
            element={<VolumeDetail />}
          />
          <Route path="/settings" element={<Settings />} />
-          <Route
-            path="/pull-list/all"
-            element={<TabulatedContentContainer category="pullList" />}
-          />
-          <Route
-            path="/wanted/all"
-            element={<TabulatedContentContainer category="wanted" />}
-          />
-          <Route
-            path="/volumes/all"
-            element={<TabulatedContentContainer category="volumes" />}
-          />
+          <Route path="/pull-list/all" element={<TabulatedContentContainer category="pullList" />} />
+          <Route path="/wanted/all" element={<TabulatedContentContainer category="wanted" />} />
+          <Route path="/volumes/all" element={<TabulatedContentContainer category="volumes" />} />
        </Routes>
      </div>
    </AirDCPPSocketContextProvider>
--- a/src/client/components/ComicDetail/AcquisitionPanel.tsx
+++ b/src/client/components/ComicDetail/AcquisitionPanel.tsx
@@ -16,7 +16,6 @@ import ellipsize from "ellipsize";
 import { Form, Field } from "react-final-form";
 import { isEmpty, isNil, map } from "lodash";
 import { AirDCPPSocketContext } from "../../context/AirDCPPSocket";
-
 interface IAcquisitionPanelProps {
  query: any;
  comicObjectId: any;
@@ -97,12 +96,9 @@ export const AcquisitionPanel = (
    (searchInstanceId, resultId, name, size, type) => {
      dispatch(
        downloadAirDCPPItem(
-          searchInstanceId,
-          resultId,
+          searchInstanceId, resultId,
          props.comicObjectId,
-          name,
-          size,
-          type,
+          name, size, type,
          airDCPPConfiguration.airDCPPState.socket,
          {
            username: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.username}`,
@@ -167,7 +163,7 @@ export const AcquisitionPanel = (
                        }
                      >
                        <span className="icon is-small">
-                          <img src="/src/client/assets/img/airdcpp_logo.svg" />
+                          <img src="/img/airdcpp_logo.svg" />
                        </span>
                        <span className="airdcpp-text">Search on AirDC++</span>
                      </button>
@@ -336,4 +332,4 @@ export const AcquisitionPanel = (
  );
 };

-export default AcquisitionPanel;
+export default AcquisitionPanel;
--- a/src/client/components/ComicDetail/ComicDetail.tsx
+++ b/src/client/components/ComicDetail/ComicDetail.tsx
@@ -66,7 +66,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
  );

  const extractedComicBook = useSelector(
-    (state: RootState) => state.fileOps.extractedComicBookArchive.reading,
+    (state: RootState) => state.fileOps.extractedComicBookArchive,
  );
  const { comicObjectId } = useParams<{ comicObjectId: string }>();

@@ -74,21 +74,13 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {

  const openModal = useCallback((filePath) => {
    setIsOpen(true);
-    dispatch(
-      extractComicArchive(filePath, {
-        type: "full",
-        purpose: "reading",
-        imageResizeOptions: {
-          baseWidth: 1024,
-        },
-      }),
-    );
+    dispatch(extractComicArchive(filePath));
  }, []);

  const afterOpenModal = useCallback((things) => {
    // references are now sync'd and can be accessed.
    // subtitle.style.color = "#f00";
-    console.log("kolaveri", things);
+    console.log(things);
  }, []);

  const closeModal = useCallback(() => {
@@ -102,7 +94,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
        <>
          <div className="card search-criteria-card">
            <div className="card-content">
-              <ComicVineSearchForm data={rawFileDetails} />
+              <ComicVineSearchForm data={rawFileDetails}/>
            </div>
          </div>
          <p className="is-size-5 mt-3 mb-2 ml-3">Searching for:</p>
@@ -120,9 +112,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
                comicVineSearchResults,
                comicObjectId,
              }}
-            />
-          ) : (
-            <div className="progress-indicator-container">
+            />) : (<div className="progress-indicator-container" >
              <div className="indicator">
                <Loader
                  type="MutatingDots"
@@ -133,16 +123,16 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
                  visible={comicVineAPICallProgress}
                />
              </div>
-            </div>
-          )}
-        </>
-      ),
+            </div >)}
+        </>),
    },

+
    editComicBookMetadata: {
      content: () => <EditMetadataPanel />,
    },
  };
+  

  // check for the availability of CV metadata
  const isComicBookMetadataAvailable =
@@ -259,7 +249,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
                </div>
              </div>
              {/* raw file details */}
-              <div className="column">
+              <div className="column is-three-fifths">
                {!isUndefined(rawFileDetails) &&
                  !isEmpty(rawFileDetails.cover) && (
                    <>
@@ -290,7 +280,6 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
                          <ComicViewer
                            pages={extractedComicBook}
                            direction="ltr"
-                            className={{closeButton: "border: 1px solid red;"}}
                          />
                        )}
                      </Modal>
@@ -317,4 +306,4 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
  );
 };

-export default ComicDetail;
+export default ComicDetail;
--- a/src/client/components/ComicDetail/ComicVineDetails.tsx
+++ b/src/client/components/ComicDetail/ComicVineDetails.tsx
@@ -7,7 +7,7 @@ import Card from "../Carda";
 export const ComicVineDetails = (props): ReactElement => {
  const { data, updatedAt } = props;
  return (
-    <div className="column is-half">
+    <div className="column is-two-thirds">
      <div className="comic-detail comicvine-metadata">
        <dl>
          <dt>ComicVine Metadata</dt>
--- a/src/client/components/ComicDetail/DownloadsPanel.tsx
+++ b/src/client/components/ComicDetail/DownloadsPanel.tsx
@@ -1,5 +1,7 @@
 import React, { useEffect, useContext, ReactElement } from "react";
-import { getBundlesForComic } from "../../actions/airdcpp.actions";
+import {
+  getBundlesForComic,
+} from "../../actions/airdcpp.actions";
 import { useDispatch, useSelector } from "react-redux";
 import { RootState } from "threetwo-ui-typings";
 import { isEmpty, isNil, map } from "lodash";
--- a/src/client/components/ComicDetail/RawFileDetails.tsx
+++ b/src/client/components/ComicDetail/RawFileDetails.tsx
@@ -1,13 +1,13 @@
 import React, { ReactElement } from "react";
 import PropTypes from "prop-types";
 import prettyBytes from "pretty-bytes";
-import { isEmpty } from "lodash";
+import { isUndefined } from "lodash";

 export const RawFileDetails = (props): ReactElement => {
  const { rawFileDetails, inferredMetadata } = props.data;
  return (
    <>
-      <div className="comic-detail raw-file-details column is-three-fifths">
+      <div className="comic-detail raw-file-details">
        <dl>
          <dt>Raw File Details</dt>
          <dd className="is-size-7">
@@ -34,20 +34,11 @@ export const RawFileDetails = (props): ReactElement => {
                  </span>
                </div>
              </div>
-              <div className="control">
-                <div className="tags has-addons">
-                  <span className="tag">MIME type</span>
-                  <span className="tag is-primary is-light">
-                    {rawFileDetails.mimeType}
-                  </span>
-                </div>
-              </div>
            </div>
          </dd>
        </dl>
      </div>
-
-      <div className="content comic-detail raw-file-details mt-3 column is-three-fifths">
+      <div className="content comic-detail raw-file-details mt-3">
        <dl>
          {/* inferred metadata */}
          <dt>Inferred Issue Metadata</dt>
@@ -61,7 +52,7 @@ export const RawFileDetails = (props): ReactElement => {
                  </span>
                </div>
              </div>
-              {!isEmpty(inferredMetadata.issue.number) ? (
+              {!isUndefined(inferredMetadata.issue.number) ? (
                <div className="control">
                  <div className="tags has-addons">
                    <span className="tag">Number</span>
@@ -89,7 +80,6 @@ RawFileDetails.propTypes = {
      fileSize: PropTypes.number,
      path: PropTypes.string,
      extension: PropTypes.string,
-      mimeType: PropTypes.string,
      cover: PropTypes.shape({
        filePath: PropTypes.string,
      }),
@@ -103,4 +93,4 @@ RawFileDetails.propTypes = {
      }),
    }),
  }),
-};
+};
--- a/src/client/components/ComicDetail/Tabs/ArchiveOperations.tsx
+++ b/src/client/components/ComicDetail/Tabs/ArchiveOperations.tsx
@@ -14,7 +14,7 @@ export const ArchiveOperations = (props): ReactElement => {
    (state: RootState) => state.fileOps.comicBookExtractionInProgress,
  );
  const extractedComicBookArchive = useSelector(
-    (state: RootState) => state.fileOps.extractedComicBookArchive.analysis,
+    (state: RootState) => state.fileOps.extractedComicBookArchive,
  );

  const imageAnalysisResult = useSelector((state: RootState) => {
@@ -23,15 +23,7 @@ export const ArchiveOperations = (props): ReactElement => {

  const dispatch = useDispatch();
  const unpackComicArchive = useCallback(() => {
-    dispatch(
-      extractComicArchive(data.rawFileDetails.filePath, {
-        type: "full",
-        purpose: "analysis",
-        imageResizeOptions: {
-          baseWidth: 275,
-        },
-      }),
-    );
+    dispatch(extractComicArchive(data.rawFileDetails.filePath));
  }, []);

  // sliding panel config
@@ -126,4 +118,4 @@ export const ArchiveOperations = (props): ReactElement => {
  );
 };

-export default ArchiveOperations;
+export default ArchiveOperations;
--- a/src/client/components/Dashboard/Dashboard.tsx
+++ b/src/client/components/Dashboard/Dashboard.tsx
@@ -11,7 +11,7 @@ import {
  getComicBooks,
 } from "../../actions/fileops.actions";
 import { getLibraryStatistics } from "../../actions/comicinfo.actions";
-import { isEmpty, isNil } from "lodash";
+import { isEmpty } from "lodash";

 export const Dashboard = (): ReactElement => {
  const dispatch = useDispatch();
@@ -43,7 +43,7 @@ export const Dashboard = (): ReactElement => {
  }, []);

  const recentComics = useSelector(
-    (state: RootState) => state.fileOps.recentComics
+    (state: RootState) => state.fileOps.recentComics,
  );
  const wantedComics = useSelector(
    (state: RootState) => state.fileOps.wantedComics,
@@ -60,7 +60,7 @@ export const Dashboard = (): ReactElement => {
      <section className="section">
        <h1 className="title">Dashboard</h1>

-        {!isEmpty(recentComics) ? (
+        {!isEmpty(recentComics) && !isEmpty(recentComics.docs) ? (
          <>
            {/* Pull List */}
            <PullList issues={recentComics} />
@@ -74,8 +74,9 @@ export const Dashboard = (): ReactElement => {
              <WantedComicsList comics={wantedComics} />
            )}
            {/* Recent imports */}
+            {!isEmpty(recentComics) && (
              <RecentlyImported comicBookCovers={recentComics} />
-            
+            )}
            {/* Volumes */}
            {!isEmpty(volumeGroups) && (
              <VolumeGroups volumeGroups={volumeGroups} />
@@ -94,4 +95,4 @@ export const Dashboard = (): ReactElement => {
  );
 };

-export default Dashboard;
+export default Dashboard;
--- a/src/client/components/Dashboard/PullList.tsx
+++ b/src/client/components/Dashboard/PullList.tsx
@@ -20,7 +20,7 @@ export const PullList = ({ issues }: PullListProps): ReactElement => {
  useEffect(() => {
    dispatch(
      getWeeklyPullList({
-        startDate: "2023-3-25",
+        startDate: "2022-11-15",
        pageSize: "15",
        currentPage: "1",
      }),
@@ -161,4 +161,4 @@ export const PullList = ({ issues }: PullListProps): ReactElement => {
  );
 };

-export default PullList;
+export default PullList;
--- a/src/client/components/Dashboard/RecentlyImported.tsx
+++ b/src/client/components/Dashboard/RecentlyImported.tsx
@@ -2,6 +2,7 @@ import React, { ReactElement } from "react";
 import Card from "../Carda";
 import { Link } from "react-router-dom";
 import ellipsize from "ellipsize";
+import { escapePoundSymbol } from "../../shared/utils/formatting.utils";
 import { isEmpty, isNil, isUndefined, map } from "lodash";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
 import Masonry from "react-masonry-css";
@@ -23,6 +24,7 @@ export const RecentlyImported = ({
    700: 2,
    600: 2,
  };
+
  return (
    <>
      <div className="content mt-5">
@@ -39,7 +41,7 @@ export const RecentlyImported = ({
        columnClassName="recent-comics-column"
      >
        {map(
-          comicBookCovers,
+          comicBookCovers.docs,
          (
            {
              _id,
@@ -62,6 +64,7 @@ export const RecentlyImported = ({
              comicInfo,
              locg,
            });
+
            const isComicBookMetadataAvailable =
              !isUndefined(comicvine) &&
              !isUndefined(comicvine.volumeInformation);
@@ -83,14 +86,14 @@ export const RecentlyImported = ({
                    {/* Raw file presence  */}
                    {isNil(rawFileDetails) && (
                      <span className="icon custom-icon is-small has-text-danger mr-2">
-                        <img src="/src/client/assets/img/missing-file.svg" />
+                        <img src="/img/missing-file.svg" />
                      </span>
                    )}
                    {/* ComicInfo.xml presence */}
                    {!isNil(comicInfo) && !isEmpty(comicInfo) && (
                      <span className="icon custom-icon is-small has-text-danger">
                        <img
-                          src="/src/client/assets/img/comicinfoxml.svg"
+                          src="/img/comicinfoxml.svg"
                          alt={"ComicInfo.xml file detected."}
                        />
                      </span>
@@ -99,8 +102,8 @@ export const RecentlyImported = ({
                    {isComicBookMetadataAvailable && (
                      <span className="icon custom-icon">
                        <img
-                          src="/src/client/assets/img/cvlogo.svg"
-                          alt={"ComicVine metadata detected."}
+                          src="/img/cvlogo.svg"
+                          alt={"ComicInfo.xml file detected."}
                        />
                      </span>
                    )}
@@ -120,7 +123,7 @@ export const RecentlyImported = ({
                  </div>
                </Card>
                {/* metadata card */}
-                {!isNil(name) && (
+                {!isNil(name) ? (
                  <Card orientation="horizontal" hasDetails imageUrl={coverURL}>
                    <dd className="is-size-9">
                      <dl>
@@ -135,7 +138,7 @@ export const RecentlyImported = ({
                      </dl>
                    </dd>
                  </Card>
-                )}
+                ) : null}
              </React.Fragment>
            );
          },
@@ -143,4 +146,4 @@ export const RecentlyImported = ({
      </Masonry>
    </>
  );
-};
+};
--- a/src/client/components/Dashboard/WantedComicsList.tsx
+++ b/src/client/components/Dashboard/WantedComicsList.tsx
@@ -82,12 +82,12 @@ export const WantedComicsList = ({
                  {/* comicVine metadata presence */}
                  {isComicBookMetadataAvailable && (
                    <span className="icon custom-icon">
-                      <img src="/src/client/assets/img/cvlogo.svg" />
+                      <img src="/img/cvlogo.svg" />
                    </span>
                  )}
                  {!isEmpty(locg) && (
                    <span className="icon custom-icon">
-                      <img src="/src/client/assets/img/locglogo.svg" />
+                      <img src="/img/locglogo.svg" />
                    </span>
                  )}
                  {/* Issue type */}
--- a/src/client/components/Downloads/Downloads.tsx
+++ b/src/client/components/Downloads/Downloads.tsx
@@ -3,6 +3,7 @@ import { getTransfers } from "../../actions/airdcpp.actions";
 import { useDispatch, useSelector } from "react-redux";
 import { AirDCPPSocketContext } from "../../context/AirDCPPSocket";
 import { isEmpty, isNil, isUndefined } from "lodash";
+import { searchIssue } from "../../actions/fileops.actions";
 import { determineCoverFile } from "../../shared/utils/metadata.utils";
 import MetadataPanel from "../shared/MetadataPanel";

@@ -46,6 +47,7 @@ export const Downloads = (props: IDownloadsProps): ReactElement => {
      })
      setBundles(foo);
    }
+
  }, [issueBundles])

  return !isNil(bundles) ?
@@ -54,9 +56,9 @@ export const Downloads = (props: IDownloadsProps): ReactElement => {
        <h1 className="title">Downloads</h1>
        <div className="columns">
          <div className="column is-half">
-            {bundles.map((bundle, idx) => {
+            {bundles.map(bundle => {
              console.log(bundle);
-              return <div key={idx}>
+              return <>
                <MetadataPanel
                  data={bundle}
                  imageStyle={{ maxWidth: 80 }}
@@ -68,33 +70,30 @@ export const Downloads = (props: IDownloadsProps): ReactElement => {
                    margin: "0 0 8px 0",
                  }} />

-                <table className="table is-size-7">
-                  <thead>
+                  <table className="table is-size-7">
                    <tr>
                      <th>Name</th>
                      <th>Size</th>
                      <th>Type</th>
                      <th>Bundle ID</th>
                    </tr>
-                  </thead>
-                  <tbody>
-                    {bundle.acquisition.directconnect.downloads.map((bundle, idx) => {
-                      return (<tr key={idx}>
+
+                    {bundle.acquisition.directconnect.downloads.map((bundle) => {
+                      return(<tr>
                        <td>{bundle.name}</td>
                        <td>{bundle.size}</td>
                        <td>{bundle.type.str}</td>
                        <td><span className="tag is-warning">{bundle.bundleId}</span></td>
                      </tr>)
                    })}
-                  </tbody>
-                </table>
+                  </table>
                {/* <pre>{JSON.stringify(bundle.acquisition.directconnect.downloads, null, 2)}</pre> */}
-              </div>
+              </>
            })}
          </div>
        </div>
      </section>
-    </div> : <div>There are no downloads.</div>;
+    </div> : <div>asd</div>;
 };

 export default Downloads;
--- a/src/client/components/GlobalSearchBar/SearchBar.tsx
+++ b/src/client/components/GlobalSearchBar/SearchBar.tsx
@@ -31,7 +31,7 @@ export const SearchBar = (data: ISearchBarProps): ReactElement => {
              from: 0,
            },
            type: "volumeName",
-            trigger: "globalSearchBar",
+            trigger: "globalSearchBar"
          },
        ),
      );
@@ -51,6 +51,7 @@ export const SearchBar = (data: ISearchBarProps): ReactElement => {
          <i className="fa-solid fa-magnifying-glass"></i>
        </span>
      </div>
+
      {!isEmpty(searchResults) ? (
        <div
          className="columns box is-multiline"
@@ -61,10 +62,9 @@ export const SearchBar = (data: ISearchBarProps): ReactElement => {
            margin: "60px 0 0 350px",
          }}
        >
-          {map(searchResults, (result, idx) => (
+          {map(searchResults, (result) => (
            <MetadataPanel
              data={result}
-              key={idx}
              imageStyle={{ maxWidth: 70 }}
              titleStyle={{ fontSize: "0.8rem" }}
              tagsStyle={{ fontSize: "0.7rem" }}
--- a/src/client/components/Library/Library.tsx
+++ b/src/client/components/Library/Library.tsx
@@ -8,9 +8,10 @@ import { useDispatch, useSelector } from "react-redux";
 import { searchIssue } from "../../actions/fileops.actions";
 import ellipsize from "ellipsize";

+
 /**
 * Component that tabulates the contents of the user's ThreeTwo Library.
- *
+ * 
 * @component
 * @example
 * <Library />
@@ -19,7 +20,9 @@ export const Library = (): ReactElement => {
  const searchResults = useSelector(
    (state: RootState) => state.fileOps.libraryComics,
  );
-  const searchError = useSelector((state: RootState) => state.fileOps.librarySearchError);
+  const searchError = useSelector(
+    (state: RootState) => state.fileOps.librarySearchError,
+  );
  const dispatch = useDispatch();
  useEffect(() => {
    dispatch(
@@ -33,7 +36,7 @@ export const Library = (): ReactElement => {
            from: 0,
          },
          type: "all",
-          trigger: "libraryPage",
+          trigger: "libraryPage"
        },
      ),
    );
@@ -86,67 +89,63 @@ export const Library = (): ReactElement => {
  const WantedStatus = ({ value }) => {
    return !value ? <span className="tag is-info is-light">Wanted</span> : null;
  };
-  const columns = useMemo(
-    () => [
-      {
-        header: "Comic Metadata",
-        footer: 1,
-        columns: [
-          {
-            header: "File Details",
-            id: "fileDetails",
-            minWidth: 400,
-            accessorKey: "_source",
-            cell: (info) => {
-              return <MetadataPanel data={info.getValue()} />;
-            },
+  const columns = useMemo(() => [
+    {
+      header: "Comic Metadata",
+      footer: 1,
+      columns: [
+        {
+          header: "File Details",
+          id: "fileDetails",
+          minWidth: 400,
+          accessorKey: "_source",
+          cell: info => {
+            return <MetadataPanel data={info.getValue()} />;
          },
-          {
-            header: "ComicInfo.xml",
-            accessorKey: "_source.sourcedMetadata.comicInfo",
-            align: "center",
-            minWidth: 250,
-            cell: (info) =>
-              !isEmpty(info.getValue()) ? (
-                <ComicInfoXML data={info.getValue()} />
-              ) : (
-                <span className="tag mt-5">No ComicInfo.xml</span>
-              ),
+        },
+        {
+          header: "ComicInfo.xml",
+          accessorKey: "_source.sourcedMetadata.comicInfo",
+          align: "center",
+          minWidth: 250,
+          cell: info =>
+            !isEmpty(info.getValue()) ? (
+              <ComicInfoXML data={info.getValue()} />
+            ) : (
+              <span className="tag mt-5">No ComicInfo.xml</span>
+            ),
+        },
+      ],
+    },
+    {
+      header: "Additional Metadata",
+      columns: [
+        {
+          header: "Publisher",
+          accessorKey:
+            "_source.sourcedMetadata.comicvine.volumeInformation",
+          cell: info => {
+            return (
+              !isNil(info.getValue()) && (
+                <h6 className="is-size-7 has-text-weight-bold">
+                  {info.getValue().publisher.name}
+                </h6>
+              )
+            );
          },
-        ],
-      },
-      {
-        header: "Additional Metadata",
-        columns: [
-          {
-            header: "Publisher",
-            accessorKey: "_source.sourcedMetadata.comicvine.volumeInformation",
-            cell: (info) => {
-              return (
-                !isNil(info.getValue()) && (
-                  <h6 className="is-size-7 has-text-weight-bold">
-                    {info.getValue().publisher.name}
-                  </h6>
-                )
-              );
-            },
+        },
+        {
+          header: "Something",
+          accessorKey: "_source.acquisition.source.wanted",
+          cell: info => {
+            !isUndefined(info.getValue()) ?
+              <WantedStatus value={info.getValue().toString()} /> : "Nothing";
          },
-          {
-            header: "Something",
-            accessorKey: "_source.acquisition.source.wanted",
-            cell: (info) => {
-              !isUndefined(info.getValue()) ? (
-                <WantedStatus value={info.getValue().toString()} />
-              ) : (
-                "Nothing"
-              );
-            },
-          },
-        ],
-      },
-    ],
-    [],
-  );
+        },
+      ],
+    }
+  ], []);
+

  /**
   * Pagination control that fetches the next x (pageSize) items
@@ -154,7 +153,7 @@ export const Library = (): ReactElement => {
   * @param {number} pageIndex
   * @param {number} pageSize
   * @returns void
-   *
+   *  
   **/
  const nextPage = useCallback((pageIndex: number, pageSize: number) => {
    dispatch(
@@ -174,6 +173,7 @@ export const Library = (): ReactElement => {
    );
  }, []);

+
  /**
   * Pagination control that fetches the previous x (pageSize) items
   * based on the y (pageIndex) offset from the ThreeTwo Elasticsearch index
@@ -199,7 +199,7 @@ export const Library = (): ReactElement => {
            from,
          },
          type: "all",
-          trigger: "libraryPage",
+          trigger: "libraryPage"
        },
      ),
    );
@@ -208,19 +208,20 @@ export const Library = (): ReactElement => {
  // ImportStatus.propTypes = {
  //   value: PropTypes.bool.isRequired,
  // };
+
  return (
    <section className="container">
      <div className="section">
        <div className="header-area">
          <h1 className="title">Library</h1>
        </div>
-        {!isEmpty(searchResults) ? (
+        {!isUndefined(searchResults.hits) && (
          <div>
            <div className="library">
              <T2Table
-                totalPages={searchResults.total.value}
+                totalPages={searchResults.hits.total.value}
                columns={columns}
-                sourceData={searchResults?.hits}
+                sourceData={searchResults?.hits?.hits}
                rowClickHandler={navigateToComicDetail}
                paginationHandlers={{
                  nextPage,
@@ -229,26 +230,6 @@ export const Library = (): ReactElement => {
              />
            </div>
          </div>
-        ) : (
-          <div className="columns">
-            <div className="column is-two-thirds">
-              <article className="message is-link">
-                <div className="message-body">
-                  No comics were found in the library, Elasticsearch reports no
-                  indices. Try importing a few comics into the library and come
-                  back.
-                </div>
-              </article>
-              <pre>
-                {!isUndefined(searchError.data) &&
-                  JSON.stringify(
-                    searchError.data.meta.body.error.root_cause,
-                    null,
-                    4,
-                  )}
-              </pre>
-            </div>
-          </div>
        )}
      </div>
    </section>
--- a/src/client/components/Navbar.tsx
+++ b/src/client/components/Navbar.tsx
@@ -1,31 +1,21 @@
-import React, { useContext } from "react";
+import React from "react";
 import { SearchBar } from "./GlobalSearchBar/SearchBar";
 import { DownloadProgressTick } from "./ComicDetail/DownloadProgressTick";
 import { Link } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { isUndefined } from "lodash";
-import { format, fromUnixTime } from "date-fns";

 const Navbar: React.FunctionComponent = (props) => {
  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="/" className="navbar-item">
          <img
-            src="/src/client/assets/img/threetwo.svg"
+            src="/img/threetwo.svg"
            alt="ThreeTwo! A comic book curator"
            width="112"
            height="28"
@@ -82,66 +72,18 @@ const Navbar: React.FunctionComponent = (props) => {
          <div className="navbar-item has-dropdown is-hoverable">
            <a className="navbar-link is-arrowless">
              <i className="fa-solid fa-download"></i>
-              {downloadProgressTick && <div className="pulsating-circle"></div>}
+              {downloadProgressTick && (
+                <div className="pulsating-circle"></div>
+              )}
            </a>
            {!isUndefined(downloadProgressTick) ? (
-              <div className="navbar-dropdown is-right">
+              <div className="navbar-dropdown download-progress-meter">
                <a className="navbar-item">
                  <DownloadProgressTick data={downloadProgressTick} />
-                </a>              </div>
+                </a>
+              </div>
            ) : null}
          </div>
-          {/* AirDC++ socket connection status */}
-          <div className="navbar-item has-dropdown is-hoverable">
-            {airDCPPSocketConnectionStatus ? (
-              <>
-                <a className="navbar-link is-arrowless has-text-success">
-                  <i className="fa-solid fa-bolt"></i>
-                </a>
-                <div className="navbar-dropdown mt-3 pt-4 pr-2 pl-2 is-right airdcpp-status is-boxed">
-                  {/* AirDC++ Session Information */}
-
-                  <p>
-                    Last login was{" "}
-                    <span className="tag">
-                      {format(
-                        fromUnixTime(airDCPPSessionInfo.user.last_login),
-                        "dd MMMM, yyyy",
-                      )}
-                    </span>
-                  </p>
-                  <hr className="navbar-divider" />
-                  <p>
-                    <span className="tag has-text-success">
-                      {airDCPPSessionInfo.user.username}
-                    </span>
-                    connected to{" "}
-                    <span className="tag has-text-success">
-                      {airDCPPSessionInfo.system_info.client_version}
-                    </span>{" "}
-                    with session ID{" "}
-                    <span className="tag has-text-success">
-                      {airDCPPSessionInfo.session_id}
-                    </span>
-                  </p>
-
-                  {/* <pre>{JSON.stringify(airDCPPSessionInfo, null, 2)}</pre> */}
-                </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(socketDisconnectionReason, 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">
--- a/src/client/components/Volumes/Volumes.tsx
+++ b/src/client/components/Volumes/Volumes.tsx
@@ -166,8 +166,8 @@ export const Volumes = (props): ReactElement => {
          <div>
            <div className="library">
              <T2Table
-                sourceData={volumes?.hits}
-                totalPages={volumes.hits.length}
+                sourceData={volumes?.hits?.hits}
+                totalPages={volumes.hits.hits.length}
                paginationHandlers={{
                  nextPage: () => {},
                  previousPage: () => {},
--- a/src/client/components/WantedComics/WantedComics.tsx
+++ b/src/client/components/WantedComics/WantedComics.tsx
@@ -73,8 +73,8 @@ export const WantedComics = (props): ReactElement => {
          id: "downloadDetails",
          accessorKey: "acquisition",
          cell: data => <ol>
-            {data.getValue().directconnect.downloads.map((download, idx) => {
-              return <li className="is-size-7" key={idx}>{download.name}</li>;
+            {data.getValue().directconnect.downloads.map(download => {
+              return <li className="is-size-7">{download.name}</li>;
            })}
          </ol>
        },
--- a/src/client/components/shared/MetadataPanel.tsx
+++ b/src/client/components/shared/MetadataPanel.tsx
@@ -57,12 +57,6 @@ export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
                  >
                    {rawFileDetails.extension}
                  </span>
-                  <span
-                    className="tag is-success is-light has-text-weight-semibold"
-                    style={props.tagsStyle}
-                  >
-                    {rawFileDetails.mimeType}
-                  </span>
                  <span
                    className="tag is-success is-light"
                    style={props.tagsStyle}
--- a/src/client/components/shared/T2Table.tsx
+++ b/src/client/components/shared/T2Table.tsx
@@ -20,6 +20,8 @@ export const T2Table = (tableOptions): ReactElement => {
      pageIndex: 1,
      pageSize: 15,
    });
+    console.log(sourceData)
+

  const pagination = useMemo(
    () => ({
@@ -79,12 +81,12 @@ export const T2Table = (tableOptions): ReactElement => {
            {/* <p>{totalPages} comics in all</p> */}
          </div>
          <div className="field has-addons">
-            <div className="control">
+            <p className="control">
              <div className="button" onClick={() => goToPreviousPage()}> <i className="fas fa-chevron-left"></i></div>
-            </div>
-            <div className="control">
+            </p>
+            <p className="control">
              <div className="button" onClick={() => goToNextPage()}> <i className="fas fa-chevron-right"></i> </div>
-            </div>
+            </p>

            <div className="field has-addons ml-5">
              <p className="control">
--- a/src/client/constants/action-types.ts
+++ b/src/client/constants/action-types.ts
@@ -81,8 +81,6 @@ export const IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_IN_PROGRESS =
 export const IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_FAILED =
  "IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_FAILED";

-export const COMICBOOK_EXTRACTION_SUCCESS = "COMICBOOK_EXTRACTION_SUCCESS";
-
 // Image file stats
 export const IMG_ANALYSIS_CALL_IN_PROGRESS = "IMG_ANALYSIS_CALL_IN_PROGRESS";
 export const IMG_ANALYSIS_DATA_FETCH_SUCCESS =
@@ -115,8 +113,6 @@ export const AIRDCPP_FILE_DOWNLOAD_COMPLETED =
 export const LS_SINGLE_IMPORT = "LS_SINGLE_IMPORT";
 export const AIRDCPP_BUNDLES_FETCHED = "AIRDCPP_BUNDLES_FETCHED";
 export const AIRDCPP_DOWNLOAD_PROGRESS_TICK = "AIRDCPP_DOWNLOAD_PROGRESS_TICK";
-export const AIRDCPP_SOCKET_CONNECTED = "AIRDCPP_SOCKET_CONNECTED";
-export const AIRDCPP_SOCKET_DISCONNECTED = "AIRDCPP_SOCKET_DISCONNECTED";

 // Transfers
 export const AIRDCPP_TRANSFERS_FETCHED = "AIRDCPP_TRANSFERS_FETCHED";
@@ -139,4 +135,4 @@ export const SETTINGS_DB_FLUSH_SUCCESS = "SETTINGS_DB_FLUSH_SUCCESS";
 // Metron Metadata
 export const METRON_DATA_FETCH_SUCCESS = "METRON_DATA_FETCH_SUCCESS";
 export const METRON_DATA_FETCH_IN_PROGRESS = "METRON_DATA_FETCH_IN_PROGRESS";
-export const METRON_DATA_FETCH_ERROR = "METRON_DATA_FETCH_ERROR";
+export const METRON_DATA_FETCH_ERROR = "METRON_DATA_FETCH_ERROR";
--- a/src/client/constants/endpoints.ts
+++ b/src/client/constants/endpoints.ts
@@ -11,68 +11,68 @@ export const hostURIBuilder = (options: Record<string, string>): string => {

 export const CORS_PROXY_SERVER_URI = hostURIBuilder({
  protocol: "http",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "8050",
  apiPath: "/",
 });

 export const COMICVINE_SERVICE_URI = hostURIBuilder({
  protocol: "http",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "3080",
  apiPath: "/api/comicvine",
 });

 export const METRON_SERVICE_URI = hostURIBuilder({
  protocol: "http",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "3080",
  apiPath: "/api/metron",
 });

 export const API_BASE_URI = hostURIBuilder({
  protocol: "http",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "8050",
  apiPath: "/api",
 });

 export const LIBRARY_SERVICE_HOST = hostURIBuilder({
  protocol: "http",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "3000",
  apiPath: ``,
 });
 export const LIBRARY_SERVICE_BASE_URI = hostURIBuilder({
  protocol: "http",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "3000",
  apiPath: "/api/library",
 });
 export const SEARCH_SERVICE_BASE_URI = hostURIBuilder({
  protocol: "http",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "3000",
  apiPath: "/api/search",
 });

 export const SETTINGS_SERVICE_BASE_URI = hostURIBuilder({
  protocol: "http",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "3000",
  apiPath: "/api/settings",
 });

 export const IMAGETRANSFORMATION_SERVICE_BASE_URI = hostURIBuilder({
  protocol: "http",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "3000",
  apiPath: "/api/imagetransformation",
 });

 export const SOCKET_BASE_URI = hostURIBuilder({
  protocol: "ws",
-  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  host: process.env.UNDERLYING_HOSTNAME || "localhost",
  port: "3001",
  apiPath: `/`,
 });
--- a/src/client/context/AirDCPPSocket.tsx
+++ b/src/client/context/AirDCPPSocket.tsx
@@ -1,9 +1,7 @@
 import { isEmpty, isUndefined } from "lodash";
 import React, { createContext, useEffect, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import { toggleAirDCPPSocketConnectionStatus } from "../actions/airdcpp.actions";
 import { getSettings } from "../actions/settings.actions";
-
 import AirDCPPSocket from "../services/DcppSearchService";

 const AirDCPPSocketContextProvider = ({ children }) => {
@@ -14,7 +12,7 @@ const AirDCPPSocketContextProvider = ({ children }) => {
      airDCPPState: {
        settings: settingsObject,
        socket: {},
-        socketConectionInformation: {},
+        socketConnectionInformation: {},
      },
    });
  };
@@ -53,35 +51,16 @@ const AirDCPPSocketContextProvider = ({ children }) => {
        client: { host },
      },
    } = configuration;
-
    const initializedAirDCPPSocket = new AirDCPPSocket({
      protocol: `${host.protocol}`,
      hostname: `${host.hostname}:${host.port}`,
-      username: `${host.username}`,
-      password: `${host.password}`,
    });

-    // connect and disconnect handlers
-    initializedAirDCPPSocket.onConnected = (sessionInfo) => {
-      dispatch(toggleAirDCPPSocketConnectionStatus("connected", sessionInfo));
-    };
-    initializedAirDCPPSocket.onDisconnected = async (
-      reason,
-      code,
-      wasClean,
-    ) => {
-      dispatch(
-        toggleAirDCPPSocketConnectionStatus("disconnected", {
-          reason,
-          code,
-          wasClean,
-        }),
-      );
-    };
-
-    const socketConnectionInformation = await initializedAirDCPPSocket.connect();
-
-    // update the state with the new socket connection information
+    const socketConnectionInformation = await initializedAirDCPPSocket.connect(
+      `${host.username}`,
+      `${host.password}`,
+      true,
+    );
    persistSettings({
      ...airDCPPState,
      airDCPPState: {
@@ -101,7 +80,7 @@ const AirDCPPSocketContextProvider = ({ children }) => {
 };
 const AirDCPPSocketContext = createContext({
  airDCPPState: {},
-  saveSettings: () => { },
+  saveSettings: () => {},
 });

 export { AirDCPPSocketContext, AirDCPPSocketContextProvider };
--- a/src/client/reducers/airdcpp.reducer.ts
+++ b/src/client/reducers/airdcpp.reducer.ts
@@ -9,8 +9,6 @@ import {
  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";
@@ -26,9 +24,6 @@ const initialState = {
  downloadFileStatus: {},
  bundles: [],
  transfers: [],
-  isAirDCPPSocketConnected: false,
-  airDCPPSessionInfo: {},
-  socketDisconnectionReason: {},
 };

 function airdcppReducer(state = initialState, action) {
@@ -100,23 +95,8 @@ function airdcppReducer(state = initialState, action) {
        ...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,
@@ -125,6 +105,7 @@ function airdcppReducer(state = initialState, action) {
        bundleDBImportResult: null,
        // bundles: [],
      };
+
    default:
      return state;
  }
--- a/src/client/reducers/fileops.reducer.ts
+++ b/src/client/reducers/fileops.reducer.ts
@@ -29,11 +29,7 @@ import {
  SS_SEARCH_FAILED,
  SS_SEARCH_RESULTS_FETCHED_SPECIAL,
  VOLUMES_FETCHED,
-  COMICBOOK_EXTRACTION_SUCCESS,
 } from "../constants/action-types";
-import { removeLeadingPeriod } from "../shared/utils/formatting.utils";
-import { LIBRARY_SERVICE_HOST } from "../constants/endpoints";
-
 const initialState = {
  IMSCallInProgress: false,
  IMGCallInProgress: false,
@@ -46,10 +42,7 @@ const initialState = {
  isComicVineMetadataImportInProgress: false,
  comicVineMetadataImportError: {},
  rawImportError: {},
-  extractedComicBookArchive: {
-    reading: [],
-    analysis: [],
-  },
+  extractedComicBookArchive: [],
  recentComics: [],
  wantedComics: [],
  libraryComics: [],
@@ -88,7 +81,7 @@ function fileOpsReducer(state = initialState, action) {
    case IMS_RECENT_COMICS_FETCHED:
      return {
        ...state,
-        recentComics: action.data.docs,
+        recentComics: action.data,
      };
    case IMS_WANTED_COMICS_FETCHED:
      return {
@@ -138,7 +131,13 @@ function fileOpsReducer(state = initialState, action) {
        comicBookExtractionInProgress: true,
      };
    }
-
+    case IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_SUCCESS: {
+      return {
+        ...state,
+        extractedComicBookArchive: action.extractedComicBookArchive,
+        comicBookExtractionInProgress: false,
+      };
+    }
    case LOCATION_CHANGE: {
      return {
        ...state,
@@ -153,44 +152,11 @@ function fileOpsReducer(state = initialState, action) {
    }
    case LS_COVER_EXTRACTED: {
      console.log("BASH", action);
-      if(state.recentComics.length === 5) {
-        state.recentComics.pop();
-      }
      return {
        ...state,
        librarySearchResultCount: state.librarySearchResultCount + 1,
-        recentComics: [...state.recentComics, action.result.data.importResult]
      };
    }
-
-    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_QUEUE_DRAINED: {
      console.log("drained", action);
      return {
@@ -233,7 +199,7 @@ function fileOpsReducer(state = initialState, action) {
    case SS_SEARCH_RESULTS_FETCHED_SPECIAL: {
      const foo = [];
      if (!isUndefined(action.data.hits)) {
-        map(action.data.hits, ({ _source }) => {
+        map(action.data.hits.hits, ({ _source }) => {
          foo.push(_source);
        });
      }
@@ -246,7 +212,7 @@ function fileOpsReducer(state = initialState, action) {
    case WANTED_COMICS_FETCHED: {
      const foo = [];
      if (!isUndefined(action.data.hits)) {
-        map(action.data.hits, ({ _source }) => {
+        map(action.data.hits.hits, ({ _source }) => {
          foo.push(_source);
        });
      }
@@ -263,7 +229,7 @@ function fileOpsReducer(state = initialState, action) {
        volumes: action.data,
        SSCallInProgress: false,
      };
-
+    
    case SS_SEARCH_FAILED: {
      return {
        ...state,
@@ -283,4 +249,4 @@ function fileOpsReducer(state = initialState, action) {
  }
 }

-export default fileOpsReducer;
+export default fileOpsReducer;
--- a/src/client/services/DcppSearchService.ts
+++ b/src/client/services/DcppSearchService.ts
@@ -10,7 +10,7 @@ class AirDCPPSocket {
    }
    const options = {
      url: `${socketProtocol}://${configuration.hostname}/api/v1/`,
-      autoReconnect: true,
+      autoReconnect: false,
      reconnectInterval: 5,
      logLevel: "verbose",
      ignoredListenerEvents: [
@@ -18,8 +18,6 @@ class AirDCPPSocket {
        "hash_statistics",
        "hub_counts_updated",
      ],
-      username: `${configuration.username}`,
-      password: `${configuration.password}`,
    };
    const AirDCPPSocketInstance = Socket(options, window.WebSocket as any);
    return AirDCPPSocketInstance;
--- a/src/client/services/api/SearchApi.ts
+++ b/src/client/services/api/SearchApi.ts
@@ -18,7 +18,7 @@ function sleep(ms: number): Promise<NodeJS.Timeout> {
 }

 export const search = async (data: SearchData) => {
-  await SocketService.connect();
+  await SocketService.connect("admin", "password");
  const instance: SearchInstance = await SocketService.post("search");
  const unsubscribe = await SocketService.addListener(
    "search",
--- a/src/client/shared/utils/metadata.utils.ts
+++ b/src/client/shared/utils/metadata.utils.ts
@@ -67,10 +67,7 @@ export const determineCoverFile = (data) => {
  }
 };

-export const determineExternalMetadata = (
-  metadataSource: string,
-  source: any
-) => {
+export const determineExternalMetadata = (metadataSource, source) => {
  switch (metadataSource) {
    case "comicvine":
      return {
@@ -90,4 +87,4 @@ export const determineExternalMetadata = (
    default:
      break;
  }
-};
+};
--- a/src/client/stories/MetadataPanel.stories.tsx
+++ b/src/client/stories/MetadataPanel.stories.tsx
@@ -30,20 +30,20 @@ RawFileDetails.args = {
        },
        "inferredMetadata": {
          "issue": {
-            "name": "Batman Annual 02",
+            "name": "Fantastic Four 143",
            "number": 197402,
            "year": "1974",
            "subtitle": ""
          }
        },
        "rawFileDetails": {
-          "name": "Batman Annual 02",
+          "name": "197402 Fantastic Four 143",
          "filePath": "/Users/rishi/work/threetwo-core-service/comics/197402 Fantastic Four 143.cbz",
          "fileSize": 10341074,
          "extension": ".cbz",
          "containedIn": "./userdata/covers/197402 Fantastic Four 143",
          "cover": {
-            "filePath": "userdata/covers/Batman Annual 02/Batman 002_00a.jpg"
+            "filePath": "userdata/covers/197402 Fantastic Four 143/FF143_01.jpg"
          }
        },
        "sourcedMetadata": { "comicInfo": null, "comicvine": { "aliases": [] } },
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -30,12 +30,12 @@ app.use(bodyParser.urlencoded({ extended: true }));
 // REGISTER ROUTES
 // all of the routes will be prefixed with /api
 const routes: Router[] = Object.values(router);
-// app.use("/api", routes);
+app.use("/api", routes);

 // Send index.html on root request
-// app.use(express.static("dist"));
-// app.use(express.static("public"));
+app.use(express.static("dist"));
+app.use(express.static("public"));

-// app.listen(port);
+app.listen(port);

-// console.log(`Server is listening on ${port}`);
+console.log(`Server is listening on ${port}`);
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,21 +2,19 @@
  "extends": "@tsconfig/node14/tsconfig.json",
  "$schema": "https://json.schemastore.org/tsconfig",
  "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "lib": ["DOM", "DOM.Iterable", "ESNext"],
-    "allowJs": false,
-    "skipLibCheck": true,
-    "esModuleInterop": false,
    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
+    "noImplicitAny": false,
+    "target": "es2019",
+    "jsx": "react",
+    "module": "commonjs",
+    "sourceMap": true,
+    "outDir": "./dist/",
+    "skipLibCheck": true,
    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx"
+    "lib": ["dom", "dom.iterable", "esnext", "webworker"],
+    "baseUrl": ".",
+    "esModuleInterop": true,
+    "strict": true
  },
  "settings": {
    "eslint.workingDirectories": [
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,22 +0,0 @@
-import react from "@vitejs/plugin-react";
-import { nodeResolve } from "@rollup/plugin-node-resolve";
-import { defineConfig } from "vite";
-
-export default defineConfig({
-  publicDir: "public",
-  base: "",
-  build: "esnext",
-  plugins: [
-    nodeResolve({
-      // browser: true
-      exportConditions: ["node"],
-    }),
-    react({
-      // Use React plugin in all *.jsx and *.tsx files
-      include: "**/*.{jsx,tsx}",
-      babel: {
-        plugins: ["babel-plugin-styled-components"],
-      },
-    }),
-  ],
-});
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -0,0 +1,128 @@
+const path = require("path");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const webpack = require("webpack");
+const outputDirectory = "dist";
+const BundleAnalyzerPlugin =
+  require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
+const ReactRefreshWebpackPlugin = require("@pmmmwh/react-refresh-webpack-plugin");
+const CopyPlugin = require("copy-webpack-plugin");
+
+module.exports = (_, argv) => {
+  const mode = argv.mode;
+  const isDevelopment = mode === "development";
+  return {
+    entry: ["babel-polyfill", "./src/client/index.tsx"],
+    output: {
+      path: path.resolve(__dirname, outputDirectory),
+      filename: "./js/[name].bundle.js",
+    },
+    devtool: "source-map",
+    stats: {
+      children: true,
+    },
+    experiments: {
+      topLevelAwait: true,
+    },
+    module: {
+      rules: [
+        {
+          test: /\.worker\.(js|ts)$/i,
+          use: [
+            {
+              loader: "comlink-loader",
+              options: {
+                singleton: true,
+              },
+            },
+          ],
+        },
+        {
+          test: [/\.js?$/, /\.jsx?$/, /\.tsx?$/],
+          use: [
+            {
+              loader: "babel-loader",
+              options: {
+                plugins: [
+                  isDevelopment && require("react-refresh/babel"),
+                ].filter(Boolean),
+              },
+            },
+          ],
+          exclude: /node_modules/,
+        },
+        {
+          enforce: "pre",
+          test: /\.js$/,
+          loader: "source-map-loader",
+        },
+        {
+          test: /\.css$/i,
+          use: ["style-loader", "css-loader"],
+        },
+        {
+          test: /\.s[ac]ss$/i,
+          use: [
+            // Creates `style` nodes from JS strings
+            "style-loader",
+            // Translates CSS into CommonJS
+            "css-loader",
+            // Compiles Sass to CSS
+            "sass-loader",
+          ],
+        },
+        {
+          test: /\.(png|jpg|jpeg|gif|svg|woff|woff2|ttf|eot)$/i,
+          use: [
+            "file-loader?hash=sha512&digest=hex&name=img/[contenthash].[ext]",
+            "image-webpack-loader?bypassOnDebug&optipng.optimizationLevel=7&gifsicle.interlaced=false",
+          ],
+        },
+      ],
+    },
+    resolve: {
+      extensions: ["*", ".ts", ".tsx", ".js", ".jsx", ".json"],
+      aliasFields: ["browser", "browser.esm"],
+    },
+    mode: process.env.NODE_ENV,
+    devServer: {
+      hot: true,
+      port: 3050,
+      open: true,
+      proxy: {
+        "/api/**": {
+          target: "http://localhost:8050",
+          secure: false,
+          changeOrigin: true,
+        },
+      },
+    },
+    optimization: {
+      usedExports: false,
+    },
+    plugins: [
+      // new BundleAnalyzerPlugin(),
+      new CopyPlugin({
+        patterns: [{ from: "./src/client/assets/img/", to: "img/" }],
+        options: {
+          concurrency: 100,
+        },
+      }),
+      isDevelopment && new ReactRefreshWebpackPlugin(),
+      new HtmlWebpackPlugin({
+        template: "./public/index.html",
+        favicon: "./public/favicon.ico",
+        title: "express-typescript-react",
+      }),
+      new webpack.DefinePlugin({
+        "process.env.UNDERLYING_HOSTNAME": JSON.stringify(
+          process.env.UNDERLYING_HOSTNAME,
+        ),
+      }),
+      new MiniCssExtractPlugin({
+        filename: "./css/[name].css",
+        chunkFilename: "./css/[id].css",
+      }),
+    ].filter(Boolean),
+  };
+};
--- a/yarn.lock
+++ b/yarn.lock