From 18b18c3d8169563510de7b3459952de87874da2d Mon Sep 17 00:00:00 2001 From: Lars Gohr Date: Fri, 31 Mar 2023 03:00:12 +0200 Subject: [PATCH 1/5] Updated elgohr/Publish-Docker-Github-Action to a supported version (v5) (#73) --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index fd82e22..47fe892 100644 --- a/.github/workflows/docker-image.yml +++ b/.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 }} -- 2.49.1 From 967a82dea54a6619650734904ab2eeb2b5c9c7c3 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Fri, 31 Mar 2023 00:06:46 -0400 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=90=B3=20Fixes=20to=20the=20Dockerfil?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4db86ca..785da1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:17.3-alpine +FROM node:18.15.0-alpine LABEL maintainer="Rishi Ghan " WORKDIR /threetwo @@ -9,7 +9,7 @@ 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 diff --git a/package.json b/package.json index 7de8d5b..8808b77 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "vite build", "dev": "rimraf dist && npm run build && vite", - "prod": "npm run build && vite", + "start": "npm run build && vite", "docs": "jsdoc -c jsdoc.json", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build" -- 2.49.1 From fbf6bed4fe96e6e1c645a8c534945828992bbabb Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Fri, 31 Mar 2023 15:09:23 -0400 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=90=B3=20Fixes=20to=20the=20Dockerfil?= =?UTF-8?q?e=20(#74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4db86ca..785da1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:17.3-alpine +FROM node:18.15.0-alpine LABEL maintainer="Rishi Ghan " WORKDIR /threetwo @@ -9,7 +9,7 @@ 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 diff --git a/package.json b/package.json index 7de8d5b..8808b77 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "vite build", "dev": "rimraf dist && npm run build && vite", - "prod": "npm run build && vite", + "start": "npm run build && vite", "docs": "jsdoc -c jsdoc.json", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build" -- 2.49.1 From 07886c5c1018edc7a4fec53bb305f1e99d9cbfa4 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Fri, 31 Mar 2023 17:00:24 -0400 Subject: [PATCH 4/5] =?UTF-8?q?=20=F0=9F=9A=A2=20Updated=20port=20number?= =?UTF-8?q?=20for=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 785da1c..324fee3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,6 @@ RUN yarn --ignore-engines COPY . . -EXPOSE 3050 +EXPOSE 5173 ENTRYPOINT [ "npm", "start" ] \ No newline at end of file -- 2.49.1 From 8b5a4e63287b660d62594cb4f1880b83f66b8f09 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Wed, 19 Apr 2023 08:47:38 -0400 Subject: [PATCH 5/5] =?UTF-8?q?=E2=9D=8C=20Removed=20the=20param=20seriali?= =?UTF-8?q?zation=20from=20axios=20calls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/actions/comicinfo.actions.tsx | 4 ---- src/client/components/Search.tsx | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/client/actions/comicinfo.actions.tsx b/src/client/actions/comicinfo.actions.tsx index f3d6c1b..5224eb9 100644 --- a/src/client/actions/comicinfo.actions.tsx +++ b/src/client/actions/comicinfo.actions.tsx @@ -1,7 +1,6 @@ import axios from "axios"; import rateLimiter from "axios-rate-limit"; import { setupCache } from "axios-cache-interceptor"; -import qs from "qs"; import { CV_SEARCH_SUCCESS, CV_API_CALL_IN_PROGRESS, @@ -64,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) { diff --git a/src/client/components/Search.tsx b/src/client/components/Search.tsx index f07c422..8682c2d 100644 --- a/src/client/components/Search.tsx +++ b/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"; -- 2.49.1