Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 16:37:52 +01:00
Code Issues Projects Releases Wiki Activity

Use template path (#2961)

Browse Source
This commit is contained in:
Paulus Schoutsen 2022-01-03 08:57:09 -08:00 committed by GitHub
parent a02d2e2e11
commit 998d4229af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
esphome/dashboard/dashboard.py
View File

@ -601,7 +601,7 @@ class MainRequestHandler(BaseHandler):
begin = bool(self.get_argument("begin", False)) begin = bool(self.get_argument("begin", False))
self.render( self.render(
get_template_path("index"), "index.template.html",
begin=begin, begin=begin,
**template_args(), **template_args(),
login_enabled=settings.using_password, login_enabled=settings.using_password,
@ -778,7 +778,7 @@ class LoginHandler(BaseHandler):
def render_login_page(self, error=None): def render_login_page(self, error=None):
self.render( self.render(
get_template_path("login"), "login.template.html",
error=error, error=error,
hassio=settings.using_hassio_auth, hassio=settings.using_hassio_auth,
has_username=bool(settings.username), has_username=bool(settings.username),
@ -872,10 +872,6 @@ def get_base_frontend_path():
return os.path.abspath(os.path.join(os.getcwd(), static_path, "esphome_dashboard")) return os.path.abspath(os.path.join(os.getcwd(), static_path, "esphome_dashboard"))
def get_template_path(template_name):
return os.path.join(get_base_frontend_path(), f"{template_name}.template.html")
def get_static_path(*args): def get_static_path(*args):
return os.path.join(get_base_frontend_path(), "static", *args) return os.path.join(get_base_frontend_path(), "static", *args)
@ -933,6 +929,7 @@ def make_app(debug=get_bool_env(ENV_DEV)):
"cookie_secret": settings.cookie_secret, "cookie_secret": settings.cookie_secret,
"log_function": log_function, "log_function": log_function,
"websocket_ping_interval": 30.0, "websocket_ping_interval": 30.0,
"template_path": get_base_frontend_path(),
} }
rel = settings.relative_url rel = settings.relative_url
app = tornado.web.Application( app = tornado.web.Application(