From e921c7b5b8b8ccf62705ecba480d987f7be1572e Mon Sep 17 00:00:00 2001 From: Felipe Henrique de Almeida Bormann Date: Wed, 4 Jan 2017 02:15:24 -0300 Subject: [PATCH] added initial view with subjects pagination, still have to add users-cloud and pagination css --- amadeus/views.py | 2 +- serializedata.py | 10 ++++++++++ subjects/templates/subjects/initial.html | 31 +++++++++++++++++++++++++++++++ subjects/urls.py | 1 + subjects/views.py | 38 +++++++++++++++++++++++++++++++++++--- 5 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 serializedata.py create mode 100644 subjects/templates/subjects/initial.html diff --git a/amadeus/views.py b/amadeus/views.py index e312576..2e7ac7a 100644 --- a/amadeus/views.py +++ b/amadeus/views.py @@ -4,6 +4,6 @@ from django.urls import reverse_lazy def index(request): if request.user.is_authenticated: - return redirect(reverse_lazy("subjects:index")) + return redirect(reverse_lazy("subjects:home")) else: return redirect('users:login') \ No newline at end of file diff --git a/serializedata.py b/serializedata.py new file mode 100644 index 0000000..80f112e --- /dev/null +++ b/serializedata.py @@ -0,0 +1,10 @@ +from django.core import serializers +import os + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "amadeus.settings") + +from subjects.models import Subject + + +data = serializers.serialize("json", Subject.objects.all()) +print(data) \ No newline at end of file diff --git a/subjects/templates/subjects/initial.html b/subjects/templates/subjects/initial.html new file mode 100644 index 0000000..fda8f90 --- /dev/null +++ b/subjects/templates/subjects/initial.html @@ -0,0 +1,31 @@ +{% extends "categories/home.html" %} + +{% block content %} + +
+ +
+
+
+ {% for subject in subjects %} + {% include "subjects/subject_card.html" %} + {% endfor %} +
+
+ + + + +{% endblock content %} \ No newline at end of file diff --git a/subjects/urls.py b/subjects/urls.py index 403c033..dca7620 100644 --- a/subjects/urls.py +++ b/subjects/urls.py @@ -2,6 +2,7 @@ from django.conf.urls import url from . import views urlpatterns = [ + url(r'^home/$', views.HomeView.as_view(), name='home'), url(r'^$', views.IndexView.as_view(), name='index'), url(r'^(?P