From 0c5ad07f0e11c29223f3ec1c205173365ac283a8 Mon Sep 17 00:00:00 2001
From: jhynsoo <jhynsoo@gmail.com>
Date: Wed, 22 May 2024 11:51:49 +0900
Subject: [PATCH] feat: Update search bar component

---
 src/components/common/FilledButton.vue   |  4 ++
 src/components/common/KakaoMap.vue       |  9 ++-
 src/components/common/SearchBox.vue      | 51 +++++++++++++++
 src/components/common/Select.vue         | 26 +++++---
 src/components/common/VSelect.vue        | 20 ------
 src/components/search/AttractionItem.vue |  5 ++
 src/components/search/SearchBar.vue      | 79 +++++++-----------------
 src/router/index.js                      | 32 +++++-----
 src/stores/attractionStore.js            |  1 +
 src/views/TestView.vue                   | 25 --------
 10 files changed, 123 insertions(+), 129 deletions(-)
 create mode 100644 src/components/common/SearchBox.vue
 delete mode 100644 src/components/common/VSelect.vue
 delete mode 100644 src/views/TestView.vue

diff --git a/src/components/common/FilledButton.vue b/src/components/common/FilledButton.vue
index f9273cb..85e9eb7 100644
--- a/src/components/common/FilledButton.vue
+++ b/src/components/common/FilledButton.vue
@@ -35,6 +35,10 @@ button {
     transform 0.25s;
 }
 
+button:active {
+  transform: scale(0.95);
+}
+
 button:disabled {
   cursor: initial;
 }
diff --git a/src/components/common/KakaoMap.vue b/src/components/common/KakaoMap.vue
index dc02c5c..3eae136 100644
--- a/src/components/common/KakaoMap.vue
+++ b/src/components/common/KakaoMap.vue
@@ -28,13 +28,12 @@ onMounted(() => {
     oldMarkers.forEach((marker) => marker.setMap(null));
     newMarkers.forEach((marker) => marker.setMap(map));
     target;
-    setTarget(newMarkers[0].getPosition());
+    if (!oldMarkers[0] || !newMarkers[0].getPosition().equals(oldMarkers[0].getPosition())) {
+      setTarget(newMarkers[0].getPosition());
+    }
   });
 
-  watch(target, (newTarget, oldTarget) => {
-    if (oldTarget && newTarget.La === oldTarget.La && newTarget.Ma === oldTarget.Ma) {
-      return;
-    }
+  watch(target, (newTarget) => {
     map.panTo(newTarget);
   });
 });
diff --git a/src/components/common/SearchBox.vue b/src/components/common/SearchBox.vue
new file mode 100644
index 0000000..f20b87b
--- /dev/null
+++ b/src/components/common/SearchBox.vue
@@ -0,0 +1,51 @@
+<script setup>
+import TextButton from './TextButton.vue';
+
+const props = defineProps({
+  name: String,
+  onSubmit: Function,
+});
+const { name, onSubmit } = props;
+const model = defineModel();
+</script>
+
+<template>
+  <form @submit.prevent="onSubmit" class="search-box">
+    <input type="text" :name="name" v-model.lazy="model" placeholder="검색어를 입력하세요" />
+    <TextButton @click="onSubmit">
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        width="16"
+        height="16"
+        fill="currentColor"
+        class="bi bi-search"
+        viewBox="0 0 16 16"
+        part="svg"
+      >
+        <path
+          d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"
+        ></path>
+      </svg>
+    </TextButton>
+  </form>
+</template>
+
+<style scoped>
+.search-box {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+  box-shadow: var(--shadow);
+  border-radius: 12px;
+  border: 1px solid var(--color-border);
+  padding: 12px;
+}
+
+input {
+  padding: 0 8px;
+  border: none;
+  width: 100%;
+  outline: none;
+}
+</style>
diff --git a/src/components/common/Select.vue b/src/components/common/Select.vue
index 452ce7e..187cc6c 100644
--- a/src/components/common/Select.vue
+++ b/src/components/common/Select.vue
@@ -1,9 +1,9 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <script setup>
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, toRefs } from 'vue';
 import FilledButton from './FilledButton.vue';
 
-const { placeholder, options, optionName, disabled } = defineProps({
+const props = defineProps({
   placeholder: {
     type: String,
     default: '----',
@@ -17,20 +17,27 @@ const { placeholder, options, optionName, disabled } = defineProps({
     default: 'value',
   },
   modelValue: {
-    sidoCode: Number,
+    type: Object,
+    default: null,
+  },
+  defaultIndex: {
+    type: Number || null,
+    default: null,
   },
   disabled: {
     type: Boolean,
     default: false,
   },
 });
+const { placeholder, optionName } = props;
+const { modelValue, options, disabled } = toRefs(props);
 const updateModel = defineEmits(['update:modelValue']);
 
 const body = document.querySelector('body');
 const buttonRef = ref(null);
 const isOpen = ref(false);
 const menuStyle = ref('');
-const selected = ref(null);
+const selected = modelValue;
 
 onMounted(() => {
   const rect = buttonRef.value.$el.getBoundingClientRect();
@@ -38,7 +45,7 @@ onMounted(() => {
   menuStyle.value = `transform: translate(${rect.left}px, ${rect.bottom + 4}px)`;
 });
 
-const selectedName = computed(() => selected.value?.[optionName] ?? selected.value);
+const selectedName = computed(() => modelValue.value?.[optionName] ?? modelValue.value);
 
 function handleOpen() {
   isOpen.value = true;
@@ -60,7 +67,6 @@ function handleClose({ target }) {
 }
 
 function handleSelect(option) {
-  selected.value = option;
   updateModel('update:modelValue', option);
   closeMenu();
 }
@@ -73,7 +79,7 @@ function handleSelect(option) {
     ref="buttonRef"
     @mousedown="handleOpen"
   >
-    <span>{{ selectedName ?? placeholder }}</span>
+    <div class="select-label">{{ selectedName ?? placeholder }}</div>
     <svg
       xmlns="http://www.w3.org/2000/svg"
       width="16"
@@ -118,6 +124,12 @@ function handleSelect(option) {
   justify-content: space-between;
   align-items: center;
   border: 1px solid var(--color-border);
+  overflow: hidden;
+}
+
+.select-label {
+  overflow: hidden;
+  white-space: nowrap;
 }
 
 .active {
diff --git a/src/components/common/VSelect.vue b/src/components/common/VSelect.vue
deleted file mode 100644
index 50ce890..0000000
--- a/src/components/common/VSelect.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<script setup>
-import { ref} from 'vue'
-defineProps({ selectOptions: Array })
-const emit = defineEmits(["onKeySelect"])
-const key = ref('all')
-const onSelect = () => { 
-    console.log('vselect................... key:', key.value)
-    emit('onKeySelect', key.value)
-}
-</script>
-<template>
-    <select class="form-select" v-model="key"  @change="onSelect">
-        <option v-for="(k, index) in selectOptions" :key="index" :value="k.value">
-            {{k.text}}
-        </option>
-    </select>
-</template>
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/components/search/AttractionItem.vue b/src/components/search/AttractionItem.vue
index 3ee4989..a4f3365 100644
--- a/src/components/search/AttractionItem.vue
+++ b/src/components/search/AttractionItem.vue
@@ -60,6 +60,11 @@ function handleClick() {
   border: 1px solid var(--color-border);
   background-color: var(--color-background);
   cursor: pointer;
+  transition: transform 0.25s;
+}
+
+.attraction:active {
+  transform: scale(0.98);
 }
 
 .info {
diff --git a/src/components/search/SearchBar.vue b/src/components/search/SearchBar.vue
index 2f483e8..a97b47f 100644
--- a/src/components/search/SearchBar.vue
+++ b/src/components/search/SearchBar.vue
@@ -1,11 +1,12 @@
 <script setup>
-import { ref, watch } from 'vue';
-import TextButton from '../common/TextButton.vue';
+import { reactive, ref, watch } from 'vue';
 import axios from 'axios';
 import Select from '../common/Select.vue';
 import { useAttractionStore } from '@/stores/attractionStore';
+import SearchBox from '../common/SearchBox.vue';
 
-const contentTypeList = [
+const contentTypeList = reactive([
+  { value: 0, name: '전체' },
   { value: 12, name: '관광지' },
   { value: 14, name: '문화시설' },
   { value: 15, name: '축제공연행사' },
@@ -14,31 +15,37 @@ const contentTypeList = [
   { value: 32, name: '숙박' },
   { value: 38, name: '쇼핑' },
   { value: 39, name: '음식점' },
-];
+]);
 const { search, setQueryString } = useAttractionStore();
 const sidoList = ref([]);
 const gugunList = ref([]);
-const sido = ref({ sidoCode: 0 });
-const gugun = ref({ gugunCode: 0 });
-const contentType = ref(0);
+const sido = ref(null);
+const gugun = ref(null);
+const contentType = ref(null);
 const keyword = ref('');
 
 watch(sido, ({ sidoCode }) => {
+  gugun.value = null;
+  if (sidoCode === 0) {
+    return;
+  }
   axios.get(`//localhost:8000/area/gugun?sidoCode=${sidoCode}`).then(({ data }) => {
-    gugunList.value = data;
+    gugunList.value = [{ gugunCode: 0, gugunName: '전체' }, ...data];
   });
 });
 
 if (sidoList.value.length === 0) {
-  axios.get('//localhost:8000/area/sido').then(({ data }) => (sidoList.value = data));
+  axios
+    .get('//localhost:8000/area/sido')
+    .then(({ data }) => (sidoList.value = [{ sidoCode: 0, sidoName: '전체' }, ...data]));
 }
 
 function handleSubmit() {
-  const { sidoCode } = sido.value;
-  const { gugunCode } = gugun.value;
-  const areaQuery = `sidoCode=${sidoCode}` + (sidoCode ? `&gugunCode=${gugunCode}` : '');
+  const { sidoCode } = sido.value ?? {};
+  const { gugunCode } = gugun.value ?? {};
+  const areaQuery = `sidoCode=${sidoCode ?? 0}` + (sidoCode ? `&gugunCode=${gugunCode ?? 0}` : '');
   const keywordQuery = `title=${keyword.value}`;
-  const contentTypeQuery = `contentTypeId=${contentType.value.value}`;
+  const contentTypeQuery = `contentTypeId=${contentType.value?.value ?? 0}`;
   const queryString = [areaQuery, keywordQuery, contentTypeQuery].join('&');
 
   setQueryString(queryString);
@@ -54,34 +61,17 @@ function handleSubmit() {
         placeholder="시/군/구"
         v-model="gugun"
         :options="gugunList"
-        :disabled="gugunList.length === 0"
+        :disabled="gugunList.length <= 1"
         optionName="gugunName"
       />
       <Select
-        placeholder="종류"
+        placeholder="분류"
         v-model="contentType"
         :options="contentTypeList"
         optionName="name"
       />
     </nav>
-    <form @submit.prevent="handleSubmit" class="search-box">
-      <input type="text" name="keyword" v-model.lazy="keyword" placeholder="검색어를 입력하세요" />
-      <TextButton @click="handleSubmit">
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          width="16"
-          height="16"
-          fill="currentColor"
-          class="bi bi-search"
-          viewBox="0 0 16 16"
-          part="svg"
-        >
-          <path
-            d="M11.742 10.344a6.5 6.5 0 1 0-1.397 1.398h-.001c.03.04.062.078.098.115l3.85 3.85a1 1 0 0 0 1.415-1.414l-3.85-3.85a1.007 1.007 0 0 0-.115-.1zM12 6.5a5.5 5.5 0 1 1-11 0 5.5 5.5 0 0 1 11 0z"
-          ></path>
-        </svg>
-      </TextButton>
-    </form>
+    <SearchBox name="keyword" v-model.lazy="keyword" :onSubmit="handleSubmit" />
   </div>
 </template>
 
@@ -101,27 +91,4 @@ function handleSubmit() {
 .select-wrapper > * {
   width: 100%;
 }
-
-.search-box {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  width: 100%;
-  box-shadow: var(--shadow);
-  border-radius: 12px;
-  border: 1px solid var(--color-border);
-  padding: 12px;
-}
-
-input {
-  padding: 0 8px;
-  border: none;
-  width: 100%;
-  outline: none;
-}
-
-button {
-  display: flex;
-  align-items: center;
-}
 </style>
diff --git a/src/router/index.js b/src/router/index.js
index a1f0485..232c2f9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,22 +1,22 @@
 import { createRouter, createWebHistory } from 'vue-router';
 import HomeView from '@/views/HomeView.vue';
 
-import { storeToRefs } from "pinia";
+import { storeToRefs } from 'pinia';
 
-import { useMemberStore } from "@/stores/memberStore";
+import { useMemberStore } from '@/stores/memberStore';
 
 const onlyAuthUser = async (to, from, next) => {
   const memberStore = useMemberStore();
   const { userInfo, isValidToken } = storeToRefs(memberStore);
   const { getUserInfo } = memberStore;
 
-  let token = sessionStorage.getItem("accessToken");
+  let token = sessionStorage.getItem('accessToken');
 
   if (userInfo.value != null && token) {
     await getUserInfo(token);
   }
   if (!isValidToken.value || userInfo.value === null) {
-    next({ name: "user-login" });
+    next({ name: 'user-login' });
   } else {
     next();
   }
@@ -31,25 +31,25 @@ const router = createRouter({
       component: HomeView,
     },
     {
-      path: "/user",
-      name: "user",
-      component: () => import("@/views/TheUserView.vue"),
+      path: '/user',
+      name: 'user',
+      component: () => import('@/views/TheUserView.vue'),
       children: [
         {
-          path: "login",
-          name: "user-login",
-          component: () => import("@/components/users/UserLogin.vue"),
+          path: 'login',
+          name: 'user-login',
+          component: () => import('@/components/users/UserLogin.vue'),
         },
         {
-          path: "join",
-          name: "user-join",
-          component: () => import("@/components/users/UserRegister.vue"),
+          path: 'join',
+          name: 'user-join',
+          component: () => import('@/components/users/UserRegister.vue'),
         },
         {
-          path: "mypage",
-          name: "user-mypage",
+          path: 'mypage',
+          name: 'user-mypage',
           beforeEnter: onlyAuthUser,
-          component: () => import("@/components/users/UserMyPage.vue"),
+          component: () => import('@/components/users/UserMyPage.vue'),
         },
         // {
         //   path: "modify/:userid",
diff --git a/src/stores/attractionStore.js b/src/stores/attractionStore.js
index ab2e552..d803f36 100644
--- a/src/stores/attractionStore.js
+++ b/src/stores/attractionStore.js
@@ -11,6 +11,7 @@ export const useAttractionStore = defineStore('attraction', () => {
 
   function setQueryString(value) {
     queryString.value = value;
+    page.value = 0;
   }
 
   function search(preventClear = false) {
diff --git a/src/views/TestView.vue b/src/views/TestView.vue
deleted file mode 100644
index 13b41d8..0000000
--- a/src/views/TestView.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-    <div id="app">
-      <TravelChatBot />
-    </div>
-  </template>
-  
-  <script>
-  import TravelChatBot from '@/components/chatbot/TravelChatBot.vue';
-  
-  export default {
-    name: 'App',
-    components: {
-      TravelChatBot,
-    },
-  };
-  </script>
-  
-  <style>
-  body {
-    font-family: Avenir, Helvetica, Arial, sans-serif;
-    margin: 0;
-    padding: 0;
-    background-color: #f5f5f5;
-  }
-  </style>
\ No newline at end of file