+
+
+
+
+
diff --git a/users/forms.py b/users/forms.py
new file mode 100644
index 0000000..0fbfe7e
--- /dev/null
+++ b/users/forms.py
@@ -0,0 +1,101 @@
+from django import forms
+from django.forms import ModelForm
+
+from users.models import User
+
+class UserCreateForm(ModelForm):
+ password1 = forms.CharField(label='Password', widget=forms.PasswordInput(attrs={'class': 'input'}))
+ password2 = forms.CharField(label='Password confirmation', widget=forms.PasswordInput(attrs={'class': 'input'}))
+
+ class Meta:
+ model = User
+ fields = ['username', 'email', 'twitter', 'github']
+ widgets = {
+ 'username' : forms.TextInput(attrs={'class': 'input'}),
+ 'email' : forms.TextInput(attrs={'class': 'input'}),
+ 'twitter' : forms.TextInput(attrs={'class': 'input'}),
+ 'github' : forms.TextInput(attrs={'class': 'input'}),
+ }
+
+
+ def clean_password2(self):
+ password1 = self.cleaned_data.get("password1")
+ password2 = self.cleaned_data.get("password2")
+
+ if password1 and password2 and password1 != password2:
+ raise forms.ValidationError("Passwords don't match")
+
+ return password1
+
+
+ def clean_email(self):
+ #Make sure Email is unique
+ email = self.cleaned_data.get("email")
+ if User.objects.filter(email = email):
+ raise forms.ValidationError("Email already in use.")
+
+ return email
+
+
+ def save(self, commit=True):
+ user = super(UserCreateForm, self).save(commit=False)
+ user.set_password(self.cleaned_data["password1"])
+ user.is_active = False
+ if commit:
+ user.save()
+ return user
+
+
+
+class UserUpdateForm(ModelForm):
+ new_password1 = forms.CharField(label='New Password',
+ widget=forms.PasswordInput,
+ required=False)
+ new_password2 = forms.CharField(label='New Password confirmation',
+ widget=forms.PasswordInput,
+ required=False)
+ current_password = forms.CharField(label='Current Password', widget=forms.PasswordInput)
+
+ class Meta:
+ model = User
+ fields = ['email', 'twitter', 'github']
+
+
+ def clean_current_password(self):
+ current_password = self.cleaned_data.get("current_password")
+
+ if not self.instance.check_password(current_password):
+ raise forms.ValidationError("Password incorrect")
+
+ return current_password
+
+
+ def clean_new_password2(self):
+ password1 = self.cleaned_data.get("new_password1")
+ password2 = self.cleaned_data.get("new_password2")
+
+ if password1 and password2 and password1 != password2:
+ raise forms.ValidationError("Passwords don't match")
+
+ return password1
+
+
+ def clean_email(self):
+ #Make sure Email is still unique
+ email = self.cleaned_data.get("email")
+ if User.objects.filter(email = email).exclude(id=self.instance.id):
+ raise forms.ValidationError("Email already in use.")
+
+ return email
+
+
+ def save(self, commit=True):
+ user = super(UserUpdateForm, self).save(commit=False)
+
+ password = self.cleaned_data.get("new_password1")
+ if password:
+ user.set_password(password)
+
+ if commit:
+ user.save()
+ return user
diff --git a/users/migrations/0002_auto_20170428_1743.py b/users/migrations/0002_auto_20170428_1743.py
new file mode 100644
index 0000000..bed447a
--- /dev/null
+++ b/users/migrations/0002_auto_20170428_1743.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2017-04-28 17:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='twitter',
+ field=models.CharField(blank=True, max_length=128, verbose_name='twitter handle'),
+ ),
+ migrations.AlterField(
+ model_name='user',
+ name='github',
+ field=models.CharField(blank=True, max_length=128, verbose_name='github handle'),
+ ),
+ ]
diff --git a/users/models.py b/users/models.py
index 4bf33c2..dbe8af4 100644
--- a/users/models.py
+++ b/users/models.py
@@ -2,4 +2,5 @@ from django.db import models
from django.contrib.auth.models import AbstractUser
class User(AbstractUser):
- github = models.CharField('github handle', max_length=128)
+ github = models.CharField('github handle', max_length=128, blank=True)
+ twitter = models.CharField('twitter handle', max_length=128, blank=True)
diff --git a/users/templates/users/signup.html b/users/templates/users/signup.html
new file mode 100644
index 0000000..a85a6dc
--- /dev/null
+++ b/users/templates/users/signup.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+
+
+{% block title %} Sign up{% endblock %}
+
+
+{% block content %}
+
+
+
+
+
Registrieren
+ {% if user.is_authenticated %}
+ You are alerady logged in, why in the world would you want to sign up ?
+ {% else %}
+ {% include 'form.html' with button_text='sign up' %}
+ {% endif %}
+
+
+
+
+{% endblock %}
diff --git a/users/urls.py b/users/urls.py
new file mode 100644
index 0000000..02eac92
--- /dev/null
+++ b/users/urls.py
@@ -0,0 +1,30 @@
+from django.conf.urls import include, url
+from django.core.urlresolvers import reverse_lazy
+
+from django.contrib.auth.views import password_reset, password_reset_confirm, password_reset_done, login, logout
+
+
+from users.views import *
+
+urlpatterns = [
+ url(r'^signup/$', UserCreateView.as_view(), name='signup'),
+ url(r'^confirm/(?P
\d+)/$', SendConfirmationView.as_view(), name='send_confirmation'),
+ url(r'^confirm/(?P\d+)/(?P.+)/$', CheckConfirmationView.as_view(), name='check_confirmation'),
+
+ url(r'^update/(?P\d+)/$', UserUpdateView.as_view(), name='user_update'),
+
+ url(r'^password/reset/$', password_reset, {'template_name' : 'users/password_reset.html',
+ 'post_reset_redirect' : reverse_lazy('password_reset_sent')},
+ name='password_reset'),
+
+ url(r'^password/reset/(?P[0-9A-Za-z]+)/(?P.+)/$', password_reset_confirm,
+ {'template_name' : 'users/password_reset_confirm.html',
+ 'post_reset_redirect' : reverse_lazy('login')},
+ name='password_reset_confirm'),
+
+ url(r'^password/reset/sent/$', password_reset_done, { 'template_name' : 'users/password_reset_sent.html',},
+ name='password_reset_sent'),
+
+ url(r'^login/$', login, {'template_name' : 'users/login.html'}, name='login'),
+ url(r'^logout/$', logout ,{'next_page' : reverse_lazy('login')}, name='logout'),
+]
diff --git a/users/views.py b/users/views.py
index 91ea44a..b01f128 100644
--- a/users/views.py
+++ b/users/views.py
@@ -1,3 +1,99 @@
-from django.shortcuts import render
+from django.views.generic.edit import CreateView, UpdateView
+from django.views.generic.base import TemplateView
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+from django.contrib.auth.tokens import default_token_generator
+from django.template import loader
+from django.utils.http import int_to_base36
+from django.http import Http404
+from django.core.exceptions import PermissionDenied
-# Create your views here.
+from users.forms import UserCreateForm, UserUpdateForm
+
+class UserCreateView(CreateView):
+ model = User
+ form_class = UserCreateForm
+ template_name = 'users/signup.html'
+
+
+ def get_success_url(self):
+ return reverse('send_confirmation', kwargs={'user_id' : self.object.pk})
+
+
+class UserUpdateView(UpdateView):
+ model = User
+ form_class = UserUpdateForm
+ template_name = 'users/user_update.html'
+ pk_url_kwarg = 'user_id'
+
+ def get_queryset(self):
+ return self.model.objects.filter(id=self.request.user.id)
+
+ def get_success_url(self):
+ return reverse('geometry_create')
+
+
+
+class SendConfirmationView(TemplateView):
+ template_name = 'users/send_confirmation.html'
+ email_template_name = 'users/confirmation_email.txt'
+
+ def get_context_data(self, **kwargs):
+ context = super(SendConfirmationView, self).get_context_data(**kwargs)
+ context['confirm_user'] = User.objects.get(id=kwargs['user_id'])
+ return context
+
+ def get(self, request, *args, **kwargs):
+ try:
+ user = User.objects.get(id=kwargs['user_id'])
+ except User.DoesNotExist:
+ raise Http404
+
+ if user.is_active:
+ raise Http404
+
+ uid = int_to_base36(user.pk)
+ token = default_token_generator.make_token(user)
+ link = request.build_absolute_uri(reverse('check_confirmation', kwargs={'user_id' : user.pk, 'token' : token}))
+
+ context = {
+ 'email': user.email,
+ 'validation_link': link,
+ 'user': user
+ }
+
+ subject = "Validate your registration at %s" % site_name
+ email = loader.render_to_string(self.email_template_name, context)
+ user.email_user(subject,email)
+
+
+ return super(SendConfirmationView,self).get(self, request, *args, **kwargs)
+
+
+
+class CheckConfirmationView(TemplateView):
+ template_name = 'users/check_confirmation.html'
+
+ def get_context_data(self, **kwargs):
+ context = super(CheckConfirmationView, self).get_context_data(**kwargs)
+ context['confirm_user'] = User.objects.get(id=kwargs['user_id'])
+ return context
+
+ def get(self, request, *args, **kwargs):
+ try:
+ user = User.objects.get(id=kwargs['user_id'])
+ except User.DoesNotExist:
+ raise Http404
+
+ if user.is_active:
+ raise Http404
+
+ if not default_token_generator.check_token(user,kwargs['token']):
+ raise Http404
+
+ user.is_active = True
+ user.save()
+
+ print("Acitvating %s" % user.username)
+
+ return super(CheckConfirmationView,self).get(self, request, *args, **kwargs)