sheppy/flask-json-dream-website
1
0
Fork 0
mirror of https://github.com/FAUSheppy/flask-json-dream-website synced 2025-12-06 08:11:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

implement project page

Browse Source
This commit is contained in:
Yannik Schmidt
2020-09-09 19:47:15 +02:00
parent db3d80f1cf
commit 0cd586e8ac
3 changed files with 71 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server.py
View File

@@ -205,10 +205,17 @@ def content():
# check for extra config #
extraConfigDir = app.config[identifier + CONFIG_POSTFIX]
extraConfig = None
markupText = None
if extraConfigDir:
extraConfig = readJsonDir(os.path.join(app.config["CONTENT_DIR"], extraConfigDir))
fullpath = os.path.join(app.config["CONTENT_DIR"], extraConfigDir)
if os.path.isdir(fullpath):
extraConfig = readJsonDir(fullpath)
markupText = flask.Markup(flask.render_template(app.config[identifier],
extraConfig=extraConfig))
else:
with open(fullpath) as f:
markupText = markdown2.markdown(f.read())
markupText = flask.Markup(flask.render_template(app.config[identifier], extraConfig=extraConfig))
return flask.render_template("default_content.html", conf=app.config, markupText=markupText)
else:
return (EMPTY_STRING, HTTP_NOT_FOUND)
@@ -398,7 +405,10 @@ def init():
if type(subpages[identifier]) == dict:
app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier]["template"]
configKey = IDENTIFIER_PREFIX + identifier + CONFIG_POSTFIX
app.config[configKey] = subpages[identifier]["config-dir"]
if "config-dir" in subpages[identifier]:
app.config[configKey] = subpages[identifier]["config-dir"]
else:
app.config[configKey] = subpages[identifier]["markdown"]
else:
app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier]
app.config[IDENTIFIER_PREFIX + identifier + CONFIG_POSTFIX] = None