🚥 Added service status panel scaffold

* ⚡️ Config key to expose hostname in a Docker context

* 🔧 Miscellaneous Fixes

.babelrc

@@ -1,17 +0,0 @@
-{
-  "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"]
-    }
-  }
-}

.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"],
+  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"],
   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

.github/workflows/docker-image.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
+      uses: elgohr/Publish-Docker-Github-Action@v5
       with:
         name: frishi/threetwo
         username: ${{ secrets.DOCKER_USERNAME }}

.storybook/main.js

@@ -1,19 +0,0 @@
-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",
-  },
-};

.storybook/main.ts

@@ -0,0 +1,17 @@
+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;

.storybook/preview-head.html

@@ -0,0 +1,3 @@
+<script>
+  window.global = window;
+</script>

.storybook/preview.js

@@ -1,9 +0,0 @@
-export const parameters = {
-  actions: { argTypesRegex: "^on[A-Z].*" },
-  controls: {
-    matchers: {
-      color: /(background|color)$/i,
-      date: /Date$/,
-    },
-  },
-}

.storybook/preview.ts

@@ -0,0 +1,18 @@
+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;

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:17.3-alpine
+FROM node:18.15.0-alpine
 LABEL maintainer="Rishi Ghan <rishi.ghan@gmail.com>"
 
 WORKDIR /threetwo
@@ -9,11 +9,11 @@ COPY nodemon.json ./
 COPY jsdoc.json ./
 
 # RUN apt-get update && apt-get install -y git python3 build-essential autoconf automake g++ libpng-dev make
-RUN apk --no-cache add g++ make libpng-dev python3 git libc6-compat autoconf automake  bash libjpeg-turbo-dev libpng-dev mesa-dev mesa libxi build-base gcc libtool nasm
+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 yarn --ignore-engines
 
 
 COPY . .
-EXPOSE 3050
+EXPOSE 5173
 
 ENTRYPOINT [ "npm", "start" ]

README.md

@@ -6,13 +6,13 @@ ThreeTwo! _aims to be_ a comic book curation app.
 
 ### Screenshots
 
-![](https://raw.githubusercontent.com/rishighan/threetwo/rishighan-screenshots-dec-2022/Dashboard.png)
+![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/Dashboard.png)
 
-![](https://raw.githubusercontent.com/rishighan/threetwo/rishighan-screenshots-dec-2022/Library.png)
+![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/Library.png)
 
-![](https://raw.githubusercontent.com/rishighan/threetwo/rishighan-screenshots-dec-2022/DC%2B%2B%20integration.png)
+![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/DC%2B%2B%20integration.png)
 
-![](https://raw.githubusercontent.com/rishighan/threetwo/rishighan-screenshots-dec-2022/ComicVine%20Matching.png)
+![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/ComicVine%20Matching.png)
 
 
 ### 🦄 Early Development Support Channel
@@ -40,9 +40,8 @@ For debugging and troubleshooting, you can run this app locally using these step
 
 1. Clone this repo using `git clone https://github.com/rishighan/threetwo.git`
 2. `yarn run dev` (you can ignore the warnings)
-3. This will open `http://localhost:3050` in your default browser
+3. This will open `http://localhost:5173` in your default browser
-4. For testing `OPDS` functionality, create a folder called `comics` under `/src/server` and put some comics in there. The `OPDS` feed is accessed to `http://localhost:8050/api/opds`
+4. Note that this is simply the UI layer and won't offer anything beyond a scaffold. You have to spin up the microservices locally to get it to work.
-5. Note that this is simply the UI layer and won't offer anything beyond a scaffold. You have to spin up the microservices locally to get it to work.
 
 
 ## Troubleshooting

index.html

@@ -10,6 +10,7 @@
 
 <body>
     <div id="root"></div>
+    <script type="module" src="/src/client/index.tsx"></script>
 </body>
 
 </html>

package.json

@@ -5,15 +5,12 @@
   "main": "server/index.js",
   "typings": "server/index.js",
   "scripts": {
-    "build": "webpack --mode production",
+    "build": "vite build",
-    "start": "npm run build && npm run server",
+    "dev": "rimraf dist && npm run build && vite",
-    "client": "webpack serve --mode development --devtool inline-source-map --hot",
+    "start": "npm run build && vite",
-    "server": "tsc -p tsconfig.server.json && node server/",
-    "dev": "concurrently \"nodemon\" \"npm run client\"",
-    "server-dev": "nodemon",
     "docs": "jsdoc -c jsdoc.json",
-    "storybook": "start-storybook -p 6006",
+    "storybook": "storybook dev -p 6006",
-    "build-storybook": "build-storybook"
+    "build-storybook": "storybook build"
   },
   "author": "Rishi Ghan",
   "license": "MIT",
@@ -23,75 +20,68 @@
     "@dnd-kit/core": "^4.0.0",
     "@dnd-kit/sortable": "^5.0.0",
     "@dnd-kit/utilities": "^3.2.0",
-    "@fortawesome/fontawesome-free": "^6.1.1",
+    "@fortawesome/fontawesome-free": "^6.3.0",
-    "@parcel/config-default": "^2.6.0",
     "@redux-devtools/extension": "^3.2.2",
+    "@rollup/plugin-node-resolve": "^15.0.1",
     "@tanstack/react-table": "^8.5.11",
+    "@types/axios": "^0.14.0",
     "@types/mime-types": "^2.1.0",
-    "@types/react": "^17.0.3",
+    "@types/react-router-dom": "^5.3.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",
-    "airdcpp-apisocket": "^2.4.4",
+    "@vitejs/plugin-react": "^3.1.0",
-    "array-sort-by": "^1.2.1",
+    "airdcpp-apisocket": "~2.4.5-beta.2",
-    "axios": "^0.27.2",
+    "axios": "^1.3.4",
+    "axios-cache-interceptor": "^1.0.1",
     "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",
     "date-fns": "^2.28.0",
     "dayjs": "^1.10.6",
-    "ellipsize": "^0.1.0",
+    "ellipsize": "^0.5.1",
     "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",
-    "opds-extra": "^3.0.9",
+    "node-sass": "npm:sass",
     "pretty-bytes": "^5.6.0",
     "prop-types": "^15.8.1",
     "qs": "^6.10.5",
     "react": "^18.2.0",
     "react-collapsible": "^2.9.0",
     "react-comic-viewer": "^0.4.0",
-    "react-day-picker": "^8.0.6",
+    "react-day-picker": "^8.6.0",
-    "react-dom": "^18.1.0",
+    "react-dom": "^18.2.0",
     "react-fast-compare": "^3.2.0",
     "react-final-form": "^6.5.9",
-    "react-final-form-arrays": "^3.1.3",
+    "react-final-form-arrays": "^3.1.4",
     "react-loader-spinner": "^4.0.0",
     "react-masonry-css": "^1.0.16",
     "react-modal": "^3.15.1",
-    "react-redux": "^7.2.6",
+    "react-redux": "^8.0.5",
-    "react-router": "^6.2.2",
+    "react-router": "^6.9.0",
-    "react-router-dom": "^6.2.2",
+    "react-router-dom": "^6.9.0",
     "react-select": "^5.3.2",
-    "react-select-async-paginate": "^0.6.1",
+    "react-select-async-paginate": "^0.7.2",
     "react-slick": "^0.29.0",
     "react-sliding-pane": "^7.1.0",
-    "react-stickynode": "^4.0.0",
+    "react-stickynode": "^4.1.0",
     "react-textarea-autosize": "^8.3.4",
-    "reapop": "^4.0.5",
+    "reapop": "^4.2.1",
-    "redux-first-history": "^5.0.9",
+    "redux-first-history": "^5.1.1",
     "redux-socket.io-middleware": "^1.0.4",
-    "redux-thunk": "^2.4.1",
+    "redux-thunk": "^2.4.2",
-    "sharp": "^0.30.5",
     "slick-carousel": "^1.8.1",
     "socket.io-client": "^4.3.2",
-    "styled-components": "^5.3.5",
+    "styled-components": "^5.3.9",
     "threetwo-ui-typings": "^1.0.14",
-    "voca": "^1.4.0",
+    "vite-plugin-html": "^3.2.0",
     "websocket": "^1.0.34",
-    "ws": "^7.5.3",
-    "xml2js": "^0.4.23",
     "xregexp": "^5.0.2"
   },
   "devDependencies": {
@@ -99,44 +89,30 @@
     "@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.13.10",
+    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.12.13",
+    "@babel/preset-react": "^7.18.6",
     "@babel/preset-typescript": "^7.13.0",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
+    "@storybook/addon-essentials": "^7.0.0-rc.3",
-    "@storybook/addon-actions": "^6.5.9",
+    "@storybook/addon-interactions": "^7.0.0-rc.3",
-    "@storybook/addon-essentials": "^6.5.9",
+    "@storybook/addon-links": "^7.0.0-rc.3",
-    "@storybook/addon-interactions": "^6.5.9",
+    "@storybook/blocks": "^7.0.0-rc.3",
-    "@storybook/addon-links": "^6.5.9",
+    "@storybook/react": "^7.0.0-rc.3",
-    "@storybook/builder-webpack4": "^6.5.9",
+    "@storybook/react-vite": "^7.0.0-rc.3",
-    "@storybook/builder-webpack5": "^6.5.9",
+    "@storybook/testing-library": "^0.0.14-next.1",
-    "@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": "^17.0.3",
+    "@types/react": "^18.0.28",
-    "@types/react-dom": "^17.0.2",
+    "@types/react-dom": "^18.0.11",
-    "@types/react-redux": "^7.1.16",
+    "@types/react-redux": "^7.1.25",
     "@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",
-    "buffer": "^6.0.3",
+    "bulma": "^0.9.4",
-    "bulma": "^0.9.3",
-    "clean-webpack-plugin": "^1.0.0",
-    "comlink": "^4.3.0",
-    "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",
@@ -146,35 +122,19 @@
     "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": "^3.0.2",
+    "rimraf": "^4.1.3",
-    "sass-loader": "^11.0.1",
+    "sass": "^1.58.1",
-    "source-map-loader": "^0.2.4",
+    "storybook": "^7.0.0-rc.3",
-    "string-similarity": "^4.0.4",
-    "style-loader": "^2.0.0",
     "tslint": "^6.1.3",
-    "typescript": "^4.2.3",
+    "typescript": "^5.0.2",
-    "url-loader": "^1.0.1",
+    "vite": "^4.2.0"
-    "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"
   }
 }

src/client/actions/comicinfo.actions.tsx

@@ -1,10 +1,6 @@
 import axios from "axios";
 import rateLimiter from "axios-rate-limit";
-import {
+import { setupCache } from "axios-cache-interceptor";
-  AxiosCacheRequestConfig,
-  createCacheAdapter,
-} from "axios-simple-cache-adapter";
-import qs from "qs";
 import {
   CV_SEARCH_SUCCESS,
   CV_API_CALL_IN_PROGRESS,
@@ -26,25 +22,22 @@ 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 axios(`${COMICVINE_SERVICE_URI}/getWeeklyPullList`, {
+    await cachedAxios(`${COMICVINE_SERVICE_URI}/getWeeklyPullList`, {
       method: "get",
       params: options,
-      axiosCacheAdapter,
+    }).then((response) => {
-      cache: 1000, // value in MS
-    } as AxiosCacheRequestConfig).then((response) => {
       dispatch({
         type: CV_WEEKLY_PULLLIST_FETCHED,
         data: response.data.result,
@@ -70,9 +63,6 @@ export const comicinfoAPICall = (options) => async (dispatch) => {
         "Content-Type": "application/json",
         "Access-Control-Allow-Origin": "*",
       },
-      paramsSerializer: (params) => {
-        return qs.stringify(params, { arrayFormat: "repeat" });
-      },
     });
 
     switch (options.callURIAction) {

src/client/actions/fileops.actions.tsx

@@ -34,11 +34,27 @@ import {
   WANTED_COMICS_FETCHED,
   VOLUMES_FETCHED,
   CV_WEEKLY_PULLLIST_FETCHED,
+  LIBRARY_SERVICE_HEALTH,
 } from "../constants/action-types";
 import { success } from "react-notification-system-redux";
 
 import { isNil, map } from "lodash";
 
+export const getServiceStatus = (serviceName?: string) => async dispatch => {
+  axios
+    .request({
+      url: `${LIBRARY_SERVICE_BASE_URI}/getHealthInformation`,
+      method: "GET",
+      transformResponse: (r: string) => JSON.parse(r),
+    })
+    .then((response) => {
+      const { data } = response;
+      dispatch({
+        type: LIBRARY_SERVICE_HEALTH,
+        status: data,
+      });
+    });
+};
 export async function walkFolder(path: string): Promise<Array<IFolderData>> {
   return axios
     .request<Array<IFolderData>>({
@@ -127,49 +143,50 @@ export const getComicBooks = (options) => async (dispatch) => {
  * @returns Nothing.
  * @param payload
  */
-export const importToDB = (sourceName: string, metadata?: any) => (dispatch) => {
+export const importToDB =
-  try {
+  (sourceName: string, metadata?: any) => (dispatch) => {
-    const comicBookMetadata = {
+    try {
-      importType: "new",
+      const comicBookMetadata = {
-      payload: {
+        importType: "new",
-        rawFileDetails: {
+        payload: {
-          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: metadata || null,
+      };
-        acquisition: { source: { wanted: true, name: sourceName } },
+      dispatch({
-      }
+        type: IMS_CV_METADATA_IMPORT_CALL_IN_PROGRESS,
-    };
-    dispatch({
-      type: IMS_CV_METADATA_IMPORT_CALL_IN_PROGRESS,
-    });
-    return axios
-      .request({
-        url: `${LIBRARY_SERVICE_BASE_URI}/rawImportToDb`,
-        method: "POST",
-        data: comicBookMetadata,
-        // transformResponse: (r: string) => JSON.parse(r),
-      })
-      .then((response) => {
-        const { data } = response;
-        dispatch({
-          type: IMS_CV_METADATA_IMPORT_SUCCESSFUL,
-          importResult: data,
-        });
       });
-  } catch (error) {
+      return axios
-    dispatch({
+        .request({
-      type: IMS_CV_METADATA_IMPORT_FAILED,
+          url: `${LIBRARY_SERVICE_BASE_URI}/rawImportToDb`,
-      importError: error,
+          method: "POST",
-    });
+          data: comicBookMetadata,
-  }
+          // transformResponse: (r: string) => JSON.parse(r),
-};
+        })
+        .then((response) => {
+          const { data } = response;
+          dispatch({
+            type: IMS_CV_METADATA_IMPORT_SUCCESSFUL,
+            importResult: data,
+          });
+        });
+    } catch (error) {
+      dispatch({
+        type: IMS_CV_METADATA_IMPORT_FAILED,
+        importError: error,
+      });
+    }
+  };
 
 export const fetchVolumeGroups = () => async (dispatch) => {
   try {
@@ -254,24 +271,23 @@ export const fetchComicVineMatches =
  * @returns {any}
  */
 export const extractComicArchive =
-
   (path: string, options: any): any =>
-    async (dispatch) => {
+  async (dispatch) => {
-      dispatch({
+    dispatch({
-        type: IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_IN_PROGRESS,
+      type: IMS_COMIC_BOOK_ARCHIVE_EXTRACTION_CALL_IN_PROGRESS,
-      });
+    });
-      await axios({
+    await axios({
-        method: "POST",
+      method: "POST",
-        url: `${LIBRARY_SERVICE_BASE_URI}/uncompressFullArchive`,
+      url: `${LIBRARY_SERVICE_BASE_URI}/uncompressFullArchive`,
-        headers: {
+      headers: {
-          "Content-Type": "application/json; charset=utf-8",
+        "Content-Type": "application/json; charset=utf-8",
-        },
+      },
-        data: {
+      data: {
-          filePath: path,
+        filePath: path,
-          options,
+        options,
-        },
+      },
-      });
+    });
-    };
+  };
 
 /**
  * Description
@@ -301,26 +317,26 @@ export const searchIssue = (query, options) => async (dispatch) => {
     case "wantedComicsPage":
       dispatch({
         type: WANTED_COMICS_FETCHED,
-        data: response.data.body,
+        data: response.data.hits,
       });
       break;
     case "globalSearchBar":
       dispatch({
         type: SS_SEARCH_RESULTS_FETCHED_SPECIAL,
-        data: response.data.body,
+        data: response.data.hits,
       });
       break;
 
     case "libraryPage":
       dispatch({
         type: SS_SEARCH_RESULTS_FETCHED,
-        data: response.data.body,
+        data: response.data.hits,
       });
       break;
     case "volumesPage":
       dispatch({
         type: VOLUMES_FETCHED,
-        data: response.data.body,
+        data: response.data.hits,
       });
       break;
 
@@ -349,4 +365,4 @@ export const analyzeImage =
       type: IMG_ANALYSIS_DATA_FETCH_SUCCESS,
       result: foo.data,
     });
-  };
+  };

src/client/assets/scss/App.scss

@@ -1,8 +1,8 @@
-@import "../../../../node_modules/bulma/bulma.sass";
+@import "/node_modules/bulma/bulma.sass";
-$fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
+$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/fontawesome.scss";
-@import "../../../../node_modules/@fortawesome/fontawesome-free/scss/regular.scss";
+@import "/node_modules/@fortawesome/fontawesome-free/scss/regular.scss";
-@import "../../../../node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
+@import "/node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
 $bg-color: yellow;
 $border-color: red;
 

src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx

@@ -15,14 +15,15 @@ export const AirDCPPSettingsForm = (): ReactElement => {
     try {
       if (!isUndefined(hostname)) {
         const matches = hostname.match(hostnameRegex);
-        return (isNil(matches) && matches.length !== 0) ? hostname : "Invalid hostname; it should not contain special characters";
+        return isNil(matches) && matches.length !== 0
+          ? hostname
+          : "Invalid hostname; it should not contain special characters";
       }
-    }
+    } catch {
-    catch {
       return null;
     }
-  }
+  };
-  
+
   const onSubmit = useCallback(async (values) => {
     try {
       airDCPPSettings.setSettings(values);
@@ -39,7 +40,7 @@ export const AirDCPPSettingsForm = (): ReactElement => {
     airDCPPSettings.setSettings({});
     dispatch(deleteSettings());
   }, []);
-  const validate = async () => { };
+  const validate = async () => {};
   const initFormData = !isUndefined(
     airDCPPSettings.airDCPPState.settings.directConnect,
   )
@@ -67,13 +68,20 @@ export const AirDCPPSettingsForm = (): ReactElement => {
                 </span>
               </p>
               <div className="control is-expanded">
-                <Field
+                <Field name="hostname" validate={hostValidator}>
-                  name="hostname"
-                  validate={hostValidator}>
                   {({ input, meta }) => (
                     <div>
-                      <input {...input} type="text" placeholder="AirDC++ hostname" className="input" />
+                      <input
-                      {meta.error && meta.touched && <span className="is-size-7 has-text-danger">{meta.error}</span>}
+                        {...input}
+                        type="text"
+                        placeholder="AirDC++ hostname"
+                        className="input"
+                      />
+                      {meta.error && meta.touched && (
+                        <span className="is-size-7 has-text-danger">
+                          {meta.error}
+                        </span>
+                      )}
                     </div>
                   )}
                 </Field>

src/client/components/ComicDetail/AcquisitionPanel.tsx

@@ -167,7 +167,7 @@ export const AcquisitionPanel = (
                         }
                       >
                         <span className="icon is-small">
-                          <img src="/img/airdcpp_logo.svg" />
+                          <img src="/src/client/assets/img/airdcpp_logo.svg" />
                         </span>
                         <span className="airdcpp-text">Search on AirDC++</span>
                       </button>

src/client/components/ComicDetail/DownloadsPanel.tsx

@@ -1,7 +1,5 @@
 import React, { useEffect, useContext, ReactElement } from "react";
-import {
+import { getBundlesForComic } from "../../actions/airdcpp.actions";
-  getBundlesForComic,
-} from "../../actions/airdcpp.actions";
 import { useDispatch, useSelector } from "react-redux";
 import { RootState } from "threetwo-ui-typings";
 import { isEmpty, isNil, map } from "lodash";

src/client/components/ComicDetail/RawFileDetails.tsx

@@ -1,7 +1,7 @@
 import React, { ReactElement } from "react";
 import PropTypes from "prop-types";
 import prettyBytes from "pretty-bytes";
-import { isUndefined } from "lodash";
+import { isEmpty } from "lodash";
 
 export const RawFileDetails = (props): ReactElement => {
   const { rawFileDetails, inferredMetadata } = props.data;
@@ -34,6 +34,14 @@ 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>
@@ -53,7 +61,7 @@ export const RawFileDetails = (props): ReactElement => {
                   </span>
                 </div>
               </div>
-              {!isUndefined(inferredMetadata.issue.number) ? (
+              {!isEmpty(inferredMetadata.issue.number) ? (
                 <div className="control">
                   <div className="tags has-addons">
                     <span className="tag">Number</span>
@@ -81,6 +89,7 @@ RawFileDetails.propTypes = {
       fileSize: PropTypes.number,
       path: PropTypes.string,
       extension: PropTypes.string,
+      mimeType: PropTypes.string,
       cover: PropTypes.shape({
         filePath: PropTypes.string,
       }),

src/client/components/Dashboard/PullList.tsx

@@ -20,7 +20,7 @@ export const PullList = ({ issues }: PullListProps): ReactElement => {
   useEffect(() => {
     dispatch(
       getWeeklyPullList({
-        startDate: "2022-12-25",
+        startDate: "2023-5-25",
         pageSize: "15",
         currentPage: "1",
       }),
@@ -127,7 +127,7 @@ export const PullList = ({ issues }: PullListProps): ReactElement => {
       <Slider {...settings} ref={(c) => (sliderRef = c)}>
         {!isNil(pullList) &&
           pullList &&
-          map(pullList, ({issue}, idx) => {
+          map(pullList, ({ issue }, idx) => {
             return (
               <Card
                 key={idx}
@@ -161,4 +161,4 @@ export const PullList = ({ issues }: PullListProps): ReactElement => {
   );
 };
 
-export default PullList;
+export default PullList;

src/client/components/Dashboard/RecentlyImported.tsx

@@ -83,14 +83,14 @@ export const RecentlyImported = ({
                     {/* Raw file presence  */}
                     {isNil(rawFileDetails) && (
                       <span className="icon custom-icon is-small has-text-danger mr-2">
-                        <img src="/img/missing-file.svg" />
+                        <img src="/src/client/assets/img/missing-file.svg" />
                       </span>
                     )}
                     {/* ComicInfo.xml presence */}
                     {!isNil(comicInfo) && !isEmpty(comicInfo) && (
                       <span className="icon custom-icon is-small has-text-danger">
                         <img
-                          src="/img/comicinfoxml.svg"
+                          src="/src/client/assets/img/comicinfoxml.svg"
                           alt={"ComicInfo.xml file detected."}
                         />
                       </span>
@@ -99,8 +99,8 @@ export const RecentlyImported = ({
                     {isComicBookMetadataAvailable && (
                       <span className="icon custom-icon">
                         <img
-                          src="/img/cvlogo.svg"
+                          src="/src/client/assets/img/cvlogo.svg"
-                          alt={"ComicInfo.xml file detected."}
+                          alt={"ComicVine metadata detected."}
                         />
                       </span>
                     )}
@@ -125,7 +125,7 @@ export const RecentlyImported = ({
                     <dd className="is-size-9">
                       <dl>
                         <span className="icon custom-icon">
-                          <img src={`/img/${icon}`} />
+                          <img src={`/src/client/assets/img/${icon}`} />
                         </span>
                       </dl>
                       <dl>

src/client/components/Dashboard/WantedComicsList.tsx

@@ -82,12 +82,12 @@ export const WantedComicsList = ({
                   {/* comicVine metadata presence */}
                   {isComicBookMetadataAvailable && (
                     <span className="icon custom-icon">
-                      <img src="/img/cvlogo.svg" />
+                      <img src="/src/client/assets/img/cvlogo.svg" />
                     </span>
                   )}
                   {!isEmpty(locg) && (
                     <span className="icon custom-icon">
-                      <img src="/img/locglogo.svg" />
+                      <img src="/src/client/assets/img/locglogo.svg" />
                     </span>
                   )}
                   {/* Issue type */}

src/client/components/Downloads/Downloads.tsx

@@ -3,7 +3,6 @@ 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";
 
@@ -47,7 +46,6 @@ export const Downloads = (props: IDownloadsProps): ReactElement => {
       })
       setBundles(foo);
     }
-
   }, [issueBundles])
 
   return !isNil(bundles) ?
@@ -56,9 +54,9 @@ export const Downloads = (props: IDownloadsProps): ReactElement => {
         <h1 className="title">Downloads</h1>
         <div className="columns">
           <div className="column is-half">
-            {bundles.map(bundle => {
+            {bundles.map((bundle, idx) => {
               console.log(bundle);
-              return <>
+              return <div key={idx}>
                 <MetadataPanel
                   data={bundle}
                   imageStyle={{ maxWidth: 80 }}
@@ -70,30 +68,33 @@ export const Downloads = (props: IDownloadsProps): ReactElement => {
                     margin: "0 0 8px 0",
                   }} />
 
-                  <table className="table is-size-7">
+                <table className="table is-size-7">
+                  <thead>
                     <tr>
                       <th>Name</th>
                       <th>Size</th>
                       <th>Type</th>
                       <th>Bundle ID</th>
                     </tr>
-
+                  </thead>
-                    {bundle.acquisition.directconnect.downloads.map((bundle) => {
+                  <tbody>
-                      return(<tr>
+                    {bundle.acquisition.directconnect.downloads.map((bundle, idx) => {
+                      return (<tr key={idx}>
                         <td>{bundle.name}</td>
                         <td>{bundle.size}</td>
                         <td>{bundle.type.str}</td>
                         <td><span className="tag is-warning">{bundle.bundleId}</span></td>
                       </tr>)
                     })}
-                  </table>
+                  </tbody>
+                </table>
                 {/* <pre>{JSON.stringify(bundle.acquisition.directconnect.downloads, null, 2)}</pre> */}
-              </>
+              </div>
             })}
           </div>
         </div>
       </section>
-    </div> : <div>asd</div>;
+    </div> : <div>There are no downloads.</div>;
 };
 
 export default Downloads;

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,7 +51,6 @@ export const SearchBar = (data: ISearchBarProps): ReactElement => {
           <i className="fa-solid fa-magnifying-glass"></i>
         </span>
       </div>
-
       {!isEmpty(searchResults) ? (
         <div
           className="columns box is-multiline"
@@ -62,9 +61,10 @@ export const SearchBar = (data: ISearchBarProps): ReactElement => {
             margin: "60px 0 0 350px",
           }}
         >
-          {map(searchResults, (result) => (
+          {map(searchResults, (result, idx) => (
             <MetadataPanel
               data={result}
+              key={idx}
               imageStyle={{ maxWidth: 70 }}
               titleStyle={{ fontSize: "0.8rem" }}
               tagsStyle={{ fontSize: "0.7rem" }}

src/client/components/Library/Library.tsx

@@ -19,10 +19,7 @@ export const Library = (): ReactElement => {
   const searchResults = useSelector(
     (state: RootState) => state.fileOps.libraryComics,
   );
-  const searchError = useSelector((state: RootState) => {
+  const searchError = useSelector((state: RootState) => state.fileOps.librarySearchError);
-    console.log(state);
-    return state.fileOps.librarySearchError;
-  });
   const dispatch = useDispatch();
   useEffect(() => {
     dispatch(
@@ -221,9 +218,9 @@ export const Library = (): ReactElement => {
           <div>
             <div className="library">
               <T2Table
-                totalPages={searchResults.hits.total.value}
+                totalPages={searchResults.total.value}
                 columns={columns}
-                sourceData={searchResults?.hits?.hits}
+                sourceData={searchResults?.hits}
                 rowClickHandler={navigateToComicDetail}
                 paginationHandlers={{
                   nextPage,

src/client/components/Library/LibraryGrid.tsx

@@ -73,7 +73,7 @@ export const LibraryGrid = (libraryGridProps: ILibraryGridProps) => {
                 <div className="content is-flex is-flex-direction-row">
                   {!isEmpty(sourcedMetadata.comicvine) && (
                     <span className="icon cv-icon is-small">
-                      <img src="/dist/img/cvlogo.svg" />
+                      <img src="/src/client/assets/img/cvlogo.svg" />
                     </span>
                   )}
                   {isNil(rawFileDetails) && (

src/client/components/Navbar.tsx

@@ -25,7 +25,7 @@ const Navbar: React.FunctionComponent = (props) => {
       <div className="navbar-brand">
         <Link to="/" className="navbar-item">
           <img
-            src="/img/threetwo.svg"
+            src="/src/client/assets/img/threetwo.svg"
             alt="ThreeTwo! A comic book curator"
             width="112"
             height="28"
@@ -85,7 +85,7 @@ const Navbar: React.FunctionComponent = (props) => {
               {downloadProgressTick && <div className="pulsating-circle"></div>}
             </a>
             {!isUndefined(downloadProgressTick) ? (
-              <div className="navbar-dropdown is-right">
+              <div className="navbar-dropdown is-right is-boxed">
                 <a className="navbar-item">
                   <DownloadProgressTick data={downloadProgressTick} />
                 </a>              </div>
@@ -98,7 +98,7 @@ const Navbar: React.FunctionComponent = (props) => {
                 <a className="navbar-link is-arrowless has-text-success">
                   <i className="fa-solid fa-bolt"></i>
                 </a>
-                <div className="navbar-dropdown pt-4 pr-2 pl-2 is-right airdcpp-status">
+                <div className="navbar-dropdown pr-2 pl-2 is-right airdcpp-status is-boxed">
                   {/* AirDC++ Session Information */}
 
                   <p>
@@ -133,7 +133,7 @@ const Navbar: React.FunctionComponent = (props) => {
                 <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">
+                <div className="navbar-dropdown pr-2 pl-2 is-right is-boxed">
                   <pre>
                     {JSON.stringify(socketDisconnectionReason, null, 2)}
                   </pre>

src/client/components/Search.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useCallback, ReactElement } from "react";
+import React, { useCallback, ReactElement } from "react";
 import { isNil, isEmpty } from "lodash";
 import { IExtractedComicBookCoverFile, RootState } from "threetwo-ui-typings";
 import { importToDB } from "../actions/fileops.actions";

src/client/components/ServiceStatuses/ServiceStatuses.tsx

@@ -0,0 +1,25 @@
+import React, { ReactElement } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { useEffect } from "react";
+import { getServiceStatus } from "../../actions/fileops.actions";
+
+export const ServiceStatuses = (): ReactElement => {
+  const serviceStatus = useSelector(
+    (state: RootState) => state.fileOps.libraryServiceStatus,
+  );
+  const dispatch = useDispatch();
+  useEffect(() => {
+    dispatch(getServiceStatus());
+  }, []);
+  return (
+    <div className="is-clearfix">
+      <div className="mt-4">
+        <h3 className="title">Core Services</h3>
+        <h6 className="subtitle has-text-grey-light">
+          Statuses for core services
+        </h6>
+      </div>
+      <pre>{JSON.stringify(serviceStatus, null, 2)}</pre>
+    </div>
+  );
+};

src/client/components/Settings.tsx

@@ -2,6 +2,7 @@ import React, { useState, ReactElement } from "react";
 import { AirDCPPSettingsForm } from "./AirDCPPSettings/AirDCPPSettingsForm";
 import { AirDCPPHubsForm } from "./AirDCPPSettings/AirDCPPHubsForm";
 import { SystemSettingsForm } from "./SystemSettings/SystemSettingsForm";
+import { ServiceStatuses } from "./ServiceStatuses/ServiceStatuses";
 import settingsObject from "../constants/settings/settingsMenu.json";
 import { isUndefined, map } from "lodash";
 
@@ -22,6 +23,10 @@ export const Settings = (props: ISettingsProps): ReactElement => {
         </div>
       ),
     },
+    {
+      id: "core-service",
+      content: <ServiceStatuses />,
+    },
     {
       id: "flushdb",
       content: (

src/client/components/Volumes/Volumes.tsx

@@ -166,8 +166,8 @@ export const Volumes = (props): ReactElement => {
           <div>
             <div className="library">
               <T2Table
-                sourceData={volumes?.hits?.hits}
+                sourceData={volumes?.hits}
-                totalPages={volumes.hits.hits.length}
+                totalPages={volumes.hits.length}
                 paginationHandlers={{
                   nextPage: () => {},
                   previousPage: () => {},

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 => {
+            {data.getValue().directconnect.downloads.map((download, idx) => {
-              return <li className="is-size-7">{download.name}</li>;
+              return <li className="is-size-7" key={idx}>{download.name}</li>;
             })}
           </ol>
         },

src/client/components/shared/MetadataPanel.tsx

@@ -57,6 +57,12 @@ 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}

src/client/components/shared/T2Table.tsx

@@ -20,8 +20,6 @@ export const T2Table = (tableOptions): ReactElement => {
       pageIndex: 1,
       pageSize: 15,
     });
-    console.log(sourceData)
-
 
   const pagination = useMemo(
     () => ({
@@ -81,12 +79,12 @@ export const T2Table = (tableOptions): ReactElement => {
             {/* <p>{totalPages} comics in all</p> */}
           </div>
           <div className="field has-addons">
-            <p className="control">
+            <div className="control">
               <div className="button" onClick={() => goToPreviousPage()}> <i className="fas fa-chevron-left"></i></div>
-            </p>
+            </div>
-            <p className="control">
+            <div className="control">
               <div className="button" onClick={() => goToNextPage()}> <i className="fas fa-chevron-right"></i> </div>
-            </p>
+            </div>
 
             <div className="field has-addons ml-5">
               <p className="control">

src/client/constants/action-types.ts

@@ -139,4 +139,7 @@ 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";
+
+// service health statuses
+export const LIBRARY_SERVICE_HEALTH = "LIBRARY_SERVICE_HEALTH";

src/client/constants/endpoints.ts

@@ -8,71 +8,72 @@ export const hostURIBuilder = (options: Record<string, string>): string => {
     options.apiPath
   );
 };
+console.log(import.meta);
 
 export const CORS_PROXY_SERVER_URI = hostURIBuilder({
   protocol: "http",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "8050",
   apiPath: "/",
 });
 
 export const COMICVINE_SERVICE_URI = hostURIBuilder({
   protocol: "http",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "3080",
   apiPath: "/api/comicvine",
 });
 
 export const METRON_SERVICE_URI = hostURIBuilder({
   protocol: "http",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "3080",
   apiPath: "/api/metron",
 });
 
 export const API_BASE_URI = hostURIBuilder({
   protocol: "http",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "8050",
   apiPath: "/api",
 });
 
 export const LIBRARY_SERVICE_HOST = hostURIBuilder({
   protocol: "http",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "3000",
   apiPath: ``,
 });
 export const LIBRARY_SERVICE_BASE_URI = hostURIBuilder({
   protocol: "http",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "3000",
   apiPath: "/api/library",
 });
 export const SEARCH_SERVICE_BASE_URI = hostURIBuilder({
   protocol: "http",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "3000",
   apiPath: "/api/search",
 });
 
 export const SETTINGS_SERVICE_BASE_URI = hostURIBuilder({
   protocol: "http",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "3000",
   apiPath: "/api/settings",
 });
 
 export const IMAGETRANSFORMATION_SERVICE_BASE_URI = hostURIBuilder({
   protocol: "http",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "3000",
   apiPath: "/api/imagetransformation",
 });
 
 export const SOCKET_BASE_URI = hostURIBuilder({
   protocol: "ws",
-  host: process.env.UNDERLYING_HOSTNAME || "localhost",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
   port: "3001",
   apiPath: `/`,
 });

src/client/constants/settings/settingsMenu.json

@@ -57,6 +57,21 @@
   },
   {
     "id": 4,
+    "category": "statuses",
+    "displayName": "Service Status",
+    "children": [
+      {
+        "id": "core-service",
+        "displayName": "Core Services"
+      },
+      {
+        "id": "metadata-service",
+        "displayName": "Metadata Services"
+      }
+    ]
+  },
+  {
+    "id": 5,
     "category": "system",
     "displayName": "System",
     "children": [
@@ -67,7 +82,7 @@
     ]
   },
   {
-    "id": 5,
+    "id": 6,
     "category": "acknowledgments",
     "displayName": "Acknowledgments",
     "children": [

src/client/reducers/fileops.reducer.ts

@@ -30,6 +30,8 @@ import {
   SS_SEARCH_RESULTS_FETCHED_SPECIAL,
   VOLUMES_FETCHED,
   COMICBOOK_EXTRACTION_SUCCESS,
+  LIBRARY_SERVICE_HEALTH,
+  HEALTH_STATUS_TICK,
 } from "../constants/action-types";
 import { removeLeadingPeriod } from "../shared/utils/formatting.utils";
 import { LIBRARY_SERVICE_HOST } from "../constants/endpoints";
@@ -58,6 +60,7 @@ const initialState = {
   librarySearchResultCount: 0,
   libraryQueueResults: [],
   librarySearchError: {},
+  libraryServiceStatus: {},
 };
 
 function fileOpsReducer(state = initialState, action) {
@@ -153,13 +156,13 @@ function fileOpsReducer(state = initialState, action) {
     }
     case LS_COVER_EXTRACTED: {
       console.log("BASH", action);
-      if(state.recentComics.length === 5) {
+      if (state.recentComics.length === 5) {
         state.recentComics.pop();
       }
       return {
         ...state,
         librarySearchResultCount: state.librarySearchResultCount + 1,
-        recentComics: [...state.recentComics, action.result.data.importResult]
+        recentComics: [...state.recentComics, action.result.data.importResult],
       };
     }
 
@@ -233,7 +236,7 @@ function fileOpsReducer(state = initialState, action) {
     case SS_SEARCH_RESULTS_FETCHED_SPECIAL: {
       const foo = [];
       if (!isUndefined(action.data.hits)) {
-        map(action.data.hits.hits, ({ _source }) => {
+        map(action.data.hits, ({ _source }) => {
           foo.push(_source);
         });
       }
@@ -246,7 +249,7 @@ function fileOpsReducer(state = initialState, action) {
     case WANTED_COMICS_FETCHED: {
       const foo = [];
       if (!isUndefined(action.data.hits)) {
-        map(action.data.hits.hits, ({ _source }) => {
+        map(action.data.hits, ({ _source }) => {
           foo.push(_source);
         });
       }
@@ -271,7 +274,12 @@ function fileOpsReducer(state = initialState, action) {
         SSCallInProgress: false,
       };
     }
-
+    case LIBRARY_SERVICE_HEALTH: {
+      return {
+        ...state,
+        libraryServiceStatus: action.status,
+      };
+    }
     case FILEOPS_STATE_RESET: {
       return {
         ...state,
@@ -283,4 +291,4 @@ function fileOpsReducer(state = initialState, action) {
   }
 }
 
-export default fileOpsReducer;
+export default fileOpsReducer;

src/client/stories/MetadataPanel.stories.tsx

@@ -30,20 +30,20 @@ RawFileDetails.args = {
         },
         "inferredMetadata": {
           "issue": {
-            "name": "Fantastic Four 143",
+            "name": "Batman Annual 02",
             "number": 197402,
             "year": "1974",
             "subtitle": ""
           }
         },
         "rawFileDetails": {
-          "name": "197402 Fantastic Four 143",
+          "name": "Batman Annual 02",
           "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/197402 Fantastic Four 143/FF143_01.jpg"
+            "filePath": "userdata/covers/Batman Annual 02/Batman 002_00a.jpg"
           }
         },
         "sourcedMetadata": { "comicInfo": null, "comicvine": { "aliases": [] } },

src/funding.yml

@@ -1 +0,0 @@
-github: [rishighan]

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("dist"));
-app.use(express.static("public"));
+// 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}`);

tsconfig.json

@@ -2,19 +2,21 @@
   "extends": "@tsconfig/node14/tsconfig.json",
   "$schema": "https://json.schemastore.org/tsconfig",
   "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
+    "target": "ESNext",
-    "noImplicitAny": false,
+    "useDefineForClassFields": true,
-    "target": "es2019",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
-    "jsx": "react",
+    "allowJs": false,
-    "module": "commonjs",
-    "sourceMap": true,
-    "outDir": "./dist/",
     "skipLibCheck": true,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
     "resolveJsonModule": true,
-    "lib": ["dom", "dom.iterable", "esnext", "webworker"],
+    "isolatedModules": true,
-    "baseUrl": ".",
+    "noEmit": true,
-    "esModuleInterop": true,
+    "jsx": "react-jsx"
-    "strict": true
   },
   "settings": {
     "eslint.workingDirectories": [

vite.config.js

@@ -0,0 +1,23 @@
+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",
+  server: { host: true },
+  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"],
+      },
+    }),
+  ],
+});

webpack.config.js

@@ -1,128 +0,0 @@
-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),
-  };
-};