diff --git a/app/entrypoint.sh b/app/entrypoint.sh index 977b5f0..40a56e7 100644 --- a/app/entrypoint.sh +++ b/app/entrypoint.sh @@ -9,6 +9,8 @@ echo "Waiting for postgres..." echo "PostgreSQL started" python manage.py flush --no-input +python manage.py makemigrations python manage.py migrate +python manage.py collectstatic --noinput exec "$@" diff --git a/app/media_defaults/avatars.png b/app/media_defaults/avatars.png new file mode 100644 index 0000000..552b6a0 Binary files /dev/null and b/app/media_defaults/avatars.png differ diff --git a/app/settings/urls.py b/app/settings/urls.py index 8aaac80..f325a88 100644 --- a/app/settings/urls.py +++ b/app/settings/urls.py @@ -21,7 +21,7 @@ from django.conf import settings urlpatterns = [ path("", RedirectView.as_view(pattern_name="bloonsa_game:game", permanent=False), name="index"), - path("admin/", admin.site.urls), + path("skibidi_sigma/", admin.site.urls), path("bloonsa_api/", include("bloonsa_api.urls", namespace="bloonsa_api")), path("a/", include("bloonsa_game.urls", namespace="bloonsa_game")), path("users/", include("users.urls", namespace="users")), diff --git a/app/users/models.py b/app/users/models.py index 2d5d4dd..4db44bd 100644 --- a/app/users/models.py +++ b/app/users/models.py @@ -16,7 +16,7 @@ class Player(models.Model): user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="player") # Profile bio = models.TextField(max_length=128, null=True, blank=True) - avatar = ResizedImageField(default="defaults/avatars.jpg", + avatar = ResizedImageField(default="defaults/avatar.png", size=[256, 256], upload_to="avatars", keep_meta=False, diff --git a/app/users/views.py b/app/users/views.py index 22ce437..8763b9f 100644 --- a/app/users/views.py +++ b/app/users/views.py @@ -20,8 +20,8 @@ class LoginView(TemplateView): if not form.is_valid(): return render(request=request, template_name="users/login.html", context={"form": form}) user = form.get_user() - bloonsa_util.init_player(request=request) login(request=request, user=user) + bloonsa_util.init_player(request=request) bloonsa_util.log(player=user.player, action=actions.login) return redirect("bloonsa_game:game") diff --git a/docker-compose-example.yml b/docker-compose-example.yml index eb2fb01..9011ae3 100644 --- a/docker-compose-example.yml +++ b/docker-compose-example.yml @@ -1,28 +1,29 @@ services: bloonsworld: + container_name: bloonsworld build: ./app volumes: - - ./.data/media:/app/media:ro - - ./.data/static:/app/static:rw - - ./.data/django:/app/data:rw + - ./.data/media:/home/app/web/media:rw + - ./.data/static:/home/app/web/static:rw command: - sh - -c - | - python manage.py collectstatic --noinput - gunicorn --chdir /app --bind :80 --workers 3 settings.wsgi:application + gunicorn --chdir /home/app/web --bind :80 --worker-class gevent --workers 3 settings.wsgi:application environment: - DJANGO_SECRET_KEY - DJANGO_ALLOWED_HOSTS - DJANGO_DEBUG networks: - - nginx_private - bloonsworld depends_on: - bloonsworld-db + ports: + - 80:80 restart: unless-stopped bloonsworld-db: + container_name: bloonsworld-db image: postgres:17 volumes: - ./.data/postgres_data:/var/lib/postgresql/data/ @@ -35,6 +36,4 @@ services: restart: unless-stopped networks: - nginx_private: - external: true bloonsworld: \ No newline at end of file