Django secret generated per install,

This commit is contained in:
Raelon Masters
2020-08-02 13:17:41 -04:00
parent 5e36fc1d16
commit 0fc3d445fc
12 changed files with 49 additions and 23 deletions

View File

@@ -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):
"""

View File

@@ -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:

View File

@@ -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"),

View File

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

View File

@@ -10754,4 +10754,8 @@ a.nav_link {
.center {
width: fit-content !important;
margin: auto;
}
.collection {
cursor: pointer;
}

View File

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

View File

@@ -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){
$('#collections').append("<div class=collection data='"+value+"/"+$('#_set').val()+"'>"+value+"</div>");
});
$('#book_expanded').append('<div class=row><div class="col-auto">Title</div><div class="col-auto text-muted">'+response.data['title']+'</div></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

View File

@@ -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":
return JsonResponse({"data": Books.objects.get(pk=kwargs['pk'])}, status=200)
elif hook == "details":
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