Basic login and logout

counter/models.py

@@ -1,12 +1,14 @@
 from django.db import models
 from datetime import datetime
 from babel.dates import format_timedelta
+from django.contrib.auth.models import User
 
 # Create your models here.
 class Counter(models.Model):
     name = models.CharField("Nom",max_length=60)
     email = models.EmailField("Email",max_length=264,default="null@localhost")
     trigramme = models.CharField("Trigramme", max_length=3)
+    user = models.ForeignKey(User,blank=True,null=True)
 
     def __str__(self):
         return "%s (%s)" % (self.trigramme,self.name)

counter/templates/homeTemplate.html

@@ -3,35 +3,6 @@
 	<h1>SeumBook™</h1>
 </div>
 <div class="container-fluid">
-	{% if chooseCounter %}
-	<div class="row" id="my-counter">
-		<div class="col-sm-12">
-			<div class="panel panel-warning">
-				<div class="panel-heading">
-					<h2 class="panel-title">Mon compteur</h2>
-				</div>
-				<div class="panel-body">
-					<p>Choisis ton compteur pour qu'il apparaisse en haut de la liste quand tu reviendras sur le site !</p>
-					<form action="{% url 'set-my-counter'%}" method="post">
-						{% csrf_token %}
-						<div class="form-group">
-							<label for="myCounterSelect">Mon trigramme:</label>
-							<select class="form-control" name="myCounter">
-								{% for counter in counters %}
-								<option value="{{ counter.id }}">{{ counter.trigramme }} ({{ counter.name }})</option>
-								{% endfor %}
-							</select>
-						</div>
-						<input type="hidden" name="redirect" value="{% url 'home' %}"></input>
-						<div class="text-center">
-							<button type="submit" class="btn btn-default btn-success">Définir mon compteur</button>
-						</div>
-					</form>
-				</div>
-			</div>
-		</div>
-	</div>
-	{% else %}
 	<div class="row" id="my-counter">
 		<div class="col-sm-12">
 			<div class="panel panel-warning">
@@ -69,7 +40,6 @@
 			</div>
 		</div>
 	</div>
-	{% endif %}
 	<div class="row">
 		{% for counter in counters %} {% if chooseCounter or not counter.id == myCounter.id %}
 		<div class="col-md-4 col-sm-6 col-lg-3">
@@ -160,10 +130,6 @@
 	</div>
 </div>
 <div class="row text-center">
-	<form action="{% url 'reset-my-counter' %}" method="post">
-		{% csrf_token %}
-		<input type="hidden" name="redirect" value="{% url 'home' %}"></input>
-		<button type="submit" class="btn btn-success">Changer mon compteur</button>
-	</form>
+		<a href="{% url 'logout' %}" class="btn btn-danger">Se déconnecter</a>
 </div>
 {% endblock %}

counter/templates/login.html

@@ -0,0 +1,45 @@
+{% extends 'baseTemplate.html' %} {% block title %}Login{% endblock %}{% block content %}
+<div class="container">
+    <div class="row">
+        <div class="text-center">
+            <h1>SeumBook™</h1>
+        </div>
+    </div>
+    <div class="row">
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                <h2 class="panel-title">Connecte toi pour avoir le seum !</h2>
+            </div>
+            <div class=" panel-body">
+                <form class='' method="POST" action="{% url 'login' %}">
+                    {% csrf_token %}
+                    <div class="form-group">
+                        <label for="id_username">Trigramme</label>
+                        <input id="id_username" maxlength="3" type="text" class="form-control text-uppercase" name="username" />
+                    </div>
+                    <div class="form-group">
+                        <label for="id_username">Mot de passe</label>
+                        <input id="id_username" type="password" class="form-control" name="password" />
+                    </div>
+                    <input type="hidden" name="next" value="{{ next }}" />
+                    <div class="text-center">
+                        <button type="submit" class="btn btn-default btn-success">Se connecter</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    {% if form.errors %}
+    <div class="row">
+        <div class="panel panel-danger">
+            <div class="panel-heading">
+                <h2 class="panel-title">Erreur</h2>
+            </div>
+            <div class=" panel-body">
+                <p>T'arrives même pas à te connecter, seum.</p>
+            </div>
+        </div>
+    </div>
+    {% endif %}
+</div>
+{% endblock %}

counter/urls.py

@@ -1,5 +1,6 @@
 from django.conf.urls import url
 from counter.rss import SeumFeed
+from django.contrib.auth import views as auth_views
 
 from . import views
 
@@ -7,7 +8,11 @@ urlpatterns = [
     url(r'^$', views.home, name="home"),
     url(r'^reset-counter', views.resetCounter, name="reset-counter"),
     url(r'^counter/(?P<id_counter>\d+)$', views.counter, name="counter"),
-    url(r'^set-my-counter', views.setMyCounter, name="set-my-counter"),
-    url(r'^reset-my-counter', views.resetMyCounter, name="reset-my-counter"),
-    url(r'^rss', SeumFeed())
+    url(r'^rss', SeumFeed()),
+    url(r'^login', auth_views.login,
+        {'template_name': 'login.html'},
+        name="login"),
+    url(r'^logout', auth_views.logout,
+        {'next_page': 'login'},
+        name='logout')
 ]

counter/views.py

@@ -5,6 +5,7 @@ from datetime import datetime, timedelta
 from django import forms
 from django.http import HttpResponseRedirect
 from django.core.mail import EmailMessage
+from django.contrib.auth.decorators import login_required
 from graphos.renderers import gchart
 from graphos.sources.simple import SimpleDataSource
 from graphos.sources.model import ModelDataSource
@@ -14,6 +15,7 @@ import copy
 from django.utils import timezone
 
 
+@login_required
 def home(request):
     # JSS above this limit will not be displayed on the col graph
     JSS_limit = 7
@@ -24,32 +26,27 @@ def home(request):
     # Calculates infos for each counter
     timezero = timedelta(0)
 
-    # First we determine if the session
-    if 'my-counter' in request.session:
-        chooseCounter = False
-        try:
-            myCounter = Counter.objects.get(id=request.session['my-counter'])
-            lastReset = Reset.objects.filter(
-                counter=myCounter).order_by('-timestamp')
-            if (lastReset.count() == 0):
-                # This person never had the seum
-                myCounter.lastReset = Reset()
-                myCounter.lastReset.delta = timezero
-                myCounter.lastReset.noSeum = True
-            else:
-                myCounter.lastReset = lastReset[0]
-                myCounter.lastReset.noSeum = False
-                myCounter.lastReset.delta = datetime.now(
-                ) - myCounter.lastReset.timestamp.replace(tzinfo=None)
-                myCounter.seumCount = Reset.objects.filter(
-                    counter=myCounter).count()
-            myCounter.lastReset.formatted_delta = format_timedelta(
-                myCounter.lastReset.delta, locale='fr', threshold=1)
-        except ObjectDoesNotExist:
-            chooseCounter = True
-    else:
-        myCounter = None
-        chooseCounter = True
+    # First select our counter
+    try:
+        myCounter = Counter.objects.get(user__id=request.user.id)
+        lastReset = Reset.objects.filter(
+            counter=myCounter).order_by('-timestamp')
+        if (lastReset.count() == 0):
+            # This person never had the seum
+            myCounter.lastReset = Reset()
+            myCounter.lastReset.delta = timezero
+            myCounter.lastReset.noSeum = True
+        else:
+            myCounter.lastReset = lastReset[0]
+            myCounter.lastReset.noSeum = False
+            myCounter.lastReset.delta = datetime.now(
+            ) - myCounter.lastReset.timestamp.replace(tzinfo=None)
+            myCounter.seumCount = Reset.objects.filter(
+                counter=myCounter).count()
+        myCounter.lastReset.formatted_delta = format_timedelta(
+            myCounter.lastReset.delta, locale='fr', threshold=1)
+    except Counter.DoesNotExist:
+        return HttpResponseRedirect('login')
 
     # Building data for counters display
     counters = Counter.objects.all()
@@ -212,11 +209,11 @@ def home(request):
         'noGraph': noGraph,
         'noBestSeum': noBestSeum,
         'noSeumActivity': noSeumActivity,
-        'chooseCounter': chooseCounter,
         'myCounter': myCounter,
     })
 
 
+@login_required
 def resetCounter(request):
     # Update Form counter
     if (request.method == 'POST'):
@@ -246,6 +243,7 @@ P.S. : Pour ne plus recevoir ces messages, envoie un mail à denis.merigoux@gmai
     return HttpResponseRedirect(data['redirect'][0])
 
 
+@login_required
 def counter(request, id_counter):
 
     counter = Counter.objects.get(pk=id_counter)
@@ -312,19 +310,3 @@ def counter(request, id_counter):
         'resets': resets,
         'seumFrequency': seumFrequency
     })
-
-
-def setMyCounter(request):
-    if (request.method == 'POST'):
-        # create a form instance and populate it with data from the request:
-        data = dict(request.POST)
-        # We put the id of the counter in the session
-        request.session['my-counter'] = data['myCounter'][0]
-        return HttpResponseRedirect(data['redirect'][0])
-
-
-def resetMyCounter(request):
-    if (request.method == 'POST'):
-        data = dict(request.POST)
-        del request.session['my-counter']
-        return HttpResponseRedirect(data['redirect'][0])

seum/settings.py.default

@@ -132,3 +132,6 @@ EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
 EMAIL_USE_TLS = False
 DEFAULT_FROM_EMAIL = 'SeumMan <seum@merigoux.ovh>'
+
+LOGIN_URL = 'login'
+LOGIN_REDIRECT_URL = 'home'