diff --git a/main/urls.py b/main/urls.py index 11f3404..9b4dc37 100644 --- a/main/urls.py +++ b/main/urls.py @@ -2,4 +2,5 @@ from django.conf.urls.defaults import patterns, include, url urlpatterns = patterns('', url(r'^$', 'bbs.main.views.home', name='home'), + url(r'^register/$', 'bbs.main.views.register', name='register'), ) diff --git a/main/views.py b/main/views.py index 14a7c40..fcc3ecb 100755 --- a/main/views.py +++ b/main/views.py @@ -1,11 +1,34 @@ # Create your views here. +from django.contrib.auth import login, logout as auth_logout +from django.contrib.auth.decorators import login_required +from django.contrib.auth.forms import AuthenticationForm from django.core.urlresolvers import reverse +from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext from models import * def home(request): + if request.method == "POST": + form = AuthenticationForm(data=request.POST) + if form.is_valid(): + # Log the user in. + login(request, form.get_user()) + else: + if request.user.is_authenticated(): + # Redirect to the register + return HttpResponseRedirect( reverse('bbs.main.views.register') ) + else: + form = AuthenticationForm(request) + return render_to_response('home.html', locals(), context_instance=RequestContext(request)) + +@login_required +def register(request): products = Product.objects.all() users = User.objects.all() - return render_to_response('home.html', locals(), context_instance=RequestContext(request)) + return render_to_response('register.html', locals(), context_instance=RequestContext(request)) + +def logout(request): + auth_logout(request) + return render_to_response('registration/logout.html', locals(), context_instance=RequestContext(request)) diff --git a/templates/home.html b/templates/home.html index 9e6093f..8bb4b5d 100644 --- a/templates/home.html +++ b/templates/home.html @@ -4,21 +4,5 @@ {%endblock%} {%block content%} -
-
-Selg til: -{% for user in users %} -  -{% endfor %} -
-
-Vi selger:
-{% for product in products %} -  -  -{% endfor %} -
-
Totalt:
-  -
+Kasse {%endblock%} diff --git a/templates/register.html b/templates/register.html new file mode 100644 index 0000000..d67e15b --- /dev/null +++ b/templates/register.html @@ -0,0 +1,29 @@ +{% extends "base.html" %} +{%block header%} +

Biceps Bar System

+{%endblock%} + +{%block content%} + +
+
+Selg til: +{% for user in users %} +  +{% endfor %} +
+
+Vi selger:
+{% for product in products %} +  +  +{% endfor %} +
+
Totalt:
+  +
+{%endblock%} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 0000000..d2094be --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block title %}Logg inn{% endblock %} + +{% block content %} +{% include "registration/login_form.html" %} + +{% endblock %} diff --git a/templates/registration/login_form.html b/templates/registration/login_form.html new file mode 100644 index 0000000..1ce9f3d --- /dev/null +++ b/templates/registration/login_form.html @@ -0,0 +1,20 @@ +{% if form.errors %} +

Brukernavn og passord stemmer ikke overens. Prøv igjen.

+{% endif %} + +
+{% csrf_token %} + + + + + + + + + +
{{ form.username }}
{{ form.password }}
+ + + +
diff --git a/templates/registration/logout.html b/templates/registration/logout.html new file mode 100644 index 0000000..5559caf --- /dev/null +++ b/templates/registration/logout.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block title %}Logg inn{% endblock %} + +{% block content %} +Du er logget ut. Vil du logge inn igjen. + +{% endblock %} diff --git a/urls.py b/urls.py index 08ad56e..b986b2f 100755 --- a/urls.py +++ b/urls.py @@ -4,7 +4,9 @@ admin.autodiscover() urlpatterns = patterns('', url(r'^$', 'main.views.home', name='home'), - url(r'^bbs/', include('main.urls')), + url(r'', include('main.urls')), + url(r'^accounts/login/$', 'django.contrib.auth.views.login'), + url(r'^logout/$', 'main.views.logout'), url(r'^admin/', include(admin.site.urls)), # Uncomment the admin/doc line below to enable admin documentation: