From 936e9342a2af4790c9d1df4b507cecc79d5127b1 Mon Sep 17 00:00:00 2001 From: Joel Klabo Date: Wed, 11 Jan 2023 15:45:43 -0800 Subject: [PATCH] Formatting --- lnbits/extensions/nostrnip5/crud.py | 4 +++- lnbits/extensions/nostrnip5/models.py | 4 +++- .../nostrnip5/templates/nostrnip5/index.html | 22 +++++++++---------- lnbits/extensions/nostrnip5/views_api.py | 9 +++++++- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/lnbits/extensions/nostrnip5/crud.py b/lnbits/extensions/nostrnip5/crud.py index b71670c7..66b9840b 100644 --- a/lnbits/extensions/nostrnip5/crud.py +++ b/lnbits/extensions/nostrnip5/crud.py @@ -3,7 +3,7 @@ from typing import List, Optional, Union from lnbits.helpers import urlsafe_short_hash from . import db -from .models import Address, CreateAddressData, CreateDomainData, EditDomainData, Domain +from .models import Address, CreateAddressData, CreateDomainData, Domain, EditDomainData async def get_domain(domain_id: str) -> Optional[Domain]: @@ -169,6 +169,7 @@ async def create_address_internal(domain_id: str, data: CreateAddressData) -> Ad assert address, "Newly created address couldn't be retrieved" return address + async def update_domain_internal(wallet_id: str, data: EditDomainData) -> Domain: if data.currency != "Satoshis": amount = data.amount * 100 @@ -188,6 +189,7 @@ async def update_domain_internal(wallet_id: str, data: EditDomainData) -> Domain assert domain, "Domain couldn't be updated" return domain + async def create_domain_internal(wallet_id: str, data: CreateDomainData) -> Domain: domain_id = urlsafe_short_hash() diff --git a/lnbits/extensions/nostrnip5/models.py b/lnbits/extensions/nostrnip5/models.py index 71e32c37..0059a4ef 100644 --- a/lnbits/extensions/nostrnip5/models.py +++ b/lnbits/extensions/nostrnip5/models.py @@ -24,8 +24,9 @@ class CreateDomainData(BaseModel): amount: float = Query(..., ge=0.01) domain: str + class EditDomainData(BaseModel): - id: str + id: str currency: str amount: float = Query(..., ge=0.01) @@ -33,6 +34,7 @@ class EditDomainData(BaseModel): def from_row(cls, row: Row) -> "Domain": return cls(**dict(row)) + class Domain(BaseModel): id: str wallet: str diff --git a/lnbits/extensions/nostrnip5/templates/nostrnip5/index.html b/lnbits/extensions/nostrnip5/templates/nostrnip5/index.html index 6d66ecd8..8ebaa502 100644 --- a/lnbits/extensions/nostrnip5/templates/nostrnip5/index.html +++ b/lnbits/extensions/nostrnip5/templates/nostrnip5/index.html @@ -235,7 +235,11 @@ - +
- Update Amount + Update Amount Cancel @@ -627,13 +626,14 @@ saveEditedDomain: function () { var data = this.editFormDialog.data var self = this - + LNbits.api .request( 'PUT', '/nostrnip5/api/v1/domain', - _.findWhere(this.g.user.wallets, {id: this.editFormDialog.data.wallet}) - .inkey, + _.findWhere(this.g.user.wallets, { + id: this.editFormDialog.data.wallet + }).inkey, data ) .then(function (response) { @@ -647,7 +647,7 @@ editDomain: function (domain_id) { var self = this var data = _.findWhere(this.domains, {id: domain_id}) - + self.editFormDialog.show = true self.editFormDialog.data = data }, diff --git a/lnbits/extensions/nostrnip5/views_api.py b/lnbits/extensions/nostrnip5/views_api.py index 3dc1cbc8..99a0fe01 100644 --- a/lnbits/extensions/nostrnip5/views_api.py +++ b/lnbits/extensions/nostrnip5/views_api.py @@ -28,7 +28,12 @@ from .crud import ( rotate_address, update_domain_internal, ) -from .models import CreateAddressData, CreateDomainData, RotateAddressData, EditDomainData +from .models import ( + CreateAddressData, + CreateDomainData, + EditDomainData, + RotateAddressData, +) @nostrnip5_ext.get("/api/v1/domains", status_code=HTTPStatus.OK) @@ -89,6 +94,7 @@ async def api_domain_create( return domain + @nostrnip5_ext.put("/api/v1/domain", status_code=HTTPStatus.OK) async def api_domain_update( data: EditDomainData, wallet: WalletTypeInfo = Depends(get_key_type) @@ -98,6 +104,7 @@ async def api_domain_update( return domain + @nostrnip5_ext.delete("/api/v1/domain/{domain_id}", status_code=HTTPStatus.CREATED) async def api_domain_delete( domain_id: str,