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

14
server.py
View File

@@ -205,10 +205,17 @@ def content():
# check for extra config # # check for extra config #
extraConfigDir = app.config[identifier + CONFIG_POSTFIX] extraConfigDir = app.config[identifier + CONFIG_POSTFIX]
extraConfig = None extraConfig = None
markupText = None
if extraConfigDir: 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) 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)
@@ -398,7 +405,10 @@ def init():
if type(subpages[identifier]) == dict: if type(subpages[identifier]) == dict:
app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier]["template"] app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier]["template"]
configKey = IDENTIFIER_PREFIX + identifier + CONFIG_POSTFIX configKey = IDENTIFIER_PREFIX + identifier + CONFIG_POSTFIX
if "config-dir" in subpages[identifier]:
app.config[configKey] = subpages[identifier]["config-dir"] app.config[configKey] = subpages[identifier]["config-dir"]
else:
app.config[configKey] = subpages[identifier]["markdown"]
else: else:
app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier] app.config[IDENTIFIER_PREFIX + identifier] = subpages[identifier]
app.config[IDENTIFIER_PREFIX + identifier + CONFIG_POSTFIX] = None app.config[IDENTIFIER_PREFIX + identifier + CONFIG_POSTFIX] = None

12
templates/contact.html
View File

@@ -17,7 +17,7 @@
{% include 'progress_window.html' %} {% include 'progress_window.html' %}
<div id="main-container" class="container" style="margin-top: 4vw;"> <div id="main-container" class="container" style="margin-top: 4vw;">
<section class="mb-4"> <section class="mb-4">
<h2 class="h1-responsive font-weight-bold text-center my-4">{{ conf['CONTACT_HEADLINE'] }} <h2 class="h1-responsive font-weight-bold my-4">{{ conf['CONTACT_HEADLINE'] }}
</h2> </h2>
<p class="text-center w-responsive mx-auto mb-5"> </p> <p class="text-center w-responsive mx-auto mb-5"> </p>
<div class="row"> <div class="row">
@@ -64,15 +64,17 @@
<div class="status"></div> <div class="status"></div>
</div> </div>
<!-- <div class="border p-3 col-md-3 text-center">
<div class="col-md-3 text-center">
<ul class="list-unstyled mb-0"> <ul class="list-unstyled mb-0">
<li><i class="fas fa-envelope mt-4 fa-2x"></i> <li><i class="fas fa-envelope mt-4 fa-2x"></i>
<p>rejectmail@atlantishq.de</p> <p>Wir freuen uns auf ihre Nachricht!</p></br>
{% if conf['CONTACT_EMAIL'] %}
<p>Selbsverständlich können sie uns auch per Mail kontaktieren.</p></br>
<a href="mailto:{{ conf['CONTACT_EMAIL'] }}">{{ conf['CONTACT_EMAIL'] }}</a>
{% endif %}
</li> </li>
</ul> </ul>
</div> </div>
-->
</div> </div>
</section> </section>

4
templates/default_content.html
View File

@@ -5,13 +5,13 @@
{% include 'head.html' %} {% include 'head.html' %}
</head> </head>
<body class="bg-special" {% if "FORCE_BG_COLOR" in conf %} style="background-color: {{ conf['FORCE_BG_COLOR'] }} !important;" {% endif %}> <body class="bg-special">
{% include 'navbar.html' %} {% include 'navbar.html' %}
<div class="container mt-5 mb-5 h-100"> <div class="container mt-5 mb-5 h-100">
<div class="row impressum mt-5"></div> <div class="row impressum mt-5"></div>
<div class="col-lg-12"> <div class="col-lg-12">
{{ markupText }} {{ markupText | safe }}
<div class="pb-3"></div> <div class="pb-3"></div>
</div> </div>
</div> </div>