Merge branch 'develop' of https://github.com/PERMIT-SEOUL/permit-fe

Author: pepperdad

apps/ticket-admin/src/app/events/[eventId]/edit/coupon/_clientBoundary/CouponManagementClient/index.tsx

@@ -281,7 +281,7 @@ export const CouponManagementClient = ({ eventId }: Props) => {
                             used: coupon.usable,
                           })}
                         >
-                          {coupon.usable ? "Used ticket" : "Usable"}
+                          {coupon.usable ? "Used" : "Usable"}
                         </span>
                       </td>
                     </tr>

apps/ticket-admin/src/app/users/_clientBoundary/UserManagementClient/index.tsx

@@ -54,9 +54,9 @@ export const UserManagementClient = () => {
   return (
     <div className={cx("container")}>
       <header className={cx("header")}>
-        <Typography type="title32">User Management</Typography>
+        <Typography type="title32">Staff Management</Typography>
         <Typography type="body14" color="gray300">
-          * 권한을 바꾼 후 적용하려면 로그인을 다시 해주세요.
+          * 권한을 바꾼 후 적용하려면 해당 스태프가 다시 로그인하게 해주세요.
         </Typography>
       </header>
       <main>

apps/ticket-admin/src/data/admin/getTimeTables/queries.ts

@@ -19,7 +19,7 @@ export const timeTableOptions = (
   params: TimeTableParams,
 ): PermitQueryOptions<TimeTableResponse | null> => {
   return {
-    queryKey: [ADMIN_QUERY_KEYS.TICEKTS, params.eventId],
+    queryKey: [ADMIN_QUERY_KEYS.TIMETABLE, params.eventId],
     queryFn: () => {
       const url = getPathUrl(API_URL.ADMIN.TIME_TABLE, { eventId: params.eventId });
 

apps/ticket-admin/src/data/admin/queryKeys.ts

@@ -5,6 +5,7 @@ export const ADMIN_QUERY_KEYS = {
   EVENTS: `${queryKeyPrefix}events`,
   EVENT_DETAIL: `${queryKeyPrefix}event_detail`,
   TICEKTS: `${queryKeyPrefix}tickets`,
+  TIMETABLE: `${queryKeyPrefix}timetable`,
   TICEKTS_DETAIL: `${queryKeyPrefix}tickets_detail`,
   COUPONS: `${queryKeyPrefix}coupons`,
   USER: `${queryKeyPrefix}user`,

apps/ticket-admin/src/shared/components/Header/index.tsx

@@ -62,7 +62,7 @@ export const Header = () => {
             type="body16"
             color="gray400"
           >
-            Users
+            Staff
           </Typography>
         </Link>
 

apps/ticket/src/app/(pages)/event/[eventId]/time-table/_clientBoundary/TimeTableClient/index.tsx

@@ -294,59 +294,33 @@ function calcBlockPosition(
   const start = parseCustomDate(block.blockStartDate);
   const end = parseCustomDate(block.blockEndDate);
 
-  const durationInHours = (end.getTime() - start.getTime()) / (1000 * 60 * 60);
-
-  // 타임테이블 시작 시간을 기준으로 계산
   if (timeSlots.length === 0) {
-    const DISABLE_DISPLAY_HEIGHT = -200;
-
-    return { top: DISABLE_DISPLAY_HEIGHT, height: durationInHours * hourHeight, left: 0 };
+    return { top: -9999, height: 0, left: 0 };
   }
 
   const tableStartTime = timeSlots[0].datetime.getTime();
   const tableEndTime = timeSlots[timeSlots.length - 1].datetime.getTime();
   const blockStartTime = start.getTime();
+  const blockEndTime = end.getTime();
 
-  // 블록이 타임테이블 범위 내에 있는지 확인
-  if (blockStartTime < tableStartTime) {
-    const DISABLE_DISPLAY_HEIGHT = 0;
-    const stage = stages.find((a) => a.stageNotionId === block.blockStageNotionId);
-    const stageSequence = stage ? stage.sequence : 0;
-
-    return {
-      top: DISABLE_DISPLAY_HEIGHT,
-      height: durationInHours * hourHeight,
-      left: stageSequence * columnWidth,
-    };
-  }
-
-  if (tableEndTime < blockStartTime) {
-    return {
-      top: -200,
-      height: 0,
-      left: 0,
-    };
+  // 완전히 범위 밖이면 숨김 처리
+  if (blockEndTime <= tableStartTime || blockStartTime >= tableEndTime) {
+    return { top: -9999, height: 0, left: 0 };
   }
 
-  // 타임테이블 시작 시간부터 블록 시작/종료 시간까지의 차이를 시간 단위로 계산
-  const blockEndTime = end.getTime();
+  // 일부만 겹치는 경우는 클리핑
+  const displayStart = Math.max(blockStartTime, tableStartTime);
+  const displayEnd = Math.min(blockEndTime, tableEndTime);
 
-  const timeDiffStartMs = blockStartTime - tableStartTime;
-  const timeDiffEndMs = blockEndTime - tableStartTime;
-  const timeDiffStartInHours = timeDiffStartMs / (1000 * 60 * 60);
-  const timeDiffEndInHours = timeDiffEndMs / (1000 * 60 * 60);
-  const startMinutes = start.getMinutes();
-  const endMinutes = end.getMinutes();
+  const timeDiffStartInHours = (displayStart - tableStartTime) / (1000 * 60 * 60);
+  const timeDiffEndInHours = (displayEnd - tableStartTime) / (1000 * 60 * 60);
 
   // 해당 stage의 sequence 찾기
   const stage = stages.find((a) => a.stageNotionId === block.blockStageNotionId);
   const stageSequence = stage ? stage.sequence : 0;
 
-  // top 위치 = 시작 시간 차이(시간) * hourHeight + 시작 분 오프셋
-  const top = timeDiffStartInHours * hourHeight + (startMinutes / 60) * hourHeight;
-  // height = 종료 시간 위치 - 시작 시간 위치
-  const endTop = timeDiffEndInHours * hourHeight + (endMinutes / 60) * hourHeight;
-  const height = endTop - top;
+  const top = timeDiffStartInHours * hourHeight;
+  const height = Math.max((timeDiffEndInHours - timeDiffStartInHours) * hourHeight, 2); // 최소 높이 보장
   const left = stageSequence * columnWidth;
 
   return { top, height, left };

apps/ticket/src/app/(pages)/mypage/_clientBoundary/QrTicketModal/index.module.scss

@@ -1,3 +1,5 @@
+@use "@permit/design-system/styles/variables" as theme;
+
 .event_venue {
   margin-top: 20px;
 }
@@ -7,11 +9,17 @@
 }
 
 .qr_code_wrap {
-  padding: 80px;
+  margin: 68px;
+  background-color: theme.$white;
+  cursor: pointer;
+  border-radius: 12px;
+  padding: 12px;
 
   @media (max-width: 768px) {
+    margin: 28px;
+
     display: flex;
     justify-content: center;
-    padding: 40px;
+    padding: 12px;
   }
 }