Merge remote-tracking branch 'origin/main' into feat/external-eslint-…

…config
somnisomni · Dec 14, 2024 · 6f1ccf5 · 6f1ccf5
2 parents b318919 + 3204f75
commit 6f1ccf5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 24 deletions.
diff --git a/projects/Admin/src/components/info/BoothNoticePanel.vue b/projects/Admin/src/components/info/BoothNoticePanel.vue
@@ -15,10 +15,24 @@
                  hide-details
                  no-resize />
       <VLayout class="d-flex flex-row flex-wrap justify-end mt-2">
-        <VBtn variant="outlined"
+        <VBtn :disabled="noticeContent.length <= 0 || isUpdating"
+              :loading="isUpdating"
+              variant="outlined"
               prepend-icon="mdi-eraser"
-              :disabled="noticeContent.length <= 0"
+              class="mx-2 my-1"
               @click="noticeContent = ''">내용 지우기</VBtn>
+        <VBtn :disabled="!isEdited || isUpdating"
+              :loading="isUpdating"
+              variant="outlined"
+              prepend-icon="mdi-refresh"
+              class="mx-2 my-1"
+              @click="resetNoticeContent">변경 취소</VBtn>
+        <VBtn :disabled="!isEdited || isUpdating"
+              :loading="isUpdating"
+              color="primary"
+              prepend-icon="mdi-check"
+              class="mx-2 my-1"
+              @click="onUpdateButtonClick">업데이트</VBtn>
       </VLayout>
 
       <VDivider class="my-4" />
@@ -32,22 +46,6 @@
       </VLayout>
     </VLayout>
 
-    <VLayout class="d-flex flex-row flex-wrap justify-end">
-      <VDivider class="my-4" />
-
-      <VBtn :disabled="!isEdited || isUpdating"
-            variant="outlined"
-            prepend-icon="mdi-refresh"
-            class="mx-2 my-1"
-            @click="resetNoticeContent">변경 취소</VBtn>
-      <VBtn :disabled="!isEdited || isUpdating"
-            :loading="isUpdating"
-            color="primary"
-            prepend-icon="mdi-check"
-            class="mx-2 my-1"
-            @click="onUpdateButtonClick">업데이트</VBtn>
-    </VLayout>
-
     <MarkdownHelpDialog v-model="isMarkdownHelpDialogOpened" />
   </DashboardPanel>
 </template>

diff --git a/projects/Admin/src/pages/AdminLayout.vue b/projects/Admin/src/pages/AdminLayout.vue
@@ -35,16 +35,17 @@
                         prepend-icon="mdi-store-cog"
                         title="부스 정보" />
           </template>
-          <VListItem title="배너 이미지" value="banner-image"
-                     :to="{ name: 'admin-info-banner-image' }" exact />
-          <VListItem title="인포 이미지" value="info-image"
-                     :to="{ name: 'admin-info-info-image' }" exact />
+
           <VListItem title="부스 등록 정보" value="info"
                      :to="{ name: 'admin-info-info' }" exact />
-          <VListItem title="멤버" value="member"
-                     :to="{ name: 'admin-info-member' }" exact />
           <VListItem title="공지 사항" value="notice"
                      :to="{ name: 'admin-info-notice' }" exact />
+          <VListItem title="멤버" value="member"
+                     :to="{ name: 'admin-info-member' }" exact />
+          <VListItem title="배너 이미지" value="banner-image"
+                     :to="{ name: 'admin-info-banner-image' }" exact />
+          <VListItem title="인포 이미지" value="info-image"
+                     :to="{ name: 'admin-info-info-image' }" exact />
         </VListGroup>
         <VListItem prepend-icon="mdi-gift-open" title="굿즈" value="goods"
                    :to="{ name: 'admin-goods' }" exact />