Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 103 additions & 0 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,10 @@ const HeaderStatus: React.FC<HeaderStatusProps> = ({
menu.imageUrl ?? "bg-[#788FB6]"
}`}
>
<img src={menu.imageUrl} className="object-cover" />
<img
src={menu.imageUrl}
className="h-full w-full object-cover"
/>
</div>
<p
className={`text-16-semibold ${
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ const SalesCard: React.FC<SalesCardProps> = ({
isTablet,
}) => {
const [showToday, setShowToday] = useState(true);
// const [isHoverBack, setIsHoverBack] = useState(false);
// const [isHoverForward, setIsHoverForward] = useState(false);

const formatDate = (date: String) => {
if (!date) return "";
Expand Down
11 changes: 5 additions & 6 deletions apps/nowait-admin/src/pages/AdminBooth/AdminBooth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ const BoothForm = () => {
description: string;
noticeTitle: string;
noticeContent: string;
openTime: string; // "HHmmHHmm"
openTime: string;
profileId: number | null;
bannerIds: Array<number | null>; // 첫 3개 슬롯 기준
bannerIds: Array<number | null>;
} | null>(null);

const currentProfileSig = useMemo(() => {
Expand All @@ -76,15 +76,14 @@ const BoothForm = () => {
}, [profileImage]);

const currentBannerSig = useMemo<(string | number | null)[]>(() => {
// UI가 3 슬롯이라 가정
const slots = [bannerImages[0], bannerImages[1], bannerImages[2]];
return slots.map((img) => {
if (!img) return null;
return img instanceof File ? "file" : (img as any).id ?? null;
});
}, [bannerImages]);
const hasChanges = useMemo(() => {
if (!baseline) return false; // 아직 로딩 중이면 비활성화
if (!baseline) return false;

const textChanged =
norm(boothName) !== norm(baseline.name) ||
Expand Down Expand Up @@ -175,7 +174,7 @@ const BoothForm = () => {
},
{
onSuccess: () => resolve(),
onError: () => reject(new Error("부스 정보 수정 실패")),
onError: (err) => reject(err),
}
);
});
Expand Down Expand Up @@ -222,7 +221,7 @@ const BoothForm = () => {
refetch();
after?.();
} catch (e) {
console.error(e);
console.log(e, "부스정보저장 에러메세지");
alert("저장 중 오류가 발생했어요. 다시 시도해주세요.");
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ const AccountPage = () => {
<div className="flex space-x-[10px]">
<DropdownSelect
type="bank"
value={bank}
value={bank === "IBK기업" ? "IBK 기업" : bank}
onChange={setBank}
options={bankOptions}
placeholder="은행 선택"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ export const DropdownSelect = ({
{options.map((opt, idx) => {
const selected = opt === value;
const active = idx === highlight;

return (
<button
key={opt}
Expand Down
2 changes: 1 addition & 1 deletion apps/nowait-user/src/api/order.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const getOrderDetails = async (
publicCode: string,
tableId: number
): Promise<OrderDetailsServerResponse> => {
const res = await api.get(`/orders/items/${publicCode}/${tableId}`);
const res = await api.get(`${API_URI}/orders/items/${publicCode}/${tableId}`);
return res.data;
};

Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"typescript": "^5.8.3"
},
"dependencies": {
"@tiptap/extension-code-block-lowlight": "^3.4.1",
"@tiptap/extension-hard-break": "^3.4.0",
"@tiptap/extension-placeholder": "^3.4.0",
"@tiptap/extension-underline": "^3.0.7",
Expand All @@ -27,8 +28,10 @@
"dompurify": "^3.2.6",
"framer-motion": "^12.20.1",
"heic2any": "^0.0.4",
"highlight.js": "^11.11.1",
"jsqr": "^1.4.0",
"lottie-react": "^2.4.1",
"lowlight": "^3.3.0",
"prop-types": "^15.8.1",
"prosemirror-model": "^1.25.2",
"prosemirror-state": "^1.4.3",
Expand Down
Loading