From 120706ef3f2911c2777eb340a9132fa58c16270a Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Thu, 9 Jun 2022 16:16:58 +0900
Subject: [PATCH] =?UTF-8?q?misc:=20=EA=B2=BD=EB=A7=A4=EC=9E=A5=20=EC=A7=84?=
 =?UTF-8?q?=EC=9E=85=EB=A1=9C=EB=A5=BC=20=EA=B8=88/=EC=8C=80,=20=EC=9C=A0?=
 =?UTF-8?q?=EB=8B=88=ED=81=AC=EB=A1=9C=202=EC=9B=90=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/index.php                   | 33 +++++++++++++++++++++++++++++----
 hwe/scss/main.scss              |  4 ++--
 hwe/templates/commandButton.php |  9 ++++++++-
 hwe/ts/PageAuction.vue          | 11 +++++++++--
 hwe/ts/v_auction.ts             | 11 ++++++++++-
 hwe/v_auction.php               |  3 +++
 6 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/hwe/index.php b/hwe/index.php
index be5f5c2e..273c4150 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -114,10 +114,10 @@ if (!$otherTextInfo) {
 
 $lastVoteID = $gameStor->lastVote;
 $lastVote = null;
-if($lastVoteID){
+if ($lastVoteID) {
     $voteStor = KVStorage::getStorage($db, 'vote');
     $lastVote = VoteInfo::fromArray($voteStor->getValue("vote_{$lastVoteID}"));
-    if($lastVote->endDate && $lastVote->endDate < TimeUtil::now()){
+    if ($lastVote->endDate && $lastVote->endDate < TimeUtil::now()) {
         $lastVote = null;
     }
 }
@@ -282,7 +282,21 @@ if($lastVoteID){
                 <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
                 <div id="general-position"><?php generalInfo($generalObj); ?></div>
                 <div id="generalCommandButton" class="row gx-0">
-                    <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?></div>
+                    <div class="buttonPlate bg2">
+                        <?= commandButton([
+                            'splitBtnBegin' => '<div class="btn-group">',
+                            'splitBtnEnd' => '</div>',
+                            'splitZoneSign' => '<button type="button" class="btn btn-sammo-nation dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"><span class="visually-hidden">Toggle Dropdown</span></button>',
+                            'splitZoneBegin' => '<ul class="dropdown-menu dropdown-menu-end">',
+                            'splitZoneEnd' => '</ul>',
+                            'splitSubBtnBegin' => '<li>',
+                            'splitSubBtnEnd' => '</li>',
+                            'btnClass' => 'btn btn-sammo-nation',
+                            'btnSplitClass' => 'dropdown-item',
+                            'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
+                            'isBettingActive' => $isBettingActive
+                        ])
+                        ?></div>
                 </div>
             </div>
         </div>
@@ -382,7 +396,18 @@ if($lastVoteID){
                             국가 메뉴
                         </div>
                         <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                            <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?>
+                            <?= commandButton([
+                                'btnBegin' => '<li>',
+                                'btnEnd' => '</li>',
+                                'splitMainBegin' => '<div class="d-none">',
+                                'splitMainEnd' => '</div>',
+                                'splitSubBtnBegin' => '<li>',
+                                'splitSubBtnEnd' => '</li>',
+                                'btnClass' => 'dropdown-item',
+                                'btnSplitClass' => 'dropdown-item',
+                                'isTournamentApplicationOpen' => $isTournamentApplicationOpen,
+                                'isBettingActive' => $isBettingActive
+                            ]) ?>
                         </ul>
                     </li>
                     <li class="nav-item dropup">
diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss
index 8b1a0759..3e9bc9ea 100644
--- a/hwe/scss/main.scss
+++ b/hwe/scss/main.scss
@@ -65,7 +65,7 @@ body {
     }
 
     #navbarNationItems {
-        columns: 2;
+        columns: 3;
     }
 
     #navbarQuickItems {
@@ -320,7 +320,7 @@ body {
         font-weight: bold;
         font-size: 14px;
     }
-    
+
     .toolbarButton2 {
         @extend .btn;
         @extend .btn-sammo-base2;
diff --git a/hwe/templates/commandButton.php b/hwe/templates/commandButton.php
index 12f163e4..2fc26597 100644
--- a/hwe/templates/commandButton.php
+++ b/hwe/templates/commandButton.php
@@ -16,5 +16,12 @@
 <?=$btnBegin??''?><a href='b_battleCenter.php' target='_blank' class='open-window commandButton <?=$btnClass??""?> <?= $showSecret ? '' : 'disabled' ?>'>감 찰 부</a><?=$btnEnd??''?>
 <?=$btnBegin??''?><a href='v_inheritPoint.php' class='commandButton <?=$btnClass??""?>'>유산 관리</a><?=$btnEnd??''?>
 <?=$btnBegin??''?><a href='b_myPage.php' class='commandButton <?=$btnClass??""?>'>내 정보&amp;설정</a><?=$btnEnd??''?>
-<?=$btnBegin??''?><a href='v_auction.php' target='_blank' class='open-window commandButton <?=$btnClass??""?>'>거 래 장</a><?=$btnEnd??''?>
+<?=$splitBtnBegin??''?>
+  <?=$splitMainBegin??''?><a href='v_auction.php' target='_blank' class='open-window commandButton <?=$btnClass??""?>'>경 매 장</a><?=$splitMainEnd??''?>
+  <?=$splitZoneSign??''?>
+  <?=$splitZoneBegin??''?>
+    <?=$splitSubBtnBegin??''?><a href='v_auction.php' target='_blank' class='open-window commandButton <?=$btnSplitClass??''?>'>금/쌀 경매장</a><?=$splitSubBtnEnd??''?>
+    <?=$splitSubBtnBegin??''?><a href='v_auction.php?type=unique' target='_blank' class='open-window commandButton <?=$btnSplitClass??''?>'>유니크 경매장</a><?=$splitSubBtnEnd??''?>
+  <?=$splitZoneEnd??''?>
+<?=$splitBtnEnd??''?>
 <?=$btnBegin??''?><a href='b_betting.php' target='_blank' class='open-window <?=$btnClassForBetting??""?>'>베 팅 장</a><?=$btnEnd??''?>
\ No newline at end of file
diff --git a/hwe/ts/PageAuction.vue b/hwe/ts/PageAuction.vue
index b0dc4b07..f48b12fc 100644
--- a/hwe/ts/PageAuction.vue
+++ b/hwe/ts/PageAuction.vue
@@ -22,9 +22,16 @@ import TopBackBar from "@/components/TopBackBar.vue";
 import BottomBar from "./components/BottomBar.vue";
 import AuctionResource from "@/components/AuctionResource.vue";
 import AuctionUniqueItem from "@/components/AuctionUniqueItem.vue";
-import { ref } from "vue";
+import { toRef } from "vue";
 
-const isResAuction = ref(true);
+const props = defineProps({
+    isResAuction: {
+        type: Boolean,
+        default: true,
+    },
+});
+
+const isResAuction = toRef(props, 'isResAuction');
 
 function tryReload() {
   console.log('갱신');
diff --git a/hwe/ts/v_auction.ts b/hwe/ts/v_auction.ts
index a17a0102..072d67d1 100644
--- a/hwe/ts/v_auction.ts
+++ b/hwe/ts/v_auction.ts
@@ -6,9 +6,18 @@ import { auto500px } from "./util/auto500px";
 import { insertCustomCSS } from "./util/customCSS";
 import { htmlReady } from "./util/htmlReady";
 
+declare const staticValues: {
+  serverID: string,
+  turnterm: number,
+  serverNick: string,
+  isResAuction: boolean,
+};
+
 auto500px();
 
 htmlReady(() => {
     insertCustomCSS();
   });
-createApp(PageAuction).use(BootstrapVue3).use(BToastPlugin).mount('#app')
\ No newline at end of file
+createApp(PageAuction, {
+  isResAuction: staticValues.isResAuction,
+}).use(BootstrapVue3).use(BToastPlugin).mount('#app')
\ No newline at end of file
diff --git a/hwe/v_auction.php b/hwe/v_auction.php
index 2184eb43..66796a61 100644
--- a/hwe/v_auction.php
+++ b/hwe/v_auction.php
@@ -11,6 +11,8 @@ $userID = Session::getUserID();
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
+$isResAuction = Util::getReq('type') !== 'unique';
+
 $me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, turntime, belong, penalty FROM general WHERE owner=%i', $userID);
 
 ?>
@@ -28,6 +30,7 @@ $me = $db->queryFirstRow('SELECT no, nation, officer_level, permission, con, tur
           'serverID' => UniqueConst::$serverID,
           'serverNick' => DB::prefix(),
           'turnterm' => $gameStor->turnterm,
+          'isResAuction' => $isResAuction,
       ]
     ]) ?>
     <?= WebUtil::printDist('vue', 'v_auction', true) ?>