-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #90 from DDMAL/user-login
Basic UI & functionality for login, logout, change pwd
- Loading branch information
Showing
8 changed files
with
269 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
from django.db import models | ||
|
||
# Create your models here. | ||
from django.db import models | ||
|
||
# Create your models here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
.login-form { | ||
color: #435334; | ||
} | ||
|
||
input { | ||
border: 1px solid #9EB384; | ||
border-radius: 4px; | ||
background-color: #FAF1E4; | ||
padding: 5px; | ||
color: #435334; | ||
margin: 0 10px; | ||
} | ||
|
||
input:hover { | ||
border: 1px solid #435334; | ||
background-color: #FAF1E4; | ||
color: #435334; | ||
} | ||
|
||
input:focus { | ||
border: 1px solid #435334; | ||
box-shadow: 0 0 5px #9EB384; | ||
outline: none; | ||
} | ||
|
||
input::placeholder { | ||
color: #9EB384; | ||
} | ||
|
||
.btn-primary { | ||
background-color: #435334; | ||
border: 1px solid #435334; | ||
} | ||
|
||
.btn-primary:hover { | ||
background-color: #9EB384; | ||
border: 1px solid #9EB384; | ||
} | ||
|
||
p { | ||
color: #435334; | ||
} | ||
|
||
a { | ||
color: #435334; | ||
text-decoration: none; | ||
font-weight: bold; | ||
} | ||
|
||
a:hover { | ||
color: #9EB384; | ||
text-decoration: none; | ||
font-weight: bold; | ||
} | ||
|
||
.errorlist { | ||
color: red; | ||
} |
48 changes: 48 additions & 0 deletions
48
web-app/django/VIM/apps/main/templates/registration/change_password.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
{% extends "base.html" %} | ||
{% load static %} | ||
|
||
{% block title %} | ||
Login | ||
{% endblock %} | ||
|
||
{% block css_files %} | ||
<link rel="stylesheet" type="text/css" href="{% static 'main/css/login.css' %}"> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<div class="container"> | ||
<div class="row"> | ||
<div class="mr-3 p-4 col-md-8"> | ||
{% if form.errors %} | ||
<div class="alert alert-danger alert-dismissible"> | ||
{% for field, error in form.errors.items %} | ||
{{ error }} | ||
{% endfor %} | ||
</div> | ||
{% endif %} | ||
<div class="col-md mt-4 login-form" id="change-password"> | ||
<h5 class="mb-4"><strong>Change Password</strong></h5> | ||
<form method="post"> | ||
{% csrf_token %} | ||
<div class="mb-4"> | ||
<label for="exampleInputPassword0" class="form-label">Current Password</label> | ||
{{ form.old_password }} | ||
</div> | ||
<div class="mb-4"> | ||
<label for="exampleInputPassword1" class="form-label">New Password</label> | ||
{{ form.new_password1 }} | ||
</div> | ||
<div class="mb-4"> | ||
<label for="exampleInputPassword2" class="form-label">Confirm New Password</label> | ||
{{ form.new_password2 }} | ||
</div> | ||
<button type="submit" class="btn btn-primary">Change Password</button> | ||
</form> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
{% endblock %} | ||
|
||
{% block script %} | ||
{% endblock %} |
56 changes: 56 additions & 0 deletions
56
web-app/django/VIM/apps/main/templates/registration/login.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
{% extends "base.html" %} | ||
{% load static %} | ||
|
||
{% block title %} | ||
Login | ||
{% endblock %} | ||
|
||
{% block css_files %} | ||
<link rel="stylesheet" type="text/css" href="{% static 'main/css/login.css' %}"> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<div class="container"> | ||
<div class="row"> | ||
<div class="mr-3 p-4 col-md-6"> | ||
{% if messages %} | ||
<div class="alert alert-success alert-dismissible"> | ||
{% for message in messages %} | ||
{{ message }} | ||
{% endfor %} | ||
</div> | ||
{% endif %} | ||
{% if form.errors %} | ||
<div class="alert alert-danger alert-dismissible"> | ||
{% for field, error in form.errors.items %} | ||
{{ error }} | ||
{% endfor %} | ||
</div> | ||
{% endif %} | ||
<div class="col-md mt-4 login-form" id="login"> | ||
<h5><strong>Login for Contributors</strong></h5> | ||
<form method="post"> | ||
{% csrf_token %} | ||
<div class="mt-4 mb-4"> | ||
<label for="exampleInputEmail" class="form-label">Email Address</label> | ||
{{ form.username }} | ||
</div> | ||
<div class="mb-4"> | ||
<label for="exampleInputPassword" class="form-label">Password</label> | ||
{{ form.password }} | ||
</div> | ||
<button type="submit" class="btn btn-primary">Sign in</button> | ||
</form> | ||
</div> | ||
<div class="col-md mt-4 create-account-link"> | ||
<p>Don't have an account? | ||
<a href="{% url 'main:register' %}">Create a new account</a> | ||
</p> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
{% endblock %} | ||
|
||
{% block script %} | ||
{% endblock %} |
48 changes: 48 additions & 0 deletions
48
web-app/django/VIM/apps/main/templates/registration/register.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
{% extends "base.html" %} | ||
{% load static %} | ||
|
||
{% block title %} | ||
Register | ||
{% endblock %} | ||
|
||
{% block css_files %} | ||
<link rel="stylesheet" type="text/css" href="{% static 'main/css/login.css' %}"> | ||
{% endblock %} | ||
|
||
{% block content %} | ||
<div class="container"> | ||
<div class="row"> | ||
<div class="mr-3 p-4 col-md-8"> | ||
{% if form.errors %} | ||
<div class="alert alert-danger alert-dismissible"> | ||
{% for field, error in form.errors.items %} | ||
{{ error }} | ||
{% endfor %} | ||
</div> | ||
{% endif %} | ||
<div class="col-md mt-4 login-form" id="registration"> | ||
<h5 class="mb-4"><strong>Create a New Account</strong></h5> | ||
<form method="post"> | ||
{% csrf_token %} | ||
<div class="mt-4 mb-4"> | ||
<label for="exampleInputEmail" class="form-label">Email Address</label> | ||
{{ form.username }} | ||
</div> | ||
<div class="mb-4"> | ||
<label for="exampleInputPassword1" class="form-label">Password</label> | ||
{{ form.password1 }} | ||
</div> | ||
<div class="mb-4"> | ||
<label for="exampleInputPassword2" class="form-label">Confirm Password</label> | ||
{{ form.password2 }} | ||
</div> | ||
<button type="submit" class="btn btn-primary">Register</button> | ||
</form> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
{% endblock %} | ||
|
||
{% block script %} | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,34 @@ | ||
from django.urls import path | ||
from django.contrib.auth import views as auth_views | ||
from . import views | ||
|
||
app_name = "main" | ||
|
||
urlpatterns = [ | ||
path("", views.home, name="home"), | ||
path("about/", views.about, name="about"), | ||
path("register/", views.register, name="register"), | ||
path( | ||
"accounts/logout/", | ||
auth_views.LogoutView.as_view(next_page="main:home"), | ||
name="logout", | ||
), | ||
path( | ||
"change-password/", | ||
auth_views.PasswordChangeView.as_view( | ||
template_name="registration/change_password.html", | ||
success_url="/", | ||
), | ||
name="change_password", | ||
), | ||
path( | ||
"accounts/login/", | ||
auth_views.LoginView.as_view( | ||
template_name="registration/login.html", | ||
redirect_authenticated_user=True, | ||
redirect_field_name="next", | ||
next_page="main:home", | ||
), | ||
name="login", | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters