diff --git a/README.md b/README.md new file mode 100644 index 0000000..ba8b48d --- /dev/null +++ b/README.md @@ -0,0 +1,25 @@ +## TODO +### Form +* tlf field + * type="tel" + * validates in javascript with phonenumber-package + * onkeyup could shows matching user data from inside (name, expires) +* cardnumber field + * js validation + * js lookup from membercardnumber table +* submit button + * grey if form invalid + * blue if form valid + * grey out on submit +* verify consistency + +### Other +* Inside auth and models +* local users tied to inside user +* maybe user add page +* menu with login and logout + +### Backend +* store in inside-table din_phonenumber, din_usedmembercard, din_user +* lookup inside user table +* lookup sms-tables in inside \ No newline at end of file diff --git a/apps/kassa/forms.py b/apps/kassa/forms.py new file mode 100644 index 0000000..c5d8644 --- /dev/null +++ b/apps/kassa/forms.py @@ -0,0 +1,6 @@ +from django.forms import forms +from phonenumber_field.formfields import PhoneNumberField + + +class AddCardForm(forms.Form): + tlf = PhoneNumberField() # Type diff --git a/apps/kassa/templates/kassa/register.html b/apps/kassa/templates/kassa/register.html index 0da588b..3c56278 100644 --- a/apps/kassa/templates/kassa/register.html +++ b/apps/kassa/templates/kassa/register.html @@ -1,2 +1,12 @@ {% extends "base.html" %} -{% block content %}LOL{% endblock %} \ No newline at end of file +{% block content %} +
+
+

Registrer kjøpt medlemskap

+ Telefonnummer som allerede er tilknyttet en bruker i Inside vil få kortnummer registrert på sin bruker. + {{ form }} + + +
+
+{% endblock %} \ No newline at end of file diff --git a/apps/kassa/templates/registration/logged_out.html b/apps/kassa/templates/registration/logged_out.html new file mode 100644 index 0000000..7586462 --- /dev/null +++ b/apps/kassa/templates/registration/logged_out.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} + +{% block title %}Logget ut{% endblock %} + +{% block content %} +
+ +
+{% endblock %} diff --git a/apps/kassa/templates/registration/login.html b/apps/kassa/templates/registration/login.html new file mode 100644 index 0000000..85905d6 --- /dev/null +++ b/apps/kassa/templates/registration/login.html @@ -0,0 +1,17 @@ +{% extends "base.html" %} + +{% block body_classes %}page-login{% endblock %} + +{% block title %}Logg inn{% endblock %} + +{% block content %} +
+
+ +

Logg inn

+ {% include "registration/login_form.html" %} +
+
+{% endblock %} diff --git a/apps/kassa/templates/registration/login_form.html b/apps/kassa/templates/registration/login_form.html new file mode 100644 index 0000000..bbf2392 --- /dev/null +++ b/apps/kassa/templates/registration/login_form.html @@ -0,0 +1,25 @@ +{% load i18n %} +
+
+ {% if form.non_field_errors %} + {{ form.non_field_errors }}
+ {% endif %} + {% csrf_token %} + +
+ + {{ form.username }} {{ form.username.errors }} +
+
+ + {{ form.password }} {{ form.password.errors }} +
+
+ +
+
+ {% trans "Forgot username or password?" %} +
+ +
+
diff --git a/apps/kassa/templates/registration/password_change_done.html b/apps/kassa/templates/registration/password_change_done.html new file mode 100644 index 0000000..f4308b1 --- /dev/null +++ b/apps/kassa/templates/registration/password_change_done.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block title %}Passord endret{% endblock %} +{% block content %} +
+
+

Passordet ditt er endret.

+ Gå tilbake +
+
+{% endblock %} diff --git a/apps/kassa/templates/registration/password_change_form.html b/apps/kassa/templates/registration/password_change_form.html new file mode 100644 index 0000000..cbf2253 --- /dev/null +++ b/apps/kassa/templates/registration/password_change_form.html @@ -0,0 +1,25 @@ +{% extends "base.html" %} +{% block title %}Endre passord{% endblock %} + +{% block content %} +
+
+

Endre passord

+
+ {% if form.non_field_errors %} + {{ form.non_field_errors }}
+ {% endif %} + {% csrf_token %} + +
+ {{ form.new_password1 }} {{ form.new_password1.errors }} +
+ +
+ {{ form.new_password2 }} {{ form.new_password2.errors }} +
+ +
+
+{% endblock %} + diff --git a/apps/kassa/templates/registration/password_reset_complete.html b/apps/kassa/templates/registration/password_reset_complete.html new file mode 100644 index 0000000..a116aa5 --- /dev/null +++ b/apps/kassa/templates/registration/password_reset_complete.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block title %}Passordendring vellykket{% endblock %} +{% block content %} +
+
+

Strålende, passordet ditt har blitt endret!

+

Du kan nå forsøke å logge inn med ditt nye passord.

+
+
+{% endblock %} diff --git a/apps/kassa/templates/registration/password_reset_confirm.html b/apps/kassa/templates/registration/password_reset_confirm.html new file mode 100644 index 0000000..85e82fa --- /dev/null +++ b/apps/kassa/templates/registration/password_reset_confirm.html @@ -0,0 +1,26 @@ +{% extends "base.html" %} +{% block title %}Bekreft nytt passord{% endblock %} +{% block content %} +
+
+ + {% if validlink %} +

Vennligst velg et nytt passord

+

Ditt nye passord må være på miminum 8 tegn.

+
+ {{ form.non_field_errors }} + {% csrf_token %} + +
{{ form.new_password1 }}{{ form.new_password1.errors }}
+ +
{{ form.new_password2 }}{{ form.new_password2.errors }}
+ +
+ {% else %} +

Nytt-passord-lenken er ikke gyldig eller har allerede blitt brukt.

+ + {% endif %} +
+
+ +{% endblock %} diff --git a/apps/kassa/templates/registration/password_reset_done.html b/apps/kassa/templates/registration/password_reset_done.html new file mode 100644 index 0000000..7bb15eb --- /dev/null +++ b/apps/kassa/templates/registration/password_reset_done.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block title %}Passordmail er sent{% endblock %} +{% block content %} +
+
+

Du har nå mottatt en epost med informasjon om hvordan du kan velge et nytt passord.

+

Sjekk eposten din.

+
+
+{% endblock %} diff --git a/apps/kassa/templates/registration/password_reset_email.html b/apps/kassa/templates/registration/password_reset_email.html new file mode 100644 index 0000000..4be3b56 --- /dev/null +++ b/apps/kassa/templates/registration/password_reset_email.html @@ -0,0 +1,2 @@ +Noen har bedt om at passordet for brukeren {{ user.username }} med epostadresse {{ email }} skal endres. Vennligst følg lenken nedenfor: +{{ protocol }}://{{ domain }}{% url "password_reset_confirm" uidb64=uid token=token %} diff --git a/apps/kassa/templates/registration/password_reset_form.html b/apps/kassa/templates/registration/password_reset_form.html new file mode 100644 index 0000000..7ea8806 --- /dev/null +++ b/apps/kassa/templates/registration/password_reset_form.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} +{% load i18n %} +{% block title %}Få nytt passord{% endblock %} +{% block content %} +
+
+ +
+

{% trans "Forgot password?" %}

+ {% if form.non_field_errors %} + {{ form.non_field_errors }}
+ {% endif %} + {% csrf_token %} +
+ + {{ form.email }} {{ form.email.errors }} +
+ +
+
+
+{% endblock %} + diff --git a/apps/kassa/templates/registration/password_reset_subject.txt b/apps/kassa/templates/registration/password_reset_subject.txt new file mode 100644 index 0000000..ccb9fcd --- /dev/null +++ b/apps/kassa/templates/registration/password_reset_subject.txt @@ -0,0 +1 @@ +[{{ site_name }}] Sett nytt passord diff --git a/apps/kassa/urls.py b/apps/kassa/urls.py index 3b37955..934e019 100644 --- a/apps/kassa/urls.py +++ b/apps/kassa/urls.py @@ -2,5 +2,5 @@ from django.conf.urls import url from apps.kassa.views import register urlpatterns = [ - url(r'register/', register) + url(r'^$', register) ] \ No newline at end of file diff --git a/apps/kassa/views.py b/apps/kassa/views.py index 0db9131..a9e4d30 100644 --- a/apps/kassa/views.py +++ b/apps/kassa/views.py @@ -3,12 +3,12 @@ from __future__ import unicode_literals from django.contrib.auth.decorators import login_required from django.shortcuts import render +from apps.kassa.forms import AddCardForm + + @login_required def register(request): - context = {} - return render(request, 'kassa/register.html', context) - - -def home(request): - context = {} + context = { + 'form': AddCardForm() + } return render(request, 'kassa/register.html', context) diff --git a/kassasite/settings.py b/kassasite/settings.py index ca9ceb2..58e27a0 100644 --- a/kassasite/settings.py +++ b/kassasite/settings.py @@ -57,7 +57,9 @@ ROOT_URLCONF = 'kassasite.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': [ + os.path.join(BASE_DIR, 'apps/kassa/templates') + ], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ diff --git a/kassasite/urls.py b/kassasite/urls.py index 8751c7a..8dcfbb8 100644 --- a/kassasite/urls.py +++ b/kassasite/urls.py @@ -19,5 +19,6 @@ from apps.kassa import urls as kassa_urls urlpatterns = [ url(r'^admin/', include(admin.site.urls)), - url(r'^', include(kassa_urls)), + url('^', include(kassa_urls)), + url('^accounts/', include('django.contrib.auth.urls')) ] diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..364e625 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +Django==1.8.2 +django-phonenumber-field==0.7.2