~fast fertig

0667c19e · leo · 34f70ff8 · 0667c19e · 0667c19e · 0667c19e
Commit 0667c19e authored 6 years ago by leo
--- a/model/__init__.py
+++ b/model/__init__.py
@@ -9,6 +9,6 @@ class BaseModel(Model):
    class Meta():
        database = sqlite

-from model.base import Question, Answer
+from model.base import Question, Answer, Submit

-sqlite.create_tables([Question, Answer])
\ No newline at end of file
+sqlite.create_tables([Question, Answer, Submit])
\ No newline at end of file
--- a/model/base.py
+++ b/model/base.py
@@ -6,12 +6,12 @@ class Question(BaseModel):
        
        text = CharField()

+class Submit(BaseModel):
+
+    token = CharField()

 class Answer(BaseModel):

    text = CharField()
    question = ForeignKeyField(Question, backref="answers")
-    
-
-
-class Submit(BaseModel):
\ No newline at end of file
+    submit = ForeignKeyField(Submit, backref="answers")
--- a/model/cfd.sqlite
+++ b/model/cfd.sqlite
--- a/static/LNP300_blue.jpg
+++ b/static/LNP300_blue.jpg
--- a/static/LNP300_green.jpg
+++ b/static/LNP300_green.jpg
--- a/static/LNP300_green.jpg~
+++ b/static/LNP300_green.jpg~
--- a/static/LNP300_green.png
+++ b/static/LNP300_green.png
--- a/static/PressStart2P-Regular.ttf
+++ b/static/PressStart2P-Regular.ttf
--- a/static/main.css
+++ b/static/main.css
+@font-face { font-family: PressStart2P; src: url('../../static/PressStart2P-Regular.ttf'); }
+
+
+.vertical-center {
+    min-height: 100%;  /* Fallback for browsers do NOT support vh unit */
+    min-height: 100vh; /* These two lines are counted as one :-)       */
+  
+    display: flex;
+    align-items: center;
+  }
+.my-auto {
+    margin-top: auto;
+margin-bottom: auto;
+}
+.hor-cent {
+    margin: 0 auto;
+    border-radius: 10px;
+    width: 40%;
+    background-color: black;
+    color: white;
+    position: relative;
+}
+
+.imgplacer {
+    margin: 0 auto;
+    width: 50%;
+}
+
+img {
+    width: 100%;
+}
+
+.fw {
+    width: 100%;
+}
+
+.ccc-blue{
+    color: #0084b0;
+}
+
+.ccc-green{
+    color: #00a356;
+}
+
+.white{
+    color: white;
+}
+
+body {
+    
+ background-color: #232323;
+ font-family: PressStart2P;
+}
+
+@media (max-width: 1275.98px) {
+    .hor-cent {
+        width:90%;
+    }
+    .imgplacer {
+        width: 60%;
+    }
+}
--- a/templates/feedback.jinja
+++ b/templates/feedback.jinja
+{% extends "main.jinja" %}
+
+{% block content%}
+    {{message}}
+{% endblock %}
\ No newline at end of file
--- a/templates/index.html
+++ b/templates/index.html
-<html>
-    <head></head>
-    <body>
-        <form action="/submit" method="POST">
-        {% for quest in questions %}
-        {% set questid = quest.id %}
-        {% set questtext = quest.text %}
-            {{ questtext }}
-            <br>
-            <input type="hidden" name="question_ids[]" value="{{questid}}"/>
-            <input type="text" name="{{questid}}" value="">
-            <br><br>
-        {% endfor %}
-        <input type="submit" value="Submit">
-        </form>
-    </body>
-</html>
\ No newline at end of file
--- a/templates/index.jinja
+++ b/templates/index.jinja
+{% extends "main.jinja" %}
+
+{% block content%}
+    Trage hier deine Antworten ein:<br><br>
+    <form action="/submit" method="POST">
+    {% for quest in questions %}
+    {% set questid = quest.id %}
+    {% set questtext = quest.text %}
+        {{ questtext }}
+        <br>
+        <input class="form-control" type="hidden" name="question_ids[]" value="{{questid}}"/>
+        <input class="form-control" type="text" name="{{questid}}" value="">
+        <br><br>
+    {% endfor %}
+    <input type="submit" value="Submit">
+    </form>
+{% endblock %}
--- a/templates/main.jinja
+++ b/templates/main.jinja
+<html>
+    <head>
+        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+        <link rel="stylesheet" href="/static/main.css">
+    </head>
+    <body>
+        <div class="container-fluid">
+            <div class="row p-3 m-2">
+                <div class="col-3">
+
+                </div>
+                <div class="col-6">
+                    <h3 class="ccc-blue">Chaos-Familien-Duell</h3>
+                    <div class="imgplacer">
+                            <img src="/static/LNP300_green.png" alt="lnp300-logo">
+                    </div>
+                    <div class="white">
+                        {% block content %}
+                        {% endblock %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
--- a/view/questions.py
+++ b/view/questions.py
 import uuid

 from flask import Flask, render_template, redirect, request, Blueprint, session
-from model import Question, Answer
+from model import Question, Answer, Submit

 questions = Blueprint("questions", "questions")

 @questions.route("/")
 def index():
-    return render_template("index.html", questions=Question.select())
+    if "token" in session:
+        return render_template("feedback.jinja", message="Vielen Dank für deine Antworten!")
+    return render_template("index.jinja", questions=Question.select())

 @questions.route("/debug")
 def debug():
@@ -21,20 +23,23 @@ def submit_answers():
    if "token" in session:
        return "nanan, du hast schon!"

-    session["token"] = uuid.uuid4()
+    token = uuid.uuid4()
+    session["token"] = token
+
+    submit = Submit.get_or_create(token=token)[0]

    question_ids = request.form.getlist("question_ids[]")

    if question_ids is None:
-        return "No answers submitted!"
+        return render_template("feedback.jinja", message="ERROR: Keine Question-ID übermittelt!")

    for question_id in question_ids:
        question = Question.get_or_none(id=question_id)
        if question is None:
-            return "No question found by that id %s" % question_id
+            return render_template("feedback.jinja", message="ERROR: Keine Frage mit der ID '%s' gefunden" % question_id)

        answer = request.form.get(question_id)
-        answer = Answer.create(text=answer, question=question)
+        answer = Answer.create(text=answer, question=question, submit=submit)
        answer.save()

-    return "Vielen Dankeschön"
\ No newline at end of file
+    return render_template("feedback.jinja", message="Vielen Dank für deine Antworten!")
\ No newline at end of file