From 5cb16a330d07a5a056d86c9576876749aa598842 Mon Sep 17 00:00:00 2001 From: Jun99uu_Lee Date: Tue, 28 Nov 2023 16:51:47 +0900 Subject: [PATCH 01/17] fix: android bug fix --- .../src/components/OtherThink/Commnet.tsx | 4 ++-- .../components/common/CustomEmailInput.tsx | 2 +- .../src/components/common/CustomTextInput.tsx | 2 +- .../src/components/common/CustomTextarea.tsx | 2 +- TERMTERM/src/components/common/Input.tsx | 2 +- TERMTERM/src/components/home/DailyTermBox.tsx | 2 +- .../components/my/Point/HistoryWrapper.tsx | 2 +- TERMTERM/src/screens/Login.tsx | 13 ++++------ TERMTERM/src/screens/ReportWord.tsx | 24 +++++++++---------- TERMTERM/src/screens/SelectFolder.tsx | 2 +- TERMTERM/src/screens/Support/First.tsx | 2 +- TERMTERM/src/screens/Webview/KakaoLogin.tsx | 2 ++ TERMTERM/src/style/designSystem.ts | 2 +- 13 files changed, 30 insertions(+), 31 deletions(-) diff --git a/TERMTERM/src/components/OtherThink/Commnet.tsx b/TERMTERM/src/components/OtherThink/Commnet.tsx index ffbbc30f..c752fb57 100644 --- a/TERMTERM/src/components/OtherThink/Commnet.tsx +++ b/TERMTERM/src/components/OtherThink/Commnet.tsx @@ -148,7 +148,7 @@ const Content = styled.Text<{ COLOR: colorTheme }>` width: 100%; ${TYPO_STYLE.Subheading[1].Regular}; color: ${(props) => props.COLOR.Text.active}; - text-align: start; + text-align: left; white-space: pre-line; line-height: 20.5%; @@ -156,7 +156,7 @@ const Content = styled.Text<{ COLOR: colorTheme }>` const Source = styled.Text<{ COLOR: colorTheme }>` ${TYPO_STYLE.Caption[2].Medium}; - text-align: start; + text-align: left; color: ${(props) => props.COLOR.Text.disabled}; margin-top: 7px; `; diff --git a/TERMTERM/src/components/common/CustomEmailInput.tsx b/TERMTERM/src/components/common/CustomEmailInput.tsx index 9609c334..8fd5ba43 100644 --- a/TERMTERM/src/components/common/CustomEmailInput.tsx +++ b/TERMTERM/src/components/common/CustomEmailInput.tsx @@ -50,7 +50,7 @@ const Input = styled.TextInput<{ COLOR: colorTheme }>` ${TYPO_STYLE.Subheading[1].Regular}; width: 100%; height: 100%; - text-align: start; + text-align: left; color: ${(props) => props.COLOR.Text.active}; margin-bottom: 2px; `; diff --git a/TERMTERM/src/components/common/CustomTextInput.tsx b/TERMTERM/src/components/common/CustomTextInput.tsx index 0741976b..bd4384b7 100644 --- a/TERMTERM/src/components/common/CustomTextInput.tsx +++ b/TERMTERM/src/components/common/CustomTextInput.tsx @@ -58,7 +58,7 @@ const InputBox = styled.View` const Input = styled.TextInput<{ COLOR: colorTheme }>` width: 100%; height: 100%; - text-align: start; + text-align: left; color: ${(props) => props.COLOR.Text.active}; margin-bottom: 2px; `; diff --git a/TERMTERM/src/components/common/CustomTextarea.tsx b/TERMTERM/src/components/common/CustomTextarea.tsx index 6e665b8f..8e277911 100644 --- a/TERMTERM/src/components/common/CustomTextarea.tsx +++ b/TERMTERM/src/components/common/CustomTextarea.tsx @@ -46,7 +46,7 @@ const Input = styled.TextInput<{ COLOR: colorTheme }>` padding: 15px 20px; outline: none; border: none; - text-align: start; + text-align: left; ${TYPO_STYLE.Subheading[1].Regular}; `; diff --git a/TERMTERM/src/components/common/Input.tsx b/TERMTERM/src/components/common/Input.tsx index 9deb32de..c6968b1f 100644 --- a/TERMTERM/src/components/common/Input.tsx +++ b/TERMTERM/src/components/common/Input.tsx @@ -73,7 +73,7 @@ const InputBox = styled.View` const Input = styled.TextInput<{ COLOR: colorTheme }>` width: 100%; height: 100%; - text-align: start; + text-align: left; color: ${(props) => props.COLOR.Text.active}; margin-bottom: 2px; `; diff --git a/TERMTERM/src/components/home/DailyTermBox.tsx b/TERMTERM/src/components/home/DailyTermBox.tsx index 2042f1c4..54ef4c79 100644 --- a/TERMTERM/src/components/home/DailyTermBox.tsx +++ b/TERMTERM/src/components/home/DailyTermBox.tsx @@ -94,7 +94,7 @@ const Content = styled.Text<{ COLOR: colorTheme }>` flex: 1; line-height: 17.5%; color: ${(props) => props.COLOR.Text.default}; - text-align: start; + text-align: left; white-space: pre-line; `; diff --git a/TERMTERM/src/components/my/Point/HistoryWrapper.tsx b/TERMTERM/src/components/my/Point/HistoryWrapper.tsx index 5af9a448..7d579373 100644 --- a/TERMTERM/src/components/my/Point/HistoryWrapper.tsx +++ b/TERMTERM/src/components/my/Point/HistoryWrapper.tsx @@ -94,7 +94,7 @@ const Container = styled.View` const TitleBox = styled.Text<{ COLOR: colorTheme }>` width: 100%; - text-align: start; + text-align: left; ${TYPO_STYLE.Body[2].Bold}; color: ${(props) => props.COLOR.Text.active}; `; diff --git a/TERMTERM/src/screens/Login.tsx b/TERMTERM/src/screens/Login.tsx index df4ec5f8..1fa91118 100644 --- a/TERMTERM/src/screens/Login.tsx +++ b/TERMTERM/src/screens/Login.tsx @@ -17,6 +17,7 @@ import { MemberInfo } from "Member"; import MemberApi from "@api/MemberApi"; import { useNavigation } from "@react-navigation/native"; import { setAccessToken, setRefreshToken } from "@utils/tokenHandler"; +import { Platform } from "react-native"; export type Props = StackScreenProps; @@ -43,8 +44,6 @@ const Login = ({ navigation, route }: Props) => { const { user, loading } = useMember(); const authApi = new AuthApi(); const memberApi = new MemberApi(); - const inquiryNavigation = - useNavigation>(); useSafeColor(); @@ -135,11 +134,9 @@ const Login = ({ navigation, route }: Props) => { type="google" onPress={() => navigation.navigate("Google")} /> - navigation.navigate("Support")} - onPress={appleOauth} - /> + {Platform.OS === "ios" && ( + + )} {`회원가입시 `} @@ -158,7 +155,7 @@ const Login = ({ navigation, route }: Props) => { - inquiryNavigation.navigate("Support")}> + navigation.navigate("Support")}> 이용하시는 데에 어려움이 있나요? diff --git a/TERMTERM/src/screens/ReportWord.tsx b/TERMTERM/src/screens/ReportWord.tsx index f5503b64..5f0ea87f 100644 --- a/TERMTERM/src/screens/ReportWord.tsx +++ b/TERMTERM/src/screens/ReportWord.tsx @@ -23,17 +23,17 @@ const ReportWord = ({ route, navigation }: Props) => { const [COLOR, mode] = useThemeStyle(); const [reasonType, setReasonType] = useState([ - {label: "저작권 침해, 명예훼손", value: "COPYRIGHT"}, - {label: "개인정보 유출", value: "PERSONAL_INFORMATION"}, - {label: "광고 및 홍보성 내용", value: "ADVERTISEMENT"}, - {label: "용어와 무관한 내용", value: "IRRELEVANT_CONTENT"}, - {label: "사기 또는 거짓 정보", value: "FRAUD"}, - {label: "잘못된 정보 포함", value: "INCORRECT_CONTENT"}, - {label: "혐오 발언 또는 상징", value: "DISGUST"}, - {label: "욕설, 비방, 선정성 등 미풍양속을 해치는 내용", value: "ABUSE"}, - {label: "스팸", value: "SPAM"}, - {label: "기타", value: "OTHER"}, - ]) + { label: "저작권 침해, 명예훼손", value: "COPYRIGHT" }, + { label: "개인정보 유출", value: "PERSONAL_INFORMATION" }, + { label: "광고 및 홍보성 내용", value: "ADVERTISEMENT" }, + { label: "용어와 무관한 내용", value: "IRRELEVANT_CONTENT" }, + { label: "사기 또는 거짓 정보", value: "FRAUD" }, + { label: "잘못된 정보 포함", value: "INCORRECT_CONTENT" }, + { label: "혐오 발언 또는 상징", value: "DISGUST" }, + { label: "욕설, 비방, 선정성 등 미풍양속을 해치는 내용", value: "ABUSE" }, + { label: "스팸", value: "SPAM" }, + { label: "기타", value: "OTHER" }, + ]); const [selectedReason, setSelectedReason] = useState(""); const [etc, setEtc] = useState(""); const [btnPosition, setBtnPosition] = useState(70); @@ -219,7 +219,7 @@ const LightTitleWrapper = styled.View` const Title = styled.Text<{ COLOR: colorTheme }>` ${TYPO_STYLE.Body[1].ExtraBold}; - text-align: start; + text-align: left; color: ${(props) => props.COLOR.Text.active}; `; diff --git a/TERMTERM/src/screens/SelectFolder.tsx b/TERMTERM/src/screens/SelectFolder.tsx index db8b5e86..35bfe805 100644 --- a/TERMTERM/src/screens/SelectFolder.tsx +++ b/TERMTERM/src/screens/SelectFolder.tsx @@ -100,7 +100,7 @@ const TitleWrapper = styled.View` `; const Title = styled.Text<{ COLOR: colorTheme }>` - text-align: start; + text-align: left; white-space: pre-line; word-break: keep-all; ${TYPO_STYLE.Body[1].ExtraBold}; diff --git a/TERMTERM/src/screens/Support/First.tsx b/TERMTERM/src/screens/Support/First.tsx index aa0b48db..e146c872 100644 --- a/TERMTERM/src/screens/Support/First.tsx +++ b/TERMTERM/src/screens/Support/First.tsx @@ -193,7 +193,7 @@ const TitleWrapper = styled.View` const Title = styled.Text<{ COLOR: colorTheme }>` ${TYPO_STYLE.Body[1].ExtraBold}; - text-align: start; + text-align: left; color: ${(props) => props.COLOR.Text.active}; `; diff --git a/TERMTERM/src/screens/Webview/KakaoLogin.tsx b/TERMTERM/src/screens/Webview/KakaoLogin.tsx index 48c4c7ed..17b360b1 100644 --- a/TERMTERM/src/screens/Webview/KakaoLogin.tsx +++ b/TERMTERM/src/screens/Webview/KakaoLogin.tsx @@ -36,6 +36,8 @@ const KakaoLogin = ({ navigation }: HomeScreenProps) => { const logInProgress = (data: any) => { const exp = "code="; + if (!data) return; + const condition = data.indexOf(exp); if (condition != -1) { diff --git a/TERMTERM/src/style/designSystem.ts b/TERMTERM/src/style/designSystem.ts index a53ab4b3..1b5ea97f 100644 --- a/TERMTERM/src/style/designSystem.ts +++ b/TERMTERM/src/style/designSystem.ts @@ -14,7 +14,7 @@ export function normalize(size: number) { if (Platform.OS === "ios") { return Math.round(PixelRatio.roundToNearestPixel(newSize)); } else { - return Math.round(PixelRatio.roundToNearestPixel(newSize)) + 2; + return Math.round(PixelRatio.roundToNearestPixel(newSize)); } } From cff2310523604313a0ea71403748e07a0ce05d4a Mon Sep 17 00:00:00 2001 From: Jun99uu_Lee Date: Tue, 28 Nov 2023 17:56:37 +0900 Subject: [PATCH 02/17] fix: android bug test --- TERMTERM/src/components/OtherThink/Commnet.tsx | 6 +++--- TERMTERM/src/components/apply/style.tsx | 4 ++-- TERMTERM/src/components/archive/default/index.tsx | 2 +- TERMTERM/src/components/cards/EmptyWordCard.tsx | 4 ++-- TERMTERM/src/components/cards/WordCard.tsx | 8 ++++++-- TERMTERM/src/components/common/Bookmark.tsx | 4 ++-- TERMTERM/src/components/common/CustomTextarea.tsx | 2 +- TERMTERM/src/components/common/Filter/index.tsx | 2 +- TERMTERM/src/components/common/TermBox/index.tsx | 2 +- TERMTERM/src/components/home/DailyTermBox.tsx | 2 +- TERMTERM/src/components/my/ProfileBox/InterestBadge.tsx | 2 +- TERMTERM/src/screens/CompleteQuiz.tsx | 2 +- 12 files changed, 22 insertions(+), 18 deletions(-) diff --git a/TERMTERM/src/components/OtherThink/Commnet.tsx b/TERMTERM/src/components/OtherThink/Commnet.tsx index c752fb57..3d767607 100644 --- a/TERMTERM/src/components/OtherThink/Commnet.tsx +++ b/TERMTERM/src/components/OtherThink/Commnet.tsx @@ -151,7 +151,7 @@ const Content = styled.Text<{ COLOR: colorTheme }>` text-align: left; white-space: pre-line; - line-height: 20.5%; + line-height: 20.5px; `; const Source = styled.Text<{ COLOR: colorTheme }>` @@ -180,7 +180,7 @@ const DefaultInfoWrapper = styled.View` const ProfileImageWrapper = styled.View` width: 22px; height: 22px; - border-radius: 100%; + border-radius: 500px; overflow: hidden; display: flex; align-items: center; @@ -220,7 +220,7 @@ const Likes = styled.Text<{ COLOR: colorTheme }>` const LikeButtonWrapper = styled.TouchableOpacity` width: 34px; height: 34px; - border-radius: 100%; + border-radius: 500px; overflow: hidden; margin-right: 7px; `; diff --git a/TERMTERM/src/components/apply/style.tsx b/TERMTERM/src/components/apply/style.tsx index 4c092546..2a644b5e 100644 --- a/TERMTERM/src/components/apply/style.tsx +++ b/TERMTERM/src/components/apply/style.tsx @@ -32,7 +32,7 @@ export const TitleWrapper = styled.View` export const Title = styled.Text<{ COLOR: colorTheme }>` ${TYPO_STYLE.Body[1].ExtraBold}; color: ${(props) => props.COLOR.Text.active}; - text-align: start; + text-align: left; `; export const TitleObjet = styled.View` @@ -46,7 +46,7 @@ export const TitleObjet = styled.View` export const Content = styled.Text<{ COLOR: colorTheme }>` ${TYPO_STYLE.Subheading[1].Regular}; - text-align: start; + text-align: left; white-space: pre-line; line-height: 20px; color: ${(props) => props.COLOR.Text.active}; diff --git a/TERMTERM/src/components/archive/default/index.tsx b/TERMTERM/src/components/archive/default/index.tsx index 3de3c404..e899443e 100644 --- a/TERMTERM/src/components/archive/default/index.tsx +++ b/TERMTERM/src/components/archive/default/index.tsx @@ -63,7 +63,7 @@ const Title = styled.Text<{ COLOR: colorTheme }>` text-align: center; white-space: pre-line; margin-top: 20px; - line-height: 37%; + line-height: 37px; `; const Subtitle = styled.Text<{ COLOR: colorTheme }>` diff --git a/TERMTERM/src/components/cards/EmptyWordCard.tsx b/TERMTERM/src/components/cards/EmptyWordCard.tsx index ac9831d3..e453e053 100644 --- a/TERMTERM/src/components/cards/EmptyWordCard.tsx +++ b/TERMTERM/src/components/cards/EmptyWordCard.tsx @@ -90,7 +90,7 @@ const Title = styled.Text<{ COLOR: colorTheme }>` ${TYPO_STYLE.Body[1].ExtraBold}; color: ${(props) => props.COLOR.Text.active}; text-align: center; - line-height: 37%; + line-height: 20px; `; const SubTitle = styled.Text<{ COLOR: colorTheme }>` @@ -107,7 +107,7 @@ const WordButton = styled.TouchableOpacity<{ COLOR: colorTheme }>` height: 45px; z-index: 2; background-color: ${(props) => props.COLOR.THEME.primary[130]}; - border-radius: 50%; + border-radius: 50px; margin-top: 30px; display: flex; flex-direction: row; diff --git a/TERMTERM/src/components/cards/WordCard.tsx b/TERMTERM/src/components/cards/WordCard.tsx index b9068d7b..c4019cba 100644 --- a/TERMTERM/src/components/cards/WordCard.tsx +++ b/TERMTERM/src/components/cards/WordCard.tsx @@ -1,7 +1,11 @@ import styled from "styled-components/native"; import { useState, useEffect } from "react"; import { TouchableOpacityProps, ImageSourcePropType } from "react-native"; -import { DARK_COLOR_STYLE, LIGHT_COLOR_STYLE, TYPO_STYLE } from "@style/designSystem"; +import { + DARK_COLOR_STYLE, + LIGHT_COLOR_STYLE, + TYPO_STYLE, +} from "@style/designSystem"; import { screenWidth } from "@style/dimensions"; interface Props extends TouchableOpacityProps { @@ -85,7 +89,7 @@ const WordButton = styled.TouchableOpacity` height: 44px; z-index: 2; background-color: #19d24d; - border-radius: 50%; + border-radius: 50px; margin-top: 30px; `; diff --git a/TERMTERM/src/components/common/Bookmark.tsx b/TERMTERM/src/components/common/Bookmark.tsx index 8d26e30b..ba762647 100644 --- a/TERMTERM/src/components/common/Bookmark.tsx +++ b/TERMTERM/src/components/common/Bookmark.tsx @@ -9,7 +9,7 @@ export const BookmarkButton = styled.TouchableOpacity` right: 10px; width: 38px; height: 38px; - border-radius: 100%; + border-radius: 500px; display: flex; align-items: center; justify-content: center; @@ -27,7 +27,7 @@ export const PreviewBookmark = styled.TouchableOpacity` export const BookmarkWrapper = styled.TouchableOpacity` width: 38px; height: 38px; - border-radius: 100%; + border-radius: 500px; display: flex; align-items: center; justify-content: center; diff --git a/TERMTERM/src/components/common/CustomTextarea.tsx b/TERMTERM/src/components/common/CustomTextarea.tsx index 8e277911..4c7a1452 100644 --- a/TERMTERM/src/components/common/CustomTextarea.tsx +++ b/TERMTERM/src/components/common/CustomTextarea.tsx @@ -16,7 +16,7 @@ const CustomTextarea = ({ value, max, ...props }: Props) => { COLOR={COLOR} multiline={true} value={value} - style={{ textAlignVertical: "top" }} + style={{ textAlignVertical: "top", textAlign: "left" }} maxLength={max} placeholderTextColor={COLOR.Text.disabled} {...props} diff --git a/TERMTERM/src/components/common/Filter/index.tsx b/TERMTERM/src/components/common/Filter/index.tsx index 21cdf82c..cbfa6268 100644 --- a/TERMTERM/src/components/common/Filter/index.tsx +++ b/TERMTERM/src/components/common/Filter/index.tsx @@ -52,7 +52,7 @@ const FilterButton = styled.TouchableOpacity` const CilrcleWrapper = styled.View<{ COLOR: colorTheme }>` width: 11px; height: 11px; - border-radius: 100%; + border-radius: 500px; background-color: ${(props) => props.COLOR.THEME.primary[130]}; display: flex; align-items: center; diff --git a/TERMTERM/src/components/common/TermBox/index.tsx b/TERMTERM/src/components/common/TermBox/index.tsx index 2e1d7f5f..024d797d 100644 --- a/TERMTERM/src/components/common/TermBox/index.tsx +++ b/TERMTERM/src/components/common/TermBox/index.tsx @@ -98,7 +98,7 @@ const BookmarkButton = styled.TouchableOpacity<{ mode: boolean }>` align-items: center; justify-content: center; background-color: ${(props) => (props.mode ? "#e2e2e261" : "#0000003b")}; - border-radius: 100%; + border-radius: 500px; `; const ResultTitle = styled.Text<{ COLOR: colorTheme }>` diff --git a/TERMTERM/src/components/home/DailyTermBox.tsx b/TERMTERM/src/components/home/DailyTermBox.tsx index 54ef4c79..6c3c292b 100644 --- a/TERMTERM/src/components/home/DailyTermBox.tsx +++ b/TERMTERM/src/components/home/DailyTermBox.tsx @@ -92,7 +92,7 @@ const Content = styled.Text<{ COLOR: colorTheme }>` ${TYPO_STYLE.Caption[1].Regular}; //TODO : line-height 수정 flex: 1; - line-height: 17.5%; + line-height: 17.5px; color: ${(props) => props.COLOR.Text.default}; text-align: left; white-space: pre-line; diff --git a/TERMTERM/src/components/my/ProfileBox/InterestBadge.tsx b/TERMTERM/src/components/my/ProfileBox/InterestBadge.tsx index 4783a5eb..46b228d7 100644 --- a/TERMTERM/src/components/my/ProfileBox/InterestBadge.tsx +++ b/TERMTERM/src/components/my/ProfileBox/InterestBadge.tsx @@ -56,7 +56,7 @@ const InterestBadge = ({ interest, ...props }: Props) => { const Badge = styled.View<{ bg: string }>` height: 20px; padding: 1px 13px; - border-radius: 100px; + border-radius: 1000px; display: flex; align-items: center; justify-content: center; diff --git a/TERMTERM/src/screens/CompleteQuiz.tsx b/TERMTERM/src/screens/CompleteQuiz.tsx index 71589971..d2cd7809 100644 --- a/TERMTERM/src/screens/CompleteQuiz.tsx +++ b/TERMTERM/src/screens/CompleteQuiz.tsx @@ -240,7 +240,7 @@ const CompleteButton = styled.TouchableOpacity<{ z-index: 2; background-color: ${(props) => props.mode ? props.COLOR.Neutral[100] : props.COLOR.Background.onSurface}; - border-radius: 50%; + border-radius: 50px; margin-top: 40px; `; From d63ec0ebb8b667b1d483b791c67852f9a898f4e4 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:02:29 +0900 Subject: [PATCH 03/17] refactor : member api v2 migration --- TERMTERM/src/api/MemberApi.ts | 22 +++++++++++----------- TERMTERM/src/hooks/useProfile.tsx | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/TERMTERM/src/api/MemberApi.ts b/TERMTERM/src/api/MemberApi.ts index 283631e7..40343607 100644 --- a/TERMTERM/src/api/MemberApi.ts +++ b/TERMTERM/src/api/MemberApi.ts @@ -4,19 +4,19 @@ import { get, put, remove } from "./AxiosCreate"; class MemberApi { /** 사용자 정보 받아오기 */ getInfo = async (): Promise => { - const data = await get(`/v1/member/info`); + const data = await get(`/v2/s/member/info`); return data; }; /** 사용자 기본 정보 수정하기 */ putInfo = async (modifyInfo: ModifiedMemberInfo): Promise => { - const data = await put(`/v1/member/info`, modifyInfo); + const data = await put(`/v2/s/member/info`, modifyInfo); return data; }; /** 사용자 관심사 수정하기 */ putCategory = async (categories: string[]): Promise => { - const data = await put(`/v1/member/info/category`, { + const data = await put(`/v2/s/member/info/category`, { categories: categories, }); return data; @@ -24,7 +24,7 @@ class MemberApi { /** 사용자 닉네임 중복 검사하기 */ nicknameDoubleCheck = async (nickname: string): Promise => { - const data = await get(`/v1/member/nickname/check`, { + const data = await get(`/v2/s/member/nickname/check`, { params: { nickname: nickname, }, @@ -34,35 +34,35 @@ class MemberApi { /** 프로필 이미지 받아오기 */ getProfileImage = async (): Promise => { - const data = await get(`/v1/member/info/profile-image`); + const data = await get(`/v2/s/member/info/profile-image`); return data; }; /** 프로필 이미지 제거하기 */ removeProfileImage = async (): Promise => { - const data = await remove(`/v1/member/info/profile-image`); + const data = await remove(`/v2/s/member/info/profile-image`); return data; }; /** S3로 이미지 업데이트할 수 있는 URL 발급. * 발급 이후 하단의 syncPresignedUrl로 API 요청을 보내야함 */ - getPresignedUrl = async (): Promise => { - const data = await get( - `/v1/member/info/profile-image/presigned-url` + putPresignedUrl = async (): Promise => { + const data = await put( + `/v2/s/member/info/profile-image/presigned-url` ); return data; }; /** presigned url로 이미지 업데이트 후, 여기로 동기화 */ syncPresignedUrl = async (): Promise => { - const data = await get(`/v1/member/info/profile-image/sync`); + const data = await get(`/v2/s/member/info/profile-image/sync`); return data; }; /** 회원 탈퇴 */ withdraw = async (): Promise => { - const data = await get(`/v1/member/withdraw`); + const data = await get(`/v2/s/member/withdraw`); return data; }; } diff --git a/TERMTERM/src/hooks/useProfile.tsx b/TERMTERM/src/hooks/useProfile.tsx index 26b7e2cd..3fa8b159 100644 --- a/TERMTERM/src/hooks/useProfile.tsx +++ b/TERMTERM/src/hooks/useProfile.tsx @@ -147,7 +147,7 @@ export const useProfile = () => { /** 프로필 이미지 수정 */ const editProfileImage = async (input: MemberInfo): Promise => { try { - const updateS3url = await memberApi.getPresignedUrl(); + const updateS3url = await memberApi.putPresignedUrl(); const blob = await fetchBlob(input.profileImage); await uploadToS3(updateS3url, blob); await memberApi.syncPresignedUrl(); From 3e6c6eb1250d61be4ef000b3e384e9e6f4ccfbd6 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:29:29 +0900 Subject: [PATCH 04/17] =?UTF-8?q?chore:=20bookmarked=20type=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/@types/Folder.d.ts | 2 +- TERMTERM/src/interfaces/word.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TERMTERM/@types/Folder.d.ts b/TERMTERM/@types/Folder.d.ts index 358f87b9..c926ee1c 100644 --- a/TERMTERM/@types/Folder.d.ts +++ b/TERMTERM/@types/Folder.d.ts @@ -1,6 +1,6 @@ declare module "Folder" { export type FolderDetail = { - bookmarked: "YES" | null; + bookmarked: "YES" | "NO"; categories: string[]; comments: FolderTermComment[]; description: string; diff --git a/TERMTERM/src/interfaces/word.ts b/TERMTERM/src/interfaces/word.ts index 9e8f1f73..d7399d39 100644 --- a/TERMTERM/src/interfaces/word.ts +++ b/TERMTERM/src/interfaces/word.ts @@ -8,7 +8,7 @@ interface WordProps { source: string; categories?: Array; comments?: Array; - bookmarked?: "YES" | null; + bookmarked?: "YES" | "NO"; } interface Category { From 693d3e3e56052085a2c6ace2ee7126a18d89adb4 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:29:48 +0900 Subject: [PATCH 05/17] =?UTF-8?q?refactor=20:=20auth=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/AuthApi.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TERMTERM/src/api/AuthApi.ts b/TERMTERM/src/api/AuthApi.ts index 9d1b0ccf..d35cf793 100644 --- a/TERMTERM/src/api/AuthApi.ts +++ b/TERMTERM/src/api/AuthApi.ts @@ -10,7 +10,7 @@ class AuthApi { ): Promise => { const data = await axios({ method: "post", - url: `${BASE_URL}/v1/auth/${oauth}`, + url: `${BASE_URL}/v2/auth/${oauth}`, headers: { "auth-code": code, }, @@ -26,7 +26,7 @@ class AuthApi { ): Promise => { const data = await axios({ method: "post", - url: `${BASE_URL}/v1/apple-callback`, + url: `${BASE_URL}/v2/apple-callback`, params: { code: code, id_token: token, From 0dfddfe6b3cde544bad21b67a720f234aa922c03 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:30:09 +0900 Subject: [PATCH 06/17] =?UTF-8?q?refactor=20:=20refresh=20token=20api=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20v2=20=EC=9D=B4=EA=B4=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/utils/tokenHandler.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TERMTERM/src/utils/tokenHandler.tsx b/TERMTERM/src/utils/tokenHandler.tsx index b4462022..2a7fed6f 100644 --- a/TERMTERM/src/utils/tokenHandler.tsx +++ b/TERMTERM/src/utils/tokenHandler.tsx @@ -43,7 +43,7 @@ export const updateRefreshToken = async () => { const data: any = await axios({ method: "post", - url: `${BASE_URL}/v1/auth/token/refresh`, + url: `${BASE_URL}/v2/auth/token/refresh`, data: { access_token: access, refresh_token: refresh, From 51b60a4c0175a6d2662f6b08377dfd0d2c42a5ee Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:30:19 +0900 Subject: [PATCH 07/17] =?UTF-8?q?refactor=20:=20quiz=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/QuizApi.ts | 8 ++++---- TERMTERM/src/screens/DailyQuiz.tsx | 2 +- TERMTERM/src/screens/ReviewQuiz.tsx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TERMTERM/src/api/QuizApi.ts b/TERMTERM/src/api/QuizApi.ts index e59378a1..dc933890 100644 --- a/TERMTERM/src/api/QuizApi.ts +++ b/TERMTERM/src/api/QuizApi.ts @@ -5,13 +5,13 @@ import { post, get } from "./AxiosCreate"; class QuizApi { /** 데일리 퀴즈 */ getDailyQuiz = async (): Promise => { - const data = await get(`/v1/quiz/daily`); + const data = await get(`/v2/s/quiz/daily`); return data; }; /** 용어 퀴즈 리뷰 */ getFinalQuizReview = async (): Promise => { - const data = await get(`/v1/quiz/final-quiz-review`); + const data = await get(`/v2/s/quiz/final-quiz-review`); return data; }; @@ -23,13 +23,13 @@ class QuizApi { /** 용어 복습 퀴즈 */ getReviewQuiz = async (): Promise => { - const data = await get(`/v1/quiz/review`); + const data = await get(`/v2/s/quiz/review`); return data; }; /** 데일리 퀴즈 응시 여부 - 홈 화면 */ getDailyQuizStatus = async (): Promise => { - const data = await get(`/v1/quiz/status`); + const data = await get(`/v2/s/quiz/status`); return data; }; } diff --git a/TERMTERM/src/screens/DailyQuiz.tsx b/TERMTERM/src/screens/DailyQuiz.tsx index 3af75e7a..cce50dc5 100644 --- a/TERMTERM/src/screens/DailyQuiz.tsx +++ b/TERMTERM/src/screens/DailyQuiz.tsx @@ -33,7 +33,7 @@ const DailyQuiz = ({ navigation }: Props) => { setBorderColor(COLOR.THEME.secondary[120]); setCurr((prev) => ({ ...prev, currIdx: prev.currIdx + 1 })); const isFinalQuestion = curr.currIdx === 4; - let apiUrl = `/v1/quiz/result`; + let apiUrl = `/v2/s/quiz/result`; const memberQuizSelect: QuizSubmit = { quizType: "DAILY", diff --git a/TERMTERM/src/screens/ReviewQuiz.tsx b/TERMTERM/src/screens/ReviewQuiz.tsx index 0e8a7bc0..95f993c6 100644 --- a/TERMTERM/src/screens/ReviewQuiz.tsx +++ b/TERMTERM/src/screens/ReviewQuiz.tsx @@ -33,7 +33,7 @@ const ReviewQuiz = ({ navigation }: Props) => { setBorderColor(COLOR.THEME.secondary[120]); setCurr((prev) => ({ ...prev, currReviewIdx: prev.currReviewIdx + 1 })); const isFinalQuestion = curr.currReviewIdx + 1 === curr.totalReviewIdx; - let apiUrl = `/v1/quiz/result`; + let apiUrl = `/v2/s/quiz/result`; const memberQuizSelect: QuizSubmit = { quizType: "REVIEW", From 99f3ce11c10c834c9152a459ad2d43afb32cd0a6 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:30:28 +0900 Subject: [PATCH 08/17] =?UTF-8?q?refactor=20:=20comment=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/CommentApi.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TERMTERM/src/api/CommentApi.ts b/TERMTERM/src/api/CommentApi.ts index b8af970a..1240b75d 100644 --- a/TERMTERM/src/api/CommentApi.ts +++ b/TERMTERM/src/api/CommentApi.ts @@ -4,37 +4,37 @@ import { post, put } from "./AxiosCreate"; class CommentApi { /**나만의 용어 신청 작성 후 등록 */ registerComment = async (comment: CommentInput): Promise => { - const data = await post(`/v1/comment`, comment); + const data = await post(`/v2/s/comment`, comment); return data; }; /** (관리자) 나만의 용어 신청 승인 */ acceptComment = async (id: number): Promise => { - const data = await put(`/v1/comment/accept/${id}`); + const data = await put(`/v2/s/comment/accept/${id}`); return data; }; /** 코멘트 좋아요 취소 */ dislikeComment = async (id: number): Promise => { - const data = await put(`/v1/comment/dislike/${id}`); + const data = await put(`/v2/s/comment/dislike/${id}`); return data; }; /** 코멘트 좋아요 */ likeComment = async (id: number): Promise => { - const data = await put(`/v1/comment/like/${id}`); + const data = await put(`/v2/s/comment/like/${id}`); return data; }; /** 코멘트 신고하기 */ reportComment = async (report: Report): Promise => { - const data = await post(`/v1/comment/report`, report); + const data = await post(`/v2/s/comment/report`, report); return data; }; /** 코멘트 신고 승인 */ acceptReport = async (id: number): Promise => { - const data = await put(`/v1/comment/report/completed/${id}`); + const data = await put(`/v2/s/comment/report/completed/${id}`); return data; }; } From f52f6debc1ce02151ca650179c2b08984fe59295 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:30:39 +0900 Subject: [PATCH 09/17] =?UTF-8?q?refactor=20:=20curation=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/CurationApi.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TERMTERM/src/api/CurationApi.ts b/TERMTERM/src/api/CurationApi.ts index a02fb7d9..4a096295 100644 --- a/TERMTERM/src/api/CurationApi.ts +++ b/TERMTERM/src/api/CurationApi.ts @@ -10,19 +10,19 @@ import { get, post, put } from "./AxiosCreate"; class CurationApi { /** 아카이브한 큐레이션 리스트 */ getArchivedCuration = async (): Promise => { - const data = await get(`/v1/curation/archived`); + const data = await get(`/v2/s/curation/archived`); return data; }; /** 특정 큐레이션 북마크하기 */ curationBookmark = async (id: number): Promise => { - const data = await put(`/v1/curation/bookmark/${id}`); + const data = await put(`/v2/s/curation/bookmark/${id}`); return data; }; /** 특정 큐레이션의 상세 정보 */ getCurationDetail = async (id: number): Promise => { - const data = await get(`/v1/curation/detail/${id}`); + const data = await get(`/v2/s/curation/detail/${id}`); return data; }; @@ -30,7 +30,7 @@ class CurationApi { getCurationListByCategory = async ( category: Category ): Promise => { - const data = await get(`/v1/curation/list`, { + const data = await get(`/v2/s/curation/list`, { params: { category: category, }, @@ -40,13 +40,13 @@ class CurationApi { /** 큐레이션 등록 */ registerCuration = async (content: CreateCuration): Promise => { - const data = await post(`/v1/curation/register`, content); + const data = await post(`/v2/admin/curation/register`, content); return data; }; /** 큐레이션 북마크 소 */ cancelBookmarkCuration = async (id: number): Promise => { - const data = await put(`/v1/curation/unbookmark/${id}`); + const data = await put(`/v2/s/curation/unbookmark/${id}`); return data; }; } From f4f3169da93562769c1a08dd15d12e517692bb45 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:30:47 +0900 Subject: [PATCH 10/17] =?UTF-8?q?refactor=20:=20folder=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/FolderApi.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/TERMTERM/src/api/FolderApi.ts b/TERMTERM/src/api/FolderApi.ts index c4a89845..9b61f457 100644 --- a/TERMTERM/src/api/FolderApi.ts +++ b/TERMTERM/src/api/FolderApi.ts @@ -15,43 +15,43 @@ import { get, post, put, remove } from "./AxiosCreate"; class FolderApi { /** 폴더 삭제 */ removeFolder = async (id: number): Promise => { - const data = await remove(`/v1/folder/${id}`); + const data = await remove(`/v2/s/folder/${id}`); return data; }; /** 폴더 상세 페이지_하나씩 보기 */ getEachFolderDetail = async (id: number): Promise => { - const data = await get(`/v1/folder/detail/each/${id}`); + const data = await get(`/v2/s/folder/detail/each/${id}`); return data; }; /** 폴더 상세 페이지_모아서 보기 */ getSumFolderDetail = async (id: number): Promise => { - const data = await get(`/v1/folder/detail/sum/${id}`); + const data = await get(`/v2/s/folder/detail/sum/${id}`); return data; }; /** 폴더 정보 수정 */ putFolderInfo = async (folderInfo: EditFolder): Promise => { - const data = await put(`/v1/folder/info`, folderInfo); + const data = await put(`/v2/s/folder/info`, folderInfo); return data; }; /** 내 폴더 리스트 */ getMyFolderList = async (): Promise => { - const data = await get(`/v1/folder/list`); + const data = await get(`/v2/s/folder/list`); return data; }; /** 폴더 생성 */ registerFolder = async (folderInfo: CreateFolder): Promise => { - const data = await post(`/v1/folder/new`, folderInfo); + const data = await post(`/v2/s/folder/new`, folderInfo); return data; }; /** 폴더 관련 정보 모달 */ getFolderModal = async (): Promise => { - const data = await get(`/v1/folder/related-info`); + const data = await get(`/v2/s/folder/related-info`); return data; }; @@ -60,7 +60,7 @@ class FolderApi { folderIds: number[], termId: number ): Promise => { - const data = await post(`/v1/folder/term`, { folderIds, termId }); + const data = await post(`/v2/s/folder/term`, { folderIds, termId }); return data; }; @@ -68,7 +68,7 @@ class FolderApi { removeTermInFolder = async ( cancelArchiveInfo: CancelArchive ): Promise => { - const data = await remove(`/v1/folder/term`, { + const data = await remove(`/v2/s/folder/term`, { data: cancelArchiveInfo, }); return data; @@ -76,7 +76,7 @@ class FolderApi { /** 홈 화면 - 아카이빙 한 단어들 중 10개를 랜덤으로 뽑아 리턴 */ getRandomArchiveTerms = async (): Promise => { - const data = await get(`/v1/folder/term/random-10`); + const data = await get(`/v2/s/folder/term/random-10`); return data; }; @@ -86,7 +86,7 @@ class FolderApi { termId: number ): Promise => { const data = await get( - `/v1/folder/${folderId}/including/${termId}` + `/v2/s/folder/${folderId}/including/${termId}` ); return data; }; From a0b9b074a8ad66cd2c7199e62af7fed7ee75d5ad Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:30:59 +0900 Subject: [PATCH 11/17] =?UTF-8?q?refactor=20:=20home=20title=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/HomeApi.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TERMTERM/src/api/HomeApi.ts b/TERMTERM/src/api/HomeApi.ts index 781db40a..85ef70da 100644 --- a/TERMTERM/src/api/HomeApi.ts +++ b/TERMTERM/src/api/HomeApi.ts @@ -4,25 +4,25 @@ import { get, post, remove } from "./AxiosCreate"; class HomeApi { /** 서브타이틀 리스트 */ getSubTitleList = async (): Promise => { - const data = await get(`/v1/home/subtitle`); + const data = await get(`/v2/home/subtitle`); return data; }; /** 서브타이틀 등록 (관리자용) */ registerSubTitle = async (): Promise => { - const data = await post(`/v1/home/subtitle`); + const data = await post(`/v2/home/subtitle`); return data; }; /** 서브타이틀 삭제 (관리자용) */ removeSubTitle = async (): Promise => { - const data = await remove(`/v1/home/subtitle`); + const data = await remove(`/v2/home/subtitle`); return data; }; /** 홈 화면 상단 UX Writing */ getUxWriting = async (): Promise => { - const data = await get(`/v1/home/title`); + const data = await get(`/v2/s/home/title`); return data; }; } From 0b06aaeb3abdab1ad67a5014cf58fc5d9af1cf17 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:31:15 +0900 Subject: [PATCH 12/17] =?UTF-8?q?refactor=20:=20inquery=20admin=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/InquiryApi.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TERMTERM/src/api/InquiryApi.ts b/TERMTERM/src/api/InquiryApi.ts index ca128e49..61c4d323 100644 --- a/TERMTERM/src/api/InquiryApi.ts +++ b/TERMTERM/src/api/InquiryApi.ts @@ -4,19 +4,19 @@ import { post, put } from "./AxiosCreate"; class InquiryApi { /** 문의사항 접수 */ postInquiry = async (inquiry: InquiryContent): Promise => { - const data = await post(`/v1/inquiry`, inquiry); + const data = await post(`/v2/inquiry`, inquiry); return data; }; /** 문의사항 답변 완료 */ completeInquiry = async (id: number): Promise => { - const data = await put(`/v1/inquiry/to-completed/${id}`); + const data = await put(`/v2/inquiry/to-completed/${id}`); return data; }; /** 문의사항 대기 중 */ waitingInquiry = async (id: number): Promise => { - const data = await put(`/v1/inquiry/to-waiting/${id}`); + const data = await put(`/v2/inquiry/to-waiting/${id}`); return data; }; } From 732d7f1006f5747a220ebc7ba37c0bb74031af6a Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:31:24 +0900 Subject: [PATCH 13/17] =?UTF-8?q?refactor=20:=20member=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/MemberApi.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TERMTERM/src/api/MemberApi.ts b/TERMTERM/src/api/MemberApi.ts index 40343607..3e6cedb4 100644 --- a/TERMTERM/src/api/MemberApi.ts +++ b/TERMTERM/src/api/MemberApi.ts @@ -24,7 +24,7 @@ class MemberApi { /** 사용자 닉네임 중복 검사하기 */ nicknameDoubleCheck = async (nickname: string): Promise => { - const data = await get(`/v2/s/member/nickname/check`, { + const data = await get(`/v2/member/nickname/check`, { params: { nickname: nickname, }, @@ -62,7 +62,7 @@ class MemberApi { /** 회원 탈퇴 */ withdraw = async (): Promise => { - const data = await get(`/v2/s/member/withdraw`); + const data = await put(`/v2/s/member/withdraw`); return data; }; } From 5f32f0ac9f9ab715a31fdd2b0a3f9d3f3e750840 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:31:34 +0900 Subject: [PATCH 14/17] =?UTF-8?q?refactor=20:=20term=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/TermApi.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TERMTERM/src/api/TermApi.ts b/TERMTERM/src/api/TermApi.ts index 4053f916..39c8d9d6 100644 --- a/TERMTERM/src/api/TermApi.ts +++ b/TERMTERM/src/api/TermApi.ts @@ -11,19 +11,19 @@ import { AxiosRequestConfig } from "axios"; class TermApi { /** 용어 북마크 (임시)*/ bookmarkTerm = async (id: number): Promise => { - const data = await post(`/v1/term/bookmark/${id}`); + const data = await post(`/v2/s/term/bookmark/${id}`); return data; }; /** 오늘의 용어*/ dailyTerm = async (): Promise => { - const data = await get(`/v1/term/daily`); + const data = await get(`/v2/s/term/daily`); return data; }; /** 용어 상세 */ termDetail = async (id: number): Promise => { - const data = await get(`/v1/term/detail/${id}`); + const data = await get(`/v2/s/term/detail/${id}`); return data; }; @@ -32,13 +32,13 @@ class TermApi { categories: TermConfig, config?: AxiosRequestConfig ): Promise => { - const data = await post(`/v1/term/list`, categories, config); + const data = await post(`/v2/s/term/list`, categories, config); return data; }; /** 용어 검색 */ searchTerm = async (token: string): Promise => { - const data = await get(`/v1/term/search/${token}`); + const data = await get(`/v2/s/term/search/${token}`); return data; }; } From d23f4b986473640a423c82b3bb545841bde4db13 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Thu, 28 Mar 2024 16:31:41 +0900 Subject: [PATCH 15/17] =?UTF-8?q?refactor=20:=20point=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20v2=20=EC=9D=B4=EA=B4=80/=EB=B3=B4=EC=95=88=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/api/PointApi.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TERMTERM/src/api/PointApi.ts b/TERMTERM/src/api/PointApi.ts index ae70bd06..c8909f37 100644 --- a/TERMTERM/src/api/PointApi.ts +++ b/TERMTERM/src/api/PointApi.ts @@ -4,26 +4,26 @@ import { PointHistory } from "Point"; class PointApi { /** 현재 포인트 가져오기 */ getCurPoint = async (): Promise => { - const data = await get("/v1/point/current"); + const data = await get("/v2/s/point/current"); return data; }; /** (페이지네이션) 포인트 히스토리 조회 */ getPointHistory = async (curPage: number): Promise => { const data = await get( - `/v1/point/history?page=${curPage}&size=5` + `/v2/s/point/history?page=${curPage}&size=5` ); return data; }; /** 큐레이션 구매 */ buyCuration = async (id: number) => { - await put(`/v1/point/pay/curation/${id}`); + await put(`/v2/s/point/pay/curation/${id}`); }; /** 폴더 한도 1개 추가 (폴더 구매) */ buyFolder = async () => { - await put(`/v1/point/pay/folder`); + await put(`/v2/s/point/pay/folder`); }; } From dd5363e756ec2015360bf4a420599f4622c62693 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Fri, 3 May 2024 12:16:57 +0900 Subject: [PATCH 16/17] =?UTF-8?q?chore=20:=20Google=20Redirect=20URL=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/screens/Webview/GoogleLogin.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TERMTERM/src/screens/Webview/GoogleLogin.tsx b/TERMTERM/src/screens/Webview/GoogleLogin.tsx index 2a14454f..88778db3 100644 --- a/TERMTERM/src/screens/Webview/GoogleLogin.tsx +++ b/TERMTERM/src/screens/Webview/GoogleLogin.tsx @@ -64,7 +64,7 @@ const GoogleLogin = ({ navigation }: HomeScreenProps) => { scalesPageToFit={false} style={{ marginTop: 30 }} source={{ - uri: `https://accounts.google.com/o/oauth2/v2/auth/oauthchooseaccount?scope=profile%20email%20openid&access_type=offline&include_granted_scopes=true&response_type=code&state=state_parameter_passthrough_value&redirect_uri=https%3A%2F%2Fapi.termterm.site%2Fv1%2Fsocial-auth&client_id=413663542158-o4k411e714pjhibpb2nbmpa54o6vucuf.apps.googleusercontent.com&service=lso&o2v=2&flowName=GeneralOAuthFlow`, + uri: `https://accounts.google.com/o/oauth2/v2/auth/oauthchooseaccount?scope=profile%20email%20openid&access_type=offline&include_granted_scopes=true&response_type=code&state=state_parameter_passthrough_value&redirect_uri=https%3A%2F%2Fapi2.termterm.site%2Fv2%2Fsocial-auth&client_id=413663542158-o4k411e714pjhibpb2nbmpa54o6vucuf.apps.googleusercontent.com&service=lso&o2v=2&flowName=GeneralOAuthFlow`, }} injectedJavaScript={runFirst} javaScriptEnabled={true} From c00d0e6ebcf7ce7b3701f269ca3de8416fde79f4 Mon Sep 17 00:00:00 2001 From: Jun99uu_Lee Date: Fri, 3 May 2024 23:42:57 +0900 Subject: [PATCH 17/17] fix: home carousel --- TERMTERM/src/screens/Toolbar/Home.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TERMTERM/src/screens/Toolbar/Home.tsx b/TERMTERM/src/screens/Toolbar/Home.tsx index 42f3a2c2..14a5306c 100644 --- a/TERMTERM/src/screens/Toolbar/Home.tsx +++ b/TERMTERM/src/screens/Toolbar/Home.tsx @@ -103,7 +103,7 @@ const Home = ({ navigation, route }: Props) => { > - {archivedWords ? ( + {archivedWords && archivedWords.length ? ( ) : (