fixing mybokks

hajarLamharchi · Nov 29, 2023 · 46c3d38 · 46c3d38
1 parent b731003
commit 46c3d38
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 13 deletions.
diff --git a/flaskapp/__pycache__/__init__.cpython-311.pyc b/flaskapp/__pycache__/__init__.cpython-311.pyc
diff --git a/flaskapp/__pycache__/forms.cpython-311.pyc b/flaskapp/__pycache__/forms.cpython-311.pyc
diff --git a/flaskapp/__pycache__/models.cpython-311.pyc b/flaskapp/__pycache__/models.cpython-311.pyc
diff --git a/flaskapp/__pycache__/routes.cpython-311.pyc b/flaskapp/__pycache__/routes.cpython-311.pyc
diff --git a/flaskapp/models.py b/flaskapp/models.py
@@ -1,6 +1,6 @@
 from flaskapp import db, login_manager
 from flask_login import UserMixin
-
+import json
 
 @login_manager.user_loader
 def load_user(user_id):
@@ -34,4 +34,11 @@ class Book(db.Model):
     #cover = db.Column(db.LargeBinary)
 
     def __repr__(self):
-        return f"Book('{self.id}','{self.title}', '{self.subtitle}', '{self.genre}')"
+        return f"Book('{self.id}','{self.title}', '{self.subtitle}', '{self.genre}')"
+
+    def to_dict(self):
+        new_dict = self.__dict__.copy()
+        new_dict["__class__"] = self.__class__.__name__
+        if "_sa_instance_state" in new_dict:
+            del new_dict["_sa_instance_state"]
+        return new_dict
diff --git a/flaskapp/routes.py b/flaskapp/routes.py
@@ -1,4 +1,4 @@
-from flask import render_template, url_for, flash, redirect, request, jsonify
+from flask import send_from_directory, render_template, url_for, flash, redirect, request, jsonify
 from flaskapp.models import User, Book
 from flaskapp.forms import RegistrationForm, LoginForm, UpdateAccountForm, AddBookForm
 from flaskapp import app, db, bcrypt
@@ -81,9 +81,13 @@ def load_content(tab_name):
        # form.new_password.data = current_user.password
         return render_template(f'{tab_name}.html', form=form)
     if tab_name == 'Publish':
-        return render_template(f'{tab_name}.html', form=form1)
+        return render_template(f'{tab_name}.html',  form=form1)
     if tab_name == 'MyBooks':
-        return render_template(f'{tab_name}.html', form=form2)
+        books = db.session.query(Book).filter(Book.author_id == "3")
+        myBooks = []
+        for book in books:
+            myBooks.append(book.to_dict())
+        return render_template(f'{tab_name}.html',  books=myBooks, form=form2)
     content = render_template(f'{tab_name}.html', form=form)
     return content
 
@@ -138,6 +142,13 @@ def publish():
 @app.route('/mybooks', methods={'GET'}, strict_slashes=False)
 @login_required
 def getBooksByUser():
-    books = db.session.query(Book).all()
-    return jsonify(books)
+    books = db.session.query(Book).filter(Book.author_id == "3")
+    myBooks = []
+    for book in books:
+        myBooks.append(book.to_dict())
+    return jsonify(myBooks)
+
+@app.route('/books/<path:filename>')
+def get_image(filename):
+    return send_from_directory(os.path.join(os.getcwd(), 'books'), filename)
 
diff --git a/flaskapp/static/scripts/Dahboard.js b/flaskapp/static/scripts/Dahboard.js
@@ -13,10 +13,7 @@ $(document).ready(function () {
     $('#publish').click(function(event){
         fetchData('Publish');
         setActiveTab(this)
-        $.get("http://127.0.0.1:5000/mybooks", function(data){
-            console.log(data)
-
-        });
+
 
     });
     $('#account').click(function(event){

diff --git a/flaskapp/templates/MyBooks.html b/flaskapp/templates/MyBooks.html
@@ -3,9 +3,8 @@ <h1 class="title"> My BookShelf</h1>
     {% for book in books %}
         <div class="Book-item">
             <p class="book-name">{{ book.title }}</p>
-            <img src="../../{{ book.cover }}" alt="book">
+            <img src="{{ url_for('get_image', filename=book.cover) }}" alt="book">
             <button class="edit-btn">Edit</button>
         </div>
     {% endfor %}
-
 </div>