From 60e082ac9eae879e8da9f3ed37a96dcf239eecf5 Mon Sep 17 00:00:00 2001 From: study2895 <144806675+study2895@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:10:27 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Feat:=20Footer=EA=B3=BC=20Header=20?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=ED=8F=B4=EB=8D=94=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=EB=B0=8F=20import=EB=AC=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout/FeedLayout.vue | 4 +- .../mainpage => components/layout}/Footer.vue | 0 .../mainpage => components/layout}/Header.vue | 2 +- src/views/calendar/CalendarMainView.vue | 4 +- src/views/feed/AkoStampWriteView.vue | 2 +- src/views/login/mypage/MypageView.vue | 121 ++---------------- src/views/mainpage/MainpageScript.js | 0 src/views/mainpage/MainpageView.vue | 14 +- 8 files changed, 28 insertions(+), 119 deletions(-) rename src/{views/mainpage => components/layout}/Footer.vue (100%) rename src/{views/mainpage => components/layout}/Header.vue (85%) create mode 100644 src/views/mainpage/MainpageScript.js diff --git a/src/components/layout/FeedLayout.vue b/src/components/layout/FeedLayout.vue index 7c72d89..2c4351e 100644 --- a/src/components/layout/FeedLayout.vue +++ b/src/components/layout/FeedLayout.vue @@ -8,8 +8,8 @@ diff --git a/src/views/calendar/CalendarMainView.vue b/src/views/calendar/CalendarMainView.vue index 90bb920..4d4da13 100644 --- 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/AkoStampWriteView.vue b/src/views/feed/AkoStampWriteView.vue index 37557c2..7836889 100644 --- a/src/views/feed/AkoStampWriteView.vue +++ b/src/views/feed/AkoStampWriteView.vue @@ -62,7 +62,7 @@ - - + diff --git a/src/views/mainpage/MainpageScript.js b/src/views/mainpage/MainpageScript.js new file mode 100644 index 0000000..e69de29 diff --git a/src/views/mainpage/MainpageView.vue b/src/views/mainpage/MainpageView.vue index 1e3caab..9063755 100644 --- a/src/views/mainpage/MainpageView.vue +++ b/src/views/mainpage/MainpageView.vue @@ -97,8 +97,8 @@ + + From 2f26f116ce715cd9c620d927cbaf3bab3eb4b9d3 Mon Sep 17 00:00:00 2001 From: study2895 <144806675+study2895@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:17:41 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Feat:=20Fonts=ED=8F=B4=EB=8D=94=EC=97=90=20?= =?UTF-8?q?Fonts.css=20=EC=9E=91=EC=84=B1=20=EB=B0=8F=20=EB=A9=94=EC=9D=B8?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=8F=B0=ED=8A=B8=20uhbee?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fonts 추가 시 요 폴더에 추가해주시면 감사하겠습니다 !!!✨ --- src/assets/fonts/fonts.css | 8 ++++++++ src/main.js | 2 ++ src/views/mainpage/MainpageView.vue | 4 +++- tailwind.config.js | 3 ++- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/assets/fonts/fonts.css diff --git a/src/assets/fonts/fonts.css b/src/assets/fonts/fonts.css new file mode 100644 index 0000000..318998f --- /dev/null +++ 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/noonfonts_five@.2.0/UhBeeSe_hyun.woff') + format('woff'); + font-weight: normal; + font-style: normal; +} diff --git a/src/main.js b/src/main.js index f16b06b..2f8a672 100644 --- 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/mainpage/MainpageView.vue b/src/views/mainpage/MainpageView.vue index 9063755..3f6368c 100644 --- a/src/views/mainpage/MainpageView.vue +++ b/src/views/mainpage/MainpageView.vue @@ -7,7 +7,9 @@
-

+

오늘도 우리 아코는 한 걸음씩!

diff --git a/tailwind.config.js b/tailwind.config.js index 8becf89..1894f5d 100644 --- 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'