Skip to content

Develop #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oriNuguri25 merged 3 commits into from
Aug 26, 2025
Merged

Develop #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4b01ca
refactor: 폰트 사이즈 및 색상 수정
oriNuguri25 Aug 26, 2025
389af53
refactor: 9시간 추가
oriNuguri25 Aug 26, 2025
8fe090a
Merge pull request #367 from GTable/refactor/user/login
oriNuguri25 Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions apps/nowait-admin/src/pages/AdminOrders/AdminOrders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,21 @@ const AdminOrders = () => {
refetch,
} = useGetOrderList(storeId);

// 시간만 포맷팅 함수 (10:15 형식)
// 시간만 포맷팅 함수 (10:15 형식) - 9시간 추가
const getFormattedTime = (createdAt: string) => {
const date = new Date(createdAt);
// 9시간 추가 (한국 시간대)
date.setHours(date.getHours() + 9);
const hours = date.getHours().toString().padStart(2, "0");
const minutes = date.getMinutes().toString().padStart(2, "0");
return `${hours}:${minutes}`;
};

// 날짜와 시간 포맷팅 함수 (2025년 6월 2일 08:02 형식) - Detail에서만 사용
// 날짜와 시간 포맷팅 함수 (2025년 6월 2일 08:02 형식) - Detail에서만 사용 - 9시간 추가
const getFormattedDateTime = (createdAt: string) => {
const date = new Date(createdAt);
// 9시간 추가 (한국 시간대)
date.setHours(date.getHours() + 9);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
Expand Down
2 changes: 1 addition & 1 deletion apps/nowait-user/src/pages/home/components/MyWaitingSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const MyWaitingSection = ({ children }: MyWaitingSectionProps) => {
<div className="flex flex-col px-5 mb-10">
{/* 내 대기 순서 */}
<div className="flex flex-col">
<div className="flex flex-row gap-1.5 text-title-20-bold text-black-100">
<div className="flex flex-row gap-1.5 text-title-20-bold text-black-90">
<div className="flex">나의 대기카드</div>
</div>
{children}
Expand Down
4 changes: 2 additions & 2 deletions apps/nowait-user/src/pages/home/components/SortWaitingCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const SortWaitingCard = memo(
return (
<div className="flex flex-col">
<div className="flex flex-row gap-1.5 items-center mb-3.5">
<div className="flex text-start text-headline-22-bold text-black-90">
<div className="flex text-start text-title-20-bold text-black-90">
{getSectionTitle()}
</div>
<div
Expand All @@ -89,7 +89,7 @@ const SortWaitingCard = memo(
return (
<div className="flex flex-col">
<div className="flex flex-row gap-1.5 items-center mb-3.5">
<div className="flex text-start text-headline-22-bold text-black-90">
<div className="flex text-start text-title-20-bold text-black-90">
{getSectionTitle()}
</div>
<div
Expand Down
4 changes: 2 additions & 2 deletions apps/nowait-user/src/pages/home/components/WaitingListModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const WaitingListModal = ({
key={option.id}
className="flex items-center justify-between cursor-pointer"
>
<span className="text-16-semibold text-black-90">
<span className="text-title-18-semibold text-black-90">
{option.label}
</span>

Expand All @@ -73,7 +73,7 @@ const WaitingListModal = ({
className="sr-only"
/>
<div
className={`w-4.5 h-4.5 rounded-full border-[1px] flex items-center justify-center transition-colors ${
className={`w-5 h-5 rounded-full border-[1.5px] flex items-center justify-center transition-colors ${
tempSelectedOption === option.label
? "border-black-90 bg-white"
: "border-black-35 bg-white"
Expand Down