Merge branch 'main' of https://github.com/merging-Branchify/Branchify_FE

merging-Branchify · Nov 25, 2024 · f9f4ace · f9f4ace
2 parents 6062657 + 0d64d70
commit f9f4ace
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/src/pages/Home/Intro.jsx b/src/pages/Home/Intro.jsx
@@ -20,7 +20,7 @@ const containerStyle = css`
   @media (max-width: 768px) {
     padding: 4rem 1rem;
     h1 {
-      font-size: 20px;
+      font-size: 18px;
     }
     p {
       font-size: 15px;
@@ -38,7 +38,7 @@ const titleStyle = css`
   font-style: normal;
   font-weight: 600;
   line-height: normal;
-  letter-spacing: -2.4px;
+  letter-spacing: -2.1px;
 `;
 
 const paragraphStyle = css`

diff --git a/src/pages/Home/JoinForm/Api.js b/src/pages/Home/JoinForm/Api.js
@@ -4,7 +4,9 @@ const SERVER = import.meta.env.VITE_SERVER_API;
 
 export const submitEmail = async (email) => {
     try {
-        const response = await axios.post('${SERVER}/api/branchify/beta-tester', { email });
+        const response = await axios.post(`${SERVER}/api/branchify/beta-tester`, {
+        email: email,
+        });
         return response.data;
     } catch (error) {
         throw new Error('이메일 등록에 실패했습니다. 다시 시도해 주세요.');

diff --git a/src/pages/Home/Main/MainStyle.js b/src/pages/Home/Main/MainStyle.js
@@ -14,7 +14,7 @@ export const mainStyle = css`
   }
 
   @media (max-width: 1000px) {
-    padding: 2rem 6rem;
+    padding: 2rem 4rem;
     flex-direction: column;
     h1 {
       font-size: 36px;
@@ -28,10 +28,10 @@ export const mainStyle = css`
   }
 
   @media (max-width: 768px) {
-    padding: 2rem 3rem;
+    padding: 2rem 2rem;
     flex-direction: column;
     h1 {
-      font-size: 32px;
+      font-size: 30px;
     }
     span {
       font-size: 34px;

diff --git a/vite.config.js b/vite.config.js
@@ -4,21 +4,19 @@ import react from '@vitejs/plugin-react';
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd(), '');
-  const serverPort = Number(env.VITE_SERVER_DOMAIN_PORT);
+  const server = Number(env.VITE_SERVER_API);
 
   return {
     base: '/',
     plugins: [react()],
-    server: {
-      port: serverPort, // 서버 포트 설정
-      proxy: {
-        '/api': {
-          target: env.VITE_SERVER_DOMAIN_PORT, // 백엔드 서버 URL
-          changeOrigin: true, // 크로스 오리진 허용
-          rewrite: (path) => path.replace(/^\/api/, ''), // '/api'를 백엔드 경로에서 제거
-        },
-      },
-    },
+    // server: {
+    //   proxy: {
+    //     '/api': {
+    //       target: env.VITE_SERVER_API, // 백엔드 서버 URL
+    //       rewrite: (path) => path.replace(/^\/api/, ''), // '/api'를 백엔드 경로에서 제거
+    //     },
+    //   },
+    // },
     define: {
       __APP_ENV__: JSON.stringify(env.APP_ENV),
     },