remove assets folder, separate media and assets

.dockerignore

@@ -4,6 +4,5 @@ __pycache__
 .coverage
 venv
 src/db/db.sqlite3
-src/assets/static/*
-src/assets/media/images/*
-!src/assets/media/images/none.svg
+src/media/images/*
+!src/media/images/none.svg

.gitignore

@@ -4,6 +4,5 @@ __pycache__
 .coverage
 venv
 src/db/db.sqlite3
-src/assets/static/*
-src/assets/media/images/*
-!src/assets/media/images/none.svg
+src/media/images/*
+!src/media/images/none.svg

README.md

@@ -50,7 +50,7 @@ services:
       # - REGISTRATION=False
     volumes:
       - ./db:/app/db
-      - media:/app/assets/media
+      - media:/app/media
     ports:
       - "8000:8000"
 

docker-compose.yml

@@ -16,7 +16,7 @@ services:
       # - REGISTRATION=False
     volumes:
       - ./db:/app/db
-      - media:/app/assets/media
+      - media:/app/media
     ports:
       - "8000:8000"
 

entrypoint.sh

@@ -12,6 +12,6 @@ PGID=${PGID:-911}
 groupmod -o -g "$PGID" abc
 usermod -o -u "$PUID" abc
 chown -R abc:abc db
-chown -R abc:abc assets
+chown -R abc:abc media
 
 exec gosu abc:abc uwsgi --ini /app/base/uwsgi.ini

src/base/settings.py

@@ -132,8 +132,8 @@ USE_TZ = True
 
 STATIC_URL = "static/"
 MEDIA_URL = "media/"
-STATIC_ROOT = os.path.join(BASE_DIR, "assets/static")
-MEDIA_ROOT = os.path.join(BASE_DIR, "assets/media")
+STATIC_ROOT = os.path.join(BASE_DIR, "static")
+MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field

src/base/uwsgi.ini

@@ -5,8 +5,8 @@ enable-threads = true
 module = base.wsgi
 die-on-term = true
 
-static-map = /static=/app/assets/static
-static-map = /media=/app/assets/media
+static-map = /static=/app/static
+static-map = /media=/app/media
 static-expires = 7776000
 offload-threads = %k