From 27376f4a88169bcb2a698d597fec817b53a49f60 Mon Sep 17 00:00:00 2001
From: Alex <mail@alexroidl.de>
Date: Tue, 30 Nov 2021 22:16:10 +0100
Subject: [PATCH] run on sqlite and be more stable

---
 app/__init__.py               |  4 ++--
 app/forms.py                  |  6 +++---
 app/models.py                 |  3 +--
 app/static/css/style.css      | 14 ++++++++------
 app/templates/base.html       |  3 ++-
 app/templates/header.html     |  5 +++--
 app/templates/scape_new.html  |  2 +-
 app/templates/show_books.html |  4 +---
 app/views.py                  | 32 ++++++++++++--------------------
 requirements.txt              | 26 --------------------------
 10 files changed, 33 insertions(+), 66 deletions(-)
 delete mode 100755 requirements.txt

diff --git a/app/__init__.py b/app/__init__.py
index 8a69b1f..8c6f89e 100755
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -23,11 +23,11 @@ app = Flask(__name__)
 app.config['SECRET_KEY'] = 'super secret key'
 #app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////tmp/mydatabase.db'
 app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
-app.config['SQLALCHEMY_DATABASE_URI'] = 'rqlite+pyrqlite://localhost:4001/'
+#app.config['SQLALCHEMY_DATABASE_URI'] = 'rqlite+pyrqlite://localhost:4001/'
 app.config['DEBUG'] = True
 app.config['PORT'] = 80
 
-#app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir, 'mydatabase.db')
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + os.path.join(basedir, 'mydatabase.db')
 db = SQLAlchemy(app)
 light = not os.path.isdir(UPLOAD_FOLDER)
 DOMAIN = environ.get('DOMAIN')
diff --git a/app/forms.py b/app/forms.py
index 6083f5a..6b57bed 100755
--- a/app/forms.py
+++ b/app/forms.py
@@ -5,7 +5,7 @@ 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
+from wtforms.fields import DecimalRangeField
 
 
 # - - - Forms - - -
@@ -80,6 +80,6 @@ class SearchForm(FlaskForm):
                ('Outliers', 'Outliers')]
     select = SelectField('', choices=choices, default='All')
     search = StringField('', validators=[InputRequired()])
-    grid = SubmitField('Grid')
-    listview = SubmitField('List')
+    # grid = SubmitField('Grid')
+    # listview = SubmitField('List')
     randomize = SubmitField('Order differently')
diff --git a/app/models.py b/app/models.py
index 076ca22..91a2192 100755
--- a/app/models.py
+++ b/app/models.py
@@ -1,8 +1,7 @@
 from app import db
 from marshmallow import Schema, fields, ValidationError, pre_load
 import datetime
-from sqlalchemy import Column, Integer, DateTime
-import flask_whooshalchemyplus
+from sqlalchemy import Column, DateTime
 
 
 authors = db.Table('books_authors',
diff --git a/app/static/css/style.css b/app/static/css/style.css
index 9f3d6a0..294fcfa 100755
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -1,22 +1,23 @@
 @import url("../fonts/fonts_style.css");
 
 *{
-font-family: "Archivo Narrow";
+font-family: "Archivo Narrow", Helvetica, sans-serif;
+}
+
+body{
+  background-color: #f1f1f1;
 }
 
 p{
   font-size: 20px;
-
-
 }
 
 a{
-
   text-decoration: underline;
   color: black;
 }
-a:hover{
 
+a:hover{
   text-decoration: underline;
   color: #0000FF;
 }
@@ -291,7 +292,8 @@ font-size: 12px;
   left:0;
   position: fixed;
   font-size: 18px;
-  background-color: yellow;
+  background-color: rgb(0, 3, 170);
+  color: white;
 }
 
 #annotindication{
diff --git a/app/templates/base.html b/app/templates/base.html
index ea3b2b7..67d5fdf 100755
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -50,7 +50,8 @@
 <script type="text/javascript" src="{{ url_for("static", filename="js/jquery.tablesorter.js") }}"></script>
 <script src="{{ url_for("static", filename="js/app.js") }}"></script>
 
-<script src="{{ url_for("static", filename="js/vendor/socket.io.slim.js") }}"></script>
+<!-- <script src="{{ url_for("static", filename="js/vendor/socket.io.slim.js") }}"></script> -->
+<script src="https://cdn.socket.io/4.4.0/socket.io.min.js" integrity="sha384-1fOn6VtTq3PWwfsOrk45LnYcGosJwzMHv+Xh/Jx5303FVOXzEnw0EpLv30mtjmlj" crossorigin="anonymous"></script>
 <script src="{{ url_for("static", filename="js/vendor/vue.min.js") }}"></script>
 <script>
 
diff --git a/app/templates/header.html b/app/templates/header.html
index b182288..c05767f 100755
--- a/app/templates/header.html
+++ b/app/templates/header.html
@@ -2,13 +2,14 @@
           <ul>
             <li><a href="{{ url_for('home') }}">Home</a></li>
             <li><a href="{{ url_for('show_books') }}">Catalogue</a></li>
-            <li><a href="{{ url_for('show_stacks') }}">Stacks</a></li>
+            
             {%if light%}
             {%else%}
             <li><a href="{{ url_for('add_book') }}">Add Book</a></li>
+            <li><a href="{{ url_for('show_stacks') }}">Stacks</a></li>
             <li><a href="{{ url_for ('add_stack') }}">Add Stack</a></li>
             {%endif%}
-            <li><a href="{{ url_for('annotations') }}">Annotations</a></li>
+            <!-- <li><a href="{{ url_for('annotations') }}">Annotations</a></li> -->
             <li><a href="{{ url_for('about') }}">About</a></li>
             {%if light%}
             {%else%}
diff --git a/app/templates/scape_new.html b/app/templates/scape_new.html
index 3fe98e0..0e02bc7 100644
--- a/app/templates/scape_new.html
+++ b/app/templates/scape_new.html
@@ -40,7 +40,7 @@ fill: yellow;
 <body>
 
 <script>
-console.log("hello");
+
 // d3.json("/api/books").then(function(data){
 //   console.log("loaded");
 //   console.log(data)
diff --git a/app/templates/show_books.html b/app/templates/show_books.html
index 63814ad..7dcfd68 100755
--- a/app/templates/show_books.html
+++ b/app/templates/show_books.html
@@ -8,10 +8,8 @@
     <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" @click="sendMessage" class="button is-info" >browse</button>
-
+      <button type="submit" @click="sendMessage" class="button is-info" >find</button>
        <p><br>
-      {{ form.grid(style="font-size:20px")}}{{ form.listview(style="font-size:20px")}}</p>
  </form>
 
   <h1 class="page-header">All Books</h1>
diff --git a/app/views.py b/app/views.py
index e20ad53..53a475e 100755
--- a/app/views.py
+++ b/app/views.py
@@ -33,7 +33,7 @@ import sys
 from werkzeug.utils import secure_filename
 
 # import sqlite3
-ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'epub', 'chm', 'mobi'])
+ALLOWED_EXTENSIONS = set(['txt', 'pdf', 'epub', 'chm', 'mobi', "png", "mp3"])
 
 author_schema = AuthorSchema()
 authors_schema = AuthorSchema(many=True)
@@ -123,17 +123,6 @@ def annotations_pdf():
     html = render_template(('annotations.html'), annot=annot, light=light)
     return render_pdf(HTML(string=html))
 
-# @app.route('/myannotations.pdf')
-# def myannotations_pdf():
-#     books = db.session.query(Book).all()
-#     name=str(request.args.get('query'))
-#     annot = get_annotations()
-#     res = get_annot_results(annot,name)
-#     # Make a PDF straight from HTML in a string.
-#     html = render_template('results_annot.html', name=name, annot=annot, res=res, books=books)
-#     return render_pdf(HTML(string=html))
-
-
 @app.route('/viewpdf/<filename>')
 def viewtestfile1_file(filename):
     return redirect("/static/viewer/web/viewer.html?file=%2Fuploads%2F"+urlquote(filename))
@@ -446,6 +435,8 @@ def edit_author_by_id(id):
 @app.route('/stacks')
 def show_stacks():
     stacks = db.session.query(Stack).all()
+    print("stacks looooooook")
+    print(stacks)
     return render_template('show_stacks.html', stacks=stacks, light=light)
 
 @app.route('/stacks/add_stack', methods=['POST', 'GET'])
@@ -462,6 +453,7 @@ def add_stack():
         if form.stack_name.data:
             stack = Stack(stack_name, stack_description, stack_author)
             db.session.add(stack)
+            db.session.commit()
         stacks = db.session.query(Stack).all()
         return redirect(url_for('show_stacks'))
         flash("%s stack created" % (stack_name))
@@ -561,15 +553,15 @@ def show_books():
     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, light=light)
+    # if search.grid.data:
+    #     viewby = '2'
+    #     view.append('2')
+    #     return render_template ('show_books_grid.html', books=books, form=search, light=light)
 
-    if search.listview.data:
-        viewby = '1'
-        view.append('1')
-        return render_template ('show_books.html', books=books, form=search, light=light)
+    # if search.listview.data:
+    #     viewby = '1'
+    #     view.append('1')
+    #     return render_template ('show_books.html', books=books, form=search, light=light)
 
     if request.method == 'POST':
         newmsg = 'searched for: ' + search.search.data
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100755
index f8e94e1..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-appdirs==1.4.0
-click==6.7
-Flask==0.12
-Flask-SQLAlchemy==2.1
-Flask-WTF==0.14.2
-gunicorn==19.6.0
-itsdangerous==0.24
-Jinja2==2.9.4
-MarkupSafe==0.23
-packaging==16.8
-pyparsing==2.1.10
-six==1.10.0
-SQLAlchemy==1.1.5
-Werkzeug==0.11.15
-WTForms==2.1
-flask-marshmallow==0.9.0
-Wand==0.4.4
-PyPDF2==1.26.0
-flask-socketio==2.9.2
-flask-whooshalchemyplus==0.7.5
-python-dotenv==0.7.1
-autocomplete==0.0.104
-git+https://github.com/rqlite/pyrqlite.git
-git+https://github.com/rqlite/sqlalchemy-rqlite.git
-git+https://github.com/Kozea/Flask-WeasyPrint.git
-requests=2.20.1