From a035612da3460eb6178cc9a03be5c14c130402ca Mon Sep 17 00:00:00 2001 From: ben Date: Wed, 4 Jan 2023 21:11:06 +0000 Subject: [PATCH] format --- lnbits/extensions/market/crud.py | 6 ++++-- .../market/templates/market/index.html | 21 ++++++++++++++----- .../market/templates/market/order.html | 4 +++- lnbits/extensions/market/views_api.py | 4 +++- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/lnbits/extensions/market/crud.py b/lnbits/extensions/market/crud.py index 6d82b354..1d9c28be 100644 --- a/lnbits/extensions/market/crud.py +++ b/lnbits/extensions/market/crud.py @@ -14,10 +14,10 @@ from .models import ( CreateMarket, CreateMarketStalls, Market, + MarketSettings, OrderDetail, Orders, Products, - MarketSettings, Stalls, Zones, createOrder, @@ -456,7 +456,9 @@ async def get_market_chat_by_merchant(ids: List[str]) -> List[ChatMessage]: async def get_market_settings(user) -> Optional[MarketSettings]: - row = await db.fetchone("""SELECT * FROM market.settings WHERE "user" = ?""", (user,)) + row = await db.fetchone( + """SELECT * FROM market.settings WHERE "user" = ?""", (user,) + ) return MarketSettings(**row) if row else None diff --git a/lnbits/extensions/market/templates/market/index.html b/lnbits/extensions/market/templates/market/index.html index e16e5d48..ffcb612b 100644 --- a/lnbits/extensions/market/templates/market/index.html +++ b/lnbits/extensions/market/templates/market/index.html @@ -60,7 +60,8 @@ @click="marketDialog.show = true" >Create Market - Makes a simple frontend market for your stalls (not NOSTR) @@ -596,7 +597,9 @@ this.$q.localStorage.set(`lnbits.market.${this.g.user.id}`, this.keys) }, restoreKeys() { - let keys = this.$q.localStorage.getItem(`lnbits.market.${this.g.user.id}`) + let keys = this.$q.localStorage.getItem( + `lnbits.market.${this.g.user.id}` + ) if (keys) { this.keys = keys this.stallDialog.data.publickey = this.keys.pubkey @@ -1027,7 +1030,11 @@ //////////////////////////////////////// getMarkets() { LNbits.api - .request('GET', '/market/api/v1/markets', this.g.user.wallets[0].inkey) + .request( + 'GET', + '/market/api/v1/markets', + this.g.user.wallets[0].inkey + ) .then(response => { if (response.data) { this.markets = response.data.map(mapMarkets) @@ -1318,7 +1325,9 @@ } else { ws_scheme = 'ws://' } - ws = new WebSocket(ws_scheme + location.host + '/market/ws/' + room_name) + ws = new WebSocket( + ws_scheme + location.host + '/market/ws/' + room_name + ) ws.onmessage = async event => { let event_data = JSON.parse(event.data) @@ -1359,7 +1368,9 @@ await this.getOrders() this.getMarkets() await this.getAllMessages() - let keys = this.$q.localStorage.getItem(`lnbits.market.${this.g.user.id}`) + let keys = this.$q.localStorage.getItem( + `lnbits.market.${this.g.user.id}` + ) if (keys) { this.keys = keys } diff --git a/lnbits/extensions/market/templates/market/order.html b/lnbits/extensions/market/templates/market/order.html index ebabe882..5be606f9 100644 --- a/lnbits/extensions/market/templates/market/order.html +++ b/lnbits/extensions/market/templates/market/order.html @@ -443,7 +443,9 @@ } else { ws_scheme = 'ws://' } - ws = new WebSocket(ws_scheme + location.host + '/market/ws/' + room_name) + ws = new WebSocket( + ws_scheme + location.host + '/market/ws/' + room_name + ) ws.onmessage = event => { let event_data = JSON.parse(event.data) diff --git a/lnbits/extensions/market/views_api.py b/lnbits/extensions/market/views_api.py index 8d0202a3..045bc0fc 100644 --- a/lnbits/extensions/market/views_api.py +++ b/lnbits/extensions/market/views_api.py @@ -422,7 +422,9 @@ async def api_market_order_shipped( async def api_market_markets(wallet: WalletTypeInfo = Depends(get_key_type)): # await get_market_market_stalls(market_id="FzpWnMyHQMcRppiGVua4eY") try: - return [market.dict() for market in await get_market_markets(wallet.wallet.user)] + return [ + market.dict() for market in await get_market_markets(wallet.wallet.user) + ] except: return {"message": "We could not retrieve the markets."}