From 94c5c88a86e3debd444c0e0b877a18f93fffbe7f Mon Sep 17 00:00:00 2001
From: study2895 <144806675+study2895@users.noreply.github.com>
Date: Sun, 27 Oct 2024 15:53:08 +0900
Subject: [PATCH 1/4] =?UTF-8?q?[Rename]=20NotFound.vue=20404=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC=EC=A1=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/NotFound.vue | 65 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 src/views/NotFound.vue

diff --git a/src/views/NotFound.vue b/src/views/NotFound.vue
new file mode 100644
index 0000000..1c8de3c
--- /dev/null
+++ b/src/views/NotFound.vue
@@ -0,0 +1,65 @@
+<template>
+  <div
+    class="min-h-screen flex items-center justify-center bg-[#FFF9F2] font-nanum-square-round"
+  >
+    <div
+      class="w-[395px] min-w-[340px] bg-[#FAE8DA] min-h-screen flex items-center justify-center"
+    >
+      <MainHeader />
+      <div class="text-center px-6">
+        <h1 class="text-6xl font-bold text-gray-800 mb-4 font-uhbeesehyun">
+          404
+        </h1>
+        <p class="text-base text-gray-600 mb-8">페이지를 찾을 수 없습니다</p>
+        <router-link
+          to="/main"
+          class="px-6 py-3 bg-[#F4B28C] text-white rounded-full no-underline"
+        >
+          홈으로 돌아가기
+        </router-link>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import MainHeader from '@/components/layout/Header.vue'
+
+export default {
+  name: 'NotFound'
+}
+</script>
+
+<style>
+@font-face {
+  font-family: 'UhBeeSe_hyun';
+  src: url('https://gcore.jsdelivr.net/gh/projectnoonnu/noonfonts_five@.2.0/UhBeeSe_hyun.woff')
+    format('woff');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'NanumSquareRound';
+  src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_two@1.0/NanumSquareRound.woff')
+    format('woff');
+  font-weight: normal;
+  font-style: normal;
+}
+
+body {
+  font-family: 'NanumSquareRound', sans-serif;
+}
+
+.font-uhbeesehyun {
+  font-family: 'UhBeeSe_hyun', sans-serif;
+}
+
+.font-nanum-square-round {
+  font-family: 'NanumSquareRound', sans-serif;
+}
+
+.no-underline {
+  text-decoration: none;
+}
+</style>

From a2fcda5a3d7dd8f24acdaaba5dcd31cc4b584409 Mon Sep 17 00:00:00 2001
From: study2895 <144806675+study2895@users.noreply.github.com>
Date: Sun, 27 Oct 2024 15:58:45 +0900
Subject: [PATCH 2/4] =?UTF-8?q?[Feat]=20#16=20-=20Feed=20=EB=A9=94?=
 =?UTF-8?q?=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=95=84=EC=9B=83=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/feed/FeedPageStyle.css | 94 ++++++++++++++++++++++++++++++++
 src/views/feed/MainFeedPage.vue  | 32 +++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 src/views/feed/FeedPageStyle.css
 create mode 100644 src/views/feed/MainFeedPage.vue

diff --git a/src/views/feed/FeedPageStyle.css b/src/views/feed/FeedPageStyle.css
new file mode 100644
index 0000000..3571281
--- /dev/null
+++ b/src/views/feed/FeedPageStyle.css
@@ -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;
+}
diff --git a/src/views/feed/MainFeedPage.vue b/src/views/feed/MainFeedPage.vue
new file mode 100644
index 0000000..19fd3e0
--- /dev/null
+++ b/src/views/feed/MainFeedPage.vue
@@ -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>

From ca6bb6a8d8eafb2f0d4774aaf9068ef5ed759f50 Mon Sep 17 00:00:00 2001
From: study2895 <144806675+study2895@users.noreply.github.com>
Date: Sun, 27 Oct 2024 16:01:05 +0900
Subject: [PATCH 3/4] =?UTF-8?q?[Feat]=20#16=20-=20=ED=94=BC=EB=93=9C=20?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B0=81=20?=
 =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EA=B5=AC=ED=98=84(?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EB=A7=8C=20=EC=9E=84=EC=8B=9C=EB=A1=9C)=20?=
 =?UTF-8?q?=EB=B0=8F=20=EB=9D=BC=EC=9A=B0=ED=84=B0=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

세부 수정 필요
- 백엔드 로직 연결 필요(현재는 임시 데이터)
- 검색과 팔로우 리스트는 일단 UI만
- 기타 세부 동작 로직이나 수정 필요
---
 src/components/common/feed/CommentInput.vue | 30 ++++++++++
 src/components/common/feed/CommentList.vue  | 27 +++++++++
 src/components/common/feed/FollowStats.vue  | 63 +++++++++++++++++++++
 src/components/common/feed/FriendGoal.vue   | 40 +++++++++++++
 src/components/common/feed/MyGoal.vue       | 63 +++++++++++++++++++++
 src/components/common/feed/SearchBar.vue    | 29 ++++++++++
 src/router/index.js                         |  5 ++
 7 files changed, 257 insertions(+)
 create mode 100644 src/components/common/feed/CommentInput.vue
 create mode 100644 src/components/common/feed/CommentList.vue
 create mode 100644 src/components/common/feed/FollowStats.vue
 create mode 100644 src/components/common/feed/FriendGoal.vue
 create mode 100644 src/components/common/feed/MyGoal.vue
 create mode 100644 src/components/common/feed/SearchBar.vue

diff --git a/src/components/common/feed/CommentInput.vue b/src/components/common/feed/CommentInput.vue
new file mode 100644
index 0000000..c1f6a84
--- /dev/null
+++ b/src/components/common/feed/CommentInput.vue
@@ -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>
diff --git a/src/components/common/feed/CommentList.vue b/src/components/common/feed/CommentList.vue
new file mode 100644
index 0000000..78083e4
--- /dev/null
+++ b/src/components/common/feed/CommentList.vue
@@ -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>
diff --git a/src/components/common/feed/FollowStats.vue b/src/components/common/feed/FollowStats.vue
new file mode 100644
index 0000000..028175a
--- /dev/null
+++ b/src/components/common/feed/FollowStats.vue
@@ -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>
diff --git a/src/components/common/feed/FriendGoal.vue b/src/components/common/feed/FriendGoal.vue
new file mode 100644
index 0000000..263dea6
--- /dev/null
+++ b/src/components/common/feed/FriendGoal.vue
@@ -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>
diff --git a/src/components/common/feed/MyGoal.vue b/src/components/common/feed/MyGoal.vue
new file mode 100644
index 0000000..9288a0c
--- /dev/null
+++ b/src/components/common/feed/MyGoal.vue
@@ -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>
diff --git a/src/components/common/feed/SearchBar.vue b/src/components/common/feed/SearchBar.vue
new file mode 100644
index 0000000..9710c82
--- /dev/null
+++ b/src/components/common/feed/SearchBar.vue
@@ -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>
diff --git a/src/router/index.js b/src/router/index.js
index e3a2b90..8d9ff35 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -98,6 +98,11 @@ const routes = [
         path: 'ako-stamp-follow',
         name: 'AkoStampFollow',
         component: importedViews['AkoStampFollow'] // 자동 임포트 적용
+      },
+      {
+        path: 'main',
+        name: 'MainFeedPage',
+        component: importedViews['MainFeedPage'] // 자동 임포트 적용
       }
     ]
   }

From b40157cef448a7f9b56cd6fd4ef903d8f30015f7 Mon Sep 17 00:00:00 2001
From: study2895 <144806675+study2895@users.noreply.github.com>
Date: Sun, 27 Oct 2024 16:01:26 +0900
Subject: [PATCH 4/4] =?UTF-8?q?[Feat]=20404=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/test/NotFound.vue | 65 -------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 src/views/test/NotFound.vue

diff --git a/src/views/test/NotFound.vue b/src/views/test/NotFound.vue
deleted file mode 100644
index 1c8de3c..0000000
--- a/src/views/test/NotFound.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-  <div
-    class="min-h-screen flex items-center justify-center bg-[#FFF9F2] font-nanum-square-round"
-  >
-    <div
-      class="w-[395px] min-w-[340px] bg-[#FAE8DA] min-h-screen flex items-center justify-center"
-    >
-      <MainHeader />
-      <div class="text-center px-6">
-        <h1 class="text-6xl font-bold text-gray-800 mb-4 font-uhbeesehyun">
-          404
-        </h1>
-        <p class="text-base text-gray-600 mb-8">페이지를 찾을 수 없습니다</p>
-        <router-link
-          to="/main"
-          class="px-6 py-3 bg-[#F4B28C] text-white rounded-full no-underline"
-        >
-          홈으로 돌아가기
-        </router-link>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import MainHeader from '@/components/layout/Header.vue'
-
-export default {
-  name: 'NotFound'
-}
-</script>
-
-<style>
-@font-face {
-  font-family: 'UhBeeSe_hyun';
-  src: url('https://gcore.jsdelivr.net/gh/projectnoonnu/noonfonts_five@.2.0/UhBeeSe_hyun.woff')
-    format('woff');
-  font-weight: normal;
-  font-style: normal;
-}
-
-@font-face {
-  font-family: 'NanumSquareRound';
-  src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_two@1.0/NanumSquareRound.woff')
-    format('woff');
-  font-weight: normal;
-  font-style: normal;
-}
-
-body {
-  font-family: 'NanumSquareRound', sans-serif;
-}
-
-.font-uhbeesehyun {
-  font-family: 'UhBeeSe_hyun', sans-serif;
-}
-
-.font-nanum-square-round {
-  font-family: 'NanumSquareRound', sans-serif;
-}
-
-.no-underline {
-  text-decoration: none;
-}
-</style>