diff --git a/api/admin.py b/api/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/api/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/api/apps.py b/api/apps.py deleted file mode 100644 index d87006d..0000000 --- a/api/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class ApiConfig(AppConfig): - name = 'api' diff --git a/api/migrations/0001_initial.py b/api/migrations/0001_initial.py deleted file mode 100644 index 449752e..0000000 --- a/api/migrations/0001_initial.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 6.0.2 on 2026-02-10 18:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Building', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('geojson_id', models.IntegerField()), - ('health', models.FloatField()), - ], - ), - ] diff --git a/api/migrations/0002_playerinfo.py b/api/migrations/0002_playerinfo.py deleted file mode 100644 index 2346d21..0000000 --- a/api/migrations/0002_playerinfo.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 6.0.2 on 2026-02-11 00:00 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - dependencies = [ - ("api", "0001_initial"), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name="PlayerInfo", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("energy", models.PositiveIntegerField()), - ( - "user", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - related_name="player_info", - to=settings.AUTH_USER_MODEL, - ), - ), - ], - ), - ] diff --git a/api/models.py b/api/models.py deleted file mode 100644 index 2464d11..0000000 --- a/api/models.py +++ /dev/null @@ -1,16 +0,0 @@ -from django.conf import settings -from django.db import models - - -class Building(models.Model): - geojson_id = models.IntegerField() - health = models.FloatField() - - -class PlayerInfo(models.Model): - user = models.OneToOneField( - settings.AUTH_USER_MODEL, - on_delete=models.CASCADE, - related_name="player_info", - ) - energy = models.PositiveIntegerField() diff --git a/api/urls.py b/api/urls.py deleted file mode 100644 index 7dccde5..0000000 --- a/api/urls.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.urls import path - -from .views import prova - -urlpatterns = [path("prova/", prova)] diff --git a/api/views.py b/api/views.py deleted file mode 100644 index 0bcf0dd..0000000 --- a/api/views.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.http.request import HttpRequest -from django.http.response import JsonResponse - - -def prova(reques: HttpRequest): - return JsonResponse({"message": "OK"}) diff --git a/db.sqlite3 b/db.sqlite3 index 0dddb75..88becb5 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/dronewars/settings.py b/dronewars/settings.py index 4ffd728..bd52cb5 100644 --- a/dronewars/settings.py +++ b/dronewars/settings.py @@ -40,12 +40,11 @@ ALLOWED_HOSTS = ["127.0.0.1", "localhost"] # Application definition INSTALLED_APPS = [ - "api", + "game", "frontend", "rest_framework", "rest_framework_simplejwt", "rest_framework_simplejwt.token_blacklist", - "django.contrib.admin", "django.contrib.auth", "django.contrib.contenttypes", "django.contrib.sessions", diff --git a/dronewars/urls.py b/dronewars/urls.py index 4a31971..288b4d1 100644 --- a/dronewars/urls.py +++ b/dronewars/urls.py @@ -15,11 +15,8 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ -from django.contrib import admin from django.urls import include, path urlpatterns = [ path("", include("frontend.urls")), - path("admin/", admin.site.urls), - path("api/", include("api.urls")), ] diff --git a/frontend/admin.py b/frontend/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/frontend/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/frontend/apps.py b/frontend/apps.py deleted file mode 100644 index 3035b67..0000000 --- a/frontend/apps.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.apps import AppConfig - - -class FrontendConfig(AppConfig): - name = "frontend" - - def ready(self) -> None: - from . import models # noqa: F401 diff --git a/frontend/migrations/0001_userprofile.py b/frontend/migrations/0001_userprofile.py deleted file mode 100644 index 32726cd..0000000 --- a/frontend/migrations/0001_userprofile.py +++ /dev/null @@ -1,37 +0,0 @@ -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name="UserProfile", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("display_name", models.CharField(max_length=150)), - ( - "user", - models.OneToOneField( - on_delete=django.db.models.deletion.CASCADE, - related_name="profile", - to=settings.AUTH_USER_MODEL, - ), - ), - ], - ), - ] diff --git a/frontend/migrations/0002_userprofile_display_name_unique.py b/frontend/migrations/0002_userprofile_display_name_unique.py deleted file mode 100644 index 231d0f1..0000000 --- a/frontend/migrations/0002_userprofile_display_name_unique.py +++ /dev/null @@ -1,15 +0,0 @@ -from django.db import migrations, models - - -class Migration(migrations.Migration): - dependencies = [ - ("frontend", "0001_userprofile"), - ] - - operations = [ - migrations.AlterField( - model_name="userprofile", - name="display_name", - field=models.CharField(max_length=150, unique=True), - ), - ] diff --git a/frontend/migrations/__init__.py b/frontend/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/urls.py b/frontend/urls.py index aab6221..55ec43d 100644 --- a/frontend/urls.py +++ b/frontend/urls.py @@ -2,7 +2,6 @@ from django.urls import path from . import views - urlpatterns = [ path("", views.home, name="home"), path("auth/register/", views.register, name="register"), diff --git a/frontend/views.py b/frontend/views.py index 37d9f89..6bb2849 100644 --- a/frontend/views.py +++ b/frontend/views.py @@ -10,7 +10,7 @@ from django.shortcuts import redirect, render from django.views.decorators.http import require_http_methods from django_ratelimit.decorators import ratelimit -from .models import UserProfile +from game.models import UserProfile def home(request): diff --git a/api/__init__.py b/game/__init__.py similarity index 100% rename from api/__init__.py rename to game/__init__.py diff --git a/game/apps.py b/game/apps.py new file mode 100644 index 0000000..f46c908 --- /dev/null +++ b/game/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class GameConfig(AppConfig): + name = 'game' diff --git a/game/migrations/0001_initial.py b/game/migrations/0001_initial.py new file mode 100644 index 0000000..7e4d605 --- /dev/null +++ b/game/migrations/0001_initial.py @@ -0,0 +1,41 @@ +# Generated by Django 6.0.2 on 2026-02-11 20:00 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Building', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('geojson_id', models.IntegerField()), + ('health', models.FloatField()), + ], + ), + migrations.CreateModel( + name='PlayerInfo', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('energy', models.PositiveIntegerField()), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='player_info', to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='UserProfile', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('display_name', models.CharField(max_length=150, unique=True)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/api/migrations/__init__.py b/game/migrations/__init__.py similarity index 100% rename from api/migrations/__init__.py rename to game/migrations/__init__.py diff --git a/frontend/models.py b/game/models.py similarity index 62% rename from frontend/models.py rename to game/models.py index 3e559e1..1b6104b 100644 --- a/frontend/models.py +++ b/game/models.py @@ -4,6 +4,20 @@ from django.db.models.signals import post_save from django.dispatch import receiver +class Building(models.Model): + geojson_id = models.IntegerField() + health = models.FloatField() + + +class PlayerInfo(models.Model): + user = models.OneToOneField( + settings.AUTH_USER_MODEL, + on_delete=models.CASCADE, + related_name="player_info", + ) + energy = models.PositiveIntegerField() + + class UserProfile(models.Model): user = models.OneToOneField( settings.AUTH_USER_MODEL, @@ -19,7 +33,8 @@ class UserProfile(models.Model): @receiver(post_save, sender=settings.AUTH_USER_MODEL) def create_profile_for_user(sender, instance, created, **kwargs): if created: - UserProfile.objects.create( # type: ignore[attr-defined] + UserProfile.objects.create( user=instance, display_name=instance.username, ) + PlayerInfo.objects.create(user=instance, energy=10_000) diff --git a/api/tests.py b/game/tests.py similarity index 100% rename from api/tests.py rename to game/tests.py diff --git a/game/views.py b/game/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/game/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here.