Skip to content

Commit

Permalink
Merge pull request #86 from Minn-Choi/feature/#6
Browse files Browse the repository at this point in the history
Feature/#6
  • Loading branch information
Minn-Choi authored Dec 5, 2024
2 parents ad4f892 + dd07642 commit 106686d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/components/common/feed/FriendGoal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ export default {
});
if (response.ok) {
alert('λŒ“κΈ€μ΄ μ„±κ³΅μ μœΌλ‘œ μΆ”κ°€λ˜μ—ˆμŠ΅λ‹ˆλ‹€.');
comments[goalId].content = '';
comments[goalId].emoji = '';
fetchGoals();
Expand Down Expand Up @@ -184,6 +183,7 @@ export default {
border: none;
background: none;
cursor: pointer;
align-items: center;
}
.btn:focus,
Expand Down
4 changes: 1 addition & 3 deletions src/components/common/feed/MyGoal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ export default {
});
if (response.ok) {
alert('λŒ“κΈ€μ΄ μ„±κ³΅μ μœΌλ‘œ μΆ”κ°€λ˜μ—ˆμŠ΅λ‹ˆλ‹€.');
comments[goalId].content = '';
comments[goalId].emoji = '';
fetchGoals();
Expand Down Expand Up @@ -158,7 +157,6 @@ export default {
if (response.ok) {
goal.content = updatedContent;
alert('λͺ©ν‘œκ°€ μˆ˜μ •λ˜μ—ˆμŠ΅λ‹ˆλ‹€.');
} else {
alert('λͺ©ν‘œ μˆ˜μ • 쀑 λ¬Έμ œκ°€ λ°œμƒν–ˆμŠ΅λ‹ˆλ‹€.');
}
Expand All @@ -180,7 +178,7 @@ export default {
});
if (response.ok) {
alert('λͺ©ν‘œκ°€ μ‚­μ œλ˜μ—ˆμŠ΅λ‹ˆλ‹€.');
alert('λͺ©ν‘œκ°€ μ‚­μ œλ˜μ—ˆμŠ΅λ‹ˆλ‹€β˜ οΈ');
window.location.reload();
} else {
const errorData = await response.json();
Expand Down
7 changes: 5 additions & 2 deletions src/views/feed/AkoStampFollow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
νŒ”λ‘œμ›Œ {{ followerCount }}
</div>
<div class="followerline" :style="{ width: '100%', height: '2px', background: showFollowers ? '#FF7F00' : '#B3B3B3', marginBottom: '15px' }"></div>
<ul v-show="showFollowers && followers.length > 0" style="margin-left: 170px; padding: 20; width: 150%; z-index: 200;">
<ul v-show="showFollowers && followers.length > 0" style="margin-left: 190px; padding: 20; width: 140%; z-index: 200;">
<li v-for="follower in followers" :key="follower.followingId" class="flex justify-between items-center mb-4">
<span class='font-NaR'>{{ follower.nickname }}</span>
<button @click="blockFollower(follower.followingId)" class="followerDelete-btn">μ‚­μ œ</button>
Expand All @@ -35,7 +35,7 @@
νŒ”λ‘œμž‰ {{ followingCount }}
</div>
<div class="followingline" :style="{ width: '100%', height: '2px', background: showFollowings ? '#FF7F00' : '#B3B3B3', marginBottom: '15px' }"></div>
<ul v-show="showFollowings && followings.length > 0" style="padding-right: 100%; width: 250%;">
<ul v-show="showFollowings && followings.length > 0" style="padding-right: 90%; width: 220%;">
<li v-for="following in followings" :key="following.followingId" class="flex justify-between items-center mb-4">
<span class='font-NaR'>{{ following.nickname }}</span>
<button @click="unfollow(following.followingId)" class="unfollow-button">νŒ”λ‘œμš° μ·¨μ†Œ</button>
Expand Down Expand Up @@ -180,4 +180,7 @@ const goBack = () => {
background-color:#FAE8DA;
height: 100%;
}
.unfollow-button{
width: 90px;
}
</style>
1 change: 0 additions & 1 deletion src/views/feed/AkoStampWriteView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ const registerGoal = async () => {
if (response.ok) {
const data = await response.json()
alert(`λͺ©ν‘œκ°€ λ“±λ‘λ˜μ—ˆμŠ΅λ‹ˆλ‹€: ${data.content}`)
window.history.back();
userText.value = ''
} else {
Expand Down

0 comments on commit 106686d

Please sign in to comment.