From f47718852131c085aa2feb41d05a11faed305f9e Mon Sep 17 00:00:00 2001
From: Piotr Szkudlarek <szkudlarekp5@gmail.com>
Date: Sun, 7 Jan 2024 01:10:31 +0100
Subject: [PATCH] Add ckeditor to post creation page

---
 .../migrations/0004_alter_post_content.py     |  18 ++++++++++++++
 ..._comment_date_added_alter_post_date_pub.py |  22 ++++++++++++++++++
 PlanktonDetector/Community/models.py          |   7 +++---
 PlanktonDetector/Community/views.py           |   2 +-
 PlanktonDetector/db.sqlite3                   | Bin 479232 -> 479232 bytes
 .../static/Community/css/add_post.css         |  13 +++++++----
 .../static/Community/css/list_posts.css       |   1 +
 .../static/Community/css/post_details.css     |   3 ++-
 PlanktonDetector/templates/add_post.html      |   3 ++-
 PlanktonDetector/templates/history.html       |   2 +-
 PlanktonDetector/templates/post_details.html  |   6 +++--
 11 files changed, 63 insertions(+), 14 deletions(-)
 create mode 100644 PlanktonDetector/Community/migrations/0004_alter_post_content.py
 create mode 100644 PlanktonDetector/Community/migrations/0005_alter_comment_date_added_alter_post_date_pub.py

diff --git a/PlanktonDetector/Community/migrations/0004_alter_post_content.py b/PlanktonDetector/Community/migrations/0004_alter_post_content.py
new file mode 100644
index 0000000..0233ee2
--- /dev/null
+++ b/PlanktonDetector/Community/migrations/0004_alter_post_content.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2024-01-06 23:25
+
+import ckeditor.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("Community", "0003_comment_date_added"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="post",
+            name="content",
+            field=ckeditor.fields.RichTextField(blank=True, null=True),
+        ),
+    ]
diff --git a/PlanktonDetector/Community/migrations/0005_alter_comment_date_added_alter_post_date_pub.py b/PlanktonDetector/Community/migrations/0005_alter_comment_date_added_alter_post_date_pub.py
new file mode 100644
index 0000000..e7460ee
--- /dev/null
+++ b/PlanktonDetector/Community/migrations/0005_alter_comment_date_added_alter_post_date_pub.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.7 on 2024-01-07 00:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("Community", "0004_alter_post_content"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="comment",
+            name="date_added",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name="post",
+            name="date_pub",
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+    ]
diff --git a/PlanktonDetector/Community/models.py b/PlanktonDetector/Community/models.py
index fa94610..8d8b78c 100644
--- a/PlanktonDetector/Community/models.py
+++ b/PlanktonDetector/Community/models.py
@@ -1,14 +1,15 @@
 from django.db import models
 from django.contrib.auth.models import User
+from ckeditor.fields import RichTextField
 
 # Create your models here.
 
 
 class Post(models.Model):
     title = models.CharField(max_length=500)
-    content = models.TextField()
+    content = RichTextField(null=True, blank=True)
     author = models.ForeignKey(User, on_delete=models.CASCADE, null=False)
-    date_pub = models.DateField(auto_now_add=True)
+    date_pub = models.DateTimeField(auto_now_add=True)
 
     @property
     def sorted_comments(self):
@@ -19,4 +20,4 @@ class Comment(models.Model):
     author = models.ForeignKey(User, on_delete=models.CASCADE, null=False)
     content = models.TextField()
     post = models.ForeignKey(Post, on_delete=models.CASCADE)
-    date_added = models.DateField(auto_now_add=True)
+    date_added = models.DateTimeField(auto_now_add=True)
diff --git a/PlanktonDetector/Community/views.py b/PlanktonDetector/Community/views.py
index d3f1bf4..341c051 100644
--- a/PlanktonDetector/Community/views.py
+++ b/PlanktonDetector/Community/views.py
@@ -11,7 +11,7 @@ from .froms import PostForm, CommentForm
 class ListPosts(ListView):
     model = Post
     template_name = "list_posts.html"
-    paginate_by = 3
+    paginate_by = 4
 
     def get_queryset(self) -> QuerySet[Any]:
         queryset = Post.objects.all().order_by("-date_pub")
diff --git a/PlanktonDetector/db.sqlite3 b/PlanktonDetector/db.sqlite3
index d4ec1d5f11e24a2377aa8cb78181c9554acd220b..a7d5506efc40ae13484e0682acaa14f07722aec3 100644
GIT binary patch
delta 3230
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
BriK6j

delta 1106
zcmah|ZA?>F7{2Gd_x3<3=d?_%2$(Cum5<S{TY<7T*ceV@2L?4%Mpiaug)&+Ut%S~H
z6m|U3S-rXw$VjTdj7k`+=uJ$vWI>i}A<pb8x-9!}e@e11{jvSn;&%A8CR?(TyvaH5
zd7eD)d7t-;q)J9oCCMU-RS<+2k8&P}NBqoVDzYwgO;fSda7DxB=Cn(B-jKesA(Tt#
zCUT4XL1sw@IZu*l%X}TtI_%|@e)6kOz{y!_eX;03O_BcoShzPj95~2#-QlQ7o3(F2
zRoX547ST`b+5@|-P%6k5E3%*ik-?};Cj^(~QmVCpBZW%eb>42U)F^Ie{kGbA_cpsr
z^{8rX`uoT$6-s}1UGEV!9F6oHesO5HH~vy=V4%hwbjNzUVQ;+Vuy%C(+ODTVZT0=#
zYQ+6QVAvb<#=}9cS{>RE-nZjGPqW(h)RVrZA=N+V3I*aF)q{0zr`uEQbXB{ZS(+Y?
zyVjGAPn?y_^epYCJIP)0km}?#S>&A<Bo$@iv*`b-F|L8MkqPD4ow-YQ=FlF?za;e4
zho}gNRmRkL4DD=Gfz9bgrOc?OjBscxk!ePtf70LS1NsxqaOE#4%QQf7v578cUC<xs
zH}o$3oPI(-rpp{QL)mfzG>CrFD#LqVf!pdbvF|!T)_?AV4I<|+{Wt$3y2SZYlr2SI
zr)=XUZ{_D-sP@-snU~`e=skLqzDbWzAJ5lQ=4-`^*OP$EWrhNQ2wj4yE$;)onA>Lj
zI`@X`6S^cM3IK*?dXTIbm@5U3>u+6#DWvax8+M88iL3CTlzUlF`2;wOqc8ih)!{%V
zFk77l8;a?c8BozWrKNSB(z4&@t2kD)8(W*2(24Dg%t9eEUj?k6oP#K0d2`Ti$sZOh
zS)(Zkx-<(I#02rOQx_qL>e%KfC}-vwP7X{#kVR+U5PNhQ2>C~a|Bt=AX{|_1tm|OG
z3vkYu*mM9}_d8HxI}2X`E4wre1uQlVq3iP?DPoJ9)bVYY1Wx-A^yC*1?GUSICByTm
zowsU*=#>rPSB;`S|31ShwC0I7U%!7!eB>U_jWawTE$F3P;*d#eR6_drt5V;m+`tSs
zP+kK&O=Fo(S<iGDikC!!Jq#<jgy+pzO4weP*qQeXR=w4RujQ=Ig_{C7o}ZI<(rC^(
zhd0VMq-TI7=AnrXR}V;|uO0WZgxyfcINrwIv0<lPr{Wb;v5AZc^jrEqouo(UbF`jr
WB)^f*h)yQS7=J{N=woldF!~#~P*L#!

diff --git a/PlanktonDetector/static/Community/css/add_post.css b/PlanktonDetector/static/Community/css/add_post.css
index ce7c4bb..99203e1 100644
--- a/PlanktonDetector/static/Community/css/add_post.css
+++ b/PlanktonDetector/static/Community/css/add_post.css
@@ -5,13 +5,15 @@
     align-items: center;
 }
 
-#add_post p{
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
+#add_post input{
+    margin-bottom: 10px;
 }
 
+#add_post label{
+    margin-bottom: 10px;
+    font-size: 20px;
+    font-weight: bold;
+}
 
 #submit{
     background-color: chartreuse;
@@ -22,4 +24,5 @@
     color:black;
     font-family: Arial;
     text-align: center;
+    margin-top: 10px;
 }
\ No newline at end of file
diff --git a/PlanktonDetector/static/Community/css/list_posts.css b/PlanktonDetector/static/Community/css/list_posts.css
index 2b5e61b..51e1018 100644
--- a/PlanktonDetector/static/Community/css/list_posts.css
+++ b/PlanktonDetector/static/Community/css/list_posts.css
@@ -47,4 +47,5 @@ ul{
     box-shadow: 0 0 0 2px black;
     font-size: 20px;
     font-family: Arial;
+    margin-bottom:10px;
 }
\ No newline at end of file
diff --git a/PlanktonDetector/static/Community/css/post_details.css b/PlanktonDetector/static/Community/css/post_details.css
index b0a8d19..a237703 100644
--- a/PlanktonDetector/static/Community/css/post_details.css
+++ b/PlanktonDetector/static/Community/css/post_details.css
@@ -12,7 +12,7 @@
     margin-top:10px;
     flex-direction: column;
     justify-content:center;
-    align-items: flex-start;
+    align-items: stretch;
     border: 3px solid lightgray;
     width: 80%;
     padding: 15px;
@@ -30,6 +30,7 @@
     font-size: 40px;
     color: black;
     font-weight: bold;
+    align-self: flex-start;
 }
 
 #content{
diff --git a/PlanktonDetector/templates/add_post.html b/PlanktonDetector/templates/add_post.html
index 7b8f77a..c341af1 100644
--- a/PlanktonDetector/templates/add_post.html
+++ b/PlanktonDetector/templates/add_post.html
@@ -6,7 +6,8 @@
 {%block content%}
 <form method="POST" id="add_post">
     {% csrf_token %}
-    {{ form.as_p }}
+    {{form}}
+    {{form.media}}
     <input type="submit" value="Add post" id="submit">
 </form>
 {%endblock content%}
\ No newline at end of file
diff --git a/PlanktonDetector/templates/history.html b/PlanktonDetector/templates/history.html
index 5f610ae..9263579 100644
--- a/PlanktonDetector/templates/history.html
+++ b/PlanktonDetector/templates/history.html
@@ -12,7 +12,7 @@
             <div class="history_details">
             <img src="{{detection.images.first.image.url}}" alt="upload_image" style="width:125px; height:125px;">
             <div class="date_author">
-            <p class="date">{{detection.date_predicted.date}}</p>
+            <p class="date">{{detection.date_predicted}}</p>
             <p class="author">{{detection.owner}}</p>
             <p class="num_images">Images uploaded: {{detection.images.all.count}}</p>
             </div>
diff --git a/PlanktonDetector/templates/post_details.html b/PlanktonDetector/templates/post_details.html
index b085729..a505834 100644
--- a/PlanktonDetector/templates/post_details.html
+++ b/PlanktonDetector/templates/post_details.html
@@ -8,20 +8,22 @@
     <div class="post">
     <div class="title-content">
         <p id="title">{{object.title}}</p>
-        <p id="content">{{object.content}}</p>
+        <p id="content">{{object.content|safe}}</p>
     </div>
     <div class="author">
         <p id="author">{{object.author}}</p>
     </div>
     </div>
     <p id="comment-label">Comments:</p>
-        <div id="add_comment">
+    {%if user.is_authenticated%}
+    <div id="add_comment">
     <form method="POST" id="comment_form">
     {%csrf_token%}
     {{form}}
     <input type="submit" id="submit" value="Add comment">
     </form>
     </div>
+    {%endif%}
     <div class="comments">
         {%for comment in object.sorted_comments%}
     <div class="single-comment">