add custom logo

This commit is contained in:
Tiago vasconcelos
2022-06-08 11:00:43 +01:00
committed by dni ⚡
parent 1ebd557b1d
commit e04e24faec
5 changed files with 26 additions and 58 deletions

View File

@@ -39,6 +39,7 @@ class Settings(BaseSettings):
site_description: str = Field(default=None, env="LNBITS_SITE_DESCRIPTION") site_description: str = Field(default=None, env="LNBITS_SITE_DESCRIPTION")
default_wallet_name: str = Field(default="LNbits wallet", env="LNBITS_DEFAULT_WALLET_NAME") 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") 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") ad_space: List[str] = Field(default_factory=list, env="LNBITS_AD_SPACE")
# .env # .env
env: Optional[str] env: Optional[str]

View File

@@ -41,60 +41,9 @@ async def m001_create_admin_table(db):
site_description = conf.site_description site_description = conf.site_description
default_wallet_name = conf.default_wallet_name default_wallet_name = conf.default_wallet_name
theme = ",".join(conf.theme) theme = ",".join(conf.theme)
custom_logo = conf.custom_logo
ad_space = ",".join(conf.ad_space) 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( await db.execute(
""" """
CREATE TABLE IF NOT EXISTS admin.admin ( CREATE TABLE IF NOT EXISTS admin.admin (
@@ -115,6 +64,7 @@ async def m001_create_admin_table(db):
site_description TEXT, site_description TEXT,
default_wallet_name TEXT, default_wallet_name TEXT,
theme TEXT, theme TEXT,
custom_logo TEXT,
ad_space TEXT ad_space TEXT
); );
""" """
@@ -139,8 +89,9 @@ async def m001_create_admin_table(db):
site_description, site_description,
default_wallet_name, default_wallet_name,
theme, theme,
custom_logo,
ad_space) ad_space)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
""", """,
( (
user, user,
@@ -160,6 +111,7 @@ async def m001_create_admin_table(db):
site_description, site_description,
default_wallet_name, default_wallet_name,
theme, theme,
custom_logo,
ad_space, ad_space,
), ),
) )

View File

@@ -23,6 +23,7 @@ class UpdateAdminSettings(BaseModel):
default_wallet_name: str = Query("LNbits wallet") default_wallet_name: str = Query("LNbits wallet")
denomination: str = Query("sats") denomination: str = Query("sats")
theme: str = Query(None) theme: str = Query(None)
custom_logo: str = Query(None)
ad_space: str = Query(None) ad_space: str = Query(None)
class Admin(BaseModel): class Admin(BaseModel):
@@ -46,6 +47,7 @@ class Admin(BaseModel):
default_wallet_name: Optional[str] default_wallet_name: Optional[str]
denomination: str = Field(default="sats") denomination: str = Field(default="sats")
theme: Optional[str] theme: Optional[str]
custom_logo: Optional[str]
ad_space: Optional[str] ad_space: Optional[str]
@classmethod @classmethod

View File

@@ -705,6 +705,19 @@
<br /> <br />
</div> </div>
</div> </div>
<div class="row q-col-gutter-md">
<div class="col-12 col-md-6">
<p>Custom Logo</p>
<q-input
filled
type="text"
v-model="data.admin.custom_logo"
label="https://example.com/image.png"
hint="URL to logo image"
></q-input>
<br />
</div>
</div>
</div> </div>
<div class="row q-mt-lg"> <div class="row q-mt-lg">
@@ -718,10 +731,7 @@
</div> </div>
</div> </div>
<!-- END TABS --> <!-- END TABS -->
<!--
Forked from:
https://quasar.dev/vue-components/form#Example--Basic
-->
<div class="row"> <div class="row">
<!-- <div class="col-8"> <!-- <div class="col-8">
<q-card class="q-mr-md"> <q-card class="q-mr-md">
@@ -1290,6 +1300,7 @@
default_wallet_name, default_wallet_name,
denomination, denomination,
theme, theme,
custom_logo,
ad_space ad_space
} = this.data.admin } = this.data.admin
//console.log("this", this.data.admin) //console.log("this", this.data.admin)
@@ -1308,6 +1319,7 @@
default_wallet_name, default_wallet_name,
denomination, denomination,
theme: theme.toString(), theme: theme.toString(),
custom_logo: custom_logo.toString(),
ad_space: ad_space.toString() ad_space: ad_space.toString()
} }
//console.log(data) //console.log(data)

View File

@@ -170,6 +170,7 @@ def template_renderer(additional_folders: List = []) -> Jinja2Templates:
settings.LNBITS_SITE_TAGLINE = _.site_tagline settings.LNBITS_SITE_TAGLINE = _.site_tagline
settings.LNBITS_SITE_DESCRIPTION = _.site_description settings.LNBITS_SITE_DESCRIPTION = _.site_description
settings.LNBITS_THEME_OPTIONS = _.theme settings.LNBITS_THEME_OPTIONS = _.theme
settings.LNBITS_CUSTOM_LOGO = _.custom_logo
t = Jinja2Templates( t = Jinja2Templates(
loader=jinja2.FileSystemLoader( loader=jinja2.FileSystemLoader(