Node assets (#36)

* moved all static files to node_modules

* updating Dockerfile

* updating Dockerfile

* updating Dockerfile

* updating Dockerfile

* fixed fontawesome

* added psql client in case it's needed.

* removed some debug stuff from scan_comics.py

* fixed generete_directory to cover missing thumbnails

comic/management/commands/scan_comics.py

@@ -31,7 +31,6 @@ class Command(BaseCommand):
     def handle(self, *args, **options):
         self.VERIFY_PAGES = options.get('verify_pages', False)
         self.OUTPUT = options.get('out', False)
-        print(options)
         self.scan_directory()
 
     def scan_directory(self, directory=False):
@@ -40,7 +39,6 @@ class Command(BaseCommand):
 
         :type directory: Directory
         """
-        a=1
         if not directory:
             comic_dir = settings.COMIC_BOOK_VOLUME
         else:

comic/templates/base.html

@@ -15,11 +15,11 @@
     <title>{% block title %}CB Web Reader{% endblock %}</title>
 
     <!-- Bootstrap core CSS -->
-    {% bootstrap_css %}
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/dt-1.10.21/b-1.6.2/b-colvis-1.6.2/r-2.2.4/datatables.min.css"/>
+    {% sri_static "bootstrap/dist/css/bootstrap.min.css" %}
+    {% sri_static "datatables.net-bs4/css/dataTables.bootstrap4.min.css" %}
     <!-- Custom styles for this template -->
   {% sri_static "css/base.min.css" %}
-  {% sri_static "font-awesome/css/all.css" %}
+  {% sri_static "@fortawesome/fontawesome-free/css/all.min.css" %}
 
   </head>
 
@@ -60,13 +60,16 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    {% bootstrap_javascript jquery='full' %}
-    <script src="https://cdn.datatables.net/v/bs4/dt-1.10.21/b-1.6.2/b-colvis-1.6.2/r-2.2.4/datatables.min.js" integrity="sha384-P3iGLDP5TXhDKfLfR7rtqmxJ8IqQE6m4zOeFjT7Nnt3scS9VMDJ88XVSnG+yrM4e" crossorigin="anonymous"></script>
-    {% sri_static "js/js.cookie.js" %}
-    {% sri_static "reveal.js/reveal.js" %}
-    {% sri_static "reveal.js/plugin/menu/menu.js" %}
-    {% sri_static "js/hammer.min.js" %}
-    {% sri_static "js/isotope.pkgd.min.js" %}
+{#    {% bootstrap_javascript jquery='full' %}#}
+    {% sri_static "jquery/dist/jquery.min.js" %}
+    {% sri_static "bootstrap/dist/js/bootstrap.bundle.js" %}
+    {% sri_static "datatables.net/js/jquery.dataTables.min.js" %}
+    {% sri_static "datatables.net-bs4/js/dataTables.bootstrap4.min.js" %}
+    {% sri_static "js-cookie/src/js.cookie.js" %}
+    {% sri_static "reveal.js/dist/reveal.js" %}
+    {% sri_static "reveal.js-menu/menu.js" %}
+    {% sri_static "hammerjs/hammer.js" %}
+    {% sri_static "isotope-layout/dist/isotope.pkgd.min.js" %}
 
  {% block script %}
  {% endblock %}

comic/templates/comic/read_comic_pdf.html

@@ -24,7 +24,7 @@
 {% endblock %}
 
 {% block script %}
-    {% sri_static "pdfjs/build/pdf.js" %}
+    {% sri_static "pdfjs-dist/build/pdf.min.js" %}
     {{ nav|json_script:"nav" }}
     {{ status.last_read_page|json_script:"last_read_page" }}
     {% sri_static 'js/read_comic_pdf.min.js' %}

comic/templates/comic/recent_comics.html

@@ -20,7 +20,7 @@
             <tr>
                 <th id="select-all"><input type="checkbox" id="select-all-cb"></th>
                 <th>
-                    <div style="text-align: center;"><span class="glyphicon glyphicon-file"></span></div>
+                    <div class="text-center"><span class="glyphicon glyphicon-file"></span></div>
                 </th>
                 <th width="100%">File/Folder</th>
                 <th>Date&nbsp;Added</th>

comic/util.py

@@ -1,7 +1,7 @@
 from collections import OrderedDict
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Union
+from typing import Union, Iterable
 
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -131,8 +131,16 @@ def generate_directory(user: User, directory=False):
         dir_list_obj = Directory.objects.filter(name__in=[x.name for x in dir_list], parent=directory)
         file_list_obj = ComicBook.objects.filter(file_name__in=[x.name for x in file_list], directory=directory)
     else:
-        dir_list_obj = Directory.objects.filter(name__in=[x.name for x in dir_list], parent__isnull=True)
-        file_list_obj = ComicBook.objects.filter(file_name__in=[x.name for x in file_list], directory__isnull=True)
+        dir_list_obj: Iterable[Directory] = Directory.objects.filter(name__in=[x.name for x in dir_list], parent__isnull=True)
+        file_list_obj: Iterable[ComicBook] = ComicBook.objects.filter(file_name__in=[x.name for x in file_list], directory__isnull=True)
+    for file in file_list_obj:
+        if file.thumbnail and not Path(file.thumbnail.path).exists():
+            file.thumbnail.delete()
+            file.save()
+    for folder in dir_list_obj:
+        if folder.thumbnail and not Path(folder.thumbnail.path).exists():
+            folder.thumbnail.delete()
+            folder.save()
 
     dir_list_obj = dir_list_obj.annotate(
         total=Count('comicbook', distinct=True),