Merge 76b6fea into b177ce2

rloomans · Aug 11, 2018 · ce125b6 · ce125b6
2 parents b177ce2 + 76b6fea
commit ce125b6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -9,6 +9,7 @@ django-filter==2.0.0
 djangorestframework==3.8.2
 django-secure==1.0.1
 django-toolbelt==0.0.1
+django-user-sessions==1.5.3
 gunicorn==19.9.0
 gviz_api==1.9.0
 py-bcrypt==0.4

diff --git a/teamtemp/settings/base.py b/teamtemp/settings/base.py
@@ -87,8 +87,8 @@
     'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.middleware.gzip.GZipMiddleware',
     'django.middleware.http.ConditionalGetMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
+    'user_sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
@@ -104,7 +104,7 @@
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
-    'django.contrib.sessions',
+    'user_sessions',
     # 'django.contrib.sites',
     'django.contrib.messages',
     'whitenoise.runserver_nostatic',
@@ -124,7 +124,7 @@
 )
 
 SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'
-SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
+SESSION_ENGINE = 'user_sessions.backends.db'
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
@@ -216,6 +216,7 @@
 
 LOGIN_URL = "/djadmin/login/"
 LOGOUT_URL = "/djadmin/logout/"
+LOGOUT_REDIRECT_URL = "/"
 
 WORDCLOUD_HEIGHT = 400
 WORDCLOUD_WIDTH = 500

diff --git a/teamtemp/templates/user_sessions/_base.html b/teamtemp/templates/user_sessions/_base.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% load bootstrap3 %}
+
+{% block title %}Sessions{% endblock %}
+
+{% block body %}
+  <div class="container">
+    {% block content %}{% endblock %}
+  </div>
+{% endblock %}
diff --git a/teamtemp/urls.py b/teamtemp/urls.py
@@ -79,6 +79,7 @@
     re_path(r'^djadmin/', djadmin.site.urls),
     re_path(r'^api/', include(router.urls)),
     re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    re_path(r'', include('user_sessions.urls', namespace='user_sessions')),
     re_path(r'^docs/', include_docs_urls(title='Team Temperature API')),
     re_path(r'^csp/', include('cspreports.urls')),
 ]