Merge branch 'epic/FE-27--my-page' into fix/FE-27

epigram5-9 · Aug 9, 2024 · 07894b5 · 07894b5
2 parents 7dbe85e + 5d092ea
commit 07894b5
Show file tree

Hide file tree

Showing 170 changed files with 7,874 additions and 622 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -30,8 +30,8 @@ module.exports = {
     'react/jsx-props-no-spreading': 'off',
     'no-use-before-define': 'off',
     '@typescript-eslint/no-use-before-define': ['off'],
-    "react/require-default-props": 'off',
-    "react/self-closing-comp": 'off',
+    'react/require-default-props': 'off',
+    'react/self-closing-comp': 'off',
   },
   settings: {
     react: {

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -64,5 +64,8 @@
         }
       ]
     }
-  }
+  },
+  "cSpell.words": [
+    "clsx"
+  ]
 }
diff --git a/src/apis/.http → fonts/montserrat/Montserrat-Regular.woff2 b/src/apis/.http → fonts/montserrat/Montserrat-Regular.woff2
diff --git a/next.config.mjs b/next.config.mjs
@@ -2,22 +2,9 @@
 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: '/**',
-      },
-    ],
+    remotePatterns: [{ protocol: 'https', hostname: '**' }],
+    domains: ['phinf.pstatic.net', 'k.kakaocdn.net'],
   },
-  rewrites: async () => [
-    {
-      source: '/api/proxy/:path*',
-      destination: 'https://sprint-fe-project.s3.ap-northeast-2.amazonaws.com/:path*',
-    },
-  ],
 };
 
 export default nextConfig;
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,5 +64,8 @@ @@
             }
           ]
         }
-      }
+      },
+      "cSpell.words": [
+        "clsx"
+      ]
     }