From 8ebb6eaedcf1e409f10c7112a592c1763a622cb5 Mon Sep 17 00:00:00 2001 From: MUsoftware Date: Sun, 17 May 2026 17:31:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20payment=20=EC=8B=9C=EC=8A=A4?= =?UTF-8?q?=ED=85=9C=EC=9D=98=20backend=20=EB=B3=91=ED=95=A9=20=EC=9D=B4?= =?UTF-8?q?=EA=B4=80=EC=97=90=20=EB=94=B0=EB=A5=B8=20shop=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/Header/Mobile/MobileNavigation.tsx | 2 - .../src/components/layout/Header/index.tsx | 2 - .../layout/UserScanCodeButton/index.tsx | 56 -------- apps/pyconkr-2025/src/main.tsx | 3 - apps/pyconkr-2025/vite-env.d.ts | 2 - .../layout/UserScanCodeButton/index.tsx | 56 -------- apps/pyconkr-2026/src/main.tsx | 3 - apps/pyconkr-2026/vite-env.d.ts | 2 - apps/pyconkr-admin/src/main.tsx | 3 - apps/pyconkr-admin/src/vite-env.d.ts | 2 - dotenv/.env.development | 2 - dotenv/.env.production | 2 - packages/shop/src/apis/client.ts | 132 ------------------ packages/shop/src/apis/index.ts | 54 ++++--- .../shop/src/components/features/cart.tsx | 4 +- .../shop/src/components/features/order.tsx | 6 +- .../shop/src/components/features/product.tsx | 8 +- packages/shop/src/contexts/index.ts | 7 +- packages/shop/src/hooks/index.ts | 46 +++--- packages/shop/src/schemas/index.ts | 6 - 20 files changed, 54 insertions(+), 344 deletions(-) delete mode 100644 apps/pyconkr-2025/src/components/layout/UserScanCodeButton/index.tsx delete mode 100644 apps/pyconkr-2026/src/components/layout/UserScanCodeButton/index.tsx delete mode 100644 packages/shop/src/apis/client.ts diff --git a/apps/pyconkr-2025/src/components/layout/Header/Mobile/MobileNavigation.tsx b/apps/pyconkr-2025/src/components/layout/Header/Mobile/MobileNavigation.tsx index 2bed3ec..9203179 100644 --- a/apps/pyconkr-2025/src/components/layout/Header/Mobile/MobileNavigation.tsx +++ b/apps/pyconkr-2025/src/components/layout/Header/Mobile/MobileNavigation.tsx @@ -10,7 +10,6 @@ import { SignInButton } from "@apps/pyconkr-2025/components/layout/SignInButton" import { HamburgerButton } from "./HamburgerButton"; import { MobileLanguageToggle } from "./MobileLanguageToggle"; -// import { ScanCodeButton } from "@apps/pyconkr-2025/components/layout/UserScanCodeButton"; type MenuType = NestedSiteMapSchema; @@ -201,7 +200,6 @@ export const MobileNavigation: FC = ({ isOpen, onClose, s - {/* */} diff --git a/apps/pyconkr-2025/src/components/layout/Header/index.tsx b/apps/pyconkr-2025/src/components/layout/Header/index.tsx index a91e50d..8c67f7c 100644 --- a/apps/pyconkr-2025/src/components/layout/Header/index.tsx +++ b/apps/pyconkr-2025/src/components/layout/Header/index.tsx @@ -12,7 +12,6 @@ import LanguageSelector from "@apps/pyconkr-2025/components/layout/LanguageSelec import { SignInButton } from "@apps/pyconkr-2025/components/layout/SignInButton"; import { useAppContext } from "@apps/pyconkr-2025/contexts/app_context"; -// import { ScanCodeIconButton } from "@apps/pyconkr-2025/components/layout/UserScanCodeButton"; import { MobileHeader } from "./Mobile/MobileHeader"; type MenuType = NestedSiteMapSchema; @@ -150,7 +149,6 @@ const Header: FC = () => { - {/* */} diff --git a/apps/pyconkr-2025/src/components/layout/UserScanCodeButton/index.tsx b/apps/pyconkr-2025/src/components/layout/UserScanCodeButton/index.tsx deleted file mode 100644 index 03c2961..0000000 --- a/apps/pyconkr-2025/src/components/layout/UserScanCodeButton/index.tsx +++ /dev/null @@ -1,56 +0,0 @@ -import { useShopClient, useUserInfo } from "@frontend/shop/hooks"; -import { QrCode2 } from "@mui/icons-material"; -import { Button, IconButton, IconButtonProps } from "@mui/material"; -import { ErrorBoundary, Suspense } from "@suspensive/react"; -import { FC, Fragment } from "react"; - -import { useAppContext } from "@apps/pyconkr-2025/contexts/app_context"; - -export const ScanCodeIconButton: FC<{ sx?: IconButtonProps["sx"] }> = Suspense.with( - { fallback: }, - ErrorBoundary.with({ fallback: }, ({ sx }) => { - const shopAPIClient = useShopClient(); - const { data } = useUserInfo(shopAPIClient); - - const iconBtnStyle: IconButtonProps["sx"] = (theme) => ({ - color: theme.palette.primary.nonFocus, - "&:hover": { color: theme.palette.primary.dark }, - "&:active": { color: theme.palette.primary.main }, - transition: "color 0.4s ease, background-color 0.4s ease", - }); - - return ( - - } sx={sx ?? iconBtnStyle} /> - - ); - }) -); - -export const ScanCodeButton: FC = Suspense.with( - { fallback: null }, - ErrorBoundary.with({ fallback: null }, () => { - const { language } = useAppContext(); - const shopAPIClient = useShopClient(); - const { data } = useUserInfo(shopAPIClient); - - const buttonText = language === "ko" ? "등록 코드" : "Entrance QR Code"; - - return ( - -