Merge remote-tracking branch 'origin/main' into board-file

This commit is contained in:
dyhj625 2025-03-04 17:01:22 +09:00
commit 4dc807c452
5 changed files with 11 additions and 8 deletions

View File

@ -1,6 +1,6 @@
VITE_DOMAIN = https://192.168.0.251:5173/
# VITE_LOGIN_URL = http://localhost:10325/ms/
VITE_SERVER = httpS://192.168.0.251:10300/
VITE_SERVER = https://192.168.0.251:10300/
VITE_API_URL = https://192.168.0.251:10300/api/
VITE_TEST_URL = https://192.168.0.251:10300/test/
VITE_KAKAO_MAP_KEY=6f092e8f45ee81186bb6d8408f66a492

View File

@ -32,7 +32,6 @@
<link rel="stylesheet" href="/css/font.css" />
<!-- Icons -->
<link rel="stylesheet" href="/vendor/fonts/boxicons.css" />
<link rel="stylesheet" href="/vendor/fonts/fontawesome.css" />

View File

@ -30,9 +30,10 @@ pipeline {
steps {
// 로컬 Nginx 서버 재실행
bat '''
taskkill /f /im nginx.exe > nul 2>&1
ping -n 3 127.0.0.1 > nul
start "" "C:\\nginx\\nginx.exe"
net stop localnginx
ping -n 5 127.0.0.1 > nul
net start localnginx
ping -n 5 127.0.0.1 > nul
'''
}
}

View File

@ -111,5 +111,7 @@
// If current layout is vertical and current window screen is > small
// Auto update menu collapsed/expanded based on the themeConfig
window.Helpers.setCollapsed(true, false);
// 250304 pc 화면에서 메뉴바 고정을 위해 false 처리
window.Helpers.setCollapsed(false, false);
//window.Helpers.setCollapsed(true, false);
})();

View File

@ -23,9 +23,10 @@
<span class="app-brand-text demo menu-text fw-bold ms-2">LOCALNET</span>
</a>
<a href="javascript:void(0);" class="layout-menu-toggle menu-link text-large ms-auto">
<!-- 메뉴 토글바 -->
<!-- <a href="javascript:void(0);" class="layout-menu-toggle menu-link text-large ms-auto">
<i class="bx bx-chevron-left bx-sm d-flex align-items-center justify-content-center"></i>
</a>
</a> -->
</div>
<div class="menu-inner-shadow"></div>