diff --git a/CalibreWebCompanion/CalibreWebCompanion/__pycache__/__init__.cpython-38.pyc b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..7a21604 Binary files /dev/null and b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/__init__.cpython-38.pyc differ diff --git a/CalibreWebCompanion/CalibreWebCompanion/__pycache__/settings.cpython-38.pyc b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/settings.cpython-38.pyc new file mode 100644 index 0000000..20b35ca Binary files /dev/null and b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/settings.cpython-38.pyc differ diff --git a/CalibreWebCompanion/CalibreWebCompanion/__pycache__/urls.cpython-38.pyc b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/urls.cpython-38.pyc new file mode 100644 index 0000000..b3eec87 Binary files /dev/null and b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/urls.cpython-38.pyc differ diff --git a/CalibreWebCompanion/CalibreWebCompanion/__pycache__/wsgi.cpython-38.pyc b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/wsgi.cpython-38.pyc new file mode 100644 index 0000000..7d2bbc5 Binary files /dev/null and b/CalibreWebCompanion/CalibreWebCompanion/__pycache__/wsgi.cpython-38.pyc differ diff --git a/CalibreWebCompanion/db_routers/__pycache__/__init__.cpython-38.pyc b/CalibreWebCompanion/db_routers/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..20bd377 Binary files /dev/null and b/CalibreWebCompanion/db_routers/__pycache__/__init__.cpython-38.pyc differ diff --git a/CalibreWebCompanion/db_routers/__pycache__/routers.cpython-38.pyc b/CalibreWebCompanion/db_routers/__pycache__/routers.cpython-38.pyc new file mode 100644 index 0000000..5847d95 Binary files /dev/null and b/CalibreWebCompanion/db_routers/__pycache__/routers.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/__pycache__/__init__.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..1c90bc9 Binary files /dev/null and b/CalibreWebCompanion/library/__pycache__/__init__.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/__pycache__/admin.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/admin.cpython-38.pyc new file mode 100644 index 0000000..1cb042a Binary files /dev/null and b/CalibreWebCompanion/library/__pycache__/admin.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/__pycache__/context_processors.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/context_processors.cpython-38.pyc new file mode 100644 index 0000000..86ed37b Binary files /dev/null and b/CalibreWebCompanion/library/__pycache__/context_processors.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/__pycache__/forms.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/forms.cpython-38.pyc new file mode 100644 index 0000000..a27ce3b Binary files /dev/null and b/CalibreWebCompanion/library/__pycache__/forms.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/__pycache__/models.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/models.cpython-38.pyc new file mode 100644 index 0000000..1d3aac9 Binary files /dev/null and b/CalibreWebCompanion/library/__pycache__/models.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/__pycache__/urls.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/urls.cpython-38.pyc new file mode 100644 index 0000000..1462ae7 Binary files /dev/null and b/CalibreWebCompanion/library/__pycache__/urls.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/__pycache__/views.cpython-38.pyc b/CalibreWebCompanion/library/__pycache__/views.cpython-38.pyc new file mode 100644 index 0000000..5089de3 Binary files /dev/null and b/CalibreWebCompanion/library/__pycache__/views.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/migrations/__pycache__/0001_initial.cpython-38.pyc b/CalibreWebCompanion/library/migrations/__pycache__/0001_initial.cpython-38.pyc new file mode 100644 index 0000000..ba4829f Binary files /dev/null and b/CalibreWebCompanion/library/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/migrations/__pycache__/__init__.cpython-38.pyc b/CalibreWebCompanion/library/migrations/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 0000000..755dafb Binary files /dev/null and b/CalibreWebCompanion/library/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/CalibreWebCompanion/library/static/css/styles.css b/CalibreWebCompanion/library/static/css/styles.css deleted file mode 100644 index 2d8332c..0000000 --- a/CalibreWebCompanion/library/static/css/styles.css +++ /dev/null @@ -1,112 +0,0 @@ -/* sidenav */ - - -/* Fixed sidenav, full height */ -.sidenav { - height: 100%; - width: 200px; - position: fixed; - z-index: 1; - top: 0; - left: 0; - background-color: #111; - overflow-x: hidden; - padding-top: 20px; -} - -/* Style the sidenav links and the dropdown button */ -.sidenav a, -.dropdown-btn { - padding: 6px 8px 6px 16px; - text-decoration: none; - font-size: 20px; - color: #818181; - display: block; - border: none; - background: none; - width: 100%; - text-align: left; - cursor: pointer; - outline: none; -} - -/* On mouse-over */ -.sidenav a:hover, -.dropdown-btn:hover { - color: #f1f1f1; -} - -/* Main content */ -.main { - margin-left: 200px; - /* Same as the width of the sidenav */ - font-size: 20px; - /* Increased text to enable scrolling */ - padding: 0px 10px; -} - -/* Add an active class to the active dropdown button */ -.active { - background-color: green; - color: white; -} - -/* Dropdown container (hidden by default). Optional: add a lighter background color and some left padding to change the design of the dropdown content */ -.dropdown-container { - display: none; - background-color: #262626; - padding-left: 8px; -} - -/* Optional: Style the caret down icon */ -.fa-caret-down { - float: right; - padding-right: 8px; -} - - -ul.topnav { - list-style-type: none; - margin: 0; - padding: 0; - overflow: hidden; - background-color: #333; -} - -.topnav li { - float: right; -} - -.topnav li a { - display: block; - color: white; - text-align: center; - padding: 14px 16px; - text-decoration: none; -} - -.topnav li a:hover { - background-color: #111; -} - - -/* Table */ -table { - border-spacing: 0; - width: 100%; - border: 1px solid #ddd; -} - -th { - cursor: pointer; -} - -th, -td { - text-align: left; - padding: 16px; -} - -tr:nth-child(even) { - background-color: #f2f2f2 -} \ No newline at end of file diff --git a/CalibreWebCompanion/library/static/js/nav.js b/CalibreWebCompanion/library/static/js/nav.js deleted file mode 100644 index 9503bdc..0000000 --- a/CalibreWebCompanion/library/static/js/nav.js +++ /dev/null @@ -1,14 +0,0 @@ -var dropdown = document.getElementsByClassName("dropdown-btn"); -var i; - -for (i = 0; i < dropdown.length; i++) { - dropdown[i].addEventListener("click", function() { - this.classList.toggle("active"); - var dropdownContent = this.nextElementSibling; - if (dropdownContent.style.display === "block") { - dropdownContent.style.display = "none"; - } else { - dropdownContent.style.display = "block"; - } - }); -} \ No newline at end of file diff --git a/CalibreWebCompanion/library/templates/base.html b/CalibreWebCompanion/library/templates/base.html index a167ba6..9a31027 100644 --- a/CalibreWebCompanion/library/templates/base.html +++ b/CalibreWebCompanion/library/templates/base.html @@ -3,99 +3,126 @@ {% block title %}Local Library{% endblock %} + - - - {% load static %} - + + + + + + + + - {% block topnav%} - - {% endblock %} +
+
+ + {% if user.is_authenticated %} + {% block content %} {% endblock %} + {% else %} +
+
+
+
+
+
+
+

You don't have permission to view this.

+
+
+ Login +
+
+
+
+
+
+
+ {% endif %} + - {% else %} -

You don't have permission to view this.

-
  • Login
    • - or -
  • Sign up
    • - {% endif %} - - - - - \ No newline at end of file diff --git a/CalibreWebCompanion/library/templates/ifelselogin.html b/CalibreWebCompanion/library/templates/ifelselogin.html index 5188599..688e1eb 100644 --- a/CalibreWebCompanion/library/templates/ifelselogin.html +++ b/CalibreWebCompanion/library/templates/ifelselogin.html @@ -1,6 +1,22 @@ {% if user.is_authenticated %} {% else %} -

    You don't have permission to view this.

    -
  • Login
    • +
    +
    +
    +
    +
    +
    +
    +

    You don't have permission to view this.

    +
    +
    + Login +
    +
    +
    +
    +
    +
    +
    {% endif %} \ No newline at end of file diff --git a/CalibreWebCompanion/library/templates/library/author_detail.html b/CalibreWebCompanion/library/templates/library/author_detail.html index bfdeac7..816bebb 100644 --- a/CalibreWebCompanion/library/templates/library/author_detail.html +++ b/CalibreWebCompanion/library/templates/library/author_detail.html @@ -1,17 +1,17 @@ {% extends "base.html" %} {% block content %} -{% load static %} +

    {{author}}

    - +
    - - - - - + + + + + {% for book in books %} diff --git a/CalibreWebCompanion/library/templates/library/author_list.html b/CalibreWebCompanion/library/templates/library/author_list.html index be14c9a..52f8f4d 100644 --- a/CalibreWebCompanion/library/templates/library/author_list.html +++ b/CalibreWebCompanion/library/templates/library/author_list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} -{% load static %} +

    Author List

    {% if author_list %}
    TitleAuthorRatingTagsAddedTitleAuthorRatingTagsAdded
    +

    Book List

    + +
    +
    +
    +
    +
    - - - - - + + + + + {% for book in book_list %} @@ -30,11 +34,8 @@ {% endfor %}
    TitleAuthorRatingTagsAddedTitleAuthorRatingTagsAdded
    - - - - - - +
    +
    + {% endblock %} \ No newline at end of file diff --git a/CalibreWebCompanion/library/templates/library/publisher_detail.html b/CalibreWebCompanion/library/templates/library/publisher_detail.html index 505db2a..2764717 100644 --- a/CalibreWebCompanion/library/templates/library/publisher_detail.html +++ b/CalibreWebCompanion/library/templates/library/publisher_detail.html @@ -1,18 +1,18 @@ {% extends "base.html" %} {% block content %} -{% load static %} +

    {{publisher}}

    {% if publisher.released %} - +
    - - - - - + + + + + {% for book in books %} diff --git a/CalibreWebCompanion/library/templates/library/publisher_list.html b/CalibreWebCompanion/library/templates/library/publisher_list.html index e1e92e4..64856ef 100644 --- a/CalibreWebCompanion/library/templates/library/publisher_list.html +++ b/CalibreWebCompanion/library/templates/library/publisher_list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} -{% load static %} +

    Publishers List

    {% if publisher_list %}
    TitleAuthorRatingTagsAddedTitleAuthorRatingTagsAdded
    +
    - - - - - + + + + + {% for book in books %} diff --git a/CalibreWebCompanion/library/templates/library/rating_list.html b/CalibreWebCompanion/library/templates/library/rating_list.html index c3db6fb..7587be9 100644 --- a/CalibreWebCompanion/library/templates/library/rating_list.html +++ b/CalibreWebCompanion/library/templates/library/rating_list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} -{% load static %} +

    Ratings List

    {% if rating_list %}
    TitleAuthorRatingTagsAddedTitleAuthorRatingTagsAdded
    +
    - - - - - + + + + + {% for book in books %} diff --git a/CalibreWebCompanion/library/templates/library/tag_list.html b/CalibreWebCompanion/library/templates/library/tag_list.html index d85ddb7..8950940 100644 --- a/CalibreWebCompanion/library/templates/library/tag_list.html +++ b/CalibreWebCompanion/library/templates/library/tag_list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} -{% load static %} +

    Tags List

    {% if tag_list %}
    TitleAuthorRatingTagsAddedTitleAuthorRatingTagsAdded
    @@ -27,7 +14,23 @@
    {{ form.password }}
    - + +
    + {% if form.errors %} +

    Your username and password didn't match. Please try again.

    + {% endif %} + + {% if next %} + {% if user.is_authenticated %} +

    Your account doesn't have access to this page. To proceed, + please login with an account that has access.

    + {% else %} +

    Please login to see this page.

    + {% endif %} + {% endif %} +
    + + diff --git a/CalibreWebCompanion/library/templates/registration/sign_up.html b/CalibreWebCompanion/library/templates/registration/sign_up.html index d46cece..2b5b374 100644 --- a/CalibreWebCompanion/library/templates/registration/sign_up.html +++ b/CalibreWebCompanion/library/templates/registration/sign_up.html @@ -3,7 +3,7 @@ {% block content %}
    - {% csrf_token %} {{form.as_p}}
    + {% csrf_token %} {{form.as_p}} diff --git a/CalibreWebCompanion/library/templates/results.html b/CalibreWebCompanion/library/templates/results.html index 849b4c6..4e30811 100644 --- a/CalibreWebCompanion/library/templates/results.html +++ b/CalibreWebCompanion/library/templates/results.html @@ -1,17 +1,17 @@ {% extends "base.html" %} {% block content %} -{% load static %} +

    Results

    - - - - - + + + + + {% for book in book_list %} diff --git a/CalibreWebCompanion/library/templates/search.html b/CalibreWebCompanion/library/templates/search.html index 4650077..ba0aad0 100644 --- a/CalibreWebCompanion/library/templates/search.html +++ b/CalibreWebCompanion/library/templates/search.html @@ -1,15 +1,15 @@ {% extends "base.html" %} {% block content %} -{% load static %} - + +
    + - - + - +
    {% endblock %} \ No newline at end of file diff --git a/CalibreWebCompanion/library/templates/stripped_base.html b/CalibreWebCompanion/library/templates/stripped_base.html index 80468ed..4d1392a 100644 --- a/CalibreWebCompanion/library/templates/stripped_base.html +++ b/CalibreWebCompanion/library/templates/stripped_base.html @@ -5,36 +5,39 @@ {% block title %}Local Library{% endblock %} - - - {% load static %} - + + + + + + + - {% block topnav%} - - {% endblock %} +
    + +
    +
    +
    +
    {% block content %}{% endblock %}
    - +
    TitleAuthorRatingTagsAddedTitleAuthorRatingTagsAdded