From 39cbb5beaa36a2940dec037e85ad80393b318934 Mon Sep 17 00:00:00 2001 From: Minn-Choi Date: Wed, 20 Nov 2024 16:54:31 +0900 Subject: [PATCH] =?UTF-8?q?[Design]=20#6=20-=20=EC=95=84=EC=BD=94=ED=94=BC?= =?UTF-8?q?=EB=93=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=97=B0=EA=B2=B0=20?= =?UTF-8?q?=EB=B0=8F=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 1 - src/assets/images/plusBtn.svg | 12 ++ src/components/common/feed/CommentInput.vue | 113 +++++++++++-- src/components/common/feed/CommentList.vue | 40 ++++- src/components/common/feed/FollowStats.vue | 14 +- src/components/common/feed/FriendGoal.vue | 2 +- src/components/common/feed/MyGoal.vue | 3 +- src/components/common/feed/SearchBar.vue | 171 ++++++++++++++++---- src/components/layout/Footer.vue | 2 +- src/views/feed/AkoStampFollow.vue | 18 ++- src/views/feed/AkoStampWriteView.vue | 28 +++- src/views/feed/MainFeedPage.vue | 43 ++++- 12 files changed, 377 insertions(+), 70 deletions(-) create mode 100644 src/assets/images/plusBtn.svg diff --git a/package-lock.json b/package-lock.json index f810195..bd45c60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4076,7 +4076,6 @@ "version": "1.7.7", "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", - "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", diff --git a/src/assets/images/plusBtn.svg b/src/assets/images/plusBtn.svg new file mode 100644 index 0000000..7256f92 --- /dev/null +++ b/src/assets/images/plusBtn.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/components/common/feed/CommentInput.vue b/src/components/common/feed/CommentInput.vue index 0c39de9..6efc723 100644 --- a/src/components/common/feed/CommentInput.vue +++ b/src/components/common/feed/CommentInput.vue @@ -1,31 +1,124 @@ + \ No newline at end of file diff --git a/src/components/common/feed/CommentList.vue b/src/components/common/feed/CommentList.vue index 78083e4..4f663b5 100644 --- a/src/components/common/feed/CommentList.vue +++ b/src/components/common/feed/CommentList.vue @@ -1,9 +1,9 @@ @@ -18,10 +18,38 @@ const comments = ref([ diff --git a/src/components/common/feed/FollowStats.vue b/src/components/common/feed/FollowStats.vue index 6ccbeef..da33264 100644 --- a/src/components/common/feed/FollowStats.vue +++ b/src/components/common/feed/FollowStats.vue @@ -6,13 +6,14 @@ {{ followerCount }}λͺ… νŒ”λ‘œμž‰ {{ followingCount }}λͺ… - + Next @@ -36,6 +39,7 @@ const goToFollowPage = () => { .follow-stats { display: flex; align-items: center; + width: 100%; height: 37px; padding: 8px; border-radius: 10px; @@ -84,4 +88,8 @@ const goToFollowPage = () => { font-weight: 400; line-height: normal; } - + +.na{ + cursor: pointer; +} + \ No newline at end of file diff --git a/src/components/common/feed/FriendGoal.vue b/src/components/common/feed/FriendGoal.vue index 9981b2f..134dd90 100644 --- a/src/components/common/feed/FriendGoal.vue +++ b/src/components/common/feed/FriendGoal.vue @@ -17,7 +17,7 @@ import CommentInput from './CommentInput.vue' import CommentList from './CommentList.vue' const friendNickname = ref('ν† λ‹ˆ') -const friendGoalContent = ref('이따 μƒλ‘μ›μ—μ„œ λ°₯λ¨Ήμ„μ‚¬λžŒ? κΉ€μΉ˜μ² νŒμ–΄μ©Œκ³ μ €μ©Œκ³ ') +const friendGoalContent = ref('이따 μƒλ‘μ›μ—μ„œ λ°₯λ¨Ήμ„μ‚¬λžŒμžˆλ‚˜μš”? 같이 λ¨Ήμ–΄μš”') const showCommentSection = ref(false) const toggleCommentSection = () => { diff --git a/src/components/common/feed/MyGoal.vue b/src/components/common/feed/MyGoal.vue index 07af965..c7f3725 100644 --- a/src/components/common/feed/MyGoal.vue +++ b/src/components/common/feed/MyGoal.vue @@ -25,7 +25,7 @@ import CommentInput from './CommentInput.vue' import CommentList from './CommentList.vue' const nickname = ref('λ―Όλ‹¬νŒ½λŸ΄') -const goalContent = ref('ν¬κΈ°ν•˜μ§€ μ•Šκ³  κΈμ •μ μœΌλ‘œ 였늘의 할일을 λ§ˆλ¬΄λ¦¬ν•˜μžλƒ₯λƒ₯κ±Έ') +const goalContent = ref('ν¬κΈ°ν•˜μ§€ μ•Šκ³  κΈμ •μ μœΌλ‘œ 였늘의 할일을 λ§ˆλ¬΄λ¦¬ν•˜μž') const showCommentSection = ref(false) const toggleCommentSection = () => { @@ -96,7 +96,6 @@ const deleteGoal = () => { .comment-section { - margin-top: 8px; } .line{ diff --git a/src/components/common/feed/SearchBar.vue b/src/components/common/feed/SearchBar.vue index 360d227..f8d0de4 100644 --- a/src/components/common/feed/SearchBar.vue +++ b/src/components/common/feed/SearchBar.vue @@ -1,60 +1,165 @@ diff --git a/src/components/layout/Footer.vue b/src/components/layout/Footer.vue index 1b8e1a9..a34c020 100644 --- a/src/components/layout/Footer.vue +++ b/src/components/layout/Footer.vue @@ -55,7 +55,7 @@ const navItems = ref([ label: 'ν”Όλ“œ', icon: new URL('@/assets/Icons/akoming/bottom/feedicon.svg', import.meta.url) .href, - route: '/feed/ako-stamp-write' + route: '/feed/main' }, { label: 'λ§ˆμ΄νŽ˜μ΄μ§€', diff --git a/src/views/feed/AkoStampFollow.vue b/src/views/feed/AkoStampFollow.vue index 5682ed5..3c004ad 100644 --- a/src/views/feed/AkoStampFollow.vue +++ b/src/views/feed/AkoStampFollow.vue @@ -16,6 +16,7 @@ src="@/assets/images/back.svg" alt="이전" style="width: 24px; height: 24px; margin-top: 10px; margin-bottom: 20px; cursor: pointer;" + @click="goBack" />
@@ -57,18 +58,17 @@ diff --git a/src/views/feed/MainFeedPage.vue b/src/views/feed/MainFeedPage.vue index f3c018e..17f5926 100644 --- a/src/views/feed/MainFeedPage.vue +++ b/src/views/feed/MainFeedPage.vue @@ -7,6 +7,12 @@ +
+ + μ•„μ½”μžκ΅­ μž‘μ„±ν•˜κΈ° + ν”ŒλŸ¬μŠ€λ²„νŠΌ + +
@@ -29,8 +35,43 @@ import MainFooter from '@/components/layout/Footer.vue' .feed-page { max-width: 345px; margin: 0 auto; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding-bottom: 100px; } .component-spacing { - margin-bottom: 20px; /* μ»΄ν¬λ„ŒνŠΈ μ‚¬μ΄μ˜ 간격 μ‘°μ • */ + margin-bottom: 20px; } +.Btn { + position: fixed; + bottom: 60px; + width: 100%; + max-width: 395px; + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: center; + z-index: 10; +} +.plusMentBtn { + width: 100%; + display: flex; + justify-content: center; + align-items: center; + height: 87px; + border-radius: 50px 50px 0px 0px; + background: #FFF; + box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25) inset; + color: #FF7F00; + text-align: center; + font-family: 'NaR'; + font-size: 20px; + font-style: normal; + font-weight: 400; + line-height: 32px; + text-decoration: none; +} +