Compare commits

..

No commits in common. "81599a9bde15d17ce6151dc405c03522fc508130" and "a24bfa4806fa36664e0ef869b30b5421dfaefd64" have entirely different histories.

7 changed files with 215 additions and 215 deletions

View File

@ -123,5 +123,3 @@ STATIC_URL = 'static/'
# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
LOGIN_REDIRECT_URL = '/polls'

View File

@ -23,5 +23,4 @@ urlpatterns = [
path('polls/', include('polls.urls')), path('polls/', include('polls.urls')),
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path('', include('django.contrib.auth.urls')),
] ]

View File

@ -1,96 +0,0 @@
<!DOCTYPE html>
<html lang="en" data-bs-theme="dark">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<title>{% block title %}Test site{% endblock %}</title>
<style>
.darker-bg {
background-color: #171a1e;
}
body {
min-height: 75rem;
padding-top: 3rem;
}
.list-group {
width: 100%;
max-width: 460px;
margin-inline: 1.5rem;
}
.list-group-checkable .list-group-item {
cursor: pointer;
}
.list-group-item-check {
position: absolute;
clip: rect(0, 0, 0, 0);
}
.list-group-item-check:hover + .list-group-item {
background-color: var(--bs-secondary-bg);
}
.list-group-item-check:checked + .list-group-item {
color: #fff;
background-color: var(--bs-primary);
border-color: var(--bs-primary);
}
.list-group-item-check[disabled] + .list-group-item,
.list-group-item-check:disabled + .list-group-item {
pointer-events: none;
filter: none;
opacity: .5;
}
.list-group-radio .list-group-item {
cursor: pointer;
border-radius: .5rem;
}
.list-group-radio .form-check-input {
z-index: 2;
margin-top: -.5em;
}
.list-group-radio .list-group-item:hover,
.list-group-radio .list-group-item:focus {
background-color: var(--bs-secondary-bg);
}
.list-group-radio .form-check-input:checked + .list-group-item {
background-color: var(--bs-body);
border-color: var(--bs-primary);
box-shadow: 0 0 0 2px var(--bs-primary);
}
.list-group-radio .form-check-input[disabled] + .list-group-item,
.list-group-radio .form-check-input:disabled + .list-group-item {
pointer-events: none;
filter: none;
opacity: .5;
}
</style>
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<div class="container-fluid">
<a class="navbar-brand" href="/polls">Test App</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav me-auto mb-2 mb-md-0">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="/polls">Polls</a>
</li>
</ul>
<div class="d-flex">
{% if user.is_authenticated %}
<a href="/logout"><button class="btn btn-outline-success">Log out</button></a>
{% else %}
<button class="btn btn-primary">Log In</button>
{% endif %}
</div>
</div>
</div>
</nav>
<main class="px-4 py-5 shadow darker-bg">
{% block content %}{% endblock %}
</main>
</body>
</html>

View File

@ -1,25 +1,86 @@
{% extends "base.html" %} <!DOCTYPE html>
<html lang="en" data-bs-theme="dark">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<title>Testapp</title>
<style>
.darker-bg {
background-color: #171a1e;
}
.list-group {
width: 100%;
max-width: 460px;
margin-inline: 1.5rem;
}
.list-group-checkable .list-group-item {
cursor: pointer;
}
.list-group-item-check {
position: absolute;
clip: rect(0, 0, 0, 0);
}
.list-group-item-check:hover + .list-group-item {
background-color: var(--bs-secondary-bg);
}
.list-group-item-check:checked + .list-group-item {
color: #fff;
background-color: var(--bs-primary);
border-color: var(--bs-primary);
}
.list-group-item-check[disabled] + .list-group-item,
.list-group-item-check:disabled + .list-group-item {
pointer-events: none;
filter: none;
opacity: .5;
}
.list-group-radio .list-group-item {
cursor: pointer;
border-radius: .5rem;
}
.list-group-radio .form-check-input {
z-index: 2;
margin-top: -.5em;
}
.list-group-radio .list-group-item:hover,
.list-group-radio .list-group-item:focus {
background-color: var(--bs-secondary-bg);
}
{% block title %}{{ question.question_text }}{% endblock %} .list-group-radio .form-check-input:checked + .list-group-item {
background-color: var(--bs-body);
{% block content %} border-color: var(--bs-primary);
<div class="text-center"> box-shadow: 0 0 0 2px var(--bs-primary);
<h1 class="display-5 fw-bold text-body-emphasis">{{ question.question_text }}</h1> }
<br/> .list-group-radio .form-check-input[disabled] + .list-group-item,
.list-group-radio .form-check-input:disabled + .list-group-item {
<form action="{% url 'polls:vote' question.id %}" method="post"> pointer-events: none;
{% csrf_token %} filter: none;
<fieldset class="d-flex flex-column flex-md-row col-lg-6 mx-auto align-items-center justify-content-center"> opacity: .5;
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %} }
<div class="list-group list-group-checkable d-grid gap-2 border-0"> </style>
{% for choice in question.choice_set.all %} </head>
<input class="list-group-item-check pe-none" type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}"> <body>
<label class="list-group-item rounded-3 py-3" for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br> <div class="px-4 py-5 my-5 text-center shadow darker-bg">
{% endfor %} <h1 class="display-5 fw-bold text-body-emphasis">{{ question.question_text }}</h1>
</div>
</fieldset>
<br/> <br/>
<input class="btn btn-success rounded-3 px-3" type="submit" value="Vote">
</form> <form action="{% url 'polls:vote' question.id %}" method="post">
</div> {% csrf_token %}
{% endblock %} <fieldset class="d-flex flex-column flex-md-row col-lg-6 mx-auto align-items-center justify-content-center">
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
<div class="list-group list-group-checkable d-grid gap-2 border-0">
{% for choice in question.choice_set.all %}
<input class="list-group-item-check pe-none" type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}">
<label class="list-group-item rounded-3 py-3" for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
{% endfor %}
</div>
</fieldset>
<br/>
<input class="btn btn-success rounded-3 px-3" type="submit" value="Vote">
</form>
</div>
</body>
</html>

View File

@ -1,31 +1,45 @@
{% extends "base.html" %}
{% block title %}Polls{% endblock %} <!DOCTYPE html>
<html lang="en" data-bs-theme="dark">
{% block content %} <head>
<h1 class="display-5 fw-bold text-body-emphasis text-center">Polls</h1> <meta charset="utf-8">
<br/> <meta name="viewport" content="width=device-width, initial-scale=1">
<div class="d-flex flex-column flex-md-row col-lg-6 mx-auto align-items-center justify-content-center"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
{% if latest_question_list %} <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<div class="list-group"> <title>Testapp</title>
{% for question in latest_question_list %} <style>
<a href="{% url 'polls:detail' question.id %}" class="list-group-item list-group-item-action d-flex gap-3 py-3" aria-current="true"> .darker-bg {
<!--<img src="https://github.com/twbs.png" alt="twbs" width="32" height="32" class="rounded-circle flex-shrink-0"> --> background-color: #171a1e;
<div class="d-flex gap-2 w-100 justify-content-between"> }
<div> </style>
<h6 class="mb-0">{{ question.question_text }}</h6> </head>
<!-- <p class="mb-0 opacity-75">Some placeholder content in a paragraph.</p> --> <body>
</div> <div class="px-4 py-5 my-5 shadow darker-bg">
<small class="opacity-50 text-nowrap">{{ question.pub_date }}</small> <h1 class="display-5 fw-bold text-body-emphasis text-center">Polls</h1>
<br/>
<div class="d-flex flex-column flex-md-row col-lg-6 mx-auto align-items-center justify-content-center">
{% if latest_question_list %}
<div class="list-group">
{% for question in latest_question_list %}
<a href="{% url 'polls:detail' question.id %}" class="list-group-item list-group-item-action d-flex gap-3 py-3" aria-current="true">
<!--<img src="https://github.com/twbs.png" alt="twbs" width="32" height="32" class="rounded-circle flex-shrink-0"> -->
<div class="d-flex gap-2 w-100 justify-content-between">
<div>
<h6 class="mb-0">{{ question.question_text }}</h6>
<!-- <p class="mb-0 opacity-75">Some placeholder content in a paragraph.</p> -->
</div>
<small class="opacity-50 text-nowrap">{{ question.pub_date }}</small>
</div>
</a>
{% endfor %}
</div> </div>
</a> {% else %}
{% endfor %} <p class="text-center text-muted">
</div> No polls are available.<br />
{% else %} You can create polls in the <a href="/admin/polls/question/">admin panel</a>
<p class="text-center text-muted"> </p>
No polls are available.<br /> {% endif %}
You can create polls in the <a href="/admin/polls/question/">admin panel</a> </div>
</p> </div>
{% endif %} </body>
</div> </html>
{% endblock %}

View File

@ -1,28 +1,92 @@
{% extends "base.html" %} <!DOCTYPE html>
<html lang="en" data-bs-theme="dark">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<title>Testapp</title>
<style>
.darker-bg {
background-color: #171a1e;
}
.list-group {
width: 100%;
max-width: 460px;
margin-inline: 1.5rem;
}
.list-group-checkable .list-group-item {
cursor: pointer;
}
.list-group-item-check {
position: absolute;
clip: rect(0, 0, 0, 0);
}
.list-group-item-check:hover + .list-group-item {
background-color: var(--bs-secondary-bg);
}
.list-group-item-check:checked + .list-group-item {
color: #fff;
background-color: var(--bs-primary);
border-color: var(--bs-primary);
}
.list-group-item-check[disabled] + .list-group-item,
.list-group-item-check:disabled + .list-group-item {
pointer-events: none;
filter: none;
opacity: .5;
}
.list-group-radio .list-group-item {
cursor: pointer;
border-radius: .5rem;
}
.list-group-radio .form-check-input {
z-index: 2;
margin-top: -.5em;
}
.list-group-radio .list-group-item:hover,
.list-group-radio .list-group-item:focus {
background-color: var(--bs-secondary-bg);
}
{% block title %}{{ question.question_text }} Results{% endblock %} .list-group-radio .form-check-input:checked + .list-group-item {
background-color: var(--bs-body);
{% block content %} border-color: var(--bs-primary);
<h1 class="display-5 fw-bold text-body-emphasis text-center">{{ question.question_text }}</h1> box-shadow: 0 0 0 2px var(--bs-primary);
<br/> }
<h1 class="text-center">Results</h1> .list-group-radio .form-check-input[disabled] + .list-group-item,
<div class="d-flex flex-column flex-md-row col-lg-6 mx-auto align-items-center justify-content-center"> .list-group-radio .form-check-input:disabled + .list-group-item {
<div class="list-group"> pointer-events: none;
{% for choice_text, choice_votes, choice_percent in choices %} filter: none;
<div class="list-group-item list-group-item-action d-flex gap-3 py-3"> opacity: .5;
<div class="d-flex gap-2 w-100 justify-content-between"> }
<div> </style>
<h6 class="mb-0">{{ choice_text }}</h6> </head>
<!-- <body>
<div role="progressbar" aria-label="{{ choice_text }}" aria-valuenow="{{ choice_percent }}" aria-valuemin="0" aria-valuemax="100" class="progress"> <div class="px-4 py-5 my-5 shadow darker-bg">
<div class="progress-bar" style="width: {{ choice_percent }}%"></div> <h1 class="display-5 fw-bold text-body-emphasis text-center">{{ question.question_text }}</h1>
<br/>
<h1 class="text-center">Results</h1>
<div class="d-flex flex-column flex-md-row col-lg-6 mx-auto align-items-center justify-content-center">
<div class="list-group">
{% for choice_text, choice_votes, choice_percent in choices %}
<div class="list-group-item list-group-item-action d-flex gap-3 py-3">
<div class="d-flex gap-2 w-100 justify-content-between">
<div>
<h6 class="mb-0">{{ choice_text }}</h6>
<!--
<div role="progressbar" aria-label="{{ choice_text }}" aria-valuenow="{{ choice_percent }}" aria-valuemin="0" aria-valuemax="100" class="progress">
<div class="progress-bar" style="width: {{ choice_percent }}%"></div>
</div>
-->
</div> </div>
-->
<small class="text-nowrap">{{ choice_votes }} vote{{ choice_votes|pluralize }}</small>
</div>
</div> </div>
<small class="text-nowrap">{{ choice_votes }} vote{{ choice_votes|pluralize }}</small> {% endfor %}
</div{{ question.question_text }}>
</div> </div>
</div> </div>
{% endfor %} </body>
</div{{ question.question_text }}> </html>
</div>
{% endblock %}

View File

@ -1,40 +0,0 @@
{% extends "base.html" %}
{% block title %}Login{% endblock %}
{% block content %}
{% if form.errors %}
<p>Your username and password didn't match. Please try again.</p>
{% endif %}
{% if next %}
{% if user.is_authenticated %}
<p>Your account doesn't have access to this page. To proceed,
please login with an account that has access.</p>
{% else %}
<p>Please login to see this page.</p>
{% endif %}
{% endif %}
<form method="post" action="{% url 'login' %}">
{% csrf_token %}
<table>
<tr>
<td>{{ form.username.label_tag }}</td>
<td>{{ form.username }}</td>
</tr>
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
</table>
<input type="submit" value="login">
<input type="hidden" name="next" value="{{ next }}">
</form>
{# Assumes you set up the password_reset view in your URLconf #}
<p><a href="{% url 'password_reset' %}">Lost password?</a></p>
{% endblock %}