diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html new file mode 100644 index 0000000..98a0b97 --- /dev/null +++ b/backend/postings/templates/postings/frontend/entity.html @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+

{{ entity.name }} {{ entity.average }}

+

{{ entity.average_rating|floatformat:"-2" }}

+
+
+
+
+
+
+

Average user rating

+

{{ entity.average_rating|floatformat:"-2" }} / 5

+
+
+
+

Rating breakdown

+
+
+
5
+
+
+
+
+ 80% Complete (danger) +
+
+
+
0
+
+
+
+
4
+
+
+
+
+ 80% Complete (danger) +
+
+
+
1
+
+
+
+
3
+
+
+
+
+ 80% Complete (danger) +
+
+
+
1
+
+
+
+
2
+
+
+
+
+ 80% Complete (danger) +
+
+
+
1
+
+
+
+
1
+
+
+
+
+ 80% Complete (danger) +
+
+
+
0
+
+
+
+ +
+
+
+
+ + +
+
+
+
+ Leave a Review +
+ + +
+ +
+
+ {% for review in entity.review_set.all %} + {% include "postings/frontend/review.html" with review=review only %} + {% endfor %} +
+ +
+
+ +
+ + + + + + + + + + + + \ No newline at end of file diff --git a/backend/postings/templates/postings/frontend/landing.html b/backend/postings/templates/postings/frontend/landing.html new file mode 100644 index 0000000..0116fbe --- /dev/null +++ b/backend/postings/templates/postings/frontend/landing.html @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

Find rated courses

+

The best course reviews by your fellow students!

+
+
+
+ +
+ +
+
+
+
+
+
+ + + + + + + + + + + + + diff --git a/backend/postings/templates/postings/frontend/results.html b/backend/postings/templates/postings/frontend/results.html new file mode 100644 index 0000000..2eb49d1 --- /dev/null +++ b/backend/postings/templates/postings/frontend/results.html @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+

+ 160 Courses found for: "Software engineering" +

+ Request time (0.23 seconds) + +
+
+
+ +
+ +
+
+
+
+ + {# Second section for displaying results, or whatever should be shown first. #} + {% if results %} + {% for entity in results %} +
+
+

{{ entity.name }}

+ UNIVERSITY + + +
+ {% endfor %} + {% endif %} + +
+ + + + + + + + + +
+
+
+
+ + + + + + + + + + + diff --git a/backend/postings/templates/postings/frontend/review.html b/backend/postings/templates/postings/frontend/review.html new file mode 100644 index 0000000..00d7edf --- /dev/null +++ b/backend/postings/templates/postings/frontend/review.html @@ -0,0 +1,20 @@ + + + +
+
+
+ +
Student
+
{{ review.created_date|date:"j M, Y" }}
+
+
+
+
+ + +
+
{{ review.title }}
+
{{ review.content }}
+
+
\ No newline at end of file diff --git a/backend/postings/templates/postings/generic_page.html b/backend/postings/templates/postings/generic_page.html index 7e2bdb2..c1274c8 100644 --- a/backend/postings/templates/postings/generic_page.html +++ b/backend/postings/templates/postings/generic_page.html @@ -15,7 +15,7 @@ - {% block title %}RateMyCourse{% endblock %} + {% block title %}RateMyCourse{% endblock %} @@ -40,7 +40,6 @@ - {# All of a page's content to display should be placed in here. #}
{% block content %} diff --git a/backend/postings/views.py b/backend/postings/views.py index 1f65c22..4f0c918 100644 --- a/backend/postings/views.py +++ b/backend/postings/views.py @@ -3,6 +3,7 @@ from django.http import HttpResponse, Http404, HttpResponseBadRequest, HttpRespo from postings.models import * from postings.forms import * + # Create your views here. # The view for the homepage, or index.html @@ -13,8 +14,8 @@ def index(request): if search_query: # Filter objects based on case-insensitive contains filter. results = RateableEntity.objects.filter(name__icontains=search_query) - - return render(request, 'postings/index.html', {'results': results}) + return render(request, 'postings/frontend/results.html', {'results': results}) + return render(request, 'postings/frontend/landing.html', {'results': results}) # The view for listing all rateable entities. def rateables(request): @@ -47,7 +48,8 @@ def rateable_entity(request, entity_id): except RateableEntity.DoesNotExist: raise Http404("RateableEntity with id " + str(entity_id) + " does not exist.") - return render(request, "postings/rateables/" + template, {'entity': entity}) + return render(request, 'postings/frontend/entity.html', {'entity': entity}) + # return render(request, "postings/rateables/" + template, {'entity': entity}) # The view for receiving POST requests for new reviews. def post_review(request): diff --git a/frontpage/css/main.css.map b/frontpage/css/main.css.map deleted file mode 100644 index 021c2fa..0000000 --- a/frontpage/css/main.css.map +++ /dev/null @@ -1,7 +0,0 @@ -{ -"version": 3, -"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,cAAe;EACb,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAOrB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;;AAEpB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO", -"sources": ["main.scss"], -"names": [], -"file": "main.css" -} \ No newline at end of file diff --git a/frontpage/css/main.css b/frontpage/css/style.css similarity index 79% rename from frontpage/css/main.css rename to frontpage/css/style.css index 515b546..867e3fd 100644 --- a/frontpage/css/main.css +++ b/frontpage/css/style.css @@ -1,5 +1,5 @@ .box { - position: relative; + position: absolute; width: 100%; background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; color: #fff; @@ -20,6 +20,9 @@ .fullcontainer h3 { margin-bottom: 30px; } +.navbar-brand { + cursor: pointer; } + .box2 { background: #EAEBEC; position: relative; @@ -83,4 +86,24 @@ body { font-size: 24px; color: #d17581; } -/*# sourceMappingURL=main.css.map */ +.hr-line-dashed { + border-top: 1px dashed #E7EAEC; + color: #ffffff; + background-color: #ffffff; + height: 1px; + margin: 20px 0; } + +h2 { + font-size: 24px; + font-weight: 100; } + +.block3 { + background: white; } + +.search-form { + min-width: 60vw; } + +.big-font { + font-size: 25px; } + +/*# sourceMappingURL=style.css.map */ diff --git a/frontpage/css/style.css.map b/frontpage/css/style.css.map new file mode 100644 index 0000000..9fd736d --- /dev/null +++ b/frontpage/css/style.css.map @@ -0,0 +1,7 @@ +{ +"version": 3, +"mappings": "AACA,IAAI;EACF,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,0FAA0F;EACtG,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,MAAM;EAClB,aAAa,EAAE,CAAC;EAChB,UAAU,EAAC,MAAM;;AAEnB,cAAe;EACb,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAIrB,aAAa;EACX,MAAM,EAAC,OAAO;;AAIhB,KAAM;EACJ,UAAU,EAAE,OAAO;EACnB,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,IAAI;;AAGb,MAAM;EACJ,UAAU,EAAE,KAAK;;AAGnB,IAAK;EACH,WAAW,EAAE,IAAI;;AAEnB,SAAS;EACP,gBAAgB,EAAC,OAAO;EACxB,KAAK,EAAC,IAAI;;AAEZ,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,mBAAmB;EAC3B,aAAa,EAAC,GAAG;;AAEnB,KAAK;EACH,WAAW,EAAC,GAAG;;AAEjB,iBAAiB;EACf,cAAc,EAAC,GAAG;;AAGpB,aAAa;EACX,gBAAgB,EAAC,OAAO;EACxB,MAAM,EAAC,iBAAiB;EACxB,OAAO,EAAC,IAAI;EACZ,aAAa,EAAC,GAAG;EACjB,aAAa,EAAC,IAAI;;AAEpB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,MAAM,EAAC,MAAM;;AAEf,kBAAkB;EAChB,SAAS,EAAC,IAAI;;AAEhB,kBAAkB;EAChB,SAAS,EAAC,IAAI;EACd,aAAa,EAAC,IAAI;;AAEpB,mBAAmB;EACjB,SAAS,EAAC,IAAI;EACd,WAAW,EAAC,GAAG;EACf,aAAa,EAAC,IAAI;;AAEpB,yBAAyB;EACvB,SAAS,EAAC,IAAI;;AAGhB,SAAU;EACR,kBAAkB,EAAE,WAAW;EAC/B,eAAe,EAAE,WAAW;EAC5B,UAAU,EAAE,WAAW;;AAGzB,MACA;EACE,MAAM,EAAE,MAAM;EACd,SAAS,EAAE,IAAI;EACf,KAAK,EAAE,OAAO;;AAOhB,eAAgB;EACd,UAAU,EAAE,kBAAkB;EAC9B,KAAK,EAAE,OAAO;EACd,gBAAgB,EAAE,OAAO;EACzB,MAAM,EAAE,GAAG;EACX,MAAM,EAAE,MAAM;;AAGhB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;;AAElB,OAAQ;EACN,UAAU,EAAE,KAAK;;AAGnB,YAAY;EACV,SAAS,EAAC,IAAI;;AAGhB,SAAS;EACP,SAAS,EAAC,IAAI", +"sources": ["style.scss"], +"names": [], +"file": "style.css" +} \ No newline at end of file diff --git a/frontpage/css/main.scss b/frontpage/css/style.scss similarity index 81% rename from frontpage/css/main.scss rename to frontpage/css/style.scss index 2f1ca7d..d964ee3 100644 --- a/frontpage/css/main.scss +++ b/frontpage/css/style.scss @@ -1,6 +1,6 @@ //Homepage .box{ - position: relative; + position: absolute; width: 100%; background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; color: #fff; @@ -23,7 +23,9 @@ } - +.navbar-brand{ + cursor:pointer +} //Course page .box2 { @@ -98,4 +100,28 @@ body { .nopointer{ +} + +.hr-line-dashed { + border-top: 1px dashed #E7EAEC; + color: #ffffff; + background-color: #ffffff; + height: 1px; + margin: 20px 0; +} + +h2 { + font-size: 24px; + font-weight: 100; +} +.block3 { + background: white; +} + +.search-form{ + min-width:60vw; +} + +.big-font{ + font-size:25px; } \ No newline at end of file diff --git a/frontpage/entity.html b/frontpage/entity.html new file mode 100644 index 0000000..9689498 --- /dev/null +++ b/frontpage/entity.html @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+

Software engineering and startups

+

Rijksuniversiteit Groningen

+
+
+
+
+
+
+

Average user rating

+

3 / 5

+ + + + + +
+
+
+

Rating breakdown

+
+
+
5
+
+
+
+
+ 80% Complete (danger) +
+
+
+
0
+
+
+
+
4
+
+
+
+
+ 80% Complete (danger) +
+
+
+
1
+
+
+
+
3
+
+
+
+
+ 80% Complete (danger) +
+
+
+
1
+
+
+
+
2
+
+
+
+
+ 80% Complete (danger) +
+
+
+
1
+
+
+
+
1
+
+
+
+
+ 80% Complete (danger) +
+
+
+
0
+
+
+
+ +
+
+
+
+ + +
+
+
+
+ Leave a Review +
+ + +
+ +
+
+ +
+ +
+
+ +
Student
+
January 29, 2016
1 day ago
+
+
+
+
+ + + + + +
+
Course review 3
+
Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley
+
+
+ + + + + +
+
+
+ +
+ + + + + + + + + + + + \ No newline at end of file diff --git a/frontpage/index.html b/frontpage/index.html index fdc2fa0..d4e609c 100644 --- a/frontpage/index.html +++ b/frontpage/index.html @@ -211,7 +211,6 @@ - + + + + + + + +
+
+
+
+
+

+ 160 Courses found for: "Software engineering" +

+ Request time (0.23 seconds) +
+
+
+ +
+ +
+
+
+
+ +
+
+

Bootdey

+ www.bootdey.com +

+ +

+
+ +
+
+

Bootdey

+ https://bootdey.com/ +

+ +

+
+
+ + + + + + + + +
+
+
+
+
+ + + + + + + + + + diff --git a/frontpage/templSearchbar.html b/frontpage/templSearchbar.html new file mode 100644 index 0000000..31c52b5 --- /dev/null +++ b/frontpage/templSearchbar.html @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+

Find rated courses

+

The best course reviews by your fellow students!

+
+
+
+ +
+ +
+
+
+
+
+
+ + + + + + + + + + + +