Skip to content

feat: 프록시 삭제 #519

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
hwangdae merged 10 commits into from
Nov 7, 2025
Merged

feat: 프록시 삭제 #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a0d2e60
refactor: 웨이팅 카드 상태 변화 api userId -> reservationId 사용하는 것으로 교체
dgKim1 Sep 22, 2025
0c209a4
Merge pull request #514 from GTable/refactor/admin/waitingCard
dgKim1 Sep 22, 2025
49605c0
fix: 정규식 . 추가
dgKim1 Sep 26, 2025
7426fc0
Merge pull request #515 from GTable/feature/admin/menuModal
dgKim1 Sep 26, 2025
a42b227
feat: 정규식 모음추가
dgKim1 Sep 26, 2025
c90c11b
Merge pull request #516 from GTable/feature/admin/menuModal
dgKim1 Sep 26, 2025
87d592e
feat: IME조합 추가
dgKim1 Sep 26, 2025
f80454c
Merge pull request #517 from GTable/feature/admin/menuModal
dgKim1 Sep 26, 2025
ab58980
feat: 프록시 삭제
hwangdae Nov 7, 2025
440a23c
Merge pull request #518 from GTable/feature/user/proxy
hwangdae Nov 7, 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
0 ...ait-admin/dist/assets/banner-e46E9X_9.svg → ...ait-admin/dist/assets/banner-BZOeI9vB.svg
View file
Open in desktop
File renamed without changes
0 ...dmin/dist/assets/bg_festival-CTt6Su2V.svg → ...dmin/dist/assets/bg_festival-CYbdk6eS.svg
View file
Open in desktop
File renamed without changes
0 ...t-admin/dist/assets/bg_order-Co40Uzux.svg → ...t-admin/dist/assets/bg_order-C4LFRYk8.svg
View file
Open in desktop
File renamed without changes
0 ...-admin/dist/assets/bg_status-CIRyoveo.svg → ...-admin/dist/assets/bg_status-X4xZSgun.svg
View file
Open in desktop
File renamed without changes
0 ...admin/dist/assets/bg_waiting-CooukfHn.svg → ...admin/dist/assets/bg_waiting-B0UxGpnI.svg
View file
Open in desktop
File renamed without changes
282 changes: 0 additions & 282 deletions apps/nowait-admin/dist/assets/index-BygJeh2Q.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/nowait-admin/dist/assets/index-C0RRDTKc.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion apps/nowait-admin/dist/assets/index-CceQ--ur.css
View file
Open in desktop

This file was deleted.

390 changes: 247 additions & 143 deletions ...owait-admin/dist/assets/index-DkSeSUtN.js → ...owait-admin/dist/assets/index-DW0XV7o7.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions apps/nowait-admin/dist/assets/index-LjFDaPMN.css
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added apps/nowait-admin/dist/assets/kakao-8XdR8U-n.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions apps/nowait-admin/dist/assets/kakaoLogo-C3ppN5vA.svg
View file
Open in desktop

This file was deleted.

Binary file added apps/nowait-admin/dist/assets/toss-CibZHcza.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 0 additions & 15 deletions apps/nowait-admin/dist/assets/tossLogo-BDXEA9g6.svg
View file
Open in desktop

This file was deleted.

0 ...-admin/dist/assets/underline-DUfQVG_7.svg → ...-admin/dist/assets/underline-Bqk3dE8x.svg
View file
Open in desktop
File renamed without changes
28 changes: 14 additions & 14 deletions apps/nowait-admin/dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon_admin.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>NOWAIT Admin</title>
<script type="module" crossorigin src="/assets/index-DkSeSUtN.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-CceQ--ur.css">
</head>
<body>
<div id="root"></div>
</body>
</html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon_admin.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>NOWAIT Admin</title>
<script type="module" crossorigin src="/assets/index-DW0XV7o7.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-LjFDaPMN.css">
</head>
<body>
<div id="root"></div>
</body>
</html>
Expand Down
6 changes: 3 additions & 3 deletions apps/nowait-admin/src/hooks/Reservation/useUpdateReservationStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ import AdminApi from "../../utils/AdminApi";

interface UpdateReservationParams {
storeId: number;
userId: number;
reservationNumber: number;
status: "WAITING" | "CALLING" | "CONFIRMED" | "CANCELLED" | "NO_SHOW";
}

export const useUpdateReservationStatus = () => {
return useMutation({
mutationFn: async ({
storeId,
userId,
reservationNumber,
status,
}: UpdateReservationParams) => {
const res = await AdminApi.patch(
`/reservations/admin/update/${storeId}/${userId}`,
`/reservations/admin/update/${storeId}/${reservationNumber}`,
{ status }
);
return res.data;
Expand Down
5 changes: 3 additions & 2 deletions apps/nowait-admin/src/hooks/useRemoveEmoji.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ export const useRemoveEmoji = (): Sanitizers => {
// 메뉴명: 공백 유지, '(' '[' 만 허용
const removeEmojiSome = useCallback(
(t: string) =>
removeEmoji(t).replace(/[^ㄱ-ㅎ가-힣a-zA-Z0-9 \(\[\(\)\]]/g, ""),
removeEmoji(t).replace(/[^ㄱ-ㅎㅏ-ㅣ가-힣a-zA-Z0-9 \(\[\]\)]/g, ""),
[removeEmoji]
);

// 관리자용 메뉴명: 공백 유지, 특수문자 전부 제거
const removeEmojiAll = useCallback(
(t: string) => removeEmoji(t).replace(/[^ㄱ-ㅎ가-힣a-zA-Z0-9 ]/g, ""),
(t: string) =>
removeEmoji(t).replace(/[^ㄱ-ㅎㅏ-ㅣ가-힣a-zA-Z0-9 \(\[\]\)]/g, ""),
[removeEmoji]
);

Expand Down
28 changes: 24 additions & 4 deletions apps/nowait-admin/src/pages/AdminBooth/components/Modal/menuModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ const MenuModal = ({
focused && hasValue ? "text-black" : "text-gray-400";
const { removeEmojiAll, removeEmojiSome } = useRemoveEmoji();

const [isComposingName, setIsComposingName] = useState(false);
const [isComposingAdmin, setIsComposingAdmin] = useState(false);

const isFormValid =
name.trim() !== "" &&
adminDisplayName.trim() !== "" &&
Expand Down Expand Up @@ -188,7 +191,16 @@ const MenuModal = ({
<input
type="text"
value={name}
onChange={(e) => setName(removeEmojiSome(e.target.value))}
onChange={(e) => {
const v = e.target.value;

setName(isComposingName ? v : removeEmojiSome(v));
}}
onCompositionStart={() => setIsComposingName(true)}
onCompositionEnd={(e) => {
setIsComposingName(false);
setName(removeEmojiSome(e.currentTarget.value));
}}
onFocus={() => setFocus((f) => ({ ...f, name: true }))}
onBlur={() => setFocus((f) => ({ ...f, name: false }))}
maxLength={25}
Expand Down Expand Up @@ -243,11 +255,19 @@ const MenuModal = ({
<input
type="text"
value={adminDisplayName}
onCompositionStart={() => setIsComposingAdmin(true)}
onCompositionEnd={(e) => {
setIsComposingAdmin(false);
setAdminDisplayName(removeEmojiAll(e.currentTarget.value));
}}
onFocus={() => setFocus((f) => ({ ...f, admin: true }))}
onBlur={() => setFocus((f) => ({ ...f, admin: false }))}
onChange={(e) =>
setAdminDisplayName(removeEmojiAll(e.target.value))
}
onChange={(e) => {
const v = e.target.value;
setAdminDisplayName(
isComposingAdmin ? v : removeEmojiAll(v)
);
}}
maxLength={10}
className="w-full h-[52px] border border-[#DDDDDD] bg-black-5 bg-black-5 focus:bg-white px-4 py-2 border rounded-lg text-14-regular"
placeholder={`${
Expand Down
12 changes: 6 additions & 6 deletions apps/nowait-admin/src/pages/AdminHome/AdminHome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ const AdminHome = () => {
}, [reservations, activeTab]);

// 호출 버튼 클릭 이벤트
const handleCall = (id: number, userId: number) => {
const handleCall = (id: number, reservationNumber: number) => {
updateStatus(
{ storeId, userId, status: "CALLING" },
{ storeId, reservationNumber, status: "CALLING" },
{
onSuccess: () => {
setReservations((prev) =>
Expand All @@ -130,10 +130,10 @@ const AdminHome = () => {
);
};

const handleEnter = (id: number, userId: number) => {
const handleEnter = (id: number, reservationNumber: number) => {
const now = new Date().toISOString();
updateStatus(
{ storeId, userId, status: "CONFIRMED" },
{ storeId, reservationNumber, status: "CONFIRMED" },
{
onSuccess: () => {
setReservations((prev) =>
Expand All @@ -147,10 +147,10 @@ const AdminHome = () => {
);
};

const handleClose = (id: number, userId: number) => {
const handleClose = (id: number, reservationNumber: number) => {
const now = new Date().toISOString();
updateStatus(
{ storeId, userId, status: "CANCELLED" },
{ storeId, reservationNumber, status: "CANCELLED" },
{
onSuccess: () => {
setReservations((prev) =>
Expand Down
2 changes: 1 addition & 1 deletion apps/nowait-admin/tsconfig.app.tsbuildinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"root":["./src/AppRouter.tsx","./src/global.d.ts","./src/main.tsx","./src/vite-env.d.ts","./src/Context/dirtyModeContext.tsx","./src/components/AdminSidebar.tsx","./src/components/ConfirmRemoveModal.tsx","./src/components/ImageBox.tsx","./src/components/MenuItem.tsx","./src/components/MobileAdminNav.tsx","./src/components/MobileMenuBar.tsx","./src/components/RedBadge.tsx","./src/components/RequireAdminAuth.tsx","./src/components/closeButton.tsx","./src/hooks/useGetOrderList.tsx","./src/hooks/usePostAdminLogin.tsx","./src/hooks/useRemoveEmoji.tsx","./src/hooks/useUpdateOrderStatus.tsx","./src/hooks/useWindowWidth.tsx","./src/hooks/Reservation/useGetCompletedList.tsx","./src/hooks/Reservation/useGetReservationList.tsx","./src/hooks/Reservation/useUpdateReservationStatus.tsx","./src/hooks/analytics/useGetPopularMenu.tsx","./src/hooks/analytics/useGetSalesByDate.tsx","./src/hooks/analytics/useGetTopSalse.tsx","./src/hooks/booth/useResizeImage.tsx","./src/hooks/booth/useUpdateMenu.tsx","./src/hooks/booth/useUploadMenuImage.tsx","./src/hooks/booth/menu/useCreateMenu.tsx","./src/hooks/booth/menu/useDeleteBannerImage.tsx","./src/hooks/booth/menu/useDeleteMenu.tsx","./src/hooks/booth/menu/useGetAllMenus.tsx","./src/hooks/booth/menu/useGetMenuDetail.tsx","./src/hooks/booth/menu/useToggleMenuSoldOut.tsx","./src/hooks/booth/menu/useUpadateMenuSort.tsx","./src/hooks/booth/payment/useCreateStorePayment.tsx","./src/hooks/booth/payment/useGetStorePayment.tsx","./src/hooks/booth/payment/useUpdateStorePayment.tsx","./src/hooks/booth/store/useGetStore.tsx","./src/hooks/booth/store/useUpdateStore.tsx","./src/hooks/booth/store/useUploadStoreBannerImages.ts","./src/hooks/booth/store/useUploadStoreProfileImage.tsx","./src/layout/AdminLayout.tsx","./src/pages/AdminAnalytics/AdminAnalytics.tsx","./src/pages/AdminAnalytics/components/BoothSalesRankingCard .tsx","./src/pages/AdminAnalytics/components/HeaderStatus.tsx","./src/pages/AdminAnalytics/components/SalesCard.tsx","./src/pages/AdminAnalytics/components/TotalSalesCard.tsx","./src/pages/AdminAuth/AdminAuth.tsx","./src/pages/AdminBooth/AdminBooth.tsx","./src/pages/AdminBooth/components/AccountPage.tsx","./src/pages/AdminBooth/components/BoothProfileImage.tsx","./src/pages/AdminBooth/components/BoothSection.tsx","./src/pages/AdminBooth/components/MenuSection.tsx","./src/pages/AdminBooth/components/NoticeEditor.tsx","./src/pages/AdminBooth/components/OperatingTimeSelector.tsx","./src/pages/AdminBooth/components/QrGuides.tsx","./src/pages/AdminBooth/components/SwipeItem.tsx","./src/pages/AdminBooth/components/Button/saveBttn.tsx","./src/pages/AdminBooth/components/DropDown/DropDownSelect.tsx","./src/pages/AdminBooth/components/Modal/MenuRemoveModal.tsx","./src/pages/AdminBooth/components/Modal/PreviewModal.tsx","./src/pages/AdminBooth/components/Modal/UnsavedChangesModal.tsx","./src/pages/AdminBooth/components/Modal/menuModal.tsx","./src/pages/AdminBooth/components/Rule/payUrlRule.tsx","./src/pages/AdminBooth/types/booth.ts","./src/pages/AdminBooth/types/react-swipeable-list.d.ts","./src/pages/AdminHome/AdminHome.tsx","./src/pages/AdminHome/components/CardBox.tsx","./src/pages/AdminHome/components/RoundTabButton.tsx","./src/pages/AdminHome/components/ToggleSwitch.tsx","./src/pages/AdminHome/components/WaitingCard.tsx","./src/pages/AdminOrders/AdminOrders.tsx","./src/pages/AdminOrders/CookedPage.tsx","./src/pages/AdminOrders/DetailCard.tsx","./src/pages/AdminOrders/OrderCard.tsx","./src/pages/AdminOrders/OrderPageModal.tsx","./src/pages/LoingPage/LoginPage.tsx","./src/pages/LoingPage/components/HalfLabelInput.tsx","./src/pages/NotFound/NotFound.tsx","./src/types/order.ts","./src/utils/AdminApi.tsx","./src/utils/UserApi.tsx","./src/utils/tableColors.ts"],"errors":true,"version":"5.8.3"}
{"root":["./src/AppRouter.tsx","./src/global.d.ts","./src/main.tsx","./src/vite-env.d.ts","./src/Context/dirtyModeContext.tsx","./src/components/AdminSidebar.tsx","./src/components/ConfirmRemoveModal.tsx","./src/components/ImageBox.tsx","./src/components/MenuItem.tsx","./src/components/MobileAdminNav.tsx","./src/components/MobileMenuBar.tsx","./src/components/NewOrderToast.tsx","./src/components/RedBadge.tsx","./src/components/RequireAdminAuth.tsx","./src/components/closeButton.tsx","./src/hooks/useDetectNewOrders.tsx","./src/hooks/useGetOrderList.tsx","./src/hooks/useNewOrderToastStore.tsx","./src/hooks/usePostAdminLogin.tsx","./src/hooks/useRemoveEmoji.tsx","./src/hooks/useToggleActive.tsx","./src/hooks/useUpdateOrderStatus.tsx","./src/hooks/useWindowWidth.tsx","./src/hooks/Reservation/useGetCompletedList.tsx","./src/hooks/Reservation/useGetReservationList.tsx","./src/hooks/Reservation/useUpdateReservationStatus.tsx","./src/hooks/analytics/useGetPopularMenu.tsx","./src/hooks/analytics/useGetSalesByDate.tsx","./src/hooks/analytics/useGetTopSalse.tsx","./src/hooks/booth/useUpdateMenu.tsx","./src/hooks/booth/useUploadMenuImage.tsx","./src/hooks/booth/menu/useCreateMenu.tsx","./src/hooks/booth/menu/useDeleteBannerImage.tsx","./src/hooks/booth/menu/useDeleteMenu.tsx","./src/hooks/booth/menu/useGetAllMenus.tsx","./src/hooks/booth/menu/useGetMenuDetail.tsx","./src/hooks/booth/menu/useToggleMenuSoldOut.tsx","./src/hooks/booth/menu/useUpadateMenuSort.tsx","./src/hooks/booth/payment/useCreateStorePayment.tsx","./src/hooks/booth/payment/useGetStorePayment.tsx","./src/hooks/booth/payment/useUpdateStorePayment.tsx","./src/hooks/booth/store/useGetStore.tsx","./src/hooks/booth/store/useUpdateStore.tsx","./src/hooks/booth/store/useUploadStoreBannerImages.ts","./src/hooks/booth/store/useUploadStoreProfileImage.tsx","./src/hooks/booth/type/booth.ts","./src/layout/AdminLayout.tsx","./src/pages/AdminAnalytics/AdminAnalytics.tsx","./src/pages/AdminAnalytics/components/BoothSalesRankingCard .tsx","./src/pages/AdminAnalytics/components/HeaderStatus.tsx","./src/pages/AdminAnalytics/components/SalesCard.tsx","./src/pages/AdminAnalytics/components/TotalSalesCard.tsx","./src/pages/AdminAuth/AdminAuth.tsx","./src/pages/AdminBooth/AdminBooth.tsx","./src/pages/AdminBooth/components/AccountPage.tsx","./src/pages/AdminBooth/components/BoothProfileImage.tsx","./src/pages/AdminBooth/components/BoothSection.tsx","./src/pages/AdminBooth/components/MenuSection.tsx","./src/pages/AdminBooth/components/NoticeEditor.tsx","./src/pages/AdminBooth/components/OperatingTimeSelector.tsx","./src/pages/AdminBooth/components/QrGuides.tsx","./src/pages/AdminBooth/components/SwipeItem.tsx","./src/pages/AdminBooth/components/Button/saveBttn.tsx","./src/pages/AdminBooth/components/DropDown/DropDownSelect.tsx","./src/pages/AdminBooth/components/Modal/ImageCropModal.tsx","./src/pages/AdminBooth/components/Modal/MenuRemoveModal.tsx","./src/pages/AdminBooth/components/Modal/PreviewModal.tsx","./src/pages/AdminBooth/components/Modal/UnsavedChangesModal.tsx","./src/pages/AdminBooth/components/Modal/menuModal.tsx","./src/pages/AdminBooth/components/Rule/payUrlRule.tsx","./src/pages/AdminBooth/components/Swipe/SwipeableRow.tsx","./src/pages/AdminBooth/types/booth.ts","./src/pages/AdminBooth/types/react-swipeable-list.d.ts","./src/pages/AdminHome/AdminHome.tsx","./src/pages/AdminHome/components/RoundTabButton.tsx","./src/pages/AdminHome/components/ToggleSwitch.tsx","./src/pages/AdminHome/components/WaitingCard.tsx","./src/pages/AdminOrders/AdminOrders.tsx","./src/pages/AdminOrders/CookedPage.tsx","./src/pages/AdminOrders/DetailCard.tsx","./src/pages/AdminOrders/OrderCard.tsx","./src/pages/AdminOrders/OrderPageModal.tsx","./src/pages/LoingPage/LoginPage.tsx","./src/pages/LoingPage/components/HalfLabelInput.tsx","./src/pages/NotFound/NotFound.tsx","./src/types/order.ts","./src/utils/AdminApi.tsx","./src/utils/UserApi.tsx","./src/utils/cropUserSelect.tsx","./src/utils/imageCrop.tsx","./src/utils/tableColors.ts","./src/utils/useObjectUrl.ts","./src/utils/useVerticalLockStyle.ts"],"version":"5.8.3"}
4 changes: 2 additions & 2 deletions apps/nowait-user/src/api/order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import type {
OrderType,
StorePaymentsResponse,
} from "../types/order/order";
const API_URI = import.meta.env.VITE_SERVER_URI;

const api = axios.create({
baseURL: "/",
baseURL: `${API_URI}`,
withCredentials: true,
});

const API_URI = import.meta.env.VITE_SERVER_URI;

//주문 생성
export const createOrder = async (
Expand Down
11 changes: 11 additions & 0 deletions apps/nowait-user/src/hooks/useRouterHistory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { useEffect, useState } from "react";
import { useLocation, useNavigate } from "react-router-dom";
export const useRouterHistory = () => {
const navigate = useNavigate();
const location = useLocation()
const [stack, setStack] = useState<string[]>([]);
console.log(stack)
useEffect(() => {
setStack((prev) => [...prev, location.pathname]);
}, [navigate]);
};
Loading