File tree Expand file tree Collapse file tree 2 files changed +31
-23
lines changed
Expand file tree Collapse file tree 2 files changed +31
-23
lines changed Original file line number Diff line number Diff line change 11const getApiBaseUrl = ( ) => {
22 const host = window . location . hostname ;
33
4- if ( host === 'localhost' ) return import . meta. env . VITE_LOCAL_API_URL ;
54 if ( host === 'test.codemonster.site' ) return import . meta. env . VITE_TEST_URL ;
65 if ( host === 'codemonster.site' ) return import . meta. env . VITE_BASE_URL ;
76
8- return 'https://api.codemonster.site' ;
7+ return 'https://api.test. codemonster.site' ;
98} ;
109
11- export const API_BASE_URL = getApiBaseUrl ( ) ;
10+ export const API_BASE_URL = getApiBaseUrl ( ) ;
Original file line number Diff line number Diff line change 11import { isDevMode } from '@/utils/cookie.ts' ;
22
33import apiInstance from '@/api/apiInstance' ;
4- import {
5- teamAdminPageMock ,
6- teamCombinedMock ,
7- teamSearchMock ,
8- } from '@/api/mocks.ts' ;
4+ import { teamAdminPageMock , teamSearchMock } from '@/api/mocks.ts' ;
95import { ServerResponse } from '@/api/types' ;
106
117// 생성
@@ -43,28 +39,45 @@ interface ITeamMember {
4339
4440export interface ITeamInfo extends ITeamCommon {
4541 teamId : number ;
46- imageUrl : string ;
42+ teamName : string ;
43+ teamExplain : string ;
44+ topic : string ;
45+ memberLimit : number ;
4746 memberCount : number ;
4847 streakDays : number ;
49- // successMemberCount: number;
50- teamAnnouncement ?: string ;
48+ imageUrl : string ;
5149 createdAt : string ;
52- teamRecruitId : number | null ;
53- // password: string;
5450 members ?: ITeamMember [ ] ;
55- memberLimit : number ;
5651}
5752
5853interface ITeamListResponse {
5954 myTeams : ITeamInfo [ ] ;
6055 allTeams : {
6156 content : ITeamInfo [ ] ;
62- page : {
63- size : number ;
64- number : number ;
65- totalElements : number ;
66- totalPages : number ;
57+ empty : boolean ;
58+ first : boolean ;
59+ last : boolean ;
60+ number : number ;
61+ numberOfElements : number ;
62+ pageable : {
63+ pageNumber : number ;
64+ pageSize : number ;
65+ offset : number ;
66+ sort : {
67+ unsorted : boolean ;
68+ sorted : boolean ;
69+ empty : boolean ;
70+ } ;
71+ unpaged : boolean ;
72+ } ;
73+ size : number ;
74+ sort : {
75+ unsorted : boolean ;
76+ sorted : boolean ;
77+ empty : boolean ;
6778 } ;
79+ totalElements : number ;
80+ totalPages : number ;
6881 } ;
6982}
7083
@@ -174,10 +187,6 @@ export const getTeamList = async (
174187 page : number = 0 ,
175188 size : number = 6
176189) : Promise < ITeamListResponse > => {
177- if ( isDevMode ( ) ) {
178- return teamCombinedMock . data ;
179- }
180-
181190 const res = await apiInstance . get < ServerResponse < ITeamListResponse > > (
182191 `/v1/teams/combined` ,
183192 {
You can’t perform that action at this time.
0 commit comments