From 176658c31968597b3157c14730a3d3fa4700128b Mon Sep 17 00:00:00 2001 From: andrewlalis Date: Thu, 18 Oct 2018 10:04:24 +0200 Subject: [PATCH 01/12] Finished rating distribution. --- backend/postings/models.py | 8 ++++++++ .../templates/postings/frontend/entity.html | 20 +++++++++++++++---- backend/postings/views.py | 2 ++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/backend/postings/models.py b/backend/postings/models.py index 0054bed..de4c017 100644 --- a/backend/postings/models.py +++ b/backend/postings/models.py @@ -40,6 +40,14 @@ class RateableEntity(models.Model): return None return rating_sum / reviews.count() + # Gets a 5-item list of the count of each rating. + def getRatingDistribution(self): + reviews = self.review_set.select_related() + distribution = [0, 0, 0, 0, 0] + for review in reviews: + distribution[review.rating-1] += 1 + return distribution + # Simply returns the name as the string representation. def __str__(self): return self.name diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html index 000ecdf..52c58aa 100644 --- a/backend/postings/templates/postings/frontend/entity.html +++ b/backend/postings/templates/postings/frontend/entity.html @@ -9,11 +9,13 @@ {% block content %}
-
-
-

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

+ {% block entity_info %} +
+
+

{{ entity.name }}

+
-
+ {% endblock %}
@@ -22,6 +24,16 @@

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

+ {# Rating Distribution Display #} +
+
    +
  • 5: {{ entity.rating_distribution.4 }}
    • +
  • 4: {{ entity.rating_distribution.3 }}
    • +
  • 3: {{ entity.rating_distribution.2 }}
    • +
  • 2: {{ entity.rating_distribution.1 }}
    • +
  • 1: {{ entity.rating_distribution.0 }}
    • +
+
diff --git a/backend/postings/views.py b/backend/postings/views.py index 7ffeeaf..bf668c8 100644 --- a/backend/postings/views.py +++ b/backend/postings/views.py @@ -49,6 +49,8 @@ def rateable_entity(request, entity_id): # Set any auxiliary variables needed, like average rating. # This MUST be done after categorizing the object above. entity.average_rating = entity.getAverageRating() + entity.rating_distribution = entity.getRatingDistribution() + print(entity.rating_distribution) except RateableEntity.DoesNotExist: raise Http404("RateableEntity with id " + str(entity_id) + " does not exist.") -- 2.34.1 From 643e9ea1d39dfd30e7f6bc61189d8534a2711024 Mon Sep 17 00:00:00 2001 From: andrewlalis Date: Thu, 18 Oct 2018 10:32:37 +0200 Subject: [PATCH 02/12] Added temporary user name shortcut for now. --- backend/db.sqlite3 | Bin 79872 -> 79872 bytes .../migrations/0005_review_author_name.py | 18 ++++++++++++++++++ backend/postings/models.py | 2 ++ .../templates/postings/frontend/entity.html | 4 ++-- .../templates/postings/frontend/review.html | 2 +- backend/postings/views.py | 1 + 6 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 backend/postings/migrations/0005_review_author_name.py diff --git a/backend/db.sqlite3 b/backend/db.sqlite3 index c569ecb7996f92af1140e34288f371bb93ae6de0..92f7380d513d38ab1a12c2d3571bbb25c167fd67 100644 GIT binary patch delta 706 zcmYk2ZAepL6vvOhK#Vn1=D5;eaB5g8>ntB+nxzodzFsOGYs)r-Uo|po+ng` zFuT0vhC0YBem!07;9K;sM#dei5o4vQrFBLhF^Db~+&QUU*=>eiHTY6gAMbuvzwKRA z6MHx76v|TX(_- zF%(b4Z;U1;#}!)zL5I>%gy|NTI|RLEf&s-xu*{~pTj9we*k&@avJ*;k5q@cfM~7gI zks@7+p$KoeK&km((@cgrUu78MtK|C?M@1UY;u4(FY9(@bSAu%&rvy^DQhnJVo~2-) g=5d2n`_%?b+G632PlAr;7CQ(J_jSuU84e780ap^jG5`Po delta 612 zcmXv~OK1~O6n*#Imxd;peA<`@p-F3+rgjpsh(aiSW+Sv!Nrl9XAPPlFp$Ump!A(X% z6j5xSbX*835)fSJ)I__m$-)*Ibfa{kn`99y=psTJL`8iw(tA0F`wr)Rc!d@#wAh`1 zr%DJpAuuXH1@d#TeL~#hZCJ$1g)an?W6!dq*pU)d;-tQeW6WQ`2yS2zPvZ!Ej~1M! z6LdL>FgzCzK!k1Z{nzTX11{{8kf)=H_U?u zg$)Yw&*k7_R_S#!SR|;>>vUWc!!%>u4*Fu_c$b7D1RzZyZ6x=wHlzek*sh*SS^csM z*DmwH%`lAfdcB9=YFK%8bB*8Ky2O>OBzFfHyb<>5^B;^kEwo0kh6|WRAFYWUuc%)8 zbEFT($`FIUSa!#tg>y;ELO*mkN(6KCE$xFFq{KZRijJhqMj(8}uP8vY`F>cD)E!PC zMb#ct%0%F%r0$l4lu-98N+;1g1MomncR6gN^ROB=rPTqrC#iP3aLKCGlxCx#x+NMQ zjI0xwChPPIjf$&RQ0+RU&B$<2V={!aH5m?|8c%Dlhv2C8)Q~<7K|nhsL);<$(|{Q~ T+OF#N>pNk-mzCLG_-*|MEik2K diff --git a/backend/postings/migrations/0005_review_author_name.py b/backend/postings/migrations/0005_review_author_name.py new file mode 100644 index 0000000..dae5770 --- /dev/null +++ b/backend/postings/migrations/0005_review_author_name.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.1 on 2018-10-18 08:30 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('postings', '0004_remove_reviewhelpfulvote_user'), + ] + + operations = [ + migrations.AddField( + model_name='review', + name='author_name', + field=models.CharField(default='Anonymous', max_length=64), + ), + ] diff --git a/backend/postings/models.py b/backend/postings/models.py index de4c017..f6ca417 100644 --- a/backend/postings/models.py +++ b/backend/postings/models.py @@ -74,6 +74,8 @@ class Review(models.Model): last_updated_date = models.DateTimeField(auto_now=True) # A reference to the person who created this review. author = models.ForeignKey('postings.User', on_delete=models.PROTECT, null=True, blank=True) + # TEMPORARY: Name of person who gave review. + author_name = models.CharField(max_length=64, default='Anonymous') # Gets the total number of votes which marked this review as 'helpful'. @property diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html index 52c58aa..3350487 100644 --- a/backend/postings/templates/postings/frontend/entity.html +++ b/backend/postings/templates/postings/frontend/entity.html @@ -55,8 +55,8 @@ {# Username input #}
- - + +
{# Title input #} diff --git a/backend/postings/templates/postings/frontend/review.html b/backend/postings/templates/postings/frontend/review.html index ab4f843..6e83a36 100644 --- a/backend/postings/templates/postings/frontend/review.html +++ b/backend/postings/templates/postings/frontend/review.html @@ -7,7 +7,7 @@ {# Username #} -
Student
+
{{ review.author_name }}
{# Date at which review was posted. #}
{{ review.created_date|date:"j M, Y" }}
diff --git a/backend/postings/views.py b/backend/postings/views.py index bf668c8..89c1225 100644 --- a/backend/postings/views.py +++ b/backend/postings/views.py @@ -71,6 +71,7 @@ def post_review(request): if form.is_valid(): # Only if the request is a POST and the form is valid do we do anything. rating = form.cleaned_data['rating'] + name = form.cleaned_data['name'] title = form.cleaned_data['title'] content = form.cleaned_data['content'] entity_id = form.cleaned_data['entity_id'] -- 2.34.1 From b666a135625c0414e47c5bc0db0234007df5a482 Mon Sep 17 00:00:00 2001 From: andrewlalis Date: Thu, 18 Oct 2018 10:47:21 +0200 Subject: [PATCH 03/12] Added names. --- backend/db.sqlite3 | Bin 79872 -> 79872 bytes backend/postings/forms.py | 4 +++- backend/postings/views.py | 8 +++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/db.sqlite3 b/backend/db.sqlite3 index 92f7380d513d38ab1a12c2d3571bbb25c167fd67..2c112bb1fe9db45c079c3e36bfb0f65a8ebbc2a1 100644 GIT binary patch delta 952 zcmZ{jL1@!Z7{~MaWsY@huG^~Ua6V9QLsybEZITw09t+}O7ZDHct$k@;mgdD|UD;uD z;$4(oJbIFWc#whxQS>$nB8VV@2qMTX9_Gb^^WaO}Dt0cAfAaW;@Av)R_p-htukXlr zr$#!GBwZ1A_qsQuqt26s7lW`0ORa?bAhz);Zla})pYfY#;F&bK|DhyJ9EbDB=ixH* zs^N`*t}xn2w(bnCY@Qs3js&~#1HQvI*oH6g2|mC(cmo|#@)1nSAfaR=laWkBG9F1H zlCjoy`;>fa7`FCne1?zk9^S%h*lLYFe+(P4zUWf z;H=bxfDzlS+g6kQTPS1ZH8W+Tv$>pch@&fJ(c|7~jn_jjA%e}BT}sRN9M zFu`I1%Y89HU%dEYh`cXSQvlOqj2X?$nFoM-j;Z&6x1=#aRIhc3Fi%6Ddm&qNDGtjv z=WYov+ss?qTVWRBD(96HF5ASbQe0cbH8IY=pkj2CL=UQ(GPG>k=-bzxlTo!^4+G*b hBiN1puoCRH(FL>vvCBsv&LH{eStQGCSwX)Be*>)50L1_R delta 203 zcmZqpz|!!6Wr8&CVFm^UKOpu5Vy1~2=8T6oChTQr&SuWuEXcBeY4QOsOU8!DzqksO zg~ge*84L1@OEUA)i{pz@%Q92T`I&by@Bwu~!R9{hvK4%+%+DE^e=~n${>c1>`8m*- ztIV69Zq1l(@{i`RRV?1PQ2iMj-72#NI$`0K|GgB`=sKX|OD3(P3oS d&Z5Eihk3K0%6sO?3M_(?ez0z5HDLVB4gg=6IdA{~ diff --git a/backend/postings/forms.py b/backend/postings/forms.py index 99d8065..ccd5446 100644 --- a/backend/postings/forms.py +++ b/backend/postings/forms.py @@ -9,4 +9,6 @@ class EntityReviewForm(forms.Form): # The textual content of the review. content = forms.CharField(widget=forms.Textarea) # The id of the entity for which the review is created. - entity_id = forms.IntegerField() \ No newline at end of file + entity_id = forms.IntegerField() + # TEMPORARY name for author name. + name = forms.CharField(max_length=64, required=False) \ No newline at end of file diff --git a/backend/postings/views.py b/backend/postings/views.py index 89c1225..51f26f4 100644 --- a/backend/postings/views.py +++ b/backend/postings/views.py @@ -71,10 +71,15 @@ def post_review(request): if form.is_valid(): # Only if the request is a POST and the form is valid do we do anything. rating = form.cleaned_data['rating'] - name = form.cleaned_data['name'] title = form.cleaned_data['title'] content = form.cleaned_data['content'] entity_id = form.cleaned_data['entity_id'] + + if 'name' in request.POST: + author_name = form.cleaned_data['name'] + else: + author_name = None + try: entity = RateableEntity.objects.get(pk=entity_id) except RateableEntity.DoesNotExist: @@ -83,6 +88,7 @@ def post_review(request): # Creates the new Review object from the posted data. review = Review.objects.create( rating=rating, + author_name=author_name, title=title, content=content, rateable_entity=entity -- 2.34.1 From 7814cf6626d1a8174f5c66f9127cb3e3cde989f2 Mon Sep 17 00:00:00 2001 From: ludger Date: Thu, 18 Oct 2018 10:49:54 +0200 Subject: [PATCH 04/12] Ratings updated --- .../templates/postings/frontend/entity.html | 77 ++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html index 3350487..7eb64a0 100644 --- a/backend/postings/templates/postings/frontend/entity.html +++ b/backend/postings/templates/postings/frontend/entity.html @@ -25,7 +25,9 @@
{# Rating Distribution Display #} -
+ + + + +
+

Rating breakdown

+
+
+
5
+
+
+
+
+ 80% Complete (danger) +
+
+
+
{{ entity.rating_distribution.4 }}
+
+
+
+
4
+
+
+
+
+ 80% Complete (danger) +
+
+
+
{{ entity.rating_distribution.3 }}
+
+
+
+
3
+
+
+
+
+ 80% Complete (danger) +
+
+
+
{{ entity.rating_distribution.2 }}
+
+
+
+
2
+
+
+
+
+ 80% Complete (danger) +
+
+
+
{{ entity.rating_distribution.1 }}
+
+
+
+
1
+
+
+
+
+ 80% Complete (danger) +
+
+
+
{{ entity.rating_distribution.0 }}
+
+ + + +
-- 2.34.1 From f5dbbd974276b805be3af74a5ccf1dd3471c5192 Mon Sep 17 00:00:00 2001 From: andrewlalis Date: Thu, 18 Oct 2018 11:06:55 +0200 Subject: [PATCH 05/12] Fixed distribution. --- backend/postings/models.py | 21 ++++++++++-- .../templates/postings/frontend/entity.html | 32 ++++++------------- backend/postings/views.py | 1 - 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/backend/postings/models.py b/backend/postings/models.py index f6ca417..69af1a2 100644 --- a/backend/postings/models.py +++ b/backend/postings/models.py @@ -40,12 +40,27 @@ class RateableEntity(models.Model): return None return rating_sum / reviews.count() - # Gets a 5-item list of the count of each rating. + # Gets a 5-item list of the count of each rating, and the percentage of total votes. def getRatingDistribution(self): reviews = self.review_set.select_related() - distribution = [0, 0, 0, 0, 0] + distribution = [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]] + review_count = len(reviews) + for review in reviews: - distribution[review.rating-1] += 1 + distribution[review.rating-1][0] += 1 + + max_val = 0 + for rating_dist in distribution: + rating_dist[1] = (rating_dist[0] / review_count) * 100 + if (rating_dist[1] > max_val): + max_val = rating_dist[1] + + print(max_val) + print(distribution) + for rating_dist in distribution: + rating_dist[1] = (rating_dist[1] / max_val) * 100 + + print(distribution) return distribution # Simply returns the name as the string representation. diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html index 7eb64a0..3977c31 100644 --- a/backend/postings/templates/postings/frontend/entity.html +++ b/backend/postings/templates/postings/frontend/entity.html @@ -25,18 +25,6 @@
{# Rating Distribution Display #} - - - -

Rating breakdown

@@ -45,12 +33,12 @@
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.4 }}
+
{{ entity.rating_distribution.4.0 }}
@@ -58,12 +46,12 @@
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.3 }}
+
{{ entity.rating_distribution.3.0 }}
@@ -71,12 +59,12 @@
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.2 }}
+
{{ entity.rating_distribution.2.0 }}
@@ -84,12 +72,12 @@
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.1 }}
+
{{ entity.rating_distribution.1.0 }}
@@ -97,12 +85,12 @@
-
+
80% Complete (danger)
-
{{ entity.rating_distribution.0 }}
+
{{ entity.rating_distribution.0.0 }}
diff --git a/backend/postings/views.py b/backend/postings/views.py index 51f26f4..c98473d 100644 --- a/backend/postings/views.py +++ b/backend/postings/views.py @@ -50,7 +50,6 @@ def rateable_entity(request, entity_id): # This MUST be done after categorizing the object above. entity.average_rating = entity.getAverageRating() entity.rating_distribution = entity.getRatingDistribution() - print(entity.rating_distribution) except RateableEntity.DoesNotExist: raise Http404("RateableEntity with id " + str(entity_id) + " does not exist.") -- 2.34.1 From ef24a303e3e019acb08e72f1ab26dd144c299579 Mon Sep 17 00:00:00 2001 From: andrewlalis Date: Thu, 18 Oct 2018 11:28:21 +0200 Subject: [PATCH 06/12] Fixed a divide by zero error. --- backend/postings/models.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/backend/postings/models.py b/backend/postings/models.py index 69af1a2..cc3ffdc 100644 --- a/backend/postings/models.py +++ b/backend/postings/models.py @@ -44,23 +44,21 @@ class RateableEntity(models.Model): def getRatingDistribution(self): reviews = self.review_set.select_related() distribution = [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]] - review_count = len(reviews) + review_count = reviews.count() for review in reviews: distribution[review.rating-1][0] += 1 - max_val = 0 - for rating_dist in distribution: - rating_dist[1] = (rating_dist[0] / review_count) * 100 - if (rating_dist[1] > max_val): - max_val = rating_dist[1] + if (review_count > 0): + max_val = 0 + for rating_dist in distribution: + rating_dist[1] = (rating_dist[0] / review_count) * 100 + if (rating_dist[1] > max_val): + max_val = rating_dist[1] - print(max_val) - print(distribution) - for rating_dist in distribution: - rating_dist[1] = (rating_dist[1] / max_val) * 100 + for rating_dist in distribution: + rating_dist[1] = (rating_dist[1] / max_val) * 100 - print(distribution) return distribution # Simply returns the name as the string representation. -- 2.34.1 From c5ee3d8ec9ea337bdd5fcb7d995c3fc86721ce24 Mon Sep 17 00:00:00 2001 From: ludger Date: Thu, 18 Oct 2018 11:43:32 +0200 Subject: [PATCH 07/12] Fixing layout --- .../postings/static/postings/css/style.css | 17 ++++++++++++++++- .../static/postings/css/style.css.map | 2 +- .../postings/static/postings/css/style.scss | 19 ++++++++++++++++++- .../templates/postings/frontend/entity.html | 3 ++- .../templates/postings/frontend/results.html | 2 +- 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/backend/postings/static/postings/css/style.css b/backend/postings/static/postings/css/style.css index 867e3fd..ffa0608 100644 --- a/backend/postings/static/postings/css/style.css +++ b/backend/postings/static/postings/css/style.css @@ -7,19 +7,31 @@ margin-bottom: 0; overflow-y: hidden; } -.fullcontainer { +.box .fullcontainer { display: flex; align-items: center; height: -webkit-calc(100vh - 50px); height: -moz-calc(100vh - 50px); height: calc(100vh - 50px); } +.box3 .fullcontainer { + display: flex; + height: -webkit-calc(100vh - 50px); + height: -moz-calc(100vh - 50px); + height: calc(100vh - 50px); } + .fullcontainer h1 { font-size: 60px; } .fullcontainer h3 { margin-bottom: 30px; } +.whitebox { + background: white; + border-radius: 15px; + padding: 30px; + margin-top: 25px; } + .navbar-brand { cursor: pointer; } @@ -106,4 +118,7 @@ h2 { .big-font { font-size: 25px; } +.box3 { + background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; } + /*# sourceMappingURL=style.css.map */ diff --git a/backend/postings/static/postings/css/style.css.map b/backend/postings/static/postings/css/style.css.map index 9fd736d..d7b4014 100644 --- a/backend/postings/static/postings/css/style.css.map +++ b/backend/postings/static/postings/css/style.css.map @@ -1,6 +1,6 @@ { "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", +"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,mBAAoB;EAClB,OAAO,EAAE,IAAI;EACb,WAAW,EAAE,MAAM;EACnB,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,oBAAqB;EACnB,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,0BAA0B;EAClC,MAAM,EAAE,uBAAuB;EAC/B,MAAM,EAAE,kBAAkB;;AAE5B,iBAAiB;EACf,SAAS,EAAE,IAAI;;AAEjB,iBAAiB;EACf,aAAa,EAAE,IAAI;;AAGrB,SAAS;EACP,UAAU,EAAE,KAAK;EACjB,aAAa,EAAE,IAAI;EACnB,OAAO,EAAE,IAAI;EACb,UAAU,EAAC,IAAI;;AAIjB,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;;AAGhB,KAAK;EACH,UAAU,EAAE,0FAA0F", "sources": ["style.scss"], "names": [], "file": "style.css" diff --git a/backend/postings/static/postings/css/style.scss b/backend/postings/static/postings/css/style.scss index d964ee3..aa8d346 100644 --- a/backend/postings/static/postings/css/style.scss +++ b/backend/postings/static/postings/css/style.scss @@ -8,13 +8,19 @@ margin-bottom: 0; overflow-y:hidden; } -.fullcontainer { +.box .fullcontainer { display: flex; align-items: center; height: -webkit-calc(100vh - 50px); height: -moz-calc(100vh - 50px); height: calc(100vh - 50px); } +.box3 .fullcontainer { + display: flex; + height: -webkit-calc(100vh - 50px); + height: -moz-calc(100vh - 50px); + height: calc(100vh - 50px); +} .fullcontainer h1{ font-size: 60px; } @@ -22,6 +28,13 @@ margin-bottom: 30px; } +.whitebox{ + background: white; + border-radius: 15px; + padding: 30px; + margin-top:25px; +} + .navbar-brand{ cursor:pointer @@ -124,4 +137,8 @@ h2 { .big-font{ font-size:25px; +} + +.box3{ + background: #5850c7 url(https://d20ohkaloyme4g.cloudfront.net/img/hero-illustration-module.png) repeat; } \ No newline at end of file diff --git a/backend/postings/templates/postings/frontend/entity.html b/backend/postings/templates/postings/frontend/entity.html index 3977c31..81e784d 100644 --- a/backend/postings/templates/postings/frontend/entity.html +++ b/backend/postings/templates/postings/frontend/entity.html @@ -8,6 +8,7 @@ {% endblock %} {% block content %} +
{% block entity_info %}
@@ -114,6 +115,7 @@