diff --git a/app/authentication/forms.py b/app/authentication/forms.py new file mode 100644 index 0000000..09ef910 --- /dev/null +++ b/app/authentication/forms.py @@ -0,0 +1,12 @@ +from django import forms +from django.contrib.auth.forms import UserCreationForm +from django.contrib.auth.models import User + +class CustomUserCreationForm(UserCreationForm): + first_name = forms.CharField(required=True) + last_name = forms.CharField(required=True) + email = forms.EmailField(required=True) + + class Meta: + model = User + fields = ("username", "first_name", "last_name", "email", "password1", "password2") diff --git a/app/authentication/templates/authentication/login.html b/app/authentication/templates/authentication/login.html index bd3ba00..754e2f7 100644 --- a/app/authentication/templates/authentication/login.html +++ b/app/authentication/templates/authentication/login.html @@ -22,6 +22,7 @@ {% endif %}
+
{% render_field form.username|add_error_class:"error" %}
{% endif %}
+ diff --git a/app/authentication/templates/authentication/register-continue.html b/app/authentication/templates/authentication/register-continue.html index 6d31bd1..4b1ec4f 100644 --- a/app/authentication/templates/authentication/register-continue.html +++ b/app/authentication/templates/authentication/register-continue.html @@ -1,5 +1,6 @@ {% extends 'core/base.html' %} {% load static %} +{% load widget_tweaks %} {% block title %} Medwings | Sign Up {% endblock title %} @@ -9,9 +10,136 @@

Register

{% csrf_token %} - {{ user_form }} - {{ profile_form }} - +
+ Please enter your profile information + + {% if form.non_field_errors %} +
+ {% for error in form.non_field_errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} + +
+ +
+ {% render_field user_form.first_name|add_error_class:"error" %} + + {% if user_form.first_name.errors %} +
+ {% for error in user_form.first_name.errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} +
+ +
+ {% render_field user_form.last_name|add_error_class:"error" %} + + {% if user_form.last_name.errors %} +
+ {% for error in user_form.last_name.errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} +
+ +
+ {% render_field profile_form.date_of_birth|add_error_class:"error" %} + + {% if profile_form.date_of_birth.errors %} +
+ {% for error in profile_form.date_of_birth.errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} +
+ +
+ {% render_field profile_form.sex|add_error_class:"error" %} + + {% if profile_form.sex.errors %} +
+ {% for error in profile_form.sex.errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} +
+ +
+ {% render_field user_form.email|add_error_class:"error" %} + + {% if user_form.email.errors %} +
+ {% for error in user_form.email.errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} +
+ +
+ {% render_field user_form.username|add_error_class:"error" %} + + {% if user_form.username.errors %} +
+ {% for error in user_form.username.errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} +
+ +
+ {% render_field user_form.password1|add_error_class:"error" %} + + {% if user_form.password1.errors %} +
+ {% for error in user_form.password1.errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} +
+ +
+ {% render_field user_form.password2|add_error_class:"error" %} + + {% if user_form.password2.errors %} +
+ {% for error in user_form.password2.errors %} +

{{ error }}

+ {% endfor %} +
+ {% endif %} +
+ +
+ + + +
{% endblock content %} diff --git a/app/authentication/views.py b/app/authentication/views.py index 294a2a3..70c0d4a 100644 --- a/app/authentication/views.py +++ b/app/authentication/views.py @@ -7,7 +7,6 @@ from django.conf import settings from django.urls import reverse from django.core.exceptions import PermissionDenied from django.http import HttpResponseBadRequest -from django.contrib.auth.forms import UserCreationForm from django.utils.dateparse import parse_datetime import withings.api @@ -15,6 +14,7 @@ import withings.models import gotify.api import gotify.models from medwings.forms import ProfileForm +from .forms import CustomUserCreationForm def register_init(request): @@ -56,8 +56,19 @@ def register_continue(request): if not request.session.get('spoof_protection_token', None) == authorization_state: return HttpResponseBadRequest() - if request.method == 'POST': - user_form = UserCreationForm(request.POST) + if request.method == 'GET': + # Fetch access and refresh tokens and save them to session storage + redirect_uri = request.build_absolute_uri(reverse('register-continue')) + response_data = withings.api.fetch_initial_tokens(authorization_code, redirect_uri) + if response_data['status'] != 0: + return HttpResponseBadRequest() + withings.api.save_tokens_to_session(request, response_data) + + user_form = CustomUserCreationForm() + profile_form = ProfileForm() + + else: + user_form = CustomUserCreationForm(request.POST) profile_form = ProfileForm(request.POST) if user_form.is_valid() and profile_form.is_valid(): @@ -65,13 +76,6 @@ def register_continue(request): profile = profile_form.save(commit=False) profile.user = user - # Fetch access and refresh tokens and save them to session storage - redirect_uri = request.build_absolute_uri(reverse('register-continue')) - response_data = withings.api.fetch_initial_tokens(authorization_code, redirect_uri) - if response_data['status'] != 0: - return HttpResponseBadRequest() - withings.api.save_tokens_to_session(request, response_data) - user_password = request.POST.get('password1') gotify_user_info = gotify.api.create_user(user.username, user_password) gotify_app_info = gotify.api.create_application(user.username, user_password) @@ -113,10 +117,6 @@ def register_continue(request): # TODO redirect user to some other page and ask them to log in return redirect('dashboard') - else: - user_form = UserCreationForm() - profile_form = ProfileForm() - context = { 'user_form': user_form, 'profile_form': profile_form, diff --git a/assets/css/styles.css b/assets/css/styles.css index 68871d8..e9a8396 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -47,6 +47,16 @@ input[type="submit"] { @apply hover:drop-shadow-xl; } +select { + @apply rounded rounded-md drop-shadow-sm px-2 py-1; + @apply bg-accent-100; + @apply w-full; +} + +select.error { + @apply border border-failure; +} + input.error { @apply border border-failure; }