From 363bc85e3b73967c26b9809f1d71664ec8719d8d Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Wed, 8 Jun 2022 11:00:43 +0100 Subject: [PATCH] add custom logo --- lnbits/config.py | 1 + lnbits/extensions/admin/migrations.py | 58 ++----------------- lnbits/extensions/admin/models.py | 2 + .../admin/templates/admin/index.html | 20 +++++-- lnbits/helpers.py | 3 +- 5 files changed, 26 insertions(+), 58 deletions(-) diff --git a/lnbits/config.py b/lnbits/config.py index 3ce51c3c..d07ca044 100644 --- a/lnbits/config.py +++ b/lnbits/config.py @@ -39,6 +39,7 @@ class Settings(BaseSettings): site_description: str = Field(default=None, env="LNBITS_SITE_DESCRIPTION") default_wallet_name: str = Field(default="LNbits wallet", env="LNBITS_DEFAULT_WALLET_NAME") theme: List[str] = Field(default=["classic, flamingo, mint, salvador, monochrome, autumn"], env="LNBITS_THEME_OPTIONS") + custom_logo: str = Field(default=None, env="LNBITS_CUSTOM_LOGO") ad_space: List[str] = Field(default_factory=list, env="LNBITS_AD_SPACE") # .env env: Optional[str] diff --git a/lnbits/extensions/admin/migrations.py b/lnbits/extensions/admin/migrations.py index 6c5b507d..aad66f02 100644 --- a/lnbits/extensions/admin/migrations.py +++ b/lnbits/extensions/admin/migrations.py @@ -41,60 +41,9 @@ async def m001_create_admin_table(db): site_description = conf.site_description default_wallet_name = conf.default_wallet_name theme = ",".join(conf.theme) + custom_logo = conf.custom_logo ad_space = ",".join(conf.ad_space) - # if getenv("LNBITS_ADMIN_EXTENSIONS"): - # admin_ext = getenv("LNBITS_ADMIN_EXTENSIONS") - - # if getenv("LNBITS_DATABASE_URL"): - # database_url = getenv("LNBITS_DATABASE_URL") - - # if getenv("LNBITS_HIDE_API"): - # hide_api = getenv("LNBITS_HIDE_API") - - # if getenv("LNBITS_THEME_OPTIONS"): - # theme = getenv("LNBITS_THEME_OPTIONS") - - # if getenv("LNBITS_AD_SPACE"): - # ad_space = getenv("LNBITS_AD_SPACE") - - # if getenv("LNBITS_SITE_TITLE"): - # site_title = getenv("LNBITS_SITE_TITLE") - - # if getenv("LNBITS_SITE_TAGLINE"): - # site_tagline = getenv("LNBITS_SITE_TAGLINE") - - # if getenv("LNBITS_SITE_DESCRIPTION"): - # site_description = getenv("LNBITS_SITE_DESCRIPTION") - - # if getenv("LNBITS_ALLOWED_USERS"): - # allowed_users = getenv("LNBITS_ALLOWED_USERS") - - # if getenv("LNBITS_ADMIN_USERS"): - # admin_users = "".join(getenv("LNBITS_ADMIN_USERS").split()) - # user = admin_users.split(',')[0] - - # if getenv("LNBITS_DEFAULT_WALLET_NAME"): - # default_wallet_name = getenv("LNBITS_DEFAULT_WALLET_NAME") - - # if getenv("LNBITS_DATA_FOLDER"): - # data_folder = getenv("LNBITS_DATA_FOLDER") - - # if getenv("LNBITS_DISABLED_EXTENSIONS"): - # disabled_ext = getenv("LNBITS_DISABLED_EXTENSIONS") - - # if getenv("LNBITS_FORCE_HTTPS"): - # force_https = getenv("LNBITS_FORCE_HTTPS") - - # if getenv("LNBITS_SERVICE_FEE"): - # service_fee = getenv("LNBITS_SERVICE_FEE") - - # if getenv("LNBITS_DENOMINATION"): - # denomination = getenv("LNBITS_DENOMINATION", "sats") - - # if getenv("LNBITS_BACKEND_WALLET_CLASS"): - # funding_source = getenv("LNBITS_BACKEND_WALLET_CLASS") - await db.execute( """ CREATE TABLE IF NOT EXISTS admin.admin ( @@ -115,6 +64,7 @@ async def m001_create_admin_table(db): site_description TEXT, default_wallet_name TEXT, theme TEXT, + custom_logo TEXT, ad_space TEXT ); """ @@ -139,8 +89,9 @@ async def m001_create_admin_table(db): site_description, default_wallet_name, theme, + custom_logo, ad_space) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) """, ( user, @@ -160,6 +111,7 @@ async def m001_create_admin_table(db): site_description, default_wallet_name, theme, + custom_logo, ad_space, ), ) diff --git a/lnbits/extensions/admin/models.py b/lnbits/extensions/admin/models.py index 0f25679d..3b17e720 100644 --- a/lnbits/extensions/admin/models.py +++ b/lnbits/extensions/admin/models.py @@ -23,6 +23,7 @@ class UpdateAdminSettings(BaseModel): default_wallet_name: str = Query("LNbits wallet") denomination: str = Query("sats") theme: str = Query(None) + custom_logo: str = Query(None) ad_space: str = Query(None) class Admin(BaseModel): @@ -46,6 +47,7 @@ class Admin(BaseModel): default_wallet_name: Optional[str] denomination: str = Field(default="sats") theme: Optional[str] + custom_logo: Optional[str] ad_space: Optional[str] @classmethod diff --git a/lnbits/extensions/admin/templates/admin/index.html b/lnbits/extensions/admin/templates/admin/index.html index 584d3a33..d9790051 100644 --- a/lnbits/extensions/admin/templates/admin/index.html +++ b/lnbits/extensions/admin/templates/admin/index.html @@ -705,6 +705,19 @@
+
+
+

Custom Logo

+ +
+
+
@@ -718,10 +731,7 @@
- +