From c3e04c3b21c0faa3d0409a8e9545892bb4360254 Mon Sep 17 00:00:00 2001 From: oleting Date: Wed, 13 Jan 2021 22:52:19 +0100 Subject: [PATCH] + small Changes --- README.md | 3 +- Web/main/routes.py | 3 +- Web/static/main.css | 90 ++++++++++++++++++++++++++++++++++ Web/templates/datenschutz.html | 7 +++ Web/templates/layout.html | 6 +-- Web/templates/upload.html | 4 +- 6 files changed, 104 insertions(+), 9 deletions(-) create mode 100644 Web/static/main.css create mode 100644 Web/templates/datenschutz.html diff --git a/README.md b/README.md index 3786ee2..d76a6c0 100644 --- a/README.md +++ b/README.md @@ -7,5 +7,4 @@ In the final version, you will just have to execute the nassi.exe and choose you Using: Python 3.9.1 with -PySimpleGUI & -Pillow +PySimpleGUI, Pillow, Flask & wtforms diff --git a/Web/main/routes.py b/Web/main/routes.py index 0fa8a87..5bcbb2f 100644 --- a/Web/main/routes.py +++ b/Web/main/routes.py @@ -1,5 +1,4 @@ from flask.helpers import send_file -import Web from flask import render_template, abort, flash, Blueprint from Web.main.forms import UploadJavaForm from random import randint @@ -71,5 +70,5 @@ def generator(): return send_file(zip_path + '.zip', as_attachment=True) - return render_template('upload.html', title='', legend='', form=form ) + return render_template('upload.html', title='Upload', legend='Upload', form=form ) diff --git a/Web/static/main.css b/Web/static/main.css new file mode 100644 index 0000000..deb1063 --- /dev/null +++ b/Web/static/main.css @@ -0,0 +1,90 @@ + +body { +color: #ffffff; +margin-top: 5rem; +} + +h1, h2, h3, h4, h5, h6 { +color: #ffffff; +} + +.black-text { + color: #000000; +} + +.bg-steel { +background-color: #49484d; +} + +.site-header .navbar-nav .nav-link { +color: #cbd5db; +} + +.site-header .navbar-nav .nav-link:hover { +color: #ffffff; +} + +.site-header .navbar-nav .nav-link.active { +font-weight: 500; +} + +.content-section { +background: #444444; +padding: 10px 20px; +border: 10px solid #444455; +border-style: groove; +border-radius: 30px 1px 30px 1px; +margin-bottom: 20px; +} + +.article-title { +color: #ffffff; +} + +a.article-title:hover { +color: #428bca; +text-decoration: none; +} + +.article-content { +white-space: pre-line; +color: aliceblue; +} + +.article-img { +height: 65px; +width: 65px; +margin-right: 16px; +} + +.article-metadata { +padding-bottom: 1px; +margin-bottom: 4px; +border-bottom: 1px solid #ffffff +} + +.article-metadata a:hover { +color: #ffffff; +text-decoration: none; +} + +.article-svg { +width: 25px; +height: 25px; +vertical-align: middle; +} + +.account-img { +height: 125px; +width: 125px; +margin-right: 20px; +margin-bottom: 16px; +} + +.account-heading { +font-size: 2.5rem; +} + +.label-filter { + color: #291852; +} diff --git a/Web/templates/datenschutz.html b/Web/templates/datenschutz.html new file mode 100644 index 0000000..90e7fb4 --- /dev/null +++ b/Web/templates/datenschutz.html @@ -0,0 +1,7 @@ +{% extends 'layout.html' %} +{% block content %} + +

Datenschutz

+
Sie werden jeden Moment weitergeleitet!
+

Falls dies nicht der Fall ist, hier die Zieladresse https://ole-siepmann.de/startseite/datenschutzerklaerung/ an die Sie weitergeleitet werden.

+{% endblock content %} \ No newline at end of file diff --git a/Web/templates/layout.html b/Web/templates/layout.html index cdb9c2d..14f784c 100644 --- a/Web/templates/layout.html +++ b/Web/templates/layout.html @@ -8,7 +8,7 @@ - + {% if title %} NassiShneiderman Generator - {{ title }} @@ -27,8 +27,8 @@