Commit 0df0e8d3 authored by Danny Rehl's avatar Danny Rehl
Browse files

improvements in wording

parent 9056eee7

creative_app/creative_app.py

+5 −5
Original line number Original line Diff line number Diff line 
import requests

import requests

from flask import Flask, render_template, url_for, jsonify

from flask import Flask, render_template, url_for

from creative_app.forms.rickandmorty import RickAndMortyForm

from creative_app.forms.rickandmorty import RickAndMortyForm





app = Flask(__name__, template_folder='./templates', static_folder='./static')

app = Flask(__name__, template_folder='./templates', static_folder='./static')
@@ -14,16 +14,16 @@ def index(): 




@app.route('/rickandmorty', methods=['GET', 'POST'])

@app.route('/rickandmorty', methods=['GET', 'POST'])

def rickandmorty():

def rickandmorty():

    url_template = "http://loremricksum.com/api/?paragraphs={p}&quotes={q}"

    url = "http://loremricksum.com/api/"

    text = {"data": ["Currently no Rick and Morty citations."]}

    text = {"data": ["Currently no Rick and Morty quotes."]}

    form = RickAndMortyForm()

    form = RickAndMortyForm()





    if form.validate_on_submit():

    if form.validate_on_submit():

        payload = {

        payload = {

            'paragraphs': form.paragraphs.data,

            'paragraphs': form.paragraphs.data,

            'quotes': form.paragraphs.data

            'quotes': form.quotes.data

        }

        }

        r = requests.get(url_template, params=payload)

        r = requests.get(url, params=payload)

        if r.ok:

        if r.ok:

            text = r.json()

            text = r.json()

        else:

        else:

creative_app/forms/rickandmorty.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,6 @@ class RickAndMortyForm(FlaskForm): 
    Form used to request Rick and Morty Lorem Ipsum Generator

    Form used to request Rick and Morty Lorem Ipsum Generator

    """

    """

    paragraphs = IntegerField('Anzahl Absätze', validators=[InputRequired()])

    paragraphs = IntegerField('Anzahl Absätze', validators=[InputRequired()])

    citations = IntegerField('Anzahl Zitate', validators=[InputRequired()])

    quotes = IntegerField('Anzahl Zitate', validators=[InputRequired()])

    submit = SubmitField('Anfrage durchführen')

    submit = SubmitField('Anfrage durchführen')

creative_app/templates/rickandmorty.html

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 
        {{ form.hidden_tag() }}

        {{ form.hidden_tag() }}

        <p>

        <p>

            {{ form.paragraphs.label }}: {{ form.paragraphs }} <span class="error">{{ form.paragraphs.errors | join(", ") }}</span><br>

            {{ form.paragraphs.label }}: {{ form.paragraphs }} <span class="error">{{ form.paragraphs.errors | join(", ") }}</span><br>

            {{ form.citations.label }}: {{ form.citations }} <span class="error">{{ form.citations.errors | join(", ") }}</span>

            {{ form.quotes.label }}: {{ form.quotes }} <span class="error">{{ form.quotes.errors | join(", ") }}</span>

        </p>

        </p>

        <p>

        <p>

            {{ form.submit() }}

            {{ form.submit() }}