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

Bug: 회원가입 직후 아바타 변경없이 저장 시 400 에러 수정 #94

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Bug: 회원가입 직후 아바타 변경없이 저장 시 400 에러 수정 #94

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
697bb41
Bug: 회원가입 직후 아바타 변경없이 저장 시 400 에러 수정
mixsung Jun 26, 2024
601cda9
Refactor: 아바타 변경사항 없이 저장 버튼 눌렀을 때 API 요청 삭제
mixsung Jun 27, 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
54 changes: 27 additions & 27 deletions frontend/static/js/view/Profile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,14 @@ export default class extends AbstractView {
<nav>
<a href="/" id="unregister" class="nav__link" data-link>${words[registry.lang].unregister}</a>
<a href="/play" id="play_link" class="nav__link" data-link>${words[registry.lang].play}</a>
<a href="/profile" id="profile_link" class="nav__link" data-link style="pointer-events: none; color: grey; text-decoration: none;">${
words[registry.lang].profile
}</a>
<a href="/profile" id="profile_link" class="nav__link" data-link style="pointer-events: none; color: grey; text-decoration: none;">${words[registry.lang].profile
}</a>
</nav>
<section class="modal_container">
<div class="modal_content profile_modal">
<ul class="profile_nav">
<li class="profile_nav_item"><a href="#" class="information">${
words[registry.lang].information
}</a></li>
<li class="profile_nav_item"><a href="#" class="information">${words[registry.lang].information
}</a></li>
<li class="profile_nav_item"><a href="#" class="history">${words[registry.lang].history}</a></li>
<li class="profile_nav_item"><a href="#" class="friends">${words[registry.lang].friends}</a></li>
<li class="profile_nav_item"><a href="#" class="search">${words[registry.lang].search}</a></li>
Expand Down Expand Up @@ -98,9 +96,8 @@ export default class extends AbstractView {
<div class="friend_image" style="background-image: url(/static/assets/${friend.profile_img}.png);"></div>
<div class="friend_name">${friend.nickname}</div>
<div class="friend_message">${friend.status_msg}</div>
<div class="friend_button delete_button"><button class="#" data-user-id=${friend.id}>${
words[registry.lang].friend_delete_button
}</button></div>
<div class="friend_button delete_button"><button class="#" data-user-id=${friend.id}>${words[registry.lang].friend_delete_button
}</button></div>
`;
friendDiv.innerHTML = friendHTML;
friendResultBox.appendChild(friendDiv);
Expand Down Expand Up @@ -156,13 +153,11 @@ export default class extends AbstractView {
<div class="friend_message">${user.status_msg}</div>
`;
if (user.is_friend) {
resultHTML += `<div class="disabled_friend_button friend_add_button"><button class="add_button disabled_button" disabled data-user-id="${
user.id
}">${words[registry.lang].friend_add_button}</button></div>`;
resultHTML += `<div class="disabled_friend_button friend_add_button"><button class="add_button disabled_button" disabled data-user-id="${user.id
}">${words[registry.lang].friend_add_button}</button></div>`;
} else {
resultHTML += `<div class="friend_button friend_add_button"><button class="add_button" data-user-id="${
user.id
}">${words[registry.lang].friend_add_button}</button></div>`;
resultHTML += `<div class="friend_button friend_add_button"><button class="add_button" data-user-id="${user.id
}">${words[registry.lang].friend_add_button}</button></div>`;
}
friendElement.innerHTML = resultHTML;
searchResultBox.appendChild(friendElement);
Expand Down Expand Up @@ -232,9 +227,8 @@ export default class extends AbstractView {
<button class="profile_status_save hidden" id="status_save"><i class="fa-solid fa-check"></i></button>
</div>
</div>
<span class="profile_count">${data.win_cnt}${words[registry.lang].win} ${data.lose_cnt}${
words[registry.lang].lose
} </span>
<span class="profile_count">${data.win_cnt}${words[registry.lang].win} ${data.lose_cnt}${words[registry.lang].lose
} </span>
<section class="profile_img_modal hidden">
<div class="profile_img_modal_flex">
<div class="profile_img_set">
Expand Down Expand Up @@ -266,10 +260,18 @@ export default class extends AbstractView {
avatarModal.classList.add('hidden');
});
imgSaveButton.addEventListener('click', async () => {
const imgData = await patchAvatar(imgId);
if (imgId === undefined) {
profileImage.style.backgroundImage = `url(/static/assets/${currentAvatarId}.png)`;
imgId = currentAvatarId;
} else if (currentAvatarId === imgId) {
profileImage.style.backgroundImage = `url(/static/assets/${imgId}.png)`;
currentAvatarId = imgId;
} else {
await patchAvatar(imgId);
profileImage.style.backgroundImage = `url(/static/assets/${imgId}.png)`;
currentAvatarId = imgId;
}
avatarModal.classList.add('hidden');
profileImage.style.backgroundImage = `url(/static/assets/${imgId}.png)`;
currentAvatarId = imgId;
});

avatarEditButton.addEventListener('click', () => {
Expand Down Expand Up @@ -384,18 +386,16 @@ export default class extends AbstractView {
<div class="form_container">
<form action="#" class="form_box">
<div class="input_container">
<input type="search" id="search_input" placeholder='${
words[registry.lang].friend_search_placeholder
}' required>
<input type="search" id="search_input" placeholder='${words[registry.lang].friend_search_placeholder
}' required>
</div>
<div class="search_button_container"><button type="button" class="search_button"><i class="fa-solid fa-magnifying-glass"></i></button></div>
</form>
<section class="friend_add_modal hidden" id="friend_add_modal">
<div class="friend_add_modal_flex">
<div><span class="friend_add_modal_message"><span></div>
<div><button class="save_button" id="friend_modal_button">${
words[registry.lang].confirm_button
}</button></div>
<div><button class="save_button" id="friend_modal_button">${words[registry.lang].confirm_button
}</button></div>
</div>
</section>
</div>
Expand Down