diff --git a/backend/package-lock.json b/backend/package-lock.json index ecb82dd..4a1ed75 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -4,7 +4,6 @@ "requires": true, "packages": { "": { - "name": "backend", "dependencies": { "@koa/cors": "^5.0.0", "@koa/multer": "^3.0.2", @@ -12,7 +11,6 @@ "koa": "^2.14.1", "koa-bodyparser": "^4.3.0", "koa-mount": "^4.0.0", - "koa-send": "^5.0.1", "koa-static": "^5.0.0", "uuid": "^9.0.0" } diff --git a/backend/package.json b/backend/package.json index 79b6136..6f8fff4 100644 --- a/backend/package.json +++ b/backend/package.json @@ -6,7 +6,6 @@ "koa": "^2.14.1", "koa-bodyparser": "^4.3.0", "koa-mount": "^4.0.0", - "koa-send": "^5.0.1", "koa-static": "^5.0.0", "uuid": "^9.0.0" }, diff --git a/backend/server.js b/backend/server.js index ce97070..e8d5fa0 100644 --- a/backend/server.js +++ b/backend/server.js @@ -6,7 +6,6 @@ const router = require("@koa/router")(); const bodyParser = require("koa-bodyparser"); const cors = require("@koa/cors"); const multer = require("@koa/multer"); -const send = require("koa-send"); const mount = require("koa-mount"); const serve = require("koa-static"); @@ -320,14 +319,6 @@ async function saveCardsSort(ctx) { router.post("/sort/cards", saveCardsSort); -async function getImage(ctx) { - await send(ctx, `${process.env.CONFIG_DIR}/images/${ctx.params.image}`, { - root: process.env.NODE_ENV === "prod" ? "/" : __dirname, - }); -} - -router.get("/images/:image", getImage); - async function saveImage(ctx) { const imageName = ctx.request.file.originalname; await fs.promises.mkdir(`${process.env.CONFIG_DIR}/images`, { @@ -374,6 +365,7 @@ app.use(async (ctx, next) => { }); app.use(mount(`${BASE_PATH}api`, router.routes())); app.use(mount(BASE_PATH, serve("/static"))); +app.use(mount(`${BASE_PATH}api/images`, serve(`${process.env.CONFIG_DIR}/images`))); app.use( mount( `${BASE_PATH}stylesheets/`, diff --git a/frontend/src/utils.js b/frontend/src/utils.js index 36c08f4..41f6f3f 100644 --- a/frontend/src/utils.js +++ b/frontend/src/utils.js @@ -17,12 +17,12 @@ export function handleKeyDown(e, enterCb, cancelCb) { export function getButtonCoordinates(event) { event.stopPropagation(); - const btnCoordinates = event.target.getBoundingClientRect(); - let x = btnCoordinates.x + event.target.offsetWidth - 3; + const btnCoordinates = event.currentTarget.getBoundingClientRect(); + let x = btnCoordinates.x + event.currentTarget.offsetWidth - 3; const menuWidth = 82; const offsetX = x + menuWidth >= window.innerWidth ? menuWidth : 0; x -= offsetX; const offsetY = offsetX ? 0 : 3; - const y = btnCoordinates.y + event.target.offsetHeight - offsetY; + const y = btnCoordinates.y + event.currentTarget.offsetHeight - offsetY; return { x, y }; }