Merge pull request #219 from TEAM-MONGDOL/develop

[merge] - develop > main 수정

.eslintrc.json

@@ -31,12 +31,12 @@
     ],
     "no-nested-ternary": "off",
     "no-useless-catch": "off",
+    "consistent-return": "off",
     "import/prefer-default-export": "off",
     "react/require-default-props": "off",
     "@typescript-eslint/no-unused-expressions": "off",
     "@typescript-eslint/no-unused-vars": "off",
     "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-unused-expressions": "off",
     "react/button-has-type": "off",
     "react/function-component-definition": [
       2,

next-auth.d.ts

@@ -4,7 +4,6 @@ declare module 'next-auth' {
   interface Session {
     user: {
       name: number;
-      admin: boolean;
       sub: string;
       type: string;
       token: string;
@@ -15,5 +14,6 @@ declare module 'next-auth' {
     };
     accessToken: string;
     accountId: number;
+    isAdmin: boolean;
   }
 }

next.config.mjs

@@ -19,6 +19,11 @@ const nextConfig = {
         destination: '/support/notices',
         permanent: true,
       },
+      {
+        source: '/points',
+        destination: '/points/history',
+        permanent: true,
+      },
     ];
   },
   images: {

package.json

@@ -9,16 +9,19 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.51.5",
+    "@tanstack/react-query": "^5.51.21",
     "axios": "^1.7.2",
     "dayjs": "^1.11.12",
     "next": "14.2.5",
     "next-auth": "^4.24.7",
     "react": "^18",
+    "react-apexcharts": "^1.4.1",
     "react-datepicker": "^7.3.0",
+    "react-daum-postcode": "^3.1.3",
     "react-dom": "^18",
     "react-infinite-scroller": "^1.2.6",
     "react-router-dom": "^6.25.1",
+    "react-spinners": "^0.14.1",
     "tailwind-scrollbar-hide": "^1.1.7",
     "zod": "^3.23.8",
     "zustand": "^4.5.4"