parent
7807c98459
commit
435eb4f35a
|
|
@ -1,3 +1,15 @@
|
|||
* 2020-07-13
|
||||
** note
|
||||
- none
|
||||
* 2020-07-10
|
||||
** note
|
||||
- none
|
||||
* 2020-07-08
|
||||
** note
|
||||
- none
|
||||
* 2020-07-06
|
||||
** note
|
||||
- none
|
||||
* 2020-07-04
|
||||
** note
|
||||
- none
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -27,6 +27,9 @@ DEBUG = True
|
|||
|
||||
ALLOWED_HOSTS = [
|
||||
"[2a0a:e5c1:120::35]",
|
||||
"192.168.0.20",
|
||||
"127.0.0.1",
|
||||
"2a0a-e5c1-0120-0000-0000-0000-0000-0035.has-a.name",
|
||||
]
|
||||
|
||||
|
||||
|
|
@ -108,7 +111,8 @@ AUTH_PASSWORD_VALIDATORS = [
|
|||
|
||||
LANGUAGE_CODE = 'en-us'
|
||||
|
||||
TIME_ZONE = 'UTC'
|
||||
#TIME_ZONE = 'UTC'
|
||||
TIME_ZONE = 'Asia/Seoul'
|
||||
|
||||
USE_I18N = True
|
||||
|
||||
|
|
|
|||
|
|
@ -4,3 +4,6 @@ from __future__ import unicode_literals
|
|||
from django.contrib import admin
|
||||
|
||||
# Register your models here.
|
||||
from .models import Question
|
||||
|
||||
admin.site.register(Question)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,9 @@ class Question(models.Model):
|
|||
def __str__(self):
|
||||
return self.question_text
|
||||
def was_published_recently(self):
|
||||
return self.pub_date >= timezone.now() - datetime.timedelta(days=1)
|
||||
# return self.pub_date >= timezone.now() - datetime.timedelta(days=1)
|
||||
now = timezone.now()
|
||||
return now - datetime.timedelta(days=1) <= self.pub_date <= now
|
||||
|
||||
class Choice(models.Model):
|
||||
question = models.ForeignKey(Question, on_delete=models.CASCADE)
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
|
|
@ -0,0 +1,7 @@
|
|||
li a {
|
||||
color: green;
|
||||
}
|
||||
|
||||
body {
|
||||
background: white url("images/background.jpg") no-repeat;
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
<h1>{{ question.question_text }}</h1>
|
||||
|
||||
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
|
||||
|
||||
<form action="{% url 'polls:vote' question.id %}" method="post">
|
||||
{% csrf_token %}
|
||||
{% for choice in question.choice_set.all %}
|
||||
<input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}">
|
||||
<label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
|
||||
{% endfor %}
|
||||
<input type="submit" value="Vote">
|
||||
</form>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
{% load static %}
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}">
|
||||
|
||||
{% if latest_question_list %}
|
||||
<ul>
|
||||
{% for question in latest_question_list %}
|
||||
<li><a href="{% url 'polls:detail' question.id %}">{{ question.question_text }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% else %}
|
||||
<p>No polls are available.</p>
|
||||
{% endif %}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<h1>{{ question.question_text }}</h1>
|
||||
|
||||
<ul>
|
||||
{% for choice in question.choice_set.all %}
|
||||
<li>{{ choice.choice_text }} -- {{ choice.votes }} vote{{ choice.votes|pluralize }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<a href="{% url 'polls:detail' question.id %}">Vote again?</a>
|
||||
|
|
@ -4,3 +4,131 @@ from __future__ import unicode_literals
|
|||
from django.test import TestCase
|
||||
|
||||
# Create your tests here.
|
||||
import datetime
|
||||
|
||||
from django.test import TestCase
|
||||
from django.utils import timezone
|
||||
from django.urls import reverse
|
||||
|
||||
from .models import Question
|
||||
|
||||
|
||||
class QuestionModelTests(TestCase):
|
||||
|
||||
def test_was_published_recently_with_future_question(self):
|
||||
"""
|
||||
was_published_recently() returns False for questions whose pub_date
|
||||
is in the future.
|
||||
"""
|
||||
time = timezone.now() + datetime.timedelta(days=30)
|
||||
future_question = Question(pub_date=time)
|
||||
self.assertIs(future_question.was_published_recently(), False)
|
||||
|
||||
|
||||
def test_was_published_recently_with_old_question(self):
|
||||
"""
|
||||
was_published_recently() returns False for questions whose pub_date
|
||||
is older than 1 day.
|
||||
"""
|
||||
time = timezone.now() - datetime.timedelta(days=1, seconds=1)
|
||||
old_question = Question(pub_date=time)
|
||||
self.assertIs(old_question.was_published_recently(), False)
|
||||
|
||||
def test_was_published_recently_with_recent_question(self):
|
||||
"""
|
||||
was_published_recently() returns True for questions whose pub_date
|
||||
is within the last day.
|
||||
"""
|
||||
time = timezone.now() - datetime.timedelta(hours=23, minutes=59, seconds=59)
|
||||
recent_question = Question(pub_date=time)
|
||||
self.assertIs(recent_question.was_published_recently(), True)
|
||||
|
||||
|
||||
def create_question(question_text, days):
|
||||
"""
|
||||
Create a question with the given `question_text` and published the
|
||||
given number of `days` offset to now (negative for questions published
|
||||
in the past, positive for questions that have yet to be published).
|
||||
"""
|
||||
time = timezone.now() + datetime.timedelta(days=days)
|
||||
return Question.objects.create(question_text=question_text, pub_date=time)
|
||||
|
||||
|
||||
class QuestionIndexViewTests(TestCase):
|
||||
def test_no_questions(self):
|
||||
"""
|
||||
If no questions exist, an appropriate message is displayed.
|
||||
"""
|
||||
response = self.client.get(reverse('polls:index'))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertContains(response, "No polls are available.")
|
||||
self.assertQuerysetEqual(response.context['latest_question_list'], [])
|
||||
|
||||
def test_past_question(self):
|
||||
"""
|
||||
Questions with a pub_date in the past are displayed on the
|
||||
index page.
|
||||
"""
|
||||
create_question(question_text="Past question.", days=-30)
|
||||
response = self.client.get(reverse('polls:index'))
|
||||
self.assertQuerysetEqual(
|
||||
response.context['latest_question_list'],
|
||||
['<Question: Past question.>']
|
||||
)
|
||||
|
||||
def test_future_question(self):
|
||||
"""
|
||||
Questions with a pub_date in the future aren't displayed on
|
||||
the index page.
|
||||
"""
|
||||
create_question(question_text="Future question.", days=30)
|
||||
response = self.client.get(reverse('polls:index'))
|
||||
self.assertContains(response, "No polls are available.")
|
||||
self.assertQuerysetEqual(response.context['latest_question_list'], [])
|
||||
|
||||
def test_future_question_and_past_question(self):
|
||||
"""
|
||||
Even if both past and future questions exist, only past questions
|
||||
are displayed.
|
||||
"""
|
||||
create_question(question_text="Past question.", days=-30)
|
||||
create_question(question_text="Future question.", days=30)
|
||||
response = self.client.get(reverse('polls:index'))
|
||||
self.assertQuerysetEqual(
|
||||
response.context['latest_question_list'],
|
||||
['<Question: Past question.>']
|
||||
)
|
||||
|
||||
def test_two_past_questions(self):
|
||||
"""
|
||||
The questions index page may display multiple questions.
|
||||
"""
|
||||
create_question(question_text="Past question 1.", days=-30)
|
||||
create_question(question_text="Past question 2.", days=-5)
|
||||
response = self.client.get(reverse('polls:index'))
|
||||
self.assertQuerysetEqual(
|
||||
response.context['latest_question_list'],
|
||||
['<Question: Past question 2.>', '<Question: Past question 1.>']
|
||||
)
|
||||
|
||||
|
||||
class QuestionDetailViewTests(TestCase):
|
||||
def test_future_question(self):
|
||||
"""
|
||||
The detail view of a question with a pub_date in the future
|
||||
returns a 404 not found.
|
||||
"""
|
||||
future_question = create_question(question_text='Future question.', days=5)
|
||||
url = reverse('polls:detail', args=(future_question.id,))
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code, 404)
|
||||
|
||||
def test_past_question(self):
|
||||
"""
|
||||
The detail view of a question with a pub_date in the past
|
||||
displays the question's text.
|
||||
"""
|
||||
past_question = create_question(question_text='Past Question.', days=-5)
|
||||
url = reverse('polls:detail', args=(past_question.id,))
|
||||
response = self.client.get(url)
|
||||
self.assertContains(response, past_question.question_text)
|
||||
|
|
|
|||
|
|
@ -2,6 +2,18 @@ from django.urls import path
|
|||
|
||||
from . import views
|
||||
|
||||
app_name = 'polls'
|
||||
urlpatterns = [
|
||||
path('', views.index, name='index'),
|
||||
]
|
||||
# ex: /polls/
|
||||
#path('', views.index, name='index'),
|
||||
path('', views.IndexView.as_view(), name='index'),
|
||||
# ex: /polls/5/
|
||||
#path('<int:question_id>/', views.detail, name='detail'),
|
||||
path('<int:pk>/', views.DetailView.as_view(), name='detail'),
|
||||
# ex: /polls/5/results/
|
||||
#path('<int:question_id>/results/', views.results, name='results'),
|
||||
path('<int:pk>/results/', views.ResultsView.as_view(), name='results'),
|
||||
# ex: /polls/5/vote/
|
||||
#path('<int:question_id>/vote/', views.vote, name='vote'),
|
||||
path('<int:question_id>/vote/', views.vote, name='vote'),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,8 +4,108 @@ from __future__ import unicode_literals
|
|||
from django.shortcuts import render
|
||||
|
||||
# Create your views here.
|
||||
from django.http import HttpResponse
|
||||
from django.http import HttpResponse, HttpResponseRedirect
|
||||
from django.template import loader
|
||||
from django.http import Http404
|
||||
from django.shortcuts import get_object_or_404, render
|
||||
from django.urls import reverse
|
||||
from django.views import generic
|
||||
from django.utils import timezone
|
||||
|
||||
from .models import Choice, Question
|
||||
|
||||
|
||||
def index(request):
|
||||
return HttpResponse("Hello, world. You're at the polls index.")
|
||||
#def index(request):
|
||||
# return HttpResponse("Hello, world. You're at the polls index.")
|
||||
|
||||
#def index(request):
|
||||
# latest_question_list = Question.objects.order_by('-pub_date')[:5]
|
||||
# output = ', '.join([q.question_text for q in latest_question_list])
|
||||
# return HttpResponse(output)
|
||||
|
||||
#def index(request):
|
||||
# latest_question_list = Question.objects.order_by('-pub_date')[:5]
|
||||
# template = loader.get_template('polls/index.html')
|
||||
# context = {
|
||||
# 'latest_question_list': latest_question_list,
|
||||
# }
|
||||
# return HttpResponse(template.render(context, request))
|
||||
|
||||
#def index(request):
|
||||
# latest_question_list = Question.objects.order_by('-pub_date')[:5]
|
||||
# context = {'latest_question_list': latest_question_list}
|
||||
# return render(request, 'polls/index.html', context)
|
||||
|
||||
class IndexView(generic.ListView):
|
||||
template_name = 'polls/index.html'
|
||||
context_object_name = 'latest_question_list'
|
||||
|
||||
# def get_queryset(self):
|
||||
# """Return the last five published questions."""
|
||||
# return Question.objects.order_by('-pub_date')[:5]
|
||||
|
||||
def get_queryset(self):
|
||||
"""
|
||||
Return the last five published questions (not including those set to be
|
||||
published in the future).
|
||||
"""
|
||||
return Question.objects.filter(
|
||||
pub_date__lte=timezone.now()
|
||||
).order_by('-pub_date')[:5]
|
||||
|
||||
#def detail(request, question_id):
|
||||
# return HttpResponse("You're looking at question %s." % question_id)
|
||||
|
||||
#def detail(request, question_id):
|
||||
# try:
|
||||
# question = Question.objects.get(pk=question_id)
|
||||
# except Question.DoesNotExist:
|
||||
# raise Http404("Question does not exist")
|
||||
# return render(request, 'polls/detail.html', {'question': question})
|
||||
|
||||
#def detail(request, question_id):
|
||||
# question = get_object_or_404(Question, pk=question_id)
|
||||
# return render(request, 'polls/detail.html', {'question': question})
|
||||
|
||||
class DetailView(generic.DetailView):
|
||||
model = Question
|
||||
template_name = 'polls/detail.html'
|
||||
|
||||
def get_queryset(self):
|
||||
"""
|
||||
Excludes any questions that aren't published yet.
|
||||
"""
|
||||
return Question.objects.filter(pub_date__lte=timezone.now())
|
||||
|
||||
#def results(request, question_id):
|
||||
# response = "You're looking at the results of question %s."
|
||||
# return HttpResponse(response % question_id)
|
||||
|
||||
#def results(request, question_id):
|
||||
# question = get_object_or_404(Question, pk=question_id)
|
||||
# return render(request, 'polls/results.html', {'question': question})
|
||||
|
||||
class ResultsView(generic.DetailView):
|
||||
model = Question
|
||||
template_name = 'polls/results.html'
|
||||
|
||||
#def vote(request, question_id):
|
||||
# return HttpResponse("You're voting on question %s." % question_id)
|
||||
|
||||
def vote(request, question_id):
|
||||
question = get_object_or_404(Question, pk=question_id)
|
||||
try:
|
||||
selected_choice = question.choice_set.get(pk=request.POST['choice'])
|
||||
except (KeyError, Choice.DoesNotExist):
|
||||
# Redisplay the question voting form.
|
||||
return render(request, 'polls/detail.html', {
|
||||
'question': question,
|
||||
'error_message': "You didn't select a choice.",
|
||||
})
|
||||
else:
|
||||
selected_choice.votes += 1
|
||||
selected_choice.save()
|
||||
# Always return an HttpResponseRedirect after successfully dealing
|
||||
# with POST data. This prevents data from being posted twice if a
|
||||
# user hits the Back button.
|
||||
return HttpResponseRedirect(reverse('polls:results', args=(question.id,)))
|
||||
|
|
|
|||
|
|
@ -1,3 +1,88 @@
|
|||
* 2020-07-15
|
||||
*** Django #7: Tutorial 6
|
||||
**** Lecture content
|
||||
- Environment like in Django 1 and Django 3
|
||||
- Ensure your nginx is working
|
||||
- Paste the URL of your Django server into the chat
|
||||
- Ensure you can reach the other Django servers
|
||||
- Follow steps on https://docs.djangoproject.com/en/3.0/intro/tutorial06/
|
||||
*** Django #8: Tutorial 7
|
||||
**** Lecture content
|
||||
- Environment like in Django 1 and Django 3
|
||||
- Ensure your nginx is working
|
||||
- Paste the URL of your Django server into the chat
|
||||
- Ensure you can reach the other Django servers
|
||||
- Follow steps on https://docs.djangoproject.com/en/3.0/intro/tutorial07/
|
||||
* 2020-07-13
|
||||
*** Django #6: Tutorial 5
|
||||
**** DONE Lecture content
|
||||
CLOSED: [2020-07-14 화 00:25]
|
||||
- Environment like in Django 1 and Django 3
|
||||
- Ensure your nginx is working
|
||||
- Follow steps on https://docs.djangoproject.com/en/3.0/intro/tutorial05/
|
||||
|
||||
* 2020-07-10
|
||||
*** Django #5: Tutorial 4
|
||||
**** DONE Lecture content
|
||||
CLOSED: [2020-07-14 화 00:19]
|
||||
- Environment like in Django 1 and Django 3
|
||||
- Ensure your nginx is working
|
||||
- Follow steps on https://docs.djangoproject.com/en/3.0/intro/tutorial04/
|
||||
|
||||
* 2020-07-08
|
||||
*** Django #4: Tutorial 3
|
||||
**** DONE Lecture content
|
||||
CLOSED: [2020-07-14 화 00:18]
|
||||
- Environment like in Django 1 and Django 3
|
||||
- Ensure your nginx is working
|
||||
- Follow steps on https://docs.djangoproject.com/en/3.0/intro/tutorial03/
|
||||
* 2020-07-06
|
||||
*** Django #3: using http and https
|
||||
**** DONE Lecture content
|
||||
CLOSED: [2020-07-14 화 00:17]
|
||||
- We want expose our Django app via https to the world
|
||||
- We want to allow IPv6 world wide access
|
||||
- Steps IPv6
|
||||
- Ensure you have IPv6 connectivity
|
||||
- Get a VPN from IPv6VPN.ch if you don't have IPv6
|
||||
- Ensure that your firewall allows access to ports 80 and 443
|
||||
to your machine
|
||||
- Coordinate with another participant to test your connection
|
||||
- The square brackets are needed in the following examples
|
||||
- curl -vv http://[your ipv6 address]
|
||||
- curl -vv https://[your ipv6 address]
|
||||
- Both examples should return "connection refused"
|
||||
- Find out your Domain name
|
||||
- We will install an letsencrypt certificate
|
||||
- Certificates need a name
|
||||
- The website https://has-a.name provides you with a name
|
||||
- Find out your name
|
||||
- Have somebody else ping your name
|
||||
- Steps webserver
|
||||
- Install nginx
|
||||
- Have somebody else run curl -v http://<your name>.has-a.name
|
||||
- Install certbot
|
||||
- Use certbot to request a certificate for your name
|
||||
- Use the nginx plugin of certbot
|
||||
- Have somebody else run curl -v https://<your name>.has-a.name
|
||||
(with httpS!)
|
||||
- Proxy configuration
|
||||
- We want nginx to forward the HTTPS requests to django
|
||||
- We run django on the IPv6 localhost
|
||||
- python manage.py runserver '[::1]:8000'
|
||||
- Note: this is different from last session!
|
||||
- We configure nginx to proxy to django
|
||||
- Locate the configuration file for the https server (usually
|
||||
somewhere below /etc/nginx)
|
||||
- Add a proxy configuration to it
|
||||
- The proxy block looks similar to this:
|
||||
location / {
|
||||
proxy_pass http://localhost:8000;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
}
|
||||
- Test with the other participants to reach you!
|
||||
- Add your nginx configuration
|
||||
* 2020-07-04
|
||||
*** Django #2: Tutorial 2
|
||||
**** DONE Lecture content
|
||||
|
|
|
|||
Loading…
Reference in New Issue