[Fix] CSID-DGU#6 - 충돌 해결

Minn-Choi · Oct 23, 2024 · f1d6cd5 · f1d6cd5
2 parents 4e8fce6 + 7e12cd8
commit f1d6cd5
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 125 deletions.
diff --git a/docs/회의록.md b/docs/회의록.md
@@ -13,3 +13,4 @@
 | 7차   | 2024년 10월 14일 | 정기 회의 | 이소은, 최민, 정지원, 정예빈 | 이소은 | https://www.notion.so/7-11f8a727ce1f806c816cc3e8e9a60498       |
 | 7.5차 | 2024년 10월 15일 | 임시 회의 | 이소은, 최민, 정지원, 정예빈 | x      | https://www.notion.so/7-5-11f8a727ce1f80269d5bfbd5ea839057     |
 | 8차   | 2024년 10월 16일 | 정기 회의 | 이소은, 최민, 정지원, 정예빈 | 정지원 | https://www.notion.so/8-1218a727ce1f80828502ff33c79181fd       |
+| 9차   | 2024년 10월 21일 | 정기 회의 | 이소은, 최민, 정지원, 정예빈 | 정지원 | https://www.notion.so/9-fef17d0bf58649b0aec1f8e5d1c16bfd       |
diff --git a/src/assets/fonts/fonts.css b/src/assets/fonts/fonts.css
@@ -0,0 +1,8 @@
+/* src/assets/fonts.css */
+@font-face {
+  font-family: 'UhBeeSe_hyun';
+  src: url('https://gcore.jsdelivr.net/gh/projectnoonnu/[email protected]/UhBeeSe_hyun.woff')
+    format('woff');
+  font-weight: normal;
+  font-style: normal;
+}
diff --git a/src/components/layout/FeedLayout.vue b/src/components/layout/FeedLayout.vue
@@ -8,8 +8,8 @@
 </template>
 
 <script>
-import MainHeader from '@/views/mainpage/Header.vue'
-import MainFooter from '@/views/mainpage/Footer.vue'
+import MainHeader from '@/components/layout/Header.vue'
+import MainFooter from '@/components/layout/Footer.vue'
 
 export default {
   name: 'FeedLayout'

diff --git a/src/views/mainpage/Footer.vue → src/components/layout/Footer.vue b/src/views/mainpage/Footer.vue → src/components/layout/Footer.vue
diff --git a/src/views/mainpage/Header.vue → src/components/layout/Header.vue b/src/views/mainpage/Header.vue → src/components/layout/Header.vue
@@ -16,6 +16,6 @@
 
 <script>
 export default {
-  name: 'MainHeader' // Header 컴포넌트를 다른 파일에서 사용하기 위해 export
+  name: 'HeaderComponent' // Header 컴포넌트를 다른 파일에서 사용하기 위해 export
 }
 </script>
diff --git a/src/main.js b/src/main.js
@@ -7,6 +7,8 @@ import axios from 'axios'
 import './assets/styles/global.css'
 import 'tailwindcss/tailwind.css'
 import 'bootstrap/dist/css/bootstrap.min.css'
+import './assets/fonts/fonts.css'
+
 import VCalendar from 'v-calendar' // v-calendar를 불러오기
 axios.defaults.withCredentials = true
 

diff --git a/src/views/calendar/CalendarMainView.vue b/src/views/calendar/CalendarMainView.vue
@@ -65,8 +65,8 @@
 import { ref } from 'vue'
 import { format } from 'date-fns'
 import 'v-calendar/dist/style.css'
-import MainHeader from '@/views/mainpage/Header.vue'
-import MainFooter from '@/views/mainpage/Footer.vue'
+import MainHeader from '@/components/layout/Header.vue'
+import MainFooter from '@/components/layout/Footer.vue'
 
 // 현재 날짜를 기준으로 연도와 월을 가져옴
 const currentDate = new Date()

diff --git a/src/views/feed/AkoStampBoard.vue b/src/views/feed/AkoStampBoard.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script setup>
-import Footer from '@/views/mainpage/Footer.vue'
+import Footer from '@/components/layout/Footer.vue'
 </script>
 
 <style>

diff --git a/src/views/feed/AkoStampWriteView.vue b/src/views/feed/AkoStampWriteView.vue
@@ -18,7 +18,7 @@
         style="height:600px">
         <div class="mb-6 text-center p-4 flex items-center justify-between">
           <p class="mb-2 text-[#FF7F00] text-left mt-4 text-lg text-gray-600 padding font-NaR" 
-            style="font-size: 30px; font-style: normal; font-weight: 400; line-height: normal;">
+            style="font-size: 30px; color:#FF7F00; font-style: normal; font-weight: 400; line-height: normal;">
             <span class="text-[25px]"> {{ currentDate[0] }} </span><br /> 
             {{ currentDate[1] }}<br />
             {{ currentDate[2] }}
@@ -66,7 +66,7 @@
 <script setup>
 import { ref, computed } from 'vue'
 import axios from 'axios'
-import Footer from '@/views/mainpage/Footer.vue'
+import Footer from '@/components/layout/Footer.vue'
 
 const currentDate = computed(() => {
   const now = new Date();

diff --git a/src/views/login/mypage/MypageView.vue b/src/views/login/mypage/MypageView.vue
@@ -158,121 +158,20 @@
         </section>
       </main>
       <!-- 하단바 -->
-      <footer
-        class="bg-white shadow-sm py-3 px-4 fixed bottom-0 left-1/2 transform -translate-x-1/2 w-[395px] min-w-[340px] z-10"
-      >
-        <div class="flex items-center justify-between">
-          <h1 class="text-xl font-bold">{{ user.nickname }}님의 마이페이지</h1>
-          <button
-            @click="handleLogout"
-            class="text-[#F6B87A] hover:bg-[#F6B87A] hover:bg-opacity-10 px-2 py-1 rounded-full transition-colors duration-300 text-sm"
-          >
-            로그아웃
-          </button>
-        </div>
-      </footer>
+      <MainFooter />
     </div>
   </div>
 </template>
 
-<script src="./MypageScript.js"></script>
-
-<style scoped>
-/* .mypage-container {
-  max-width: 600px;
-  margin: 0 auto;
-  padding: 20px;
-  background-color: #f9f9f9;
-  border-radius: 10px;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-}
-
-h1 {
-  text-align: center;
-  color: #333;
-  margin-bottom: 30px;
-  font-size: 24px;
-}
-
-.logout-button {
-  background-color: #ff4d4f;
-  color: white;
-  border: none;
-  padding: 10px 20px;
-  border-radius: 5px;
-  cursor: pointer;
-  display: block;
-  margin: 10px auto;
-  width: 150px;
-  text-align: center;
-}
-
-.logout-button:hover {
-  background-color: #ff7875;
-}
-
-.intro-section,
-.profile-section {
-  background-color: white;
-  padding: 20px;
-  border-radius: 10px;
-  margin-bottom: 20px;
-  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.05);
-}
-
-h2 {
-  color: #666;
-  margin-bottom: 15px;
-  font-size: 20px;
-}
-
-.introduce-text {
-  font-style: italic;
-  color: #555;
-  margin-bottom: 10px;
-}
-
-.edit-button {
-  background-color: #40a9ff;
-  color: white;
-  border: none;
-  padding: 8px 15px;
-  border-radius: 5px;
-  cursor: pointer;
-}
-
-.edit-button:hover {
-  background-color: #69c0ff;
-}
-
-.form-group {
-  margin-bottom: 15px;
-}
-
-label {
-  display: block;
-  margin-bottom: 5px;
-  color: #555;
-}
-
-input {
-  width: 100%;
-  padding: 8px;
-  border: 1px solid #ddd;
-  border-radius: 5px;
-}
+<script src="./MypageScript.js">
+import MainFooter from '@/components/layout/Footer.vue'
+import './MypageScript.js';
 
-.save-button {
-  background-color: #52c41a;
-  color: white;
-  border: none;
-  padding: 10px 20px;
-  border-radius: 5px;
-  cursor: pointer;
-  margin-top: 10px;
+export default {
+  components: {
+    MainFooter
+  }
 }
+</script>
 
-.save-button:hover {
-  background-color: #73d13d;
-} */
-</style>
+<style scoped></style>
diff --git a/src/views/mainpage/MainpageScript.js b/src/views/mainpage/MainpageScript.js
diff --git a/src/views/mainpage/MainpageView.vue b/src/views/mainpage/MainpageView.vue
@@ -7,7 +7,9 @@
       <!-- 본문 내용 -->
       <main class="flex flex-col px-6 pt-20 pb-24">
         <!-- 제목 -->
-        <h1 class="mb-6 text-2xl font-bold text-center text-gray-800">
+        <h1
+          class="mb-6 text-xl font-medium text-center text-gray-800 font-uhbeesehyun"
+        >
           오늘도 우리 아코는 한 걸음씩!
         </h1>
 
@@ -63,7 +65,12 @@
 
         <!-- 아코 이미지 -->
         <div class="text-center">
-          <svg
+          <img
+            src="@/assets/Icons/akoming/mainpage/minielephanticon.svg"
+            alt="아코 이미지"
+            class="w-32 h-32 mx-auto mb-2"
+          />
+          <!-- <svg
             class="w-32 h-32 mx-auto mb-2"
             viewBox="0 0 24 24"
             fill="none"
@@ -76,8 +83,13 @@
               d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"
             />
             <path d="M14 9l-5 5-2-2" />
-          </svg>
+          </svg> -->
           <p class="text-sm text-gray-600">토실토실 아코가 자라는 중</p>
+          <img
+            src="@/assets/Icons/akoming/mainpage/ako-01.svg"
+            alt="아코 이미지"
+            class="w-32 h-32 mx-auto mb-2"
+          />
         </div>
       </main>
       <MainFooter />
@@ -87,8 +99,9 @@
 
 <script setup>
 import { ref } from 'vue'
-import MainHeader from '@/views/mainpage/Header.vue'
-import MainFooter from '@/views/mainpage/Footer.vue'
+import MainHeader from '@/components/layout/Header.vue'
+import MainFooter from '@/components/layout/Footer.vue'
+import minielephanticon from '@/assets/Icons/akoming/mainpage/minielephanticon.svg'
 
 const stamps = ref([
   { label: 'A', completed: true, position: { top: '25px', left: '25px' } },
@@ -107,3 +120,13 @@ const tasks = ref([
   { name: '아코폴리오', completed: false }
 ])
 </script>
+
+<style scoped>
+@font-face {
+  font-family: 'UhBeeSe_hyun';
+  src: url('https://gcore.jsdelivr.net/gh/projectnoonnu/[email protected]/UhBeeSe_hyun.woff')
+    format('woff');
+  font-weight: normal;
+  font-style: normal;
+}
+</style>
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -5,7 +5,8 @@ module.exports = {
   theme: {
     extend: {
       fontFamily: {
-        pretendard: ['Pretendard', 'sans-serif'] // Pretendard 폰트 추가
+        pretendard: ['Pretendard', 'sans-serif'], // Pretendard 폰트 추가
+        uhbeesehyun: ['UhBeeSe_hyun', 'sans-serif'] // UhBeeSe_hyun 폰트 추가
       },
       colors: {
         customBg: '#FFF9F2'