moved to orders tab

static/js/index.js

@@ -5,7 +5,7 @@ window.app = Vue.createApp({
   mixins: [window.windowMixin],
   data: function () {
     return {
-      activeTab: 'merchant',
+      activeTab: 'orders',
       selectedStallFilter: null,
       merchant: {},
       shippingZones: [],

templates/nostrmarket/index.html

@@ -12,6 +12,12 @@
             indicator-color="primary"
             align="left"
           >
+            <q-tab
+              name="orders"
+              label="Orders"
+              icon="receipt_long"
+              style="min-width: 120px"
+            ></q-tab>
             <q-tab
               name="merchant"
               label="Merchant"
@@ -42,6 +48,23 @@
         <q-separator></q-separator>
 
         <q-tab-panels v-model="activeTab" animated>
+          <!-- Orders Tab -->
+          <q-tab-panel name="orders">
+            <q-card-section>
+              <div class="text-h6">Orders</div>
+            </q-card-section>
+            <q-separator></q-separator>
+            <q-card-section class="q-pt-none">
+              <order-list
+                ref="orderListRef"
+                :adminkey="g.user.wallets[0].adminkey"
+                :inkey="g.user.wallets[0].inkey"
+                :customer-pubkey-filter="orderPubkey"
+                @customer-selected="customerSelectedForOrder"
+              ></order-list>
+            </q-card-section>
+          </q-tab-panel>
+
           <!-- Merchant Tab -->
           <q-tab-panel name="merchant">
             <merchant-tab
@@ -99,21 +122,6 @@
           <!-- Messages Tab -->
         </q-tab-panels>
       </q-card>
-      <q-card class="q-mt-md">
-        <q-card-section>
-          <div class="text-h6">Orders</div>
-        </q-card-section>
-        <q-separator></q-separator>
-        <q-card-section class="q-pt-none">
-          <order-list
-            ref="orderListRef"
-            :adminkey="g.user.wallets[0].adminkey"
-            :inkey="g.user.wallets[0].inkey"
-            :customer-pubkey-filter="orderPubkey"
-            @customer-selected="customerSelectedForOrder"
-          ></order-list>
-        </q-card-section>
-      </q-card>
     </div>
     <q-card v-else>
       <q-card-section>