ztimson/oacpl
ztimson/oacpl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Added backend for login page

Browse Source
This commit is contained in:
Zak Timson 2017-09-15 12:41:20 -04:00
parent 7c2fd01b3f
commit ef69d57661
3 changed files with 153 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
main/templates/login.html
View File

@ -1,149 +1,72 @@
{% extends 'base.html' %}
{% load static %} {% load static %}
<html> {% block head %}
<head>
<style> <style>
@import url(https://fonts.googleapis.com/css?family=Roboto:300);
.login-page {
width: 360px;
padding: 8% 0 0;
margin: auto;
}
.form {
position: relative;
z-index: 1;
background: #FFFFFF;
max-width: 360px;
margin: 0 auto 100px;
padding: 45px;
text-align: center;
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.2), 0 5px 5px 0 rgba(0, 0, 0, 0.24);
}
.form input {
font-family: "Roboto", sans-serif;
outline: 0;
background: #f2f2f2;
width: 100%;
border: 0;
margin: 0 0 15px;
padding: 15px;
box-sizing: border-box;
font-size: 14px;
}
.form button {
font-family: "Roboto", sans-serif;
text-transform: uppercase;
outline: 0;
background: #4CAF50;
width: 100%;
border: 0;
padding: 15px;
color: #FFFFFF;
font-size: 14px;
-webkit-transition: all 0.3 ease;
transition: all 0.3 ease;
cursor: pointer;
}
.form button:hover,.form button:active,.form button:focus {
background: #43A047;
}
.form .message {
margin: 15px 0 0;
color: #b3b3b3;
font-size: 12px;
}
.form .message a {
color: #4CAF50;
text-decoration: none;
}
.form .register-form {
display: none;
}
.container {
position: relative;
z-index: 1;
max-width: 300px;
margin: 0 auto;
}
.container:before, .container:after {
content: "";
display: block;
clear: both;
}
.container .info {
margin: 50px auto;
text-align: center;
}
.container .info h1 {
margin: 0 0 15px;
padding: 0;
font-size: 36px;
font-weight: 300;
color: #1a1a1a;
}
.container .info span {
color: #4d4d4d;
font-size: 12px;
}
.container .info span a {
color: #000000;
text-decoration: none;
}
.container .info span .fa {
color: #EF3B3A;
}
body { body {
background: #76b852; /* fallback for old browsers */ background-color: #0F4C85;
background: -webkit-linear-gradient(right, #76b852, #8DC26F); }
background: -moz-linear-gradient(right, #76b852, #8DC26F);
background: -o-linear-gradient(right, #76b852, #8DC26F); .login {
background: linear-gradient(to left, #76b852, #8DC26F); background-color: #F7F7F7;
font-family: "Roboto", sans-serif; border-radius: 2px;
-webkit-font-smoothing: antialiased; box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3)
-moz-osx-font-smoothing: grayscale; }
.btn, .form-control {
border-radius: 0;
} }
</style> </style>
<script> <script>
$(function() { $(function() {
$('.message a').click(function(){ $('#register-mode').click(function() {
$('form').animate({height: "toggle", opacity: "toggle"}, "slow"); $('#login-form').collapse('hide');
$('#register-form').collapse('show');
});
$('#login-mode').click(function() {
$('#login-form').collapse('show');
$('#register-form').collapse('hide');
}); });
}); });
</script> </script>
</head> {% endblock %}
<body> {% block body %}
<div class="login-page"> <div class="col-sm-11 col-md-6 col-lg-4 col-xl-2 mx-auto mt-5 p-5 login">
<div class="form"> <div class="form">
<a class="navbar-brand text-dark-primary" href="{% url 'home' %}"> <div class="my-4">
<img src="{% static 'main/img/logo.png' %}" width="30" height="30" class="d-inline-block align-top" alt=""> <img src="{% static 'main/img/logo.png' %}" height="30px" width="auto">
<div class="d-none d-sm-inline-block"> <a class="navbar-brand text-dark-primary" href="{% url 'home' %}" style="vertical-align: sub">
ONTARIO ASSOCIATION OF OACPL
<br> <div class="d-inline-block d-sm-none">
CHILD PROTECTION LAWYERS OACPL
</div>
</a>
</div> </div>
<div class="d-inline-block d-sm-none">
OACPL <form id="login-form" class="collapse show" method="post">
</div> {% csrf_token %}
</a> <input type="hidden" name="request" value="login">
<form class="register-form"> <input type="text" class="form-control mb-2 p-2" name="username" placeholder="Username"/>
<input type="text" placeholder="name"/> <input type="password" class="form-control mb-2 p-2" name="password" placeholder="Password"/>
<input type="password" placeholder="password"/> <button class="btn btn-primary col-12 mb-2 p-2">login</button>
<input type="text" placeholder="email address"/> <p class="text-muted"><a id="register-mode">Register</a></p>
<button>create</button> </form>
<p class="message">Already registered? <a href="#">Sign In</a></p>
</form> <form id="register-form" class="collapse" method="post">
<form class="login-form"> {% csrf_token %}
<input type="text" placeholder="username"/> <input type="hidden" name="request" value="register">
<input type="password" placeholder="password"/> <input type="text" class="form-control mb-2 p-2" name="username" placeholder="Username"/>
<button>login</button> <input type="text" class="form-control mb-2 p-2" name="email" placeholder="Email"/>
<p class="message">Not registered? <a href="#">Create an account</a></p> <input type="password" class="form-control mb-2 p-2" name="password" placeholder="Password"/>
</form> <input type="password" class="form-control mb-2 p-2" placeholder="Confirm Password"/>
<input type="checkbox" class="form-control mb-2" name="newsletter"> Newsletter
<input type="checkbox" class="form-control mb-2" name="caselaw"> Case Law Access
<button class="btn btn-primary col-12 mb-2 p-2">Register</button>
<p class="text-muted"><a id="login-mode">Login</a></p>
</form>
</div>
</div> </div>
</div> {% endblock %}
</body>
</html>

35
main/views.py
View File

@ -1,9 +1,9 @@
import json from django.shortcuts import render, redirect
from django.shortcuts import HttpResponse, render, redirect
from django.contrib import auth from django.contrib import auth
from django.contrib.auth.models import User
from charter_members.models import Attorney from charter_members.models import Attorney
from newsletters.models import Subscriber
def index(request): def index(request):
@ -13,13 +13,30 @@ def index(request):
def login(request): def login(request):
if request.method == 'POST': if request.method == 'POST':
user = auth.authenticate(request) if request.POST.get('request') == 'login':
if user: user = auth.authenticate(request, username=request.POST.get('username'), password=request.POST.get('password'))
return HttpResponse(json.dumps({'status': True})) if user:
else: auth.login(request, user)
return HttpResponse(json.dumps({'status': False})) return redirect('/')
else:
return render(request, 'login.html', {'navbar': False, 'footer': False, 'failed': True})
elif request.POST.get('request') == 'register':
user = User.objects.create_user(request.POST.get('username'),
email=request.POST.get('email'),
password=request.POST.get('password'))
user.save()
# TODO: Send confirmation email
if request.POST.get('newsletter'):
Subscriber.objects.create(email=request.POST.get('email'))
# TODO: If Case law access was requested, send an email out to staff
auth.login(request, user)
return redirect('/')
elif request.POST.get('request') == 'reset':
# TODO: Reset password and send email
pass
else: else:
return render(request, 'login.html') return render(request, 'login.html', {'navbar': False, 'footer': False})
def logout(request): def logout(request):

135
templates/base.html
View File

@ -24,77 +24,82 @@
<body> <body>
{% csrf_token %} {% csrf_token %}
<!-- Navbar --> {% if navbar|default_if_none:True %}
<nav class="navbar navbar-expand-lg navbar-light bg-white py-4"> <!-- Navbar -->
<div class="container"> <nav class="navbar navbar-expand-lg navbar-light bg-white py-4">
<a class="navbar-brand text-dark-primary" href="{% url 'home' %}"> <div class="container">
<img src="{% static 'main/img/logo.png' %}" width="30" height="30" class="d-inline-block align-top" alt=""> <a class="navbar-brand text-dark-primary" href="{% url 'home' %}">
<div class="d-none d-sm-inline-block"> <img src="{% static 'main/img/logo.png' %}" width="30" height="30" class="d-inline-block align-top" alt="">
ONTARIO ASSOCIATION OF <div class="d-none d-sm-inline-block">
<br> ONTARIO ASSOCIATION OF
CHILD PROTECTION LAWYERS <br>
CHILD PROTECTION LAWYERS
</div>
<div class="d-inline-block d-sm-none">
OACPL
</div>
</a>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto">
<li class="nav-item text-dark-primary">
<a class="nav-link" href="{% url 'home' %}">HOME</a>
</li>
<li class="new-item text-dark-primary">
<a class="nav-link" href="{% url 'newsletters' %}">NEWSLETTERS</a>
</li>
<li class="nav-item text-dark-primary">
<a class="nav-link" href="#">FORUM</a>
</li>
<li class="nav-item text-dark-primary">
<a class="nav-link" href="{% url 'caselaw' %}">CASE LAW</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="{% url 'experts' %}" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
EXPERTS
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="{% url 'experts' %}?filter=Abuse">Abuse</a>
<a class="dropdown-item" href="{% url 'experts' %}?filter=DNA">DNA</a>
<a class="dropdown-item" href="{% url 'experts' %}?filter=Forensics">Forensics</a>
</div>
</li>
{% if request.user.is_staff %}
<li class="nav-item text-dark-primary">
<a class="nav-link" href="/admin/">ADMIN PANEL</a>
</li>
{% endif %}
{% if request.user.is_authenticated%}
<li class="nav-item text-dark-primary">
<a class="nav-link" href="{% url 'logout' %}">LOGOUT</a>
</li>
{% endif %}
{% if not request.user.is_authenticated %}
<li class="nav-item text-dark-primary">
<a class="nav-link" href="{% url 'login' %}">LOGIN</a>
</li>
{% endif %}
</ul>
</div> </div>
<div class="d-inline-block d-sm-none"> <button class="navbar-toggler ml-auto" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
OACPL aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
</div> <span class="navbar-toggler-icon"></span>
</a> </button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ml-auto">
<li class="nav-item text-dark-primary">
<a class="nav-link" href="{% url 'home' %}">HOME</a>
</li>
<li class="new-item text-dark-primary">
<a class="nav-link" href="{% url 'newsletters' %}">NEWSLETTERS</a>
</li>
<li class="nav-item text-dark-primary">
<a class="nav-link" href="#">FORUM</a>
</li>
<li class="nav-item text-dark-primary">
<a class="nav-link" href="{% url 'caselaw' %}">CASE LAW</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="{% url 'experts' %}" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
EXPERTS
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="{% url 'experts' %}?filter=Abuse">Abuse</a>
<a class="dropdown-item" href="{% url 'experts' %}?filter=DNA">DNA</a>
<a class="dropdown-item" href="{% url 'experts' %}?filter=Forensics">Forensics</a>
</div>
</li>
{% if request.user.is_staff %}
<li class="nav-item text-dark-primary">
<a class="nav-link" href="/admin/">ADMIN PANEL</a>
</li>
{% endif %}
{% if request.user.is_authenticated%}
<li class="nav-item text-dark-primary">
<a class="nav-link" href="{% url 'logout' %}">LOGOUT</a>
</li>
{% endif %}
{% if not request.user.is_authenticated %}
<li class="nav-item text-dark-primary">
<a class="nav-link" href="{% url 'login' %}">LOGIN</a>
</li>
{% endif %}
</ul>
</div> </div>
<button class="navbar-toggler ml-auto" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" </nav>
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> {% endif %}
<span class="navbar-toggler-icon"></span>
</button>
</div>
</nav>
<!-- Content -->
{% block body %} {% block body %}
{% endblock %} {% endblock %}
<!-- Footer --> {% if footer|default_if_none:True %}
<footer class="container-fluid bg-white text-dark-primary py-3"> <!-- Footer -->
<div class="container text-center"> <footer class="container-fluid bg-white text-dark-primary py-3">
<p class="mb-0">© 2017 Ontario Association of Child Protection Lawyers.</p> <div class="container text-center">
</div> <p class="mb-0">© 2017 Ontario Association of Child Protection Lawyers.</p>
</footer> </div>
</footer>
{% endif %}
</body> </body>
</html> </html>