An actual minimum viable product, maybe? #11

Merged
andrewlalis merged 43 commits from develop into master 2018-10-12 18:19:41 +00:00
10 changed files with 94 additions and 12 deletions
Showing only changes of commit 714f3241ce - Show all commits

View File

@ -27,9 +27,15 @@ urlpatterns = [
# /universities routes to a list of universities.
path('universities', views.universities, name='universities_list'),
# /universities/<pk> routes to a specific university.
path('universities/<int:university_id>', views.university_entity, name='university entity'),
# /courses routes to a list of courses.
path('courses', views.courses, name='courses_list'),
# /courses/<pk> routes to a specific course.
path('courses/<int:course_id>', views.course_entity, name='course entity'),
# static files (*.css, *.js, *.jpg etc.) served on /
# (assuming Django uses /static/ and /media/ for static/media urls)
url(r'^(?!/?static/)(?!/?media/)(?P<path>.*\..*)$',

Binary file not shown.

View File

@ -4,10 +4,14 @@
{% block content %}
{% block collection_name %}
{% endblock %}
<ul>
{% for entity in entities %}
<li>
{% block entity %}
{{ entity.name }}
{% endblock %}
</li>
{% endfor %}

View File

@ -2,11 +2,10 @@
{# Represents a list of university entities. #}
{% block entity %}
<b>{{ entity.name }}</b>, University:<i> {{ entity.taught_at_university.name}}</i><br>
<ul>
{% for professor in entity.professors.all %}
<li>{{ professor.name }}</li>
{% endfor %}
</ul>
{% block collection_name %}
<h2>Courses</h2>
{% endblock %}
{% block entity %}
<h3><a href="/courses/{{ entity.pk }}">{{ entity.name }}</a></h3>
{% endblock %}

View File

@ -2,6 +2,10 @@
{# Represents a list of university entities. #}
{% block entity %}
<b>{{ entity.name }}</b>
{% block collection_name %}
<h2>Universities</h2>
{% endblock %}
{% block entity %}
<h3><a href="/universities/{{ entity.pk }}">{{ entity.name }}</a></h3>
{% endblock %}

View File

@ -0,0 +1,11 @@
{% extends "postings/entity_pages/entity.html" %}
{% block entity_info %}
Taught at: <a href="/universities/{{ entity.taught_at_university.pk }}">{{ entity.taught_at_university.name }}</a>
<h4>Professors</h4>
<ul>
{% for professor in entity.professors.all %}
<li>{{ professor.name }}</li>
{% endfor %}
</ul>
{% endblock %}

View File

@ -0,0 +1,24 @@
{% extends "postings/generic_page.html" %}
{# Represents a single entity's detail page. #}
{% block content %}
<h2>Name: {{ entity.name }}</h2>
{% block entity_info %}
{% endblock %}
<section>
<h3>Reviews</h3>
<ul>
{% for review in entity.review_set.all %}
<li>
<h4>{{ review.title }}</h4> {{ review.rating }}
<p>{{ review.content }}
</li>
{% endfor %}
</ul>
</section>
{% endblock %}

View File

@ -0,0 +1,16 @@
{% extends "postings/entity_pages/entity.html" %}
{% block entity_info %}
<h4>Courses</h4>
<ul>
{% for course in entity.course_set.all %}
<li><a href="/courses/{{ course.pk }}">{{ course.name }}</a></li>
{% endfor %}
</ul>
<h4>Professors</h4>
<ul>
{% for professor in entity.professor_set.all %}
<li>{{ professor.name }}</li>
{% endfor %}
</ul>
{% endblock %}

View File

@ -10,9 +10,9 @@
</head>
<body>
<div style="width: 100%; text-align: center; background-color: gray;">
<h1>RateMyCourse</h1>
</div>
<header>
<h1><a href="/">RateMyCourse</a></h1>
</header>
{# All of a page's content to display should be placed in here. #}
<div id="content">

View File

@ -1,5 +1,5 @@
from django.shortcuts import render
from django.http import HttpResponse
from django.http import HttpResponse, Http404
from postings.models import *
# Create your views here.
@ -8,12 +8,30 @@ from postings.models import *
def index(request):
return render(request, 'postings/index.html')
# The view for a listing of universities.
def universities(request):
universities_list = University.objects.all()
context = {'entities': universities_list}
return render(request, 'postings/collections/universities.html', context)
# The view for /universities/<pk> Displays one university entity.
def university_entity(request, university_id):
try:
university = University.objects.get(pk=university_id)
except University.DoesNotExist:
raise Http404("University does not exist")
return render(request, 'postings/entity_pages/university.html', {'entity': university})
# The view for a listing of courses.
def courses(request):
courses_list = Course.objects.all()
context = {'entities': courses_list}
return render(request, 'postings/collections/courses.html', context)
# The view for a specific course entity.
def course_entity(request, course_id):
try:
course = Course.objects.get(pk=course_id)
except Course.DoesNotExist:
raise Http404("Course does not exist")
return render(request, 'postings/entity_pages/course.html', {'entity': course})