Merge branch 'main' into deploy
Deploy Frontend / deploy (push) Successful in 7m20s

This commit is contained in:
2026-07-21 11:51:55 +09:00
4 changed files with 32 additions and 15 deletions
@@ -84,7 +84,7 @@ export function ScheduleInfoPanel({ params }: ScheduleInfoPanelProps) {
<div className="space-y-2">
<div className="flex items-center justify-between rounded-sm border border-border p-3">
<Badge size="lg" className="font-semibold">
{data.inptSeCd}차 입력기간
입력기간
</Badge>
<p className="text-2xl">
{dayjs(data.inptBgngYmd).format(
@@ -102,7 +102,7 @@ export function ScheduleInfoPanel({ params }: ScheduleInfoPanelProps) {
color="gray"
className="font-semibold"
>
{data.vrfcSeCd}차 검증기간
검증기간
</Badge>
<p className="text-2xl">
{dayjs(data.vrfcBgngYmd).format(
@@ -15,6 +15,14 @@ interface UseSessionExtendConfirmOptions {
const DEFAULT_MESSAGE = "로그인을 연장하시겠습니까?";
function formatRemainingMs(remainingMs: number): string {
const totalSeconds = Math.floor(remainingMs / 1000);
const minutes = Math.floor((totalSeconds % 3600) / 60);
const seconds = totalSeconds % 60;
return `${minutes}분 ${seconds}초`;
}
function useSessionExtendConfirm({
enabled,
getAccessToken,
@@ -71,8 +79,10 @@ function useSessionExtendConfirm({
void showConfirm();
return;
}
confirmTimerRef.current = setTimeout(() => {
console.log(
`>>>>>>>>>>>>>>>>>>>> ${formatRemainingMs(confirmMs)} 후 로그인 연장 팝업 표시 <<<<<<<<<<<<<<<<<<<<`,
);
void showConfirm();
}, confirmMs);
}, [message, confirm, getAccessToken, silentRefresh, declineSessionExtend]);
@@ -117,7 +117,7 @@ function useTokenRemainingMs(enabled: boolean): number {
const update = () => {
const token = getCookie(appConfig.CLAIM_NAME ?? "");
setRemainingMs(token ? getRemainingMs(token) : 0);
setRemainingMs(token ? getRemainingMs(token, 0) : 0);
};
update();
@@ -145,6 +145,10 @@ export function Header({
const remainingMs = useTokenRemainingMs(mounted && isLoggedIn && !viewOnly);
const siteId = getCookie("site-id-key") ?? "";
console.log(
`/********************* 로그인 만료까지: ${formatRemainingMs(remainingMs)} *********************/`,
);
useSessionExtendConfirm({
enabled:
mounted &&
@@ -8,15 +8,18 @@ import { SidebarProvider } from "../sidebar";
import { LNB } from "../lnb";
import { Header } from "../header";
import "./common.css";
import type { AuthService } from "@common/auth";
export function NoFooterLayout({
children,
queryClient,
authService,
currentPath,
handleMenuClick,
}: {
children: React.ReactNode;
queryClient?: QueryClient;
authService?: AuthService;
currentPath?: string;
handleMenuClick?: (item: MenuItem) => void;
}) {
@@ -26,19 +29,19 @@ export function NoFooterLayout({
<PopupProvider>
<HelpDialogProvider>
<SidebarProvider>
<div className="flex-1">
<Header />
<div className="flex">
<LNB
currentPath={currentPath}
handleMenuClick={handleMenuClick}
/>
<div className="flex min-h-[calc(100vh-50px)] flex-1 flex-col overflow-auto">
<div className="flex-1">{children}</div>
<div className="flex-1">
<Header authService={authService} />
<div className="flex">
<LNB
currentPath={currentPath}
handleMenuClick={handleMenuClick}
/>
<div className="flex min-h-[calc(100vh-50px)] flex-1 flex-col overflow-auto">
<div className="flex-1">{children}</div>
</div>
</div>
</div>
</div>
</SidebarProvider>
</SidebarProvider>
</HelpDialogProvider>
</PopupProvider>
</ClientIpGuard>