Cashu waket: multimint support (#1448)

* multimint working

* working

* fix typo

* migrations

* migration

* migration

* migration

* fix local storage

* notifications

* strings

* add mint dialog

* make format

* update favicons

* icons
This commit is contained in:
calle
2023-02-04 03:45:08 +01:00
committed by GitHub
parent 0dca98ca2e
commit d01c5dfdec
3 changed files with 734 additions and 443 deletions

1
.gitignore vendored
View File

@@ -44,5 +44,4 @@ docker
fly.toml fly.toml
# Ignore extensions (post installable extension PR) # Ignore extensions (post installable extension PR)
extensions/
upgrades/ upgrades/

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,5 @@
from http import HTTPStatus from http import HTTPStatus
from typing import Optional
from fastapi import Depends, Request from fastapi import Depends, Request
from fastapi.templating import Jinja2Templates from fastapi.templating import Jinja2Templates
@@ -25,18 +26,25 @@ async def index(
@cashu_ext.get("/wallet") @cashu_ext.get("/wallet")
async def wallet(request: Request, mint_id: str): async def wallet(request: Request, mint_id: Optional[str] = None):
cashu = await get_cashu(mint_id) if mint_id is not None:
if not cashu: cashu = await get_cashu(mint_id)
raise HTTPException( if not cashu:
status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist." raise HTTPException(
) status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist."
)
manifest_url = f"/cashu/manifest/{mint_id}.webmanifest"
mint_name = cashu.name
else:
manifest_url = "/cashu/cashu.webmanifest"
mint_name = "Cashu mint"
return cashu_renderer().TemplateResponse( return cashu_renderer().TemplateResponse(
"cashu/wallet.html", "cashu/wallet.html",
{ {
"request": request, "request": request,
"web_manifest": f"/cashu/manifest/{mint_id}.webmanifest", "web_manifest": manifest_url,
"mint_name": cashu.name, "mint_name": mint_name,
}, },
) )
@@ -50,177 +58,193 @@ async def cashu(request: Request, mintID):
) )
return cashu_renderer().TemplateResponse( return cashu_renderer().TemplateResponse(
"cashu/mint.html", "cashu/mint.html",
{"request": request, "mint_name": cashu.name, "mint_id": mintID}, {"request": request, "mint_id": mintID},
) )
@cashu_ext.get("/manifest/{cashu_id}.webmanifest") @cashu_ext.get("/manifest/{cashu_id}.webmanifest")
async def manifest(cashu_id: str): async def manifest_lnbits(cashu_id: str):
cashu = await get_cashu(cashu_id) cashu = await get_cashu(cashu_id)
if not cashu: if not cashu:
raise HTTPException( raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist." status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist."
) )
return get_manifest(cashu_id, cashu.name)
@cashu_ext.get("/cashu.webmanifest")
async def manifest():
return get_manifest()
def get_manifest(mint_id: Optional[str] = None, mint_name: Optional[str] = None):
manifest_name = "Cashu"
if mint_name:
manifest_name += " - " + mint_name
manifest_url = "/cashu/wallet"
if mint_id:
manifest_url += "?mint_id=" + mint_id
return { return {
"short_name": "Cashu", "short_name": "Cashu",
"name": "Cashu" + " - " + cashu.name, "name": manifest_name,
"icons": [ "icons": [
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/android/android-launchericon-512-512.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/512-512.png",
"type": "image/png", "type": "image/png",
"sizes": "512x512", "sizes": "512x512",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/android/android-launchericon-96-96.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/96-96.png",
"type": "image/png", "type": "image/png",
"sizes": "96x96", "sizes": "96x96",
}, },
], ],
"id": "/cashu/wallet?mint_id=" + cashu_id, "id": manifest_url,
"start_url": "/cashu/wallet?mint_id=" + cashu_id, "start_url": manifest_url,
"background_color": "#1F2234", "background_color": "#1F2234",
"description": "Cashu ecash wallet", "description": "Cashu ecash wallet",
"display": "standalone", "display": "standalone",
"scope": "/cashu/", "scope": "/cashu/",
"theme_color": "#1F2234", "theme_color": "#1F2234",
"protocol_handlers": [ "protocol_handlers": [
{"protocol": "cashu", "url": "&recv_token=%s"}, {"protocol": "web+cashu", "url": "&recv_token=%s"},
{"protocol": "lightning", "url": "&lightning=%s"}, {"protocol": "web+lightning", "url": "&lightning=%s"},
], ],
"shortcuts": [ "shortcuts": [
{ {
"name": "Cashu" + " - " + cashu.name, "name": manifest_name,
"short_name": "Cashu", "short_name": "Cashu",
"description": "Cashu" + " - " + cashu.name, "description": manifest_name,
"url": "/cashu/wallet?mint_id=" + cashu_id, "url": manifest_url,
"icons": [ "icons": [
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/android/android-launchericon-512-512.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/512x512.png",
"sizes": "512x512", "sizes": "512x512",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/android/android-launchericon-192-192.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/192x192.png",
"sizes": "192x192", "sizes": "192x192",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/android/android-launchericon-144-144.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/144x144.png",
"sizes": "144x144", "sizes": "144x144",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/android/android-launchericon-96-96.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/96x96.png",
"sizes": "96x96", "sizes": "96x96",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/android/android-launchericon-72-72.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/72x72.png",
"sizes": "72x72", "sizes": "72x72",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/android/android-launchericon-48-48.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/48x48.png",
"sizes": "48x48", "sizes": "48x48",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/16.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/16x16.png",
"sizes": "16x16", "sizes": "16x16",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/20.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/20x20.png",
"sizes": "20x20", "sizes": "20x20",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/29.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/29x29.png",
"sizes": "29x29", "sizes": "29x29",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/32.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/32x32.png",
"sizes": "32x32", "sizes": "32x32",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/40.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/40x40.png",
"sizes": "40x40", "sizes": "40x40",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/50.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/50x50.png",
"sizes": "50x50", "sizes": "50x50",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/57.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/57x57.png",
"sizes": "57x57", "sizes": "57x57",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/58.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/58x58.png",
"sizes": "58x58", "sizes": "58x58",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/60.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/60x60.png",
"sizes": "60x60", "sizes": "60x60",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/64.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/64x64.png",
"sizes": "64x64", "sizes": "64x64",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/72.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/72x72.png",
"sizes": "72x72", "sizes": "72x72",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/76.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/76x76.png",
"sizes": "76x76", "sizes": "76x76",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/80.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/80x80.png",
"sizes": "80x80", "sizes": "80x80",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/87.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/87x87.png",
"sizes": "87x87", "sizes": "87x87",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/100.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/100x100.png",
"sizes": "100x100", "sizes": "100x100",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/114.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/114x114.png",
"sizes": "114x114", "sizes": "114x114",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/120.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/120x120.png",
"sizes": "120x120", "sizes": "120x120",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/128.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/128x128.png",
"sizes": "128x128", "sizes": "128x128",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/144.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/144x144.png",
"sizes": "144x144", "sizes": "144x144",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/152.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/152x152.png",
"sizes": "152x152", "sizes": "152x152",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/167.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/167x167.png",
"sizes": "167x167", "sizes": "167x167",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/180.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/180x180.png",
"sizes": "180x180", "sizes": "180x180",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/192.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/192x192.png",
"sizes": "192x192", "sizes": "192x192",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/256.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/256x256.png",
"sizes": "256x256", "sizes": "256x256",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/512.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/512x512.png",
"sizes": "512x512", "sizes": "512x512",
}, },
{ {
"src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/ios/1024.png", "src": "https://github.com/cashubtc/cashu-ui/raw/main/ui/icons/circle/1024x1024.png",
"sizes": "1024x1024", "sizes": "1024x1024",
}, },
], ],