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.

Sign up for GitHub

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

πŸ”€ Merge(HOTFIX/apiurl -> master): api url 포트 제거 #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

πŸ”€ Merge(HOTFIX/apiurl -> master): api url 포트 제거 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion front/src/apis/axios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import axios from "axios";

const SERVER_URL = "https://stepup-pi.com:8080/api";
const SERVER_URL = "https://stepup-pi.com/api";

export const axiosUser = axios.create({
baseURL: SERVER_URL + "/user"
Expand Down
6 changes: 3 additions & 3 deletions front/src/components/ExitModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Modal = (props: props): ReactElement => {

// νšŒμ› νƒˆν‡΄
const leaveStepup = async () => {
await axios.delete(`https://stepup-pi.com:8080/api/user?id=${id}`, {
await axios.delete(`https://stepup-pi.com/api/user?id=${id}`, {
headers: {
Authorization: `Bearer ${accessToken}`
},
Expand All @@ -42,7 +42,7 @@ const Modal = (props: props): ReactElement => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.delete(`https://stepup-pi.com:8080/api/user?id=${id}`, {
axios.delete(`https://stepup-pi.com/api/user?id=${id}`, {
headers: {
refreshToken: refreshToken
},
Expand All @@ -52,7 +52,7 @@ const Modal = (props: props): ReactElement => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.delete(`https://stepup-pi.com:8080/api/user?id=${id}`, {
axios.delete(`https://stepup-pi.com/api/user?id=${id}`, {
headers: {
Authorization: `Bearer ${accessToken}`
},
Expand Down
6 changes: 3 additions & 3 deletions front/src/components/PointHistoryModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const Modal = (props: props): ReactElement => {
const router = useRouter();

// 포인트 적립 λ‚΄μ—­ 쑰회
axios.get("https://stepup-pi.com:8080/api/rank/my/history", {
axios.get("https://stepup-pi.com/api/rank/my/history", {
headers: {
Authorization: `Bearer ${accessToken}`
},
Expand All @@ -37,7 +37,7 @@ const Modal = (props: props): ReactElement => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.get("https://stepup-pi.com:8080/api/rank/my/history", {
axios.get("https://stepup-pi.com/api/rank/my/history", {
headers: {
refreshToken: refreshToken
},
Expand All @@ -47,7 +47,7 @@ const Modal = (props: props): ReactElement => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.get("https://stepup-pi.com:8080/api/rank/my/history", {
axios.get("https://stepup-pi.com/api/rank/my/history", {
headers: {
Authorization: `Bearer ${accessToken}`
},
Expand Down
6 changes: 3 additions & 3 deletions front/src/components/UpdateRPDModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const Modal = (props: props): ReactElement => {

// λžœν”ŒλŒ„ μˆ˜μ •
const updateRPD = async () => {
await axios.put("https://stepup-pi.com:8080/api/dance/my", {
await axios.put("https://stepup-pi.com/api/dance/my", {
randomDanceId: props.randomDanceId,
title: roomTitle.current?.value,
content: roomContent.current?.value,
Expand All @@ -72,7 +72,7 @@ const Modal = (props: props): ReactElement => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.put("https://stepup-pi.com:8080/api/dance/my", {
axios.put("https://stepup-pi.com/api/dance/my", {
randomDanceId: props.randomDanceId,
title: roomTitle.current?.value,
content: roomContent.current?.value,
Expand All @@ -93,7 +93,7 @@ const Modal = (props: props): ReactElement => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.put("https://stepup-pi.com:8080/api/dance/my", {
axios.put("https://stepup-pi.com/api/dance/my", {
randomDanceId: props.randomDanceId,
title: roomTitle.current?.value,
content: roomContent.current?.value,
Expand Down
4 changes: 2 additions & 2 deletions front/src/pages/hostroom/[roomName].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ const Hostroom = () => {
useEffect(() => {
socketRef.current = io.connect(SOCKET_SERVER_URL);

axios.get('https://stepup-pi.com:8080/api/music',{
axios.get('https://stepup-pi.com/api/music',{
params:{
keyword: "",
},
Expand All @@ -178,7 +178,7 @@ const Hostroom = () => {
}
}).catch((error: any) => {
if(error.response.data.message === "만료된 토큰"){
axios.get('https://stepup-pi.com:8080/api/music',{
axios.get('https://stepup-pi.com/api/music',{
params:{
keyword: "",
},
Expand Down
54 changes: 27 additions & 27 deletions front/src/pages/mypage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const MyPage = () => {
} else {
const setup = async () => {
// 둜그인 μœ μ € 정보 쑰회
await axios.get("https://stepup-pi.com:8080/api/user", {
await axios.get("https://stepup-pi.com/api/user", {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand Down Expand Up @@ -150,7 +150,7 @@ const MyPage = () => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.get("https://stepup-pi.com:8080/api/user", {
axios.get("https://stepup-pi.com/api/user", {
headers: {
refreshToken: refreshToken,
}
Expand All @@ -160,7 +160,7 @@ const MyPage = () => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.get("https://stepup-pi.com:8080/api/user", {
axios.get("https://stepup-pi.com/api/user", {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand Down Expand Up @@ -218,7 +218,7 @@ const MyPage = () => {
})

// 둜그인 μœ μ €κ°€ μž‘μ„±ν•œ μ •λͺ¨ κ²Œμ‹œκΈ€ 쑰회
await axios.get(`https://stepup-pi.com:8080/api/board/meeting/my`, {
await axios.get(`https://stepup-pi.com/api/board/meeting/my`, {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand All @@ -229,7 +229,7 @@ const MyPage = () => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.get(`https://stepup-pi.com:8080/api/board/meeting/my`, {
axios.get(`https://stepup-pi.com/api/board/meeting/my`, {
headers: {
refreshToken: refreshToken
}
Expand All @@ -239,7 +239,7 @@ const MyPage = () => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.get(`https://stepup-pi.com:8080/api/board/meeting/my`, {
axios.get(`https://stepup-pi.com/api/board/meeting/my`, {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand All @@ -265,7 +265,7 @@ const MyPage = () => {
})

// 둜그인 μœ μ €κ°€ μž‘μ„±ν•œ μžμœ κ²Œμ‹œνŒ κ²Œμ‹œκΈ€ 쑰회
await axios.get(`https://stepup-pi.com:8080/api/board/talk/my`, {
await axios.get(`https://stepup-pi.com/api/board/talk/my`, {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand All @@ -277,7 +277,7 @@ const MyPage = () => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.get(`https://stepup-pi.com:8080/api/board/talk/my`, {
axios.get(`https://stepup-pi.com/api/board/talk/my`, {
headers: {
refreshToken: refreshToken
}
Expand All @@ -287,7 +287,7 @@ const MyPage = () => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.get(`https://stepup-pi.com:8080/api/board/talk/my`, {
axios.get(`https://stepup-pi.com/api/board/talk/my`, {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand All @@ -314,7 +314,7 @@ const MyPage = () => {
})

// 둜그인 μœ μ €μ˜ λžœν”ŒλŒ„ μ˜ˆμ•½ λͺ©λ‘ 쑰회
await axios.get("https://stepup-pi.com:8080/api/dance/my/reserve", {
await axios.get("https://stepup-pi.com/api/dance/my/reserve", {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand All @@ -325,7 +325,7 @@ const MyPage = () => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.get("https://stepup-pi.com:8080/api/dance/my/reserve", {
axios.get("https://stepup-pi.com/api/dance/my/reserve", {
headers: {
refreshToken: refreshToken
}
Expand All @@ -335,7 +335,7 @@ const MyPage = () => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.get("https://stepup-pi.com:8080/api/dance/my/reserve", {
axios.get("https://stepup-pi.com/api/dance/my/reserve", {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand All @@ -361,7 +361,7 @@ const MyPage = () => {
})

// 둜그인 μœ μ €κ°€ κ°œμ΅œν•œ λžœν”ŒλŒ„ λͺ©λ‘ 쑰회
await axios.get("https://stepup-pi.com:8080/api/dance/my/open", {
await axios.get("https://stepup-pi.com/api/dance/my/open", {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand All @@ -371,7 +371,7 @@ const MyPage = () => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.get("https://stepup-pi.com:8080/api/dance/my/open", {
axios.get("https://stepup-pi.com/api/dance/my/open", {
headers: {
refreshToken: refreshToken
}
Expand All @@ -381,7 +381,7 @@ const MyPage = () => {
setRefreshToken(data.data.data.refreshToken);
}
}).then((data) => {
axios.get("https://stepup-pi.com:8080/api/dance/my/open", {
axios.get("https://stepup-pi.com/api/dance/my/open", {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand All @@ -406,7 +406,7 @@ const MyPage = () => {
})

// 둜그인 μœ μ €κ°€ μ°Έμ—¬ν•œ λžœν”ŒλŒ„ λͺ©λ‘ 쑰회
await axios.get("https://stepup-pi.com:8080/api/dance/my/attend/", {
await axios.get("https://stepup-pi.com/api/dance/my/attend/", {
headers: {
Authorization: `Bearer ${accessToken}`
},
Expand All @@ -416,7 +416,7 @@ const MyPage = () => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.get("https://stepup-pi.com:8080/api/dance/my/attend/", {
axios.get("https://stepup-pi.com/api/dance/my/attend/", {
headers: {
refreshToken: refreshToken
},
Expand All @@ -426,7 +426,7 @@ const MyPage = () => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.get("https://stepup-pi.com:8080/api/dance/my/attend/", {
axios.get("https://stepup-pi.com/api/dance/my/attend/", {
headers: {
Authorization: `Bearer ${accessToken}`
},
Expand Down Expand Up @@ -459,7 +459,7 @@ const MyPage = () => {

// 둜그인 μœ μ €μ˜ λžœν”ŒλŒ„ μ˜ˆμ•½ μ·¨μ†Œ
const cancelRandomDance = async (selectedId: any) => {
await axios.delete(`https://stepup-pi.com:8080/api/dance/my/reserve/${selectedId.reservationId}`, {
await axios.delete(`https://stepup-pi.com/api/dance/my/reserve/${selectedId.reservationId}`, {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand All @@ -472,7 +472,7 @@ const MyPage = () => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.delete(`https://stepup-pi.com:8080/api/dance/my/reserve/${selectedId.reservationId}`, {
axios.delete(`https://stepup-pi.com/api/dance/my/reserve/${selectedId.reservationId}`, {
headers: {
refreshToken: refreshToken
}
Expand All @@ -482,7 +482,7 @@ const MyPage = () => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.delete(`https://stepup-pi.com:8080/api/dance/my/reserve/${selectedId.reservationId}`, {
axios.delete(`https://stepup-pi.com/api/dance/my/reserve/${selectedId.reservationId}`, {
headers: {
Authorization: `Bearer ${accessToken}`
}
Expand Down Expand Up @@ -512,7 +512,7 @@ const MyPage = () => {

// 둜그인 μœ μ €κ°€ κ°œμ΅œν•œ λžœν”ŒλŒ„ μ‚­μ œ
const deleteMyRandomDance = async (roomid: any) => {
await axios.delete(`https://stepup-pi.com:8080/api/dance/my/${roomid.rpdId}`, {
await axios.delete(`https://stepup-pi.com/api/dance/my/${roomid.rpdId}`, {
headers: {
Authorization: `Bearer ${accessToken}`
},
Expand All @@ -525,7 +525,7 @@ const MyPage = () => {
}
}).catch((error: any) => {
if (error.response.data.message === "만료된 토큰") {
axios.delete(`https://stepup-pi.com:8080/api/dance/my/${roomid.rpdId}`, {
axios.delete(`https://stepup-pi.com/api/dance/my/${roomid.rpdId}`, {
headers: {
refreshToken: refreshToken
},
Expand All @@ -535,7 +535,7 @@ const MyPage = () => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.delete(`https://stepup-pi.com:8080/api/dance/my/${roomid.rpdId}`, {
axios.delete(`https://stepup-pi.com/api/dance/my/${roomid.rpdId}`, {
headers: {
Authorization: `Bearer ${accessToken}`
},
Expand Down Expand Up @@ -567,7 +567,7 @@ const MyPage = () => {
const checkPw = async () => {
setCheckPassword(pwValue.current!.value);
try {
axios.post("https://stepup-pi.com:8080/api/user/checkpw", {
axios.post("https://stepup-pi.com/api/user/checkpw", {
id: id,
password: pwValue.current!.value,
}, {
Expand All @@ -583,7 +583,7 @@ const MyPage = () => {
}).catch((error: any) => {
setEqualPw(false);
if (error.response.data.message === "만료된 토큰") {
axios.post("https://stepup-pi.com:8080/api/user/checkpw", {
axios.post("https://stepup-pi.com/api/user/checkpw", {
id: id,
password: pwValue.current!.value,
}, {
Expand All @@ -596,7 +596,7 @@ const MyPage = () => {
setRefreshToken(data.data.data.refreshToken);
}
}).then(() => {
axios.post("https://stepup-pi.com:8080/api/user/checkpw", {
axios.post("https://stepup-pi.com/api/user/checkpw", {
id: id,
password: pwValue.current!.value,
}, {
Expand Down
Loading