refactor destination of JS/CSS files in static folder

django-cms · Oct 11, 2024 · c1dbda1 · c1dbda1
1 parent b70b81d
commit c1dbda1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,4 +45,4 @@ data
 local.sqlite
 
 workdir*/
-finder/static/admin/finder/
+finder/static/finder/
diff --git a/client/esbuild.config.mjs → client/adminbuild.config.mjs b/client/esbuild.config.mjs → client/adminbuild.config.mjs
@@ -16,7 +16,7 @@ await build({
   bundle: true,
   minify: buildOptions.minify,
   sourcemap: buildOptions.debug,
-  outdir: 'finder/static/admin/finder/js',
+  outdir: 'finder/static/finder/js/admin',
   splitting: true,
   format: 'esm',
   jsx: 'automatic',

diff --git a/finder/admin/file.py b/finder/admin/file.py
@@ -12,7 +12,7 @@
 
 from finder.models.file import FileModel
 from finder.models.label import Label
-from .inode import InodeAdmin
+from finder.admin.inode import InodeAdmin
 
 
 class LabelsChoiceField(ModelMultipleChoiceField):
@@ -45,9 +45,9 @@ class FileAdmin(InodeAdmin):
     @property
     def media(self):
         return Media(
-            css={'all': ['admin/finder/css/finder-admin.css', 'admin/css/forms.css']},
+            css={'all': ['finder/css/finder-admin.css', 'admin/css/forms.css']},
             js=[format_html(
-                '<script type="module" src="{}"></script>', static('admin/finder/js/file-admin.js')
+                '<script type="module" src="{}"></script>', static('finder/js/admin/file-admin.js')
             )],
         )
 

diff --git a/finder/admin/folder.py b/finder/admin/folder.py
@@ -33,9 +33,9 @@ class FolderAdmin(InodeAdmin):
     @property
     def media(self):
         return Media(
-            css={'all': ['admin/finder/css/finder-admin.css']},
+            css={'all': ['finder/css/finder-admin.css']},
             js=[format_html(
-                '<script type="module" src="{}"></script>', static('admin/finder/js/folder-admin.js')
+                '<script type="module" src="{}"></script>', static('finder/js/admin/folder-admin.js')
             )],
         )
 

diff --git a/package.json b/package.json
@@ -3,9 +3,8 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "esbuild": "node client/esbuild.config.mjs",
-    "compilescss": "sass --load-path=. client:finder/static/admin/finder/css/",
-    "buildall": "concurrently \"npm run esbuild -- --debug \" \"npm run compilescss\""
+    "adminbuild": "node client/adminbuild.config.mjs",
+    "compilescss": "sass --load-path=. client:finder/static/finder/css/",
   },
   "devDependencies": {
     "@dnd-kit/core": "^6.1.0",