Add in signup form and business logic

Author: kylejuliandev

Diff for: accounts/admin.py

@@ -15,6 +15,19 @@ def clean_username(self):
         data = self.cleaned_data['username']
         return data.lower()
 
+class SignupForm(forms.Form):
+    username = forms.CharField(label='username',
+        max_length = 60
+    )
+    first_name = forms.CharField(label='first name', max_length=50)
+    last_name = forms.CharField(label='last name', max_length=50)
+    password1 = forms.CharField(label='password1')
+    password2 = forms.CharField(label='password2')
+
+    def clean_username(self):
+        data = self.cleaned_data['username']
+        return data.lower()
+
 class UserCreationForm(forms.ModelForm):
     """A form for creating new users. Includes all the required
     fields, plus a repeated password."""
@@ -23,7 +36,7 @@ class UserCreationForm(forms.ModelForm):
 
     class Meta:
         model = User
-        fields = ('username', 'first_name', 'last_name', 'is_author')
+        fields = ('username', 'first_name', 'last_name', 'is_author', 'password1', 'password2')
 
     def clean_password2(self):
         # Check that the two password entries match

Diff for: accounts/static/accounts/accounts.css

@@ -1,6 +1,14 @@
 .form-signin {
     width: 100%;
-    max-width: 330px;
+    max-width: 30%;
+    padding: 15px;
+    margin: auto;
+    background-color: #9D82EB;
+}
+
+.form-signup {
+    width: 100%;
+    max-width: 40%;
     padding: 15px;
     margin: auto;
     background-color: #9D82EB;

Diff for: accounts/templates/accounts/signup.html

@@ -0,0 +1,110 @@
+{% extends "layout.html" %}
+{% load static %}
+{% load widget_tweaks %}
+
+{% block title %}
+    Sign up
+{% endblock %}
+
+{% block appstatic %}
+<link rel="stylesheet" type="text/css" href="{% static 'accounts/accounts.css' %}"/>
+{% endblock %}
+
+{% block body %}
+<main class="text-center form-signup vertical-center d-flex justify-content-center needs-validation">
+    <form action="{% url 'signup' %}" method="post">
+        {% csrf_token %}
+        <h1 class="mb-4">Please sign up</h1>
+
+        {% if form.errors %}
+            {% for error in form.non_field_errors %}
+            <div class="alert alert-danger">
+                <strong>{{ error|escape }}</strong>
+            </div>
+            {% endfor %}
+        {% endif %}
+
+        <div class="row g-3 mb-3 justify-content-center">
+            <div class="col-sm-8">
+                <div class="form-floating mb-2">
+                    {{ form.username.errors }}
+                    {% render_field form.username class+="form-control" %}
+                    <label for="{{ form.username.id_for_label }}">Username</label>
+                </div>
+            </div>
+        </div>
+
+        <div class="row g-3 mb-3">
+            <div class="col-sm-6">
+                <div class="form-floating mb-2">
+                    {% if form.first_name.errors %}
+                        {% render_field form.first_name class+="form-control is-invalid" %}
+                    {% else %}
+                        {% render_field form.first_name class+="form-control" %}
+                    {% endif %}
+
+                    <label for="{{ form.first_name.id_for_label }}">First name</label>
+                    {% for message in form.first_name.errors %}
+                        <p>*{{ message }}</p>
+                    {% endfor %}
+                </div>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-floating mb-2">
+                    {% if form.last_name.errors %}
+                        {% render_field form.last_name class+="form-control is-invalid" %}
+                    {% else %}
+                        {% render_field form.last_name class+="form-control" %}
+                    {% endif %}
+
+                    <label for="{{ form.last_name.id_for_label }}">Last name</label>
+                    {% for message in form.last_name.errors %}
+                        <p>*{{ message }}</p>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+
+        <div class="row g-3 mb-3 justify-content-center">
+            <div class="col-sm-8">
+                <div class="form-floating mb-2">
+                    {% if form.password1.errors %}
+                        {% render_field form.password1 class+="form-control is-invalid" type="password" %}
+                    {% else %}
+                        {% render_field form.password1 class+="form-control" type="password" %}
+                    {% endif %}
+
+                    <label for="{{ form.password1.id_for_label }}">Password</label>
+                    {% for message in form.password1.errors %}
+                        <p>*{{ message }}</p>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+
+        <div class="row g-3 mb-3 justify-content-center">
+            <div class="col-sm-8">
+                <div class="form-floating mb-2">
+                    {% if form.password2.errors %}
+                        {% render_field form.password2 class+="form-control is-invalid" type="password" %}
+                    {% else %}
+                        {% render_field form.password2 class+="form-control" type="password" %}
+                    {% endif %}
+
+                    <label for="{{ form.password2.id_for_label }}">Password confirmation</label>
+                    {% for message in form.password2.errors %}
+                        <p>*{{ message }}</p>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+
+        <button class="w-50 btn btn-lg btn-primary mb-5" type="submit">Sign up</button>
+
+        <div class="d-flex justify-content-between">
+            <a class="w-40 btn" onClick="javascript:history.go(-1);">Back</a>
+            <a class="w-40 btn" href="{% url 'login' %}">Login</a>
+        </div>
+    </form>
+</main>
+{% endblock %}

Diff for: accounts/urls.py

@@ -3,5 +3,6 @@
 
 urlpatterns = [
     path('login', views.signin, name='login'),
-    path('logoff', views.signout, name='logout')
+    path('logoff', views.signout, name='logout'),
+    path('signup', views.signup, name='signup'),
 ]

Diff for: accounts/views.py

@@ -1,18 +1,21 @@
 from django.shortcuts import redirect, render
 from django.urls import reverse
 
-from accounts.admin import LoginForm, UserCreationForm
+from accounts.admin import LoginForm, SignupForm
 from django.contrib.auth import authenticate, login, logout
 
+import re
+
+from accounts.models import User, UserManager
+
 # Create your views here.
 def signin(request):
-
     if request.method == 'POST':
         form = LoginForm(request.POST)
 
         if form.is_valid():
-            user = form.cleaned_data['username']
-            passw = form.cleaned_data['password']
+            user = str(form.cleaned_data['username'])
+            passw = str(form.cleaned_data['password'])
             user = authenticate(username=user, password=passw)
             if user is not None:
                 if user.is_active:
@@ -27,6 +30,58 @@ def signin(request):
 
     return render(request, 'accounts/signin.html', { 'form': form })
 
+def signup(request):
+    if request.method == 'POST':
+        form = SignupForm(request.POST)
+
+        if form.is_valid():
+            username = str(form.cleaned_data['username'])
+            password1 = str(form.cleaned_data['password1'])
+            password2 = str(form.cleaned_data['password2'])
+            first_name = str(form.cleaned_data['first_name'])
+            last_name = str(form.cleaned_data['last_name'])
+
+            charactersOnlyPattern = '^[a-zA-Z]+$'
+
+            if len(password1) < 8:
+                form.add_error(field='password1', error='Password is too short')
+
+            if password1 != password2:
+                form.add_error(field='password2', error='Passwords do not match')
+            
+            if len(first_name) > 50:
+                form.add_error(field='first_name', error='First name is too long')
+
+            if len(last_name) > 50:
+                form.add_error(field='last_name', error='Last name is too long')
+
+            if not re.match(charactersOnlyPattern, first_name):
+                form.add_error(field='first_name', error='First name cannot only consist of letters')
+
+            if not re.match(charactersOnlyPattern, last_name):
+                form.add_error(field='last_name', error='Last name cannot only consist of letters')
+            
+            if User.objects.filter(username=username).exists():
+                form.add_error(field=None, error='Invalid username or password')
+                return render(request, 'accounts/signup.html', { 'form': form })
+
+            usermanager = UserManager()
+            usermanager.model = User
+
+            user = usermanager.create_user(
+                username=username.lower(),
+                first_name=first_name,
+                last_name=last_name,
+                is_author=False,
+                password=password1)
+            
+            login(request=request, user=user)
+            return redirect(reverse(viewname='home'))
+    else:
+        form = SignupForm()
+
+    return render(request, 'accounts/signup.html', { 'form': form })
+
 def signout(request):
     logout(request)
     return redirect(reverse(viewname='home'))

Diff for: common/templates/content.html

@@ -18,7 +18,7 @@
                     <li class="nav-item"><a href="{% url 'logout' %}" class="nav-link mr-5">Sign out</a></li>
                 {% else %}
                     <li class="nav-item"><a href="{% url 'login' %}" class="nav-link mr-5">Sign in</a></li>
-                    <li class="nav-item"><a href="{% url 'home' %}" class="nav-link">Sign up</a></li>
+                    <li class="nav-item"><a href="{% url 'signup' %}" class="nav-link">Sign up</a></li>
                 {% endif %}
             </ul>
         </div>

Diff for: runtime.txt

@@ -1 +1 @@
-python-3.10.3
+python-3.10.4