Kaydet (Commit) d1956389 authored tarafından Batuhan Taşkaya's avatar Batuhan Taşkaya

sectioned view

üst fbf9ac1b
# Generated by Django 2.2.1 on 2019-05-11 23:16
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('social', '0006_auto_20190507_1848'),
]
operations = [
migrations.AlterField(
model_name='sharable',
name='pub_date',
field=models.DateTimeField(auto_now=True),
),
]
...@@ -27,7 +27,7 @@ class Sharable(models.Model): ...@@ -27,7 +27,7 @@ class Sharable(models.Model):
author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
pub_date = models.TimeField(auto_now=True) pub_date = models.DateTimeField(auto_now=True)
def __str__(self): def __str__(self):
return f"{self.__class__.__name__}@{self.author}" return f"{self.__class__.__name__}@{self.author}"
......
...@@ -13,3 +13,12 @@ function getCookie(c_name) ...@@ -13,3 +13,12 @@ function getCookie(c_name)
} }
return ""; return "";
} }
$('.js-captcha-refresh').click(function () {
$.getJSON("/captcha/refresh/", function (result) {
$('.captcha').attr('src', result['image_url']);
$('#id_captcha_0').val(result['key'])
});
});
...@@ -61,6 +61,8 @@ ...@@ -61,6 +61,8 @@
</main> </main>
{% bootstrap_javascript jquery='full' %} {% bootstrap_javascript jquery='full' %}
{% block js %}{% endblock %} {% block js %}{% endblock %}
{% load static %}
<script src="{% static 'js/main.js' %}"></script>
</body> </body>
</html> </html>
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
{% buttons %} {% buttons %}
<button class='js-captcha-refresh'>Refresh Captcha</button>
<button type="submit" class="btn btn-primary">Post link</button> <button type="submit" class="btn btn-primary">Post link</button>
{% endbuttons %} {% endbuttons %}
</form> </form>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
{% buttons %} {% buttons %}
<button class='js-captcha-refresh'>Refresh Captcha</button>
<button type="submit" class="btn btn-primary">Post</button> <button type="submit" class="btn btn-primary">Post</button>
{% endbuttons %} {% endbuttons %}
</form> </form>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
{% buttons %} {% buttons %}
<button class='js-captcha-refresh'>Refresh Captcha</button>
<button type="submit" class="btn btn-primary">Post snippet</button> <button type="submit" class="btn btn-primary">Post snippet</button>
{% endbuttons %} {% endbuttons %}
</form> </form>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<form method="post" class="form"> <form method="post" class="form">
{% csrf_token %} {% csrf_token %}
{% buttons %} {% buttons %}
<button class='js-captcha-refresh'>Refresh Captcha</button>
<button type="submit" class="btn btn-primary" value="Confirm">Delete Link</button> <button type="submit" class="btn btn-primary" value="Confirm">Delete Link</button>
{% endbuttons %} {% endbuttons %}
</form> </form>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<form method="post" class="form"> <form method="post" class="form">
{% csrf_token %} {% csrf_token %}
{% buttons %} {% buttons %}
<button class='js-captcha-refresh'>Refresh Captcha</button>
<button type="submit" class="btn btn-primary" value="Confirm">Delete Post</button> <button type="submit" class="btn btn-primary" value="Confirm">Delete Post</button>
{% endbuttons %} {% endbuttons %}
</form> </form>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<form method="post" class="form"> <form method="post" class="form">
{% csrf_token %} {% csrf_token %}
{% buttons %} {% buttons %}
<button class='js-captcha-refresh'>Refresh Captcha</button>
<button type="submit" class="btn btn-primary" value="Confirm">Delete Snippet</button> <button type="submit" class="btn btn-primary" value="Confirm">Delete Snippet</button>
{% endbuttons %} {% endbuttons %}
</form> </form>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
{% buttons %} {% buttons %}
<button class='js-captcha-refresh'>Refresh Captcha</button>
<button type="submit" class="btn btn-primary">Update Link</button> <button type="submit" class="btn btn-primary">Update Link</button>
{% endbuttons %} {% endbuttons %}
</form> </form>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
{% buttons %} {% buttons %}
<button class='js-captcha-refresh'>Refresh Captcha</button>
<button type="submit" class="btn btn-primary">Update Post</button> <button type="submit" class="btn btn-primary">Update Post</button>
{% endbuttons %} {% endbuttons %}
</form> </form>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
{% csrf_token %} {% csrf_token %}
{% bootstrap_form form %} {% bootstrap_form form %}
{% buttons %} {% buttons %}
<button class='js-captcha-refresh'>Refresh Captcha</button>
<button type="submit" class="btn btn-primary">Update Snippet</button> <button type="submit" class="btn btn-primary">Update Snippet</button>
{% endbuttons %} {% endbuttons %}
</form> </form>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{% block content %} {% block content %}
{% load renderer %} {% load renderer %}
{% load likes_inclusion_tags %} {% load likes_inclusion_tags %}
{% for item in feed %} {% for item in this_day %}
<div class="container-fluid __{{ item | get_class }}"> <div class="container-fluid __{{ item | get_class }}">
<fieldset class="border p-2"> <fieldset class="border p-2">
<legend class="w-auto"><a href="{% url 'profile' item.author %}">{{ item.author }}</a></legend> <legend class="w-auto"><a href="{% url 'profile' item.author %}">{{ item.author }}</a></legend>
...@@ -24,10 +24,8 @@ ...@@ -24,10 +24,8 @@
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}
{% block js %} {% block js %}
{% load static %}
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
<script>hljs.initHighlightingOnLoad();</script> <script>hljs.initHighlightingOnLoad();</script>
<script src="{% static 'js/main.js' %}"></script>
<script> <script>
$(function () { $(function () {
$('button').on('click', function () { $('button').on('click', function () {
......
...@@ -3,6 +3,9 @@ import docker.errors ...@@ -3,6 +3,9 @@ import docker.errors
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from django.http import JsonResponse from django.http import JsonResponse
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.utils import timezone
from datetime import datetime, timedelta
from functools import partial
from evality import Evality from evality import Evality
from purima.views import ExtendedListView from purima.views import ExtendedListView
...@@ -19,10 +22,27 @@ class Home(ExtendedListView): ...@@ -19,10 +22,27 @@ class Home(ExtendedListView):
template_name = "home.html" template_name = "home.html"
context_object_name = "feed" context_object_name = "feed"
def date_sorted(self, qs, to_date, from_date):
return list(filter(lambda item: from_date < item.pub_date < to_date, qs))
def get_queryset(self): def get_queryset(self):
qs = list(super().get_queryset()) qs = list(super().get_queryset())
qs.sort(key=(lambda item: item.id)) qs.sort(key=(lambda item: item.vote_total))
return reversed(qs) return reversed(qs)
def get_context_data(self):
context = super().get_context_data()
context['all_time'] = list(context.pop(self.context_object_name))
now = timezone.now()
date_sorted = partial(self.date_sorted, context['all_time'], now)
context['this_year'] = date_sorted(now - timedelta(365))
context['this_month'] = date_sorted(now - timedelta(30))
context['this_week'] = date_sorted(now - timedelta(7))
context['this_day'] = date_sorted(now - timedelta(1))
return context
@csrf_exempt @csrf_exempt
def run_snippet(request): def run_snippet(request):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment