-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #17 from study2895/main
[Feature] #16 - λ©μΈ νΌλ νμ΄μ§ ꡬν λ° 404νμ΄μ§ μ΄λ
- Loading branch information
Showing
10 changed files
with
383 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<template> | ||
<div class="comment-input"> | ||
<select v-model="selectedEmoji"> | ||
<option value="π">π</option> | ||
<option value="π">π</option> | ||
<option value="β€οΈ">β€οΈ</option> | ||
</select> | ||
<input type="text" v-model="comment" placeholder="λκΈ μ λ ₯" /> | ||
<button @click="submitComment">μμ±</button> | ||
</div> | ||
</template> | ||
|
||
<script setup> | ||
import { ref } from 'vue' | ||
const selectedEmoji = ref('') | ||
const comment = ref('') | ||
const submitComment = () => { | ||
/* λκΈ μ μΆ */ | ||
} | ||
</script> | ||
|
||
<style scoped> | ||
.comment-input { | ||
display: flex; | ||
gap: 8px; | ||
margin-top: 8px; | ||
} | ||
</style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<template> | ||
<div class="comment-list"> | ||
<div v-for="comment in comments" :key="comment.id" class="comment"> | ||
<span>{{ comment.nickname }}</span> | ||
<span>{{ comment.emoji }}</span> | ||
<p>{{ comment.content }}</p> | ||
</div> | ||
</div> | ||
</template> | ||
|
||
<script setup> | ||
import { ref } from 'vue' | ||
const comments = ref([ | ||
{ id: 1, nickname: 'μΉκ΅¬1', emoji: 'π', content: 'μ’μ λͺ©νλ€μ!' }, | ||
{ id: 2, nickname: 'μΉκ΅¬2', emoji: 'π', content: 'νμ΄ν !' } | ||
]) | ||
</script> | ||
|
||
<style scoped> | ||
.comment-list .comment { | ||
display: flex; | ||
gap: 8px; | ||
align-items: center; | ||
margin-bottom: 8px; | ||
} | ||
</style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
<template> | ||
<div class="follow-stats" @click="goToFollowPage"> | ||
<div class="date-info">{{ formattedDate }}</div> | ||
<div class="follow-info"> | ||
<span>νλ‘μ {{ followerCount }}λͺ </span> | ||
<span>νλ‘μ {{ followingCount }}λͺ </span> | ||
<span class="arrow-icon">βΊ</span> | ||
</div> | ||
</div> | ||
</template> | ||
|
||
<script setup> | ||
import { ref } from 'vue' | ||
const followerCount = ref(0) // APIμμ λ°μμ€λ νλ‘μ μ | ||
const followingCount = ref(0) // APIμμ λ°μμ€λ νλ‘μ μ | ||
// νμ¬ λ μ§λ₯Ό ν¬λ§·ν | ||
const formattedDate = ref( | ||
new Date().toLocaleDateString('ko-KR', { | ||
year: 'numeric', | ||
month: 'long', | ||
day: 'numeric' | ||
}) | ||
) | ||
const goToFollowPage = () => { | ||
// νλ‘μ° κ΄λ¦¬ νμ΄μ§λ‘ μ΄λνλ ν¨μ | ||
} | ||
</script> | ||
|
||
<style scoped> | ||
.follow-stats { | ||
display: flex; | ||
align-items: center; | ||
padding: 8px; | ||
background-color: #f6f6f6; | ||
font-family: 'NanumSquareRound', sans-serif; | ||
} | ||
.date-info { | ||
flex: 1; | ||
text-align: left; | ||
color: #333; | ||
font-size: 0.9rem; | ||
} | ||
.follow-info { | ||
display: flex; | ||
align-items: center; | ||
gap: 10px; | ||
} | ||
.follow-info span { | ||
color: #333; | ||
font-size: 0.9rem; | ||
} | ||
.arrow-icon { | ||
font-size: 1rem; | ||
color: #999; | ||
} | ||
</style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
<template> | ||
<div class="friend-goal"> | ||
<div class="goal-content"> | ||
<span>{{ friendNickname }}μ λͺ©ν: {{ friendGoalContent }}</span> | ||
<button @click="toggleCommentSection">π¬</button> | ||
</div> | ||
|
||
<CommentInput v-if="showCommentSection" /> | ||
<CommentList v-if="showCommentSection" /> | ||
</div> | ||
</template> | ||
|
||
<script setup> | ||
import { ref } from 'vue' | ||
import CommentInput from './CommentInput.vue' | ||
import CommentList from './CommentList.vue' | ||
const friendNickname = ref('μΉκ΅¬ λλ€μ') | ||
const friendGoalContent = ref('μΉκ΅¬μ μ€λ λͺ©ν') | ||
const showCommentSection = ref(false) | ||
const toggleCommentSection = () => { | ||
showCommentSection.value = !showCommentSection.value | ||
} | ||
</script> | ||
|
||
<style scoped> | ||
.friend-goal { | ||
display: flex; | ||
flex-direction: column; | ||
gap: 4px; | ||
} | ||
.goal-content { | ||
display: flex; | ||
justify-content: space-between; | ||
align-items: center; | ||
width: 100%; | ||
} | ||
</style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
<template> | ||
<div class="my-goal"> | ||
<div class="goal-content"> | ||
<span>{{ nickname }}μ λͺ©ν: {{ goalContent }}</span> | ||
<div class="goal-icons"> | ||
<button @click="toggleCommentSection">π¬</button> | ||
<button @click="editGoal">βοΈ</button> | ||
<button @click="deleteGoal">ποΈ</button> | ||
</div> | ||
</div> | ||
|
||
<div v-if="showCommentSection" class="comment-section"> | ||
<CommentInput /> | ||
<CommentList /> | ||
</div> | ||
</div> | ||
</template> | ||
|
||
<script setup> | ||
import { ref } from 'vue' | ||
import CommentInput from './CommentInput.vue' | ||
import CommentList from './CommentList.vue' | ||
const nickname = ref('λ΄ λλ€μ') | ||
const goalContent = ref('μ€λμ λͺ©ν λ΄μ©') | ||
const showCommentSection = ref(false) | ||
const toggleCommentSection = () => { | ||
showCommentSection.value = !showCommentSection.value | ||
} | ||
const editGoal = () => { | ||
/* λͺ©ν μμ */ | ||
} | ||
const deleteGoal = () => { | ||
/* λͺ©ν μμ */ | ||
} | ||
</script> | ||
|
||
<style scoped> | ||
.my-goal { | ||
display: flex; | ||
flex-direction: column; | ||
gap: 8px; | ||
width: 100%; | ||
} | ||
.goal-content { | ||
display: flex; | ||
align-items: center; | ||
justify-content: space-between; | ||
width: 100%; | ||
} | ||
.goal-icons { | ||
display: flex; | ||
gap: 4px; | ||
} | ||
.comment-section { | ||
margin-top: 8px; | ||
} | ||
</style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
<template> | ||
<div class="search-bar"> | ||
<input | ||
type="text" | ||
v-model="nickname" | ||
placeholder="μΉκ΅¬ λλ€μ κ²μ" | ||
@input="searchFriend" | ||
/> | ||
</div> | ||
</template> | ||
|
||
<script setup> | ||
import { ref } from 'vue' | ||
const nickname = ref('') | ||
const searchFriend = () => { | ||
// μΉκ΅¬ κ²μ λ‘μ§ μΆκ° | ||
} | ||
</script> | ||
|
||
<style scoped> | ||
.search-bar input { | ||
width: 100%; | ||
padding: 8px; | ||
border: 1px solid #ddd; | ||
border-radius: 4px; | ||
} | ||
</style> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
.min-h-screen { | ||
background-color: #fff9f2; | ||
font-family: 'Nanum Square Round', sans-serif; | ||
} | ||
|
||
.w-[395px] { | ||
background-color: #fae8da; | ||
min-width: 340px; | ||
min-height: 100vh; | ||
overflow-y: auto; | ||
} | ||
|
||
.text-center { | ||
text-align: center; | ||
} | ||
|
||
h1 { | ||
font-size: 1.25rem; | ||
font-weight: 500; | ||
color: #333333; | ||
font-family: 'Uhbee Sehyun', sans-serif; | ||
margin-bottom: 70px; | ||
} | ||
|
||
.relative svg path { | ||
stroke: #bbb4b4; | ||
stroke-width: 3; | ||
fill: transparent; | ||
} | ||
|
||
.stamp { | ||
width: 95px; | ||
height: 95px; | ||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
} | ||
|
||
.flex-col { | ||
display: flex; | ||
flex-direction: column; | ||
} | ||
|
||
.space-y-3 > * + * { | ||
margin-top: 0.75rem; | ||
} | ||
|
||
.task-box { | ||
display: flex; | ||
justify-content: space-between; | ||
align-items: center; | ||
padding: 0.75rem 1rem; | ||
background-color: #fff; | ||
border-radius: 17px; | ||
color: #b3b3b3; | ||
font-size: 0.875rem; | ||
} | ||
|
||
.task-box.completed { | ||
color: #ff7f00; | ||
} | ||
|
||
.icon { | ||
width: 1.25rem; | ||
height: 1.25rem; | ||
} | ||
|
||
.icon.grayscale { | ||
filter: grayscale(100%); | ||
} | ||
|
||
.ako-container { | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
margin-top: 2.5rem; | ||
} | ||
|
||
.ako-container img { | ||
width: 256px; | ||
height: 256px; | ||
} | ||
|
||
.ako-container .mini-icon { | ||
width: 2rem; | ||
height: 2rem; | ||
margin-right: 0.5rem; | ||
} | ||
|
||
.ako-container p { | ||
font-size: 0.875rem; | ||
color: #666666; | ||
margin-bottom: 0.5rem; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
<template> | ||
<div class="feed-page"> | ||
<MainHeader /> | ||
<SearchBar class="component-spacing" style="margin-top: 100px" /> | ||
<FollowStats class="component-spacing" /> | ||
<MyGoal class="component-spacing" /> | ||
<FriendGoal class="component-spacing" /> | ||
<MainFooter /> | ||
</div> | ||
</template> | ||
|
||
<script setup> | ||
import SearchBar from '@/components/common/feed/SearchBar.vue' | ||
import FollowStats from '@/components/common/feed/FollowStats.vue' | ||
import MyGoal from '@/components/common/feed/MyGoal.vue' | ||
import FriendGoal from '@/components/common/feed/FriendGoal.vue' | ||
import CommentInput from '@/components/common/feed/CommentInput.vue' | ||
import CommentList from '@/components/common/feed/CommentList.vue' | ||
import './FeedPageStyle.css' | ||
import MainHeader from '@/components/layout/Header.vue' | ||
import MainFooter from '@/components/layout/Footer.vue' | ||
</script> | ||
|
||
<style scoped> | ||
.feed-page { | ||
max-width: 395px; | ||
margin: 0 auto; | ||
} | ||
.component-spacing { | ||
margin-bottom: 20px; /* μ»΄ν¬λνΈ μ¬μ΄μ κ°κ²© μ‘°μ */ | ||
} | ||
</style> |