Merge pull request #166 from yeonjulee1005/stage

🚌 [version: 2.9.1] push to master
yeonjulee1005 · Jun 21, 2024 · 791e859 · 791e859
2 parents 8ce61c5 + 69aa046
commit 791e859
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/components/A/Header.vue b/components/A/Header.vue
@@ -3,10 +3,10 @@
     <div class="header-container flex flex-align-center gap-20">
       <HeaderLogo />
       <div class="flex-auto" />
-      <HeaderDesktopMenu />
+      <HeaderDesktopMenu v-if="isDesktop" />
       <AThemeChange />
       <ALanguageChange v-if="isDesktop" />
-      <HeaderMobileMenu />
+      <HeaderMobileMenu v-else />
     </div>
     <LazyHeaderForecast
       v-if="isDesktop"

diff --git a/components/Header/DesktopMenu.vue b/components/Header/DesktopMenu.vue
@@ -1,8 +1,5 @@
 <template>
-  <div
-    v-if="isDesktop"
-    class="flex flex-fixed gap-40"
-  >
+  <div class="flex flex-fixed gap-40">
     <nuxt-link
       v-for="(menu, index) in mainMenuData"
       v-show="index"
@@ -33,7 +30,5 @@
 </template>
 
 <script setup lang="ts">
-const { isDesktop } = useDevice()
-
 const { mainMenuData, socialMenuData } = useMenuStore()
 </script>
diff --git a/components/Header/MobileMenu.vue b/components/Header/MobileMenu.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <DDButton
-      v-if="!isDesktop"
       aria-label="mobile-menu"
       color="orange"
       size="sm"
@@ -42,8 +41,8 @@
           <template #leading>
             <Icon
               name="line-md:menu-to-close-alt-transition"
-              :width="isDesktop ? 24 : 20"
-              :height="isDesktop ? 24 : 20"
+              :width="20"
+              :height="20"
             />
           </template>
         </DDButton>
@@ -86,8 +85,6 @@
 </template>
 
 <script setup lang="ts">
-const { isDesktop } = useDevice()
-
 const { mainMenuData, socialMenuData } = useMenuStore()
 const { url } = useImageStorage()
 

diff --git a/data/korLocation.json b/data/korLocation.json
@@ -10163,6 +10163,13 @@
     "geoX": 51,
     "geoY": 38
   },
+  {
+    "code": 5011068000,
+    "firstLoc": "제주",
+    "secondLoc": "제주시",
+    "geoX": 52,
+    "geoY": 37
+  },
   {
     "code": 5013000000,
     "firstLoc": "제주",

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "name": "Dewdew",
     "email": "yeonju.lee1005@gmail.com"
   },
-  "version": "2.9.0",
+  "version": "2.9.1",
   "private": true,
   "scripts": {
     "build": "nuxt build",