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
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 }}
-
- {{ views }}
-
-
- {{ commentNum }}
-
+ {{ views }}
+ {{ commentNum }}
@@ -29,112 +25,104 @@
-
+
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/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/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 @@
*
-
+ {{ 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;
}
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 @@
/>
-
+
-
-
+
@@ -54,165 +59,153 @@
\ No newline at end of file
+
+ @media (max-width: 768px) {
+ .btn-margin {
+ margin-top: 2.5rem;
+ }
+ }
+
diff --git a/src/views/board/BoardEdit.vue b/src/views/board/BoardEdit.vue
index 354b75d..14514f1 100644
--- a/src/views/board/BoardEdit.vue
+++ b/src/views/board/BoardEdit.vue
@@ -10,25 +10,48 @@
-
+
+
+
+
+
+
첨부파일: {{ fileCount }} / 5개
+
{{ fileError }}
+
+
+ -
+ {{ file.name }}
+ ✖
+
+
+
+
-
+
@@ -48,95 +71,167 @@
diff --git a/src/views/board/BoardView.vue b/src/views/board/BoardView.vue
index 84bb8b2..d32b3e6 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 @@
-
+
첨부파일 ({{ attachments.length }}개)
-
+
@@ -97,11 +113,7 @@
@submitEdit="handleSubmitEdit"
@update:password="updatePassword"
/>
-
+
@@ -110,677 +122,664 @@