Merge pull request #33 from MomHelpMe/front/fix/matching-page-css

Front/fix/matching page css
MomHelpMe · Sep 2, 2024 · 34d97e2 · 34d97e2
2 parents 0a97442 + 6db20f7
commit 34d97e2
Show file tree

Hide file tree

Showing 5 changed files with 214 additions and 92 deletions.
diff --git a/frontend/src/components/Edit-Profile.js b/frontend/src/components/Edit-Profile.js
@@ -79,7 +79,10 @@ export class EditProfile extends Component {
 			this.state.img_url = data.img_url;
 			this.state.is_2FA = data.is_2FA;
 		})
-		.catch(error => console.error('Fetch error:', error));
+		.catch(error => {
+			console.error('Fetch error:', error);
+			changeUrl("/");
+		});
 		return { nickname: this.nickname, img_url: this.img_url, is_2FA: this.is_2FA };
 	}
 
@@ -182,7 +185,10 @@ export class EditProfile extends Component {
 				if (response.ok) changeUrl(`/`);
 				else throw new Error('Network response was not ok');
 			})
-			.catch(error => console.error('Fetch error:', error));
+			.catch(error => {
+				console.error('Fetch error:', error);
+				changeUrl("/");
+			});
 		});
 
 		this.addEvent('click', '#profileChange', async (event) => {
@@ -217,7 +223,8 @@ export class EditProfile extends Component {
 				changeUrl(`/main/profile/${this.props.uid}/edit`);
 			})
 			.catch(error => {
-				console.error('Error updating profile:', error);
+				console.error('Fetch error:', error);
+				changeUrl("/");
 			});
 		});
 	}

diff --git a/frontend/src/components/Friends-List.js b/frontend/src/components/Friends-List.js
@@ -92,7 +92,8 @@ export class FriendsList extends Component {
 				{ className: "fList", ids: friendIdList, contents: friendNicknameList }));
 		})
 		.catch(error => {
-			console.error('Fetch operation failed:', error);
+			console.error('Fetch error:', error);
+			changeUrl("/");
 		});
 	}
 
@@ -177,7 +178,10 @@ export class FriendsList extends Component {
 					}
 					changeUrl(window.location.pathname);
 				})
-				.catch(error => console.error('Error:', error));
+				.catch(error => {
+					console.error('Fetch error:', error);
+					changeUrl("/");
+				});
 			}
 		}
 
@@ -224,7 +228,10 @@ export class FriendsList extends Component {
 					searchResults.appendChild(div);
 				});
 			})
-			.catch(error => console.error('Error:', error));
+			.catch(error => {
+				console.error('Fetch error:', error);
+				changeUrl("/");
+			});
 		})
 
 		this.addEvent('click', '#searchResults', (event) => {
@@ -255,7 +262,10 @@ export class FriendsList extends Component {
 				}
 				changeUrl(window.location.pathname);
 			})
-			.catch(error => console.error('Error:', error));
+			.catch(error => {
+				console.error('Fetch error:', error);
+				changeUrl("/");
+			});
 		});
 	}
 }
diff --git a/frontend/src/components/Main-Menu.js b/frontend/src/components/Main-Menu.js
@@ -77,8 +77,14 @@ export class Menu extends Component {
 				})
 			})
 			.then(response => {
-				if (!response.ok) changeUrl("/");
+				if (!response.ok) {
+					throw new Error('Network response was not ok');
+				}
 			})
+			.catch(error => {
+				console.error('Fetch error:', error);
+				changeUrl("/");
+			});
 			changeUrl("/main");
 		}
 
@@ -112,7 +118,10 @@ export class Menu extends Component {
 				if (response.ok) changeUrl(`/`);
 				else throw new Error('Network response was not ok');
 			})
-			.catch(error => console.error('Fetch error:', error));
+			.catch(error => {
+				console.error('Fetch error:', error);
+				changeUrl("/");
+			});
 		});
 	}
 }
diff --git a/frontend/src/components/Profile-Info.js b/frontend/src/components/Profile-Info.js
@@ -41,26 +41,31 @@ export class ProfileInfo extends Component {
 		this.user = {win: null, lose: null, img_url: null, nickname: null, uid: null};
 		this.rate = null;
 		this.games = null;
-		fetch(`https://localhost:443/api/user/${this.props.uid}`, {
-			method: 'GET',
-			credentials: 'include', // 쿠키를 포함하여 요청 (사용자 인증 필요 시)
-		})
-		.then(response => {
-			if (!response.ok) {
-				throw new Error('Network response was not ok');
-			}
-			return response.json();
-		})
-		.then(data => {
-			this.state.games = data.games;
-			this.state.user = data.user;
-			this.state.rate = data.user.lose == 0 ? (data.user.win == 0 ? 0 : 100) :
-							Math.round((data.user.win / (data.user.lose + data.user.win)) * 100);
-		})
-		.catch(error => {
-			console.error('Fetch error:', error);
+		if (this.uid !== parseInt(this.props.uid)) {
 			changeUrl("/404", false);
-		});
+		} else {
+			fetch(`https://localhost:443/api/user/${this.props.uid}`, {
+				method: 'GET',
+				credentials: 'include', // 쿠키를 포함하여 요청 (사용자 인증 필요 시)
+			})
+			.then(response => {
+				if (!response.ok) {
+					throw new Error('Network response was not ok');
+x				} else {
+					return response.json();
+				}
+			})
+			.then(data => {
+				this.state.games = data.games;
+				this.state.user = data.user;
+				this.state.rate = data.user.lose == 0 ? (data.user.win == 0 ? 0 : 100) :
+							Math.round((data.user.win / (data.user.lose + data.user.win)) * 100);
+			})
+			.catch(error => {
+				console.error('Fetch error:', error);
+				changeUrl("/");
+			});
+		}
 		return { user: this.user, rate: this.rate, games: this.games };
 	}
 
@@ -135,7 +140,6 @@ export class ProfileInfo extends Component {
 			changeUrl(`/main/profile/${this.props.uid}/edit`);
 		});
 
-		// 컴포넌트가 렌더링된 후 원형 진행 막대를 그립니다.
 	}
 
 	drawBackgroundCircle() {