qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#101) from dev into prd-deploy

Browse Source 
Reviewed-on: #101
This commit is contained in:
ysCha 2025-06-05 11:32:18 +09:00
commit faf4c62328
7 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -27,4 +27,6 @@ AWS_REGION="ap-northeast-1"
AMPLIFY_BUCKET="files.hanasys.jp" AMPLIFY_BUCKET="files.hanasys.jp"
AWS_ACCESS_KEY_ID="AKIA3K4QWLZHFZRJOM2E" AWS_ACCESS_KEY_ID="AKIA3K4QWLZHFZRJOM2E"
AWS_SECRET_ACCESS_KEY="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" AWS_SECRET_ACCESS_KEY="Cw87TjKwnTWRKgORGxYiFU6GUTgu25eUw4eLBNcA"
NEXT_PUBLIC_AWS_S3_BASE_URL="//files.hanasys.jp" NEXT_PUBLIC_AWS_S3_BASE_URL="//files.hanasys.jp"
S3_PROFILE="dev"

4
.env.local.dev
View File

@ -27,4 +27,6 @@ AWS_REGION="ap-northeast-1"
AMPLIFY_BUCKET="files.hanasys.jp" AMPLIFY_BUCKET="files.hanasys.jp"
AWS_ACCESS_KEY_ID="AKIA3K4QWLZHFZRJOM2E" AWS_ACCESS_KEY_ID="AKIA3K4QWLZHFZRJOM2E"
AWS_SECRET_ACCESS_KEY="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" AWS_SECRET_ACCESS_KEY="Cw87TjKwnTWRKgORGxYiFU6GUTgu25eUw4eLBNcA"
NEXT_PUBLIC_AWS_S3_BASE_URL="//files.hanasys.jp" NEXT_PUBLIC_AWS_S3_BASE_URL="//files.hanasys.jp"
S3_PROFILE="dev"

4
.env.localhost
View File

@ -27,4 +27,6 @@ AWS_REGION="ap-northeast-1"
AMPLIFY_BUCKET="files.hanasys.jp" AMPLIFY_BUCKET="files.hanasys.jp"
AWS_ACCESS_KEY_ID="AKIA3K4QWLZHFZRJOM2E" AWS_ACCESS_KEY_ID="AKIA3K4QWLZHFZRJOM2E"
AWS_SECRET_ACCESS_KEY="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" AWS_SECRET_ACCESS_KEY="Cw87TjKwnTWRKgORGxYiFU6GUTgu25eUw4eLBNcA"
NEXT_PUBLIC_AWS_S3_BASE_URL="//files.hanasys.jp" NEXT_PUBLIC_AWS_S3_BASE_URL="//files.hanasys.jp"
S3_PROFILE="dev"

4
.env.production
View File

@ -28,4 +28,6 @@ AWS_REGION="ap-northeast-1"
AMPLIFY_BUCKET="files.hanasys.jp" AMPLIFY_BUCKET="files.hanasys.jp"
AWS_ACCESS_KEY_ID="AKIA3K4QWLZHFZRJOM2E" AWS_ACCESS_KEY_ID="AKIA3K4QWLZHFZRJOM2E"
AWS_SECRET_ACCESS_KEY="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" AWS_SECRET_ACCESS_KEY="Cw87TjKwnTWRKgORGxYiFU6GUTgu25eUw4eLBNcA"
NEXT_PUBLIC_AWS_S3_BASE_URL="//files.hanasys.jp" NEXT_PUBLIC_AWS_S3_BASE_URL="//files.hanasys.jp"
S3_PROFILE="prd"

2
src/app/api/image/canvas/route.js
View File

@ -96,7 +96,7 @@ export async function POST(req) {
/** /**
* 크롭 이미지 이름을 결정한다. * 크롭 이미지 이름을 결정한다.
*/ */
const Key = `Drawing/${objectNo}_${planNo}_${type}.png` const Key = `Drawing/${process.env.S3_PROFILE}/${objectNo}_${planNo}_${type}.png`
/** /**
* 크롭이 완료된 이미지를 업로드한다. * 크롭이 완료된 이미지를 업로드한다.

12
src/app/api/image/estimate-image-copy/route.js
View File

@ -20,7 +20,7 @@ export async function POST(req) {
const isExistImage1 = await s3.send( const isExistImage1 = await s3.send(
new GetObjectCommand({ new GetObjectCommand({
Bucket, Bucket,
Key: `Drawing/${objectNo}_${planNo}_1.png`, Key: `Drawing/${process.env.S3_PROFILE}/${objectNo}_${planNo}_1.png`,
}), }),
) )
@ -28,7 +28,7 @@ export async function POST(req) {
const isExistImage2 = await s3.send( const isExistImage2 = await s3.send(
new GetObjectCommand({ new GetObjectCommand({
Bucket, Bucket,
Key: `Drawing/${objectNo}_${planNo}_2.png`, Key: `Drawing/${process.env.S3_PROFILE}/${objectNo}_${planNo}_2.png`,
}), }),
) )
@ -37,16 +37,16 @@ export async function POST(req) {
//견적서1 번 이미지 복사 //견적서1 번 이미지 복사
const copyCommand = new CopyObjectCommand({ const copyCommand = new CopyObjectCommand({
Bucket, Bucket,
CopySource: encodeURI(`${Bucket}/Drawing/${objectNo}_${planNo}_1.png`), CopySource: encodeURI(`${Bucket}/Drawing/${process.env.S3_PROFILE}/${objectNo}_${planNo}_1.png`),
Key: `Drawing/${newObjectNo}_${newPlanNo}_1.png`, Key: `Drawing/${process.env.S3_PROFILE}/${newObjectNo}_${newPlanNo}_1.png`,
}) })
const response = await s3.send(copyCommand) const response = await s3.send(copyCommand)
const copyCommand2 = new CopyObjectCommand({ const copyCommand2 = new CopyObjectCommand({
Bucket, Bucket,
CopySource: encodeURI(`${Bucket}/Drawing/${objectNo}_${planNo}_2.png`), CopySource: encodeURI(`${Bucket}/Drawing/${process.env.S3_PROFILE}/${objectNo}_${planNo}_2.png`),
Key: `Drawing/${newObjectNo}_${newPlanNo}_2.png`, Key: `Drawing/${process.env.S3_PROFILE}/${newObjectNo}_${newPlanNo}_2.png`,
}) })
const response2 = await s3.send(copyCommand2) const response2 = await s3.send(copyCommand2)

2
src/hooks/useEvent.js
View File

@ -401,7 +401,7 @@ export function useEvent() {
const removeMouseEvent = (type) => { const removeMouseEvent = (type) => {
mouseEventListeners.current = mouseEventListeners.current.filter((event) => { mouseEventListeners.current = mouseEventListeners.current.filter((event) => {
if (event.eventType === type) { if (event.eventType === type) {
canvas.off(type, event.handler) canvas?.off(type, event.handler)
return false return false
} }
return true return true