Merge branch 'main' into merge/FE-51

.vscode/settings.json

@@ -64,5 +64,8 @@
         }
       ]
     }
-  }
+  },
+  "cSpell.words": [
+    "clsx"
+  ]
 }

next.config.mjs

@@ -1,6 +1,23 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
+  images: {
+    domains: ['sprint-fe-project.s3.ap-northeast-2.amazonaws.com', 'localhost'],
+    remotePatterns: [
+      {
+        protocol: 'https',
+        hostname: 'via.placeholder.com',
+        port: '',
+        pathname: '/**',
+      },
+    ],
+  },
+  rewrites: async () => [
+    {
+      source: '/api/proxy/:path*',
+      destination: 'https://sprint-fe-project.s3.ap-northeast-2.amazonaws.com/:path*',
+    },
+  ],
 };
 
 export default nextConfig;

package.json

@@ -17,6 +17,7 @@
     "@lukemorales/query-key-factory": "^1.3.4",
     "@radix-ui/react-alert-dialog": "^1.1.1",
     "@radix-ui/react-avatar": "^1.1.0",
+    "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.1",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-radio-group": "^1.2.0",
@@ -28,6 +29,8 @@
     "axios": "^1.7.2",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
+    "date-fns": "^3.6.0",
+    "formik": "^2.4.6",
     "lucide-react": "^0.402.0",
     "next": "14.2.4",
     "qs": "^6.12.2",
@@ -38,13 +41,14 @@
     "sharp": "^0.33.4",
     "tailwind-merge": "^2.4.0",
     "tailwindcss-animate": "^1.0.7",
+    "yup": "^1.4.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
     "@tanstack/eslint-plugin-query": "^5.50.0",
-    "@types/node": "^20",
+    "@types/node": "^20.14.10",
     "@types/qs": "^6.9.15",
-    "@types/react": "^18",
+    "@types/react": "^18.3.3",
     "@types/react-dom": "^18",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
@@ -63,7 +67,7 @@
     "postcss": "8.4.39",
     "prettier": "^3.2.5",
     "prettier-eslint": "^16.3.0",
-    "tailwindcss": "3.4.4",
-    "typescript": "^5"
+    "tailwindcss": "^3.4.4",
+    "typescript": "^5.5.3"
   }
 }

src/apis/emotion.ts

@@ -0,0 +1,12 @@
+import { GetMonthlyEmotionLogsRequestType, GetMonthlyEmotionLogsResponseType } from '@/schema/emotion';
+
+import httpClient from '.';
+
+const getMonthlyEmotionLogs = async (request: GetMonthlyEmotionLogsRequestType): Promise<GetMonthlyEmotionLogsResponseType> => {
+  const response = await httpClient.get(`/emotionLogs/monthly`, {
+    params: request,
+  });
+  return response.data;
+};
+
+export default getMonthlyEmotionLogs;