Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: 절대 경로 수정에 따른 변경점 적용 #92

Open
wants to merge 28 commits into
base: refactor-base-code
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f76f856
chore: 절대 경로 수정에 따른 변경점 적용
Low-ProFiles Nov 10, 2024
ec233ef
fix: axios instance 파일의 header 수정
Low-ProFiles Nov 10, 2024
fa67fc0
fix: 내 프로필 조회 API 수정
Low-ProFiles Dec 15, 2024
5908988
fix: 내 투두리스트 조회 -> MyTodos.tsx의 teamManageId (yean)
Low-ProFiles Dec 15, 2024
7d78842
fix: 내 프로필 수정 API 수정
Low-ProFiles Dec 15, 2024
33214c3
fix: 내 프로필 한마디 상태 변경 API -> 수정 사항 없음
Low-ProFiles Dec 15, 2024
2fac689
fix: 내 포트폴리오 조회 & 내 포트폴리오 상세 조회 API 수정
Low-ProFiles Dec 15, 2024
8c38b84
fix: 내 팀 조회 API 수정
Low-ProFiles Dec 15, 2024
807eba8
fix: 약관 동의 생성 API 수정
Low-ProFiles Dec 15, 2024
b56ba29
fix: 팀 생성 API 수정
Low-ProFiles Dec 15, 2024
44e1690
chore: request type 추가
Low-ProFiles Dec 15, 2024
481c805
fix: 팀 수정 API 수정
Low-ProFiles Dec 15, 2024
c399d71
fix: 알림 조회 API 수정
Low-ProFiles Dec 15, 2024
b9599c0
fix: 알림 읽음 표시 API 수정
Low-ProFiles Dec 15, 2024
ca278b1
chore: 쓰이지 않는 폴더 삭제
Low-ProFiles Dec 15, 2024
1ec4636
fix: 팀 조회(팀 코드) API 수정
Low-ProFiles Dec 15, 2024
146f5ed
fix: 팀 생성 API 2차 수정
Low-ProFiles Dec 15, 2024
9b855a3
fix: 팀 비밀번호 생성 API 수정
Low-ProFiles Dec 15, 2024
146f7a3
fix: 내 프로필 수정 API 2차 수정
Low-ProFiles Dec 15, 2024
34d51fc
fix: 자료 도메인 API 수정
Low-ProFiles Dec 15, 2024
ddb6d51
fix: 팀 메모 생성 API 수정
Low-ProFiles Dec 15, 2024
cb70f56
fix: 팀 메모 조회 API 수정
Low-ProFiles Dec 15, 2024
cc80ed2
fix: 팀 메모 조회 API 2차 수정
Low-ProFiles Dec 15, 2024
c9ff043
fix: 팀 메모 개별 조회 API 수정
Low-ProFiles Dec 15, 2024
adca21b
fix: 메모 수정 API 수정
Low-ProFiles Dec 15, 2024
4f1f56e
fix: 메모 삭제 API 수정
Low-ProFiles Dec 15, 2024
5a2b888
fix: share.ts에서 피드백 도메인인데 storageId 대신 teamId 사용중 (jina)
Low-ProFiles Dec 15, 2024
4125e4b
fix: 캘린더 도메인 API 수정
Low-ProFiles Dec 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import { BrowserRouter, Routes, Route } from 'react-router-dom';
import { CalendarPage, ExtraCalendarPage } from '@pages/calendar';
import { LoginPage, LoginCompletePage } from '@pages/login';
import { ManagementPage, ExtraManagementPage } from '@pages/management';
import { MemoPage, ExtraMemoPage } from '@pages/memo';
import { MyPage, ExtraMyPage } from '@pages/mypage';
import { SharePage, ExtraSharePage } from '@pages/share';
import { TodoListPage, ExtraTodoListPage } from '@pages/todo-list';
import { CalendarPage, ExtraCalendarPage } from '@/pages/calendar';
import { LoginPage, LoginCompletePage } from '@/pages/login';
import { ManagementPage, ExtraManagementPage } from '@/pages/management';
import { MemoPage, ExtraMemoPage } from '@/pages/memo';
import { MyPage, ExtraMyPage } from '@/pages/mypage';
import { SharePage, ExtraSharePage } from '@/pages/share';
import { TodoListPage, ExtraTodoListPage } from '@/pages/todo-list';
import {
CreateTeamPage,
JoinTeamPage,
TeamPage,
ShareTeamPage
} from '@pages/team';
import ErrorPage from '@pages/error';
import { ProfilePage } from '@pages/mypage/profile';
import { PortfolioPage } from '@pages/mypage/portfolio';
import MainPage from '@pages/main/main';
import Layout from '@components/Layout';
import { SignupPage } from '@pages/signup/signup';
import { RequireAuth } from '@hooks/useRequireAuth';
} from '@/pages/team';
import ErrorPage from '@/pages/error';
import { ProfilePage } from '@/pages/mypage/profile';
import { PortfolioPage } from '@/pages/mypage/portfolio';
import MainPage from '@/pages/main/main';
import Layout from '@/components/Layout';
import { SignupPage } from '@/pages/signup/signup';
import { RequireAuth } from '@/hooks/useRequireAuth';

const App = () => {
return (
Expand Down
23 changes: 0 additions & 23 deletions src/apis/alarm/getAlarmList.ts

This file was deleted.

23 changes: 0 additions & 23 deletions src/apis/alarm/updatePassword.ts

This file was deleted.

56 changes: 31 additions & 25 deletions src/apis/calendar.ts
Original file line number Diff line number Diff line change
@@ -1,53 +1,59 @@
import { AxiosInstance } from '@/apis/new/axios-instance';
import { CreateEventProps, UpdateEventProps } from 'src/types/calendar';
import { calendarApiUrl, calendarApiUrlWithTeamId } from './new/urls';

export const getTeamMember = async (teamId: number) => {
const response = await AxiosInstance.get(`/api/team/${teamId}/member`);
return response;
};

// 캘린더 생성
export const createCalendarEvent = async (
teamId: number,
event: CreateEventProps
) => {
const response = await AxiosInstance.post(`/api/team/${teamId}/calendar`, event);
return response;
await AxiosInstance.post(calendarApiUrlWithTeamId(teamId), event);
};

export const updateCalendarEvent = async (
eventId: number,
data: UpdateEventProps
// 팀 캘린더 조회
export const getCalendarEventList = async (
teamId: number,
month: number | null
) => {
const response = await AxiosInstance.patch(`/api/calendar/${eventId}`, data);
const response = await AxiosInstance.get(
`${calendarApiUrlWithTeamId(teamId)}?month=${month}`
);
return response;
};

export const updateEventState = async (eventId: number) => {
const response = await AxiosInstance.patch(`/api/calendar/${eventId}/state`);
// 다가오는 캘린더 조회
export const getUpcomingEvent = async (teamId: number) => {
const response = await AxiosInstance.get(
`${calendarApiUrlWithTeamId(teamId)}/coming`
);
return response;
};

export const deleteCalendarEvent = async (eventId: number) => {
const response = await AxiosInstance.delete(`/api/calendar/${eventId}`);
// 캘린더 상세 조회
export const getCalendarEventDetail = async (calendarId: number) => {
const response = await AxiosInstance.get(calendarApiUrl(calendarId));
return response;
};

export const getCalendarEventList = async (
teamId: number,
month: number | null
// 캘린더 수정
export const updateCalendarEvent = async (
calendarId: number,
data: UpdateEventProps
) => {
const response = await AxiosInstance.get(
`/api/team/${teamId}/calendar?month=${month}`
);
const response = await AxiosInstance.patch(calendarApiUrl(calendarId), data);
return response;
};

export const getCalendarEventDetail = async (calendarId: number) => {
const response = await AxiosInstance.get(`/api/calendar/${calendarId}`);
// 캘린더 상태 수정
export const updateEventState = async (calendarId: number) => {
const response = await AxiosInstance.patch(
`${calendarApiUrl(calendarId)}/state`
);
return response;
};

export const getUpcomingEvent = async (teamId: number) => {
const response = await AxiosInstance.get(`/api/team/${teamId}/calendar/coming`);
// 캘린더 삭제
export const deleteCalendarEvent = async (calendarId: number) => {
const response = await AxiosInstance.delete(calendarApiUrl(calendarId));
return response;
};
32 changes: 0 additions & 32 deletions src/apis/login/google-login.ts

This file was deleted.

25 changes: 0 additions & 25 deletions src/apis/login/kakao-login.ts

This file was deleted.

25 changes: 0 additions & 25 deletions src/apis/login/naver-login.ts

This file was deleted.

27 changes: 0 additions & 27 deletions src/apis/login/postTerms.ts

This file was deleted.

50 changes: 23 additions & 27 deletions src/apis/management.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
import { AxiosInstance } from '@/apis/new/axios-instance.ts';
import { ScheduleRequestBody, TeamData } from '../types/management.ts';

// 내 팀 조회
export const getMyTeam = async () => {
const token = localStorage.getItem('teamId');
if (!token) {
return null;
}

try {
const response = await AxiosInstance.get(`/api/member/team`);
return response.data.result.teamList;
} catch (error) {
console.error(error);
throw error;
}
};

// 팀 조회
export const getTeamData = async (teamId: number): Promise<TeamData> => {
try {
Expand All @@ -31,7 +15,9 @@ export const getTeamData = async (teamId: number): Promise<TeamData> => {
// 팀 멤버 조회 (역할태그 포함)
export const getMembers = async (teamId: number) => {
try {
const response = await AxiosInstance.get(`/api/team/${teamId}/member/detail`);
const response = await AxiosInstance.get(
`/api/team/${teamId}/member/detail`
);
return response.data.result.teamMember;
} catch (error) {
console.error(error);
Expand Down Expand Up @@ -59,11 +45,15 @@ export const updateProfile = async (
formData.append('imageFile', imageFile);
}

const response = await AxiosInstance.patch(`/api/team/${teamId}`, formData, {
headers: {
'Content-Type': 'multipart/form-data'
const response = await AxiosInstance.patch(
`/api/team/${teamId}`,
formData,
{
headers: {
'Content-Type': 'multipart/form-data'
}
}
});
);

console.log(response.data);
return response.data;
Expand All @@ -80,9 +70,12 @@ export const updateTag = async (
name: string
) => {
try {
const response = await AxiosInstance.patch(`/api/team/${teamId}/tag/${tagId}`, {
name: name
});
const response = await AxiosInstance.patch(
`/api/team/${teamId}/tag/${tagId}`,
{
name: name
}
);
console.log(response.data);
return response.data;
} catch (error) {
Expand All @@ -94,9 +87,12 @@ export const updateTag = async (
// 역할 태그 생성
export const createRoleTag = async (teamManageId: number, name: string) => {
try {
const response = await AxiosInstance.post(`/api/management/${teamManageId}/role`, {
name: name
});
const response = await AxiosInstance.post(
`/api/management/${teamManageId}/role`,
{
name: name
}
);
console.log(response.data);
return response.data;
} catch (error) {
Expand Down
Loading
Loading