.
This commit is contained in:
1 parent
f715d57c2d
commit
d9106c198b
4 files changed
+18
-12
No files matched your search
+15
-9
@@ -1,6 +1,7 @@
|
|||||||
import { useEffect, useMemo, useState } from 'react'
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
import AutomationPanel from './components/AutomationPanel'
|
import AutomationPanel from './components/AutomationPanel'
|
||||||
import type {
|
import type {
|
||||||
|
AutoReservationState,
|
||||||
Branch,
|
Branch,
|
||||||
PriceOption,
|
PriceOption,
|
||||||
ReservationRequest,
|
ReservationRequest,
|
||||||
@@ -54,6 +55,7 @@ function Icon({ name, className = 'h-5 w-5' }: { name: string; className?: strin
|
|||||||
check: <path d="m5 12 4 4L19 6"/>,
|
check: <path d="m5 12 4 4L19 6"/>,
|
||||||
arrow: <><path d="M5 12h14M13 6l6 6-6 6"/></>,
|
arrow: <><path d="M5 12h14M13 6l6 6-6 6"/></>,
|
||||||
key: <><circle cx="8" cy="15" r="4"/><path d="m11 12 9-9M16 7l3 3M14 9l3 3"/></>,
|
key: <><circle cx="8" cy="15" r="4"/><path d="m11 12 9-9M16 7l3 3M14 9l3 3"/></>,
|
||||||
|
rabbit: <><path d="M8.6 8.8C6.7 6.6 6.2 3.3 7.7 2.6c1.5-.7 3.1 1.7 3.5 4.7"/><path d="M15.4 8.8c1.9-2.2 2.4-5.5.9-6.2-1.5-.7-3.1 1.7-3.5 4.7"/><circle cx="12" cy="14.8" r="6.2"/><path d="M9.7 14.2h.01M14.3 14.2h.01"/><path d="M12 16.6v.01"/></>,
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
|
<svg className={className} viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.8" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
|
||||||
@@ -97,6 +99,8 @@ function ReservationApp() {
|
|||||||
const [loading, setLoading] = useState<LoadingKey>('branches')
|
const [loading, setLoading] = useState<LoadingKey>('branches')
|
||||||
const [error, setError] = useState('')
|
const [error, setError] = useState('')
|
||||||
const [result, setResult] = useState<ReservationResult | null>(null)
|
const [result, setResult] = useState<ReservationResult | null>(null)
|
||||||
|
const [autoStatus, setAutoStatus] = useState<AutoReservationState['status']>('idle')
|
||||||
|
const autoArmed = autoStatus === 'armed' || autoStatus === 'firing'
|
||||||
|
|
||||||
const selectedBranch = branches.find((item) => item.num === branchNum)
|
const selectedBranch = branches.find((item) => item.num === branchNum)
|
||||||
const selectedTheme = themes.find((item) => item.infoNum === themeInfoNum)
|
const selectedTheme = themes.find((item) => item.infoNum === themeInfoNum)
|
||||||
@@ -129,6 +133,12 @@ function ReservationApp() {
|
|||||||
}
|
}
|
||||||
}, [agreed, captchaToken, name, person, phone, selectedPrice, selection])
|
}, [agreed, captchaToken, name, person, phone, selectedPrice, selection])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const unsubscribe = window.reservationApi.subscribeAutoState((state) => setAutoStatus(state.status))
|
||||||
|
window.reservationApi.getAutoReservationState().then((state) => setAutoStatus(state.status)).catch(() => undefined)
|
||||||
|
return unsubscribe
|
||||||
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
window.reservationApi.getBranches()
|
window.reservationApi.getBranches()
|
||||||
.then(setBranches)
|
.then(setBranches)
|
||||||
@@ -315,11 +325,11 @@ function ReservationApp() {
|
|||||||
<div className="lg:sticky lg:top-10">
|
<div className="lg:sticky lg:top-10">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
<div className="flex h-11 w-11 items-center justify-center rounded-full bg-coral text-coral-ink">
|
<div className="flex h-11 w-11 items-center justify-center rounded-full bg-coral text-coral-ink">
|
||||||
<Icon name="key" />
|
<Icon name="rabbit" />
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<p className="text-lg font-bold tracking-[0.16em] text-ink">ESCAPE</p>
|
<p className="text-lg font-bold tracking-tight text-ink">Dahyeon's</p>
|
||||||
<p className="text-[10px] font-semibold tracking-[0.34em] text-ink-muted">RESERVE DESK</p>
|
<p className="text-[10px] font-semibold uppercase tracking-[0.2em] text-ink-muted">Test Project 161</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -328,11 +338,7 @@ function ReservationApp() {
|
|||||||
<Step number="01" label="공간 선택" detail={selectedTheme ? `${selectedBranch?.name} · ${selectedTheme.name}` : '지점과 테마를 고르세요'} state={selectionDone ? 'done' : 'active'} />
|
<Step number="01" label="공간 선택" detail={selectedTheme ? `${selectedBranch?.name} · ${selectedTheme.name}` : '지점과 테마를 고르세요'} state={selectionDone ? 'done' : 'active'} />
|
||||||
<Step number="02" label="일정 선택" detail={selectedTime ? `${formatDate(date)} · ${selectedTime.time}` : '날짜와 가능한 시간을 고르세요'} state={scheduleDone ? 'done' : selectionDone ? 'active' : 'idle'} />
|
<Step number="02" label="일정 선택" detail={selectedTime ? `${formatDate(date)} · ${selectedTime.time}` : '날짜와 가능한 시간을 고르세요'} state={scheduleDone ? 'done' : selectionDone ? 'active' : 'idle'} />
|
||||||
<Step number="03" label="예약자 확인" detail="정보 입력 · 캡차 토큰 · 접수" state={result?.success ? 'done' : scheduleDone ? 'active' : 'idle'} />
|
<Step number="03" label="예약자 확인" detail="정보 입력 · 캡차 토큰 · 접수" state={result?.success ? 'done' : scheduleDone ? 'active' : 'idle'} />
|
||||||
</div>
|
{autoMode && <Step number="04" label="자동 예약 대기" detail={autoArmed ? '준비 완료 · 목표 시각에 1회 자동 접수' : '토큰과 실행 시각을 준비하세요'} state={autoStatus === 'succeeded' ? 'done' : autoArmed ? 'active' : 'idle'} />}
|
||||||
|
|
||||||
<div className="mt-12 hidden rounded-2xl border border-line-soft bg-surface p-4 lg:block">
|
|
||||||
<div className="flex items-center gap-2 text-xs font-semibold text-ink"><Icon name="shield" className="h-4 w-4 text-success" /> 민감 정보 보호</div>
|
|
||||||
<p className="mt-2 text-[11px] leading-5 text-ink-muted">이름, 연락처, 캡차 토큰은 파일에 저장하지 않고 예약 요청 시에만 사용합니다.</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
@@ -445,7 +451,7 @@ function ReservationApp() {
|
|||||||
<div className="flex items-start justify-between gap-5"><div><p className="text-[10px] font-semibold uppercase tracking-[0.26em] text-violet">Final check</p><h2 className="mt-2 text-xl font-bold text-ink">예약 요약</h2></div><p className="text-xl font-bold tabular-nums text-ink">{formatPrice(selectedPrice?.totalPrice)}</p></div>
|
<div className="flex items-start justify-between gap-5"><div><p className="text-[10px] font-semibold uppercase tracking-[0.26em] text-violet">Final check</p><h2 className="mt-2 text-xl font-bold text-ink">예약 요약</h2></div><p className="text-xl font-bold tabular-nums text-ink">{formatPrice(selectedPrice?.totalPrice)}</p></div>
|
||||||
<dl className="mt-5 grid grid-cols-[80px_1fr] gap-y-2.5 border-y border-line-soft py-4 text-xs"><dt className="text-ink-muted">테마</dt><dd className="text-right text-ink">{selectedBranch?.name ?? '—'} · {selectedTheme?.name ?? '—'}</dd><dt className="text-ink-muted">일정</dt><dd className="text-right text-ink">{date ? formatDate(date) : '—'} {selectedTime?.time ?? ''}</dd><dt className="text-ink-muted">인원</dt><dd className="text-right text-ink">{person ? `${person}명` : '—'}</dd><dt className="text-ink-muted">결제</dt><dd className="text-right text-ink">무통장입금</dd></dl>
|
<dl className="mt-5 grid grid-cols-[80px_1fr] gap-y-2.5 border-y border-line-soft py-4 text-xs"><dt className="text-ink-muted">테마</dt><dd className="text-right text-ink">{selectedBranch?.name ?? '—'} · {selectedTheme?.name ?? '—'}</dd><dt className="text-ink-muted">일정</dt><dd className="text-right text-ink">{date ? formatDate(date) : '—'} {selectedTime?.time ?? ''}</dd><dt className="text-ink-muted">인원</dt><dd className="text-right text-ink">{person ? `${person}명` : '—'}</dd><dt className="text-ink-muted">결제</dt><dd className="text-right text-ink">무통장입금</dd></dl>
|
||||||
<label className="mt-4 flex cursor-pointer items-start gap-3 text-[11px] leading-5 text-ink-muted"><input type="checkbox" checked={agreed} onChange={(event) => setAgreed(event.target.checked)} disabled={!scheduleDone} className="mt-0.5 h-4 w-4 accent-coral" /><span>개인정보 수집·이용, 결제 주의사항 및 예약 규정에 모두 동의합니다.</span></label>
|
<label className="mt-4 flex cursor-pointer items-start gap-3 text-[11px] leading-5 text-ink-muted"><input type="checkbox" checked={agreed} onChange={(event) => setAgreed(event.target.checked)} disabled={!scheduleDone} className="mt-0.5 h-4 w-4 accent-coral" /><span>개인정보 수집·이용, 결제 주의사항 및 예약 규정에 모두 동의합니다.</span></label>
|
||||||
{!autoMode ? <><button onClick={submitReservation} disabled={!scheduleDone || loading === 'submit'} className="mt-5 flex w-full items-center justify-center gap-2 rounded-xl bg-coral px-5 py-4 text-sm font-bold text-coral-ink transition hover:bg-coral-strong disabled:cursor-not-allowed disabled:bg-chrome disabled:text-ink-muted">{loading === 'submit' ? '예약 접수 중…' : '예약 접수하기'} <Icon name="arrow" className="h-4 w-4" /></button><p className="mt-3 text-center text-[10px] text-ink-muted">버튼을 누르면 실제 예약이 1회 접수됩니다.</p></> : <p className="mt-5 rounded-xl border border-coral-soft bg-coral-tint px-3 py-3 text-center text-[10px] leading-4 text-coral-ink">자동 예약 카드에서 서버시간과 토큰 상태를 확인한 뒤 무장하세요.</p>}
|
{!autoMode ? <><button onClick={submitReservation} disabled={!scheduleDone || loading === 'submit'} className="mt-5 flex w-full items-center justify-center gap-2 rounded-xl bg-coral px-5 py-4 text-sm font-bold text-coral-ink transition hover:bg-coral-strong disabled:cursor-not-allowed disabled:bg-chrome disabled:text-ink-muted">{loading === 'submit' ? '예약 접수 중…' : '예약 접수하기'} <Icon name="arrow" className="h-4 w-4" /></button><p className="mt-3 text-center text-[10px] text-ink-muted">버튼을 누르면 실제 예약이 1회 접수됩니다.</p></> : <p className="mt-5 rounded-xl border border-coral-soft bg-coral-tint px-3 py-3 text-center text-[10px] leading-4 text-coral-ink">자동 예약 카드에서 서버시간과 토큰 상태를 확인한 뒤 시작하세요.</p>}
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -235,7 +235,7 @@ export default function AutomationPanel({
|
|||||||
captchaPastedAtMs,
|
captchaPastedAtMs,
|
||||||
}))
|
}))
|
||||||
} catch (reason) {
|
} catch (reason) {
|
||||||
setError(reason instanceof Error ? reason.message : '자동 예약을 무장하지 못했습니다.')
|
setError(reason instanceof Error ? reason.message : '자동 예약을 시작하지 못했습니다.')
|
||||||
} finally {
|
} finally {
|
||||||
setBusy(null)
|
setBusy(null)
|
||||||
}
|
}
|
||||||
@@ -330,7 +330,7 @@ export default function AutomationPanel({
|
|||||||
<div className="mt-3 rounded-xl border border-line-soft bg-canvas p-3 text-[10px] leading-5 text-ink-muted"><div className="flex justify-between gap-3"><span>토큰</span><span className={tokenReady ? 'font-semibold text-success' : 'font-semibold text-warning'}>{captchaToken ? `${captchaToken.slice(0, 6)}••••${captchaToken.slice(-4)} · ${formatDuration(tokenAgeMs)}` : '입력되지 않음'}</span></div>{autoState.snapshot && <><div className="flex justify-between gap-3"><span>고정 스냅샷</span><span className="text-right text-ink">{autoState.snapshot.themeName} · {autoState.snapshot.date} {autoState.snapshot.timeLabel} · {autoState.snapshot.person}명</span></div><div className="flex justify-between gap-3"><span>예정 발송</span><span className="font-mono text-ink">{autoState.timeline?.plannedSendAtMs ? formatClock(autoState.timeline.plannedSendAtMs) : '계산 중'}</span></div></>}</div>
|
<div className="mt-3 rounded-xl border border-line-soft bg-canvas p-3 text-[10px] leading-5 text-ink-muted"><div className="flex justify-between gap-3"><span>토큰</span><span className={tokenReady ? 'font-semibold text-success' : 'font-semibold text-warning'}>{captchaToken ? `${captchaToken.slice(0, 6)}••••${captchaToken.slice(-4)} · ${formatDuration(tokenAgeMs)}` : '입력되지 않음'}</span></div>{autoState.snapshot && <><div className="flex justify-between gap-3"><span>고정 스냅샷</span><span className="text-right text-ink">{autoState.snapshot.themeName} · {autoState.snapshot.date} {autoState.snapshot.timeLabel} · {autoState.snapshot.person}명</span></div><div className="flex justify-between gap-3"><span>예정 발송</span><span className="font-mono text-ink">{autoState.timeline?.plannedSendAtMs ? formatClock(autoState.timeline.plannedSendAtMs) : '계산 중'}</span></div></>}</div>
|
||||||
{autoState.timeline?.actualSendAtMs && <div className="mt-3 grid grid-cols-2 gap-2 sm:grid-cols-4"><Metric label="actual send" value={formatClock(autoState.timeline.actualSendAtMs).split(' ').at(-1) ?? '—'} /><Metric label="arrival error" value={autoState.timeline.arrivalErrorMs === undefined ? '—' : `${autoState.timeline.arrivalErrorMs >= 0 ? '+' : ''}${autoState.timeline.arrivalErrorMs.toFixed(1)}ms`} /><Metric label="response RTT" value={autoState.timeline.rttMs === undefined ? '—' : `${autoState.timeline.rttMs.toFixed(1)}ms`} /><Metric label="HTTP / socket" value={`${autoState.timeline.httpStatus ?? '—'} / ${autoState.timeline.reusedSocket ? 'reused' : 'new'}`} /></div>}
|
{autoState.timeline?.actualSendAtMs && <div className="mt-3 grid grid-cols-2 gap-2 sm:grid-cols-4"><Metric label="actual send" value={formatClock(autoState.timeline.actualSendAtMs).split(' ').at(-1) ?? '—'} /><Metric label="arrival error" value={autoState.timeline.arrivalErrorMs === undefined ? '—' : `${autoState.timeline.arrivalErrorMs >= 0 ? '+' : ''}${autoState.timeline.arrivalErrorMs.toFixed(1)}ms`} /><Metric label="response RTT" value={autoState.timeline.rttMs === undefined ? '—' : `${autoState.timeline.rttMs.toFixed(1)}ms`} /><Metric label="HTTP / socket" value={`${autoState.timeline.httpStatus ?? '—'} / ${autoState.timeline.reusedSocket ? 'reused' : 'new'}`} /></div>}
|
||||||
{(error || autoState.message) && <p role="alert" className={`mt-3 rounded-xl border px-3 py-2 text-[10px] leading-4 ${error || autoState.status === 'failed' ? 'border-danger/25 bg-danger/8 text-danger' : 'border-success/25 bg-success/8 text-success'}`}>{error || autoState.message}</p>}
|
{(error || autoState.message) && <p role="alert" className={`mt-3 rounded-xl border px-3 py-2 text-[10px] leading-4 ${error || autoState.status === 'failed' ? 'border-danger/25 bg-danger/8 text-danger' : 'border-success/25 bg-success/8 text-success'}`}>{error || autoState.message}</p>}
|
||||||
<div className="mt-4 grid grid-cols-2 gap-2">{armed ? <button onClick={disarm} disabled={autoState.status === 'firing'} className="col-span-2 rounded-xl border border-danger/30 py-3 text-xs font-semibold text-danger hover:bg-danger/8 disabled:opacity-40">자동 예약 해제</button> : <button onClick={arm} disabled={busy === 'arm' || !request || !tokenReady} className="col-span-2 rounded-xl bg-coral py-3 text-xs font-bold text-coral-ink hover:bg-coral-strong disabled:cursor-not-allowed disabled:bg-chrome disabled:text-ink-muted">{busy === 'arm' ? '무장 중…' : '자동 예약 무장'}</button>}</div>
|
<div className="mt-4 grid grid-cols-2 gap-2">{armed ? <button onClick={disarm} disabled={autoState.status === 'firing'} className="col-span-2 rounded-xl border border-danger/30 py-3 text-xs font-semibold text-danger hover:bg-danger/8 disabled:opacity-40">자동 예약 해제</button> : <button onClick={arm} disabled={busy === 'arm' || !request || !tokenReady} className="col-span-2 rounded-xl bg-coral py-3 text-xs font-bold text-coral-ink hover:bg-coral-strong disabled:cursor-not-allowed disabled:bg-chrome disabled:text-ink-muted">{busy === 'arm' ? '시작 중…' : '자동 예약 시작'}</button>}</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ test.describe('[escape-reserve] e2e tests', () => {
|
|||||||
return value.toISOString().slice(0, -1)
|
return value.toISOString().slice(0, -1)
|
||||||
})
|
})
|
||||||
await page.getByLabel('실행 시각 (KST, ms)').fill(target)
|
await page.getByLabel('실행 시각 (KST, ms)').fill(target)
|
||||||
await page.getByRole('button', { name: '자동 예약 무장' }).click()
|
await page.getByRole('button', { name: '자동 예약 시작' }).click()
|
||||||
await expect(page.getByText('armed', { exact: true })).toBeVisible({ timeout: 10_000 })
|
await expect(page.getByText('armed', { exact: true })).toBeVisible({ timeout: 10_000 })
|
||||||
|
|
||||||
await page.getByRole('button', { name: '자동 예약 해제' }).click()
|
await page.getByRole('button', { name: '자동 예약 해제' }).click()
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 79 KiB |
Reference in new issue
Block a user