Added better defaults
This commit is contained in:
parent
3d98f297d9
commit
7667e54635
@ -9,6 +9,8 @@ echo "Waiting for postgres..."
|
|||||||
echo "PostgreSQL started"
|
echo "PostgreSQL started"
|
||||||
|
|
||||||
python manage.py flush --no-input
|
python manage.py flush --no-input
|
||||||
|
python manage.py makemigrations
|
||||||
python manage.py migrate
|
python manage.py migrate
|
||||||
|
python manage.py collectstatic --noinput
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|||||||
BIN
app/media_defaults/avatars.png
Normal file
BIN
app/media_defaults/avatars.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 217 KiB |
@ -21,7 +21,7 @@ from django.conf import settings
|
|||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("", RedirectView.as_view(pattern_name="bloonsa_game:game", permanent=False), name="index"),
|
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("bloonsa_api/", include("bloonsa_api.urls", namespace="bloonsa_api")),
|
||||||
path("a/", include("bloonsa_game.urls", namespace="bloonsa_game")),
|
path("a/", include("bloonsa_game.urls", namespace="bloonsa_game")),
|
||||||
path("users/", include("users.urls", namespace="users")),
|
path("users/", include("users.urls", namespace="users")),
|
||||||
|
|||||||
@ -16,7 +16,7 @@ class Player(models.Model):
|
|||||||
user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="player")
|
user = models.OneToOneField(User, on_delete=models.CASCADE, related_name="player")
|
||||||
# Profile
|
# Profile
|
||||||
bio = models.TextField(max_length=128, null=True, blank=True)
|
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],
|
size=[256, 256],
|
||||||
upload_to="avatars",
|
upload_to="avatars",
|
||||||
keep_meta=False,
|
keep_meta=False,
|
||||||
|
|||||||
@ -20,8 +20,8 @@ class LoginView(TemplateView):
|
|||||||
if not form.is_valid():
|
if not form.is_valid():
|
||||||
return render(request=request, template_name="users/login.html", context={"form": form})
|
return render(request=request, template_name="users/login.html", context={"form": form})
|
||||||
user = form.get_user()
|
user = form.get_user()
|
||||||
bloonsa_util.init_player(request=request)
|
|
||||||
login(request=request, user=user)
|
login(request=request, user=user)
|
||||||
|
bloonsa_util.init_player(request=request)
|
||||||
bloonsa_util.log(player=user.player,
|
bloonsa_util.log(player=user.player,
|
||||||
action=actions.login)
|
action=actions.login)
|
||||||
return redirect("bloonsa_game:game")
|
return redirect("bloonsa_game:game")
|
||||||
|
|||||||
@ -1,28 +1,29 @@
|
|||||||
services:
|
services:
|
||||||
bloonsworld:
|
bloonsworld:
|
||||||
|
container_name: bloonsworld
|
||||||
build: ./app
|
build: ./app
|
||||||
volumes:
|
volumes:
|
||||||
- ./.data/media:/app/media:ro
|
- ./.data/media:/home/app/web/media:rw
|
||||||
- ./.data/static:/app/static:rw
|
- ./.data/static:/home/app/web/static:rw
|
||||||
- ./.data/django:/app/data:rw
|
|
||||||
command:
|
command:
|
||||||
- sh
|
- sh
|
||||||
- -c
|
- -c
|
||||||
- |
|
- |
|
||||||
python manage.py collectstatic --noinput
|
gunicorn --chdir /home/app/web --bind :80 --worker-class gevent --workers 3 settings.wsgi:application
|
||||||
gunicorn --chdir /app --bind :80 --workers 3 settings.wsgi:application
|
|
||||||
environment:
|
environment:
|
||||||
- DJANGO_SECRET_KEY
|
- DJANGO_SECRET_KEY
|
||||||
- DJANGO_ALLOWED_HOSTS
|
- DJANGO_ALLOWED_HOSTS
|
||||||
- DJANGO_DEBUG
|
- DJANGO_DEBUG
|
||||||
networks:
|
networks:
|
||||||
- nginx_private
|
|
||||||
- bloonsworld
|
- bloonsworld
|
||||||
depends_on:
|
depends_on:
|
||||||
- bloonsworld-db
|
- bloonsworld-db
|
||||||
|
ports:
|
||||||
|
- 80:80
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
bloonsworld-db:
|
bloonsworld-db:
|
||||||
|
container_name: bloonsworld-db
|
||||||
image: postgres:17
|
image: postgres:17
|
||||||
volumes:
|
volumes:
|
||||||
- ./.data/postgres_data:/var/lib/postgresql/data/
|
- ./.data/postgres_data:/var/lib/postgresql/data/
|
||||||
@ -35,6 +36,4 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
nginx_private:
|
|
||||||
external: true
|
|
||||||
bloonsworld:
|
bloonsworld:
|
||||||
Loading…
Reference in New Issue
Block a user