Django secret generated per install,

config.json

@@ -1 +1 @@
-{"TITLE": "pyShelf E-Book Server", "VERSION": "0.6.0", "BOOKPATH": "/home/raelon/Books", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"}
+{"TITLE": "pyShelf E-Book Server", "VERSION": "0.6.0", "BOOKPATH": "/home/raelon/Books", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001", "SECRET": "r0m#@$d(cs^si9_jmm)z-z#6-4-(snoctd)l(4becso9k=dwvs"}

doxygen.conf

@@ -38,13 +38,13 @@ PROJECT_NAME           = "pyShelf Open Source Ebook Server"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.4.1
+PROJECT_NUMBER         = 0.6.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Open source, console based E-book server"
+PROJECT_BRIEF          = "FOSS E-Book Server, https://pyshelf.com"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55

importBooks

@@ -5,9 +5,10 @@ import sys
 
 from src.backend.lib.storage import Storage
 from src.backend.pyShelf_ScanLibrary import execute_scan
-
+from src.backend.pyShelf_MakeCollections import MakeCollections
 PRG_PATH = pathlib.Path.cwd()
 LIB_PATH = pathlib.Path.joinpath(PRG_PATH, "src", "backend", "lib")
 sys.path.insert(0, PRG_PATH)
 print("\n")
 execute_scan(PRG_PATH)
+MakeCollections(PRG_PATH)

installer

@@ -1,12 +1,9 @@
-#!/usr/bin/ env python
+#!/usr/bin/ env python3
 import json
 import os
 import pathlib
 import platform
-import pprint
+from django.core.management.utils import get_random_secret_key
-import subprocess as sp
-import sys
-from shutil import copyfile
 
 import psutil
 from src.backend.lib.display import TerminalDisplay
@@ -34,6 +31,8 @@ class Configuration:
                 json.dump(data, backup_file)
             return data
         except Exception as e:
+            f = open(str(self._cp),"w")
+            f
             print(e)
             return False
 
@@ -225,6 +224,7 @@ for key in install_answers:
     config[key["name"]] = key["answer"]
 # config["USER"] = os.environ["USER"]
 config["USER"] = "pyshelf"
+config["SECRET"] = get_random_secret_key()
 # Write configuration
 Configuration().write_file(config)
 # Start checking for our list of required services

src/backend/lib/config.py

@@ -17,6 +17,7 @@ class Config:
         """
         _cp = pathlib.Path.joinpath(root, self._fp)
         _data = self.open_file(_cp)
+        breakpoint()
         self.book_path = _data["BOOKPATH"]
         self.TITLE = _data["TITLE"]
         self.VERSION = _data["VERSION"]
@@ -36,6 +37,7 @@ class Config:
         self.allowed_hosts = _data["ALLOWED_HOSTS"]
         self.db_user = _data["USER"]
         self.db_pass = _data["PASSWORD"]
+        self.SECRET = _data["SECRET"]
 
     def open_file(self, _cp):
         """

src/frontend/settings.py

@@ -30,8 +30,8 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "@(9b9jslgg41u1u=mr)-2*-n2x0vef0zsy39*z@sz18&tvow18"
+# SECRET_KEY = "@(9b9jslgg41u1u=mr)-2*-n2x0vef0zsy39*z@sz18&tvow18"
-
+SECRET_KEY = CONFIG.SECRET
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = TEMPLATE_DEBUG = True
 if DEBUG is True:

src/frontend/urls.py

@@ -15,17 +15,17 @@ Including another URLconf
 """
 from django.conf import settings
 from django.contrib import admin
-from django.urls import include, path, re_path
 from django.contrib.auth import views as auth_views
 from django.contrib.auth.models import User
 from django.shortcuts import HttpResponse
+from django.urls import include, path, re_path
 from interface import views
 
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("", views.index, name="index"),
     path("home", views.home, name="home"),
-    re_path("^live", views.live, name="liverequest"),
+    re_path("^live$", views.live, name="live"),
     path("sort/<_order>", views.index, name="index"),
     path("flip_sort/<_order>", views.flip_sort, name="index"),
     path("download/<pk>", views.download, name="download"),

src/interface/admin.py

@@ -22,7 +22,6 @@ class CustomUserAdmin(UserAdmin):
     )
 
 
-# Register your models here.
 admin.site.register(Books)
 admin.site.register(Collections)
 admin.site.register(Favorites)

src/interface/static/css/main.css

@@ -10755,3 +10755,7 @@ a.nav_link {
   width: fit-content !important;
   margin: auto;
 }
+
+.collection {
+  cursor: pointer;
+}

src/interface/static/css/main.scss

@@ -618,3 +618,6 @@ a.nav_link {
     width: fit-content !important;
     margin: auto;
 }
+.collection{
+    cursor: pointer;
+}

src/interface/static/js/pyshelf_ux.js

@@ -185,20 +185,26 @@ $(document).ready(function(){
             success: function(response){
                 // Set the dialog title
                 $('#pop_over_0').dialog({
-                    title: "Collections",
+                    title: response.data['title'],
                     maxHeight: (win_height-100),
                     minWidth: $("#horiz_nav_main").width(),
                     hide: { effect: "blind", duration: 1000 },
                     show: { effect: "blind", duration: 1000 },
-                    position: { my: "top", at: "bottom", of: $("#horiz_nav_main")
+                    position: { my: "center center", at: "center center", of: window
                     }
                 });
                 // clear and create a new container
-                $('#pop_over_0').html('<div id=collections>');
+                $('#pop_over_0').html('<div id=book_expanded>');
                 // Populate the container from response.data
-                $.each(response.data, function(index, value){
+                $('#book_expanded').append('<div class=row><div class="col-auto">Title</div><div class="col-auto text-muted">'+response.data['title']+'</div></div>')
-                    $('#collections').append("<div class=collection data='"+value+"/"+$('#_set').val()+"'>"+value+"</div>");
+                $('#book_expanded').append('<div class=row><div class="col-auto">Author</div><div class="col-auto text-muted">'+response.data['author']+'</div></div>')
-                });
+                if (response.data['description']!== null){
+                    $('#book_expanded').append('<div class=row><div class="col-auto">Expanded Description</div><div class="col-auto text-muted">'+response.data['description']+'</div></div>')
+
+                }
+                if (response.data['tags'] !== null){
+                    $('#book_expanded').append('<div class=row><div class="col-auto">Tags</div><div class="col-auto text-muted">'+response.data['tags']+'</div></div>')
+                }
                 // Close the container
                 $('#pop_over').append('</div>');
                 // Now open this dialog

src/interface/views.py

@@ -393,8 +393,11 @@ def live(request, **kwargs):
     if hook == "collection_listing":
         collections = collections_list()
         return JsonResponse({"data": collections}, status=200)
-    elif hook == "book_details":
+    elif hook == "details":
-        return JsonResponse({"data": Books.objects.get(pk=kwargs['pk'])}, status=200)
+        try: _pk = request.GET['pk']
+        except KeyError as e: return False
+        book = book_details(Books.objects.get(pk=_pk))
+        return JsonResponse({"data": book}, status=200)
     elif hook == "register":
         html = render_to_string('signup.html', {'form': SignUpForm}, request)
         html += render_to_string('login.html', {'form': UserLoginForm}, request)
@@ -403,7 +406,15 @@ def live(request, **kwargs):
 
     return JsonResponse({"data": "Response sent"}, status=200)
 
-
+def book_details(book):
+    return {
+        'title': book.title,
+        'author': book.author,
+        'description': book.description,
+        'tags': book.tags,
+        'rights': book.rights,
+        'pk': book.id
+    }
 def payload(request, query, _set, _limit, _order, **kwargs):
     """
     Return formatted data to template