From 0e1a08683b888606fb9566113cbaff41c6b65d39 Mon Sep 17 00:00:00 2001 From: Kyle Blanker Date: Tue, 12 Sep 2017 14:46:33 -0400 Subject: Fixed up login page, added auth middleware, adding company crud operations --- app/dispatch/middleware.py | 31 ++++++++++ app/dispatch/templates/dispatch/base.html | 30 ++++++++-- .../templates/dispatch/companies/create.html | 15 +++++ .../templates/dispatch/companies/detail.html | 10 ++++ .../templates/dispatch/companies/edit.html | 15 +++++ .../templates/dispatch/companies/list.html | 39 ++++++++++++ app/dispatch/templates/dispatch/index.html | 36 +++++++++-- app/dispatch/templates/dispatch/login.html | 70 +++++++++------------- app/dispatch/urls.py | 12 +++- app/dispatch/views.py | 57 +++++++++++------- 10 files changed, 241 insertions(+), 74 deletions(-) create mode 100644 app/dispatch/middleware.py create mode 100644 app/dispatch/templates/dispatch/companies/create.html create mode 100644 app/dispatch/templates/dispatch/companies/detail.html create mode 100644 app/dispatch/templates/dispatch/companies/edit.html create mode 100644 app/dispatch/templates/dispatch/companies/list.html (limited to 'app/dispatch') diff --git a/app/dispatch/middleware.py b/app/dispatch/middleware.py new file mode 100644 index 0000000..2b3e349 --- /dev/null +++ b/app/dispatch/middleware.py @@ -0,0 +1,31 @@ +from django.http import HttpResponseRedirect +from django.conf import settings +from re import compile +from django.core.urlresolvers import reverse + +EXEMPT_URLS = [reverse('login'),reverse('logout')] + +if hasattr(settings, 'LOGIN_EXEMPT_URLS'): + EXEMPT_URLS += settings.LOGIN_EXEMPT_URLS + +""" +Middleware that requires a user to be authenticated to view any page other +than LOGIN_URL. Exemptions to this requirement can optionally be specified +in settings via a list of regular expressions in LOGIN_EXEMPT_URLS (which +you can copy from your urls.py). + +Requires authentication middleware and template context processors to be +loaded. You'll get an error if they aren't. +""" +class LoginRequiredMiddleware(object): + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + if not request.user or not request.user.is_authenticated(): + path = request.path_info + if path not in EXEMPT_URLS: + login_uri = '%s?next=%s' % (settings.LOGIN_URL, request.path_info) + return HttpResponseRedirect(login_uri) + + return self.get_response(request) \ No newline at end of file diff --git a/app/dispatch/templates/dispatch/base.html b/app/dispatch/templates/dispatch/base.html index 8654d2e..d7a85a9 100644 --- a/app/dispatch/templates/dispatch/base.html +++ b/app/dispatch/templates/dispatch/base.html @@ -12,18 +12,40 @@ - +

Dispatch Tracker +

Dispatch Tracker

Navbar Link
Drivers
Companies
Contacts
Logout
Login

Navbar Link
Drivers
Companies
Contacts
Logout
Login

diff --git a/app/dispatch/templates/dispatch/companies/create.html b/app/dispatch/templates/dispatch/companies/create.html new file mode 100644 index 0000000..fb6030e --- /dev/null +++ b/app/dispatch/templates/dispatch/companies/create.html @@ -0,0 +1,15 @@ +{% extends 'dispatch/base.html' %} + + +{% block content %} +

New Company

+ + +{% endblock %} diff --git a/app/dispatch/templates/dispatch/companies/detail.html b/app/dispatch/templates/dispatch/companies/detail.html new file mode 100644 index 0000000..e939fdb --- /dev/null +++ b/app/dispatch/templates/dispatch/companies/detail.html @@ -0,0 +1,10 @@ +{% extends 'dispatch/base.html' %} + + +{% block content %} +

{{ object.name }} details

+{% endblock %} diff --git a/app/dispatch/templates/dispatch/companies/edit.html b/app/dispatch/templates/dispatch/companies/edit.html new file mode 100644 index 0000000..fe8460d --- /dev/null +++ b/app/dispatch/templates/dispatch/companies/edit.html @@ -0,0 +1,15 @@ +{% extends 'dispatch/base.html' %} + + +{% block content %} +

+ + +{% endblock %} diff --git a/app/dispatch/templates/dispatch/companies/list.html b/app/dispatch/templates/dispatch/companies/list.html new file mode 100644 index 0000000..48612d9 --- /dev/null +++ b/app/dispatch/templates/dispatch/companies/list.html @@ -0,0 +1,39 @@ +{% extends 'dispatch/base.html' %} + + +{% block content %} +

Companies

+ Add Company +

+ + + + + + + + + + + {% for company in object_list %} + + + + + + + + {% empty %} + + {% endfor %} + +

Name	Address	Phone	Email
{{ company.name }}	{{ company.address }}	{{ company.phone_number }}	{{ company.email_address }}	+ Edit + View +
No companies yet.

+{% endblock %} diff --git a/app/dispatch/templates/dispatch/index.html b/app/dispatch/templates/dispatch/index.html index fd87570..79df18c 100644 --- a/app/dispatch/templates/dispatch/index.html +++ b/app/dispatch/templates/dispatch/index.html @@ -2,8 +2,36 @@ {% block content %} -
- -

Index Page

- +

Tuesday, September 12, 2017

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Driver	Company	Load	Amount
Alvin	Eclair	Ecasdfasflair	$0.87
Alan	Jellybean	Ecasdfasflair	$3.76
Jonathan	Lollipop	Ecasdfasflair	$7.00

{% endblock %} diff --git a/app/dispatch/templates/dispatch/login.html b/app/dispatch/templates/dispatch/login.html index b43f363..eb7f1a7 100644 --- a/app/dispatch/templates/dispatch/login.html +++ b/app/dispatch/templates/dispatch/login.html @@ -1,51 +1,37 @@ {% extends 'dispatch/base.html' %} - - {% block content %} - {% if form.errors %} - -

Your username and password didn't match. Please try again.

-{% endif %} - -{% if next %} - {% if user.is_authenticated %} - -

Your account doesn't have access to this page. To proceed, - please login with an account that has access.

- {% else %} - -

Please login to see this page.

- {% endif %} -{% endif %} -

Please Sign In

+ {% if form.errors %} +

+ Your username and password didn't match. Please try again. +

-{% csrf_token %} -

- - - - - - - - - -
{{ form.username.label_tag }} {{ form.username }}
{{ form.password.label_tag }} {{ form.password }}
-

- - -

+ {% endif %} +

+ + Please Sign In + + + {% csrf_token %} +

+ {{ form.username }} + {{ form.username.label_tag }} +

+ {{ form.password }} + {{ form.password.label_tag }} +

+ +

diff --git a/app/dispatch/urls.py b/app/dispatch/urls.py index d40462b..688839e 100644 --- a/app/dispatch/urls.py +++ b/app/dispatch/urls.py @@ -1,12 +1,18 @@ from django.conf.urls import url from . import views - +from django.conf import settings from django.contrib.auth import views as authviews urlpatterns = [ url(r'^$', views.home, name='home'), - url(r'^login/$', authviews.LoginView.as_view(template_name="dispatch/login.html")), - url(r'^logout/$', views.logout), + url(r'^%s$' % settings.LOGIN_URL, authviews.LoginView.as_view(template_name="dispatch/login.html"), name='login'), + url(r'^logout/$', authviews.LogoutView.as_view(next_page='/'), name='logout'), + + url(r'^companies/$', views.CompanyList.as_view(), name='company_list'), + url(r'^companies/new$', views.CompanyCreate.as_view(), name='company_new'), + url(r'^companies/view/(?P\d+)$', views.CompanyDetail.as_view(), name='company_detail'), + url(r'^companies/edit/(?P\d+)$', views.CompanyUpdate.as_view(), name='company_edit'), + url(r'^companies/delete/(?P\d+)$', views.CompanyDelete.as_view(), name='company_delete'), ] diff --git a/app/dispatch/views.py b/app/dispatch/views.py index 916c04b..600a746 100644 --- a/app/dispatch/views.py +++ b/app/dispatch/views.py @@ -1,30 +1,45 @@ from django.shortcuts import render, redirect from django.http import HttpResponse from django.template import loader - -from django.contrib.auth.decorators import login_required -# from django.contrib.auth import authenticate, login, logout +from django.core.urlresolvers import reverse import django.contrib.auth as auth - +from django.conf import settings # Create your views here. +from django.views.generic import TemplateView,ListView +from django.views.generic.detail import DetailView +from django.views.generic.edit import CreateView, UpdateView, DeleteView +from django.core.urlresolvers import reverse_lazy +from dispatch.models import Company - -@login_required(login_url="login/") def home(request): return render(request,"dispatch/index.html") -def login(request): - username = request.POST['username'] - password = request.POST['password'] - user = auth.authenticate(request, username=username, password=password) - if user is not None: - auth.login(request, user) - return redirect('/dispatch/') - else: - template = loader.get_template('dispatch/login.html') - context = {} - return HttpResponse(template.render(context, request)) - -def logout(request): - auth.logout(request) - return redirect('/dispatch/login', permanent=False) + +class CompanyList(ListView): + template_name = "dispatch/companies/list.html" + model = Company + +class CompanyCreate(CreateView): + template_name = "dispatch/companies/create.html" + model = Company + success_url = reverse_lazy('company_list') + fields = ['name', 'address', 'phone_number','email_address'] + +class CompanyDetail(DetailView): + template_name = "dispatch/companies/detail.html" + model = Company + + def get_context_data(self, **kwargs): + context = super(CompanyDetail, self).get_context_data(**kwargs) + return context + +class CompanyUpdate(UpdateView): + template_name = "dispatch/companies/edit.html" + model = Company + success_url = reverse_lazy('company_list') + fields = ['name', 'address', 'phone_number','email_address'] + +class CompanyDelete(DeleteView): + template_name = "dispatch/companies/delete.html" + model = Company + success_url = reverse_lazy('company_list') \ No newline at end of file -- cgit v1.2.3