Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/main/front/src/pages/GoogleCallback.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ const GoogleOAuthCallback: React.FC = () => {
console.log("✅ 디코딩된 유저 정보:", decoded);

if (decoded.studentId) {
setOutput(`학생 인증됨! ${decoded.email} → club/callein 이동`);
navigate("/club/callein");
setOutput(`학생 인증됨! ${decoded.email} → club 이동`);
navigate("/club");
} else {
setOutput(`로그인 성공! ${decoded.email} 님 환영합니다.`);
navigate("/register");
Expand Down
2 changes: 1 addition & 1 deletion src/main/front/src/pages/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const LandingPage: React.FC = () => {

const handleButtonClick = () => {
if (jwtToken) {
navigate("/club/callein"); // 로그인된 경우 클럽 페이지로 이동
navigate("/club"); // 로그인된 경우 클럽 페이지로 이동
} else {
initiateGoogleLogin(); // 로그인 안 된 경우 구글 로그인 시작
}
Expand Down
7 changes: 4 additions & 3 deletions src/main/front/src/pages/ProfileRegistrationPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ const ProfileRegistrationPage: React.FC = () => {
return;
}


if (!jwtToken) {
alert("로그인이 필요합니다.");
return;
Expand Down Expand Up @@ -150,7 +149,7 @@ const ProfileRegistrationPage: React.FC = () => {
});

alert("프로필이 성공적으로 등록되었습니다.");
navigate("/club/callein");
navigate("/club");
} catch (err: any) {
alert("프로필 등록에 실패했습니다: " + (err.message || "서버 오류"));
console.error(err);
Expand Down Expand Up @@ -185,7 +184,9 @@ const ProfileRegistrationPage: React.FC = () => {
userId={userData?.userId || ""}
photoURL={myData?.profileImage}
size={80}
onUploaded={() => {void refetch();}}
onUploaded={() => {
void refetch();
}}
/>
<Typography variant="h6" fontWeight="bold">
프로필 등록
Expand Down