From bd22c516841b50376530b08bb3ab30a36e6c06ff Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Fri, 17 Jan 2025 13:20:36 +0900
Subject: [PATCH 01/13] =?UTF-8?q?login=20api=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user/TheLogin.vue | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/views/user/TheLogin.vue b/src/views/user/TheLogin.vue
index dfbac2a..f477984 100644
--- a/src/views/user/TheLogin.vue
+++ b/src/views/user/TheLogin.vue
@@ -8,12 +8,27 @@
 </template>
 
 <script setup>
+import $api from '@/common/axios-interceptor';
+import router from '@/router';
 import LoginForm from '@c/user/LoginForm.vue';
 import LogoHeader from '@c/user/LogoHeader.vue';
 
-    const handleSubmit = async ({ id, password }) => {
-        console.log('Login');
-    };
+const handleSubmit = async ({ id, password }) => {
+    try {
+        const response = await $api.post('user/login', {
+            loginId: id,
+            password: password,
+            remember: false,
+        });
+
+        if (response.status === 200) {
+            console.log('로그인 성공', response.data);
+            router.push('/');
+        }
+    } catch (error) {
+        console.error('로그인 실패', error);
+    }
+};
 </script>
 
 <style></style>

From c9efaf9643ff8413893c427a29ce3399c892e2cb Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Fri, 17 Jan 2025 15:15:32 +0900
Subject: [PATCH 02/13] =?UTF-8?q?api=20=EA=B2=BD=EB=A1=9C=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/views/user/TheLogin.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/user/TheLogin.vue b/src/views/user/TheLogin.vue
index f477984..b30793b 100644
--- a/src/views/user/TheLogin.vue
+++ b/src/views/user/TheLogin.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script setup>
-import $api from '@/common/axios-interceptor';
+import $api from '@api';
 import router from '@/router';
 import LoginForm from '@c/user/LoginForm.vue';
 import LogoHeader from '@c/user/LogoHeader.vue';

From 6c83a287216fd7226a1c46ccf2e8b10d9813d173 Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Tue, 21 Jan 2025 13:33:58 +0900
Subject: [PATCH 03/13] login

---
 src/components/user/LoginForm.vue | 27 +++++++++++++++++++--------
 src/views/user/TheLogin.vue       | 20 +-------------------
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/components/user/LoginForm.vue b/src/components/user/LoginForm.vue
index 9296d52..71a9b1d 100644
--- a/src/components/user/LoginForm.vue
+++ b/src/components/user/LoginForm.vue
@@ -12,7 +12,7 @@
 
             <UserFormInput
                 title="비밀번호"
-                name="pw"
+                name="password"
                 type="password"
                 :is-alert="passwordAlert"
                 @update:data="handlePasswordChange"
@@ -36,6 +36,8 @@
 </template>
 
 <script setup>
+    import $api from '@api';
+    import router from '@/router';
     import { ref } from 'vue';
     import UserFormInput from '@c/input/UserFormInput.vue';
 
@@ -44,8 +46,6 @@
     const idAlert = ref(false);
     const passwordAlert = ref(false);
 
-    const emit = defineEmits(['submit']);
-
     const handleIdChange = value => {
         id.value = value;
         idAlert.value = false;
@@ -56,12 +56,23 @@
         passwordAlert.value = false;
     };
 
-    const handleSubmit = () => {
-        idAlert.value = id.value.trim() === '';
-        passwordAlert.value = password.value.trim() === '';
+    const handleSubmit = async () => {
 
-        if (!idAlert.value && !passwordAlert.value) {
-            emit('submit', { id: id.value, password: password.value });
+        try {
+            const response = await $api.post('user/login', {
+                loginId: id.value,
+                password: password.value,
+                remember: false,
+            });
+
+            if (response.status === 200) {
+                console.log('로그인 성공', response.data);
+                router.push('/');
+            }
+        } catch (error) {
+            console.error('로그인 실패', error);
         }
     };
+
+
 </script>
diff --git a/src/views/user/TheLogin.vue b/src/views/user/TheLogin.vue
index b30793b..cc10bb1 100644
--- a/src/views/user/TheLogin.vue
+++ b/src/views/user/TheLogin.vue
@@ -2,33 +2,15 @@
     <div class="d-flex justify-content-center align-items-center vh-100">
         <div class="container container-p-y rounded bg-white" style="max-width: 500px">
             <LogoHeader title="LOCALNET" />
-            <LoginForm @submit="handleSubmit" />
+            <LoginForm />
         </div>
     </div>
 </template>
 
 <script setup>
-import $api from '@api';
-import router from '@/router';
 import LoginForm from '@c/user/LoginForm.vue';
 import LogoHeader from '@c/user/LogoHeader.vue';
 
-const handleSubmit = async ({ id, password }) => {
-    try {
-        const response = await $api.post('user/login', {
-            loginId: id,
-            password: password,
-            remember: false,
-        });
-
-        if (response.status === 200) {
-            console.log('로그인 성공', response.data);
-            router.push('/');
-        }
-    } catch (error) {
-        console.error('로그인 실패', error);
-    }
-};
 </script>
 
 <style></style>

From 3f96011c2abee39b54f0fbccb1e31c18489ec148 Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Tue, 21 Jan 2025 13:34:12 +0900
Subject: [PATCH 04/13] =?UTF-8?q?=EA=B3=B5=ED=86=B5=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/input/FormSelect.vue | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/input/FormSelect.vue b/src/components/input/FormSelect.vue
index d95b94e..43c41b5 100644
--- a/src/components/input/FormSelect.vue
+++ b/src/components/input/FormSelect.vue
@@ -1,12 +1,14 @@
 <template>
-    <div class="mb-2" :class="isRow ?'row' : ''">
+    <div class="mb-2" :class="isRow ? 'row' : ''">
         <label :for="name" class="col-md-2 col-form-label" :class="isLabel ? 'd-block' : 'd-none'">
             {{ title }}
             <span :class="isEssential ? 'link-danger' : 'none'">*</span>
         </label>
-        <div :class="isRow ?'col-md-10' : 'col-md-12'">
+        <div :class="isRow ? 'col-md-10' : 'col-md-12'">
             <select class="form-select" :id="name" v-model="selectData">
-                <option v-for="(item , i) in data" :key="item" :value="i" :selected="value == i">{{ item }}</option>
+                <option v-for="(item, i) in data" :key="i" :value="isCommon ? item.value : i">
+                    {{ isCommon ? item.label : item }}
+                </option>
             </select>
         </div>
         <div v-if="isAlert" class="invalid-feedback">{{ title }}을 확인해주세요.</div>
@@ -56,13 +58,24 @@ const props = defineProps({
         type: Boolean,
         default: true,
         required: false,
+    },
+    isCommon : {
+        type: Boolean,
+        default: false,
+        required: false,
     }
 });
 
 const emit = defineEmits(['update:data']);
 const selectData = ref(props.value);
 
+
 watchEffect(() => {
+    if (props.isCommon && props.data.length > 0) {
+        selectData.value = props.data[0].value; // 첫 번째 옵션의 값으로 설정
+    } else {
+        selectData.value = props.value; // 기본값으로 설정
+    }
     emit('update:data', selectData.value);
 })
 </script>

From e66dcad9313ad7c2141c97fc124e4c2f7e74e290 Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Tue, 21 Jan 2025 13:35:42 +0900
Subject: [PATCH 05/13] =?UTF-8?q?date=20=ED=83=80=EC=9E=85=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/input/UserFormInput.vue | 133 ++++++++++++++-----------
 1 file changed, 73 insertions(+), 60 deletions(-)

diff --git a/src/components/input/UserFormInput.vue b/src/components/input/UserFormInput.vue
index 4e0217d..54024ec 100644
--- a/src/components/input/UserFormInput.vue
+++ b/src/components/input/UserFormInput.vue
@@ -11,9 +11,10 @@
                     class="form-control"
                     :type="type"
                     @input="updateInput"
-                    :value="value"
+                    :value="computedValue"
                     :maxLength="maxlength"
                     :placeholder="title"
+                    @blur="$emit('blur')"
                 />
                 <span class="input-group-text">@ localhost.co.kr</span>
             </div>
@@ -23,78 +24,90 @@
                     class="form-control"
                     :type="type"
                     @input="updateInput"
-                    :value="value"
+                    :value="computedValue"
                     :maxLength="maxlength"
                     :placeholder="title"
+                    @blur="$emit('blur')"
                 />
             </div>
-
             <div class="invalid-feedback" :class="isAlert ? 'd-block' : ''">{{ title }}를 확인해주세요.</div>
         </div>
     </div>
 </template>
 
 <script setup>
-import { ref } from 'vue';
+    import { inject, computed } from 'vue';
 
-const prop = defineProps({
-    title: {
-        type: String,
-        default: '라벨',
-        required: true,
-    },
-    name: {
-        type: String,
-        default: 'nameplz',
-        required: true,
-    },
-    isEssential: {
-        type: Boolean,
-        default: false,
-        required: false,
-    },
-    type: {
-        type: String,
-        default: 'text',
-        required: false,
-    },
-    value: {
-        type: String,
-        default: '',
-        require: false,
-    },
-    maxlength: {
-        type: Number,
-        default: 30,
-        required: false,
-    },
-    isAlert : {
-        type: Boolean,
-        default: false,
-        required: false,
-    },
-    useInputGroup: {
-        type: Boolean,
-        default: false,
-        required: false,
-    },
-});
+    const props = defineProps({
+        title: {
+            type: String,
+            default: '라벨',
+            required: true,
+        },
+        name: {
+            type: String,
+            default: 'nameplz',
+            required: true,
+        },
+        isEssential: {
+            type: Boolean,
+            default: false,
+            required: false,
+        },
+        type: {
+            type: String,
+            default: 'text',
+            required: false,
+        },
+        value: {
+            type: String,
+            default: '',
+            required: false,
+        },
+        maxlength: {
+            type: Number,
+            default: 30,
+            required: false,
+        },
+        isAlert: {
+            type: Boolean,
+            default: false,
+            required: false,
+        },
+        useInputGroup: {
+            type: Boolean,
+            default: false,
+            required: false,
+        },
+    });
 
-const emits = defineEmits(['update:data', 'update:alert'])
+    const emits = defineEmits(['update:data', 'update:alert', 'blur']);
 
-const updateInput = function (event) {
-    //Type Number 일때 maxlength 적용 안됨 방지
-    if (event.target.value.length > prop.maxlength) {
-        event.target.value = event.target.value.slice(0, prop.maxlength);
-    }
-    emits('update:data', event.target.value);
+    // dayjs 인스턴스 가져오기
+    const dayjs = inject('dayjs');
 
-    // 값이 입력될 때 isAlert를 false로 설정
-    if (event.target.value.trim() !== '') { emits('update:alert', false); }
+    // 오늘 날짜를 YYYY-MM-DD 형식으로 변환
+    const today = dayjs().format('YYYY-MM-DD');
 
-};
+    // date인 경우 기본값 -> 오늘 날짜
+    const computedValue = computed(() => {
+        return props.type === 'date' ? props.value || today : props.value;
+    });
+
+    // 입력값 업데이트
+    const updateInput = event => {
+        const newValue = event.target.value.slice(0, props.maxlength);
+
+        // date인 경우 날짜 형식 유지
+        if (props.type === 'date') {
+            emits('update:data', newValue.replace(/[^0-9-]/g, ''));
+        } else {
+            emits('update:data', newValue);
+        }
+
+        // 값이 입력될 때 isAlert를 false로 설정
+        if (newValue.trim() !== '') {
+            emits('update:alert', false);
+        }
+    };
 </script>
-
-<style>
-
-</style>

From e7c3833640574f923a9ae3199bb83422b04f9588 Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Tue, 21 Jan 2025 14:54:11 +0900
Subject: [PATCH 06/13] =?UTF-8?q?=EB=93=B1=EB=A1=9D=EC=8B=A0=EC=B2=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/user/RegisterForm.vue | 205 ++++++++++++++++++++++-----
 src/views/user/TheRegister.vue       |   5 +-
 2 files changed, 171 insertions(+), 39 deletions(-)

diff --git a/src/components/user/RegisterForm.vue b/src/components/user/RegisterForm.vue
index 52ebca7..7b6dd93 100644
--- a/src/components/user/RegisterForm.vue
+++ b/src/components/user/RegisterForm.vue
@@ -3,11 +3,12 @@
         <div class="text-center">
             <label
                 for="profilePic"
-                class="rounded-circle m-auto border-label-secondary ui-bg-cover position-relative cursor-pointer"
+                class="rounded-circle m-auto ui-bg-cover position-relative cursor-pointer"
                 id="profileLabel"
-                style="width: 100px; height: 100px; background-image: url(public/img/avatars/default-Profile.jpg)"
+                style="width: 100px; height: 100px; background-image: url(public/img/avatars/default-Profile.jpg); background-repeat: no-repeat;"
             >
             </label>
+
             <span class="link-danger position-absolute">*</span>
             <input type="file" id="profilePic" class="d-none" @change="profileUpload" />
             <span v-if="profilerr" class="invalid-feedback d-block">{{ profilerr }}</span>
@@ -22,8 +23,10 @@
                 :useInputGroup="true"
                 @update:data="id = $event"
                 @update:alert="idAlert = $event"
+                @blur="checkIdDuplicate"
                 :value="id"
             />
+            <span v-if="idError" class="invalid-feedback d-block">{{ idError }}</span>
 
             <UserFormInput
                 title="비밀번호"
@@ -44,16 +47,28 @@
                 :is-alert="passwordcheckAlert"
                 @update:data="passwordcheck = $event"
                 @update:alert="passwordcheckAlert = $event"
+                @blur="checkPw"
                 :value="passwordcheck"
             />
+            <span v-if="passwordcheckError" class="invalid-feedback d-block">{{ passwordcheckError }}</span>
 
+            <FormSelect
+                    title="비밀번호 힌트"
+                    name="pwhint"
+                    :is-essential="true"
+                    :is-row="false"
+                    :is-label="true"
+                    :data="pwhintList"
+                    @update:data="pwhint = $event"
+            />
             <UserFormInput
-                title="비밀번호 힌트"
-                name="pwhint"
-                :is-alert="passwordhintAlert"
-                @update:data="passwordhint = $event"
-                @update:alert="passwordhintAlert = $event"
-                :value="passwordhint"
+                title="답변"
+                name="pwhintRes"
+                :is-essential="true"
+                :is-alert="pwhintResAlert"
+                @update:data="pwhintRes = $event"
+                @update:alert="pwhintResAlert = $event"
+                :value="pwhintRes"
             />
 
             <div class="d-flex">
@@ -74,6 +89,7 @@
                     :is-essential="true"
                     :is-row="false"
                     :is-label="true"
+                    :is-common="true"
                     :data="colorList"
                     @update:data="color = $event"
                     class="w-50"
@@ -84,6 +100,7 @@
                 <UserFormInput
                     title="생년월일"
                     name="birth"
+                    :type="'date'"
                     :is-essential="true"
                     :is-alert="birthAlert"
                     @update:data="birth = $event"
@@ -98,6 +115,7 @@
                     :is-essential="true"
                     :is-row="false"
                     :is-label="true"
+                    :is-common="true"
                     :data="mbtiList"
                     @update:data="mbti = $event"
                     class="w-50"
@@ -109,7 +127,7 @@
                 name="arr"
                 :isEssential="true"
                 :is-alert="arrAlert"
-                @update:data="arr = $event"
+                @update:data="handleAddressUpdate"
                 @update:alert="arrAlert = $event"
                 :value="arr"
             />
@@ -134,69 +152,80 @@
 </template>
 
 <script setup>
-    import { ref } from 'vue';
+    import { ref, onMounted } from 'vue';
+    import $api from '@api';
     import UserFormInput from '@c/input/UserFormInput.vue';
-    import FormSelect from '@/components/input/FormSelect.vue';
-    import ArrInput from '@/components/input/ArrInput.vue';
+    import FormSelect from '@c/input/FormSelect.vue';
+    import ArrInput from '@c/input/ArrInput.vue';
+    import { fileMsg } from '@/common/msgEnum';
+    import { useRouter } from 'vue-router';
+    import { useToastStore } from '@s/toastStore';
+
+    const pwhintList = ['현재 살고 있는 동네', '가장 기억에 남는 책', '좋아하는 음식'];
+
+    const router = useRouter();
 
     const profile = ref(null);
     const profilerr = ref('');
 
     const id = ref('');
+    const idError = ref('');
     const password = ref('');
     const passwordcheck = ref('');
-    const passwordhint = ref('');
+    const passwordcheckError = ref('');
+    const pwhint = ref(0);
+    const pwhintRes = ref('');
     const name = ref('');
     const birth = ref('');
-    const arr = ref('');
+    const arr = ref('');        // 전체 주소
+    const postcode = ref('');   // 우편번호
     const phone = ref('');
-    const color = ref('');
-    const mbti = ref('');
+    const colorList = ref([]);
+    const mbtiList = ref([]);
+    const color = ref(''); // 선택된 color
+    const mbti = ref('');  // 선택된 MBTI
 
+    const profilAlert = ref(false);
     const idAlert = ref(false);
+    const idErrorAlert = ref(false);
     const passwordAlert = ref(false);
     const passwordcheckAlert = ref(false);
-    const passwordhintAlert = ref(false);
+    const passwordcheckErrorAlert = ref(false); // 비밀번호 확인 오류 메시지
+    const pwhintResAlert = ref(false);
     const nameAlert = ref(false);
     const birthAlert = ref(false);
     const arrAlert = ref(false);
     const phoneAlert = ref(false);
 
-    const handleSubmit = async () => {
-        idAlert.value = id.value.trim() === '';
-        passwordAlert.value = password.value.trim() === '';
-        passwordcheckAlert.value = passwordcheck.value.trim() === '';
-        passwordhintAlert.value = passwordhint.value.trim() === '';
-        nameAlert.value = name.value.trim() === '';
-        birthAlert.value = birth.value.trim() === '';
-        arrAlert.value = arr.value.trim() === '';
-        phoneAlert.value = phone.value.trim() === '';
+    const toastStore = useToastStore();
 
-        if (!profile.value) {
-            profilerr.value = '프로필 이미지를 선택해주세요.';
-            return;
-        }
-    };
 
+    // 프로필 체크
     const profileValid = (size, type) => {
         const maxSize = 5 * 1024 * 1024;
         const validTypes = ['image/jpeg', 'image/png'];
+
+        // 용량
         if (size > maxSize) {
-            profilerr.value = '5MB 미만의 파일만 업로드할 수 있습니다.';
+            profilerr.value = fileMsg.FileMaxSizeMsg;
             return false;
         }
+
+        // 파일 타입
         if (!validTypes.includes(type)) {
-            profilerr.value = '지원되지 않는 파일 형식입니다. JPEG 또는 PNG만 가능합니다.';
+            profilerr.value = fileMsg.FileNotTypeMsg;
             return false;
         }
         profilerr.value = '';
         return true;
     };
 
+    // 파일 업로드 시 미리보기
     const profileUpload = e => {
         const file = e.target.files[0];
         const profileLabel = document.getElementById('profileLabel');
 
+        // 사이즈, 파일 타입 안 맞으면 기본 이미지
         if (!profileValid(file.size, file.type)) {
             e.target.value = '';
             profileLabel.style.backgroundImage = 'url("public/img/avatars/default-Profile.jpg")';
@@ -209,8 +238,114 @@
         profile.value = file;
     };
 
-    const colorList = ['blue', 'red', 'pink'];
-    const mbtiList = ['ISTP', 'ENFP', 'INTJ'];
+    // 아이디 중복체크
+    const checkIdDuplicate = async () => {
+        const response = await $api.get(`/register/checkId?memberIds=${id.value}`);
+
+        if (!response.data.data) {
+            idErrorAlert.value = true;
+            idError.value = '이미 사용 중인 아이디입니다.';
+        } else {
+            idErrorAlert.value = false;
+            idError.value = '';
+        }
+    };
+
+    const Colors = async () => {
+        try {
+            const response = await $api.get('/register/color');
+            colorList.value = response.data.data.map(item => ({
+                label: item.CMNCODNAM,
+                value: item.CMNCODVAL
+            }));
+        } catch (error) {
+            console.error('Error colors:', error);
+        }
+    };
+
+    const Mbtis = async () => {
+        try {
+            const response = await $api.get('/register/mbti');
+            mbtiList.value = response.data.data.map(item => ({
+                label: item.CMNCODNAM,
+                value: item.CMNCODVAL
+            }));
+        } catch (error) {
+            console.error('Error MBTIs:', error);
+        }
+    };
+
+    onMounted(() => {
+        Colors();
+        Mbtis();
+    });
+
+    // 주소 업데이트 핸들러
+    const handleAddressUpdate = (addressData) => {
+        arr.value = addressData.fullAddress;    // 전체 주소
+        postcode.value = addressData.postcode;  // 우편번호
+    };
+
+    // 비밀번호 확인 체크
+    const checkPw = async () => {
+        if (password.value !== passwordcheck.value) {
+            passwordcheckError.value = '비밀번호가 일치하지 않습니다.';
+            passwordcheckErrorAlert.value = true;
+        } else {
+            passwordcheckError.value = '';
+            passwordcheckErrorAlert.value = false;
+        }
+    };
+
+    // 회원가입
+    const handleSubmit = async () => {
+
+            idAlert.value = id.value.trim() === '';
+            passwordAlert.value = password.value.trim() === '';
+            passwordcheckAlert.value = passwordcheck.value.trim() === '';
+            pwhintResAlert.value = pwhintRes.value.trim() === '';
+            nameAlert.value = name.value.trim() === '';
+            birthAlert.value = birth.value.trim() === '';
+            arrAlert.value = arr.value.trim() === '';
+            phoneAlert.value = phone.value.trim() === '';
+
+            // 프로필 이미지 체크
+            if (!profile.value) {
+                profilerr.value = '프로필 이미지를 선택해주세요.';
+                profilAlert.value = true;
+            } else {
+                profilerr.value = '';
+                profilAlert.value = false;
+            }
+
+            if (profilAlert.value || idAlert.value || idErrorAlert.value || passwordAlert.value || passwordcheckAlert.value ||
+                passwordcheckErrorAlert.value || pwhintResAlert.value || nameAlert.value || birthAlert.value || arrAlert.value || phoneAlert.value) {
+                return;
+            }
+
+            const formData = new FormData();
+            formData.append('memberIds', id.value);
+            formData.append('memberPwd', password.value);
+            formData.append('memberPwh', pwhintList[pwhint.value]);
+            formData.append('memberPwr', pwhintRes.value);
+            formData.append('memberNam', name.value);
+            formData.append('memberArr', arr.value); // 전체 주소
+            formData.append('memberZip', postcode.value); // 우편번호
+            formData.append('memberTel', phone.value);
+            formData.append('memberCol', color.value);
+            formData.append('memberMbt', mbti.value);
+
+            if (profile.value) {
+                formData.append('profile', profile.value);
+            }
+
+            const response = await $api.post('/register/join', formData, { isFormData : true });
+
+            if (response.status === 200) {
+                toastStore.onToast('등록신청이 완료되었습니다. 관리자 승인 후 이용가능합니다.', 's');
+                //router.push('/login');
+            }
+    };
 </script>
 
 <style></style>
diff --git a/src/views/user/TheRegister.vue b/src/views/user/TheRegister.vue
index 7c7ec8e..4296715 100644
--- a/src/views/user/TheRegister.vue
+++ b/src/views/user/TheRegister.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="d-flex justify-content-center align-items-center">
         <div class="container rounded bg-white my-10 py-10" style="max-width: 500px">
-            <RegisterForm @submit="handleSubmit" />
+            <RegisterForm/>
         </div>
     </div>
 </template>
@@ -9,9 +9,6 @@
 <script setup>
 import RegisterForm from '@c/user/RegisterForm.vue';
 
-const handleSubmit = async (formData) => {
-    console.log('Register');
-};
 </script>
 
 <style></style>

From 471b1d33c47bbed2dc1c6e778e5f8e1fb2c704cb Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Tue, 21 Jan 2025 14:59:08 +0900
Subject: [PATCH 07/13] isEssential

---
 src/components/input/FormInput.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/input/FormInput.vue b/src/components/input/FormInput.vue
index 63be771..7f005e6 100644
--- a/src/components/input/FormInput.vue
+++ b/src/components/input/FormInput.vue
@@ -2,7 +2,7 @@
     <div class="mb-2 row">
         <label :for="name" class="col-md-2 col-form-label" :class="isLabel ? 'd-block' : 'd-none'">
             {{ title }}
-            <span class="text-danger">*</span>
+            <span :class="isEssential ? 'text-red' : 'none'">*</span>
         </label>
         <div class="col-md-10">
             <input

From 3e6c9f2c976146c70707bd0f1ca7b9048b386df6 Mon Sep 17 00:00:00 2001
From: kimdaae328 <kimdaae328@gmail.com>
Date: Tue, 21 Jan 2025 15:00:14 +0900
Subject: [PATCH 08/13] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EC=BD=94=EB=A9=98=ED=8A=B8=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=85=80=EB=A0=89=ED=8A=B8=20=EB=B0=95=EC=8A=A4=20=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/list/BoardCard.vue     | 12 +++---
 src/components/list/BoardCardList.vue | 58 ++++++++++++++++-----------
 src/components/search/SearchBar.vue   |  2 +-
 src/views/board/BoardList.vue         | 48 +++++++++++-----------
 4 files changed, 66 insertions(+), 54 deletions(-)

diff --git a/src/components/list/BoardCard.vue b/src/components/list/BoardCard.vue
index 327e1e7..bbe6551 100644
--- a/src/components/list/BoardCard.vue
+++ b/src/components/list/BoardCard.vue
@@ -34,11 +34,11 @@
                             <span class="text-muted me-3">
                                 <i class="fa-regular fa-eye"></i> {{ views || 0 }}
                             </span>
-                            <span class="text-muted me-3">
-                                <i class="bx bx-like"></i> {{ likes || 0 }}
+                            <span class="text-muted me-3" v-if="likes != null">
+                                <i class="bx bx-like"></i> {{ likes }}
                             </span>
-                            <span class="text-muted">
-                                <i class="bx bx-comment"></i> {{ comments || 0 }}
+                            <span class="text-muted" v-if="comments !== null">
+                                <i class="bx bx-comment"></i> {{ comments }}
                             </span>
                         </div>
                     </div>
@@ -80,11 +80,11 @@ const props = defineProps({
     },
     likes: {
         type: Number,
-        default: 0,
+        default: null,
     },
     comments: {
         type: Number,
-        default: 0,
+        default: null,
     },
     attachment: {
         type: Boolean,
diff --git a/src/components/list/BoardCardList.vue b/src/components/list/BoardCardList.vue
index 23f55ca..f727c6e 100644
--- a/src/components/list/BoardCardList.vue
+++ b/src/components/list/BoardCardList.vue
@@ -1,43 +1,53 @@
 <template>
     <div class="mt-4">
         <div v-if="posts.length === 0" class="text-center">
-            게시물이 없습니다.
+            <p class="text-muted mt-4">게시물이 없습니다.</p>
         </div>
         <div v-for="post in posts" :key="post.id" @click="handleClick(post.id)">
             <BoardCard
-                :img="post.img"
-                :category="post.category"
+                :img="post.img || null" 
+                :category="post.category || ''" 
                 :title="post.title"
                 :content="post.content"
                 :date="post.date"
-                :views="post.views"
-                :likes="post.likes"
-                :comments="post.comments"
-                :attachment="post.attachment"
+                :views="post.views || 0" 
+                v-bind="getBoardCardProps(post)"
+                :attachment="post.attachment || false" 
+                @click="() => goDetail(post.id)" 
                 />
         </div>
     </div>
 </template>
 
-<script>
+<script setup>
+import { defineProps, defineEmits } from 'vue';
 import BoardCard from './BoardCard.vue';
 
-export default {
-    components: {
-        BoardCard,
-    },
-    props: {
-        posts: {
-            type: Array,
-            required: true,
-        },
-    },
-    emits: ['click'],
-    methods: {
-        handleClick(id) {
-            this.$emit('click', id);
-        },
-    },
+const props = defineProps({
+    posts: {
+        type: Array,
+        required: true,
+        default: () => [],
+    }
+});
+
+const emit = defineEmits(['click']);
+
+// 상세 페이지 이동
+const goDetail = (id) => {
+    emit('click', id);
+};
+
+// 없는 데이터는 상위 페이지에서 삭제해도 되게끔 설정
+const getBoardCardProps = (post) => {
+    const boardCardProps = {};
+    if ('likes' in post) {
+        boardCardProps.likes = post.likes;
+    }
+    if ('comments' in post) {
+        boardCardProps.comments = post.comments;
+    }
+    return boardCardProps;
 };
 </script>
 
diff --git a/src/components/search/SearchBar.vue b/src/components/search/SearchBar.vue
index 56a918b..a9c1052 100644
--- a/src/components/search/SearchBar.vue
+++ b/src/components/search/SearchBar.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="input-group mb-3 d-flex">
-        <input type="text" class="form-control bg-white" placeholder="Search" @change="search" />
+        <input type="text" class="form-control" placeholder="Search" @change="search" />
         <button type="button" class="btn btn-primary"><i class="bx bx-search bx-md"></i></button>
     </div>
 </template>
diff --git a/src/views/board/BoardList.vue b/src/views/board/BoardList.vue
index 2f5d056..d5e0a45 100644
--- a/src/views/board/BoardList.vue
+++ b/src/views/board/BoardList.vue
@@ -1,6 +1,5 @@
 <template>
     <div class="container-xxl flex-grow-1 container-p-y">
-        <!-- 상단 바: 검색창, 정렬 셀렉트 박스, 새 글쓰기 버튼 -->
         <div class="row mb-4">
             <!-- 검색창 -->
             <div class="col">
@@ -9,31 +8,36 @@
         </div>
 
         <div class="row">
-            <!-- 정렬 셀렉트 박스 -->
-            <div class="col-md-3 mb-4">
-                <select class="form-select" v-model="selectedOrder" @change="handleSortChange">
-                    <option value="date">최신날짜</option>
-                    <option value="views">조회수</option>
-                </select>
-            </div>
-
-            <!-- 새 글쓰기 버튼 -->
-            <div class="col-auto ms-auto mb-4">
+            <!-- 새 글쓰기 -->
+            <div class="mb-4">
                 <router-link to="/board/write">
                     <WriteButton />
                 </router-link>
             </div>
         </div>
 
-        <!-- 공지사항 게시물 리스트 -->
-        <div class="row g-3 mt-2 mt-md-8">
+        <!-- 공지사항 리스트 -->
+        <div class="row g-3">
             <h3>공지사항</h3>
-            <board-card :posts="noticeList" @click="goDetail" />
         </div>
-        <!-- 일반 게시물 리스트 -->
+        <div class="row">
+            <BoardCardList :posts="noticeList" @click="goDetail" />
+        </div>
+
+        <!-- 일반 리스트 -->
         <div class="row g-3 mt-8">
-            <h3>일반게시판</h3>
-            <board-card :posts="generalList" @click="goDetail" />
+            <h3 class="col">일반게시판</h3>
+
+            <!-- 셀렉트 박스 -->
+            <div class="col-12 col-md-auto">
+                <select class="form-select" v-model="selectedOrder" @change="handleSortChange">
+                    <option value="date">최신날짜</option>
+                    <option value="views">조회수</option>
+                </select>
+            </div>
+        </div>
+        <div class="row">
+            <BoardCardList :posts="generalList" @click="goDetail" />
         </div>
 
         <!-- 페이지네이션 -->
@@ -61,7 +65,7 @@
 
 <script setup>
 import { ref, computed, onMounted } from 'vue';
-import BoardCard from '@/components/list/BoardCardList.vue';
+import BoardCardList from '@/components/list/BoardCardList.vue';
 import Pagination from '@c/pagination/Pagination.vue';
 import SearchBar from '@c/search/SearchBar.vue';
 import router from '@/router';
@@ -102,7 +106,7 @@ const search = (e) => {
 };
 
 // 정렬 변경 핸들러
-const handleSortChange = (event) => {
+const handleSortChange = () => {
     fetchGeneralPosts(1);
 };
 
@@ -125,8 +129,8 @@ const fetchGeneralPosts = async (page = 1) => {
             id: post.id || index,
             img: post.img || null,
             views: post.cnt || 0,
-            likes: post.likeCount || 0,
-            comments: post.commentCount || 0,
+            likes: post.likeCount != null ? post.likeCount : null,
+            comments: post.commentCount != null ? post.commentCount : null,
             attachment: post.hasAttachment || false,
         }));
 
@@ -164,8 +168,6 @@ const fetchNoticePosts = async () => {
             id: post.id || index,
             img: post.img || null,
             views: post.cnt || 0,
-            likes: post.likeCount || 0,
-            comments: post.commentCount || 0,
             attachment: post.hasAttachment || false,
         }));
     } else {

From 27e474a83772d5a5e02c6c48aee146aaff53b4f3 Mon Sep 17 00:00:00 2001
From: kimdaae328 <kimdaae328@gmail.com>
Date: Tue, 21 Jan 2025 15:27:11 +0900
Subject: [PATCH 09/13] =?UTF-8?q?=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EC=B2=AB=EB=B2=88=EC=A7=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=EB=A7=8C=20=EB=82=98=EC=98=A4=EA=B2=8C=20?=
 =?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/views/board/BoardList.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/board/BoardList.vue b/src/views/board/BoardList.vue
index d5e0a45..a4ee082 100644
--- a/src/views/board/BoardList.vue
+++ b/src/views/board/BoardList.vue
@@ -17,11 +17,13 @@
         </div>
 
         <!-- 공지사항 리스트 -->
-        <div class="row g-3">
-            <h3>공지사항</h3>
-        </div>
-        <div class="row">
-            <BoardCardList :posts="noticeList" @click="goDetail" />
+        <div v-if="pagination.currentPage === 1">
+            <div class="row g-3">
+                <h3>공지사항</h3>
+            </div>
+            <div class="row">
+                <BoardCardList :posts="noticeList" @click="goDetail" />
+            </div>
         </div>
 
         <!-- 일반 리스트 -->

From 84364e9fda4c8034a6f4a900fed229579477e869 Mon Sep 17 00:00:00 2001
From: kimdaae328 <kimdaae328@gmail.com>
Date: Tue, 21 Jan 2025 15:31:53 +0900
Subject: [PATCH 10/13] =?UTF-8?q?=EA=B0=84=EA=B2=A9=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/board/BoardList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/board/BoardList.vue b/src/views/board/BoardList.vue
index a4ee082..1f08359 100644
--- a/src/views/board/BoardList.vue
+++ b/src/views/board/BoardList.vue
@@ -17,7 +17,7 @@
         </div>
 
         <!-- 공지사항 리스트 -->
-        <div v-if="pagination.currentPage === 1">
+        <div v-if="pagination.currentPage === 1" class="mb-8">
             <div class="row g-3">
                 <h3>공지사항</h3>
             </div>
@@ -27,7 +27,7 @@
         </div>
 
         <!-- 일반 리스트 -->
-        <div class="row g-3 mt-8">
+        <div class="row g-3">
             <h3 class="col">일반게시판</h3>
 
             <!-- 셀렉트 박스 -->

From e4700b0ff80157f15361164bcb059281c390febf Mon Sep 17 00:00:00 2001
From: kimdaae328 <kimdaae328@gmail.com>
Date: Tue, 21 Jan 2025 15:33:39 +0900
Subject: [PATCH 11/13] =?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/views/board/BoardList.vue | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/board/BoardList.vue b/src/views/board/BoardList.vue
index 1f08359..87c4d0a 100644
--- a/src/views/board/BoardList.vue
+++ b/src/views/board/BoardList.vue
@@ -27,19 +27,21 @@
         </div>
 
         <!-- 일반 리스트 -->
-        <div class="row g-3">
-            <h3 class="col">일반게시판</h3>
+        <div>
+            <div class="row g-3">
+                <h3 class="col">일반게시판</h3>
 
-            <!-- 셀렉트 박스 -->
-            <div class="col-12 col-md-auto">
-                <select class="form-select" v-model="selectedOrder" @change="handleSortChange">
-                    <option value="date">최신날짜</option>
-                    <option value="views">조회수</option>
-                </select>
+                <!-- 셀렉트 박스 -->
+                <div class="col-12 col-md-auto">
+                    <select class="form-select" v-model="selectedOrder" @change="handleSortChange">
+                        <option value="date">최신날짜</option>
+                        <option value="views">조회수</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row">
+                <BoardCardList :posts="generalList" @click="goDetail" />
             </div>
-        </div>
-        <div class="row">
-            <BoardCardList :posts="generalList" @click="goDetail" />
         </div>
 
         <!-- 페이지네이션 -->

From 8089e981036692a4e81602a9b4bc9b41be9c7bdb Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Tue, 21 Jan 2025 15:49:17 +0900
Subject: [PATCH 12/13] =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=ED=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/user/RegisterForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/user/RegisterForm.vue b/src/components/user/RegisterForm.vue
index 7b6dd93..a94bc41 100644
--- a/src/components/user/RegisterForm.vue
+++ b/src/components/user/RegisterForm.vue
@@ -343,7 +343,7 @@
 
             if (response.status === 200) {
                 toastStore.onToast('등록신청이 완료되었습니다. 관리자 승인 후 이용가능합니다.', 's');
-                //router.push('/login');
+                router.push('/login');
             }
     };
 </script>

From 5095f68d6b18b6008ffb9bcb1a89b26ebfd22f34 Mon Sep 17 00:00:00 2001
From: yoon <nmjk0123@gmail.com>
Date: Thu, 23 Jan 2025 09:50:28 +0900
Subject: [PATCH 13/13] =?UTF-8?q?register=20->=20user=20=EB=A1=9C=20axios?=
 =?UTF-8?q?=20=EA=B2=BD=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

---
 src/components/user/RegisterForm.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/user/RegisterForm.vue b/src/components/user/RegisterForm.vue
index a94bc41..df715b4 100644
--- a/src/components/user/RegisterForm.vue
+++ b/src/components/user/RegisterForm.vue
@@ -240,7 +240,7 @@
 
     // 아이디 중복체크
     const checkIdDuplicate = async () => {
-        const response = await $api.get(`/register/checkId?memberIds=${id.value}`);
+        const response = await $api.get(`/user/checkId?memberIds=${id.value}`);
 
         if (!response.data.data) {
             idErrorAlert.value = true;
@@ -253,7 +253,7 @@
 
     const Colors = async () => {
         try {
-            const response = await $api.get('/register/color');
+            const response = await $api.get('/user/color');
             colorList.value = response.data.data.map(item => ({
                 label: item.CMNCODNAM,
                 value: item.CMNCODVAL
@@ -265,7 +265,7 @@
 
     const Mbtis = async () => {
         try {
-            const response = await $api.get('/register/mbti');
+            const response = await $api.get('/user/mbti');
             mbtiList.value = response.data.data.map(item => ({
                 label: item.CMNCODNAM,
                 value: item.CMNCODVAL
@@ -339,7 +339,7 @@
                 formData.append('profile', profile.value);
             }
 
-            const response = await $api.post('/register/join', formData, { isFormData : true });
+            const response = await $api.post('/user/join', formData, { isFormData : true });
 
             if (response.status === 200) {
                 toastStore.onToast('등록신청이 완료되었습니다. 관리자 승인 후 이용가능합니다.', 's');