Merge branch 'develop' into Refactor/modalAction

junjeeong · web-flow · commit 79215040a4c6 · 2024-11-19T12:04:57.000+09:00
diff --git a/components/Link/AddLinkInput.tsx b/components/Link/AddLinkInput.tsx
@@ -35,14 +35,14 @@ const AddLinkInput = ({ folderList }: FolderListData) => {
   };
 
   return (
-    <div className="flex bg-white items-center w-full lg:max-w-[800px] md:max-w-[704px] sm:max-w-[325px] h-[69px] lg:px-5 md:px-5 sm:px-[10px] border border-blue-500 rounded-[10px] md:w-[704px] sm:w-[325px] sm:h-[53px] transition-all">
+    <div className="flex bg-white justify-between items-center w-full lg:max-w-[800px] md:max-w-[704px] sm:max-w-[325px] h-[69px] lg:px-5 md:px-5 sm:px-[10px] border border-blue-500 rounded-[10px] md:w-[704px] sm:w-[325px] sm:h-[53px] transition-all">
       <Image src="/icons/link.svg" width={20} height={20} alt="link icon" />
       <input
         onChange={handleChange}
         onKeyDown={handleKeyDown}
         value={link}
         placeholder="링크를 추가해 보세요."
-        className="flex-grow lg:ml-3 md:ml-3 sm:ml-[8px]"
+        className="lg:ml-3 md:ml-3 sm:ml-[8px]"
       />
       <SubmitButton
         onClick={handleClick}
diff --git a/lib/api/axiosInstanceApi.ts b/lib/api/axiosInstanceApi.ts
@@ -1,12 +1,12 @@
 import axios from "axios";
 
 const axiosInstance = axios.create({
-  baseURL: process.env.NEXT_PUBLIC_API_URL || "http://localhost:3000",
+  baseURL: process.env.NEXT_PUBLIC_API_URL || "/",
 });
 
 export const proxy = axios.create({
   // 배포 이후에는 배포된 URL로 변경해야 함.
-  baseURL: "http://localhost:3000",
+  baseURL: "https://linkbrary-9-99.vercel.app",
 });
 
 proxy.interceptors.response.use(
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -14,13 +14,17 @@ export default function App({ Component, pageProps }: AppProps) {
     <>
       <Head>
         <meta property="og:type" content="website" />
-        {/* <meta property="og:url" content="https://linkbrary.app" /> 배포 후 실제 도메인으로 변경 필요 */}
+        <meta property="og:url" content="https://linkbrary-9-99.vercel.app/" />
         <meta property="og:title" content="Linkbrary" />
         <meta
           property="og:description"
           content="나만의 링크를 관리하는 Linkbrary"
         />
         <meta property="og:image" content="/images/home_main.png" />
+        <meta
+          name="viewport"
+          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+        />
         <title>Linkbrary</title>
       </Head>
 
diff --git a/pages/api/auth/sign-in/google.ts b/pages/api/auth/sign-in/google.ts
@@ -13,8 +13,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     const clientId = process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID;
     const clientSecret = process.env.NEXT_PUBLIC_GOOGLE_CLIENT_SECRET;
     const redirectUri =
-      process.env.NEXT_PUBLIC_GOOGLE_REDIRECT_URI_SIGN_IN ||
-      "http://localhost:3000/";
+      process.env.NEXT_PUBLIC_GOOGLE_REDIRECT_URI_SIGN_IN || "/";
 
     if (!clientId || !clientSecret) {
       return res
@@ -59,7 +58,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
             path: "/",
           })
         );
-        return res.redirect("http://localhost:3000");
+        return res.redirect("/");
       }
     } catch (loginError: any) {
       return res.redirect("/signup");
diff --git a/pages/api/auth/sign-in/kakao.ts b/pages/api/auth/sign-in/kakao.ts
@@ -11,8 +11,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     }
 
     const redirectUri =
-      process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI_SIGN_IN ||
-      "http://localhost:3000/";
+      process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI_SIGN_IN || "/";
 
     try {
       const loginResponse = await axiosInstance.post("/auth/sign-in/kakao", {
@@ -32,7 +31,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
             path: "/",
           })
         );
-        return res.redirect("http://localhost:3000");
+        return res.redirect("/");
       }
     } catch (loginError: any) {
       console.error(
diff --git a/pages/api/auth/sign-up/google.ts b/pages/api/auth/sign-up/google.ts
@@ -18,8 +18,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     const clientId = process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID;
     const clientSecret = process.env.NEXT_PUBLIC_GOOGLE_CLIENT_SECRET;
     const redirectUri =
-      process.env.NEXT_PUBLIC_GOOGLE_REDIRECT_URI_SIGN_UP ||
-      "http://localhost:3000/";
+      process.env.NEXT_PUBLIC_GOOGLE_REDIRECT_URI_SIGN_UP || "/";
 
     if (!clientId || !clientSecret) {
       return res
@@ -51,7 +50,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
       const signUpResponse = await axiosInstance.post("/auth/sign-up/google", {
         name: name || "사용자",
         token: id_token,
-        redirectUri: "http://localhost:3000",
+        redirectUri: "/",
       });
 
       const accessToken = signUpResponse.data.access_token;
diff --git a/pages/api/auth/sign-up/kakao.ts b/pages/api/auth/sign-up/kakao.ts
@@ -11,8 +11,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
     }
 
     const redirectUri =
-      process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI_SIGN_UP ||
-      "http://localhost:3000/";
+      process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI_SIGN_UP || "/";
 
     // 회원가입 시도
     try {
@@ -34,7 +33,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
             path: "/",
           })
         );
-        return res.redirect("http://localhost:3000");
+        return res.redirect("/");
       }
     } catch (signUpError: any) {
       console.error(
diff --git a/pages/signup/index.tsx b/pages/signup/index.tsx
@@ -57,10 +57,10 @@ const SignupPage = () => {
             error={errors.password}
           />
           <AuthInput
-            text="비밀번호"
+            text="비밀번호 확인"
             type="password"
             name="passwordConfirm"
-            placeholder="비밀번호를 입력해주세요."
+            placeholder="비밀번호를 한번 더 입력해주세요."
             value={values.passwordConfirm}
             onChange={handleChange}
             onBlur={handleBlur}
diff --git a/test.http b/test.http
