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

Merge branch 'dev'

Browse Source
This commit is contained in:
Yannik Schmidt
2020-08-30 12:55:27 +02:00
parent 1f6c8f47ab e49329f329
commit 4262cdd927
7 changed files with 38 additions and 9 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

4
example_config.py
View File

@@ -22,6 +22,8 @@ SITE_LOGO_URL = "Site Logo URL"
SITE_BASE_URL = "Site Base URL" SITE_BASE_URL = "Site Base URL"
WALLPAPER_URL = "/picture/example.png" WALLPAPER_URL = "/picture/example.png"
SITE_WELLCOME_TITLE = "Title on the Wallpaper"
SITE_WELLCOME_SUBTITLE = "Subtitle on the Wallpaper"
TEAMSPEAK_SERVER = "teamspeak.com" TEAMSPEAK_SERVER = "teamspeak.com"
DISCORD_SERVER = "https://discord.gg/" DISCORD_SERVER = "https://discord.gg/"
@@ -31,3 +33,5 @@ TWITTER = "https://twitter.com/its_a_sheppy"
TWITCH_CHANNEL = "esports_erlangen" TWITCH_CHANNEL = "esports_erlangen"
TWITCH_PLACEHOLDER_IMG = "placeholder.png" TWITCH_PLACEHOLDER_IMG = "placeholder.png"
ADDITIONAL_HEADER_CONTENT = "<!-- additional content you want in <head> -->"

19
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/"
@@ -169,7 +170,6 @@ def impressum():
with open(impressumTextPath) as f: with open(impressumTextPath) as f:
impressumText = flask.Markup(f.read()) impressumText = flask.Markup(f.read())
#impressumText = flask.Markup(impressumTextPath)
with open(impressumPath) as f: with open(impressumPath) as f:
impressumFull = flask.render_template_string(f.read(), conf=app.config, text=impressumText) impressumFull = flask.render_template_string(f.read(), conf=app.config, text=impressumText)
return flask.render_template("stub.html", content=impressumFull) return flask.render_template("stub.html", content=impressumFull)
@@ -183,7 +183,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)
@@ -317,7 +324,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)

2
templates/default_content.html
View File

@@ -5,7 +5,7 @@
{% include 'head.html' %} {% include 'head.html' %}
</head> </head>
<body class="bg-special"> <body class="bg-special" {% if "FORCE_BG_COLOR" in conf %} style="background-color: {{ conf['FORCE_BG_COLOR'] }} !important;" {% endif %}>
{% include 'navbar.html' %} {% include 'navbar.html' %}
<div class="container mt-5 mb-5 h-100"> <div class="container mt-5 mb-5 h-100">

2
templates/head.html
View File

@@ -28,6 +28,8 @@
<meta property="og:url" content="{{ url_for(request.endpoint) }}" /> <meta property="og:url" content="{{ url_for(request.endpoint) }}" />
<meta property="og:image" content="{{ conf['SITE_LOG_URL'] }}"> <meta property="og:image" content="{{ conf['SITE_LOG_URL'] }}">
{{ conf['ADDITIONAL_HEADER_CONTENT'] | safe }}
<script type="application/ld+json"> <script type="application/ld+json">
{ {
"@context": "https://schema.org", "@context": "https://schema.org",

4
templates/index.html
View File

@@ -19,8 +19,10 @@
<div class="container h-50"> <div class="container h-50">
<div class="row h-100 align-items-center"> <div class="row h-100 align-items-center">
<div class="col-12 text-center"> <div class="col-12 text-center">
<div style="opacity: 0;"></div> <div style="opacity: 0;"></div> <!-- TODO color for text configurable -->
<div class="mt-5" style="opacity: 0;"></div> <div class="mt-5" style="opacity: 0;"></div>
{% if "SITE_WELLCOME_TITLE" in conf %} <h1 class="font-weight-light">{{ conf["SITE_WELLCOME_TITLE"] }}</h1> {% endif %}
{% if "SITE_WELLCOME_SUBTITLE" in conf %} <p class="lead">{{ conf["SITE_WELLCOME_SUBTITLE"] }}</p> {% endif %}
</div> </div>
</div> </div>
</div> </div>

4
templates/people.html
View File

@@ -21,8 +21,8 @@
</p> </p>
</div> </div>
<div class="col image-min-dimensions"> <div class="col image-min-dimensions">
<img class="img-responsive w-100 image-max-dimensions" <img class="img-responsive w-100 image-max-dimensions"
src="{{ p['image'] }}"></img> src="{{ p['image'] }}" alt="{{ 'title' }}"></img>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}