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 config dir for subpages

Browse Source
This commit is contained in:
Yannik Schmidt
2020-08-28 19:01:52 +02:00
parent e78117b9cb
commit 2fb91f1b7b
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -69,8 +69,16 @@ The order is again specified by the alpha-numeric order of the files.
You can add new subpages in the *content*-location via a *subpages.json* file denoting an identifier as key and a HTML-template as value, like this: You can add new subpages in the *content*-location via a *subpages.json* file denoting an identifier as key and a HTML-template as value, like this:
{ {
"identifiert-1" : "html-template-1.html", "identifier-1" : "html-template-1.html",
"identifiert-2" : "html-template-2.html" "identifier-2" : "html-template-2.html"
}
You can also give identifier complex objects pointing to another config dir which will be parsed by *readJsonDir* and passed to *render_template* as a list of dictionary objects called *"extraConfig"*:
{
"identifier-1" : {
"template" : "html-template-1.html",
"config-dir" : "config_dir_in_content_dir"
} }
# Contact Page # Contact Page

18
server.py
View File

@@ -46,6 +46,7 @@ WRITE = "w"
# subpages # subpages
IDENTIFIER_PREFIX = "PAGE_" IDENTIFIER_PREFIX = "PAGE_"
CONFIG_POSTFIX = "_EXTRA_CONFIG"
SUBPAGE_CONFIG_FILE = "subpages.json" SUBPAGE_CONFIG_FILE = "subpages.json"
SUBPAGE_CONTENT_DIR = "subpages/" SUBPAGE_CONTENT_DIR = "subpages/"
@@ -180,7 +181,14 @@ def people():
def content(): def content():
identifier = IDENTIFIER_PREFIX + flask.request.args.get("id") identifier = IDENTIFIER_PREFIX + flask.request.args.get("id")
if identifier in app.config: if identifier in app.config:
markupText = flask.Markup(flask.render_template(app.config[identifier]))
# check for extra config #
extraConfigDir = app.config[identifier + CONFIG_POSTFIX]
extraConfig = None
if extraConfigDir:
extraConfig = readJsonDir(os.path.join(app.config[CONTENT_DIR], extraConfigDir))
markupText = flask.Markup(flask.render_template(app.config[identifier], extraConfig=extraConfig))
return flask.render_template("default_content.html", conf=app.config, markupText=markupText) return flask.render_template("default_content.html", conf=app.config, markupText=markupText)
else: else:
return (EMPTY_STRING, HTTP_NOT_FOUND) return (EMPTY_STRING, HTTP_NOT_FOUND)
@@ -314,7 +322,13 @@ def init():
# set template paths for identifier in app config # # set template paths for identifier in app config #
for identifier in subpages.keys(): for identifier in subpages.keys():
app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier] 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"]
else:
app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier]
app.config[IDENTIFIER_PREFIX + identifier + CONFIG_POSTFIX] = None
# set custom loader to support second template dir # # set custom loader to support second template dir #
subpageContentDirTmp = os.path.join(app.config["CONTENT_DIR"], SUBPAGE_CONTENT_DIR) subpageContentDirTmp = os.path.join(app.config["CONTENT_DIR"], SUBPAGE_CONTENT_DIR)