Merge branch 'dev' of https://github.com/oodd-team/oodd-web-react into feat/OD-142

Author: gustn99

src/App.tsx

@@ -3,7 +3,7 @@ import { BrowserRouter, Route, Routes, Navigate } from 'react-router-dom';
 import Home from './pages/Home';
 import Login from './pages/Login';
 import SignUp from './pages/SignUp';
-import LoginComplete from './pages/Login/components/LoginComplete';
+import LoginComplete from './pages/Login/LoginComplete';
 import TermsAgreement from './pages/TermsAgreement';
 
 import Profile from './pages/Profile';

src/apis/chat-room/dto.ts

@@ -3,7 +3,7 @@ import { newRequest } from '../core';
 import { EmptySuccessResponse } from '../core/dto';
 
 // 유저 정보 수정 api
-export const patchUserInfoApi = (data: PatchUserInfoRequest, userId: number) =>
+export const patchUserInfoApi = (data: Partial<PatchUserInfoRequest>, userId: number) =>
 	newRequest.patch<PatchUserInfoResponse>(`/user/${userId}`, data);
 
 // 유저 탈퇴 api

src/apis/user/index.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import type { IconsProps } from './dto';
+
+const Alarm: React.FC<IconsProps> = ({ isFilled = false }) => {
+	return (
+		<svg xmlns="http://www.w3.org/2000/svg" width="14" height="18" viewBox="0 0 14 18" fill="none">
+			<path
+				d="M0 15.3V13.5H1.75V7.2C1.75 5.958 2.1175 4.851 2.84375 3.879C3.57 2.907 4.52375 2.277 5.6875 1.98V1.35C5.6875 0.972 5.81875 0.657 6.0725 0.396C6.32625 0.135 6.64125 0 7 0C7.35875 0 7.67375 0.135 7.9275 0.396C8.18125 0.657 8.3125 0.981 8.3125 1.35V1.98C9.47625 2.277 10.43 2.916 11.1562 3.879C11.8825 4.842 12.25 5.949 12.25 7.2V13.5H14V15.3H0ZM7 18C6.51875 18 6.1075 17.82 5.76625 17.469C5.425 17.118 5.25 16.695 5.25 16.2H8.75C8.75 16.695 8.575 17.118 8.23375 17.469C7.8925 17.82 7.48125 18 7 18ZM3.5 13.5H10.5V7.2C10.5 6.21 10.1587 5.364 9.4675 4.653C8.77625 3.942 7.95375 3.591 6.99125 3.591C6.02875 3.591 5.20625 3.942 4.515 4.653C3.82375 5.364 3.4825 6.21 3.4825 7.2V13.5H3.5Z"
+				fill="#8E8E8E"
+			/>
+			{isFilled && <path d="M11 14.5H2.5V6C2.5 4 5 3 7.5 3C9.5 3 10.6667 5.33333 11 6.5V14.5Z" fill="#8E8E8E" />}
+		</svg>
+	);
+};
+
+export default Alarm;

src/assets/arrow/bottom.svg

@@ -0,0 +1,34 @@
+import React from 'react';
+import type { IconsProps } from './dto';
+
+const Heart: React.FC<IconsProps> = ({ isFilled = false }) => {
+	return (
+		<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+			<rect x="0.5" y="0.5" width="55" height="55" rx="27.5" fill="white" />
+			<rect x="0.5" y="0.5" width="55" height="55" rx="27.5" stroke="url(#paint0_linear_3603_1320)" />
+			<path
+				d={
+					isFilled
+						? 'M28 34.8813L26.9125 33.8913C23.05 30.3888 20.5 28.0788 20.5 25.2438C20.5 22.9338 22.315 21.1188 24.625 21.1188C25.93 21.1188 27.1825 21.7263 28 22.6863C28.8175 21.7263 30.07 21.1188 31.375 21.1188C33.685 21.1188 35.5 22.9338 35.5 25.2438C35.5 28.0788 32.95 30.3888 29.0875 33.8988L28 34.8813Z'
+						: 'M31.375 21.1187C30.07 21.1187 28.8175 21.7262 28 22.6862C27.1825 21.7262 25.93 21.1187 24.625 21.1187C22.315 21.1187 20.5 22.9337 20.5 25.2437C20.5 28.0787 23.05 30.3887 26.9125 33.8987L28 34.8812L29.0875 33.8912C32.95 30.3887 35.5 28.0787 35.5 25.2437C35.5 22.9337 33.685 21.1187 31.375 21.1187ZM28.075 32.7812L28 32.8562L27.925 32.7812C24.355 29.5487 22 27.4112 22 25.2437C22 23.7437 23.125 22.6187 24.625 22.6187C25.78 22.6187 26.905 23.3612 27.3025 24.3887H28.705C29.095 23.3612 30.22 22.6187 31.375 22.6187C32.875 22.6187 34 23.7437 34 25.2437C34 27.4112 31.645 29.5487 28.075 32.7812Z'
+				}
+				fill={isFilled ? '#FF2389' : '#8E8E8E'}
+			/>
+			<defs>
+				<linearGradient
+					id="paint0_linear_3603_1320"
+					x1="0.56"
+					y1="2.7451"
+					x2="58.788"
+					y2="6.19466"
+					gradientUnits="userSpaceOnUse"
+				>
+					<stop stopColor="#FF2389" />
+					<stop offset="1" stopColor="#F27575" />
+				</linearGradient>
+			</defs>
+		</svg>
+	);
+};
+
+export default Heart;