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/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 +++++++++------------- 7 files changed, 165 insertions(+), 50 deletions(-) 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/templates') 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 }} +

+ +

-- cgit v1.2.3