diff --git a/CalibreWebCompanion/CalibreWebCompanion/__pycache__/settings.cpython-38.pyc b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/settings.cpython-38.pyc index aaa27cd..cfb16f6 100644 Binary files a/CalibreWebCompanion/CalibreWebCompanion/__pycache__/settings.cpython-38.pyc and b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/settings.cpython-38.pyc differ diff --git a/CalibreWebCompanion/CalibreWebCompanion/settings.py b/CalibreWebCompanion/CalibreWebCompanion/settings.py index 7484635..bdbf8b4 100644 --- a/CalibreWebCompanion/CalibreWebCompanion/settings.py +++ b/CalibreWebCompanion/CalibreWebCompanion/settings.py @@ -11,16 +11,34 @@ https://docs.djangoproject.com/en/3.0/ref/settings/ """ import os +import json + +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + +with open( BASE_DIR + "/settings.json", "r") as userfile: + usersettings = json.load(userfile) + CALIBRE_DIR = os.path.abspath(usersettings["CALIBRE_DIR"]) + SECRET_KEY = usersettings["SECRET_KEY"] + ALLOWED_HOSTS = usersettings["ALLOWED_HOSTS"] + INTERNAL_IPS = usersettings["INTERNAL_IPS"] + + +# CALIBRE_DIR = os.path.abspath( +# "C:\\Users\\MassiveAtoms\\Documents\\Calibre Library") +# SECRET_KEY = 'u(8^+rb%rz5hsx4v^^y(ul7g(4n7a8!db@s*9(m5cs*2_ppy8+' +# ALLOWED_HOSTS = ['127.0.0.1', ] +# INTERNAL_IPS = ['127.0.0.1', ] + + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -CALIBRE_DIR = os.path.abspath( - "C:\\Users\\MassiveAtoms\\Documents\\Calibre Library") + + + EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' - - -# optimisation stuff +# optimisation stuff ###############################################3 +# # CONN_MAX_AGE = 60 * 5 CACHES = { @@ -32,6 +50,9 @@ CACHES = { } } +## ## +######################################################################## +## STATIC FILES ## # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.0/howto/static-files/ @@ -42,23 +63,9 @@ STATICFILES_DIRS = [ ] STATIC_URL = '/static/' - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'u(8^+rb%rz5hsx4v^^y(ul7g(4n7a8!db@s*9(m5cs*2_ppy8+' - - -ALLOWED_HOSTS = ['127.0.0.1', ] -INTERNAL_IPS = [ - # ... - '127.0.0.1', - # ... -] - - +## ## +######################################################################## +## DERUG ## # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -76,9 +83,9 @@ DEBUG_TOOLBAR_PANELS = [ ] - - - +## ## +######################################################################## +## DERUG ## LOGIN_REDIRECT_URL = '/books' diff --git a/CalibreWebCompanion/library/templates/library/book_detail.html b/CalibreWebCompanion/library/templates/library/book_detail.html index 99750c7..ea795ac 100644 --- a/CalibreWebCompanion/library/templates/library/book_detail.html +++ b/CalibreWebCompanion/library/templates/library/book_detail.html @@ -6,46 +6,47 @@
- download + download
-

{{book.title}}

+

{{book.title}}

by - {% if book.authors %} - {% for author in book.authors.all %} - {{author.name}} - {%endfor%} - {% else %} - {{book.author_sort}} - {%endif%} -
- Published by - {% if book.publishers %} - {% for pub in book.publishers.all %} - {{pub.name}} - {%endfor%} - {% else %} - Unknown - {%endif%} -
- Tags: - {% if book.tags %} - {% for tag in book.tags.all %} - {{tag.name}}, - {%endfor%} - {% else %} - {%endif%} -
- Rating: - {% if book.ratings %} - {% for rating in book.ratings.all %} - {{rating}} - {%endfor%} - {% else %} - {%endif%} -
- {{book.publisher}} + {% if book.authors %} + {% for author in book.authors.all %} + {{author.name}} + {%endfor%} + {% else %} + {{book.author_sort}} + {%endif%} +
+ Published by + {% if book.publishers %} + {% for pub in book.publishers.all %} + {{pub.name}} + {%endfor%} + {% else %} + Unknown + {%endif%} +
+ Tags: + {% if book.tags %} + {% for tag in book.tags.all %} + {{tag.name}}, + {%endfor%} + {% else %} + {%endif%} +
+ Rating: + {% if book.ratings %} + {% for rating in book.ratings.all %} + {{rating}} + {%endfor%} + {% else %} + {%endif%} +
+ {{book.publisher}}

@@ -53,9 +54,9 @@
-{% autoescape off %} -{{comment}} -{% endautoescape %} + {% autoescape off %} + {{comment}} + {% endautoescape %}
{% endblock %} \ No newline at end of file