Adds auth templates, reqs, TODOs
This commit is contained in:
1 parent
25dbf545cc
commit
c99327dc1b
19 files changed
+217
-10
No files matched your search
@@ -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
|
||||
@@ -0,0 +1,6 @@
|
||||
from django.forms import forms
|
||||
from phonenumber_field.formfields import PhoneNumberField
|
||||
|
||||
|
||||
class AddCardForm(forms.Form):
|
||||
tlf = PhoneNumberField() # Type
|
||||
@@ -1,2 +1,12 @@
|
||||
{% extends "base.html" %}
|
||||
{% block content %}LOL{% endblock %}
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="small-6 columns">
|
||||
<h2>Registrer kjøpt medlemskap</h2>
|
||||
Telefonnummer som allerede er tilknyttet en bruker i Inside vil få kortnummer registrert på sin bruker.
|
||||
{{ form }}
|
||||
<label for="tlf">Kortnummer</label><input id="card-num" type="number" class="small-6">
|
||||
<button type="submit">Registrer</button>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,12 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Logget ut{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="content row">
|
||||
<div class="large-4 large-centered columns logo">
|
||||
<h2>Du har blitt logget ut.</h2>
|
||||
<p>Vil du <a href="{% url "login" %}">logge inn</a> igjen?</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,17 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block body_classes %}page-login{% endblock %}
|
||||
|
||||
{% block title %}Logg inn{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="content row">
|
||||
<div class="small-4 small-centered columns">
|
||||
<div class="logo">
|
||||
<div class="image-logo"></div>
|
||||
</div>
|
||||
<h3>Logg inn</h3>
|
||||
{% include "registration/login_form.html" %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,25 @@
|
||||
{% load i18n %}
|
||||
<div class="login-form">
|
||||
<form method="post" action="{% url "login" %}">
|
||||
{% if form.non_field_errors %}
|
||||
{{ form.non_field_errors }}<br />
|
||||
{% endif %}
|
||||
{% csrf_token %}
|
||||
<input type="hidden" name="next" value="{{ next }}" />
|
||||
<div>
|
||||
<label>{% trans "Email" %}</label>
|
||||
{{ form.username }} {{ form.username.errors }}
|
||||
</div>
|
||||
<div>
|
||||
<label>{% trans "Password" %}</label>
|
||||
{{ form.password }} {{ form.password.errors }}
|
||||
</div>
|
||||
<div>
|
||||
<button type="submit" class="large-12 large-centered columns btn-action">{% trans "Log in" %}</button>
|
||||
</div>
|
||||
<div class="text-right">
|
||||
<a href="{% url "password_reset" %}">{% trans "Forgot username or password?" %}</a>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
@@ -0,0 +1,10 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Passord endret{% endblock %}
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="large-5 large-centered columns text-center">
|
||||
<h2>Passordet ditt er endret.</h2>
|
||||
<a href="/" class="btn">Gå tilbake</a>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,25 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Endre passord{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="small-5 small-centered columns">
|
||||
<h1>Endre passord</h1>
|
||||
<form method="post">
|
||||
{% if form.non_field_errors %}
|
||||
{{ form.non_field_errors }}<br />
|
||||
{% endif %}
|
||||
{% csrf_token %}
|
||||
<label for="id_new_password1">Nytt passord:</label>
|
||||
<div>
|
||||
{{ form.new_password1 }} {{ form.new_password1.errors }}
|
||||
</div>
|
||||
<label for="id_new_password2">Bekeft nytt passord:</label>
|
||||
<div>
|
||||
{{ form.new_password2 }} {{ form.new_password2.errors }}
|
||||
</div>
|
||||
<button type="submit" class="btn-action right">Endre passordet mitt</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Passordendring vellykket{% endblock %}
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="small-6 small-centered columns">
|
||||
<h2>Strålende, passordet ditt har blitt endret!</h2>
|
||||
<p>Du kan nå forsøke å <a href="/">logge inn</a> med ditt nye passord.</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,26 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Bekreft nytt passord{% endblock %}
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="small-5 small-centered columns">
|
||||
<!--Presents a form for entering a new password.-->
|
||||
{% if validlink %}
|
||||
<h1>Vennligst velg et nytt passord</h1>
|
||||
<p>Ditt nye passord må være på miminum 8 tegn.</p>
|
||||
<form method="post">
|
||||
{{ form.non_field_errors }}
|
||||
{% csrf_token %}
|
||||
<label for="id_new_password1">Nytt passord: </label>
|
||||
<div>{{ form.new_password1 }}{{ form.new_password1.errors }}</div>
|
||||
<label for="id_new_password2">Bekreft nytt passord: </label>
|
||||
<div>{{ form.new_password2 }}{{ form.new_password2.errors }}</div>
|
||||
<button type="submit" class="btn-action right">Endre passordet mitt</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<p>Nytt-passord-lenken er ikke gyldig eller har allerede blitt brukt.</p>
|
||||
<!--The password reset link is not valid or allready used.-->
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,10 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Passordmail er sent{% endblock %}
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="small-6 small-centered columns">
|
||||
<p>Du har nå mottatt en epost med informasjon om hvordan du kan velge et nytt passord.<br/></p>
|
||||
<p>Sjekk eposten din.</p>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -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 %}
|
||||
@@ -0,0 +1,23 @@
|
||||
{% extends "base.html" %}
|
||||
{% load i18n %}
|
||||
{% block title %}Få nytt passord{% endblock %}
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="large-4 large-centered columns">
|
||||
<!--Allows a user to reset their password by generating a one-time use link that can be used to reset the password, and sending that link to the user's registered email address.-->
|
||||
<form method="post">
|
||||
<h1>{% trans "Forgot password?" %}</h1>
|
||||
{% if form.non_field_errors %}
|
||||
{{ form.non_field_errors }}<br />
|
||||
{% endif %}
|
||||
{% csrf_token %}
|
||||
<div>
|
||||
<label>{% trans "Email" %}</label>
|
||||
{{ form.email }} {{ form.email.errors }}
|
||||
</div>
|
||||
<button type="submit" class="large-12 large-centered columns btn-action">{% trans "Send a new one" %}</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
[{{ site_name }}] Sett nytt passord
|
||||
+1
-1
@@ -2,5 +2,5 @@ from django.conf.urls import url
|
||||
from apps.kassa.views import register
|
||||
|
||||
urlpatterns = [
|
||||
url(r'register/', register)
|
||||
url(r'^$', register)
|
||||
]
|
||||
+6
-6
@@ -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)
|
||||
@@ -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': [
|
||||
|
||||
+2
-1
@@ -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'))
|
||||
]
|
||||
@@ -0,0 +1,2 @@
|
||||
Django==1.8.2
|
||||
django-phonenumber-field==0.7.2
|
||||
Reference in new issue
Block a user