diff --git a/alkatorapi/admin.py b/alkatorapi/admin.py index 6c7c651..d95c729 100644 --- a/alkatorapi/admin.py +++ b/alkatorapi/admin.py @@ -11,13 +11,3 @@ class RacerAdmin(admin.ModelAdmin): @admin.register(Profile) class ProfileAdmin(admin.ModelAdmin): pass - - -@admin.register(User) -class UserAdmin(admin.ModelAdmin): - change_form_template = "invoice_custom_admin_page.html" - - def response_change(self, request, obj): - if "_invoice" in request.POST: - return HttpResponseRedirect(f"/api/invoice?invoice_id={obj.invoice_id}") - return super().response_change(request, obj) \ No newline at end of file diff --git a/alkatorapi/migrations/0018_profile_phone.py b/alkatorapi/migrations/0018_profile_phone.py new file mode 100644 index 0000000..4adc48a --- /dev/null +++ b/alkatorapi/migrations/0018_profile_phone.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.12 on 2024-10-12 10:48 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('alkatorapi', '0017_racer_register_date'), + ] + + operations = [ + migrations.AddField( + model_name='profile', + name='phone', + field=models.CharField(blank=True, max_length=120, null=True), + ), + ] diff --git a/alkatorapi/models.py b/alkatorapi/models.py index e9f36fc..ffbc379 100644 --- a/alkatorapi/models.py +++ b/alkatorapi/models.py @@ -49,6 +49,7 @@ class Profile(models.Model): user = models.OneToOneField(DjangoUser, related_name='profile', on_delete=models.CASCADE) first_name = models.CharField(max_length=120) last_name = models.CharField(max_length=120) + phone = models.CharField(max_length=120, null=True, blank=True) address = models.CharField(max_length=255, null=True, blank=True) def __str__(self): diff --git a/alkatorapi/views.py b/alkatorapi/views.py index 7d68283..bc540ac 100644 --- a/alkatorapi/views.py +++ b/alkatorapi/views.py @@ -41,6 +41,8 @@ def register_user(request): return HttpResponse('{"reason":"Heslo je povinné!"}', status=400, content_type='application/json') if request.POST['password1'] != request.POST['password2']: return HttpResponse('{"reason":"Hesla se neshodují!"}', status=400, content_type='application/json') + if not request.POST['phone']: + return HttpResponse('{"reason":"Hesla se neshodují!"}', status=400, content_type='application/json') if DjangoUser.objects.filter(email=request.POST['email']): return HttpResponse('{"reason":"Email je již registrován!"}', status=400, content_type='application/json') email = request.POST['email'] @@ -48,7 +50,13 @@ def register_user(request): user = DjangoUser.objects.create_user( email, email, request.POST['password1'] ) - profile = Profile(user=user, first_name=request.POST['first_name'], last_name=request.POST['last_name'], address=request.POST['address']) + profile = Profile( + user=user, + first_name=request.POST['first_name'], + last_name=request.POST['last_name'], + address=request.POST['address'], + phone=request.POST['phone'], + ) profile.save() auth_login(request, user) return HttpResponse('{"success":"Úspěšná registrace!", "redirect":"/#"}', content_type='application/json') diff --git a/frontend/src/scripts/index.js b/frontend/src/scripts/index.js index fd9b8a6..aebb360 100644 --- a/frontend/src/scripts/index.js +++ b/frontend/src/scripts/index.js @@ -302,6 +302,10 @@ class Main extends Component { +
+ + +