From 6ac3d587f8d8f980afa79796108ba0e466982493 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Thu, 6 Mar 2025 12:15:37 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EA=B0=84?= =?UTF-8?q?=EA=B2=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/board/BoardProfile.vue | 196 ++++++++++++-------------- 1 file changed, 92 insertions(+), 104 deletions(-) diff --git a/src/components/board/BoardProfile.vue b/src/components/board/BoardProfile.vue index 25ae89d..87e08bc 100644 --- a/src/components/board/BoardProfile.vue +++ b/src/components/board/BoardProfile.vue @@ -10,12 +10,8 @@
{{ date }}
@@ -29,112 +25,104 @@ - + From d74c0ddacbbb1dde914037fef1761dca39c6ef02 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Thu, 6 Mar 2025 12:21:50 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EA=B0=84=EA=B2=A9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=EC=9E=85=EB=A0=A5=EC=B0=BD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/button/EditBtn.vue | 38 +- src/views/board/BoardView.vue | 1252 ++++++++++++++--------------- 2 files changed, 644 insertions(+), 646 deletions(-) diff --git a/src/components/button/EditBtn.vue b/src/components/button/EditBtn.vue index d3437b0..a5d2496 100644 --- a/src/components/button/EditBtn.vue +++ b/src/components/button/EditBtn.vue @@ -1,30 +1,30 @@ diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue index 84bb8b2..442114a 100644 --- a/src/views/board/BoardView.vue +++ b/src/views/board/BoardView.vue @@ -18,6 +18,21 @@ @editClick="editClick" @deleteClick="deleteClick" /> + + +
+
+ + +
+ {{ passwordAlert }} +
@@ -31,17 +46,18 @@
-
-
+
@@ -97,11 +113,7 @@ @submitEdit="handleSubmitEdit" @update:password="updatePassword" /> - +
@@ -110,677 +122,663 @@ From d11e9df73c267c3ed5837e262b4fee71362d1ced Mon Sep 17 00:00:00 2001 From: yoon Date: Thu, 6 Mar 2025 13:15:51 +0900 Subject: [PATCH 3/6] estj --- public/img/mbti/{est.png => estj.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename public/img/mbti/{est.png => estj.png} (100%) diff --git a/public/img/mbti/est.png b/public/img/mbti/estj.png similarity index 100% rename from public/img/mbti/est.png rename to public/img/mbti/estj.png From 2331a345aa965fa5dbd3c5d98e92468994c6629f Mon Sep 17 00:00:00 2001 From: yoon Date: Thu, 6 Mar 2025 13:16:07 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EC=8B=9C=20=EC=83=89=EC=83=81=20=EC=B2=B4=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/input/FormSelect.vue | 8 ++++++-- src/components/user/RegisterForm.vue | 25 +++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/components/input/FormSelect.vue b/src/components/input/FormSelect.vue index 1da67e5..99fbfb3 100644 --- a/src/components/input/FormSelect.vue +++ b/src/components/input/FormSelect.vue @@ -5,7 +5,7 @@ *
- @@ -91,7 +91,7 @@ const props = defineProps({ }, }); -const emit = defineEmits(['update:data']); +const emit = defineEmits(['update:data', 'blur']); const selectData = ref(props.value); // props.value의 변경을 감지하는 watch 추가 @@ -106,6 +106,10 @@ watch(() => props.data, (newData) => { if (props.value === '0') { selectData.value = newData[0].value; emit('update:data', selectData.value); + + if (props.isColor) { + emit('blur'); + } } } }, { immediate: true }); diff --git a/src/components/user/RegisterForm.vue b/src/components/user/RegisterForm.vue index 5a5b557..0a6c7a7 100644 --- a/src/components/user/RegisterForm.vue +++ b/src/components/user/RegisterForm.vue @@ -95,9 +95,11 @@ :is-color="true" :data="colorList" @update:data="color = $event" + @blur="checkColorDuplicate" class="w-50" />
+ {{ colorError }}
{ const response = await $api.get(`/user/checkId?memberIds=${id.value}`); - if (!response.data.data) { idErrorAlert.value = true; idError.value = '이미 사용 중인 아이디입니다.'; @@ -295,9 +298,26 @@ } }; + + // 색상 중복체크 + const checkColorDuplicate = async () => { + const response = await $api.get(`/user/checkColor?memberCol=${color.value}`); + + if (response.data.data) { + colorErrorAlert.value = true; + colorError.value = '이미 사용 중인 색상입니다.'; + } else { + colorErrorAlert.value = false; + colorError.value = ''; + } + }; + + // 회원가입 const handleSubmit = async () => { + await checkColorDuplicate(); + idAlert.value = id.value.trim() === ''; passwordAlert.value = password.value.trim() === ''; passwordcheckAlert.value = passwordcheck.value.trim() === ''; @@ -317,7 +337,8 @@ } if (profilAlert.value || idAlert.value || idErrorAlert.value || passwordAlert.value || passwordcheckAlert.value || - passwordcheckErrorAlert.value || pwhintResAlert.value || nameAlert.value || birthAlert.value || addressAlert.value || phoneAlert.value || phoneErrorAlert.value) { + passwordcheckErrorAlert.value || pwhintResAlert.value || nameAlert.value || birthAlert.value || + addressAlert.value || phoneAlert.value || phoneErrorAlert.value || colorErrorAlert.value) { return; } From 19ce33e503395102e0bb801cdb0c01059b49ec80 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Thu, 6 Mar 2025 15:09:36 +0900 Subject: [PATCH 5/6] =?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/components/editor/QEditor.vue | 253 +++++++++++------------ src/components/wordDict/DictWrite.vue | 277 +++++++++++++------------- src/views/board/BoardEdit.vue | 196 ++++++++++-------- src/views/board/BoardView.vue | 27 +-- 4 files changed, 385 insertions(+), 368 deletions(-) diff --git a/src/components/editor/QEditor.vue b/src/components/editor/QEditor.vue index 3ff77e9..b66537b 100644 --- a/src/components/editor/QEditor.vue +++ b/src/components/editor/QEditor.vue @@ -52,147 +52,148 @@ diff --git a/src/components/wordDict/DictWrite.vue b/src/components/wordDict/DictWrite.vue index ceaa999..a08e901 100644 --- a/src/components/wordDict/DictWrite.vue +++ b/src/components/wordDict/DictWrite.vue @@ -14,13 +14,13 @@ />
- +
- +
-
- +
+ + +
- +
@@ -48,95 +69,96 @@ diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue index 442114a..d32b3e6 100644 --- a/src/views/board/BoardView.vue +++ b/src/views/board/BoardView.vue @@ -229,7 +229,7 @@ const data = response.data.data; profileName.value = data.author || '익명'; - + console.log(data.author); authorId.value = data.authorId; boardTitle.value = data.title || '제목 없음'; boardContent.value = data.content || ''; @@ -569,7 +569,7 @@ try { const response = await axios.post(`board/${currentBoardId.value}/password`, { LOCBRDPWD: password.value, - LOCBRDSEQ: 288, + LOCBRDSEQ: currentBoardId.value, }); if (response.data.code === 200 && response.data.data === true) { @@ -586,17 +586,18 @@ passwordAlert.value = '비밀번호가 일치하지 않습니다.'; } } catch (error) { - if (error.response) { - if (error.response.status === 401) { - passwordAlert.value = '비밀번호가 일치하지 않습니다.'; - } else { - passwordAlert.value = error.response.data?.message || '서버 오류가 발생했습니다.'; - } - } else if (error.request) { - passwordAlert.value = '네트워크 오류가 발생했습니다. 다시 시도해주세요.'; - } else { - passwordAlert.value = '요청 중 알 수 없는 오류가 발생했습니다.'; - } + if (error.reponse && error.reponse.status === 401) passwordAlert.value = '비밀번호가 일치하지 않습니다.'; + // if (error.response) { + // if (error.response.status === 401) { + // passwordAlert.value = '비밀번호가 일치하지 않습니다.'; + // } else { + // passwordAlert.value = error.response.data?.message || '서버 오류가 발생했습니다.'; + // } + // } else if (error.request) { + // passwordAlert.value = '네트워크 오류가 발생했습니다. 다시 시도해주세요.'; + // } else { + // passwordAlert.value = '요청 중 알 수 없는 오류가 발생했습니다.'; + // } } }; From 243b9702276cb1f44ebca629adbabe5368f836dc Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 7 Mar 2025 10:22:22 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=ED=99=94=EB=A9=B4=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/board/BoardEdit.vue | 109 ++++++++++++++++++++++++++++------ 1 file changed, 91 insertions(+), 18 deletions(-) diff --git a/src/views/board/BoardEdit.vue b/src/views/board/BoardEdit.vue index 94e3c9e..14514f1 100644 --- a/src/views/board/BoardEdit.vue +++ b/src/views/board/BoardEdit.vue @@ -22,19 +22,21 @@ /> -

첨부파일: {{ fileCount }} / 5개

-

{{ fileError }}

+
+

첨부파일: {{ fileCount }} / 5개

+

{{ fileError }}

-
    -
  • - {{ file.name }} - -
  • -
+
    +
  • + {{ file.name }} + +
  • +
+
@@ -71,7 +73,8 @@