Merge pull request Next-Room#86 from Next-Room/feat/hint-qa-rin

Author: lgrin-byte

app/admin/(components)/Sidebar.tsx

@@ -62,6 +62,7 @@ export default function Sidebar(props: Props) {
   const navigateToNewTheme = () => {
     resetSelectedTheme();
     router.push("/admin");
+    setDrawer({ ...drawer, isOpen: false });
   };
   const handleSelectTheme = (theme: Theme) => {
     if (drawer.isOpen && !drawer.isSameHint) {
@@ -134,7 +135,7 @@ export default function Sidebar(props: Props) {
             </button>
           </li>
         </ul>
-        {!status?.includes("SUBSCRIPTION") && (
+        {!(status?.replaceAll(`"`, "") === "SUBSCRIPTION") && (
           <div className="sidebar__subscribe">
             <p className="sidebar__subscribe-title">
               구독하고 힌트에 사진을 추가해 보세요

app/admin/(components)/ThemeDrawer/hooks/useImages.ts

@@ -100,7 +100,7 @@ const useImages = ({
   };
 
   const handleAddImageBtnClick = (e: MouseEvent<HTMLButtonElement>) => {
-    if (!status?.includes("SUBSCRIPTION")) {
+    if (!(status?.replaceAll(`"`, "") === "SUBSCRIPTION")) {
       e.preventDefault();
       window.open(subscribeLinkURL, "_blank", "noopener,noreferrer");
       return;

app/admin/(style)/admin.modules.sass

@@ -130,6 +130,7 @@
   border-radius: 8px
 
 .content-area
+  margin: 0 auto
   flex-grow: 1
   flex-shrink: 1
   overflow-x: hidden

app/components/common/Hint-Dialog-new/Dialog.tsx

@@ -47,7 +47,6 @@ const Dialog = forwardRef<HTMLFormElement, DialogProps>((props) => {
     if (type === "put") {
       fn();
       close();
-      setDrawer({ ...drawer, isOpen: false });
     } else if (type === "delete") {
       deleteHint({ id });
       close();

app/queries/getPreSignedUrl.ts

@@ -84,7 +84,7 @@ const useHintUpload = () => {
     PreSignedUrlRequest
   >({
     mutationFn: async (params) => {
-      if (status?.includes("SUBSCRIPTION")) {
+      if (status?.replaceAll(`"`, "") === "SUBSCRIPTION") {
         return getPreSignedUrl(params);
       }
       return {
@@ -119,11 +119,14 @@ const useHintUpload = () => {
     HintData
   >({
     mutationFn: (data) => (data.id > 0 ? putHint(data) : postHint(data)),
-    onSuccess: () => {
+    onSuccess: (data) => {
       queryClient.invalidateQueries(QUERY_KEY);
       setToast({
         isOpen: true,
-        title: "힌트가 성공적으로 등록되었습니다.",
+        title:
+          data.config.method === "put"
+            ? "힌트를 수정했습니다."
+            : "힌트를 추가했습니다.",
         text: "",
       });
     },

app/queries/getSubscriptionPlan.ts

@@ -21,7 +21,7 @@ interface Response {
 export interface DataItem {
   id: number; // ID
   name: string; // 이름
-  status: "FREE" | "SUBSCRIPTION"; // 상태 (두 가지 값 중 하나)
+  status: "FREE" | "SUBSCRIPTION" | "SUBSCRIPTION_EXPIRATION"; // 상태 (두 가지 값 중 하나)
   startDate: string | null; // 시작 날짜 (문자열 또는 null)
   expiryDate: string | null; // 만료 날짜 (문자열 또는 null)
   createdAt: string; // 생성 날짜

app/utils/localStorage.ts

@@ -73,7 +73,7 @@ export const setLoginInfo = (loginInfo: LoginInfo) => {
 };
 
 export const setStatus = (status: string) => {
-  setLocalStorage(STATUS, JSON.stringify(status));
+  setLocalStorage(STATUS, status);
 };
 
 export const setSelectedThemeId = (themeId: number) => {