Load app name and brand from the config and/or environment for flexibility

This commit is contained in:
nukeop 2016-12-02 01:13:54 +00:00
parent 0f1536fabe
commit 67115542d8
4 changed files with 23 additions and 6 deletions

View file

@ -1,4 +1,5 @@
{ {
"APPNAME": "", "APPNAME": "",
"APPBRAND": "",
"DBNAME": "smash.db" "DBNAME": "smash.db"
} }

View file

@ -11,6 +11,18 @@ conf = config.Config('config.json')
if 'HEROKU' in os.environ: if 'HEROKU' in os.environ:
conf.add(('HEROKU', 1)) conf.add(('HEROKU', 1))
# Load app name from environment if it's not in the config
if ('APPNAME' in conf.config and
conf.config['APPNAME']=="" and
'APPNAME' in os.environ):
conf.add(('APPNAME', os.environ['APPNAME']))
# Load app brand name from environment if it's not in the config
if ('APPBRAND' in conf.config and
conf.config['APPBRAND']=="" and
'APPBRAND' in os.environ):
conf.add(('APPBRAND', os.environ['APPBRAND']))
db = database.Database(conf.config["DBNAME"]) db = database.Database(conf.config["DBNAME"])
models.init_models(db) models.init_models(db)

View file

@ -18,7 +18,7 @@
<div class="container"> <div class="container">
<nav class="navbar navbar-default navbar-upper"> <nav class="navbar navbar-default navbar-upper">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand navbar-brand-upper" href="">smash</a> <a class="navbar-brand navbar-brand-upper" href="">{{ appbrand }}</a>
</div> </div>
</nav> </nav>
<nav class="navbar navbar-static-top navbar-lower"> <nav class="navbar navbar-static-top navbar-lower">

View file

@ -7,7 +7,8 @@ from smash import app, conf, db
def index(): def index():
return render_template( return render_template(
"index.html", "index.html",
appname=conf.config["APPNAME"], appname=conf.config['APPNAME'],
appbrand=conf.config['APPBRAND'],
title="Quotes", title="Quotes",
msg="Landing page!" msg="Landing page!"
) )
@ -20,7 +21,8 @@ def latest():
return render_template( return render_template(
"latest.html", "latest.html",
appname=conf.config["APPNAME"], appname=conf.config['APPNAME'],
appbrand=conf.config['APPBRAND'],
title="Latest", title="Latest",
quotes=quotes quotes=quotes
) )
@ -41,7 +43,8 @@ def quote(id):
] ]
return render_template( return render_template(
"latest.html", "latest.html",
appname=conf.config["APPNAME"], appname=conf.config['APPNAME'],
appbrand=conf.config['APPBRAND'],
title="Latest", title="Latest",
quotes=quote quotes=quote
) )
@ -51,6 +54,7 @@ def quote(id):
def tags(): def tags():
return render_template( return render_template(
"tags.html", "tags.html",
appname=conf.config["APPNAME"], appname=conf.config['APPNAME'],
appbrand=conf.config['APPBRAND'],
title="Tags" title="Tags"
) )