Added better defaults

This commit is contained in:
Walter 2025-02-20 23:11:08 +01:00
parent 3d98f297d9
commit 7667e54635
6 changed files with 12 additions and 11 deletions

View File

@ -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 "$@"

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 KiB

View File

@ -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")),

View File

@ -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,

View File

@ -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")

View File

@ -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: