diff --git a/public/css/custom.css b/public/css/custom.css index 9d906e2..f86b056 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -7,7 +7,6 @@ /* board */ .board-content img { max-width: 100% !important; - width: 100% !important; height: auto !important; display: block; object-fit: contain; @@ -520,6 +519,24 @@ /* project list */ +.hidden-start-input { + position: absolute; + top: 103%; + left: 20%; + width: 100%; + height: 40px; + opacity: 0; +} + +.hidden-end-input { + position: absolute; + top: 113.3%; + left: 20%; + width: 100%; + height: 40px; + opacity: 0; +} + .map { top: -160px; left: -5px; @@ -684,73 +701,83 @@ /* BoardComment end */ +/* vote */ +.hidden-date-input { + position: absolute; + top: 31.5%; + left: 17%; + width: 100%; + opacity: 0; + pointer-events: none; +} + /* 권한부여 */ .user-card-container { - display: flex; - flex-wrap: wrap; - gap: 20px; - justify-content: center; - margin-top: 20px; + display: flex; + flex-wrap: wrap; + gap: 20px; + justify-content: center; + margin-top: 20px; } .user-card { - width: 200px; - padding: 15px; - border: 1px solid #ddd; - border-radius: 10px; - background-color: #fff; - box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.1); - display: flex; - flex-direction: column; - align-items: center; - text-align: center; + width: 200px; + padding: 15px; + border: 1px solid #ddd; + border-radius: 10px; + background-color: #fff; + box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.1); + display: flex; + flex-direction: column; + align-items: center; + text-align: center; } .profile-img { - width: 80px; - height: 80px; - border-radius: 50%; - object-fit: cover; - margin-bottom: 10px; + width: 80px; + height: 80px; + border-radius: 50%; + object-fit: cover; + margin-bottom: 10px; } .switch { - position: relative; - display: inline-block; - width: 50px; - height: 24px; - margin-top: 5px; + position: relative; + display: inline-block; + width: 50px; + height: 24px; + margin-top: 5px; } .switch input { - opacity: 0; - width: 0; - height: 0; + opacity: 0; + width: 0; + height: 0; } .slider { - position: absolute; - cursor: pointer; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: #ccc; - transition: .4s; - border-radius: 24px; + position: absolute; + cursor: pointer; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: #ccc; + transition: .4s; + border-radius: 24px; } .slider:before { - position: absolute; - content: ""; - height: 18px; - width: 18px; - left: 4px; - bottom: 3px; - background-color: white; - transition: .4s; - border-radius: 50%; + position: absolute; + content: ""; + height: 18px; + width: 18px; + left: 4px; + bottom: 3px; + background-color: white; + transition: .4s; + border-radius: 50%; } input:checked + .slider { - background-color: #4CAF50; + background-color: #4CAF50; } input:checked + .slider:before { - transform: translateX(24px); + transform: translateX(24px); } /* 권한부여 끝 */ diff --git a/public/css/font.css b/public/css/font.css index 3768acc..6c499cd 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -1,23 +1,10 @@ -/* @font-face { - font-family: 'GmarketSansMedium'; - src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff'); - font-weight: normal; - font-style: normal; -} -body { - font-family: 'GmarketSansMedium', sans-serif; - font-size: 16px; - line-height: 1.6; - color: #333; -} */ - +/* 1) */ /* @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-size: 16px; @@ -25,13 +12,13 @@ body { color: #333; } */ +/* 2) */ /* @font-face { font-family: 'Pretendard-Regular'; src: url('https://cdn.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff'); font-weight: 400; font-style: normal; } - body { font-family: 'Pretendard-Regular', sans-serif; font-size: 16px; @@ -39,20 +26,117 @@ body { color: #333; } */ +/* 3) */ /* @font-face { - font-family: 'S-CoreDream-3Light'; - src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_six@1.2/S-CoreDream-3Light.woff') format('woff'); + font-family: 'NEXON Lv1 Gothic OTF'; + src: url('https://fastly.jsdelivr.net/gh/projectnoonnu/noonfonts_20-04@2.1/NEXON Lv1 Gothic OTF.woff') format('woff'); font-weight: normal; font-style: normal; } - body { - font-family: 'S-CoreDream-3Light', sans-serif; + font-family: 'NEXON Lv1 Gothic OTF', sans-serif; font-size: 16px; line-height: 1.6; color: #333; } */ +/* 4) */ +/* @font-face { + font-family: 'SUITE-Regular'; + src: url('https://fastly.jsdelivr.net/gh/projectnoonnu/noonfonts_2304-2@1.0/SUITE-Regular.woff2') format('woff2'); + font-weight: 400; + font-style: normal; +} +body { + font-family: 'SUITE-Regular', sans-serif; + font-size: 16px; + line-height: 1.6; + color: #333; +} */ + +/* 5) */ +/* @font-face { + font-family: 'GoyangIlsan'; + src: url('https://fastly.jsdelivr.net/gh/projectnoonnu/noonfonts_one@1.0/GoyangIlsan.woff') format('woff'); + font-weight: normal; + font-style: normal; +} +body { + font-family: 'GoyangIlsan', sans-serif; + font-size: 16px; + line-height: 1.6; + color: #333; +} */ + +/* 6) */ +/* @font-face { + font-family: 'GowunDodum-Regular'; + src: url('https://fastly.jsdelivr.net/gh/projectnoonnu/noonfonts_2108@1.1/GowunDodum-Regular.woff') format('woff'); + font-weight: normal; + font-style: normal; +} +body { + font-family: 'GowunDodum-Regular', sans-serif; + font-size: 16px; + line-height: 1.6; + color: #333; +} */ + +/* 7) */ +/* @font-face { + font-family: 'EASTARJET-Medium'; + src: url('https://fastly.jsdelivr.net/gh/projectnoonnu/noonfonts_231029@1.1/EASTARJET-Medium.woff2') format('woff2'); + font-weight: 500; + font-style: normal; +} +body { + font-family: 'EASTARJET-Medium', sans-serif; + font-size: 16px; + line-height: 1.6; + color: #333; +} */ + +/* 8) */ +/* @font-face { + font-family: 'HakgyoansimChulseokbuTTF-B'; + src: url('https://fastly.jsdelivr.net/gh/projectnoonnu/2408-5@1.0/HakgyoansimChulseokbuTTF-B.woff2') format('woff2'); + font-weight: 400; + font-style: normal; +} +body { + font-family: 'HakgyoansimChulseokbuTTF-B', sans-serif; + font-size: 16px; + line-height: 1.6; + color: #333; +} */ + +/* 9) */ +/* @font-face { + font-family: 'GongGothicMedium'; + src: url('https://fastly.jsdelivr.net/gh/projectnoonnu/noonfonts_20-10@1.0/GongGothicMedium.woff') format('woff'); + font-weight: normal; + font-style: normal; +} +body { + font-family: 'GongGothicMedium', sans-serif; + font-size: 16px; + line-height: 1.6; + color: #333; +} */ + + +/* @font-face { + font-family: 'MangoDdobak-B'; + src: url('https://fastly.jsdelivr.net/gh/projectnoonnu/2405-3@1.1/MangoDdobak-B.woff2') format('woff2'); + font-weight: 700; + font-style: normal; +} +body { + font-family: 'MangoDdobak-B', sans-serif; + font-size: 16px; + line-height: 1.6; + color: #333; +} */ /* 나눔고딕 */ @import url('https://fonts.googleapis.com/css2?family=Nanum+Gothic&display=swap'); diff --git a/src/components/board/BoardComment.vue b/src/components/board/BoardComment.vue index 1d4a85c..9147773 100644 --- a/src/components/board/BoardComment.vue +++ b/src/components/board/BoardComment.vue @@ -4,7 +4,7 @@ :unknown="comment.author === '익명'" :isCommentAuthor="isCommentAuthor" :boardId="comment.boardId" - :profileName="comment.nickname ? comment.nickname : comment.author" + :profileName="displayName" :date="comment.createdAt" :comment="comment" :profileImg="comment.profileImg" @@ -76,10 +76,15 @@ type: Boolean, default: false, }, + nickname: { + type: String, + default: '', + }, isCommentAuthor: { type: Boolean, default: false, }, + isPlusButton: { type: Boolean, default: true, @@ -113,6 +118,10 @@ editCommentAlert: String, }); + const displayName = computed(() => { + return props.nickname? props.nickname: props.comment.author; + }); + // emits 정의 const emit = defineEmits([ 'submitComment', diff --git a/src/components/board/BoardCommentList.vue b/src/components/board/BoardCommentList.vue index 64c634d..49ec969 100644 --- a/src/components/board/BoardCommentList.vue +++ b/src/components/board/BoardCommentList.vue @@ -7,6 +7,7 @@ :isCommentAuthor="comment.isCommentAuthor" :isEditTextarea="comment.isEditTextarea" :isDeleted="isDeleted" + :nickname="comment.nickname" :isCommentPassword="isCommentPassword" :passwordCommentAlert="passwordCommentAlert || ''" :currentPasswordCommentId="currentPasswordCommentId" @@ -32,6 +33,7 @@ :isPlusButton="false" :isLike="true" :isCommentProfile="true" + :nickname="child.nickname" :isCommentAuthor="child.isCommentAuthor" :isCommentPassword="isCommentPassword" :currentPasswordCommentId="currentPasswordCommentId" diff --git a/src/components/board/BoardProfile.vue b/src/components/board/BoardProfile.vue index 42e4b1f..be278f8 100644 --- a/src/components/board/BoardProfile.vue +++ b/src/components/board/BoardProfile.vue @@ -12,7 +12,7 @@
-
{{ profileName }}
+
{{ profileName ? profileName : nickname }}
{{ date }}