Add restrictions for editing recipe title

fix slug bug

recipes/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+from .models import Recipe, Version, Ingredient
+
+admin.site.register(Recipe)
+admin.site.register(Version)
+admin.site.register(Ingredient)

recipes/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class RecipesConfig(AppConfig):
+	default_auto_field = 'django.db.models.BigAutoField'
+	name = 'recipes'

recipes/forms.py

@@ -0,0 +1,37 @@
+from django.forms import ModelForm, ValidationError, modelformset_factory, BooleanField
+from .models import Recipe, Version, Ingredient
+
+class RecipeForm(ModelForm):
+	class Meta:
+		model = Recipe
+		fields = ['title', 'slug']
+
+class VersionForm(ModelForm):
+	recipe_id: int
+
+	def __init__(self, *args, **kwargs):
+		placeholder = None
+		if 'author_placeholder' in kwargs:
+			placeholder = kwargs.pop('author_placeholder')
+		super().__init__(*args, **kwargs)
+		if placeholder:
+			self.fields['author'].widget.attrs.update({'placeholder': placeholder})
+
+	class Meta:
+		model = Version
+		fields = ['label', 'slug', 'body', 'author']
+
+	def clean_slug(self):
+		slug = self.cleaned_data['slug']
+		if 'slug' in self.changed_data:
+			recipe = Recipe.objects.get(id=self.recipe_id)
+			if recipe.versions.filter(slug=slug).count() > 0: # type: ignore
+				raise ValidationError('A recipe version with this slug already exists.')
+		return slug
+
+class IngredientForm(ModelForm):
+	class Meta:
+		model = Ingredient
+		fields = ['text']
+
+IngredientFormSet = modelformset_factory(Ingredient, fields=('text',), extra=1)

recipes/models.py

@@ -0,0 +1,34 @@
+from django.db import models
+from django.contrib.auth.models import User
+from django.urls import reverse
+
+class Recipe(models.Model):
+	title = models.CharField(max_length=100, null=False, blank=False)
+	slug = models.SlugField(unique=True)
+
+	def __str__(self) -> str:
+		return self.title
+
+	def get_absolute_url(self):
+		return reverse('recipe', kwargs={'slug': self.slug})
+
+class Version(models.Model):
+	label = models.CharField(max_length=20, default='Original')
+	slug = models.SlugField(max_length=20, default='original')
+	body = models.TextField(null=True, blank=True)
+	user = models.ForeignKey(User, on_delete=models.PROTECT, null=False, blank=False)
+	author = models.CharField(max_length=30, blank=True)
+	recipe = models.ForeignKey(Recipe, on_delete=models.PROTECT, null=False, blank=False, related_name='versions')
+
+	def __str__(self) -> str:
+		return self.recipe.title + ' - ' + self.label
+
+	def get_absolute_url(self):
+		return reverse('version', kwargs={'slug_recipe': self.recipe.slug, 'slug_version': self.slug})
+
+class Ingredient(models.Model):
+	text = models.CharField(max_length=50, null=False, blank=False)
+	version = models.ForeignKey(Version, on_delete=models.CASCADE, null=False, blank=False, related_name='ingredients')
+
+	def __str__(self) -> str:
+		return self.text + ' for ' + str(self.version)

recipes/templates/add-recipe.html

@@ -0,0 +1,41 @@
+{% extends "base_main.html" %}
+{% block title %}{{ recipe.title }}{% endblock %}
+{% block main %}
+<form action="" method="post" id="add-version-form">
+	{%csrf_token %}
+	{{ recipe_form.as_div }}
+	<table>
+		{{ version_form.as_table }}
+	</table>
+	{{ ingredients_formset.management_form }}
+	{% for ingredient_form in ingredients_formset %}
+		{{ ingredient_form.as_div }}
+	{% endfor %}
+	<button id="add-ingredient" type="button">Add Ingredient</button>
+	<input type="submit" value="Submit">
+</form>
+
+<script>
+	let firstIngredientDiv = document.querySelector("input[id^=id_ingredient][id$=text]").parentElement;
+	let addIngredientButton = document.querySelector("#add-ingredient");
+	let form = document.querySelector("#add-version-form");
+	let totalIngredientFormsInput = document.querySelector("#id_ingredient-TOTAL_FORMS");
+
+	addIngredientButton.addEventListener('click', addIngredient);
+
+	function addIngredient(e) {
+		let nextIngredientIndex = document.querySelectorAll("input[id^=id_ingredient][id$=text]").length
+		e.preventDefault();
+
+		let newIngredientDiv = firstIngredientDiv.cloneNode(true);
+		let formRegex = new RegExp('ingredient-(\\d){1}-', 'g');
+
+		newIngredientDiv.innerHTML = newIngredientDiv.innerHTML.replace(formRegex, `ingredient-${nextIngredientIndex}-`);
+
+		form.insertBefore(newIngredientDiv, addIngredientButton);
+		totalIngredientFormsInput.setAttribute('value', `${nextIngredientIndex + 1}`);
+	}
+
+</script>
+
+{% endblock %}

recipes/templates/add-version.html

@@ -0,0 +1,40 @@
+{% extends "base_main.html" %}
+{% block title %}{{ recipe.title }}{% endblock %}
+{% block main %}
+<form action="" method="post" id="add-version-form">
+	{%csrf_token %}
+	<table>
+		{{ version_form.as_table }}
+	</table>
+	{{ ingredients_formset.management_form }}
+	{% for ingredient_form in ingredients_formset %}
+		{{ ingredient_form.as_div }}
+	{% endfor %}
+	<button id="add-ingredient" type="button">Add Ingredient</button>
+	<input type="submit" value="Submit">
+</form>
+
+<script>
+	let firstIngredientDiv = document.querySelector("input[id^=id_ingredient][id$=text]").parentElement;
+	let addIngredientButton = document.querySelector("#add-ingredient");
+	let form = document.querySelector("#add-version-form");
+	let totalIngredientFormsInput = document.querySelector("#id_ingredient-TOTAL_FORMS");
+
+	addIngredientButton.addEventListener('click', addIngredient);
+
+	function addIngredient(e) {
+		let nextIngredientIndex = document.querySelectorAll("input[id^=id_ingredient][id$=text]").length
+		e.preventDefault();
+
+		let newIngredientDiv = firstIngredientDiv.cloneNode(true);
+		let formRegex = new RegExp('ingredient-(\\d){1}-', 'g');
+
+		newIngredientDiv.innerHTML = newIngredientDiv.innerHTML.replace(formRegex, `ingredient-${nextIngredientIndex}-`);
+
+		form.insertBefore(newIngredientDiv, addIngredientButton);
+		totalIngredientFormsInput.setAttribute('value', `${nextIngredientIndex + 1}`);
+	}
+
+</script>
+
+{% endblock %}

recipes/templates/edit-recipe.html

@@ -0,0 +1,10 @@
+{% extends "base_main.html" %}
+{% block title %}{{ recipe.title }}{% endblock %}
+{% block main %}
+<form action="" method="post">
+	{%csrf_token %}
+	{{ form.as_div }}
+	<input type="submit" value="Submit">
+</form>
+
+{% endblock %}

recipes/templates/edit-version.html

@@ -0,0 +1,40 @@
+{% extends "base_main.html" %}
+{% block title %}{{ recipe.title }}{% endblock %}
+{% block main %}
+<form action="" method="post" id="edit-version-form"> <!-- TODO refactor with add-version.html-->
+	{%csrf_token %}
+	<table>
+		{{ version_form.as_table }}
+	</table>
+	{{ ingredients_formset.management_form }}
+	{% for ingredient_form in ingredients_formset %}
+		{{ ingredient_form.as_div }}
+	{% endfor %}
+	<button id="add-ingredient" type="button">Add Ingredient</button>
+	<input type="submit" value="Submit">
+</form>
+
+<script>
+	let firstIngredientDiv = document.querySelector("input[id^=id_ingredient][id$=text]").parentElement;
+	let addIngredientButton = document.querySelector("#add-ingredient");
+	let form = document.querySelector("#edit-version-form");
+	let totalIngredientFormsInput = document.querySelector("#id_ingredient-TOTAL_FORMS");
+
+	addIngredientButton.addEventListener('click', addIngredient);
+
+	function addIngredient(e) {
+		let nextIngredientIndex = document.querySelectorAll("input[id^=id_ingredient][id$=text]").length
+		e.preventDefault();
+
+		let newIngredientDiv = firstIngredientDiv.cloneNode(true);
+		let formRegex = new RegExp('ingredient-(\\d){1}-', 'g');
+
+		newIngredientDiv.innerHTML = newIngredientDiv.innerHTML.replace(formRegex, `ingredient-${nextIngredientIndex}-`);
+
+		form.insertBefore(newIngredientDiv, addIngredientButton);
+		totalIngredientFormsInput.setAttribute('value', `${nextIngredientIndex + 1}`);
+	}
+
+</script>
+
+{% endblock %}

recipes/templates/recipe.html

@@ -0,0 +1,12 @@
+{% extends "base_main.html" %}
+{% block title %}{{ recipe.title }}{% endblock %}
+{% block main %}
+<h1>{{ recipe.title }}</h1>
+<p><a href="{% url 'edit-recipe' recipe.slug %}">Edit recipe name</a></p>
+<p><a href="{% url 'add-version' recipe.slug %}">Add version</a></p>
+	<ul>
+		{% for v in versions %}
+		<li><a href="{{ v.get_absolute_url }}">{{ v.label }}</a></li>
+		{% endfor %}
+	</ul>
+{% endblock %}

recipes/templates/recipes.html

@@ -0,0 +1,11 @@
+{% extends "base_main.html" %}
+{% block title %}Recipes{% endblock %}
+{% block main %}
+<h1>Recipes</h1>
+<p><a href="{% url 'add-recipe' %}">Add recipe</a></p>
+	<ul>
+		{% for recipe in recipes %}
+		<li><a href="{{ recipe.get_absolute_url }}">{{ recipe.title }}</a></li>
+		{% endfor %}
+	</ul>
+{% endblock %}

recipes/templates/version.html

@@ -0,0 +1,17 @@
+{% extends "base_main.html" %}
+{% block title %}{{ recipe.title }}{% endblock %}
+{% block main %}
+<h1>{{ version.recipe.title }}{% if has_multiple_versions %} ({{ version.label }}){% endif %}</h1>
+{% if has_multiple_versions %}
+<p><a href="{{ recipe.get_absolute_url }}">Show all versions</a></p>
+{% endif %}
+<p><a href="{% url 'edit-recipe' recipe.slug %}">Edit recipe name</a></p>
+<p><a href="{% url 'add-version' recipe.slug %}">Add version</a></p>
+<p><a href="{% url 'edit-version' recipe.slug version.slug %}">Edit Version</a></p>
+	<ul>
+		{% for i in ingredients %}
+			<li>{{ i.text }}</li>
+		{% endfor %}
+	</ul>
+<p>{{ version.body }}</p>
+{% endblock %}

recipes/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

recipes/urls.py

@@ -0,0 +1,12 @@
+from django.urls import path
+from . import views
+
+urlpatterns = [
+	path('', views.recipes, name='recipes'),
+	path('add-recipe/', views.add_recipe, name='add-recipe'),
+	path('<slug:slug>/add-version/', views.add_version, name='add-version'),
+	path('<slug:slug>/edit-recipe/', views.edit_recipe, name='edit-recipe'),
+	path('<slug:slug_recipe>/<slug:slug_version>/edit-version/', views.edit_version, name='edit-version'),
+	path('<slug:slug_recipe>/<slug:slug_version>/', views.version, name='version'),
+	path('<slug:slug>/', views.recipe, name='recipe'),
+]

recipes/views.py

@@ -0,0 +1,148 @@
+from django.shortcuts import render, get_object_or_404, redirect
+from .models import Recipe, Version, Ingredient
+from .forms import RecipeForm, VersionForm, IngredientFormSet
+from django.contrib.auth.decorators import login_required
+from django.urls import reverse
+from django.http.response import HttpResponseRedirect
+from django.conf import settings
+
+RECIPE_FORM_PREFIX = 'recipe'
+VERSION_FORM_PREFIX = 'version'
+INGREDIENTS_FORMSET_PREFIX = 'ingredient'
+
+def get_name_of_user(user):
+	return user.first_name if user.first_name else user.username
+
+@login_required
+def recipes(request):
+	recipes = Recipe.objects.all()
+	return render(request, 'recipes.html', context={'recipes': recipes})
+
+def version(request, slug_recipe, slug_version):
+	recipe = get_object_or_404(Recipe, slug=slug_recipe)
+	has_multiple_versions = recipe.versions.all().count() > 1 # type: ignore
+	version = get_object_or_404(Version, recipe=recipe, slug=slug_version)
+	ingredients = version.ingredients.all() # type: ignore
+
+	return render(request, 'version.html', context={'recipe': recipe, 'has_multiple_versions': has_multiple_versions, 'version': version, 'ingredients': ingredients})
+
+@login_required
+def recipe(request, slug):
+	recipe = get_object_or_404(Recipe, slug=slug)
+	versions = recipe.versions.all() # type: ignore
+
+	if (1 == versions.count()):
+		return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': slug, 'slug_version': versions.get().slug}))
+	else:
+		return render(request, 'recipe.html', context={'recipe': recipe, 'versions': versions})
+
+def create_version(request, recipe: Recipe, version_form: VersionForm) -> Version:
+	version = version_form.save(commit=False)
+	version.user = request.user
+	version.recipe = recipe
+	version.save()
+	return version
+
+def save_ingredients(version: Version, ingredients_formset: IngredientFormSet): # type: ignore
+	for ingredient in ingredients_formset.save(commit=False):
+		ingredient.version = version
+		ingredient.save()
+
+@login_required
+def add_recipe(request):
+	if request.method == 'POST':
+		recipe_form = RecipeForm(request.POST, prefix=RECIPE_FORM_PREFIX)
+		version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
+		ingredients_formset = IngredientFormSet(request.POST, queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
+
+		if recipe_form.is_valid() and version_form.is_valid() and ingredients_formset.is_valid():
+			recipe = recipe_form.save(commit=True)
+			version = create_version(request, recipe, version_form)
+			save_ingredients(version, ingredients_formset)
+
+			return HttpResponseRedirect(reverse('recipe', kwargs={'slug': recipe.slug}))
+	else:
+		recipe_form = RecipeForm(prefix=RECIPE_FORM_PREFIX)
+		version_form = VersionForm(prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
+		ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
+
+	return render(request, 'add-recipe.html', {'recipe_form': recipe_form, 'version_form': version_form, 'ingredients_formset': ingredients_formset})
+
+@login_required
+def edit_recipe(request, slug):
+	recipe = get_object_or_404(Recipe, slug=slug)
+
+	# It is assumed every recipe has at least one version
+	if not request.user.is_superuser:
+		users = set()
+
+		for version in recipe.versions.all(): # type: ignore
+			users.add(version.user)
+
+		if len(users) > 1 or (len(users) == 1 and next(iter(users)) != request.user):
+			return redirect(f"/accounts/login/?next={request.path}")
+
+	if request.method == 'POST':
+		form = RecipeForm(request.POST, instance=recipe, prefix=RECIPE_FORM_PREFIX)
+		if form.is_valid():
+			if form.has_changed():
+				form.save()
+			return HttpResponseRedirect(reverse('recipe', kwargs={'slug': recipe.slug}))
+	else:
+		form = RecipeForm(instance=recipe, prefix=RECIPE_FORM_PREFIX)
+
+	return render(request, 'edit-recipe.html', {'form': form})
+
+@login_required
+def add_version(request, slug):
+	recipe = get_object_or_404(Recipe, slug=slug)
+	if (recipe.versions.all().count() > 0): # type: ignore
+		version_initial = {'label': '', 'slug': ''}
+	else:
+		version_initial = {}
+
+	if request.method == 'POST':
+		version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, initial=version_initial, author_placeholder=get_name_of_user(request.user))
+		ingredients_formset = IngredientFormSet(request.POST, queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
+		version_form.recipe_id = recipe.id # type: ignore
+
+		if version_form.is_valid() and ingredients_formset.is_valid():
+			version = create_version(request, recipe, version_form)
+			save_ingredients(version, ingredients_formset)
+
+			return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
+
+	else:
+		version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=version_initial, author_placeholder=get_name_of_user(request.user))
+		ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
+
+	return render(request, 'add-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
+
+@login_required
+def edit_version(request, slug_recipe, slug_version):
+	recipe = get_object_or_404(Recipe, slug=slug_recipe)
+	version = get_object_or_404(Version, recipe=recipe, slug=slug_version)
+
+	if version.user != request.user and not request.user.is_superuser:
+		return redirect(f"/accounts/login/?next={request.path}")
+
+	if request.method == 'POST':
+		version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, instance=version, author_placeholder=get_name_of_user(request.user))
+		ingredients_formset = IngredientFormSet(request.POST, queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
+		version_form.recipe_id = recipe.id # type: ignore
+
+		if version_form.is_valid() and ingredients_formset.is_valid():
+			if version_form.has_changed():
+				version = version_form.save()
+
+			if ingredients_formset.has_changed():
+				for ingredient in ingredients_formset.save(commit=False):
+						ingredient.version = version
+						ingredient.save()
+
+			return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
+	else:
+		version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
+		ingredients_formset = IngredientFormSet(queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
+
+	return render(request, 'edit-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})

stadlbauer/forms.py

@@ -0,0 +1,7 @@
+from django.contrib.auth.forms import UserCreationForm
+from django.contrib.auth.models import User
+
+class SignupForm(UserCreationForm):
+	class Meta:
+		model = User
+		fields = ('username', 'password1', 'password2', 'first_name', 'last_name')

stadlbauer/settings.py

@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/4.1/ref/settings/
 """
 
 from pathlib import Path
+import os
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -31,6 +32,7 @@ ALLOWED_HOSTS = []
 # Application definition
 
 INSTALLED_APPS = [
+	'recipes.apps.RecipesConfig',
 	'django.contrib.admin',
 	'django.contrib.auth',
 	'django.contrib.contenttypes',
@@ -54,7 +56,7 @@ ROOT_URLCONF = 'stadlbauer.urls'
 TEMPLATES = [
 	{
 		'BACKEND': 'django.template.backends.django.DjangoTemplates',
-		'DIRS': [],
+		'DIRS': [os.path.join(BASE_DIR, 'templates')],
 		'APP_DIRS': True,
 		'OPTIONS': {
 			'context_processors': [
@@ -99,6 +101,10 @@ AUTH_PASSWORD_VALIDATORS = [
 	},
 ]
 
+# Project specific
+
+LOGIN_REDIRECT_URL = '/'
+LOGOUT_REDIRECT_URL = '/'
 
 # Internationalization
 # https://docs.djangoproject.com/en/4.1/topics/i18n/

stadlbauer/urls.py

@@ -14,8 +14,14 @@ Including another URLconf
 	2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, include
+from . import views
 
 urlpatterns = [
+	path('', views.index, name='index'),
+	path('recipes/', include('recipes.urls')),
 	path('admin/', admin.site.urls),
+	path('accounts/new-user/', views.new_user, name='new-user'),
+	path('accounts/profile/', views.profile, name='profile'),
+	path('accounts/', include('django.contrib.auth.urls')),
 ]

stadlbauer/views.py

@@ -0,0 +1,24 @@
+from .forms import SignupForm
+from django.shortcuts import render
+from django.urls import reverse
+from django.http.response import HttpResponseRedirect
+from django.contrib.auth.decorators import login_required
+
+def new_user(request):
+	if request.method == 'POST':
+		form = SignupForm(request.POST)
+
+		if form.is_valid():
+			form.save(commit=True)
+			return HttpResponseRedirect(reverse('login'))
+	else:
+		form = SignupForm()
+
+	return render(request, 'registration/new-user.html', {'form': form})
+
+@login_required
+def profile(request):
+	return render(request, 'registration/profile.html')
+
+def index(request):
+	return render(request, 'index.html')

templates/base.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="UTF-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="color-scheme" content="dark light">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<style>
+		body {
+			max-width: 80ch;
+			margin: 0 auto;
+		}
+	</style>
+	{% load static %}
+	{% block head %}{% endblock %}
+	<title>{% block title %}Barn{% endblock %}</title>
+</head>
+
+<body>
+	{% block body %}{% endblock %}
+</body>
+
+</html>

templates/base_main.html

@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block head %}
+{% load static %}
+
+{% endblock %}
+
+{% block body %}
+<nav>
+	<ul>
+		<li><a href="{% url 'index' %}">Home</a></li>
+		{% if user.is_authenticated %}
+			<li><a href="{% url 'profile' %}">Profile {{ user.username }}</a></li>
+			<li><a href="{% url 'logout' %}">Logout</a></li>
+		{% else %}
+			<li><a href="{% url 'login' %}">Login</a></li>
+			<li><a href="{% url 'new-user' %}">Create account</a></li>
+		{% endif %}
+	</ul>
+	<ul>
+		<li><a href="{% url 'recipes' %}">Recipes</a></li>
+	</ul>
+</nav>
+<main>
+{% block main %}
+{% endblock %}
+</main>
+
+{% endblock %}

templates/index.html

@@ -0,0 +1,8 @@
+{% extends "base_main.html" %}
+{% block title %}Barn{% endblock %}
+{% block main %}
+<h1>Barn</h1>
+<ul>
+	<li><h2><a href="{% url 'recipes' %}">Recipes</a></h2></li>
+</ul>
+{% endblock %}

templates/registration/login.html

@@ -0,0 +1,38 @@
+{% extends "base_main.html" %}
+
+{% block main %}
+
+{% if form.errors %}
+<section>
+	<p>Username and password do not match. Please try again.</p>
+</section>
+{% endif %}
+
+{% if next %}
+<section>
+	{% if user.is_authenticated %}
+	<p>You are not authorized to access this site. Please log in with an account with the necessary permissions.</p>
+	{% else %}
+	<p>Please log in to view this site.</p>
+	{% endif %}
+</section>
+{% endif %}
+
+<form action="{% url 'login' %}" method="post">
+	{% csrf_token %}
+	<table>
+		<tr>
+			<td>{{ form.username.label_tag }}</td>
+			<td>{{ form.username }}</td>
+		</tr>
+		<tr>
+			<td>{{ form.password.label_tag }}</td>
+			<td>{{ form.password }}</td>
+		</tr>
+	</table>
+
+	<input type="submit" value="Login">
+	<input type="hidden" name="next" value="{{ next }}">
+</form>
+
+{% endblock %}

templates/registration/new-user.html

@@ -0,0 +1,43 @@
+{% extends "base_main.html" %}
+
+{% block main %}
+	{% if form.errors %}
+	<section>
+		<h2>Error:</h2>
+		<ul>
+			{% for field in form %}
+				{% for error in field.errors %}
+					<li>{{ error }}</li>
+				{% endfor %}
+			{% endfor %}
+		</ul>
+	</section>
+	{% endif %}
+
+	<form method="post" action="{% url 'new-user' %}">
+		{% csrf_token %}
+		<table>
+			<tr>
+				<td>{{ form.username.label_tag }}</td>
+				<td>{{ form.username }}</td>
+			</tr>
+			<tr>
+				<td>{{ form.first_name.label_tag }}</td>
+				<td>{{ form.first_name }}</td>
+			</tr>
+			<tr>
+				<td>{{ form.last_name.label_tag }}</td>
+				<td>{{ form.last_name }}</td>
+			</tr>
+			<tr>
+				<td>{{ form.password1.label_tag }}</td>
+				<td>{{ form.password1 }}</td>
+			</tr>
+			<tr>
+				<td>{{ form.password2.label_tag }}</td>
+				<td>{{ form.password2 }}</td>
+			</tr>
+		</table>
+		<input type="submit" value="Create account">
+	</form>
+{% endblock %}

templates/registration/profile.html

@@ -0,0 +1,19 @@
+{% extends "base_main.html" %}
+{% block title %}Profile {{ user.username }}{% endblock %}
+{% block main %}
+<h1>Profile {{ user.username }}</h1>
+<table>
+	<tr>
+		<td>Username</td>
+		<td>{{ user.username }}</td>
+	</tr>
+	<tr>
+		<td>First name</td>
+		<td>{{ user.first_name }}</td>
+	</tr>
+	<tr>
+		<td>Last name</td>
+		<td>{{ user.last_name }}</td>
+	</tr>
+</table>
+{% endblock %}