diff --git a/docker-env/threetwo-import-service.env b/docker-env/threetwo-import-service.env index 328860f..2707a44 100644 --- a/docker-env/threetwo-import-service.env +++ b/docker-env/threetwo-import-service.env @@ -3,6 +3,6 @@ LOGLEVEL=info SERVICEDIR=dist/services MONGO_URI=mongodb://db:27017/threetwo TRANSPORTER=nats://nats:4222 -CALIBRE_PATH=/opt/calibre +CALIBRE_EBOOK_META_PATH=/opt/calibre/ebook-meta CACHER=Memory diff --git a/src/client/actions/fileops.actions.tsx b/src/client/actions/fileops.actions.tsx index 8e63d17..05687c0 100644 --- a/src/client/actions/fileops.actions.tsx +++ b/src/client/actions/fileops.actions.tsx @@ -23,12 +23,10 @@ import sortBy from "array-sort-by"; import { success } from "react-notification-system-redux"; import { Socket } from "socket.io-client"; -const importServiceBaseURI = - `${process.env.DOCKER_HOST}:3000/api/import` || IMPORT_SERVICE_BASE_URI; export async function walkFolder(path: string): Promise> { return axios .request>({ - url: `${importServiceBaseURI}/walkFolders`, + url: `${IMPORT_SERVICE_BASE_URI}/walkFolders`, method: "POST", data: { basePathToWalk: path, @@ -100,7 +98,7 @@ export const getComicBooks = (options) => async (dispatch) => { const { paginationOptions } = options; return axios .request({ - url: `${importServiceBaseURI}/getComicBooks`, + url: `${IMPORT_SERVICE_BASE_URI}/getComicBooks`, method: "POST", data: { paginationOptions, @@ -132,7 +130,7 @@ export const importToDB = (payload?: any) => (dispatch) => { return axios .request({ - url: `${importServiceBaseURI}/rawImportToDb`, + url: `${IMPORT_SERVICE_BASE_URI}/rawImportToDb`, method: "POST", data: comicBookMetadata, transformResponse: (r: string) => JSON.parse(r), @@ -158,7 +156,7 @@ export const fetchVolumeGroups = () => (dispatch) => { }); axios .request({ - url: `${importServiceBaseURI}/getComicBookGroups`, + url: `${IMPORT_SERVICE_BASE_URI}/getComicBookGroups`, method: "GET", }) .then((data) => { diff --git a/src/client/constants/endpoints.ts b/src/client/constants/endpoints.ts index 197f892..2f009b4 100644 --- a/src/client/constants/endpoints.ts +++ b/src/client/constants/endpoints.ts @@ -1,4 +1,8 @@ -export const COMICBOOKINFO_SERVICE_URI = "http://localhost:3080/api/comicvine/"; +export const COMICBOOKINFO_SERVICE_URI = + `http://${process.env.DOCKER_HOST}/api/comicvine` || + "http://localhost:3080/api/comicvine"; export const API_BASE_URI = "http://localhost:8050/api/"; -export const IMPORT_SERVICE_BASE_URI = "http://localhost:3000/api/import/"; +export const IMPORT_SERVICE_BASE_URI = + `http://${process.env.DOCKER_HOST}/api/import` || + "http://localhost:3000/api/import"; export const SOCKET_BASE_URI = "ws://localhost:8051"; diff --git a/src/client/context/socket/socket.context.tsx b/src/client/context/socket/socket.context.tsx index 9c366a7..acf8cee 100644 --- a/src/client/context/socket/socket.context.tsx +++ b/src/client/context/socket/socket.context.tsx @@ -8,7 +8,8 @@ import { success } from "react-notification-system-redux"; const WebSocketContext = createContext(null); export const WebSocketProvider = ({ children }): ReactElement => { const dispatch = useDispatch(); - const socketHost = `${process.env.DOCKER_HOST}:8051` || SOCKET_BASE_URI; + const socketHost = + `http://${process.env.DOCKER_HOST}:8051` || SOCKET_BASE_URI; const socket: Socket = io(socketHost); socket.on("connect", () => {