From 20fba360dbe43d2331bcca05d27aba15402049c7 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Thu, 6 Mar 2025 18:35:25 +0900 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=EC=8B=9C=EC=9E=91=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- startscript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startscript.js b/startscript.js index 350b2c06..37f52696 100644 --- a/startscript.js +++ b/startscript.js @@ -1,2 +1,2 @@ var exec = require('child_process').exec -exec('yarn serve', { windowsHide: true }) +exec('yarn start', { windowsHide: true }) From be3d1062c2b8ae2406529e7ce18b72113702ef40 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Thu, 6 Mar 2025 18:37:34 +0900 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=EC=9A=B4=EC=98=81=EC=84=9C=EB=B2=84?= =?UTF-8?q?=EC=9A=A9=20=ED=8F=AC=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index a9b977ce..b1d167ce 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "dev": "next dev", "build": "next build", "start": "next start", + "start:dev": "next dev -p 3001", "lint": "next lint", "serve": "node server.js" }, From c0c620dec55f53a37af41c1e4eaafd0b5459b24d Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Thu, 6 Mar 2025 19:00:46 +0900 Subject: [PATCH 3/9] =?UTF-8?q?chore:=20env=20path=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index cfc50e71..797778d9 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080" +NEXT_PUBLIC_API_SERVER_PATH="https://dev-api.hanasys.jp" NEXT_PUBLIC_HOST_URL="http://1.248.227.176:4000" diff --git a/.env.production b/.env.production index 381c7264..990adb32 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ -NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080" +NEXT_PUBLIC_API_SERVER_PATH="https://api.hanasys.jp/" NEXT_PUBLIC_HOST_URL="http://1.248.227.176:4000" From acea77309425a67908dc8e4951fc87fd819acde7 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Fri, 7 Mar 2025 09:16:35 +0900 Subject: [PATCH 4/9] =?UTF-8?q?chore:=20env=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b1d167ce..84099e97 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "scripts": { "dev": "next dev", "build": "next build", - "start": "next start", - "start:dev": "next dev -p 3001", + "start": "next start -p 3000", + "start:dev": "next start -p 3001", "lint": "next lint", "serve": "node server.js" }, From 93df67fd7b2a28497532484bc53d405501def422 Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 7 Mar 2025 09:51:02 +0900 Subject: [PATCH 5/9] QCast Button -> button --- src/components/management/StuffDetail.jsx | 79 ++++++++++++----------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 6ececba1..ab719b45 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -1710,12 +1710,12 @@ export default function StuffDetail() { {getMessage('stuff.detail.required')}
- - + + +
@@ -2003,9 +2010,9 @@ export default function StuffDetail() {
- +
{getMessage('stuff.detail.btn.addressPop.guide')}
@@ -2093,9 +2100,9 @@ export default function StuffDetail() { > {getMessage('stuff.detail.standardWindSpeedIdSpan')} - + @@ -2206,12 +2213,12 @@ export default function StuffDetail() {
- - + + - - + +
) : ( <>
- - + + + ) : null}
@@ -2565,9 +2572,9 @@ export default function StuffDetail() {
- +
{getMessage('stuff.detail.btn.addressPop.guide')}
@@ -2660,9 +2667,9 @@ export default function StuffDetail() { > {getMessage('stuff.detail.standardWindSpeedIdSpan')} - + @@ -2825,23 +2832,23 @@ export default function StuffDetail() { > {getMessage('stuff.detail.btn.moveList')} - - + + ) : ( <>
- - + +
{managementState?.tempFlg === '1' ? ( <> - From 9a47549716c1ad279a28ae6d1831ede4c207f819 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 7 Mar 2025 10:31:53 +0900 Subject: [PATCH 7/9] =?UTF-8?q?-=20canvas=20load=EC=8B=9C=20canvasZoom=20r?= =?UTF-8?q?eset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/useCanvas.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/hooks/useCanvas.js b/src/hooks/useCanvas.js index 2afbe126..f1451bd1 100644 --- a/src/hooks/useCanvas.js +++ b/src/hooks/useCanvas.js @@ -3,8 +3,8 @@ import { fabric } from 'fabric' import { actionHandler, anchorWrapper, polygonPositionHandler } from '@/util/canvas-util' -import { useRecoilState, useRecoilValue } from 'recoil' -import { canvasSizeState, canvasState, fontSizeState } from '@/store/canvasAtom' +import { useRecoilState, useRecoilValue, useResetRecoilState, useSetRecoilState } from 'recoil' +import { canvasSizeState, canvasState, canvasZoomState, fontSizeState } from '@/store/canvasAtom' import { QLine } from '@/components/fabric/QLine' import { QPolygon } from '@/components/fabric/QPolygon' import { defineQLine } from '@/util/qline-utils' @@ -27,6 +27,7 @@ export function useCanvas(id) { const { setCanvasForEvent, attachDefaultEventOnCanvas } = useCanvasEvent() const isImageDisplay = useRecoilValue(imageDisplaySelector) const {} = useFont() + const resetCanvasZoom = useResetRecoilState(canvasZoomState) /** * 처음 셋팅 @@ -43,7 +44,7 @@ export function useCanvas(id) { setCanvas(c) setCanvasForEvent(c) attachDefaultEventOnCanvas() - + resetCanvasZoom() return () => { // c.dispose() c.clear() From 33d66cce8b19d7763752da05a83f0461accde4d1 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 7 Mar 2025 11:05:29 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EC=A7=80=EC=A7=80=EA=B8=88=EA=B5=AC=20?= =?UTF-8?q?=EC=84=A4=EC=B9=98=20=EC=8B=9C=20=EA=B0=84=EA=B2=A9=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useTrestle.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index d507ab9c..9b17d5b9 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -1665,13 +1665,13 @@ export const useTrestle = () => { canvas.add(bracket) canvas.renderAll() if (direction === 'south') { - startPointY -= height + startPointY -= height - moduleIntvlVer / 10 } else if (direction === 'north') { - startPointY += height + startPointY += height + moduleIntvlVer / 10 } else if (direction === 'east') { - startPointX -= width + startPointX -= width - moduleIntvlHor / 10 } else if (direction === 'west') { - startPointX += width + startPointX += width + moduleIntvlHor / 10 } } } From 74823bcd1cd74e837eea23170c8e17421a011e04 Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Fri, 7 Mar 2025 11:24:18 +0900 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20router=20push=20->=20replace?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next.config.mjs | 7 +++++++ src/components/auth/Login.jsx | 16 +++++++++------- src/components/header/Header.jsx | 6 ++++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/next.config.mjs b/next.config.mjs index d4759fb3..c940dbf8 100644 --- a/next.config.mjs +++ b/next.config.mjs @@ -15,6 +15,13 @@ const nextConfig = { sassOptions: { includePaths: ['./src/styles'], }, + experimental: { + staleTimes: { + dynamic: 0, + dynamicSWR: 0, + dynamicSSR: 0, + }, + }, } export default nextConfig diff --git a/src/components/auth/Login.jsx b/src/components/auth/Login.jsx index b23f9c53..85e342d4 100644 --- a/src/components/auth/Login.jsx +++ b/src/components/auth/Login.jsx @@ -9,7 +9,7 @@ import { setSession, login, checkSession } from '@/lib/authActions' import { useMessage } from '@/hooks/useMessage' import { globalLocaleStore } from '@/store/localeAtom' import { sessionStore } from '@/store/commonAtom' -import { useRouter } from 'next/navigation' +import { redirect, useRouter } from 'next/navigation' import { useSearchParams } from 'next/navigation' import GlobalSpinner from '@/components/common/spinner/GlobalSpinner' @@ -28,11 +28,13 @@ export default function Login() { autoLoginProcess(autoLoginParam) } - checkSession().then((res) => { - if (res) { - login() - } - }) + // console.log('🚀 ~ checkSession ~ checkSession():', checkSession()) + // checkSession().then((res) => { + // console.log('🚀 ~ checkSession ~ res:', res) + // if (res) { + // login() + // } + // }) }, []) const autoLoginProcess = async (autoLoginParam) => { @@ -49,7 +51,7 @@ export default function Login() { setSessionState(result) login() } else { - router.push('/login') + router.push('/login', undefined, { shallow: true }) } }) } diff --git a/src/components/header/Header.jsx b/src/components/header/Header.jsx index 3e3eabb3..f524f8cd 100644 --- a/src/components/header/Header.jsx +++ b/src/components/header/Header.jsx @@ -8,7 +8,7 @@ import { useRecoilState, useRecoilValue, useResetRecoilState } from 'recoil' import { dimmedStore, sessionStore } from '@/store/commonAtom' import { useMessage } from '@/hooks/useMessage' -import { logout } from '@/lib/authActions' +import { checkSession, logout } from '@/lib/authActions' import QSelectBox from '@/components/common/select/QSelectBox' @@ -178,6 +178,7 @@ export default function Header(props) { { // moveHome() removeStuffRecoil(menu) @@ -203,6 +204,7 @@ export default function Header(props) { { removeStuffRecoil(m) }} @@ -266,7 +268,7 @@ export default function Header(props) { code: 'DELETE', }) logout() - router.replace('/login') + router.replace('/login', undefined, { shallow: true }) }} > {getMessage('header.logout')}