diff --git a/copyStaticScrips.sh b/copyStaticScrips.sh new file mode 100644 index 0000000..6a43603 --- /dev/null +++ b/copyStaticScrips.sh @@ -0,0 +1,4 @@ +rm -d -r /var/www/testapp/ +mkdir /var/www/testapp +cp -a /root/appdirectory/assets/. /var/www/testapp/static +chown -R www-data:www-data /var/www diff --git a/post/models.py b/post/models.py index 0058cf5..c9e7905 100644 --- a/post/models.py +++ b/post/models.py @@ -1,5 +1,6 @@ from django.db import models from django.contrib.auth.models import User +from dynamic_filenames import FilePattern # Create your models here. class Post(models.Model): @@ -16,6 +17,8 @@ class Post(models.Model): def user_directory_path(instance, filename): return "user_{0}/{1}".format(instance.user.id, filename) +upload_to_pattern = FilePattern(filename_pattern='PDFuploads/{app_label:.25}/{model_name:.30}/{uuid:base32}{ext}') class ConusFilePDF(models.Model): fileName = models.CharField(max_length=32) - file = models.FileField(upload_to="PDFuploads/") \ No newline at end of file + #file = models.FileField(upload_to="PDFuploads/") + file = models.FileField(upload_to=upload_to_pattern) \ No newline at end of file diff --git a/post/templates/post/pdf_list.html b/post/templates/post/pdf_list.html new file mode 100644 index 0000000..bac16c5 --- /dev/null +++ b/post/templates/post/pdf_list.html @@ -0,0 +1,23 @@ +{% extends 'layout.html' %} + +{% block title %} + PDF +{% endblock %} + +{% block content %} +
+

PDFs

+ + {% for pdf in pdfs %} +
+

+ + {{ pdf.fileName }} + + + +

+
+ {% endfor %} +
+{% endblock %} \ No newline at end of file diff --git a/post/urls.py b/post/urls.py index 50300e7..caec112 100644 --- a/post/urls.py +++ b/post/urls.py @@ -7,6 +7,7 @@ urlpatterns = [ path('', views.post_list, name="list"), path('new-post/', views.post_new, name="new-post"), path('pdf/', views.pdf_page, name="pdf_page"), + path('pdf-list', views.pdf_list, name="pdf_list"), path('', views.post_page, name="page") diff --git a/post/views.py b/post/views.py index 8abf0ce..a1fca85 100644 --- a/post/views.py +++ b/post/views.py @@ -1,5 +1,5 @@ from django.shortcuts import render,redirect -from .models import Post +from .models import Post, ConusFilePDF from django.contrib.auth.decorators import login_required from . import forms @@ -37,4 +37,9 @@ def pdf_page(request): return redirect('post:pdf_page') else: form = forms.UploadFileForm() - return render(request, 'post/pdf_page.html', {'form' : form}) \ No newline at end of file + return render(request, 'post/pdf_page.html', {'form' : form}) + + +def pdf_list(request): + pdfs = ConusFilePDF.objects.all() + return render(request, 'post/pdf_list.html', {'pdfs': pdfs}) \ No newline at end of file diff --git a/templates/home.html b/templates/home.html index 4caf547..8165290 100644 --- a/templates/home.html +++ b/templates/home.html @@ -8,5 +8,5 @@

Home

Check out my About page.

Upload a new PDF click here

-

show pdfs click here

+

show pdfs click here

{% endblock %} \ No newline at end of file