fix: be conflict fix

boostcampwm-2024 · Nov 21, 2024 · 1595589 · 1595589
1 parent 33cd907
commit 1595589
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/packages/client/src/api/acoount.ts b/packages/client/src/api/acoount.ts
@@ -2,7 +2,7 @@ import { instance } from '@/api/instance';
 import { Account } from '@/types/account';
 
 export async function myAccount(token: string): Promise<Account> {
-	const response = await instance.get(`/api/account/myaccount`, {
+	const response = await instance.get(`/account/myaccount`, {
 		headers: {
 			Authorization: `Bearer ${token}`,
 		},

diff --git a/packages/client/src/api/auth.ts b/packages/client/src/api/auth.ts
@@ -2,12 +2,12 @@ import { instance } from '@/api/instance';
 import { LogOut, Login } from '@/types/auth';
 
 export async function guestLogin(): Promise<Login> {
-	const response = await instance.post('/api/auth/guest-login');
+	const response = await instance.post('/auth/guest-login');
 	return response.data;
 }
 
 export async function logout(token: string): Promise<LogOut> {
-	const response = await instance.delete('/api/auth/logout', {
+	const response = await instance.delete('/auth/logout', {
 		headers: {
 			Authorization: `Bearer ${token}`,
 		},

diff --git a/packages/client/src/api/market.ts b/packages/client/src/api/market.ts
@@ -3,20 +3,20 @@ import { Candle, CandlePeriod } from '@/types/chart';
 import { MarketData, SidebarMarketData } from '@/types/market';
 
 export async function getMarketAll(): Promise<MarketData[]> {
-	const response = await instance.get('/api/upbit/market/all');
+	const response = await instance.get('/upbit/market/all');
 	return response.data;
 }
 
 export async function getMarketTop20(): Promise<SidebarMarketData[]> {
-	const response = await instance.get('/api/upbit/market/top20-trade/krw');
+	const response = await instance.get('/upbit/market/top20-trade/krw');
 	return response.data;
 }
 
 export async function getRecentlyMarketList(
 	queryString: string,
 ): Promise<SidebarMarketData[]> {
 	const response = await instance.get(
-		`/api/upbit/market/simplelist/krw?${queryString}`,
+		`/upbit/market/simplelist/krw?${queryString}`,
 	);
 	return response.data;
 }
@@ -29,8 +29,8 @@ export async function getCandleByPeriod(
 ): Promise<Candle[]> {
 	const url =
 		params === 'minutes'
-			? `/api/upbit/candle/${params}/${minutes}`
-			: `/api/upbit/candle/${params}`;
+			? `/upbit/candle/${params}/${minutes}`
+			: `/upbit/candle/${params}`;
 
 	const response = await instance.get(url, {
 		params: {

diff --git a/packages/client/src/api/trade.ts b/packages/client/src/api/trade.ts
@@ -13,7 +13,7 @@ export async function calculatePercentageBuy(
 	token: string,
 ): Promise<number> {
 	const response = await instance.get(
-		`/api/trade/calculate-percentage-${askType}/${moneyType}?percent=${percent}`,
+		`/trade/calculate-percentage-${askType}/${moneyType}?percent=${percent}`,
 		{
 			headers: {
 				Authorization: `Bearer ${token}`,
@@ -34,7 +34,7 @@ type TradeAPI = {
 
 export async function trade(params: TradeAPI, token: string): Promise<Trade> {
 	const response = await instance.post(
-		`/api/trade/${params.askType}`,
+		`/trade/${params.askType}`,
 		{
 			typeGiven: params.typeGiven,
 			typeReceived: params.typeReceived,
@@ -55,7 +55,7 @@ export async function checkCoin(
 	coin: string,
 	token: string,
 ): Promise<CheckCoin> {
-	const response = await instance.get(`/api/trade/check-coinData/${coin}`, {
+	const response = await instance.get(`/trade/check-coinData/${coin}`, {
 		headers: {
 			Authorization: `Bearer ${token}`,
 		},
@@ -67,7 +67,7 @@ export async function pendingCoin(
 	coin: string,
 	token: string,
 ): Promise<PendingCoinAPI> {
-	const response = await instance.get(`/api/trade/tradeData/${coin}`, {
+	const response = await instance.get(`/trade/tradeData/${coin}`, {
 		headers: {
 			Authorization: `Bearer ${token}`,
 		},