From c6b99974dad14b90caa19eb93056b5350ed02db9 Mon Sep 17 00:00:00 2001 From: nberting Date: Thu, 7 Jun 2018 19:10:56 +0200 Subject: [PATCH] new default covers and grid view in search --- app/forms.py | 3 + app/static/css/style.css | 36 +++++++++++ app/static/img/default_cover.gif | Bin 0 -> 14473 bytes app/templates/add_to_stacks.html | 2 +- app/templates/edit_book_detail.html | 2 +- app/templates/results.html | 34 ++++++----- app/templates/results_grid.html | 89 ++++++++++++++++++++++++++++ app/templates/show_book_detail.html | 2 +- app/templates/show_books.html | 20 ++++--- app/templates/show_books_grid.html | 41 ++++++++----- app/views.py | 24 ++++++-- 11 files changed, 204 insertions(+), 49 deletions(-) create mode 100644 app/static/img/default_cover.gif create mode 100644 app/templates/results_grid.html diff --git a/app/forms.py b/app/forms.py index 0e5e25f..81508e1 100755 --- a/app/forms.py +++ b/app/forms.py @@ -51,4 +51,7 @@ class SearchForm(FlaskForm): ('Stack', 'Stack')] select = SelectField('', choices=choices) search = StringField('', validators=[InputRequired()]) + grid = SubmitField('Grid') + listview = SubmitField('List') + diff --git a/app/static/css/style.css b/app/static/css/style.css index a39c5b2..b72808f 100755 --- a/app/static/css/style.css +++ b/app/static/css/style.css @@ -313,3 +313,39 @@ box-sizing: border-box; height: 100%; border: none; } + +.grid { + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr; + grid-gap: 2px; + align-items: top; + justify-items: center; +} + +@media screen and (max-width: 900px) { +.grid{ + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr; + grid-gap: 2px; + align-items: center; + justify-items: center; +} +} +@media screen and (max-width: 400px) { +.grid{ + display: grid; + grid-template-columns: 1fr; + align-items: center; + justify-items: center; +} +} + +.gridbox { + display: inline-block; + padding-left: 5px; + align-items: center; + justify-items: center; +} +.gridbox:hover{ + opacity: 0.5; +} \ No newline at end of file diff --git a/app/static/img/default_cover.gif b/app/static/img/default_cover.gif new file mode 100644 index 0000000000000000000000000000000000000000..500390cbbb1928bb76ffe47ff34e0784f54b5609 GIT binary patch literal 14473 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 bZ$9U5KId;f=WjmeZ$9U5KIeZopCkNVFY5BI literal 0 HcmV?d00001 diff --git a/app/templates/add_to_stacks.html b/app/templates/add_to_stacks.html index c2ed248..2e7ab09 100644 --- a/app/templates/add_to_stacks.html +++ b/app/templates/add_to_stacks.html @@ -6,7 +6,7 @@
Chosen book:

{{ book.title }}

- +

These are all the stacks that have been built so far.

diff --git a/app/templates/edit_book_detail.html b/app/templates/edit_book_detail.html index 094aee6..4299e95 100755 --- a/app/templates/edit_book_detail.html +++ b/app/templates/edit_book_detail.html @@ -12,7 +12,7 @@

{{ form.title.label }} {{ form.title(size=20, class="form-control") }}

- +

diff --git a/app/templates/results.html b/app/templates/results.html index 1ee29ef..54f4546 100644 --- a/app/templates/results.html +++ b/app/templates/results.html @@ -1,19 +1,20 @@ {% extends 'base.html' %} {% block main %} -
-
{% from "_formhelpers.html" import render_field %}
{{ form.select(style="width: 100px; margin: 10px; float: left; font-size: 20px") }}
{{ render_field(form.search) }}
-
+


+ {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}

+
+
-

Results: "{{ query }}" included in {{ count }} out of {{ whole }} items

+

Results: "{{ query }}" included in {{ count }} out of {{ whole }} items

@@ -34,16 +35,17 @@ Cover Title - Author - Filetype - Category - Stack - Add to stack + Author + Filetype + Category + Stack + Add to stack {% for book in books %} - + + {{ book.title }} {% for author in book.authors %} @@ -75,16 +77,16 @@ Cover Title - Author - Filetype - Category - Stack - Add to stack + Author + Filetype + Category + Stack + Add to stack {% for book in books_all %} - + {{ book.title }} {% for author in book.authors %} diff --git a/app/templates/results_grid.html b/app/templates/results_grid.html new file mode 100644 index 0000000..cea341b --- /dev/null +++ b/app/templates/results_grid.html @@ -0,0 +1,89 @@ +{% extends 'base.html' %} + +{% block main %} +
+ {% from "_formhelpers.html" import render_field %} +
+
{{ form.select(style="width: 100px; margin: 10px; float: left; font-size: 20px") }}
+
+ {{ render_field(form.search) }}
+ +


+ {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}

+
+
+ +
+

Results: "{{ query }}" included in {{ count }} out of {{ whole }} items

+
+
+
+
+ {% with messages = get_flashed_messages() %} + {% if messages %} +
+
    + {% for message in messages %} +
  • {{ message }}
    • + {% endfor %} +
+
+ {% endif %} + {% endwith %} +
+ + {% for book in books|sort(attribute='title', reverse = False) %} + + +
+ + +

+ + +{{ book.title }} +
+ +{% for author in book.authors %} +{{ author.author_name }}
{% endfor %} + +

+
+ {% endfor %} +
+ + +
+
+

Other books

+ +
+ +{% for book in books_all|sort(attribute='title', reverse = False) %} + +
+ + +

+ + +{{ book.title }} +
+ +{% for author in book.authors %} +{{ author.author_name }}
{% endfor %} + +

+
+ {% endfor %} +
+
+ + +

+ See all books +

+ +
+ +{% endblock %} diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html index 42cd67d..a6ab30f 100755 --- a/app/templates/show_book_detail.html +++ b/app/templates/show_book_detail.html @@ -4,7 +4,7 @@

{{ book.title }}

- +

Author(s):

    {% for author in book.authors %}
  • {{ author.author_name }}
    • diff --git a/app/templates/show_books.html b/app/templates/show_books.html index 5f8e7b9..258c0e6 100755 --- a/app/templates/show_books.html +++ b/app/templates/show_books.html @@ -8,7 +8,9 @@
    {{ render_field(form.search) }}
    - +


    + {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}

    +

    All Books

    {% with messages = get_flashed_messages() %} @@ -28,19 +30,19 @@ Cover Title - Author - Filetype - Category - Stack - Add to stack + Author + Filetype + Category + Stack + Add to stack {% for book in books|sort(attribute='title', reverse = False) %} - + - + +
    + + +

    + + +{{ book.title }} +
    + +{% for author in book.authors %} +{{ author.author_name }}
    {% endfor %}     + +

    +
    {% endfor %} - +
{% endblock %} diff --git a/app/views.py b/app/views.py index 58edf45..e152071 100755 --- a/app/views.py +++ b/app/views.py @@ -342,6 +342,11 @@ def edit_stack_by_id(id): def show_books(): books = db.session.query(Book).all() search = SearchForm(request.form) + + if search.grid.data: + return render_template ('show_books_grid.html', books=books, form=search) + if search.listview.data: + return render_template ('show_books.html', books=books, form=search) if request.method == 'POST': return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data))) @@ -349,8 +354,8 @@ def show_books(): @app.route('/search///', methods=['POST', 'GET']) def search_results(searchtype, query): - search = SearchForm(request.form) - random_order=Book.query.order_by(func.random()).limit(10) + search = SearchForm(request.form, search=query) + random_order=Book.query.order_by(func.random()).limit(14) results=Book.query.filter(Book.title.contains(query)) if searchtype == 'Title': @@ -376,14 +381,21 @@ def search_results(searchtype, query): upload_form = UploadForm(title= query, author='') return render_template('red_link.html', form=upload_form, title=query) + count = results.count() + whole = Book.query.count() + percentage = float(count / whole * 100) + + if search.listview.data: + return render_template('results.html', books=results, form=search, query=query, books_all=random_order, searchtype=search.select.data, count = count, whole = whole, percentage = percentage) + + if search.grid.data: + return render_template('results_grid.html', books=results, form=search, query=query, books_all=random_order, searchtype=search.select.data, count = count, whole = whole, percentage = percentage) + if request.method == 'POST': query = search.search.data results = [] return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data))) - - count = results.count() - whole = Book.query.count() - percentage = float(count / whole * 100) + return render_template('results.html', form=search, books=results, books_all=random_order, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage)