From 68c38ae1983b012e53f6e97656c3d36b0b3653ec Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Thu, 7 Jun 2018 09:59:08 +0200
Subject: [PATCH 01/27] added upload new version of file into edit form

---
 app/forms.py                          |   1 +
 app/templates/edit_book_detail.html   |  13 ++++++++++--
 app/views.py                          |  29 ++++++++++++++++++++------
 whoosh/Book/MAIN_taxstcerlfadcokk.seg | Bin 0 -> 5276 bytes
 whoosh/Book/_MAIN_4.toc               | Bin 0 -> 2306 bytes
 5 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 whoosh/Book/MAIN_taxstcerlfadcokk.seg
 create mode 100644 whoosh/Book/_MAIN_4.toc

diff --git a/app/forms.py b/app/forms.py
index 0db4fdf..e276a3d 100755
--- a/app/forms.py
+++ b/app/forms.py
@@ -25,6 +25,7 @@ class EditForm(FlaskForm):
     author = FieldList(FormField(AuthorForm, default=lambda: Author()), min_entries=1)
     category = StringField('category', validators=[InputRequired()])
     year_published = StringField('year published', [validators.Length(max=4)],default=None)
+    file = FileField()
 
 class ChatForm(FlaskForm):
     message = StringField('message', validators=[InputRequired()])
diff --git a/app/templates/edit_book_detail.html b/app/templates/edit_book_detail.html
index c936ff4..094aee6 100755
--- a/app/templates/edit_book_detail.html
+++ b/app/templates/edit_book_detail.html
@@ -7,7 +7,7 @@
 
 
 
-  <form method="POST" action="{{ url_for('edit_book_by_id', id=book.id )}}">
+  <form method="POST" action="{{ url_for('edit_book_by_id', id=book.id )}}" enctype=multipart/form-data>
     {{ form.csrf_token }}
 
     <div class="form-group"><h1 class="header">{{ form.title.label }} {{ form.title(size=20, class="form-control") }}</h1></div>
@@ -32,10 +32,19 @@
         </table>
     </div><br>
     <div class="form-group">
-    {{ form.category.label }} {{ form.category(size=20, class="form-control") }}
+    {{ form.category.label }} {{ form.category(size=20, 
+    class="form-control") }}
   </div><br>
   <div class="form-group">
   {{ form.year_published.label }} {{ form.year_published(size=4, class="form-control") }}
+</div>
+<div class="form-group">
+  Current file: {{ book.file }}
+</div>
+<div class="form-group">
+
+  Upload new file: {{form.file}} 
+
 </div>
     <br>
     <button type="submit" class="btn btn-primary">Update</button>
diff --git a/app/views.py b/app/views.py
index acc2e22..7d77122 100755
--- a/app/views.py
+++ b/app/views.py
@@ -134,16 +134,13 @@ def edit_book_by_id(id):
 
     if request.method == 'POST':
         if user_form.validate_on_submit():
-            # check if the post request has the file part
-            title = user_form.title.data # You could also have used request.form['name']
-            input_authors = user_form.author.data # You could also have used request.form['email']
+            # on submit, check fields
+            title = user_form.title.data
+            input_authors = user_form.author.data 
             category = user_form.category.data
             year_published = user_form.year_published.data
             if year_published=="":
                 year_published = None
-            # save user to database
-            #book = Book(title, author, filename, cover, file_extension)
-
             book = Book.query.filter_by(id=id).first()
             book.title = title
             book.category = category
@@ -159,6 +156,26 @@ def edit_book_by_id(id):
                         a = Author(author_name=author_name)
                         db.session.add(a)
                     book.authors.append(a)
+
+            # editing / uploading new file
+            if user_form.file.data:
+                file = request.files['file']
+                if file.filename == '':
+                    flash('No selected file')
+                    return redirect(request.url)
+                if file and allowed_file(file.filename):
+                    filename = secure_filename(file.filename)
+                    allbooks = db.session.query(Book).all()
+                    id = book.id
+                    new_filename = str(id) +"_"+ filename
+                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], new_filename)
+                    name, file_extension = os.path.splitext(new_filename)
+                    file.save(fullpath)
+                    book.cover = get_cover(fullpath, name)
+                    book.file = new_filename
+                else:
+                    flash('allowed file formats: %s' % ALLOWED_EXTENSIONS)
+
             db.session.commit()
             flash("%s updated" % (title))
             return redirect(url_for('show_book_by_id', id=id))
diff --git a/whoosh/Book/MAIN_taxstcerlfadcokk.seg b/whoosh/Book/MAIN_taxstcerlfadcokk.seg
new file mode 100644
index 0000000000000000000000000000000000000000..a10c22262e80e2750ddc649e7aad5112616e3627
GIT binary patch
literal 5276
zcmZQz00AL>1_q{HCLoIii04+sWhboCP3cHTN=P{2qnXl^z-Gkbdxm>v*H;Gj&#a;f
zPRu}M3xRk|xUo~t|NsBzG%#s+GkP<)+kXIx0)aQPH<LG0Ng;zC$godo8M-MSy!-sm
z`Fr~6J@Y!tY`B9<Qu&9(frgI(%)vQ|&F0CA;uM2fqytpcH>wz)-!Nh4+6k&FCT!h0
zVeQ@tvHT3@0)*MAW|uPoy9|Zdpmtrv;x7ho22_82&el)4!ptDa!`zO?iOk;2sM=^4
z9HiM5OdvS&g*m9^uVMmr^$Bx&1bY}m5)p)C15(Ni44K8nr405BU@=A}CMXM{1VQEi
znVdij)KFZInw*)KgI^CwJqWXc^)MQmn8VdGz*s;jIJg01nFBFIJyTL@3QQFvGc%@}
z7=alJY(6`XR%T#I&PdEG!mpzmssrL}rjo=Ygcq<{@f@VVf6EFHAPoX`5DJq#=XFvF
zD$0v2t2BRlAe4UzS=@f@!$v5-2w6P${rW3V{vu@YrsT*U5I!TQ7y$xCQwTkx*q~w*
z2pD}KG}&yJIjKnIjIzOj!8jTY0}~FgG+B$3CP&$jxEKuw!r=f*KU0y?&nO!bZlmEa
z8V<uD4Z!mFTBJNa%7&!v!59v(_&SOdUlg+&Sf=_z&8wZF(Zi9JnVOT5n^-Uf%u7xz
zNlni$s+{7@(8H9OGR2#*hqWZLBqw!>H&ba3XJ%eXYDGz9LF$wqMvo~y9AJJ<YTguY
zwo*L?USJQWh+z@KC2%hzEi5271lm2#2KCmNB0zmDXy>mGWkdqpb7usPNOUD60>?IV
z^z=Z(9PCEj+(DC#g^Rf)Z*$H3GwJc<&%r^HyLSeCcHmj(^o+x9fs{gm&6NWp(I+09
zov|YPgwR1Yk&~V}C(jt`q~vO+aBHQUKM-(|A>`yl#wpKuw4P*XKgrX7a*>&V>!y4M
z)NwH&$1z8MdPbl=9UhmZB_w!w`Dy|k#=2>ev5;{$aHu4r;mxEYOXfH&`{tCk|H+Rh
zf2Le{lC<uMjX?A2393!}D;PK=_)QItiWyZHtGyE4<hFs)wMfX@=ra%Z&0AbIo4G8F
z3_^?;LyOWFmhNog+G)6SX5%Frh0J>koc4Wl`uEL=(U#%DS9Munw3R^911O@@eH}gh
z;!6@Mic6AHi*nKuQ<C$uv-RR(@fQz_6usp99B{0%<)@_;r<P3d=ILPril>)kfZ~-S
zH$Np482c$x+#RnSv-s4&z)(uq+_KbUn7J9u-n<zs-YglcNCs#Sav0D6A0!h5F-%az
zVM1|9eo<-)l2%cmRwWe6Rd8qpr(onD0Xp3rsGE@l-KZY7z;L!IUc1qJZG)j*61(<-
z;u2640^RG7!QvatgyLWvdP<6NA$oi#GXXW}^AV$|te_aG>5u?WlP^lpl<EPKA82F|
J1Zt<~0RZ8IBkBME

literal 0
HcmV?d00001

diff --git a/whoosh/Book/_MAIN_4.toc b/whoosh/Book/_MAIN_4.toc
new file mode 100644
index 0000000000000000000000000000000000000000..e17d8c1b9e4010a8fcf0d94a93c1e860b31cfd62
GIT binary patch
literal 2306
zcmcIlS##V(5caXQ*Rn&L3j*N?x17L|#3Z)4Ovr`VWC?3Sl*AiF$7p9_NwcjP*}DdT
z^N^HXr7EBhzlaAOdFEg64@_&MHLipd6jkiY_Dpww-Cs|4t5U7(?ELoY&d$z{Lt~ZS
zCpU+jb;`M*HIEVB721+RNnmL(Fnu2e6ByEsv4MdBv(UnD0u|k;;*DcT(&kYQMjioJ
zzGN(GFpBPD2~-PXE42LH28m$2Z>(+v6ScldXcu_U;ettWzO>drLzIaGCXEq{h?+pa
zz7{;CKZYXtDhU}z5L%P8Nq4z_)?hzkOeJtYH#7tx-A+V=U_69_PDC`*!Kln98XPhv
zQNOZ&QeUYp;NSEKI9xye5RNqAX`_Oww$%~v%yw))7TsgM%tK%0>m+h4K`yHc4US^$
zXP;=kBzdQA`5amvOW=83Q5C2W@PcESc8pLgG)>Km_y!3Dks7?%f|qn-2y?Oo99IJJ
zd07dufLDy+Tot<Ts!F`a;|N|;qNJ9D*Ok6UB)p+qSO{+_?K+bbbR}Z60H%vuN<uiH
zEG37NB@PqtR)ND~c)P%nP*VcNc&7yPeK@7e0;>n7l_YH!&J=bb%&03XBJi$~94myg
zN(#Aza|Nz|StZy6<`gcq)(FfSgE>ujPnml>g7=jb3Lg}H9(-8%_28pI<-vjy)(L#9
z+$1G%o;-k0ns7l~1XzuW^`Szxx^StX+C3s+9N5^wm$&|=0RkR%sJ4U++JDb0_@198
zu&5iOn500B7s6-#R`9K`UF+}&yGF}(8q^i9{2s10ln-l%9LsWz;%he^z~@c4Zj2+A
zW8s7f>~;9!+Vx*zn+RLkV*vsze6t^;I1BB1K2zB5LW3ntYB_-~bz=g7)JU5)4!?x2
zt}Oh4SNK!o&O6EjZX{sDwz77(9|xf+dmREdi<*cI@qLCF-`Y0zqig?c;)r>y3%3jI
zxs?ek#uS<aF?O>WRuf`^+oPr8xx}+j19w!dg~KDu_6e9<W%aNSF5KN#r#0e8d}50(
zV`lkC<Mfe|yiN1H<0RnfbevAmCe1061U#MoMUf({c5Ks|4SH*v-li+GMek5^i{9O)
z79|Lqj}~)*?$)x{jf)pGU<i0GfmIC9*Y57JJzHq;;+_@cqfbB|dznjJhL0aQxO_si
z;0bgdO%pK9yG0e^kYULn+QPgs#e5@TDX~gIk(LR>dr7Y)u>L4o_lcy}VmnsFG(~Ke
zyS|sehE7LX@HHK=sNI5ZsBKZ&f`nq3L<_#9!irUMm~JoZe<Hq1U^BLBm|ng#2R17|
zKg`RCzgDKFhs&>x!(HOkio;Bnj^CJBBJF^LGW#i;zMmy%I?h6ubVDm3Sz5VvezB3I
zBZ9P<o264T_C0yVn?G|p_Bh`-$Fg)3H#tIPbTA#eF>^u5yHFFR?Q>_<X91I0eKVa@
zYrp&uWc6XZU?H|LDJ=$LI~_M&?l?Tgl<I?N)pUtZByqDwTFt*1sBp8bbYDT+Ct+Js
zk);zjCq8y)K5%#{8{1`0PAsjK>l{_XOmTgXHIZty|256(L+OZmR?I5K=Nc}GK}X9H
z&?=Ijjn2;55kE(Qo;@=^mr;#QmUjE=n{=u^Ob^tN13g$Dq=&xG^!mUL^zarvLXXm8
r|0SZdx<Wc6@;%FS`0DEaACb(?&Ci|cc@A)QR-PsQ5V7%Z>5<x>3sdaG

literal 0
HcmV?d00001


From 1a68728ed1a310b899529bcdcd66c547698d27fe Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Thu, 7 Jun 2018 10:46:14 +0200
Subject: [PATCH 02/27] expanded search functionality

---
 app/__init__.py               |  9 ++++-----
 app/forms.py                  |  5 ++++-
 app/models.py                 |  1 -
 app/static/css/style.css      | 19 ++++---------------
 app/templates/results.html    | 25 ++++++++++++++++---------
 app/templates/show_books.html |  4 ++--
 app/views.py                  | 27 ++++++++++++++++++++-------
 7 files changed, 50 insertions(+), 40 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index b2dc543..fecc4ff 100755
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -8,7 +8,7 @@ import os
 import click
 from werkzeug.utils import secure_filename
 from sqlalchemy.dialects import registry
-import flask_whooshalchemyplus
+# import flask_whooshalchemyplus not using whoosh anymore
 
 registry.register("rqlite.pyrqlite", "sqlalchemy_rqlite.pyrqlite", "dialect")
 
@@ -27,9 +27,6 @@ app.config['SQLALCHEMY_DATABASE_URI'] = 'rqlite+pyrqlite://localhost:4001/'
 app.config['DEBUG'] = True
 app.config['PORT'] = 80
 
-# set the location for the whoosh index
-app.config['WHOOSH_BASE'] = 'whoosh'
-
 #app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir, 'mydatabase.db')
 db = SQLAlchemy(app)
 
@@ -39,5 +36,7 @@ socketio = SocketIO(app)
 app.config.from_object(__name__)
 from app import views
 
-flask_whooshalchemyplus.init_app(app)    # initialize
+# set the location for the whoosh index
+# app.config['WHOOSH_BASE'] = 'whoosh'
+# flask_whooshalchemyplus.init_app(app)    # initialize
 
diff --git a/app/forms.py b/app/forms.py
index e276a3d..0e5e25f 100755
--- a/app/forms.py
+++ b/app/forms.py
@@ -46,6 +46,9 @@ class EditStackForm(FlaskForm):
 class SearchForm(FlaskForm):
     choices = [('All', 'All'),
                 ('Title', 'Title'),
-               ('Category', 'Category')]
+               ('Author', 'Author'),
+               ('Category', 'Category'),
+               ('Stack', 'Stack')]
     select = SelectField('', choices=choices)
     search = StringField('', validators=[InputRequired()])
+
diff --git a/app/models.py b/app/models.py
index d2361e5..80868ec 100755
--- a/app/models.py
+++ b/app/models.py
@@ -17,7 +17,6 @@ stacks = db.Table('books_stacks',
 
 class Book(db.Model):
     __tablename__ = 'books'
-    __searchable__ = ['title', 'category', 'fileformat']  # these fields will be indexed by whoosh
 
     id = db.Column(db.Integer, primary_key = True)
     title = db.Column(db.String(255))
diff --git a/app/static/css/style.css b/app/static/css/style.css
index be7e00f..a39c5b2 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -1,15 +1,4 @@
 @import url("../fonts/fonts_style.css");
-/*
-Font-names:
-junicoderegular
-junicoderegularcondensed
-junicodeitalic
-junicodeitaliccondensed
-junicodebold
-junicodeboldcondensed
-junicodebolditalic
-junicodebolditaliccondensed
-*/
 
 *{
 font-family: "Archivo Narrow";
@@ -121,7 +110,7 @@ cursor: pointer;
 .header input{
 height:40px;
 width: 500px;
-font-size: 30px;
+font-size: 24px;
 font-weight: bold;
 }
 
@@ -136,10 +125,10 @@ margin: 0;
 float: left;
 width: 320px;
 height: 36px;
-font-size: 20px;
+font-size: 18px;
 font-weight: regular;
 padding: 2px;
-background:rgba(50, 50, 50, 0.2);
+background:rgb(240, 240, 240);
 border:0px;
 box-shadow: inset 0 0 5px rgba(000,000,000, 0.2);
 }
@@ -200,7 +189,7 @@ font-size: 12px;
   top:0;
   left:0;
   position: fixed;
-  font-size: 20px;
+  font-size: 18px;
   background-color: yellow;
 }
 
diff --git a/app/templates/results.html b/app/templates/results.html
index aa1acf7..1ee29ef 100644
--- a/app/templates/results.html
+++ b/app/templates/results.html
@@ -3,16 +3,21 @@
 {% block main %}
 
 <div class="container">
+  <div>
   {% from "_formhelpers.html" import render_field %}
   <form method="POST">
     <div>{{ form.select(style="width: 100px; margin: 10px; float: left; font-size: 20px") }}</div>
       <div class="search">
       {{ render_field(form.search) }} </div>
-      <button type="submit" class="button">Search</button>
+      <button type="submit" class="button">browse</button>
       </form>
-
-<div class="container">
-  <h1 class="page-header">Search Results for: {{ query }}</h1>
+    </div>
+  <br>
+  <h4 style="line-height:0px;"">Results: "{{ query }}" included in {{ count }} out of {{ whole }} items </h4>
+  <div style="height: 20px; background-color: yellow; line-height:4px;">
+    <div style="background-color: black; width: {{ percentage }}%; height: 100%;"></div>
+</div>
+<br>
   {% with messages = get_flashed_messages() %}
     {% if messages %}
       <div class="alert alert-success">
@@ -53,11 +58,11 @@
               <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>  </li>
               {% endfor %}
       </td>
-
-      <td id='plus'><a href='{{url_for('add_to_stack', id=book.id)}}'>
+      <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
           ==>
               </a></td>
-  {% endfor %}
+      {% endfor %}
+
   </table>
 
 </div>
@@ -92,11 +97,13 @@
       <td>  {% for stack in book.stacks %}
 
               <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>  </li>
-              {% endfor %}
+                    {% endfor %}
+
       </td>
-      <td id='plus'><a href='{{url_for('add_to_stack', id=book.id)}}'>
+      <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
           ==>
               </a></td>
+
   {% endfor %}
   </table>
   <p>
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 101ce54..5f8e7b9 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -7,7 +7,7 @@
     <div>{{ form.select(style="width: 100px; margin: 10px; float: left; font-size: 20px") }}</div>
       <div class="search">
       {{ render_field(form.search) }} </div>
-      <button type="submit" class="button">Search</button>
+      <button type="submit" class="button">browse</button>
       </form>
 
   <h1 class="page-header">All Books</h1>
@@ -60,7 +60,7 @@
               <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>  </li>
               {% endfor %}
               </td>
-      <td id='plus'><a href='{{url_for('add_to_stack', id=book.id)}}'>
+      <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
 
       ==>
               </a></td>
diff --git a/app/views.py b/app/views.py
index 7d77122..58edf45 100755
--- a/app/views.py
+++ b/app/views.py
@@ -335,7 +335,6 @@ def edit_stack_by_id(id):
 
         return redirect(url_for('show_stack_by_id', id=id))
     return render_template('edit_stack_detail.html', stack=stack, form=form)
-## search
 
 ## search
 
@@ -352,18 +351,28 @@ def show_books():
 def search_results(searchtype, query):
     search = SearchForm(request.form)
     random_order=Book.query.order_by(func.random()).limit(10)
-    results=Book.query.filter(Book.title.contains(query)).all()
+    results=Book.query.filter(Book.title.contains(query))
 
     if searchtype == 'Title':
-        results=Book.query.filter(Book.title.contains(query)).all()
+        results=Book.query.filter(Book.title.contains(query))
 
     if searchtype == 'Category':
-        results=Book.query.filter(Book.category.contains(query)).all()
+        results=Book.query.filter(Book.category.contains(query))
+
+    if searchtype== 'Author':
+        results=db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query))
+
+    if searchtype== 'Stack':
+        results=db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query))
 
     if searchtype== 'All':
-        results=Book.query.whoosh_search(query).all()
+        # results=Book.query.whoosh_search(query)
+        results=Book.query.filter(Book.title.contains(query))
+        results=results.union(Book.query.filter(Book.category.contains(query)))
+        results=results.union(db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query)))
+        results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query)))
 
-    if not results:
+    if results.count() == 0:
         upload_form = UploadForm(title= query, author='')
         return render_template('red_link.html', form=upload_form, title=query)
 
@@ -372,7 +381,11 @@ def search_results(searchtype, query):
         results = []
         return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data)))
 
-    return render_template('results.html', form=search, books=results, books_all=random_order, searchtype=search.select.data, query=query)
+    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)
+
 
 ## Search - autocomplete
 autocomplete_suggestions = []

From c6b99974dad14b90caa19eb93056b5350ed02db9 Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Thu, 7 Jun 2018 19:10:56 +0200
Subject: [PATCH 03/27] 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 @@
 <div> Chosen book:
 
     <h1 class="header">{{ book.title }}</h1>
-    <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.png';">
+    <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
 
 </div>
 <p>These are all the stacks that have been built so far.</p>
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 @@
 
     <div class="form-group"><h1 class="header">{{ form.title.label }} {{ form.title(size=20, class="form-control") }}</h1></div>
 
-  <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '/uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.png';">
+  <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '/uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
 
         <br>  <br>
     <div data-toggle="fieldset" id="phone-fieldset">
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 %}
-
 <div class="container">
-  <div>
   {% from "_formhelpers.html" import render_field %}
   <form method="POST">
     <div>{{ form.select(style="width: 100px; margin: 10px; float: left; font-size: 20px") }}</div>
       <div class="search">
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
-      </form>
+     <p><br>
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>      
+    </form>
     </div>
+
   <br>
-  <h4 style="line-height:0px;"">Results: "{{ query }}" included in {{ count }} out of {{ whole }} items </h4>
+  <h3 style="line-height:0px;"">Results: "{{ query }}" included in {{ count }} out of {{ whole }} items </h3>
   <div style="height: 20px; background-color: yellow; line-height:4px;">
     <div style="background-color: black; width: {{ percentage }}%; height: 100%;"></div>
 </div>
@@ -34,16 +35,17 @@
     <tr id="header">
       <th>Cover</th>
       <th>Title</th>
-      <th>Author</th>
-      <th>Filetype</th>
-      <th>Category</th>
-      <th>Stack</th>
-      <th>Add to stack</th>
+      <th width="400px;">Author</th>
+      <th width="100px;">Filetype</th>
+      <th width="100px;">Category</th>
+      <th width="100px;">Stack</th>
+      <th width="100px;">Add to stack</th>
 
     </tr>
         {% for book in books %}
     <tr>
-      <td><img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '/static/img/default_cover.png') this.src = '/static/img/default_cover.png';"></td>
+    <td style= "padding: 5px;">
+<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
       <td><a href="{{url_for('show_book_by_id', id=book.id)}}">{{ book.title }}</a></td>
 
       <td>  {% for author in book.authors %}
@@ -75,16 +77,16 @@
     <tr id="header">
       <th>Cover</th>
       <th>Title</th>
-      <th>Author</th>
-      <th>Filetype</th>
-      <th>Category</th>
-      <th>Stack</th>
-      <th>Add to stack</th>
+      <th width="400px;">Author</th>
+      <th width="100px;">Filetype</th>
+      <th width="100px;">Category</th>
+      <th width="100px;">Stack</th>
+      <th width="100px;">Add to stack</th>
 
     </tr>
         {% for book in books_all %}
     <tr>
-      <td><img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '/static/img/default_cover.png') this.src = '/static/img/default_cover.png';"></td>
+      <td style= "padding: 5px;"><img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
       <td><a href="{{url_for('show_book_by_id', id=book.id)}}">{{ book.title }}</a></td>
 
       <td>  {% 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 %}
+<div class="container">
+  {% from "_formhelpers.html" import render_field %}
+  <form method="POST">
+    <div>{{ form.select(style="width: 100px; margin: 10px; float: left; font-size: 20px") }}</div>
+      <div class="search">
+      {{ render_field(form.search) }} </div>
+      <button type="submit" class="button">browse</button>
+           <p><br>
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>  
+</form>
+    </div>
+
+  <br>
+  <h3 style="line-height:0px;"">Results: "{{ query }}" included in {{ count }} out of {{ whole }} items </h3>
+  <div style="height: 20px; background-color: yellow; line-height:4px;">
+    <div style="background-color: black; width: {{ percentage }}%; height: 100%;"></div>
+</div>
+<br>
+  {% with messages = get_flashed_messages() %}
+    {% if messages %}
+      <div class="alert alert-success">
+        <ul>
+        {% for message in messages %}
+          <li>{{ message }}</li>
+        {% endfor %}
+        </ul>
+      </div>
+    {% endif %}
+  {% endwith %}
+<div class="grid">
+
+        {% for book in books|sort(attribute='title', reverse = False) %}
+
+
+<div class="gridbox">
+<a href="books/{{ book.id }}">
+<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a> 
+<p>
+<tbody>
+<th>
+{{ book.title }}</th>
+<br>
+<span style = "font-size: 14px;">
+{% for author in  book.authors %}
+{{ author.author_name }}<br> {% endfor %} </span>
+</tbody>
+</p>
+</div>
+  {% endfor %}
+</div>
+
+
+<div class="container" >
+  <hr>
+  <h2> Other books </h2>
+
+<div class="grid">
+
+{% for book in books_all|sort(attribute='title', reverse = False) %}
+  
+<div class="gridbox">
+<a href="books/{{ book.id }}">
+<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a> 
+<p>
+<tbody>
+<th>
+{{ book.title }}</th>
+<br>
+<span style = "font-size: 14px;">
+{% for author in  book.authors %}
+{{ author.author_name }}<br> {% endfor %} </span>
+</tbody>
+</p>
+</div>
+  {% endfor %}
+</div>
+</div>
+
+
+  <p>
+    <a href="/books"> See all books </a>
+  </p>
+
+</div>
+
+{% 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 @@
 <div class="container">
 
   <h1 class="header">{{ book.title }}</h1>
-  <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.png';">
+  <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
   <p>Author(s): <ul>{% for author in book.authors %}
 
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
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 @@
       <div class="search">
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
-      </form>
+       <p><br>
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>  
+ </form>
 
   <h1 class="page-header">All Books</h1>
   {% with messages = get_flashed_messages() %}
@@ -28,19 +30,19 @@
     <tr id="header">
       <th>Cover</th>
       <th>Title</th>
-      <th>Author</th>
-      <th>Filetype</th>
-      <th>Category</th>
-      <th>Stack</th>
-      <th>Add to stack</th>
+      <th width="400px;">Author</th>
+      <th width="100px;">Filetype</th>
+      <th width="100px;">Category</th>
+      <th width="100px;">Stack</th>
+      <th width="100px;">Add to stack</th>
     </tr>
     </thead>
     <tbody>
         {% for book in books|sort(attribute='title', reverse = False) %}
     <tr>
-      <td>
+      <td style= "padding: 5px;">
 
-        <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="40" onerror="if (this.src != '/static/img/default_cover.png') this.src = '/static/img/default_cover.png';">
+        <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
       <!--  <object class="no_cover" data="../static/img/default_cover.png" type="image/png" width="65">
           <p hidden="True"></p>
 
@@ -62,7 +64,7 @@
               </td>
       <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
 
-      ==>
+      ===>
               </a></td>
     </tr>
 
diff --git a/app/templates/show_books_grid.html b/app/templates/show_books_grid.html
index b41bab4..51eec0b 100644
--- a/app/templates/show_books_grid.html
+++ b/app/templates/show_books_grid.html
@@ -2,27 +2,38 @@
 
 {% block main %}
 <div class="container">
-  <h1 class="page-header">All Books</h1>
-  {% with messages = get_flashed_messages() %}
-    {% if messages %}
-      <div class="alert alert-success">
-        <ul>
-        {% for message in messages %}
-          <li>{{ message }}</li>
-        {% endfor %}
-        </ul>
-      </div>
-    {% endif %}
-  {% endwith %}
+  {% from "_formhelpers.html" import render_field %}
+  <form method="POST">
+    <div>{{ form.select(style="width: 100px; margin: 10px; float: left; font-size: 20px") }}</div>
+      <div class="search">
+      {{ render_field(form.search) }} </div>
+      <button type="submit" class="button">browse</button>
+           <p><br>
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>  
+ </form>
+    </div>
 
+<div class="grid">
 
         {% for book in books|sort(attribute='title', reverse = False) %}
-<a href="books/{{ book.id }}">
-<img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="140" onerror="if (this.src != '../static/img/default_cover.png') this.src = '../static/img/default_cover.png';"><!--{{ book.title }}--></a>
 
 
+<div class="gridbox">
+<a href="books/{{ book.id }}">
+<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a> 
+<p>
+<tbody>
+<th>
+{{ book.title }}</th>
+<br>
+<span style = "font-size: 14px;">
+{% for author in  book.authors %}
+{{ author.author_name }}<br> {% endfor %} </span>
+</tbody>
+</p>
+</div>
   {% endfor %}
-
+</div>
 
 </div>
 {% 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/<searchtype>/<query>/', 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)
 
 

From 869ed3f3bbf14a6b8768561d33201156b95aff53 Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Thu, 7 Jun 2018 19:27:09 +0200
Subject: [PATCH 04/27] edited pdf view

---
 app/static/css/style.css             |   8 +-
 app/templates/show_stack_detail.html |   2 +-
 app/views_2.py                       | 539 +++++++++++++++++++++++++++
 3 files changed, 545 insertions(+), 4 deletions(-)
 create mode 100755 app/views_2.py

diff --git a/app/static/css/style.css b/app/static/css/style.css
index b72808f..de6ccad 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -301,9 +301,11 @@ box-sizing: border-box;
 .widget {
   resize: both;
   overflow: hidden;
-  width: 300px;
-  height: 300px;
+  width: 800px;
+  height: 200px;
   display: inline-block;
+  position: relative;
+  left: 400px;
 
 }
 
@@ -348,4 +350,4 @@ box-sizing: border-box;
 }
 .gridbox:hover{
   opacity: 0.5;
-}
\ No newline at end of file
+}
diff --git a/app/templates/show_stack_detail.html b/app/templates/show_stack_detail.html
index af144cd..fda0469 100644
--- a/app/templates/show_stack_detail.html
+++ b/app/templates/show_stack_detail.html
@@ -9,7 +9,7 @@
   <p>Books in this stack: {% for book in stack.books %}
 
           <li>  <a href="{{url_for('show_book_by_id', id=book.id)}}">{{book.title}}</a> </li>
-          <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.png';">
+          <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
 <div class='widget'>
           <iframe src="../uploads/{{ book.file }}" width="50%" ></iframe>
 </div>
diff --git a/app/views_2.py b/app/views_2.py
new file mode 100755
index 0000000..edf46ac
--- /dev/null
+++ b/app/views_2.py
@@ -0,0 +1,539 @@
+"""
+Flask Documentation:     http://flask.pocoo.org/docs/
+Jinja2 Documentation:    http://jinja.pocoo.org/2/documentation/
+Werkzeug Documentation:  http://werkzeug.pocoo.org/documentation/
+This file creates your application.
+"""
+
+from app import app, db, socketio, DOMAIN
+from flask import Flask, Response, render_template, request, redirect, url_for, flash, send_from_directory, jsonify, abort
+import json
+from  sqlalchemy.sql.expression import func, select
+from app.forms import UploadForm, EditForm, SearchForm, ChatForm, StackForm, AddtoStackForm, EditStackForm
+from app.models import Book, BookSchema, Author, AuthorSchema, Stack, StackSchema, UserIns, Chat, ChatSchema
+from app.cover import get_cover
+from os import environ
+from flask_socketio import SocketIO, emit
+import datetime
+import time
+import autocomplete
+import sys
+from csv import DictWriter
+import io
+
+import os
+from werkzeug.utils import secure_filename
+
+# import sqlite3
+ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'epub', 'chm', 'mobi'])
+
+author_schema = AuthorSchema()
+authors_schema = AuthorSchema(many=True)
+book_schema = BookSchema()
+books_schema = BookSchema(many=True)
+stack_schema = StackSchema()
+stacks_schema = StackSchema(many=True)
+chat_schema = ChatSchema()
+chats_schema = ChatSchema(many=True)
+
+def allowed_file(filename):
+    return '.' in filename and \
+           filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
+###
+# Routing for your application.
+###
+
+@app.route('/', methods= ['POST','GET'])
+def home():
+    chat_form = ChatForm()
+    chat_messages = db.session.query(Chat).all()
+
+    # if request.method == 'POST':
+    #     if chat_form.validate_on_submit():
+    #         message = chat_form.message.data
+    #         msg = Chat(message)
+    #         db.session.add(msg)
+    #         db.session.commit()
+
+    return render_template('home.html',domain=DOMAIN,chat=chat_messages, channel = 1, username="librarian")
+
+@app.route('/hello/<name>')
+def hello(name):
+    return "Hello " + name
+
+@app.route('/about/')
+def about():
+    """Render the website's about page."""
+    return render_template('about.html', name="Mary Jane")
+
+@app.route('/uploads/<filename>')
+def uploaded_file(filename):
+    return send_from_directory(app.config['UPLOAD_FOLDER'],
+                               filename)
+
+@app.route('/uploads/cover/<filename>')
+def uploaded_file_cover(filename):
+    return send_from_directory(app.config['UPLOAD_FOLDER_COVER'],
+                               filename)
+
+@app.route('/updates', methods=['POST', 'GET'])
+def get_updates():
+    userin = UserIns.query.filter_by(title="lastViewed").first()
+    allbooks = db.session.query(Book).all()
+    id = len(allbooks)
+    latest_upload = allbooks[-1]
+    return "This is the XPPL ~ Library XPUB ~ Updates / / / / / / / Last viewed: " + userin.info + " / / / / / / / " + str(len(allbooks)) + " Books online "+ " / / / / / / / " + "Latest upload: " + latest_upload.title
+
+@app.route('/scape', methods=['POST', 'GET'])
+def scape():
+    if request.method == 'POST':
+        data = request.form
+        book = Book.query.get(data['id'])
+        print(book.scapeX)
+        book.scapeX = data['x']
+        book.scapeY = data['y']
+        db.session.commit()
+    books = db.session.query(Book).all() # or you could have used User.query.all()
+    return render_template('scape.html', books=books)
+
+
+@app.route('/books_grid')
+def show_books_grid():
+    books = db.session.query(Book).all() # or you could have used User.query.all()
+    return render_template('show_books_grid.html', books=books)
+
+@app.route('/books/<int:id>')
+def show_book_by_id(id):
+    book = Book.query.get(id)
+    userin = UserIns.query.filter_by(title="lastViewed").first()
+    if userin != None:
+        userin.info = book.title
+        db.session.commit()
+    else:
+        user_info = UserIns("lastViewed", book.title)
+        db.session.add(user_info)
+        db.session.commit()
+    if not book:
+        return render_template('red_link.html', id=id)
+    else:
+        return render_template('show_book_detail.html', book=book)
+
+
+@app.route('/books/<int:id>/delete', methods=['POST', 'GET'])
+def remove_book_by_id(id):
+    book_to_edit = Book.query.filter_by(id=id).first()
+    title = book_to_edit.title
+    Book.query.filter_by(id=id).delete()
+    #author_table = Author.query.filter_by(book_id=book_to_edit.id).delete()
+    db.session.commit()
+    flash("%s deleted from library" % (title))
+    return redirect(url_for('show_books'))
+
+@app.route('/books/<int:id>/edit', methods=['POST', 'GET'])
+def edit_book_by_id(id):
+    book_to_edit = Book.query.filter_by(id=id).first()
+    user_form = EditForm(title = book_to_edit.title, author =book_to_edit.authors, category = book_to_edit.category, year_published= book_to_edit.year_published)
+
+    if request.method == 'POST':
+        if user_form.validate_on_submit():
+            # on submit, check fields
+            title = user_form.title.data
+            input_authors = user_form.author.data
+            category = user_form.category.data
+            year_published = user_form.year_published.data
+            if year_published=="":
+                year_published = None
+            book = Book.query.filter_by(id=id).first()
+            book.title = title
+            book.category = category
+            book.year_published = year_published
+
+            #authors update
+            book.authors.clear()
+            for i, author in enumerate(input_authors):
+                author_name = author.get("author_name")
+                if author_name:
+                    a = db.session.query(Author).filter_by(author_name=author_name).first()
+                    if a == None:
+                        a = Author(author_name=author_name)
+                        db.session.add(a)
+                    book.authors.append(a)
+
+            # editing / uploading new file
+            if user_form.file.data:
+                file = request.files['file']
+                if file.filename == '':
+                    flash('No selected file')
+                    return redirect(request.url)
+                if file and allowed_file(file.filename):
+                    filename = secure_filename(file.filename)
+                    allbooks = db.session.query(Book).all()
+                    id = book.id
+                    new_filename = str(id) +"_"+ filename
+                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], new_filename)
+                    name, file_extension = os.path.splitext(new_filename)
+                    file.save(fullpath)
+                    book.cover = get_cover(fullpath, name)
+                    book.file = new_filename
+                else:
+                    flash('allowed file formats: %s' % ALLOWED_EXTENSIONS)
+
+            db.session.commit()
+            flash("%s updated" % (title))
+            return redirect(url_for('show_book_by_id', id=id))
+
+    return render_template('edit_book_detail.html', book=book_to_edit, form=user_form)
+
+
+@app.route('/add-book', methods=['POST', 'GET'])
+def add_book():
+    upload_form = UploadForm()
+
+    if request.method == 'POST':
+        if upload_form.validate_on_submit():
+            #get data from form
+            title = upload_form.title.data
+            authors = upload_form.author.data
+            category = upload_form.category.data
+            year_published = upload_form.year_published.data
+            if year_published=="":
+                year_published = None
+
+            #if upload with file
+            if upload_form.upload.data:
+                # check if the post request has the file part
+                if 'file' not in request.files:
+                    flash('No file part')
+                    return redirect(request.url)
+                file = request.files['file']
+                # if user does not select file, browser also
+                # submit a empty part without filename
+                if file.filename == '':
+                    flash('No selected file')
+                    return redirect(request.url)
+                if file and allowed_file(file.filename):
+                    filename = secure_filename(file.filename)
+                    allbooks = db.session.query(Book).all()
+                    id = len(allbooks)+1
+                    new_filename = str(id) +"_"+ filename
+                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], new_filename)
+                    name, file_extension = os.path.splitext(new_filename)
+                    file.save(fullpath)
+                    cover = get_cover(fullpath, name)
+                else:
+                    flash('allowed file formats: %s' % ALLOWED_EXTENSIONS)
+            #if upload without file -> wishform, with potential PDF
+            if upload_form.wish.data:
+                #TO DO: make pdf generator
+                #file = open('app/uploads/potential.pdf')
+                #filename = 'potential.pdf'
+                #file_extension = '.pdf'
+                filename = ''
+                file_extension = ''
+                cover = ''
+
+            book = Book(title, filename, cover, file_extension, category,year_published)
+            db.session.add(book)
+            for author in authors:
+                author_name = author.get("author_name")
+                if author_name:
+                    a = db.session.query(Author).filter_by(author_name=author_name).first()
+                    if a == None:
+                        a = Author(author_name=author_name)
+                        db.session.add(a)
+                    book.authors.append(a)
+            db.session.commit()
+
+            flash("%s added to the library" % (title))
+            return redirect(url_for('show_books'))
+
+    flash_errors(upload_form)
+    return render_template('add_book.html', form=upload_form)
+
+
+# Flash errors from the form if validation fails
+def flash_errors(form):
+    for field, errors in form.errors.items():
+        for error in errors:
+            flash(u"Error in the %s field - %s" % (
+                getattr(form, field).label.text,
+                error
+            ))
+
+#Authors
+
+@app.route('/authors/<int:id>')
+def show_author_by_id(id):
+    author = Author.query.get(id)
+    if not author:
+        abort (404)
+    else:
+        return render_template('show_author_detail.html', author=author)
+
+
+@app.route('/authors/<int:id>/edit', methods=['POST', 'GET'])
+def edit_author_by_id(id):
+    return "Ask the programmer."
+
+##stacks
+
+@app.route('/stacks')
+def show_stacks():
+    stacks = db.session.query(Stack).all()
+    return render_template('show_stacks.html', stacks=stacks)
+
+@app.route('/stacks/add_stack', methods=['POST', 'GET'])
+def add_stack():
+    form = StackForm()
+    stacks = db.session.query(Stack).all()
+
+    if form.validate_on_submit():
+        stack_name = form.stack_name.data
+        stack_description = form.stack_description.data
+        stack = Stack(stack_name, stack_description)
+        if form.stack_name.data:
+            stack = Stack(stack_name, stack_description)
+            db.session.add(stack)
+        stacks = db.session.query(Stack).all()
+        return redirect(url_for('show_stacks'))
+        flash("%s stack created" % (stack_name))
+    return render_template('add_stack.html', stacks=stacks, form=form)
+
+@app.route('/stacks/tab/<int:id>', methods=['POST', 'GET'])
+def show_stack_in_tab(id):
+    return show_stack_by_id(id, is_tab=True)
+
+
+@app.route('/stacks/<int:id>', methods=['POST', 'GET'])
+def show_stack_by_id(id, is_tab=False):
+
+    stack = Stack.query.get(id)
+    if not stack:
+        abort (404)
+    else:
+        if is_tab == False:
+            return render_template('show_stack_detail.html', stack=stack)
+        else:
+            return render_template('show_stack_detail_tab.html', stack=stack)
+
+@app.route('/stacks/<int:id>/delete', methods=['POST', 'GET'])
+def remove_stack_by_id(id):
+    Stack.query.filter_by(id=id).delete()
+    db.session.commit()
+    return redirect(url_for('show_stacks'))
+
+@app.route('/stacks/<int:id>/edit', methods=['POST', 'GET'])
+def edit_stack_by_id(id):
+    stack = Stack.query.filter_by(id=id).first()
+    form = EditStackForm(edit_stack_name = stack.stack_name, edit_stack_description = stack.stack_description)
+
+    if request.method == 'POST':
+        if form.validate_on_submit():
+            stack_name = form.edit_stack_name.data
+            stack_description = form.edit_stack_description.data
+        stack.stack_name = stack_name
+        stack.stack_description = stack_description
+        db.session.commit()
+
+        return redirect(url_for('show_stack_by_id', id=id))
+    return render_template('edit_stack_detail.html', stack=stack, form=form)
+
+#@app.route('/stacks/<int:stackid>/remove/<int:bookid>', methods=['POST', 'GET'])
+#def remove_from_stack(bookid, stackid):
+#    import ipdb; ipdb.set_trace()
+#    book = Book.query.get(id)
+#    stack = Stack.query.get(id)
+
+#    stack = db.session.query(Stack).join(stack.books).filter_by(stackid=stackid)
+#    stack.books.delete(book)
+#    db.session.commit()
+#    return render_template('show_book_by_id.html', stackid=stack.id, bookid=book.id)
+
+@app.route('/add_to_stack/<int:id>', methods=['GET', 'POST'])
+def add_to_stack(id):
+    stacks = db.session.query(Stack).all()
+    add_form = AddtoStackForm(request.form)
+    add_form.select_stack.choices = [(stack.id, stack.stack_name) for stack in stacks]
+    if request.method == 'GET':
+        book = Book.query.get(id)
+        return render_template('add_to_stacks.html', id=id, stacks=stacks, book=book, add_form=add_form)
+    else:
+        stack = Stack.query.get(int(add_form.select_stack.data))
+        book = Book.query.get(id)
+        stack.books.append(book)
+        db.session.commit()
+        return render_template('show_stack_detail.html', stack=stack)
+
+## search
+
+@app.route('/books', methods= ['POST','GET'])
+def show_books():
+    books = db.session.query(Book).all()
+    search = SearchForm(request.form)
+    if request.method == 'POST':
+        return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data)))
+
+    return render_template('show_books.html', books=books, form=search)
+
+@app.route('/search/<searchtype>/<query>/', methods=['POST', 'GET'])
+def search_results(searchtype, query):
+    search = SearchForm(request.form)
+    random_order=Book.query.order_by(func.random()).limit(10)
+    results=Book.query.filter(Book.title.contains(query))
+
+    if searchtype == 'Title':
+        results=Book.query.filter(Book.title.contains(query))
+
+    if searchtype == 'Category':
+        results=Book.query.filter(Book.category.contains(query))
+
+    if searchtype== 'Author':
+        results=db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query))
+
+    if searchtype== 'Stack':
+        results=db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query))
+
+    if searchtype== 'All':
+        # results=Book.query.whoosh_search(query)
+        results=Book.query.filter(Book.title.contains(query))
+        results=results.union(Book.query.filter(Book.category.contains(query)))
+        results=results.union(db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query)))
+        results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query)))
+
+    if results.count() == 0:
+        upload_form = UploadForm(title= query, author='')
+        return render_template('red_link.html', form=upload_form, title=query)
+
+    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)
+
+
+## Search - autocomplete
+autocomplete_suggestions = []
+
+@app.route('/autocomplete_suggestions', methods=['GET', 'POST'])
+def test1():
+    if request.method == 'POST':
+        autocomplete.load()
+        query = request.form['search']
+        query_tokenized = query.lower().split()
+        print(query_tokenized)
+        word_1 = query_tokenized[-2]
+        word_2 = query_tokenized[-1]
+        #print(word_1)
+        autocomplete_output = autocomplete.predict(word_1 , word_2)
+        autocomplete_suggestions.clear()
+        for suggestion, score in autocomplete_output:
+            autocomplete_suggestions.append(suggestion)
+
+        print(autocomplete_suggestions)
+
+    return Response(json.dumps(autocomplete_suggestions), mimetype='application/json')
+
+
+
+
+
+@app.route('/export/csv', methods=['GET'])
+def export_csv ():
+    output = io.StringIO()
+    fieldnames = ['title', 'authors']
+    csv = DictWriter(output,fieldnames)
+    csv.writeheader()
+    # for i in range(10):
+    #     csv.writerow({'ID': i, 'fruit': "Tomato"})
+    for book in Book.query.order_by("title"):
+        authors = ", ".join([x.author_name for x in book.authors])
+        csv.writerow({"title": book.title, "authors": authors})
+    resp = Response(output.getvalue(), mimetype="text/plain")
+    # resp.headers["Content-Disposition"] = "attachment;filename=export.csv"
+    return resp
+###
+# The API
+###
+
+@app.route('/api/books', methods=['GET'])
+def get_books():
+    books = Book.query.all()
+    data = books_schema.dump(books)
+    #print(errors)
+    return jsonify({'books': data})
+
+@app.route('/api/books/<int:id>', methods=['GET'])
+def get_book_by_id(id):
+    book = Book.query.get(id)
+    data = book_schema.dump(book)
+    if not data:
+        return jsonify({"message": "Book could not be found."}), 400
+    else:
+        return jsonify({'book': data })
+
+@app.route('/api/chats', methods=['GET'])
+def get_chat():
+    chats = Chat.query.all()
+    data = chats_schema.dump(chats)
+    #print(errors)
+    return jsonify({'chat': data})
+
+
+
+###
+# The functions below should be applicable to all Flask apps.
+###
+
+@app.route('/<file_name>.txt')
+def send_text_file(file_name):
+    """Send your static text file."""
+    file_dot_text = file_name + '.txt'
+    return app.send_static_file(file_dot_text)
+
+
+@app.after_request
+def add_header(response):
+    """
+    Add headers to both force latest IE rendering engine or Chrome Frame,
+    and also to cache the rendered page for 10 minutes.
+    """
+    response.headers['X-UA-Compatible'] = 'IE=Edge,chrome=1'
+    response.headers['Cache-Control'] = 'public, max-age=600'
+    return response
+
+
+@app.errorhandler(404)
+def page_not_found(error):
+    """Custom 404 page."""
+    return render_template('404.html'), 404
+
+@socketio.on('new_message')
+def new_message(message):
+    # Send message to alls users
+    print("new message")
+    emit('channel-' + str(message['channel']), {
+        'username': message['username'],
+        'text': message['text'],
+        'time': str(datetime.datetime.utcnow().strftime("%d.%m.%Y %H:%M"))
+    },
+        broadcast=True
+    )
+    # Save message
+    my_new_chat = Chat(
+        message=message['text']
+    )
+    db.session.add(my_new_chat)
+    try:
+        db.session.commit()
+    except:
+        db.session.rollback()
+
+
+
+if __name__ == '__main__':
+    socketio.run(app)
+    #app.run(debug=True,host="0.0.0.0",port="8080")

From 2d8110585d626132a62b77611223a20bd4f19b56 Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Thu, 7 Jun 2018 23:05:55 +0200
Subject: [PATCH 05/27] remove book from stacks

---
 app/templates/show_book_detail.html  |  5 ++++-
 app/templates/show_stack_detail.html |  2 +-
 app/views.py                         | 17 ++++++++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index a6ab30f..da7e121 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -4,7 +4,8 @@
 <div class="container">
 
   <h1 class="header">{{ book.title }}</h1>
-  <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
+ <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
+
   <p>Author(s): <ul>{% for author in book.authors %}
 
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
@@ -16,6 +17,8 @@
 
         <p>Stack(s): <ul>{% for stack in book.stacks %}
           <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>
+            <p style="font-size: 10px;"><a href='{{url_for('remove_from_stack', stackid=stack.id, bookid=book.id)}}'> Remove from stack</a></p>
+
 
              {% endfor %}</ul></p>
 
diff --git a/app/templates/show_stack_detail.html b/app/templates/show_stack_detail.html
index fda0469..e7c5193 100644
--- a/app/templates/show_stack_detail.html
+++ b/app/templates/show_stack_detail.html
@@ -9,7 +9,7 @@
   <p>Books in this stack: {% for book in stack.books %}
 
           <li>  <a href="{{url_for('show_book_by_id', id=book.id)}}">{{book.title}}</a> </li>
-          <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../static/img/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
+          <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
 <div class='widget'>
           <iframe src="../uploads/{{ book.file }}" width="50%" ></iframe>
 </div>
diff --git a/app/views.py b/app/views.py
index e152071..2fe1bc3 100755
--- a/app/views.py
+++ b/app/views.py
@@ -136,7 +136,7 @@ def edit_book_by_id(id):
         if user_form.validate_on_submit():
             # on submit, check fields
             title = user_form.title.data
-            input_authors = user_form.author.data 
+            input_authors = user_form.author.data
             category = user_form.category.data
             year_published = user_form.year_published.data
             if year_published=="":
@@ -336,6 +336,17 @@ def edit_stack_by_id(id):
         return redirect(url_for('show_stack_by_id', id=id))
     return render_template('edit_stack_detail.html', stack=stack, form=form)
 
+@app.route('/stacks/<int:stackid>/remove/<int:bookid>', methods=['POST', 'GET'])
+def remove_from_stack(bookid, stackid):
+    book = Book.query.get(bookid)
+    stack = Stack.query.get(stackid)
+    if book not in stack.books:
+        return render_template('show_book_detail.html', book=book)
+    stack.books.remove(book)
+    db.session.commit()
+    return render_template('show_book_detail.html', book=book)
+
+
 ## search
 
 @app.route('/books', methods= ['POST','GET'])
@@ -383,7 +394,7 @@ def search_results(searchtype, query):
 
     count = results.count()
     whole = Book.query.count()
-    percentage = float(count / whole * 100) 
+    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)
@@ -395,7 +406,7 @@ def search_results(searchtype, query):
         query = search.search.data
         results = []
         return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data)))
-   
+
     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)
 
 

From 3296a2efcf20467d00b6749b2aefb354d6d4832c Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Thu, 7 Jun 2018 23:33:22 +0200
Subject: [PATCH 06/27] updates to grid and list view

---
 app/forms.py                       |  7 +++++--
 app/templates/results.html         |  8 ++++----
 app/templates/results_grid.html    |  2 +-
 app/templates/show_books.html      |  8 ++++----
 app/templates/show_books_grid.html | 18 ++++++++++++++++--
 5 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/forms.py b/app/forms.py
index 81508e1..f1704ab 100755
--- a/app/forms.py
+++ b/app/forms.py
@@ -3,7 +3,7 @@ from wtforms import StringField, FileField, validators
 from wtforms.validators import InputRequired, DataRequired
 from wtforms import FieldList
 from wtforms import Form as NoCsrfForm
-from wtforms.fields import StringField, FormField, SubmitField, SelectField
+from wtforms.fields import StringField, FormField, SubmitField, SelectField, RadioField
 from app.models import Book, BookSchema, Author, Stack, StackSchema
 
 # - - - Forms - - -
@@ -49,9 +49,12 @@ class SearchForm(FlaskForm):
                ('Author', 'Author'),
                ('Category', 'Category'),
                ('Stack', 'Stack')]
-    select = SelectField('', choices=choices)
+    select = SelectField('', choices=choices, default='All')
     search = StringField('', validators=[InputRequired()])
     grid = SubmitField('Grid')
     listview = SubmitField('List')
+    randomize = SubmitField('Order differently')
+
+
 
 
diff --git a/app/templates/results.html b/app/templates/results.html
index 54f4546..6ccb272 100644
--- a/app/templates/results.html
+++ b/app/templates/results.html
@@ -9,7 +9,7 @@
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
      <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>      
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>    
     </form>
     </div>
 
@@ -33,7 +33,7 @@
 
   <table class="library_table" id="table" style="width:100%">
     <tr id="header">
-      <th>Cover</th>
+      <th width="70px;">Cover</th>
       <th>Title</th>
       <th width="400px;">Author</th>
       <th width="100px;">Filetype</th>
@@ -45,7 +45,7 @@
         {% for book in books %}
     <tr>
     <td style= "padding: 5px;">
-<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
+<img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="70" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></td>
       <td><a href="{{url_for('show_book_by_id', id=book.id)}}">{{ book.title }}</a></td>
 
       <td>  {% for author in book.authors %}
@@ -75,7 +75,7 @@
 
   <table class="library_table" id="table" style="width:100%">
     <tr id="header">
-      <th>Cover</th>
+      <th width="70px;">Cover</th>
       <th>Title</th>
       <th width="400px;">Author</th>
       <th width="100px;">Filetype</th>
diff --git a/app/templates/results_grid.html b/app/templates/results_grid.html
index cea341b..5b2a1ec 100644
--- a/app/templates/results_grid.html
+++ b/app/templates/results_grid.html
@@ -36,7 +36,7 @@
 
 
 <div class="gridbox">
-<a href="books/{{ book.id }}">
+<a href="/books/{{ book.id }}">
 <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="100%" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';"></a> 
 <p>
 <tbody>
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 258c0e6..69be928 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -9,7 +9,7 @@
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
        <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>  
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>
  </form>
 
   <h1 class="page-header">All Books</h1>
@@ -28,7 +28,7 @@
   <table class="library_table" id="table" style="width:100%">
     <thead>
     <tr id="header">
-      <th>Cover</th>
+      <th width="70px;">Cover</th>
       <th>Title</th>
       <th width="400px;">Author</th>
       <th width="100px;">Filetype</th>
@@ -38,11 +38,11 @@
     </tr>
     </thead>
     <tbody>
-        {% for book in books|sort(attribute='title', reverse = False) %}
+        {% for book in books %}
     <tr>
       <td style= "padding: 5px;">
 
-        <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="80" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
+        <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="70" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
       <!--  <object class="no_cover" data="../static/img/default_cover.png" type="image/png" width="65">
           <p hidden="True"></p>
 
diff --git a/app/templates/show_books_grid.html b/app/templates/show_books_grid.html
index 51eec0b..4384ee8 100644
--- a/app/templates/show_books_grid.html
+++ b/app/templates/show_books_grid.html
@@ -9,13 +9,27 @@
       {{ render_field(form.search) }} </div>
       <button type="submit" class="button">browse</button>
            <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>  
+      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p> 
  </form>
     </div>
 
+
+  <h1 class="page-header">All Books</h1>
+  {% with messages = get_flashed_messages() %}
+    {% if messages %}
+      <div class="alert alert-success">
+        <ul>
+        {% for message in messages %}
+          <li>{{ message }}</li>
+        {% endfor %}
+        </ul>
+      </div>
+    {% endif %}
+  {% endwith %}
+
 <div class="grid">
 
-        {% for book in books|sort(attribute='title', reverse = False) %}
+        {% for book in books %}
 
 
 <div class="gridbox">

From 7c82f2af95614b36c7931efb7c12621a91e9c313 Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Thu, 7 Jun 2018 23:52:41 +0200
Subject: [PATCH 07/27] fixed bug grid / list view

---
 app/views.py | 92 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 36 deletions(-)

diff --git a/app/views.py b/app/views.py
index 2fe1bc3..2290a64 100755
--- a/app/views.py
+++ b/app/views.py
@@ -348,45 +348,55 @@ def remove_from_stack(bookid, stackid):
 
 
 ## search
+view = ['1']
 
 @app.route('/books', methods= ['POST','GET'])
 def show_books():
-    books = db.session.query(Book).all()
+    books = db.session.query(Book).order_by(Book.title)
     search = SearchForm(request.form)
+    view.append('1')
+    viewby = '1'
 
     if search.grid.data:
+        viewby = '2'
+        view.append('2')
         return render_template ('show_books_grid.html', books=books, form=search)
+
     if search.listview.data:
+        viewby = '1'
+        view.append('1')
         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)))
+        return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
 
     return render_template('show_books.html', books=books, form=search)
 
-@app.route('/search/<searchtype>/<query>/', methods=['POST', 'GET'])
-def search_results(searchtype, query):
+@app.route('/search/<searchtype>/<viewby>/<query>', methods=['POST', 'GET'])
+def search_results(searchtype, query, viewby):
     search = SearchForm(request.form, search=query)
     random_order=Book.query.order_by(func.random()).limit(14)
-    results=Book.query.filter(Book.title.contains(query))
+    results=Book.query.filter(Book.title.contains(query)).order_by(Book.title)
+    viewby = view[-1]
 
     if searchtype == 'Title':
-        results=Book.query.filter(Book.title.contains(query))
+        results=Book.query.filter(Book.title.contains(query)).order_by(Book.title)
 
     if searchtype == 'Category':
-        results=Book.query.filter(Book.category.contains(query))
+        results=Book.query.filter(Book.category.contains(query)).order_by(Book.title)
 
     if searchtype== 'Author':
-        results=db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query))
+        results=db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query)).order_by(Book.title)
 
     if searchtype== 'Stack':
-        results=db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query))
+        results=db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query)).order_by(Book.title)
 
     if searchtype== 'All':
         # results=Book.query.whoosh_search(query)
         results=Book.query.filter(Book.title.contains(query))
         results=results.union(Book.query.filter(Book.category.contains(query)))
         results=results.union(db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query)))
-        results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query)))
+        results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query))).order_by(Book.title)
 
     if results.count() == 0:
         upload_form = UploadForm(title= query, author='')
@@ -394,43 +404,53 @@ def search_results(searchtype, query):
 
     count = results.count()
     whole = Book.query.count()
-    percentage = float(count / whole * 100)
+    percentage = float(count / whole * 100) 
 
     if search.listview.data:
+        view.append('1')
         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:
+        view.append('2')
         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)))
-
-    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)
-
-
-## Search - autocomplete
-autocomplete_suggestions = []
+        if viewby == '1':
+            print (view[-1])
+            return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
+        else:
+            return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
+   
+    if viewby == '2':
+        return render_template('results_grid.html', form=search, books=results, books_all=random_order, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage)
 
-@app.route('/autocomplete_suggestions', methods=['GET', 'POST'])
-def test1():
-    if request.method == 'POST':
-        autocomplete.load()
-        query = request.form['search']
-        query_tokenized = query.lower().split()
-        print(query_tokenized)
-        word_1 = query_tokenized[-2]
-        word_2 = query_tokenized[-1]
-        #print(word_1)
-        autocomplete_output = autocomplete.predict(word_1 , word_2)
-        autocomplete_suggestions.clear()
-        for suggestion, score in autocomplete_output:
-            autocomplete_suggestions.append(suggestion)
-
-        print(autocomplete_suggestions)
-
-    return Response(json.dumps(autocomplete_suggestions), mimetype='application/json')
+    else:
+        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)
+
+
+# ## Search - autocomplete
+# autocomplete_suggestions = []
+
+# @app.route('/autocomplete_suggestions', methods=['GET', 'POST'])
+# def test1():
+#     if request.method == 'POST':
+#         autocomplete.load()
+#         query = request.form['search']
+#         query_tokenized = query.lower().split()
+#         print(query_tokenized)
+#         word_1 = query_tokenized[-2]
+#         word_2 = query_tokenized[-1]
+#         #print(word_1)
+#         autocomplete_output = autocomplete.predict(word_1 , word_2)
+#         autocomplete_suggestions.clear()
+#         for suggestion, score in autocomplete_output:
+#             autocomplete_suggestions.append(suggestion)
+
+#         print(autocomplete_suggestions)
+
+#     return Response(json.dumps(autocomplete_suggestions), mimetype='application/json')
 
 @app.route('/add_to_stack/<int:id>', methods=['GET', 'POST'])
 def add_to_stack(id):

From d49738db2775a363d67d39b674542ee5fbcb91a9 Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Fri, 8 Jun 2018 16:15:09 +0200
Subject: [PATCH 08/27] connected search to chat

---
 app/models.py                 |  1 -
 app/static/css/style.css      |  8 ++++----
 app/templates/base.html       |  2 +-
 app/templates/show_books.html |  6 +++++-
 app/views.py                  | 34 ++++++++++++++++++++++++++++++++--
 run.py                        |  2 +-
 6 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/app/models.py b/app/models.py
index 80868ec..2a2939a 100755
--- a/app/models.py
+++ b/app/models.py
@@ -84,7 +84,6 @@ class Chat(db.Model):
         self.message = message
         self.time = datetime.datetime.utcnow()
 
-
 class Stack(db.Model):
     __tablename__ = 'stacks'
     id = db.Column(db.Integer, primary_key = True)
diff --git a/app/static/css/style.css b/app/static/css/style.css
index de6ccad..02397ac 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -139,7 +139,7 @@ font-size: 18px;
 padding:6px 15px;
 left:0px;
 border:0px solid #dbdbdb;
-background-color: grey;
+background-color: #686d72;
 color:#fafafa;
 }
 
@@ -225,7 +225,7 @@ div.marquee > div.marquee-text {
   padding: 10px;
   margin: 0px;
   height: 100%;
-  background-color: #551A8B;
+  background-color: #b4b9be;
   overflow-y: scroll;
   overflow-x: hidden;
   color: white;
@@ -262,7 +262,7 @@ z-index: 100000;
   margin:0px!important;
   padding:0px!important;
   height: 40px;
-  font-size: 20px;
+  font-size: 16px;
   word-wrap: break-word;
   word-break: break-all;
   float: left;
@@ -287,7 +287,7 @@ box-sizing: border-box;
   margin-top: 20px;
 }
 .messages .msg{
-  font-size: 30px;
+  font-size: 24px;
   margin: 0px;
   margin-top: -15px;
   margin-bottom: 10px;
diff --git a/app/templates/base.html b/app/templates/base.html
index 76a7e06..44fb505 100755
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -60,7 +60,7 @@ console.log(time)
 return  ('0'+time.getDate()).slice(-2) + '.' + ('0'+(time.getMonth()+1)).slice(-2) + '.' +  time.getFullYear() +" " + ('0'+time.getHours()).slice(-2)+":"+ ('0'+time.getMinutes()).slice(-2);
 }
 //change addr when ONLINE::::::->
-var socket = io.connect('http://localhost:5000');
+var socket = io.connect('http://localhost:8080');
   var app = new Vue({
     el: "#app",
     delimiters: ['[[', ']]'],
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 69be928..04dbcc5 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -1,13 +1,17 @@
 {% extends 'base.html' %}
 
 {% block main %}
+
 <div class="container">
+
+
   {% from "_formhelpers.html" import render_field %}
   <form method="POST">
     <div>{{ form.select(style="width: 100px; margin: 10px; float: left; font-size: 20px") }}</div>
       <div class="search">
       {{ render_field(form.search) }} </div>
-      <button type="submit" class="button">browse</button>
+      <button type="submit" @click="sendMessage" class="button is-info" >browse</button>
+
        <p><br>
       {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>
  </form>
diff --git a/app/views.py b/app/views.py
index 2290a64..c32106f 100755
--- a/app/views.py
+++ b/app/views.py
@@ -45,6 +45,7 @@ def allowed_file(filename):
 def home():
     chat_form = ChatForm()
     chat_messages = db.session.query(Chat).all()
+    username = 'librarian'
 
     # if request.method == 'POST':
     #     if chat_form.validate_on_submit():
@@ -53,7 +54,7 @@ def home():
     #         db.session.add(msg)
     #         db.session.commit()
 
-    return render_template('home.html',domain=DOMAIN,chat=chat_messages, channel = 1, username="librarian")
+    return render_template('home.html',domain=DOMAIN,chat=chat_messages, channel = 1, username=username)
 
 @app.route('/hello/<name>')
 def hello(name):
@@ -368,6 +369,23 @@ def show_books():
         return render_template ('show_books.html', books=books, form=search)
 
     if request.method == 'POST':
+        newmsg = 'searched for: ' + search.search.data 
+        # message = search.search.data
+        # newmessage = Chat(message)
+        # db.session.add(newmessage)
+        # db.session.commit()
+         # Send search to socket chat
+        socketio.emit('channel-' + str(1), {
+        'username': 'Search form',
+        'text': search.search.data,
+        'time': str(datetime.datetime.utcnow().strftime("%d.%m.%Y %H:%M"))}, broadcast=True)
+        # Save message
+        my_new_chat = Chat(message=newmsg)
+        db.session.add(my_new_chat)
+        try:
+            db.session.commit()
+        except:
+            db.session.rollback()
         return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
 
     return render_template('show_books.html', books=books, form=search)
@@ -415,6 +433,19 @@ def search_results(searchtype, query, viewby):
         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':
+        newmsg = 'searched for: ' + search.search.data 
+        socketio.emit('channel-' + str(1), {
+        'username': 'Search form',
+        'text': search.search.data,
+        'time': str(datetime.datetime.utcnow().strftime("%d.%m.%Y %H:%M"))}, broadcast=True)
+        # Save message
+        my_new_chat = Chat(message=newmsg)
+        db.session.add(my_new_chat)
+        try:
+            db.session.commit()
+        except:
+            db.session.rollback()
+            
         query = search.search.data
         results = []
         if viewby == '1':
@@ -562,7 +593,6 @@ def new_message(message):
         db.session.rollback()
 
 
-
 if __name__ == '__main__':
     socketio.run(app)
     #app.run(debug=True,host="0.0.0.0",port="8080")
diff --git a/run.py b/run.py
index 2ba00ff..9b2708e 100755
--- a/run.py
+++ b/run.py
@@ -1,4 +1,4 @@
 #! /usr/bin/env python
 from app import app, socketio
-socketio.run(app)
+socketio.run(app, port=8080)
 #app.run(debug=True,host="0.0.0.0",port=8080)

From 45800d46e7e057f9ad8b37de581f7041808ce40c Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Fri, 8 Jun 2018 17:09:04 +0200
Subject: [PATCH 09/27] fixed mistake with socket port

---
 app/templates/base.html             |  2 +-
 app/templates/red_link.html         | 16 +++++++---------
 app/templates/show_book_detail.html |  7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/templates/base.html b/app/templates/base.html
index 44fb505..76a7e06 100755
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -60,7 +60,7 @@ console.log(time)
 return  ('0'+time.getDate()).slice(-2) + '.' + ('0'+(time.getMonth()+1)).slice(-2) + '.' +  time.getFullYear() +" " + ('0'+time.getHours()).slice(-2)+":"+ ('0'+time.getMinutes()).slice(-2);
 }
 //change addr when ONLINE::::::->
-var socket = io.connect('http://localhost:8080');
+var socket = io.connect('http://localhost:5000');
   var app = new Vue({
     el: "#app",
     delimiters: ['[[', ']]'],
diff --git a/app/templates/red_link.html b/app/templates/red_link.html
index 43a331a..b86a30b 100755
--- a/app/templates/red_link.html
+++ b/app/templates/red_link.html
@@ -5,14 +5,14 @@
 {% block css %}
 <style type="text/css">
   body{
-    padding-top: 40px;
+    padding-top: 20px;
   }
   h1, p{
-    text-align:center;
+    text-align:left;
   }
   h1{
     font-size:44px;
-    margin:75px 0 50px;
+    margin:40px 0 30px;
   }
   p{
     font-size:14px;
@@ -24,13 +24,9 @@
 {% block header %}{% endblock %}
 
 {% block main %}
-<h1>We don't have any results for: {{ title }}</h1>
-<p><a href="{{ url_for('add_book') }}">upload</a>?</p>
-<p><a href="{{ url_for('home') }}">go back home</a>?</p>
-
-
+<h1>Nothing in the library yet with: {{ title }}</h1>
+<h2>Add this potential book:</h2>
 <div class="container">
-  <h1 class="page-header">Add Book</h1>
   {% with messages = get_flashed_messages() %}
     {% if messages %}
       <div class="alert alert-danger">
@@ -42,6 +38,7 @@
       </div>
     {% endif %}
   {% endwith %}
+  <div style="width: 200px:"
   <form method="POST" action="{{ url_for('add_book') }}" enctype=multipart/form-data>
     {{ form.csrf_token }}
     <div class="form-group">{{ form.title.label }} {{ form.title(size=20, class="form-control") }}</div>
@@ -68,5 +65,6 @@
     {{ form.upload }}
     {{ form.wish }}
 </form>
+<p><a href="{{ url_for('home') }}">go back home</a>?</p>
 </div>
 {% endblock %}
diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index da7e121..cc2f0f1 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -2,10 +2,10 @@
 
 {% block main %}
 <div class="container">
-
   <h1 class="header">{{ book.title }}</h1>
- <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
+ <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="180" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
 
+  <p>Year published: {{ book.year_published }}</p>
   <p>Author(s): <ul>{% for author in book.authors %}
 
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
@@ -13,9 +13,8 @@
         {% endfor %}</ul></p>
 
 <p>Category: {{ book.category }}</p>
-<p>Year published: {{ book.year_published }}</p>
 
-        <p>Stack(s): <ul>{% for stack in book.stacks %}
+        <p>Included in stack(s): <ul>{% for stack in book.stacks %}
           <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>
             <p style="font-size: 10px;"><a href='{{url_for('remove_from_stack', stackid=stack.id, bookid=book.id)}}'> Remove from stack</a></p>
 

From aa7ad8b4507c4f53b1b7e70dbec6c00c96ffa4b2 Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Fri, 8 Jun 2018 17:56:20 +0200
Subject: [PATCH 10/27] updated red_link page

---
 app/models.py                 |  1 -
 app/static/css/style.css      |  4 ++--
 app/templates/add_book.html   | 14 +++++++++-----
 app/templates/red_link.html   | 27 +++++++++++++++------------
 app/templates/show_books.html |  3 ---
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/models.py b/app/models.py
index 2a2939a..75aa24b 100755
--- a/app/models.py
+++ b/app/models.py
@@ -124,7 +124,6 @@ class BookSchema(Schema):
     stacks = fields.Nested(StackSchema, many=True)
 
 
-
 def must_not_be_blank(data):
     if not data:
         raise ValidationError('You forgot to write stuff.')
diff --git a/app/static/css/style.css b/app/static/css/style.css
index 02397ac..8f8d93e 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -24,7 +24,7 @@ float: left;
   display: block;
   color: black;
   text-align: center;
-  padding: 14px 16px;
+  padding: 14px 18px;
   font-size: 18px;
   text-decoration: none;
 }
@@ -41,7 +41,7 @@ font-style: italic;
 }
 
 .container{
-padding: 0px 8px;
+padding: 0px 10px;
 
 
 }
diff --git a/app/templates/add_book.html b/app/templates/add_book.html
index c01dc37..d3f2ab5 100755
--- a/app/templates/add_book.html
+++ b/app/templates/add_book.html
@@ -16,10 +16,10 @@
   {% endwith %}
   <form method="POST" action="{{ url_for('add_book') }}" enctype=multipart/form-data>
     {{ form.csrf_token }}
-    <div class="form-group">{{ form.title.label }} {{ form.title(size=20, class="form-control") }}</div>
+    <div class="form-group">Title: {{ form.title (size=34, class="form-control") }}</div>
     <br>
     <div data-toggle="fieldset" id="phone-fieldset">
-         {{ form.author.label }}  <button type="button" data-toggle="fieldset-add-row"
+         Author(s):  <button type="button" data-toggle="fieldset-add-row"
                                           data-target="#phone-fieldset">+</button>
         <table>
             <tr>
@@ -28,20 +28,24 @@
             </tr>
             {% for author in form.author %}
                 <tr data-toggle="fieldset-entry">
-                    <td>{{ author.author_name }}</td>
+                    <td>{{ author.author_name (size=40)}}</td>
                     <td><button type="button" data-toggle="fieldset-remove-row" id="phone-{{loop.index0}}-remove">-</button></td>
                 </tr>
             {% endfor %}
         </table>
     </div>
+  </form>
+</div>
 <br>
-<div class="form-group">{{ form.category.label }} {{ form.category(size=20, class="form-control") }}</div>
+<div sclass="form-group" style="padding-left:10px;">Category: {{ form.category(size=27, class="form-control") }}
 <br>
-<div class="form-group">{{ form.year_published.label }} {{ form.year_published(size=4, class="form-control") }}</div>
 <br>
+
     {{ form.file }}
     {{ form.upload }}
     {{ form.wish }}
+    </div>
+
 </form>
 
 </div>
diff --git a/app/templates/red_link.html b/app/templates/red_link.html
index b86a30b..a3416a4 100755
--- a/app/templates/red_link.html
+++ b/app/templates/red_link.html
@@ -1,12 +1,8 @@
 {% extends "base.html" %}
 
-{% block title %}Red link page{% endblock %}
 
 {% block css %}
 <style type="text/css">
-  body{
-    padding-top: 20px;
-  }
   h1, p{
     text-align:left;
   }
@@ -21,11 +17,9 @@
 </style>
 {% endblock %}
 
-{% block header %}{% endblock %}
-
 {% block main %}
 <h1>Nothing in the library yet with: {{ title }}</h1>
-<h2>Add this potential book:</h2>
+<br>
 <div class="container">
   {% with messages = get_flashed_messages() %}
     {% if messages %}
@@ -38,13 +32,19 @@
       </div>
     {% endif %}
   {% endwith %}
-  <div style="width: 200px:"
+  <div style="width: 220px; float: left; padding-right: 40px;">
+    <img class="no_cover" width="220" src = '/static/img/default_cover.gif';">
+  </div>
+  <br>
+  <div>
+        <h2>Add this potential book:</h2>
+
   <form method="POST" action="{{ url_for('add_book') }}" enctype=multipart/form-data>
     {{ form.csrf_token }}
-    <div class="form-group">{{ form.title.label }} {{ form.title(size=20, class="form-control") }}</div>
+    <div class="form-group">Title: {{ form.title (size=34, class="form-control") }}</div>
     <br>
     <div data-toggle="fieldset" id="phone-fieldset">
-         {{ form.author.label }}  <button type="button" data-toggle="fieldset-add-row"
+         Author(s):  <button type="button" data-toggle="fieldset-add-row"
                                           data-target="#phone-fieldset">+</button>
         <table>
             <tr>
@@ -53,14 +53,17 @@
             </tr>
             {% for author in form.author %}
                 <tr data-toggle="fieldset-entry">
-                    <td>{{ author.author_name }}</td>
+                    <td>{{ author.author_name (size=40)}}</td>
                     <td><button type="button" data-toggle="fieldset-remove-row" id="phone-{{loop.index0}}-remove">-</button></td>
                 </tr>
             {% endfor %}
         </table>
     </div>
+  </form>
+</div>
+<br>
+<div class="form-group">Category: {{ form.category(size=27, class="form-control") }}</div>
 <br>
-<div class="form-group">{{ form.category.label }} {{ form.category(size=20, class="form-control") }}</div>
     {{ form.file }}
     {{ form.upload }}
     {{ form.wish }}
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 04dbcc5..3f767fc 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -1,10 +1,7 @@
 {% extends 'base.html' %}
 
 {% block main %}
-
 <div class="container">
-
-
   {% from "_formhelpers.html" import render_field %}
   <form method="POST">
     <div>{{ form.select(style="width: 100px; margin: 10px; float: left; font-size: 20px") }}</div>

From eb69619cf3c6e7f45759cd06d530eb506802c220 Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Sat, 9 Jun 2018 10:35:23 +0200
Subject: [PATCH 11/27] text decoration edit

---
 app/static/css/style.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index de6ccad..105407c 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -173,13 +173,13 @@ font-size: 12px;
 }
 
 .ui-tabs-vertical { width: 100em; border-top: 0;}
+.ui-tabs-vertical a { text-decoration: none; color: black;}
 .ui-tabs-vertical .ui-tabs-nav { padding: .2em .2em .2em .2em; float: left; width: 15em; -webkit-appearance: none;}
-.ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 0 !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
+.ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 0 !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; list-style-type: none; }
 .ui-tabs-vertical .ui-tabs-nav li a { display:block; }
-.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 0; background-color: #A9A9A9 !important;}
-.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: left; width: 50em; font-size: 12px;}
-#draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; }
-#droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; }
+.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 0; background-color: yellow !important; list-style-type: none;}
+.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: left; width: 50em; font-size: 12px; list-style-type: none;}
+
 
 
 #newstext{

From 72004d6c51bec4bbe6d891e468d366d7d7c0c7e7 Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Sat, 9 Jun 2018 14:27:43 +0200
Subject: [PATCH 12/27] fixed add form

---
 app/static/css/style.css             | 16 ++++++++++++++++
 app/templates/about.html             | 21 +++++++++++++++++++--
 app/templates/add_book.html          |  5 +++--
 app/templates/red_link.html          |  2 +-
 app/templates/show_books.html        | 15 +++++++++++----
 app/templates/show_stack_detail.html | 11 +++++++----
 6 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index 28ddd7b..6bc917f 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -7,6 +7,13 @@ font-family: "Archivo Narrow";
 p{
   font-size: 18px;
 
+
+}
+
+a{
+
+  text-decoration: none;
+  color: black;
 }
 
 .navigation ul{
@@ -46,9 +53,18 @@ padding: 0px 10px;
 
 }
 
+#fileformat{
+  text-align: center;
+}
+
 .lead{
   font-size: 18px;
 
+}
+
+.about{
+font-size: 16px;
+
 }
 .library_table{
 border-spacing:0; /* Removes the cell spacing via CSS */
diff --git a/app/templates/about.html b/app/templates/about.html
index 802a4dc..67aae18 100755
--- a/app/templates/about.html
+++ b/app/templates/about.html
@@ -2,12 +2,29 @@
 
 {% block main %}
 <h1 class="page-header">About</h1>
-<p>
+<p class='about'>
 XPPL is a project aimed at people who are studying the field of media culture, or as we like to call them: knowledge comrades.
 <br>
-This digital library gathers all the books and articles floating around on PZI shelves and our hard drives and memory sticks, so that they can be shared.
+<br>
+This digital library gathers all the books and articles floating around on the shelves of the Piet Zwart Institute, and our hard drives and memory sticks, so that they can be shared, annotated and grouped together into stacks...
+<br>
 <br>
  Its web interface hosts a curated catalogue of books and articles, and its distributed architecture provides instances for uploading and downloading.
+<br>
 <br>
  It starts at XPUB, but can go anywhere we want it to.</p>
+
+
+<h2> What's the deal with the stacks? </h2>
+<p class='about'>
+  A stack is a number of books that are read at a certain point in time, alternating between them. They usually have a topic in common, or follow a certain study path that can bring you to a point of knowledge. Rather than a bookshelf, where books are lined up and often forgotten, the stack on your table/nightstand/toilet consists of books prone to be opened and reopened at any time.
+</p>
+
+<h2>Who's behind this?</h2>
+<p class='about'>
+We're Angeliki, Alex, Alice, Joca, Natasha and Zalán, helped and supported by Femke, Aymeric, Michael, Steve, Andre, Leslie and many more.
+<br>
+<br>
+XPUB is a study path within the Piet Zwart Institute masters program.
+</p>
 {% endblock %}
diff --git a/app/templates/add_book.html b/app/templates/add_book.html
index d3f2ab5..2400b1e 100755
--- a/app/templates/add_book.html
+++ b/app/templates/add_book.html
@@ -34,10 +34,11 @@
             {% endfor %}
         </table>
     </div>
-  </form>
+
 </div>
 <br>
-<div sclass="form-group" style="padding-left:10px;">Category: {{ form.category(size=27, class="form-control") }}
+<div style="padding-left:10px;">
+  Category: {{ form.category(size=27, class="form-control") }}
 <br>
 <br>
 
diff --git a/app/templates/red_link.html b/app/templates/red_link.html
index a3416a4..3c81566 100755
--- a/app/templates/red_link.html
+++ b/app/templates/red_link.html
@@ -33,7 +33,7 @@
     {% endif %}
   {% endwith %}
   <div style="width: 220px; float: left; padding-right: 40px;">
-    <img class="no_cover" width="220" src = '/static/img/default_cover.gif';">
+    <img class="no_cover" width="220" src = '/static/img/default_cover.gif';>
   </div>
   <br>
   <div>
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 3f767fc..fa0580b 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -56,12 +56,19 @@
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
 
         {% endfor %}</td>
-      <td>{{ book.fileformat }}</td>
+      <td id='fileformat'>{{ book.fileformat }}</td>
       <td>{{ book.category}}</td>
-      <td>  {% for stack in book.stacks %}
+      <td>
+        {% for stack in book.stacks %}
+
+              <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">  </a>
+
+                {{ stack.stack_name }}
+                  </li>
+
+      {% endfor %}
+
 
-              <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>  </li>
-              {% endfor %}
               </td>
       <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
 
diff --git a/app/templates/show_stack_detail.html b/app/templates/show_stack_detail.html
index e7c5193..0e2d293 100644
--- a/app/templates/show_stack_detail.html
+++ b/app/templates/show_stack_detail.html
@@ -6,7 +6,9 @@
   <h1 class="header">{{ stack.stack_name }}</h1>
 
   <p>{{ stack.stack_description }} </p>
-  <p>Books in this stack: {% for book in stack.books %}
+  <h2>Books in this stack:</h2>
+<p>
+  {% for book in stack.books %}
 
           <li>  <a href="{{url_for('show_book_by_id', id=book.id)}}">{{book.title}}</a> </li>
           <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="150" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
@@ -19,12 +21,13 @@
   <br>
   <br>
 <p>
-  <a href="{{ url_for('remove_stack_by_id', id=stack.id )}}">Delete</a> </p>
-  <a href="{{ url_for('edit_stack_by_id', id=stack.id )}}">Edit</a> </p>
+  <a href="{{ url_for('remove_stack_by_id', id=stack.id )}}">Remove stack</a> </p>
+<p>
+  <a href="{{ url_for('edit_stack_by_id', id=stack.id )}}">Edit title and/or description</a> </p>
 
 
 
-<p><a href="{{url_for('show_stacks')}}">Go back to stacks</p>
+<p><a href="{{url_for('show_stacks')}}">Go back to the other stacks</p>
 
 </div>
 {% endblock %}

From 3aae3975792bd054e11646d9e7c2d13f47339599 Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Sat, 9 Jun 2018 15:27:49 +0200
Subject: [PATCH 13/27] delete book button, some css, filepath

---
 app/static/css/style.css                 |  3 ++-
 app/templates/show_book_detail.html      |  2 ++
 app/templates/show_books.html            |  2 +-
 app/templates/show_stack_detail_tab.html |  2 +-
 app/views.py                             | 28 ++++++++++++------------
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index 6bc917f..ec32671 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -93,7 +93,8 @@ background-color: #E8E8E8!important;
 
 .library_table .title_col{
   font-size: 20px;
-  padding-left: 10px;
+  padding-left: 90px;
+  padding-right: 20px;
 }
 
 .library_table .author_col{
diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index cc2f0f1..a8b29d3 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -25,6 +25,8 @@
   <br>
   <br>
     <a href="{{ url_for('edit_book_by_id', id=book.id )}}">edit</a>
+    <br>
+    <a href="{{ url_for('remove_book_by_id', id=book.id)}}">delete</a>
 
 </div>
 {% endblock %}
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index fa0580b..1b8a369 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -35,7 +35,7 @@
       <th width="100px;">Filetype</th>
       <th width="100px;">Category</th>
       <th width="100px;">Stack</th>
-      <th width="100px;">Add to stack</th>
+      <th width="100px;">Add to a stack</th>
     </tr>
     </thead>
     <tbody>
diff --git a/app/templates/show_stack_detail_tab.html b/app/templates/show_stack_detail_tab.html
index d074c2c..afa9b30 100644
--- a/app/templates/show_stack_detail_tab.html
+++ b/app/templates/show_stack_detail_tab.html
@@ -11,7 +11,7 @@
 
   <p>{{ stack.stack_description }} </p>
 
-  <p>Books in this stack: {% for book in stack.books %}
+  <p style='font-weight:bold;'>Books in this stack: {% for book in stack.books %}
 
           <li style="font-size: 18px;">  <a href="{{url_for('show_book_by_id', id=book.id)}}">{{book.title}}</a> </li>
 
diff --git a/app/views.py b/app/views.py
index c32106f..8b18213 100755
--- a/app/views.py
+++ b/app/views.py
@@ -165,15 +165,15 @@ def edit_book_by_id(id):
                     flash('No selected file')
                     return redirect(request.url)
                 if file and allowed_file(file.filename):
-                    filename = secure_filename(file.filename)
                     allbooks = db.session.query(Book).all()
                     id = book.id
-                    new_filename = str(id) +"_"+ filename
-                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], new_filename)
-                    name, file_extension = os.path.splitext(new_filename)
+
+                    filename = str(id) + "_" + secure_filename(file.filename)
+                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
+                    name, file_extension = os.path.splitext(filename)
                     file.save(fullpath)
                     book.cover = get_cover(fullpath, name)
-                    book.file = new_filename
+                    book.file = filename
                 else:
                     flash('allowed file formats: %s' % ALLOWED_EXTENSIONS)
 
@@ -211,12 +211,12 @@ def add_book():
                     flash('No selected file')
                     return redirect(request.url)
                 if file and allowed_file(file.filename):
-                    filename = secure_filename(file.filename)
                     allbooks = db.session.query(Book).all()
                     id = len(allbooks)+1
-                    new_filename = str(id) +"_"+ filename
-                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], new_filename)
-                    name, file_extension = os.path.splitext(new_filename)
+                    filename = str(id) + "_" + secure_filename(file.filename)
+
+                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
+                    name, file_extension = os.path.splitext(filename)
                     file.save(fullpath)
                     cover = get_cover(fullpath, name)
                 else:
@@ -369,7 +369,7 @@ def show_books():
         return render_template ('show_books.html', books=books, form=search)
 
     if request.method == 'POST':
-        newmsg = 'searched for: ' + search.search.data 
+        newmsg = 'searched for: ' + search.search.data
         # message = search.search.data
         # newmessage = Chat(message)
         # db.session.add(newmessage)
@@ -422,7 +422,7 @@ def search_results(searchtype, query, viewby):
 
     count = results.count()
     whole = Book.query.count()
-    percentage = float(count / whole * 100) 
+    percentage = float(count / whole * 100)
 
     if search.listview.data:
         view.append('1')
@@ -433,7 +433,7 @@ def search_results(searchtype, query, viewby):
         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':
-        newmsg = 'searched for: ' + search.search.data 
+        newmsg = 'searched for: ' + search.search.data
         socketio.emit('channel-' + str(1), {
         'username': 'Search form',
         'text': search.search.data,
@@ -445,7 +445,7 @@ def search_results(searchtype, query, viewby):
             db.session.commit()
         except:
             db.session.rollback()
-            
+
         query = search.search.data
         results = []
         if viewby == '1':
@@ -453,7 +453,7 @@ def search_results(searchtype, query, viewby):
             return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
         else:
             return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
-   
+
     if viewby == '2':
         return render_template('results_grid.html', form=search, books=results, books_all=random_order, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage)
 

From 34f736ef06d0046ec4187aca722b58c6d3c9d047 Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Sat, 9 Jun 2018 15:41:21 +0200
Subject: [PATCH 14/27] potential pdfs

---
 app/models.py                    |  12 +
 app/templates/add_book.html      |   8 +-
 app/templates/potential_pdf.html |  50 +++
 app/templates/red_link.html      |   6 +-
 app/views.py                     |  33 +-
 app/views_2.py                   | 539 -------------------------------
 6 files changed, 95 insertions(+), 553 deletions(-)
 create mode 100644 app/templates/potential_pdf.html
 delete mode 100755 app/views_2.py

diff --git a/app/models.py b/app/models.py
index 75aa24b..dd80db8 100755
--- a/app/models.py
+++ b/app/models.py
@@ -97,6 +97,18 @@ class Stack(db.Model):
     def __repr__(self):
         return '<Stack %r>' % self.stack_name
 
+
+class Potential(db.Model):
+    __tablename__ = 'potential'
+    id = db.Column(db.Integer, primary_key = True)
+    ptitle = db.Column(db.String(50))
+    time = db.Column(DateTime, default=datetime.datetime.utcnow())
+
+    def __init__(self, ptitle):
+        self.ptitle = ptitle
+        self.time = datetime.datetime.utcnow()
+
+
 class AuthorSchema(Schema):
     id = fields.Int(dump_only=True)
     author_name = fields.Str()
diff --git a/app/templates/add_book.html b/app/templates/add_book.html
index 2400b1e..b9dff17 100755
--- a/app/templates/add_book.html
+++ b/app/templates/add_book.html
@@ -19,8 +19,7 @@
     <div class="form-group">Title: {{ form.title (size=34, class="form-control") }}</div>
     <br>
     <div data-toggle="fieldset" id="phone-fieldset">
-         Author(s):  <button type="button" data-toggle="fieldset-add-row"
-                                          data-target="#phone-fieldset">+</button>
+         Author(s):  <button type="button" data-toggle="fieldset-add-row data-target="#phone-fieldset">+</button>
         <table>
             <tr>
                 <th></th>
@@ -34,14 +33,15 @@
             {% endfor %}
         </table>
     </div>
-
 </div>
 <br>
 <div style="padding-left:10px;">
   Category: {{ form.category(size=27, class="form-control") }}
 <br>
 <br>
-
+  Year published: {{ form.year_published(size=8, class="form-control") }}
+<br>
+<br>
     {{ form.file }}
     {{ form.upload }}
     {{ form.wish }}
diff --git a/app/templates/potential_pdf.html b/app/templates/potential_pdf.html
new file mode 100644
index 0000000..4450325
--- /dev/null
+++ b/app/templates/potential_pdf.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+
+    <style>
+
+    @import url("../fonts/fonts_style.css");
+
+    </style>
+
+    <title>XPPL</title>
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+  </head>
+  <body>
+<div class="container" style="padding:20px;">
+  <h1 style='font-family: Archivo Narrow; text-align: center;'>A Potential Collection</h1>
+    <h3 style='font-family: Archivo Narrow; text-align: center;'>Every book ever requested by XPPL librarians: </h3>
+<div style='font-family: Courier New; text-align: center;'>
+  <p> {% for pbook in pbooks %}{{ pbook.ptitle }} requested on: {{ pbook.time }}
+  </p>{% endfor %}
+  </div>
+
+ </body>
+
+ <br>
+<div class="footer" style="padding-left: 40%">
+<pre>
+   ,   ,
+  /////|
+ ///// |
+|~~~|  |
+|===|  |
+|x  |  |
+| p |  |
+|p l| /
+|===|/
+'---'
+</pre>
+</div>
+</html>
diff --git a/app/templates/red_link.html b/app/templates/red_link.html
index 3c81566..a4d6c5c 100755
--- a/app/templates/red_link.html
+++ b/app/templates/red_link.html
@@ -59,10 +59,12 @@
             {% endfor %}
         </table>
     </div>
-  </form>
 </div>
+<div style="padding-left:10px;">
+  Category: {{ form.category(size=27, class="form-control") }}
 <br>
-<div class="form-group">Category: {{ form.category(size=27, class="form-control") }}</div>
+<br>
+  Year published: {{ form.year_published(size=8, class="form-control") }}
 <br>
     {{ form.file }}
     {{ form.upload }}
diff --git a/app/views.py b/app/views.py
index c32106f..163a448 100755
--- a/app/views.py
+++ b/app/views.py
@@ -10,10 +10,11 @@ from flask import Flask, Response, render_template, request, redirect, url_for,
 import json
 from  sqlalchemy.sql.expression import func, select
 from app.forms import UploadForm, EditForm, SearchForm, ChatForm, StackForm, AddtoStackForm, EditStackForm
-from app.models import Book, BookSchema, Author, AuthorSchema, Stack, StackSchema, UserIns, Chat, ChatSchema
+from app.models import Book, BookSchema, Author, AuthorSchema, Stack, StackSchema, UserIns, Chat, ChatSchema, Potential
 from app.cover import get_cover
 from os import environ
 from flask_socketio import SocketIO, emit
+from weasyprint import HTML
 import datetime
 import time
 import autocomplete
@@ -128,6 +129,15 @@ def remove_book_by_id(id):
     flash("%s deleted from library" % (title))
     return redirect(url_for('show_books'))
 
+@app.route('/potential')
+def htmlpdf():
+    paragraphs= ['test title']
+    template = 'app/templates/potential_pdf.html'
+    html_string = render_template('potential_pdf.html', paragraphs=paragraphs)
+    html = HTML(string=html_string)
+    html.write_pdf(target='app/uploads/potential2.pdf');
+    return render_template('potential_pdf.html', paragraphs=paragraphs)
+
 @app.route('/books/<int:id>/edit', methods=['POST', 'GET'])
 def edit_book_by_id(id):
     book_to_edit = Book.query.filter_by(id=id).first()
@@ -223,13 +233,20 @@ def add_book():
                     flash('allowed file formats: %s' % ALLOWED_EXTENSIONS)
             #if upload without file -> wishform, with potential PDF
             if upload_form.wish.data:
-                #TO DO: make pdf generator
-                #file = open('app/uploads/potential.pdf')
-                #filename = 'potential.pdf'
-                #file_extension = '.pdf'
-                filename = ''
-                file_extension = ''
-                cover = ''
+                #pdf generator
+                filename = 'potential.pdf'
+                file_extension = '.pdf'
+                cover= ''
+                ptitle = upload_form.title.data
+                pbook = Potential(ptitle)
+                db.session.add(pbook)
+                db.session.commit()
+                pbooks = Potential.query.all()
+                template = 'app/templates/potential_pdf.html'
+                html_string = render_template('potential_pdf.html', pbooks = pbooks)
+                html = HTML(string=html_string)
+                html.write_pdf(target='app/uploads/potential.pdf');
+                print ('potential_pdf')
 
             book = Book(title, filename, cover, file_extension, category,year_published)
             db.session.add(book)
diff --git a/app/views_2.py b/app/views_2.py
deleted file mode 100755
index edf46ac..0000000
--- a/app/views_2.py
+++ /dev/null
@@ -1,539 +0,0 @@
-"""
-Flask Documentation:     http://flask.pocoo.org/docs/
-Jinja2 Documentation:    http://jinja.pocoo.org/2/documentation/
-Werkzeug Documentation:  http://werkzeug.pocoo.org/documentation/
-This file creates your application.
-"""
-
-from app import app, db, socketio, DOMAIN
-from flask import Flask, Response, render_template, request, redirect, url_for, flash, send_from_directory, jsonify, abort
-import json
-from  sqlalchemy.sql.expression import func, select
-from app.forms import UploadForm, EditForm, SearchForm, ChatForm, StackForm, AddtoStackForm, EditStackForm
-from app.models import Book, BookSchema, Author, AuthorSchema, Stack, StackSchema, UserIns, Chat, ChatSchema
-from app.cover import get_cover
-from os import environ
-from flask_socketio import SocketIO, emit
-import datetime
-import time
-import autocomplete
-import sys
-from csv import DictWriter
-import io
-
-import os
-from werkzeug.utils import secure_filename
-
-# import sqlite3
-ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'epub', 'chm', 'mobi'])
-
-author_schema = AuthorSchema()
-authors_schema = AuthorSchema(many=True)
-book_schema = BookSchema()
-books_schema = BookSchema(many=True)
-stack_schema = StackSchema()
-stacks_schema = StackSchema(many=True)
-chat_schema = ChatSchema()
-chats_schema = ChatSchema(many=True)
-
-def allowed_file(filename):
-    return '.' in filename and \
-           filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS
-###
-# Routing for your application.
-###
-
-@app.route('/', methods= ['POST','GET'])
-def home():
-    chat_form = ChatForm()
-    chat_messages = db.session.query(Chat).all()
-
-    # if request.method == 'POST':
-    #     if chat_form.validate_on_submit():
-    #         message = chat_form.message.data
-    #         msg = Chat(message)
-    #         db.session.add(msg)
-    #         db.session.commit()
-
-    return render_template('home.html',domain=DOMAIN,chat=chat_messages, channel = 1, username="librarian")
-
-@app.route('/hello/<name>')
-def hello(name):
-    return "Hello " + name
-
-@app.route('/about/')
-def about():
-    """Render the website's about page."""
-    return render_template('about.html', name="Mary Jane")
-
-@app.route('/uploads/<filename>')
-def uploaded_file(filename):
-    return send_from_directory(app.config['UPLOAD_FOLDER'],
-                               filename)
-
-@app.route('/uploads/cover/<filename>')
-def uploaded_file_cover(filename):
-    return send_from_directory(app.config['UPLOAD_FOLDER_COVER'],
-                               filename)
-
-@app.route('/updates', methods=['POST', 'GET'])
-def get_updates():
-    userin = UserIns.query.filter_by(title="lastViewed").first()
-    allbooks = db.session.query(Book).all()
-    id = len(allbooks)
-    latest_upload = allbooks[-1]
-    return "This is the XPPL ~ Library XPUB ~ Updates / / / / / / / Last viewed: " + userin.info + " / / / / / / / " + str(len(allbooks)) + " Books online "+ " / / / / / / / " + "Latest upload: " + latest_upload.title
-
-@app.route('/scape', methods=['POST', 'GET'])
-def scape():
-    if request.method == 'POST':
-        data = request.form
-        book = Book.query.get(data['id'])
-        print(book.scapeX)
-        book.scapeX = data['x']
-        book.scapeY = data['y']
-        db.session.commit()
-    books = db.session.query(Book).all() # or you could have used User.query.all()
-    return render_template('scape.html', books=books)
-
-
-@app.route('/books_grid')
-def show_books_grid():
-    books = db.session.query(Book).all() # or you could have used User.query.all()
-    return render_template('show_books_grid.html', books=books)
-
-@app.route('/books/<int:id>')
-def show_book_by_id(id):
-    book = Book.query.get(id)
-    userin = UserIns.query.filter_by(title="lastViewed").first()
-    if userin != None:
-        userin.info = book.title
-        db.session.commit()
-    else:
-        user_info = UserIns("lastViewed", book.title)
-        db.session.add(user_info)
-        db.session.commit()
-    if not book:
-        return render_template('red_link.html', id=id)
-    else:
-        return render_template('show_book_detail.html', book=book)
-
-
-@app.route('/books/<int:id>/delete', methods=['POST', 'GET'])
-def remove_book_by_id(id):
-    book_to_edit = Book.query.filter_by(id=id).first()
-    title = book_to_edit.title
-    Book.query.filter_by(id=id).delete()
-    #author_table = Author.query.filter_by(book_id=book_to_edit.id).delete()
-    db.session.commit()
-    flash("%s deleted from library" % (title))
-    return redirect(url_for('show_books'))
-
-@app.route('/books/<int:id>/edit', methods=['POST', 'GET'])
-def edit_book_by_id(id):
-    book_to_edit = Book.query.filter_by(id=id).first()
-    user_form = EditForm(title = book_to_edit.title, author =book_to_edit.authors, category = book_to_edit.category, year_published= book_to_edit.year_published)
-
-    if request.method == 'POST':
-        if user_form.validate_on_submit():
-            # on submit, check fields
-            title = user_form.title.data
-            input_authors = user_form.author.data
-            category = user_form.category.data
-            year_published = user_form.year_published.data
-            if year_published=="":
-                year_published = None
-            book = Book.query.filter_by(id=id).first()
-            book.title = title
-            book.category = category
-            book.year_published = year_published
-
-            #authors update
-            book.authors.clear()
-            for i, author in enumerate(input_authors):
-                author_name = author.get("author_name")
-                if author_name:
-                    a = db.session.query(Author).filter_by(author_name=author_name).first()
-                    if a == None:
-                        a = Author(author_name=author_name)
-                        db.session.add(a)
-                    book.authors.append(a)
-
-            # editing / uploading new file
-            if user_form.file.data:
-                file = request.files['file']
-                if file.filename == '':
-                    flash('No selected file')
-                    return redirect(request.url)
-                if file and allowed_file(file.filename):
-                    filename = secure_filename(file.filename)
-                    allbooks = db.session.query(Book).all()
-                    id = book.id
-                    new_filename = str(id) +"_"+ filename
-                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], new_filename)
-                    name, file_extension = os.path.splitext(new_filename)
-                    file.save(fullpath)
-                    book.cover = get_cover(fullpath, name)
-                    book.file = new_filename
-                else:
-                    flash('allowed file formats: %s' % ALLOWED_EXTENSIONS)
-
-            db.session.commit()
-            flash("%s updated" % (title))
-            return redirect(url_for('show_book_by_id', id=id))
-
-    return render_template('edit_book_detail.html', book=book_to_edit, form=user_form)
-
-
-@app.route('/add-book', methods=['POST', 'GET'])
-def add_book():
-    upload_form = UploadForm()
-
-    if request.method == 'POST':
-        if upload_form.validate_on_submit():
-            #get data from form
-            title = upload_form.title.data
-            authors = upload_form.author.data
-            category = upload_form.category.data
-            year_published = upload_form.year_published.data
-            if year_published=="":
-                year_published = None
-
-            #if upload with file
-            if upload_form.upload.data:
-                # check if the post request has the file part
-                if 'file' not in request.files:
-                    flash('No file part')
-                    return redirect(request.url)
-                file = request.files['file']
-                # if user does not select file, browser also
-                # submit a empty part without filename
-                if file.filename == '':
-                    flash('No selected file')
-                    return redirect(request.url)
-                if file and allowed_file(file.filename):
-                    filename = secure_filename(file.filename)
-                    allbooks = db.session.query(Book).all()
-                    id = len(allbooks)+1
-                    new_filename = str(id) +"_"+ filename
-                    fullpath = os.path.join(app.config['UPLOAD_FOLDER'], new_filename)
-                    name, file_extension = os.path.splitext(new_filename)
-                    file.save(fullpath)
-                    cover = get_cover(fullpath, name)
-                else:
-                    flash('allowed file formats: %s' % ALLOWED_EXTENSIONS)
-            #if upload without file -> wishform, with potential PDF
-            if upload_form.wish.data:
-                #TO DO: make pdf generator
-                #file = open('app/uploads/potential.pdf')
-                #filename = 'potential.pdf'
-                #file_extension = '.pdf'
-                filename = ''
-                file_extension = ''
-                cover = ''
-
-            book = Book(title, filename, cover, file_extension, category,year_published)
-            db.session.add(book)
-            for author in authors:
-                author_name = author.get("author_name")
-                if author_name:
-                    a = db.session.query(Author).filter_by(author_name=author_name).first()
-                    if a == None:
-                        a = Author(author_name=author_name)
-                        db.session.add(a)
-                    book.authors.append(a)
-            db.session.commit()
-
-            flash("%s added to the library" % (title))
-            return redirect(url_for('show_books'))
-
-    flash_errors(upload_form)
-    return render_template('add_book.html', form=upload_form)
-
-
-# Flash errors from the form if validation fails
-def flash_errors(form):
-    for field, errors in form.errors.items():
-        for error in errors:
-            flash(u"Error in the %s field - %s" % (
-                getattr(form, field).label.text,
-                error
-            ))
-
-#Authors
-
-@app.route('/authors/<int:id>')
-def show_author_by_id(id):
-    author = Author.query.get(id)
-    if not author:
-        abort (404)
-    else:
-        return render_template('show_author_detail.html', author=author)
-
-
-@app.route('/authors/<int:id>/edit', methods=['POST', 'GET'])
-def edit_author_by_id(id):
-    return "Ask the programmer."
-
-##stacks
-
-@app.route('/stacks')
-def show_stacks():
-    stacks = db.session.query(Stack).all()
-    return render_template('show_stacks.html', stacks=stacks)
-
-@app.route('/stacks/add_stack', methods=['POST', 'GET'])
-def add_stack():
-    form = StackForm()
-    stacks = db.session.query(Stack).all()
-
-    if form.validate_on_submit():
-        stack_name = form.stack_name.data
-        stack_description = form.stack_description.data
-        stack = Stack(stack_name, stack_description)
-        if form.stack_name.data:
-            stack = Stack(stack_name, stack_description)
-            db.session.add(stack)
-        stacks = db.session.query(Stack).all()
-        return redirect(url_for('show_stacks'))
-        flash("%s stack created" % (stack_name))
-    return render_template('add_stack.html', stacks=stacks, form=form)
-
-@app.route('/stacks/tab/<int:id>', methods=['POST', 'GET'])
-def show_stack_in_tab(id):
-    return show_stack_by_id(id, is_tab=True)
-
-
-@app.route('/stacks/<int:id>', methods=['POST', 'GET'])
-def show_stack_by_id(id, is_tab=False):
-
-    stack = Stack.query.get(id)
-    if not stack:
-        abort (404)
-    else:
-        if is_tab == False:
-            return render_template('show_stack_detail.html', stack=stack)
-        else:
-            return render_template('show_stack_detail_tab.html', stack=stack)
-
-@app.route('/stacks/<int:id>/delete', methods=['POST', 'GET'])
-def remove_stack_by_id(id):
-    Stack.query.filter_by(id=id).delete()
-    db.session.commit()
-    return redirect(url_for('show_stacks'))
-
-@app.route('/stacks/<int:id>/edit', methods=['POST', 'GET'])
-def edit_stack_by_id(id):
-    stack = Stack.query.filter_by(id=id).first()
-    form = EditStackForm(edit_stack_name = stack.stack_name, edit_stack_description = stack.stack_description)
-
-    if request.method == 'POST':
-        if form.validate_on_submit():
-            stack_name = form.edit_stack_name.data
-            stack_description = form.edit_stack_description.data
-        stack.stack_name = stack_name
-        stack.stack_description = stack_description
-        db.session.commit()
-
-        return redirect(url_for('show_stack_by_id', id=id))
-    return render_template('edit_stack_detail.html', stack=stack, form=form)
-
-#@app.route('/stacks/<int:stackid>/remove/<int:bookid>', methods=['POST', 'GET'])
-#def remove_from_stack(bookid, stackid):
-#    import ipdb; ipdb.set_trace()
-#    book = Book.query.get(id)
-#    stack = Stack.query.get(id)
-
-#    stack = db.session.query(Stack).join(stack.books).filter_by(stackid=stackid)
-#    stack.books.delete(book)
-#    db.session.commit()
-#    return render_template('show_book_by_id.html', stackid=stack.id, bookid=book.id)
-
-@app.route('/add_to_stack/<int:id>', methods=['GET', 'POST'])
-def add_to_stack(id):
-    stacks = db.session.query(Stack).all()
-    add_form = AddtoStackForm(request.form)
-    add_form.select_stack.choices = [(stack.id, stack.stack_name) for stack in stacks]
-    if request.method == 'GET':
-        book = Book.query.get(id)
-        return render_template('add_to_stacks.html', id=id, stacks=stacks, book=book, add_form=add_form)
-    else:
-        stack = Stack.query.get(int(add_form.select_stack.data))
-        book = Book.query.get(id)
-        stack.books.append(book)
-        db.session.commit()
-        return render_template('show_stack_detail.html', stack=stack)
-
-## search
-
-@app.route('/books', methods= ['POST','GET'])
-def show_books():
-    books = db.session.query(Book).all()
-    search = SearchForm(request.form)
-    if request.method == 'POST':
-        return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data)))
-
-    return render_template('show_books.html', books=books, form=search)
-
-@app.route('/search/<searchtype>/<query>/', methods=['POST', 'GET'])
-def search_results(searchtype, query):
-    search = SearchForm(request.form)
-    random_order=Book.query.order_by(func.random()).limit(10)
-    results=Book.query.filter(Book.title.contains(query))
-
-    if searchtype == 'Title':
-        results=Book.query.filter(Book.title.contains(query))
-
-    if searchtype == 'Category':
-        results=Book.query.filter(Book.category.contains(query))
-
-    if searchtype== 'Author':
-        results=db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query))
-
-    if searchtype== 'Stack':
-        results=db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query))
-
-    if searchtype== 'All':
-        # results=Book.query.whoosh_search(query)
-        results=Book.query.filter(Book.title.contains(query))
-        results=results.union(Book.query.filter(Book.category.contains(query)))
-        results=results.union(db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query)))
-        results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query)))
-
-    if results.count() == 0:
-        upload_form = UploadForm(title= query, author='')
-        return render_template('red_link.html', form=upload_form, title=query)
-
-    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)
-
-
-## Search - autocomplete
-autocomplete_suggestions = []
-
-@app.route('/autocomplete_suggestions', methods=['GET', 'POST'])
-def test1():
-    if request.method == 'POST':
-        autocomplete.load()
-        query = request.form['search']
-        query_tokenized = query.lower().split()
-        print(query_tokenized)
-        word_1 = query_tokenized[-2]
-        word_2 = query_tokenized[-1]
-        #print(word_1)
-        autocomplete_output = autocomplete.predict(word_1 , word_2)
-        autocomplete_suggestions.clear()
-        for suggestion, score in autocomplete_output:
-            autocomplete_suggestions.append(suggestion)
-
-        print(autocomplete_suggestions)
-
-    return Response(json.dumps(autocomplete_suggestions), mimetype='application/json')
-
-
-
-
-
-@app.route('/export/csv', methods=['GET'])
-def export_csv ():
-    output = io.StringIO()
-    fieldnames = ['title', 'authors']
-    csv = DictWriter(output,fieldnames)
-    csv.writeheader()
-    # for i in range(10):
-    #     csv.writerow({'ID': i, 'fruit': "Tomato"})
-    for book in Book.query.order_by("title"):
-        authors = ", ".join([x.author_name for x in book.authors])
-        csv.writerow({"title": book.title, "authors": authors})
-    resp = Response(output.getvalue(), mimetype="text/plain")
-    # resp.headers["Content-Disposition"] = "attachment;filename=export.csv"
-    return resp
-###
-# The API
-###
-
-@app.route('/api/books', methods=['GET'])
-def get_books():
-    books = Book.query.all()
-    data = books_schema.dump(books)
-    #print(errors)
-    return jsonify({'books': data})
-
-@app.route('/api/books/<int:id>', methods=['GET'])
-def get_book_by_id(id):
-    book = Book.query.get(id)
-    data = book_schema.dump(book)
-    if not data:
-        return jsonify({"message": "Book could not be found."}), 400
-    else:
-        return jsonify({'book': data })
-
-@app.route('/api/chats', methods=['GET'])
-def get_chat():
-    chats = Chat.query.all()
-    data = chats_schema.dump(chats)
-    #print(errors)
-    return jsonify({'chat': data})
-
-
-
-###
-# The functions below should be applicable to all Flask apps.
-###
-
-@app.route('/<file_name>.txt')
-def send_text_file(file_name):
-    """Send your static text file."""
-    file_dot_text = file_name + '.txt'
-    return app.send_static_file(file_dot_text)
-
-
-@app.after_request
-def add_header(response):
-    """
-    Add headers to both force latest IE rendering engine or Chrome Frame,
-    and also to cache the rendered page for 10 minutes.
-    """
-    response.headers['X-UA-Compatible'] = 'IE=Edge,chrome=1'
-    response.headers['Cache-Control'] = 'public, max-age=600'
-    return response
-
-
-@app.errorhandler(404)
-def page_not_found(error):
-    """Custom 404 page."""
-    return render_template('404.html'), 404
-
-@socketio.on('new_message')
-def new_message(message):
-    # Send message to alls users
-    print("new message")
-    emit('channel-' + str(message['channel']), {
-        'username': message['username'],
-        'text': message['text'],
-        'time': str(datetime.datetime.utcnow().strftime("%d.%m.%Y %H:%M"))
-    },
-        broadcast=True
-    )
-    # Save message
-    my_new_chat = Chat(
-        message=message['text']
-    )
-    db.session.add(my_new_chat)
-    try:
-        db.session.commit()
-    except:
-        db.session.rollback()
-
-
-
-if __name__ == '__main__':
-    socketio.run(app)
-    #app.run(debug=True,host="0.0.0.0",port="8080")

From 5fbdb066650da80264ee219b74034db7961895df Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Sat, 9 Jun 2018 18:13:18 +0200
Subject: [PATCH 15/27] updated styling potential pdfs

---
 app/static/css/style.css         |  5 +++++
 app/templates/potential_pdf.html | 27 ++++++++++-----------------
 app/templates/red_link.html      |  3 ++-
 app/templates/results.html       |  8 ++++----
 app/templates/show_books.html    |  4 ++--
 app/views.py                     |  4 +++-
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index ec32671..fc8faab 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -15,6 +15,11 @@ a{
   text-decoration: none;
   color: black;
 }
+a:hover{
+
+  text-decoration: underline;
+  color: #0000FF;
+}
 
 .navigation ul{
   list-style-type: none;
diff --git a/app/templates/potential_pdf.html b/app/templates/potential_pdf.html
index 4450325..1800cf6 100644
--- a/app/templates/potential_pdf.html
+++ b/app/templates/potential_pdf.html
@@ -13,27 +13,17 @@
     </style>
 
     <title>XPPL</title>
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
   </head>
   <body>
-<div class="container" style="padding:20px;">
-  <h1 style='font-family: Archivo Narrow; text-align: center;'>A Potential Collection</h1>
-    <h3 style='font-family: Archivo Narrow; text-align: center;'>Every book ever requested by XPPL librarians: </h3>
-<div style='font-family: Courier New; text-align: center;'>
-  <p> {% for pbook in pbooks %}{{ pbook.ptitle }} requested on: {{ pbook.time }}
+<div class="container" style="padding:10px; border-style:dashed; border-width:1px;">
+  <h1 style='font-family: Archivo Narrow; text-align: center;'>Potential Books</h1>
+
+    <h3 style='font-family: Archivo Narrow; text-align: center;'>Archiving the gaps in the XPPL library: </h3>
+<div style='font-family: Courier New; text-align: center; font-size: 10pt;'>
+  <p> {% for pbook in pbooks %}"{{ pbook.ptitle }}" requested on: {{ pbook.time|string|truncate(17,true," ")}}
   </p>{% endfor %}
   </div>
-
- </body>
-
- <br>
-<div class="footer" style="padding-left: 40%">
+<div style=" font-family: Archivo Narrow; padding-left: 40%">
 <pre>
    ,   ,
   /////|
@@ -46,5 +36,8 @@
 |===|/
 '---'
 </pre>
+ </body>
+
+ <br>
 </div>
 </html>
diff --git a/app/templates/red_link.html b/app/templates/red_link.html
index a4d6c5c..c15e812 100755
--- a/app/templates/red_link.html
+++ b/app/templates/red_link.html
@@ -70,6 +70,7 @@
     {{ form.upload }}
     {{ form.wish }}
 </form>
-<p><a href="{{ url_for('home') }}">go back home</a>?</p>
+<br>
+<p><a href="{{ url_for('home') }}" style="font-size: 9pt;>go back home</a>?</p>
 </div>
 {% endblock %}
diff --git a/app/templates/results.html b/app/templates/results.html
index 6ccb272..9ba0595 100644
--- a/app/templates/results.html
+++ b/app/templates/results.html
@@ -36,7 +36,7 @@
       <th width="70px;">Cover</th>
       <th>Title</th>
       <th width="400px;">Author</th>
-      <th width="100px;">Filetype</th>
+      <th width="100px;">Year</th>
       <th width="100px;">Category</th>
       <th width="100px;">Stack</th>
       <th width="100px;">Add to stack</th>
@@ -53,7 +53,7 @@
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
 
         {% endfor %}</td>
-      <td>{{ book.fileformat }}</td>
+      <td>{{ book.year_published }}</td>
       <td>{{ book.category}}</td>
       <td>  {% for stack in book.stacks %}
 
@@ -78,7 +78,7 @@
       <th width="70px;">Cover</th>
       <th>Title</th>
       <th width="400px;">Author</th>
-      <th width="100px;">Filetype</th>
+      <th width="100px;">Year</th>
       <th width="100px;">Category</th>
       <th width="100px;">Stack</th>
       <th width="100px;">Add to stack</th>
@@ -94,7 +94,7 @@
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
 
         {% endfor %}</td>
-      <td>{{ book.fileformat }}</td>
+      <td>{{ book.year_published }}</td>
       <td>{{ book.category}}</td>
       <td>  {% for stack in book.stacks %}
 
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 1b8a369..ac9a819 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -32,7 +32,7 @@
       <th width="70px;">Cover</th>
       <th>Title</th>
       <th width="400px;">Author</th>
-      <th width="100px;">Filetype</th>
+      <th width="100px;">Year</th>
       <th width="100px;">Category</th>
       <th width="100px;">Stack</th>
       <th width="100px;">Add to a stack</th>
@@ -56,7 +56,7 @@
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
 
         {% endfor %}</td>
-      <td id='fileformat'>{{ book.fileformat }}</td>
+      <td id='fileformat'>{{ book.year_published }}</td>
       <td>{{ book.category}}</td>
       <td>
         {% for stack in book.stacks %}
diff --git a/app/views.py b/app/views.py
index 565f123..ec86fd7 100755
--- a/app/views.py
+++ b/app/views.py
@@ -430,8 +430,10 @@ def search_results(searchtype, query, viewby):
         # results=Book.query.whoosh_search(query)
         results=Book.query.filter(Book.title.contains(query))
         results=results.union(Book.query.filter(Book.category.contains(query)))
+        results=results.union(Book.query.filter(Book.year_published.contains(query)))
         results=results.union(db.session.query(Book).join(Book.authors).filter(Author.author_name.contains(query)))
-        results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query))).order_by(Book.title)
+        results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_name.contains(query)))
+        results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_description.contains(query))).order_by(Book.title)
 
     if results.count() == 0:
         upload_form = UploadForm(title= query, author='')

From 0696c94a147032a0cbbd38fed201166c7f656d5e Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Sat, 9 Jun 2018 19:27:55 +0200
Subject: [PATCH 16/27] updates red link page

---
 app/static/css/style.css           |  1 +
 app/templates/red_link.html        | 65 ++++++++++++++++++++++++++++--
 app/templates/results.html         |  7 ++--
 app/templates/results_grid.html    |  9 ++---
 app/templates/show_books.html      |  2 +-
 app/templates/show_books_grid.html |  2 +-
 app/views.py                       | 10 ++---
 7 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index fc8faab..1753ba4 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -82,6 +82,7 @@ border-spacing:0; /* Removes the cell spacing via CSS */
 .library_table th{
 font-size: 20px;
 cursor: pointer;
+background-color: #fafafa;
 }
 
 th.headerSortUp{
diff --git a/app/templates/red_link.html b/app/templates/red_link.html
index c15e812..22f101d 100755
--- a/app/templates/red_link.html
+++ b/app/templates/red_link.html
@@ -37,7 +37,7 @@
   </div>
   <br>
   <div>
-        <h2>Add this potential book:</h2>
+        <h2>Add this book:</h2>
 
   <form method="POST" action="{{ url_for('add_book') }}" enctype=multipart/form-data>
     {{ form.csrf_token }}
@@ -60,17 +60,76 @@
         </table>
     </div>
 </div>
-<div style="padding-left:10px;">
+<div style="padding-left:10px; padding-bottom: 50px;">
   Category: {{ form.category(size=27, class="form-control") }}
 <br>
 <br>
   Year published: {{ form.year_published(size=8, class="form-control") }}
+<br>
 <br>
     {{ form.file }}
     {{ form.upload }}
     {{ form.wish }}
 </form>
 <br>
-<p><a href="{{ url_for('home') }}" style="font-size: 9pt;>go back home</a>?</p>
+<p><a href="{{ url_for('home') }}" style="font-size: 9pt;">go back home</a></p>
+<br>
+</div>
+<div class= "Container" style= "border-top: dashed; border-width: 1px;">
+<h2> More potential books </h2>
+<table class="library_table" id="table" style="width:100%">
+    <thead>
+    <tr id="header">
+      <th width="70px;">Cover</th>
+      <th>Title</th>
+      <th width="400px;">Author</th>
+      <th width="100px;">Year</th>
+      <th width="100px;">Category</th>
+      <th width="100px;">Stack</th>
+      <th width="100px;">Add to a stack</th>
+    </tr>
+    </thead>
+    <tbody>
+        {% for book in books %}
+    <tr>
+      <td style= "padding: 5px;">
+
+        <img class="no_cover" id="{{ book.title }}" src="/uploads/cover/{{ book.cover }}" width="70" onerror="if (this.src != '//uploads/cover/{{ book.cover }}') this.src = '/static/img/default_cover.gif';">
+      <!--  <object class="no_cover" data="../static/img/default_cover.png" type="image/png" width="65">
+          <p hidden="True"></p>
+
+      </object>-->
+      </td>
+      <td class="title_col"><a href="/books/{{ book.id }}">{{ book.title }}</a></td>
+
+      <td class="author_col">  {% for author in book.authors %}
+
+              <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
+
+        {% endfor %}</td>
+      <td id='fileformat'>{{ book.year_published }}</td>
+      <td>{{ book.category}}</td>
+      <td>
+        {% for stack in book.stacks %}
+
+              <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">  </a>
+
+                {{ stack.stack_name }}
+                  </li>
+
+      {% endfor %}
+
+
+              </td>
+      <td id='plus'><a href="{{url_for('add_to_stack', id=book.id)}}">
+
+      ===>
+              </a></td>
+    </tr>
+
+  {% endfor %}
+</tbody>
+  </table>
 </div>
+
 {% endblock %}
diff --git a/app/templates/results.html b/app/templates/results.html
index 9ba0595..8e88967 100644
--- a/app/templates/results.html
+++ b/app/templates/results.html
@@ -53,7 +53,7 @@
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
 
         {% endfor %}</td>
-      <td>{{ book.year_published }}</td>
+      <td>{{ book.year_published or '––'}}</td>
       <td>{{ book.category}}</td>
       <td>  {% for stack in book.stacks %}
 
@@ -69,8 +69,7 @@
 
 </div>
 
-<div class="container" >
-  <hr>
+<div class="container" style= "border-top: dashed; border-width: 1px;" >
   <h2> Other books </h2>
 
   <table class="library_table" id="table" style="width:100%">
@@ -94,7 +93,7 @@
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
 
         {% endfor %}</td>
-      <td>{{ book.year_published }}</td>
+      <td>{{ book.year_published or '––'}}</td>
       <td>{{ book.category}}</td>
       <td>  {% for stack in book.stacks %}
 
diff --git a/app/templates/results_grid.html b/app/templates/results_grid.html
index 5b2a1ec..d043c4a 100644
--- a/app/templates/results_grid.html
+++ b/app/templates/results_grid.html
@@ -30,7 +30,7 @@
       </div>
     {% endif %}
   {% endwith %}
-<div class="grid">
+<div class="grid" >
 
         {% for book in books|sort(attribute='title', reverse = False) %}
 
@@ -41,7 +41,7 @@
 <p>
 <tbody>
 <th>
-{{ book.title }}</th>
+{{ book.title }} ({{ book.year_published or '?' }})</th>
 <br>
 <span style = "font-size: 14px;">
 {% for author in  book.authors %}
@@ -53,8 +53,7 @@
 </div>
 
 
-<div class="container" >
-  <hr>
+<div class="container" style= "border-top: dashed; border-width: 1px;">
   <h2> Other books </h2>
 
 <div class="grid">
@@ -67,7 +66,7 @@
 <p>
 <tbody>
 <th>
-{{ book.title }}</th>
+{{ book.title }} ({{ book.year_published or '?' }})</th>
 <br>
 <span style = "font-size: 14px;">
 {% for author in  book.authors %}
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index ac9a819..fc4c1da 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -56,7 +56,7 @@
               <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
 
         {% endfor %}</td>
-      <td id='fileformat'>{{ book.year_published }}</td>
+      <td id='fileformat'>{{ book.year_published or '––'}}</td>
       <td>{{ book.category}}</td>
       <td>
         {% for stack in book.stacks %}
diff --git a/app/templates/show_books_grid.html b/app/templates/show_books_grid.html
index 4384ee8..cc2c2f3 100644
--- a/app/templates/show_books_grid.html
+++ b/app/templates/show_books_grid.html
@@ -38,7 +38,7 @@
 <p>
 <tbody>
 <th>
-{{ book.title }}</th>
+{{ book.title }} ({{ book.year_published or '–' }})</th>
 <br>
 <span style = "font-size: 14px;">
 {% for author in  book.authors %}
diff --git a/app/views.py b/app/views.py
index ec86fd7..1cf4a11 100755
--- a/app/views.py
+++ b/app/views.py
@@ -387,11 +387,6 @@ def show_books():
 
     if request.method == 'POST':
         newmsg = 'searched for: ' + search.search.data
-        # message = search.search.data
-        # newmessage = Chat(message)
-        # db.session.add(newmessage)
-        # db.session.commit()
-         # Send search to socket chat
         socketio.emit('channel-' + str(1), {
         'username': 'Search form',
         'text': search.search.data,
@@ -410,7 +405,7 @@ def show_books():
 @app.route('/search/<searchtype>/<viewby>/<query>', methods=['POST', 'GET'])
 def search_results(searchtype, query, viewby):
     search = SearchForm(request.form, search=query)
-    random_order=Book.query.order_by(func.random()).limit(14)
+    random_order=Book.query.all()
     results=Book.query.filter(Book.title.contains(query)).order_by(Book.title)
     viewby = view[-1]
 
@@ -436,8 +431,9 @@ def search_results(searchtype, query, viewby):
         results=results.union(db.session.query(Book).join(Book.stacks).filter(Stack.stack_description.contains(query))).order_by(Book.title)
 
     if results.count() == 0:
+        books = Book.query.filter(Book.file.like('potential.pdf'))
         upload_form = UploadForm(title= query, author='')
-        return render_template('red_link.html', form=upload_form, title=query)
+        return render_template('red_link.html', form=upload_form, title=query, books=books)
 
     count = results.count()
     whole = Book.query.count()

From 2bc81e7d59c8ef0834a75175c004bd7f5604ff7c Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Sat, 9 Jun 2018 22:05:47 +0200
Subject: [PATCH 17/27] added message option into book database, upload form,
 edit form

---
 app/forms.py                        |  2 ++
 app/models.py                       |  5 +++-
 app/static/css/style.css            | 41 +++++++++++++++++++++++++++--
 app/static/js/app.js                | 26 ++++++++++++++++++
 app/templates/add_book.html         |  4 +++
 app/templates/edit_book_detail.html | 19 +++++++------
 app/templates/show_book_detail.html | 21 ++++++++++-----
 app/views.py                        | 14 +++-------
 import_csv.py                       |  2 +-
 9 files changed, 105 insertions(+), 29 deletions(-)

diff --git a/app/forms.py b/app/forms.py
index f1704ab..6089ca9 100755
--- a/app/forms.py
+++ b/app/forms.py
@@ -19,6 +19,7 @@ class UploadForm(FlaskForm):
     file = FileField()
     upload = SubmitField(label='Upload')
     wish = SubmitField(label='''I don't have the file, but wish I did.''')
+    message = StringField('message', default=None)
 
 class EditForm(FlaskForm):
     title = StringField('title', validators=[InputRequired()])
@@ -26,6 +27,7 @@ class EditForm(FlaskForm):
     category = StringField('category', validators=[InputRequired()])
     year_published = StringField('year published', [validators.Length(max=4)],default=None)
     file = FileField()
+    message = StringField('message')
 
 class ChatForm(FlaskForm):
     message = StringField('message', validators=[InputRequired()])
diff --git a/app/models.py b/app/models.py
index dd80db8..2f6f119 100755
--- a/app/models.py
+++ b/app/models.py
@@ -33,8 +33,10 @@ class Book(db.Model):
     backref=db.backref('books', lazy=True))
     scapeX = db.Column(db.Numeric(10,2))
     scapeY = db.Column(db.Numeric(10,2))
+    message = db.Column(db.String(1000))
+
 
-    def __init__(self, title, file, cover, fileformat, category, year_published):
+    def __init__(self, title, file, cover, fileformat, category, year_published, message):
         self.title = title
         self.file = file
         self.cover = cover
@@ -43,6 +45,7 @@ class Book(db.Model):
         self.year_published = year_published
         self.scapeX = 0
         self.scapeY = 0
+        self.message = message
 
 
     def __repr__(self):
diff --git a/app/static/css/style.css b/app/static/css/style.css
index 1753ba4..2ea3389 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -82,7 +82,6 @@ border-spacing:0; /* Removes the cell spacing via CSS */
 .library_table th{
 font-size: 20px;
 cursor: pointer;
-background-color: #fafafa;
 }
 
 th.headerSortUp{
@@ -352,7 +351,7 @@ box-sizing: border-box;
   display: grid;
   grid-template-columns: 1fr 1fr 1fr 1fr;
   grid-gap: 2px;
-  align-items: center;
+  align-items: top;
   justify-items: center;
 }
 }
@@ -374,3 +373,41 @@ box-sizing: border-box;
 .gridbox:hover{
   opacity: 0.5;
 }
+
+/* The Modal (background) */
+.modal {
+    display: none; /* Hidden by default */
+    position: fixed; /* Stay in place */
+    z-index: 1; /* Sit on top */
+    left: 0;
+    top: 0;
+    width: 100%; /* Full width */
+    height: 100%; /* Full height */
+    overflow: auto; /* Enable scroll if needed */
+    background-color: rgb(0,0,0); /* Fallback color */
+    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+}
+
+/* Modal Content/Box */
+.modal-content {
+    background-color: #fefefe;
+    margin: 15% auto; /* 15% from the top and centered */
+    padding: 20px;
+    border: 1px solid #888;
+    width: 40%; /* Could be more or less, depending on screen size */
+}
+
+/* The Close Button */
+.close {
+    color: red;
+    float: right;
+    font-size: 28px;
+    font-weight: bold;
+}
+
+.close:hover,
+.close:focus {
+    color: black;
+    text-decoration: none;
+    cursor: pointer;
+}
diff --git a/app/static/js/app.js b/app/static/js/app.js
index 460c9ee..55d72bb 100755
--- a/app/static/js/app.js
+++ b/app/static/js/app.js
@@ -253,3 +253,29 @@ $('#search').on("input", function() {
   });
 
 });
+
+// Get the modal
+var modal = document.getElementById('myModal');
+
+// Get the button that opens the modal
+var btn = document.getElementById("myBtn");
+
+// Get the <span> element that closes the modal
+var span = document.getElementsByClassName("close")[0];
+
+// When the user clicks on the button, open the modal 
+btn.onclick = function() {
+    modal.style.display = "block";
+}
+
+// When the user clicks on <span> (x), close the modal
+span.onclick = function() {
+    modal.style.display = "none";
+}
+
+// When the user clicks anywhere outside of the modal, close it
+window.onclick = function(event) {
+    if (event.target == modal) {
+        modal.style.display = "none";
+    }
+}
diff --git a/app/templates/add_book.html b/app/templates/add_book.html
index b9dff17..35c5c6b 100755
--- a/app/templates/add_book.html
+++ b/app/templates/add_book.html
@@ -41,6 +41,10 @@
 <br>
   Year published: {{ form.year_published(size=8, class="form-control") }}
 <br>
+<br>
+<div style="width: 50%">
+  Add a message for future readers: {{ form.message(size=150, class="form-control") }}
+<br></div>
 <br>
     {{ form.file }}
     {{ form.upload }}
diff --git a/app/templates/edit_book_detail.html b/app/templates/edit_book_detail.html
index 4299e95..2fa5268 100755
--- a/app/templates/edit_book_detail.html
+++ b/app/templates/edit_book_detail.html
@@ -31,19 +31,22 @@
             {% endfor %}
         </table>
     </div><br>
-    <div class="form-group">
-    {{ form.category.label }} {{ form.category(size=20, 
+    <div class="form-group" style="padding-bottom: 10px;">
+    Category: {{ form.category(size=20, 
     class="form-control") }}
-  </div><br>
-  <div class="form-group">
-  {{ form.year_published.label }} {{ form.year_published(size=4, class="form-control") }}
+  </div>
+  <div class="form-group" style="padding-bottom: 10px;">
+  Year published: {{ form.year_published(size=8, class="form-control") }}
 </div>
-<div class="form-group">
+<div class="form-group" style="padding-bottom: 10px;">
   Current file: {{ book.file }}
 </div>
-<div class="form-group">
-
+<div class="form-group" style="padding-bottom: 10px;">
   Upload new file: {{form.file}} 
+</div>
+<div class="form-group" style="padding-bottom: 10px;">
+
+  If uploading, write a new message: {{form.message(size=150, class="form-control") }} 
 
 </div>
     <br>
diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index a8b29d3..79252d3 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -16,17 +16,26 @@
 
         <p>Included in stack(s): <ul>{% for stack in book.stacks %}
           <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>
-            <p style="font-size: 10px;"><a href='{{url_for('remove_from_stack', stackid=stack.id, bookid=book.id)}}'> Remove from stack</a></p>
+            <p style="font-size: 10px;"><a href="{{url_for('remove_from_stack', stackid=stack.id, bookid=book.id)}}"> Remove from stack</a></p>
 
 
              {% endfor %}</ul></p>
 
-  <a href="../uploads/{{ book.file }}">download {{ book.fileformat }}</a>
-  <br>
-  <br>
-    <a href="{{ url_for('edit_book_by_id', id=book.id )}}">edit</a>
+  <button id="myBtn" style= "width: 180px; font-size: 10pt;"><a> Download this {{ book.fileformat }}</a></button>
+  <button style= "font-size: 10pt;"> <a href="{{ url_for('edit_book_by_id', id=book.id )}}">edit</a></button>
+  <button style= "font-size: 10pt;"> <a href="{{ url_for('remove_book_by_id', id=book.id)}}">delete</a></button>
+
+<div id="myModal" class="modal">
+  <div class="modal-content">
+    <span class="close">&times;</span>
+    <h3>A message from the uploading librarian:</h3>
+    <p style="font-style: italic;">"{{book.message or 'Happy reading.'}}" </p>
     <br>
-    <a href="{{ url_for('remove_book_by_id', id=book.id)}}">delete</a>
+  <h4><a href="../uploads/{{ book.file }}"> >>>> Link to file <<<<</h4>
+  </div></div>
 
 </div>
+
 {% endblock %}
+
+
diff --git a/app/views.py b/app/views.py
index 1cf4a11..199b264 100755
--- a/app/views.py
+++ b/app/views.py
@@ -129,19 +129,10 @@ def remove_book_by_id(id):
     flash("%s deleted from library" % (title))
     return redirect(url_for('show_books'))
 
-@app.route('/potential')
-def htmlpdf():
-    paragraphs= ['test title']
-    template = 'app/templates/potential_pdf.html'
-    html_string = render_template('potential_pdf.html', paragraphs=paragraphs)
-    html = HTML(string=html_string)
-    html.write_pdf(target='app/uploads/potential2.pdf');
-    return render_template('potential_pdf.html', paragraphs=paragraphs)
-
 @app.route('/books/<int:id>/edit', methods=['POST', 'GET'])
 def edit_book_by_id(id):
     book_to_edit = Book.query.filter_by(id=id).first()
-    user_form = EditForm(title = book_to_edit.title, author =book_to_edit.authors, category = book_to_edit.category, year_published= book_to_edit.year_published)
+    user_form = EditForm(title = book_to_edit.title, author =book_to_edit.authors, category = book_to_edit.category, year_published= book_to_edit.year_published, message= book_to_edit.message)
 
     if request.method == 'POST':
         if user_form.validate_on_submit():
@@ -204,6 +195,7 @@ def add_book():
             title = upload_form.title.data
             authors = upload_form.author.data
             category = upload_form.category.data
+            message = upload_form.message.data
             year_published = upload_form.year_published.data
             if year_published=="":
                 year_published = None
@@ -248,7 +240,7 @@ def add_book():
                 html.write_pdf(target='app/uploads/potential.pdf');
                 print ('potential_pdf')
 
-            book = Book(title, filename, cover, file_extension, category,year_published)
+            book = Book(title, filename, cover, file_extension, category, year_published, message)
             db.session.add(book)
             for author in authors:
                 author_name = author.get("author_name")
diff --git a/import_csv.py b/import_csv.py
index b43447d..bca2b12 100644
--- a/import_csv.py
+++ b/import_csv.py
@@ -20,7 +20,7 @@ with open(args.csv) as f:
             print ('get_cover', fullpath, name)
             cover = get_cover(fullpath, name)
 
-        book = Book(row['Title'], row['Filename'], cover, row['Format'], row['Category'], None)
+        book = Book(row['Title'], row['Filename'], cover, row['Format'], row['Category'], None, '')
 
         db.session.add(book)
         authors = row['Author'].split(',')

From d769aba95ff93921d0c63a7ed44f2f7975162ebb Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Sun, 10 Jun 2018 11:12:59 +0200
Subject: [PATCH 18/27] ignored some files

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 004b085..1651a7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,7 @@ __pycache__/
 app/uploads/**
 !app/uploads/cover
 app/mydatabase.db
+pyrqlite/
+whoosh/
+sqlalchemy-rqlite/
+rqlite*

From 22494aadd27c097c1ef207848b05e68ad0a18ecb Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Sun, 10 Jun 2018 11:16:47 +0200
Subject: [PATCH 19/27] styling buttons

---
 app/static/css/style.css            | 10 +++++-----
 app/templates/show_book_detail.html | 18 ++++++++++--------
 app/views.py                        |  2 ++
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index 2ea3389..a7f6bbf 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -385,21 +385,21 @@ box-sizing: border-box;
     height: 100%; /* Full height */
     overflow: auto; /* Enable scroll if needed */
     background-color: rgb(0,0,0); /* Fallback color */
-    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+    background-color: rgba(0,0,0,0.5); /* Black w/ opacity */
 }
 
 /* Modal Content/Box */
 .modal-content {
-    background-color: #fefefe;
+    background-color: yellow;
     margin: 15% auto; /* 15% from the top and centered */
-    padding: 20px;
+    padding: 15px;
     border: 1px solid #888;
     width: 40%; /* Could be more or less, depending on screen size */
 }
 
 /* The Close Button */
 .close {
-    color: red;
+    color: grey;
     float: right;
     font-size: 28px;
     font-weight: bold;
@@ -407,7 +407,7 @@ box-sizing: border-box;
 
 .close:hover,
 .close:focus {
-    color: black;
+    color: red;
     text-decoration: none;
     cursor: pointer;
 }
diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index 79252d3..ea6b6b9 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -21,18 +21,20 @@
 
              {% endfor %}</ul></p>
 
-  <button id="myBtn" style= "width: 180px; font-size: 10pt;"><a> Download this {{ book.fileformat }}</a></button>
-  <button style= "font-size: 10pt;"> <a href="{{ url_for('edit_book_by_id', id=book.id )}}">edit</a></button>
-  <button style= "font-size: 10pt;"> <a href="{{ url_for('remove_book_by_id', id=book.id)}}">delete</a></button>
-
+{% if book.file %}
+<button id="myBtn" style= "width: 180px; font-size: 10pt;"><a> Download this {{ book.fileformat }}</a></button>
 <div id="myModal" class="modal">
   <div class="modal-content">
     <span class="close">&times;</span>
     <h3>A message from the uploading librarian:</h3>
-    <p style="font-style: italic;">"{{book.message or 'Happy reading.'}}" </p>
-    <br>
-  <h4><a href="../uploads/{{ book.file }}"> >>>> Link to file <<<<</h4>
-  </div></div>
+    <span style="font-style: italic;">"{{book.message or 'Happy reading.'}}" </span><br>
+    <h4><a href="../uploads/{{ book.file }}"> >>>> Link to file <<<<</h4></a></div>
+  </div>
+{% else %} 
+{% endif %}
+
+  <button style= "font-size: 10pt;"> <a href="{{ url_for('edit_book_by_id', id=book.id )}}">edit</a></button>
+  <button style= "font-size: 10pt;"> <a href="{{ url_for('remove_book_by_id', id=book.id)}}">delete</a></button>
 
 </div>
 
diff --git a/app/views.py b/app/views.py
index 199b264..27cb5fa 100755
--- a/app/views.py
+++ b/app/views.py
@@ -141,12 +141,14 @@ def edit_book_by_id(id):
             input_authors = user_form.author.data
             category = user_form.category.data
             year_published = user_form.year_published.data
+            message = user_form.message.data
             if year_published=="":
                 year_published = None
             book = Book.query.filter_by(id=id).first()
             book.title = title
             book.category = category
             book.year_published = year_published
+            book.message = message
 
             #authors update
             book.authors.clear()

From b8a6c86a13502c961e60a217077a15cff3c408ce Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Sun, 10 Jun 2018 12:29:09 +0200
Subject: [PATCH 20/27] reverse query results and some new links on
 show_book_detail

---
 app/templates/results.html          |  5 +++--
 app/templates/results_grid.html     |  5 ++---
 app/templates/show_book_detail.html |  7 ++++++-
 app/views.py                        | 24 ++++++++++++++++++------
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/app/templates/results.html b/app/templates/results.html
index 8e88967..296dc8e 100644
--- a/app/templates/results.html
+++ b/app/templates/results.html
@@ -31,7 +31,7 @@
     {% endif %}
   {% endwith %}
 
-  <table class="library_table" id="table" style="width:100%">
+  <table class="library_table" id="table" style="width:100%; padding-bottom:60px;">
     <tr id="header">
       <th width="70px;">Cover</th>
       <th>Title</th>
@@ -68,9 +68,10 @@
   </table>
 
 </div>
+<br>
 
 <div class="container" style= "border-top: dashed; border-width: 1px;" >
-  <h2> Other books </h2>
+  <h2> More books </h2>
 
   <table class="library_table" id="table" style="width:100%">
     <tr id="header">
diff --git a/app/templates/results_grid.html b/app/templates/results_grid.html
index d043c4a..228f7db 100644
--- a/app/templates/results_grid.html
+++ b/app/templates/results_grid.html
@@ -30,7 +30,7 @@
       </div>
     {% endif %}
   {% endwith %}
-<div class="grid" >
+<div class="grid" style="padding-bottom:60px;">
 
         {% for book in books|sort(attribute='title', reverse = False) %}
 
@@ -52,9 +52,8 @@
   {% endfor %}
 </div>
 
-
 <div class="container" style= "border-top: dashed; border-width: 1px;">
-  <h2> Other books </h2>
+  <h2> More books </h2>
 
 <div class="grid">
 
diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index ea6b6b9..e7a0e77 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -35,7 +35,12 @@
 
   <button style= "font-size: 10pt;"> <a href="{{ url_for('edit_book_by_id', id=book.id )}}">edit</a></button>
   <button style= "font-size: 10pt;"> <a href="{{ url_for('remove_book_by_id', id=book.id)}}">delete</a></button>
-
+<br><br>
+<hr>
+{% if previousbook %} 
+<a href="{{ url_for('show_book_by_id', id=previousbook.id )}}" style="font-size: 9pt;"> < see the previous book added to XPPL: &nbsp;<i>{{ previousbook.title |truncate(40,True,'...') }} </i></a> {% endif %}
+{% if nextbook %} 
+<a href="{{ url_for('show_book_by_id', id=nextbook.id )}}" style="float:right; font-size: 9pt;"> see the next book added to XPPL: &nbsp;<i>{{ nextbook.title|truncate(40,True,'...')}} </i>> </a>{% endif %}
 </div>
 
 {% endblock %}
diff --git a/app/views.py b/app/views.py
index 27cb5fa..2a97058 100755
--- a/app/views.py
+++ b/app/views.py
@@ -9,6 +9,7 @@ from app import app, db, socketio, DOMAIN
 from flask import Flask, Response, render_template, request, redirect, url_for, flash, send_from_directory, jsonify, abort
 import json
 from  sqlalchemy.sql.expression import func, select
+from sqlalchemy.sql import except_
 from app.forms import UploadForm, EditForm, SearchForm, ChatForm, StackForm, AddtoStackForm, EditStackForm
 from app.models import Book, BookSchema, Author, AuthorSchema, Stack, StackSchema, UserIns, Chat, ChatSchema, Potential
 from app.cover import get_cover
@@ -105,6 +106,15 @@ def show_books_grid():
 @app.route('/books/<int:id>')
 def show_book_by_id(id):
     book = Book.query.get(id)
+    previousbook = Book.query.filter_by(id=id - 1).first()
+    nextbook = Book.query.filter_by(id=id + 1).first()
+    allbooks = db.session.query(Book).all()
+    edge = len(allbooks)
+    if id == 1:
+        previousbook = None
+    if id == edge:
+        nextbook = None
+
     userin = UserIns.query.filter_by(title="lastViewed").first()
     if userin != None:
         userin.info = book.title
@@ -116,7 +126,7 @@ def show_book_by_id(id):
     if not book:
         return render_template('red_link.html', id=id)
     else:
-        return render_template('show_book_detail.html', book=book)
+        return render_template('show_book_detail.html', book=book, previousbook = previousbook, nextbook = nextbook)
 
 
 @app.route('/books/<int:id>/delete', methods=['POST', 'GET'])
@@ -399,8 +409,8 @@ def show_books():
 @app.route('/search/<searchtype>/<viewby>/<query>', methods=['POST', 'GET'])
 def search_results(searchtype, query, viewby):
     search = SearchForm(request.form, search=query)
-    random_order=Book.query.all()
     results=Book.query.filter(Book.title.contains(query)).order_by(Book.title)
+    allbooks = set(Book.query.all())
     viewby = view[-1]
 
     if searchtype == 'Title':
@@ -432,14 +442,16 @@ def search_results(searchtype, query, viewby):
     count = results.count()
     whole = Book.query.count()
     percentage = float(count / whole * 100)
+    fbooks = set(results)
+    books_all = allbooks - fbooks
 
     if search.listview.data:
         view.append('1')
-        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)
+        return render_template('results.html', books=results, form=search, query=query, books_all=books_all, searchtype=search.select.data, count = count, whole = whole, percentage = percentage)
 
     if search.grid.data:
         view.append('2')
-        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)
+        return render_template('results_grid.html', books=results, form=search, query=query, books_all=books_all, searchtype=search.select.data, count = count, whole = whole, percentage = percentage)
 
     if request.method == 'POST':
         newmsg = 'searched for: ' + search.search.data
@@ -464,10 +476,10 @@ def search_results(searchtype, query, viewby):
             return redirect((url_for('search_results', searchtype=search.select.data, query=search.search.data, viewby=viewby)))
 
     if viewby == '2':
-        return render_template('results_grid.html', form=search, books=results, books_all=random_order, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage)
+        return render_template('results_grid.html', form=search, books=results, books_all=books_all, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage)
 
     else:
-        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)
+        return render_template('results.html', form=search, books=results, books_all=books_all, searchtype=search.select.data, query=query, count = count, whole = whole, percentage = percentage)
 
 
 # ## Search - autocomplete

From 93bf8a6b938f9a054c4bf39ef717c7d20d7cfdca Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Sun, 10 Jun 2018 17:41:44 +0200
Subject: [PATCH 21/27] extended info on add-book page

---
 app/static/css/style.css            |  3 ++
 app/templates/add_book.html         | 48 +++++++++++++++++++++++++----
 app/templates/show_book_detail.html | 39 +++++++++++++++++------
 app/views.py                        | 13 +++++++-
 4 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index a7f6bbf..6db020c 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -83,6 +83,9 @@ border-spacing:0; /* Removes the cell spacing via CSS */
 font-size: 20px;
 cursor: pointer;
 }
+.library_table td{
+padding: 5px;
+}
 
 th.headerSortUp{
 background-color: #E8E8E8!important;
diff --git a/app/templates/add_book.html b/app/templates/add_book.html
index 35c5c6b..cf5dac6 100755
--- a/app/templates/add_book.html
+++ b/app/templates/add_book.html
@@ -1,7 +1,9 @@
 {% extends 'base.html' %}
 
 {% block main %}
-<div class="container">
+<div class="container" style="float: left; width:50%;">
+<div style="width: 98%; border-right: dashed; border-width: 1px;">
+
   <h1 class="page-header">Add Book</h1>
   {% with messages = get_flashed_messages() %}
     {% if messages %}
@@ -33,25 +35,59 @@
             {% endfor %}
         </table>
     </div>
-</div>
 <br>
-<div style="padding-left:10px;">
   Category: {{ form.category(size=27, class="form-control") }}
 <br>
 <br>
   Year published: {{ form.year_published(size=8, class="form-control") }}
 <br>
 <br>
-<div style="width: 50%">
-  Add a message for future readers: {{ form.message(size=150, class="form-control") }}
+<div style="width: 40%;">
+  Add a message for future readers: {{ form.message(size=90, class="form-control") }}
 <br></div>
 <br>
     {{ form.file }}
     {{ form.upload }}
     {{ form.wish }}
     </div>
-
 </form>
+</div>
+<div>
+<table class="library_table" id="table" style="width:30% padding:10px;" >
+    <thead>
+    <tr id="header" style="height:15px;">
+      <th style="width: 10%;"> <h5> Currently in the library </h5></th>
+      <th style="width: 20%;"></th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td> Titles: </td>
+      <td> {{ books_all }}</td>
+    </tr>
+    <tr>
+      <td> Authors: </td>
+      <td> {{ authors_all }} </td>
+    </tr>
+      <tr>
+      <td> Categories: </td>
+      <td> {{ categories|replace('[', '')|replace(']', '') }}</td>
+    </tr>
+    <tr>
+      <td> Stacks: </td>
+      <td> {{ stacks_all|replace('[', '')|replace(']', '') }}</td>
+    </tr>
+    <tr>
+      <td> From the years: </td>
+      <td> {{earliest}} –– {{latest}}</td>
+    </tr>
+    <tr>
+      <td> Gaps in the collection: </td>
+      <td> At least {{ books_potential }} potential books missing</td>
+    </tr>
 
+</tbody>
+  </table>
+</div>
 </div>
 {% endblock %}
diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index e7a0e77..19e8c64 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -5,21 +5,40 @@
   <h1 class="header">{{ book.title }}</h1>
  <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="180" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
 
-  <p>Year published: {{ book.year_published }}</p>
-  <p>Author(s): <ul>{% for author in book.authors %}
 
-              <li><a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a>  </li>
+<table class="library_table" id="table" style="width:50%; padding-bottom: 20px;">
+    <thead>
+    <tr id="header">
+      <th style="width: 150px;"></th>
+      <th style="width: 500px;"></th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>Year published: </td>
+      <td>{{ book.year_published or '––'}}</td>
+    </tr>
+    <tr>
+      <td> Author(s): </td>
+      <td>{% for author in book.authors %}
 
-        {% endfor %}</ul></p>
+              <a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a><br>
 
-<p>Category: {{ book.category }}</p>
-
-        <p>Included in stack(s): <ul>{% for stack in book.stacks %}
+        {% endfor %}</td>
+    </tr>
+    <tr>
+      <td>Category: </td>
+      <td>{{ book.category }}</td>
+    </tr>
+  <tr>
+      <td>Included in stack(s): </td>
+      <td>{% for stack in book.stacks %}
           <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>
-            <p style="font-size: 10px;"><a href="{{url_for('remove_from_stack', stackid=stack.id, bookid=book.id)}}"> Remove from stack</a></p>
-
+            <p style="font-size: 10px;"><a href="{{url_for('remove_from_stack', stackid=stack.id, bookid=book.id)}}"> – Remove from stack</a>{% endfor %}</td>
+    </tr>
 
-             {% endfor %}</ul></p>
+</tbody>
+  </table>
 
 {% if book.file %}
 <button id="myBtn" style= "width: 180px; font-size: 10pt;"><a> Download this {{ book.fileformat }}</a></button>
diff --git a/app/views.py b/app/views.py
index 2a97058..a55aa8a 100755
--- a/app/views.py
+++ b/app/views.py
@@ -200,6 +200,17 @@ def edit_book_by_id(id):
 @app.route('/add-book', methods=['POST', 'GET'])
 def add_book():
     upload_form = UploadForm()
+    allbooks = db.session.query(Book).all()
+    books_all = len(allbooks)
+    allauthors = db.session.query(Author).all()
+    authors_all = len(allauthors)
+    stacks_all = [s.stack_name for s in db.session.query(Stack.stack_name)]
+    categories = [r.category for r in db.session.query(Book.category).distinct()]
+    allpotential = db.session.query(Book).filter(Book.file.contains('potential.pdf')).all()
+    books_potential = len(allpotential)
+    earliest = db.session.query(func.min(Book.year_published)).scalar()
+    latest = db.session.query(func.max(Book.year_published)).scalar()
+
 
     if request.method == 'POST':
         if upload_form.validate_on_submit():
@@ -268,7 +279,7 @@ def add_book():
             return redirect(url_for('show_books'))
 
     flash_errors(upload_form)
-    return render_template('add_book.html', form=upload_form)
+    return render_template('add_book.html', form=upload_form, books_all=books_all, authors_all=authors_all, categories=categories, stacks_all=stacks_all, books_potential=books_potential, earliest=earliest, latest=latest)
 
 
 # Flash errors from the form if validation fails

From 2fb4013c7f0bf32a17df5fff32241d185648c90a Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Sun, 10 Jun 2018 19:33:50 +0200
Subject: [PATCH 22/27] added stack author

---
 app/forms.py                             | 5 +----
 app/models.py                            | 7 +++++--
 app/static/css/style.css                 | 4 ++++
 app/templates/add_stack.html             | 4 ++--
 app/templates/show_books.html            | 2 +-
 app/templates/show_stack_detail.html     | 6 ++++++
 app/templates/show_stack_detail_tab.html | 7 +++++++
 app/templates/show_stacks.html           | 4 ++--
 app/views.py                             | 5 +++--
 9 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/app/forms.py b/app/forms.py
index 6089ca9..ba1a8dd 100755
--- a/app/forms.py
+++ b/app/forms.py
@@ -36,6 +36,7 @@ class ChatForm(FlaskForm):
 class StackForm(FlaskForm):
     stack_name = StringField('Stack', validators=[InputRequired()])
     stack_description = StringField('Description', validators=[InputRequired()])
+    stack_author = StringField('Who made this', validators=[InputRequired()])
     create = SubmitField(label='Create')
 
 class AddtoStackForm(FlaskForm):
@@ -56,7 +57,3 @@ class SearchForm(FlaskForm):
     grid = SubmitField('Grid')
     listview = SubmitField('List')
     randomize = SubmitField('Order differently')
-
-
-
-
diff --git a/app/models.py b/app/models.py
index 2f6f119..6928cab 100755
--- a/app/models.py
+++ b/app/models.py
@@ -91,11 +91,14 @@ class Stack(db.Model):
     __tablename__ = 'stacks'
     id = db.Column(db.Integer, primary_key = True)
     stack_name = db.Column(db.String(50))
-    stack_description = db.Column(db.String(500))
+    stack_description = db.Column(db.String(1000))
+    stack_author = db.Column(db.String(255))
 
-    def __init__(self, stack_name, stack_description):
+
+    def __init__(self, stack_name, stack_description, stack_author):
         self.stack_name = stack_name
         self.stack_description = stack_description
+        self.stack_author = stack_author
 
     def __repr__(self):
         return '<Stack %r>' % self.stack_name
diff --git a/app/static/css/style.css b/app/static/css/style.css
index 6db020c..5573e85 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -205,7 +205,11 @@ font-size: 12px;
 .ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 0; background-color: yellow !important; list-style-type: none;}
 .ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: left; width: 50em; font-size: 12px; list-style-type: none;}
 
+#creator{
+  font-size: 12px;
+  color: grey;
 
+}
 
 #newstext{
   width: 100%;
diff --git a/app/templates/add_stack.html b/app/templates/add_stack.html
index 0fe1e5f..c960eb3 100644
--- a/app/templates/add_stack.html
+++ b/app/templates/add_stack.html
@@ -16,14 +16,14 @@
         </ul>
       </div>
     {% endif %}
-  {% endwith %} 
+  {% endwith %}
 
   <form method="POST" action="{{ url_for('add_stack') }}" enctype=multipart/form-data>
   {{form.hidden_tag()}}
 <br>
 {{ render_field(form.stack_name)}}
 {{ render_field(form.stack_description)}}
-
+{{ render_field(form.stack_author)}}
 <button type="submit" class='button'>Create</button>
 
 
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index fc4c1da..8ab4350 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -63,7 +63,7 @@
 
               <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">  </a>
 
-                {{ stack.stack_name }}
+                {{ stack.stack_name }} 
                   </li>
 
       {% endfor %}
diff --git a/app/templates/show_stack_detail.html b/app/templates/show_stack_detail.html
index 0e2d293..f55d6a2 100644
--- a/app/templates/show_stack_detail.html
+++ b/app/templates/show_stack_detail.html
@@ -6,6 +6,12 @@
   <h1 class="header">{{ stack.stack_name }}</h1>
 
   <p>{{ stack.stack_description }} </p>
+  <p id='creator'>Created by: 
+{%  if stack.stack_author == None %} anon</p>
+{% else %}
+
+    {{ stack.stack_author }}
+{% endif %}
   <h2>Books in this stack:</h2>
 <p>
   {% for book in stack.books %}
diff --git a/app/templates/show_stack_detail_tab.html b/app/templates/show_stack_detail_tab.html
index afa9b30..cf32045 100644
--- a/app/templates/show_stack_detail_tab.html
+++ b/app/templates/show_stack_detail_tab.html
@@ -10,6 +10,13 @@
 
 
   <p>{{ stack.stack_description }} </p>
+  <p id='creator'>Created by:
+{%  if stack.stack_author == None %} anon</p>
+{% else %}
+
+    {{ stack.stack_author }}
+{% endif %}
+
 
   <p style='font-weight:bold;'>Books in this stack: {% for book in stack.books %}
 
diff --git a/app/templates/show_stacks.html b/app/templates/show_stacks.html
index f1388a5..705d2f0 100644
--- a/app/templates/show_stacks.html
+++ b/app/templates/show_stacks.html
@@ -4,8 +4,6 @@
 <div class="container">
   <h1 class="page-header">Stacks</h1>
 <p>These are all the stacks that have been built so far.</p>
-<p><a href= {{ url_for('add_stack') }}>Add a new stack</a></p>
-
 
 <table style="width:100%">
 
@@ -26,6 +24,8 @@
 
 </div>
 <br>
+<p><a href= {{ url_for('add_stack') }}>Add a new stack</a></p>
+<br>
 <br>
 
 
diff --git a/app/views.py b/app/views.py
index a55aa8a..1ef7483 100755
--- a/app/views.py
+++ b/app/views.py
@@ -321,9 +321,10 @@ def add_stack():
     if form.validate_on_submit():
         stack_name = form.stack_name.data
         stack_description = form.stack_description.data
-        stack = Stack(stack_name, stack_description)
+        stack_author = form.stack_author.data
+        stack = Stack(stack_name, stack_description, stack_author)
         if form.stack_name.data:
-            stack = Stack(stack_name, stack_description)
+            stack = Stack(stack_name, stack_description, stack_author)
             db.session.add(stack)
         stacks = db.session.query(Stack).all()
         return redirect(url_for('show_stacks'))

From 8fa8200c49007ab76e2576ef382cf5b7369dac47 Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Mon, 11 Jun 2018 12:00:48 +0200
Subject: [PATCH 23/27] new upload form questions

---
 app/forms.py                        | 15 ++++++++
 app/models.py                       | 13 ++++++-
 app/templates/add_book.html         | 59 ++++++++++++++++++++++++-----
 app/templates/show_book_detail.html | 57 ++++++++++++++++++++--------
 app/views.py                        |  8 +++-
 import_csv.py                       |  2 +-
 6 files changed, 126 insertions(+), 28 deletions(-)

diff --git a/app/forms.py b/app/forms.py
index 6089ca9..f314919 100755
--- a/app/forms.py
+++ b/app/forms.py
@@ -5,6 +5,8 @@ from wtforms import FieldList
 from wtforms import Form as NoCsrfForm
 from wtforms.fields import StringField, FormField, SubmitField, SelectField, RadioField
 from app.models import Book, BookSchema, Author, Stack, StackSchema
+from wtforms.fields.html5 import DecimalRangeField
+
 
 # - - - Forms - - -
 class AuthorForm(NoCsrfForm):
@@ -20,6 +22,19 @@ class UploadForm(FlaskForm):
     upload = SubmitField(label='Upload')
     wish = SubmitField(label='''I don't have the file, but wish I did.''')
     message = StringField('message', default=None)
+    sameness = DecimalRangeField('sameness', default=0)
+    diversity = DecimalRangeField('diversity', default=0)
+    gender = DecimalRangeField('gender', default=50)
+    time = StringField('time', [validators.Length(max=5)],default=None)
+    choices = [('Student', 'Student'),
+                ('Librarian', 'Librarian'),
+               ('Pirate', 'Pirate'),
+               ('Teacher', 'Teacher'),
+               ('Institution', 'Institution'),
+               ('All of the above', 'All of the above'),
+               ('None of the above', 'None of the above')]
+    who = SelectField('', choices=choices, default='Student')
+
 
 class EditForm(FlaskForm):
     title = StringField('title', validators=[InputRequired()])
diff --git a/app/models.py b/app/models.py
index 2f6f119..8bdc1c2 100755
--- a/app/models.py
+++ b/app/models.py
@@ -26,7 +26,6 @@ class Book(db.Model):
     category = db.Column(db.String(255))
     year_published = db.Column(db.Numeric(4,0))
     description = db.Column(db.String(2500))
-    html = db.Column(db.String(255))
     authors = db.relationship('Author', secondary=authors,cascade="delete", lazy='subquery',
         backref=db.backref('books', lazy=True),passive_deletes=True)
     stacks = db.relationship('Stack', secondary=stacks, lazy='subquery',
@@ -34,9 +33,14 @@ class Book(db.Model):
     scapeX = db.Column(db.Numeric(10,2))
     scapeY = db.Column(db.Numeric(10,2))
     message = db.Column(db.String(1000))
+    sameness = db.Column(db.Numeric())
+    diversity = db.Column(db.Numeric())
+    gender = db.Column(db.Numeric())
+    who = db.Column(db.String(255))
+    time = db.Column(db.Numeric())
 
 
-    def __init__(self, title, file, cover, fileformat, category, year_published, message):
+    def __init__(self, title, file, cover, fileformat, category, year_published, message, sameness, diversity, gender, who, time):
         self.title = title
         self.file = file
         self.cover = cover
@@ -46,6 +50,11 @@ class Book(db.Model):
         self.scapeX = 0
         self.scapeY = 0
         self.message = message
+        self.sameness = sameness
+        self.diversity = diversity
+        self.gender = gender
+        self.who = who
+        self.time = time
 
 
     def __repr__(self):
diff --git a/app/templates/add_book.html b/app/templates/add_book.html
index cf5dac6..6326174 100755
--- a/app/templates/add_book.html
+++ b/app/templates/add_book.html
@@ -1,6 +1,21 @@
 {% extends 'base.html' %}
 
 {% block main %}
+{% from "_formhelpers.html" import render_field %}
+
+<head>
+<script>
+function outputUpdate(sameness) {
+    document.querySelector('#selected-sameness').value = sameness;
+}
+function outputUpdate2(diversity) {
+    document.querySelector('#selected-diversity').value = diversity;
+}
+function outputUpdate3(gender) {
+    document.querySelector('#selected-gender').value = gender;
+}
+</script>
+</head>
 <div class="container" style="float: left; width:50%;">
 <div style="width: 98%; border-right: dashed; border-width: 1px;">
 
@@ -18,10 +33,10 @@
   {% endwith %}
   <form method="POST" action="{{ url_for('add_book') }}" enctype=multipart/form-data>
     {{ form.csrf_token }}
-    <div class="form-group">Title: {{ form.title (size=34, class="form-control") }}</div>
+    <div class="form-group">Title:* <br> {{ form.title (size=50, class="form-control") }}</div>
     <br>
     <div data-toggle="fieldset" id="phone-fieldset">
-         Author(s):  <button type="button" data-toggle="fieldset-add-row data-target="#phone-fieldset">+</button>
+         Author(s):*  <button type="button" data-toggle="fieldset-add-row data-target="#phone-fieldset">+</button>
         <table>
             <tr>
                 <th></th>
@@ -29,19 +44,43 @@
             </tr>
             {% for author in form.author %}
                 <tr data-toggle="fieldset-entry">
-                    <td>{{ author.author_name (size=40)}}</td>
+                    <td>{{ author.author_name (size=50)}}</td>
                     <td><button type="button" data-toggle="fieldset-remove-row" id="phone-{{loop.index0}}-remove">-</button></td>
                 </tr>
             {% endfor %}
         </table>
     </div>
 <br>
-  Category: {{ form.category(size=27, class="form-control") }}
-<br>
-<br>
-  Year published: {{ form.year_published(size=8, class="form-control") }}
-<br>
+  Category:* <br> {{ form.category(size=50, class="form-control") }} <br><br>
+  Year published: <br> {{ form.year_published(size=8, class="form-control") }} <br><br>
+
+How different is this item to the rest of the collection?
+Or is it more of the same? <br>
+{{ form.sameness(min=0, max=100, oninput="outputUpdate(value)") }} &nbsp;
+<span style="color: #d3d3d3;"><output for="sameness" id="selected-sameness">{{ form.sameness.data }} </output> % different</span>
+
+<br><hr align="left" style="width:96%;"><br>
+
+Check the bibliography. How diverse are the references in this book? <br>
+{{ form.diversity(min=0, max=100, oninput="outputUpdate2(value)") }} &nbsp;
+<span style="color: #d3d3d3;"><output for="diversity" id="selected-diversity">{{ form.diversity.data }} </output> % diverse</span>
+
+<br><hr align="left" style="width:96%;"><br>
+
+Check the writing. Who is speaking? Is the voice more often male or female? <br>
+{{ form.diversity(min=1, max=100, oninput="outputUpdate3(value)") }} &nbsp;
+<span style="color: #d3d3d3;"><output for="diversity" id="selected-gender">{{ form.gender.data }} </output> % female</span>
+
+<br><hr align="left" style="width:96%;"><br>
+Who are you? {{ render_field(form.who) }}
+
+<br><hr align="left" style="width:96%;"><br>
+How much time have you spent with this item?
+Include the time spent looking for it, and uploading it.<br>
+{{ form.time (size = 50, class="form-control")}} <span style="color: #d3d3d3;">hours</span>
 <br>
+<br><hr align="left" style="width:96%;"><br>
+
 <div style="width: 40%;">
   Add a message for future readers: {{ form.message(size=90, class="form-control") }}
 <br></div>
@@ -49,11 +88,12 @@
     {{ form.file }}
     {{ form.upload }}
     {{ form.wish }}
+
     </div>
 </form>
 </div>
 <div>
-<table class="library_table" id="table" style="width:30% padding:10px;" >
+<table class="library_table" id="table" style="width:30% padding:10px; padding-bottom: 400px;" >
     <thead>
     <tr id="header" style="height:15px;">
       <th style="width: 10%;"> <h5> Currently in the library </h5></th>
@@ -90,4 +130,5 @@
   </table>
 </div>
 </div>
+<clear>
 {% endblock %}
diff --git a/app/templates/show_book_detail.html b/app/templates/show_book_detail.html
index 19e8c64..54deecd 100755
--- a/app/templates/show_book_detail.html
+++ b/app/templates/show_book_detail.html
@@ -3,17 +3,17 @@
 {% block main %}
 <div class="container">
   <h1 class="header">{{ book.title }}</h1>
- <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="180" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';">
+<div style="float:right; padding-right: 140px;">
+ <img class="no_cover" id="{{ book.title }}" src="../uploads/cover/{{ book.cover }}" width="280px" onerror="if (this.src != '../uploads/cover/{{ book.cover }}') this.src = '../static/img/default_cover.gif';"></div>
 
-
-<table class="library_table" id="table" style="width:50%; padding-bottom: 20px;">
-    <thead>
-    <tr id="header">
-      <th style="width: 150px;"></th>
-      <th style="width: 500px;"></th>
-    </tr>
-    </thead>
-    <tbody>
+  <table class="library_table" id="table" style="width:50%; padding-bottom: 80px;">
+<thead>
+  <tr id="header">
+    <th style="width: 150px;"></th>
+    <th style="width: 300px;"></th>
+  </tr>
+</thead>
+  <tbody>
     <tr>
       <td>Year published: </td>
       <td>{{ book.year_published or '––'}}</td>
@@ -21,21 +21,47 @@
     <tr>
       <td> Author(s): </td>
       <td>{% for author in book.authors %}
-
-              <a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a><br>
-
-        {% endfor %}</td>
+        <a href="{{url_for('show_author_by_id', id=author.id)}}">{{ author.author_name }}</a><br>
+      {% endfor %}</td>
     </tr>
     <tr>
       <td>Category: </td>
       <td>{{ book.category }}</td>
     </tr>
-  <tr>
+    <tr>
       <td>Included in stack(s): </td>
       <td>{% for stack in book.stacks %}
           <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">{{ stack.stack_name }}</a>
             <p style="font-size: 10px;"><a href="{{url_for('remove_from_stack', stackid=stack.id, bookid=book.id)}}"> – Remove from stack</a>{% endfor %}</td>
     </tr>
+       <tr>
+      <td></td> 
+      <td></td>
+    </tr>
+   <tr>
+      <td style="font-style: italic;">Notes from uploader</td> 
+      <td></td>
+    </tr>
+    <tr>
+      <td>How different is this item to the rest of the collection?<br></td>
+      <td>{{ book.sameness or '?'}} % different</td>
+    </tr>
+    <tr>
+      <td>How diverse are the references in this book?<br></td>
+      <td>{{ book.diversity or '?' }} % diverse </td>
+    </tr>
+    <tr>
+      <td>Who is speaking?<br></td>
+      <td>{{ book.gender or '?' }} % female </td>
+    </tr>
+    <tr>
+      <td>Who is uploading<br></td>
+      <td>{{ book.who or '?' }} </td>
+    </tr>
+    <tr>
+      <td>How much time has been spent with this item?<br></td>
+      <td>{{ book.time or '?' }} </td>
+    </tr>
 
 </tbody>
   </table>
@@ -55,6 +81,7 @@
   <button style= "font-size: 10pt;"> <a href="{{ url_for('edit_book_by_id', id=book.id )}}">edit</a></button>
   <button style= "font-size: 10pt;"> <a href="{{ url_for('remove_book_by_id', id=book.id)}}">delete</a></button>
 <br><br>
+
 <hr>
 {% if previousbook %} 
 <a href="{{ url_for('show_book_by_id', id=previousbook.id )}}" style="font-size: 9pt;"> < see the previous book added to XPPL: &nbsp;<i>{{ previousbook.title |truncate(40,True,'...') }} </i></a> {% endif %}
diff --git a/app/views.py b/app/views.py
index a55aa8a..424abff 100755
--- a/app/views.py
+++ b/app/views.py
@@ -220,6 +220,12 @@ def add_book():
             category = upload_form.category.data
             message = upload_form.message.data
             year_published = upload_form.year_published.data
+            sameness = upload_form.sameness.data
+            gender = upload_form.gender.data
+            diversity = upload_form.diversity.data
+            time = upload_form.time.data
+            who = upload_form.who.data
+
             if year_published=="":
                 year_published = None
 
@@ -263,7 +269,7 @@ def add_book():
                 html.write_pdf(target='app/uploads/potential.pdf');
                 print ('potential_pdf')
 
-            book = Book(title, filename, cover, file_extension, category, year_published, message)
+            book = Book(title, filename, cover, file_extension, category, year_published, message, sameness, diversity, gender, who, time)
             db.session.add(book)
             for author in authors:
                 author_name = author.get("author_name")
diff --git a/import_csv.py b/import_csv.py
index bca2b12..af53fbe 100644
--- a/import_csv.py
+++ b/import_csv.py
@@ -20,7 +20,7 @@ with open(args.csv) as f:
             print ('get_cover', fullpath, name)
             cover = get_cover(fullpath, name)
 
-        book = Book(row['Title'], row['Filename'], cover, row['Format'], row['Category'], None, '')
+        book = Book(row['Title'], row['Filename'], cover, row['Format'], row['Category'], None, None, None, None, None, None, None)
 
         db.session.add(book)
         authors = row['Author'].split(',')

From c2e0bec1bede4ada76936b9bb86314fe3f35af73 Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Mon, 11 Jun 2018 12:19:49 +0200
Subject: [PATCH 24/27] fixed stack author

---
 import_csv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/import_csv.py b/import_csv.py
index af53fbe..df681c0 100644
--- a/import_csv.py
+++ b/import_csv.py
@@ -39,7 +39,7 @@ with open(args.csv) as f:
             if stack:
                 b = db.session.query(Stack).filter_by(stack_name=stack).first()
                 if b == None:
-                    b = Stack(stack_name=stack, stack_description=None)
+                    b = Stack(stack_name=stack, stack_description=None, stack_author=None)
 
                     db.session.add(b)
                 book.stacks.append(b)

From a4a214d488655f7032ba248e822ee3b40a2a3623 Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Mon, 11 Jun 2018 12:25:10 +0200
Subject: [PATCH 25/27] fixed stack link

---
 app/templates/show_books.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 8ab4350..b43fe3d 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -61,10 +61,7 @@
       <td>
         {% for stack in book.stacks %}
 
-              <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}">  </a>
-
-                {{ stack.stack_name }} 
-                  </li>
+              <li><a href="{{url_for('show_stack_by_id', id=stack.id)}}"> {{ stack.stack_name }} </a></li>
 
       {% endfor %}
 

From e7d7e9fe93590a87dc71d473033bfa38a3634f8b Mon Sep 17 00:00:00 2001
From: Alice <alice.strt@gmail.com>
Date: Mon, 11 Jun 2018 12:28:07 +0200
Subject: [PATCH 26/27] moved add stack link

---
 app/templates/header.html      | 1 +
 app/templates/show_stacks.html | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/templates/header.html b/app/templates/header.html
index 9f2406a..5fc33bf 100755
--- a/app/templates/header.html
+++ b/app/templates/header.html
@@ -4,6 +4,7 @@
             <li><a href="{{ url_for('show_books') }}">Catalogue</a></li>
             <li><a href="{{ url_for('show_stacks') }}">Stacks</a></li>
             <li><a href="{{ url_for('add_book') }}">Add Book</a></li>
+            <li><a href="{{ url_for ('add_stack') }}">Add Stack</a></li>
             <li><a href="{{ url_for('about') }}">About</a></li>
           </ul>
           <div class="clearfix"></div>
diff --git a/app/templates/show_stacks.html b/app/templates/show_stacks.html
index 705d2f0..51f1a17 100644
--- a/app/templates/show_stacks.html
+++ b/app/templates/show_stacks.html
@@ -23,8 +23,13 @@
   </ul>
 
 </div>
+
+<br>
+<br>
+<br>
+<br>
+<br>
 <br>
-<p><a href= {{ url_for('add_stack') }}>Add a new stack</a></p>
 <br>
 <br>
 

From 8e872c1958ad8fd8282400be648fada1c7916249 Mon Sep 17 00:00:00 2001
From: nberting <tashberting@gmail.com>
Date: Mon, 11 Jun 2018 13:08:22 +0200
Subject: [PATCH 27/27] updated potential pdf

---
 app/templates/potential_pdf.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/potential_pdf.html b/app/templates/potential_pdf.html
index 1800cf6..866acec 100644
--- a/app/templates/potential_pdf.html
+++ b/app/templates/potential_pdf.html
@@ -15,10 +15,10 @@
     <title>XPPL</title>
   </head>
   <body>
-<div class="container" style="padding:10px; border-style:dashed; border-width:1px;">
-  <h1 style='font-family: Archivo Narrow; text-align: center;'>Potential Books</h1>
+<div class="container" style="padding:10px;">
+  <h1 style='font-family: Archivo Narrow; text-align: center;'>A Potential PDF</h1>
 
-    <h3 style='font-family: Archivo Narrow; text-align: center;'>Archiving the gaps in the XPPL library: </h3>
+    <h3 style='font-family: Archivo Narrow; text-align: center;'>Every book ever requested in the XPPL library: </h3>
 <div style='font-family: Courier New; text-align: center; font-size: 10pt;'>
   <p> {% for pbook in pbooks %}"{{ pbook.ptitle }}" requested on: {{ pbook.time|string|truncate(17,true," ")}}
   </p>{% endfor %}