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" 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/package.json b/package.json index a9b977ce..84099e97 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "scripts": { "dev": "next dev", "build": "next build", - "start": "next start", + "start": "next start -p 3000", + "start:dev": "next start -p 3001", "lint": "next lint", "serve": "node server.js" }, 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')} diff --git a/src/components/management/StuffDetail.jsx b/src/components/management/StuffDetail.jsx index 6ececba1..06a9b35a 100644 --- a/src/components/management/StuffDetail.jsx +++ b/src/components/management/StuffDetail.jsx @@ -2,7 +2,6 @@ import { useState, useEffect, useRef, useContext } from 'react' import { useRouter, useSearchParams } from 'next/navigation' -import { Button } from '@nextui-org/react' import Select from 'react-select' import { useAxios } from '@/hooks/useAxios' import { globalLocaleStore } from '@/store/localeAtom' @@ -1710,12 +1709,12 @@ export default function StuffDetail() { {getMessage('stuff.detail.required')}
- - + + +
@@ -2003,9 +2009,9 @@ export default function StuffDetail() {
- +
{getMessage('stuff.detail.btn.addressPop.guide')}
@@ -2093,9 +2099,9 @@ export default function StuffDetail() { > {getMessage('stuff.detail.standardWindSpeedIdSpan')} - + @@ -2206,12 +2212,12 @@ export default function StuffDetail() {
- - + + - - + +
) : ( <>
- - + + + ) : null}
@@ -2565,9 +2576,9 @@ export default function StuffDetail() {
- +
{getMessage('stuff.detail.btn.addressPop.guide')}
@@ -2660,9 +2671,9 @@ export default function StuffDetail() { > {getMessage('stuff.detail.standardWindSpeedIdSpan')} - + @@ -2825,23 +2836,23 @@ export default function StuffDetail() { > {getMessage('stuff.detail.btn.moveList')} - - + + ) : ( <>
- - + +