Re-formatted the assets.py file to current PEP8 standards.

Modified the yarn.lock file to remove what appears to be a dependency overwrite for Font Awesome icons which results in an older 5.x release overwriting the newer 6.x release.
Monogramm · Mar 11, 2023 · 87891a3 · 87891a3
1 parent 4c24fba
commit 87891a3
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 53 deletions.
diff --git a/powerdnsadmin/assets.py b/powerdnsadmin/assets.py
@@ -2,65 +2,63 @@
 
 
 class ConcatFilter(Filter):
-  """
-  Filter that merges files, placing a semicolon between them.
+    """
+    Filter that merges files, placing a semicolon between them.
+    """
+    def concat(self, out, hunks, **kw):
+        out.write(';'.join([h.data() for h, info in hunks]))
 
-  Fixes issues caused by missing semicolons at end of JS assets, for example
-  with last statement of jquery.pjax.js.
-  """
-  def concat(self, out, hunks, **kw):
-    out.write(';'.join([h.data() for h, info in hunks]))
 
 css_login = Bundle(
-  'node_modules/@fortawesome/fontawesome-free/css/all.css',
-  'node_modules/icheck/skins/square/blue.css',
-  'node_modules/admin-lte/dist/css/adminlte.css',
-  filters=('rcssmin', 'cssrewrite'),
-  output='generated/login.css')
+    'node_modules/@fortawesome/fontawesome-free/css/all.css',
+    'node_modules/icheck/skins/square/blue.css',
+    'node_modules/admin-lte/dist/css/adminlte.css',
+    filters=('rcssmin', 'cssrewrite'),
+    output='generated/login.css')
 
 js_login = Bundle(
-  'node_modules/jquery/dist/jquery.js',
-  'node_modules/bootstrap/dist/js/bootstrap.js',
-  'node_modules/icheck/icheck.js',
-  'custom/js/custom.js',
-  filters=(ConcatFilter, 'rjsmin'),
-  output='generated/login.js')
+    'node_modules/jquery/dist/jquery.js',
+    'node_modules/bootstrap/dist/js/bootstrap.js',
+    'node_modules/icheck/icheck.js',
+    'custom/js/custom.js',
+    filters=(ConcatFilter, 'rjsmin'),
+    output='generated/login.js')
 
 js_validation = Bundle(
-  'node_modules/bootstrap-validator/dist/validator.js',
-  output='generated/validation.js')
+    'node_modules/bootstrap-validator/dist/validator.js',
+    output='generated/validation.js')
 
 css_main = Bundle(
-  'node_modules/@fortawesome/fontawesome-free/css/all.css',
-  'node_modules/datatables.net-bs4/css/dataTables.bootstrap4.css',
-  'node_modules/icheck/skins/square/blue.css',
-  'node_modules/multiselect/css/multi-select.css',
-  'node_modules/admin-lte/dist/css/adminlte.css',
-  'custom/css/custom.css',
-  'node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.css',
-  filters=('rcssmin', 'cssrewrite'),
-  output='generated/main.css')
+    'node_modules/@fortawesome/fontawesome-free/css/all.css',
+    'node_modules/datatables.net-bs4/css/dataTables.bootstrap4.css',
+    'node_modules/icheck/skins/square/blue.css',
+    'node_modules/multiselect/css/multi-select.css',
+    'node_modules/admin-lte/dist/css/adminlte.css',
+    'custom/css/custom.css',
+    'node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.css',
+    filters=('rcssmin', 'cssrewrite'),
+    output='generated/main.css')
 
 js_main = Bundle(
-  'node_modules/jquery/dist/jquery.js',
-  'node_modules/jquery-ui-dist/jquery-ui.js',
-  'node_modules/bootstrap/dist/js/bootstrap.bundle.js',
-  'node_modules/datatables.net/js/jquery.dataTables.js',
-  'node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js',
-  'node_modules/jquery-sparkline/jquery.sparkline.js',
-  'node_modules/jquery-slimscroll/jquery.slimscroll.js',
-  'node_modules/icheck/icheck.js',
-  'node_modules/fastclick/lib/fastclick.js',
-  'node_modules/moment/moment.js',
-  'node_modules/admin-lte/dist/js/adminlte.js',
-  'node_modules/multiselect/js/jquery.multi-select.js',
-  'node_modules/datatables.net-plugins/sorting/natural.js',
-  'node_modules/jtimeout/src/jTimeout.js',
-  'node_modules/jquery.quicksearch/src/jquery.quicksearch.js',
-  'custom/js/custom.js',
-  'node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
-  filters=(ConcatFilter, 'rjsmin'),
-  output='generated/main.js')
+    'node_modules/jquery/dist/jquery.js',
+    'node_modules/jquery-ui-dist/jquery-ui.js',
+    'node_modules/bootstrap/dist/js/bootstrap.bundle.js',
+    'node_modules/datatables.net/js/jquery.dataTables.js',
+    'node_modules/datatables.net-bs4/js/dataTables.bootstrap4.js',
+    'node_modules/jquery-sparkline/jquery.sparkline.js',
+    'node_modules/jquery-slimscroll/jquery.slimscroll.js',
+    'node_modules/icheck/icheck.js',
+    'node_modules/fastclick/lib/fastclick.js',
+    'node_modules/moment/moment.js',
+    'node_modules/admin-lte/dist/js/adminlte.js',
+    'node_modules/multiselect/js/jquery.multi-select.js',
+    'node_modules/datatables.net-plugins/sorting/natural.js',
+    'node_modules/jtimeout/src/jTimeout.js',
+    'node_modules/jquery.quicksearch/src/jquery.quicksearch.js',
+    'custom/js/custom.js',
+    'node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
+    filters=(ConcatFilter, 'rjsmin'),
+    output='generated/main.js')
 
 assets = Environment()
 assets.register('js_login', js_login)

diff --git a/yarn.lock b/yarn.lock
@@ -47,11 +47,6 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.3.0.tgz#b5877182692a6f7a39d1108837bec24247ba4bd7"
   integrity sha512-qVtd5i1Cc7cdrqnTWqTObKQHjPWAiRwjUPaXObaeNPcy7+WKxJumGBx66rfSFgK6LNpIasVKkEgW8oyf0tmPLA==
 
-"@fortawesome/fontawesome-free@^5.15.4":
-  version "5.15.4"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
-  integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
-
 "@lgaitan/pace-progress@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@lgaitan/pace-progress/-/pace-progress-1.0.7.tgz#c96fbbd9fd4cf528feed34ea0c8f9d8b3e98f0dd"