From ac02337ad3a8ea0a613de211bc80c254b071347a Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Thu, 2 Mar 2023 11:46:46 +0200
Subject: [PATCH] feat: show stall list table

---
 crud.py                                      |   2 +-
 static/components/stall-list/stall-list.html | 122 +++++++++----------
 static/components/stall-list/stall-list.js   |  53 +++++++-
 views_api.py                                 |   8 +-
 4 files changed, 114 insertions(+), 71 deletions(-)

diff --git a/crud.py b/crud.py
index 55cf4ae..0f52c67 100644
--- a/crud.py
+++ b/crud.py
@@ -141,7 +141,7 @@ async def get_stall(user_id: str, stall_id: str) -> Optional[Stall]:
 
 
 async def get_stalls(user_id: str) -> List[Stall]:
-    rows = await db.fetchone(
+    rows = await db.fetchall(
         "SELECT * FROM nostrmarket.stalls WHERE user_id = ?",
         (user_id,),
     )
diff --git a/static/components/stall-list/stall-list.html b/static/components/stall-list/stall-list.html
index 03e8ba2..a039c30 100644
--- a/static/components/stall-list/stall-list.html
+++ b/static/components/stall-list/stall-list.html
@@ -35,73 +35,65 @@
         </q-btn>
       </div> -->
   </div>
-  <!--
-    <q-table
-      flat
-      dense
-      :data="stalls"
-      row-key="id"
-      :columns="relaysTable.columns"
-      :pagination.sync="relaysTable.pagination"
-      :filter="filter"
-    >
-      <template v-slot:body="props">
-        <q-tr :props="props">
-          <q-td auto-width>
-            <q-btn
-              size="sm"
-              color="accent"
-              round
-              dense
-              @click="props.row.expanded= !props.row.expanded"
-              :icon="props.row.expanded? 'remove' : 'add'"
-            />
-          </q-td>
 
-          <q-td key="id" :props="props">
-            <a style="color: unset" :href="props.row.id" target="_blank">
-              {{props.row.id}}</a
-            >
-          </q-td>
-          <q-td key="toggle" :props="props">
-            <q-toggle
-              size="sm"
-              color="secodary"
-              v-model="props.row.active"
-              @input="showToggleRelayDialog(props.row)"
-            ></q-toggle>
-          </q-td>
-          <q-td auto-width> {{props.row.name}} </q-td>
-          <q-td key="description" :props="props">
-            {{props.row.description}}
-          </q-td>
-          <q-td key="pubkey" :props="props">
-            <div>{{props.row.pubkey}}</div>
-          </q-td>
-          <q-td key="contact" :props="props">
-            <div>{{props.row.contact}}</div>
-          </q-td>
-        </q-tr>
-        <q-tr v-if="props.row.expanded" :props="props">
-          <q-td colspan="100%">
-            <div class="row items-center q-mb-lg">
-              <div class="col-12">
-                <relay-details
-                  :relay-id="props.row.id"
-                  :adminkey="g.user.wallets[0].adminkey"
-                  :inkey="g.user.wallets[0].inkey"
-                  :wallet-options="g.user.walletOptions"
-                  @relay-deleted="handleRelayDeleted"
-                  @relay-updated="handleRelayUpdated"
-                ></relay-details>
-              </div>
+  <q-table
+    flat
+    dense
+    :data="stalls"
+    row-key="id"
+    :columns="stallsTable.columns"
+    :pagination.sync="stallsTable.pagination"
+    :filter="filter"
+  >
+    <template v-slot:body="props">
+      <q-tr :props="props">
+        <q-td auto-width>
+          <q-btn
+            size="sm"
+            color="accent"
+            round
+            dense
+            @click="props.row.expanded= !props.row.expanded"
+            :icon="props.row.expanded? 'remove' : 'add'"
+          />
+        </q-td>
+
+        <q-td key="id" :props="props">
+          <a style="color: unset" :href="props.row.id" target="_blank">
+            {{props.row.name}}</a
+          >
+        </q-td>
+        <!-- <q-td key="toggle" :props="props">
+          <q-toggle
+            size="sm"
+            color="secodary"
+            v-model="props.row.active"
+            @input="showToggleStallDialog(props.row)"
+          ></q-toggle>
+        </q-td> -->
+
+        <q-td key="description" :props="props">
+          {{props.row.config.description}}
+        </q-td>
+        <q-td key="shippingZones" :props="props">
+          <div>
+            {{props.row.shipping_zones.filter(z => !!z.name).map(z =>
+            z.name).join(', ')}}
+          </div>
+        </q-td>
+      </q-tr>
+      <q-tr v-if="props.row.expanded" :props="props">
+        <q-td colspan="100%">
+          <div class="row items-center q-mb-lg">
+            <div class="col-12">
+              <!-- <stall-details></stall-details> -->
             </div>
-          </q-td>
-        </q-tr>
-      </template>
-      {% endraw %}
-    </q-table>
-    -->
+          </div>
+        </q-td>
+      </q-tr>
+    </template>
+  </q-table>
+
   <div>
     <q-dialog v-model="stallDialog.show" position="top">
       <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
diff --git a/static/components/stall-list/stall-list.js b/static/components/stall-list/stall-list.js
index 352bcf1..1ca67fe 100644
--- a/static/components/stall-list/stall-list.js
+++ b/static/components/stall-list/stall-list.js
@@ -20,7 +20,44 @@ async function stallList(path) {
             shippingZones: []
           }
         },
-        zoneOptions: []
+        zoneOptions: [],
+        stallsTable: {
+          columns: [
+            {
+              name: '',
+              align: 'left',
+              label: '',
+              field: ''
+            },
+            {
+              name: 'id',
+              align: 'left',
+              label: 'Name',
+              field: 'id'
+            },
+            // {
+            //   name: 'toggle',
+            //   align: 'left',
+            //   label: 'Active',
+            //   field: ''
+            // },
+            {
+              name: 'description',
+              align: 'left',
+              label: 'Description',
+              field: 'description'
+            },
+            {
+              name: 'shippingZones',
+              align: 'left',
+              label: 'Shipping Zones',
+              field: 'shippingZones'
+            }
+          ],
+          pagination: {
+            rowsPerPage: 10
+          }
+        }
       }
     },
     computed: {
@@ -72,6 +109,19 @@ async function stallList(path) {
           LNbits.utils.notifyApiError(error)
         }
       },
+      getStalls: async function () {
+        try {
+          const {data} = await LNbits.api.request(
+            'GET',
+            '/nostrmarket/api/v1/stall',
+            this.inkey
+          )
+          console.log('### stalls', data)
+          this.stalls = data.map(s => ({...s, expanded: false}))
+        } catch (error) {
+          LNbits.utils.notifyApiError(error)
+        }
+      },
       getZones: async function () {
         try {
           const {data} = await LNbits.api.request(
@@ -105,6 +155,7 @@ async function stallList(path) {
       }
     },
     created: async function () {
+      await this.getStalls()
       await this.getCurrencies()
       await this.getZones()
     }
diff --git a/views_api.py b/views_api.py
index 393c15b..de83d66 100644
--- a/views_api.py
+++ b/views_api.py
@@ -193,7 +193,7 @@ async def api_update_stall(
         event.sig = merchant.sign_hash(bytes.fromhex(event.id))
 
         data.config.event_id = event.id
-        # data.config.created_at =
+        # data.config.event_created_at =
         stall = await update_stall(wallet.wallet.user, data)
         assert stall, "Cannot update stall"
 
@@ -206,7 +206,7 @@ async def api_update_stall(
         logger.warning(ex)
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Cannot create stall",
+            detail="Cannot update stall",
         )
 
 
@@ -226,7 +226,7 @@ async def api_get_stall(stall_id: str, wallet: WalletTypeInfo = Depends(get_key_
         logger.warning(ex)
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Cannot create stall",
+            detail="Cannot get stall",
         )
 
 
@@ -239,7 +239,7 @@ async def api_get_stalls(wallet: WalletTypeInfo = Depends(get_key_type)):
         logger.warning(ex)
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Cannot create stall",
+            detail="Cannot get stalls",
         )