Merge branch 'dev' of https://git.hanasys.jp/qcast3/qcast-front into hotfix/dev_yscha
This commit is contained in:
commit
75b0df084b
@ -15,6 +15,8 @@ NEXT_PUBLIC_CONVERTER_DXF_API_URL="https://v2.convertapi.com/convert/dxf/to/png?
|
|||||||
|
|
||||||
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="https://q-order-dev.q-cells.jp/eos/login/autoLogin"
|
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="https://q-order-dev.q-cells.jp/eos/login/autoLogin"
|
||||||
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="https://q-musubi-dev.q-cells.jp/qm/login/autoLogin"
|
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="https://q-musubi-dev.q-cells.jp/qm/login/autoLogin"
|
||||||
|
NEXT_PUBLIC_ECONOMIC_SIMULATION_AUTH_URL="https://q-order-dev.q-cells.jp/eos/simulation/auth"
|
||||||
|
NEXT_PUBLIC_ECONOMIC_SIMULATION_URL="https://q-order-dev.q-cells.jp/eos/simulation/list"
|
||||||
|
|
||||||
# 테스트용
|
# 테스트용
|
||||||
# AWS_REGION="ap-northeast-2"
|
# AWS_REGION="ap-northeast-2"
|
||||||
|
|||||||
@ -14,6 +14,8 @@ NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secr
|
|||||||
|
|
||||||
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="http://q-order-stg.q-cells.jp:8120/eos/login/autoLogin"
|
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="http://q-order-stg.q-cells.jp:8120/eos/login/autoLogin"
|
||||||
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="http://q-musubi-stg.q-cells.jp:8120/qm/login/autoLogin"
|
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="http://q-musubi-stg.q-cells.jp:8120/qm/login/autoLogin"
|
||||||
|
NEXT_PUBLIC_ECONOMIC_SIMULATION_AUTH_URL="http://q-order-stg.q-cells.jp:8120/eos/simulation/auth"
|
||||||
|
NEXT_PUBLIC_ECONOMIC_SIMULATION_URL="http://q-order-stg.q-cells.jp:8120/eos/simulation/list"
|
||||||
|
|
||||||
# 테스트용
|
# 테스트용
|
||||||
# AWS_REGION="ap-northeast-2"
|
# AWS_REGION="ap-northeast-2"
|
||||||
|
|||||||
@ -15,6 +15,8 @@ NEXT_PUBLIC_CONVERTER_DXF_API_URL="https://v2.convertapi.com/convert/dxf/to/png?
|
|||||||
|
|
||||||
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="http://q-order-stg.q-cells.jp:8120/eos/login/autoLogin"
|
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="http://q-order-stg.q-cells.jp:8120/eos/login/autoLogin"
|
||||||
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="http://q-musubi-stg.q-cells.jp:8120/qm/login/autoLogin"
|
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="http://q-musubi-stg.q-cells.jp:8120/qm/login/autoLogin"
|
||||||
|
NEXT_PUBLIC_ECONOMIC_SIMULATION_AUTH_URL="http://q-order-stg.q-cells.jp:8120/eos/simulation/auth"
|
||||||
|
NEXT_PUBLIC_ECONOMIC_SIMULATION_URL="http://q-order-stg.q-cells.jp:8120/eos/simulation/list"
|
||||||
|
|
||||||
# 테스트용
|
# 테스트용
|
||||||
# AWS_REGION="ap-northeast-2"
|
# AWS_REGION="ap-northeast-2"
|
||||||
|
|||||||
@ -15,6 +15,8 @@ NEXT_PUBLIC_CONVERTER_DXF_API_URL="https://v2.convertapi.com/convert/dxf/to/png?
|
|||||||
|
|
||||||
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="https://q-order.q-cells.jp/eos/login/autoLogin"
|
NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="https://q-order.q-cells.jp/eos/login/autoLogin"
|
||||||
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="https://q-musubi.q-cells.jp/qm/login/autoLogin"
|
NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="https://q-musubi.q-cells.jp/qm/login/autoLogin"
|
||||||
|
NEXT_PUBLIC_ECONOMIC_SIMULATION_AUTH_URL="https://q-order.q-cells.jp/eos/simulation/auth"
|
||||||
|
NEXT_PUBLIC_ECONOMIC_SIMULATION_URL="https://q-order.q-cells.jp/eos/simulation/list"
|
||||||
|
|
||||||
# AWS_REGION="ap-northeast-2"
|
# AWS_REGION="ap-northeast-2"
|
||||||
# AMPLIFY_BUCKET="interplug"
|
# AMPLIFY_BUCKET="interplug"
|
||||||
|
|||||||
@ -164,6 +164,29 @@ export default function Header(props) {
|
|||||||
getAutoLoginParam()
|
getAutoLoginParam()
|
||||||
}, [userSession])
|
}, [userSession])
|
||||||
|
|
||||||
|
const openEconomicSimulation = async () => {
|
||||||
|
const encRes = await promiseGet({
|
||||||
|
url: '/api/pwrGnrSimulation/encData',
|
||||||
|
params: { saleStoreId: sessionState.saleStoreId, userId: sessionState.userId },
|
||||||
|
})
|
||||||
|
const { encSaleStoreId, encUserId } = encRes.data
|
||||||
|
|
||||||
|
if (!encSaleStoreId || !encUserId) return
|
||||||
|
|
||||||
|
const authRes = await fetch(process.env.NEXT_PUBLIC_ECONOMIC_SIMULATION_AUTH_URL, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ encSaleStoreId, encUserId }),
|
||||||
|
})
|
||||||
|
|
||||||
|
if (authRes.ok) {
|
||||||
|
window.open(process.env.NEXT_PUBLIC_ECONOMIC_SIMULATION_URL, 'economicSimulation', `height=${screen.height},width=${screen.width},fullscreen=yes`)
|
||||||
|
} else {
|
||||||
|
const body = await authRes.json()
|
||||||
|
swalFire({ text: body.resultMessage, type: 'error' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const menus = [
|
const menus = [
|
||||||
{ id: 0, name: 'header.menus.home', url: '/', children: [] },
|
{ id: 0, name: 'header.menus.home', url: '/', children: [] },
|
||||||
{
|
{
|
||||||
@ -187,6 +210,9 @@ export default function Header(props) {
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
{ id: 8, name: 'qna.title', url: '/community/qna', children: [] },
|
{ id: 8, name: 'qna.title', url: '/community/qna', children: [] },
|
||||||
|
...(process.env.NEXT_PUBLIC_RUN_MODE !== 'production'
|
||||||
|
? [{ id: 9, name: 'header.menus.economic.simulation', action: openEconomicSimulation, children: [] }]
|
||||||
|
: []),
|
||||||
]
|
]
|
||||||
|
|
||||||
const syncSession = useCallback(() => {
|
const syncSession = useCallback(() => {
|
||||||
@ -237,6 +263,11 @@ export default function Header(props) {
|
|||||||
onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'nav > ul')}
|
onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'nav > ul')}
|
||||||
>
|
>
|
||||||
{menu.children.length === 0 ? (
|
{menu.children.length === 0 ? (
|
||||||
|
menu.action ? (
|
||||||
|
<button key={`${menu.id}`} onClick={() => menu.action()}>
|
||||||
|
{getMessage(menu.name)}
|
||||||
|
</button>
|
||||||
|
) : (
|
||||||
<Link
|
<Link
|
||||||
key={`${menu.id}`}
|
key={`${menu.id}`}
|
||||||
href={menu.url}
|
href={menu.url}
|
||||||
@ -272,6 +303,7 @@ export default function Header(props) {
|
|||||||
>
|
>
|
||||||
{getMessage(menu.name)}
|
{getMessage(menu.name)}
|
||||||
</Link>
|
</Link>
|
||||||
|
)
|
||||||
) : (
|
) : (
|
||||||
<Fragment key={`${menu.id}`}>
|
<Fragment key={`${menu.id}`}>
|
||||||
<button>{getMessage(menu.name)}</button>
|
<button>{getMessage(menu.name)}</button>
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
"header.menus.community.notice": "お知らせ",
|
"header.menus.community.notice": "お知らせ",
|
||||||
"header.menus.community.faq": "FAQ",
|
"header.menus.community.faq": "FAQ",
|
||||||
"header.menus.community.archive": "各種資料ダウンロード",
|
"header.menus.community.archive": "各種資料ダウンロード",
|
||||||
|
"header.menus.economic.simulation": "経済シミュレーション管理",
|
||||||
"header.logout": "ログアウト",
|
"header.logout": "ログアウト",
|
||||||
"header.go": "移動",
|
"header.go": "移動",
|
||||||
"header.online.warranty.system": "オンライン保証システム",
|
"header.online.warranty.system": "オンライン保証システム",
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
"header.menus.community.notice": "공지사항",
|
"header.menus.community.notice": "공지사항",
|
||||||
"header.menus.community.faq": "FAQ",
|
"header.menus.community.faq": "FAQ",
|
||||||
"header.menus.community.archive": "각종 자료 다운로드",
|
"header.menus.community.archive": "각종 자료 다운로드",
|
||||||
|
"header.menus.economic.simulation": "경제시뮬레이션 관리",
|
||||||
"header.logout": "로그아웃",
|
"header.logout": "로그아웃",
|
||||||
"header.go": "이동",
|
"header.go": "이동",
|
||||||
"header.online.warranty.system": "온라인보증시스템",
|
"header.online.warranty.system": "온라인보증시스템",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user