Merge branch 'develop' into feat/theme-image-preview

# Conflicts: # app/components/RequireAuth/RequireAuth.tsx # app/mutations/postTheme.ts
Next-Room · Dec 29, 2024 · da303f8 · da303f8
2 parents 9322c60 + f091888
commit da303f8
Show file tree

Hide file tree

Showing 59 changed files with 123 additions and 2,205 deletions.
diff --git a/app/admin-old/page.tsx b/app/admin-old/page.tsx
diff --git a/app/admin/(components)/CreateTheme/Container.tsx b/app/admin/(components)/CreateTheme/Container.tsx
@@ -5,7 +5,7 @@ import { useRouter } from "next/navigation";
 import { usePostTheme } from "@/mutations/postTheme";
 import { useCreateThemeValue } from "@/components/atoms/createTheme.atom";
 import { useSelectedThemeWrite } from "@/components/atoms/selectedTheme.atom";
-import { setSelectedThemeId } from "@/utils/localStorage";
+import { setSelectedThemeId } from "@/utils/storageUtil";
 
 import CreateThemeTitle from "./CreateThemeTitle";
 import CreateThemeBody from "./CreateThemeBody";

diff --git a/app/admin/(components)/Sidebar.tsx b/app/admin/(components)/Sidebar.tsx
@@ -14,7 +14,7 @@ import {
   getSelectedThemeId,
   getStatus,
   removeThemeId,
-} from "@/utils/localStorage";
+} from "@/utils/storageUtil";
 import { useSelectedThemeReset } from "@/components/atoms/selectedTheme.atom";
 import { useDrawerState } from "@/components/atoms/drawer.atom";
 import useModal from "@/hooks/useModal";

diff --git a/app/admin/(components)/ThemeDrawer/hooks/useImages.ts b/app/admin/(components)/ThemeDrawer/hooks/useImages.ts
@@ -11,7 +11,7 @@ import {
 import { useCreateHint } from "@/components/atoms/createHint.atom";
 import { useSelectedHint } from "@/components/atoms/selectedHint.atom";
 import { useToastWrite } from "@/components/atoms/toast.atom";
-import { getStatus } from "@/utils/localStorage";
+import { getStatus } from "@/utils/storageUtil";
 import { subscribeLinkURL } from "@/admin/(consts)/sidebar";
 
 import { compressImage, convertToPng } from "../helpers/imageHelpers";

diff --git a/app/admin/Admin.tsx b/app/admin/Admin.tsx
@@ -5,7 +5,7 @@ import { useRouter } from "next/navigation";
 
 import useCheckSignIn from "@/hooks/useCheckSignIn";
 import Loader from "@/components/Loader/Loader";
-import { getLoginInfo, setSelectedThemeId } from "@/utils/localStorage";
+import { getLoginInfo, setSelectedThemeId } from "@/utils/storageUtil";
 import { useSelectedTheme } from "@/components/atoms/selectedTheme.atom";
 import { useGetThemeList } from "@/queries/getThemeList";
 import { useToastInfo } from "@/components/atoms/toast.atom";

diff --git a/app/admin/AdminView.tsx b/app/admin/AdminView.tsx
@@ -6,7 +6,7 @@ import ContentArea from "@/admin/(components)/ContentArea";
 import Toast from "@/components/common/Toast/Toast";
 import NotiDialog from "@/components/common/Dialog-new/Noti-Dialog-new/Dialog";
 import useModal from "@/hooks/useModal";
-import { getLocalStorage } from "@/utils/localStorage";
+import { getLocalStorage } from "@/utils/storageUtil";
 
 interface Theme {
   id: number;

diff --git a/app/components/CustomModal/CustomModal.tsx b/app/components/CustomModal/CustomModal.tsx
diff --git a/app/components/CustomModal/CustomModal.type.ts b/app/components/CustomModal/CustomModal.type.ts
diff --git a/app/components/CustomModal/CustomModalView.styled.ts b/app/components/CustomModal/CustomModalView.styled.ts
diff --git a/app/components/CustomModal/CustomModalView.tsx b/app/components/CustomModal/CustomModalView.tsx
diff --git a/app/components/DeleteHintDialog/DeleteHintDialog.tsx b/app/components/DeleteHintDialog/DeleteHintDialog.tsx
diff --git a/app/components/DeleteHintDialog/DeleteHintDialogView.tsx b/app/components/DeleteHintDialog/DeleteHintDialogView.tsx
diff --git a/app/components/DeleteHintDialog/index.ts b/app/components/DeleteHintDialog/index.ts
diff --git a/app/components/DeleteThemeDialog/DeleteThemeDialog.tsx b/app/components/DeleteThemeDialog/DeleteThemeDialog.tsx
diff --git a/app/components/DeleteThemeDialog/DeleteThemeDialogView.tsx b/app/components/DeleteThemeDialog/DeleteThemeDialogView.tsx
diff --git a/app/components/DeleteThemeDialog/index.ts b/app/components/DeleteThemeDialog/index.ts
diff --git a/app/components/HintItem/HintItem.tsx b/app/components/HintItem/HintItem.tsx