changed announcement page, added individual announcement pages, added css

Forum/migrations/0005_remove_post_post_imageurl.py

+# Generated by Django 3.2.12 on 2022-05-24 08:34
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Forum', '0004_reply_reply_post'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='post',
+            name='post_imageUrl',
+        ),
+    ]

Forum/migrations/0006_post_post_imageurl.py

+# Generated by Django 3.2.12 on 2022-05-24 08:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Forum', '0005_remove_post_post_imageurl'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='post_imageUrl',
+            field=models.CharField(default=1, max_length=999),
+        ),
+    ]

announcements/migrations/0004_announcement_announcement_imageurl.py

+# Generated by Django 3.2.12 on 2022-05-24 08:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0003_announcement_author_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='announcement',
+            name='announcement_imageUrl',
+            field=models.CharField(default='', max_length=999),
+        ),
+    ]

announcements/migrations/0005_alter_announcement_announcement_imageurl.py

+# Generated by Django 3.2.12 on 2022-05-24 08:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0004_announcement_announcement_imageurl'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='announcement',
+            name='announcement_imageUrl',
+            field=models.CharField(default=1, max_length=999),
+        ),
+    ]

announcements/migrations/0006_remove_announcement_announcement_imageurl.py

+# Generated by Django 3.2.12 on 2022-05-24 08:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0005_alter_announcement_announcement_imageurl'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='announcement',
+            name='announcement_imageUrl',
+        ),
+    ]

announcements/migrations/0007_announcement_announcement_imageurl.py

+# Generated by Django 3.2.12 on 2022-05-24 08:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0006_remove_announcement_announcement_imageurl'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='announcement',
+            name='announcement_imageUrl',
+            field=models.CharField(default=1, max_length=999),
+        ),
+    ]

announcements/models.py

@@ -7,6 +7,7 @@ class Announcement(models.Model):
     announcement_body = models.CharField(max_length=400)
     pub_date = models.DateTimeField("date published")
     author = models.ForeignKey(WidgetUser, on_delete=models.CASCADE, default=1)
+    announcement_imageUrl = models.CharField(max_length=999, default = 1)
 
     def __str__(self):
         return self.announcement_title

announcements/static/announcements/style.css

+h1 {
+    font-family: 'Courier New', Courier, monospace;
+    
+    }
+    
+    h3 {
+    font-family: 'Courier New', Courier, monospace;
+    border: 2px solid black;
+    background-color: azure;
+    }
+    
+    body {
+        background-color: bisque;
+    }
+    
+    ul {
+        font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
+        list-style-type: square;
+        border: 5px solid black;
+        background-color: aliceblue;
+    }
+    
+    img {
+        max-width: 500px;
+    }
\ No newline at end of file

announcements/templates/announcements/announcement.html

+{% extends "announcements/base.html" %}
+
+{% block content %}
+
+<h1>{{announcement.announcement_title}}</h1>
+<h4>{{announcement.author.first_name}} {{announcement.author.last_name}}, {{announcement.pub_date.day}}/{{announcement.pub_date.month}}/{{announcement.pub_date.year}}</h4>
+
+<img src= {{announcement.announcement_imageUrl}}>
+
+<h3>{{announcement.announcement_body}}</h3>
+
+    <ul>
+    {% for reaction in announcement.reaction_set.all %}
+
+        <li>{{reaction.reaction_name|lower|capfirst }}: {{reaction.tally}}</li><br>
+
+    {% endfor %} 
+    </ul>
+
+{% endblock %}
\ No newline at end of file

announcements/templates/announcements/base.html

+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" type="text/css" href="{% static 'announcements/style.css' %}">
+    <title></title>
+</head>    
+<body>
+    {% block content %}
+
+    {% endblock %}
+</body>
+</html>
\ No newline at end of file

announcements/templates/announcements/view.html

+{% extends "announcements/base.html" %}
+   
+{% block content %}
+    <h1>Announcement Board</h1>
+      {% if announcement_list %}
+         <ul>
+         {% for announcement in announcement_list %}
+            <h3><li><a href ="{% url 'announcement' announcement.id %}">{{announcement.announcement_title}}</a> 
+            </br> by {{announcement.author.first_name}} {{announcement.author.last_name}} dated {{announcement.pub_date.day}}/{{announcement.pub_date.month}}/{{announcement.pub_date.year}}</li></h3>
+         {% endfor %}
+         </ul>
+      {% else %}
+         <p>No announcements available.</p>
+      {% endif %}
+      
+{% endblock %}
\ No newline at end of file

announcements/urls.py

@@ -3,6 +3,6 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path('', views.index, name='index')
-    
+    path('', views.index, name='index'),
+    path("<int:announcement_id>/details/", views.announcement, name='announcement')  
 ]

announcements/views.py

@@ -6,18 +6,19 @@ from django.shortcuts import render
 # Create your views here.
 def index(request):
 
-    announcement_objects = Announcement.objects.all()
-    response = "<h1>~~~Announcements~~~</h1> <br><br>"
+    announcement = Announcement.objects.all()
+    reaction = Reaction.objects.all()
+    announcement_list = Announcement.objects.order_by("pub_date")
+    context ={
+        'announcement':announcement,
+        'reaction':reaction,
+        'announcement_list':announcement_list
+    }
+    return render(request, "announcements/view.html", context)
 
-    for announcement in announcement_objects:
-
-        like = announcement.reaction_set.get(reaction_name="LIKE").tally
-        love = announcement.reaction_set.get(reaction_name="LOVE").tally
-        angry = announcement.reaction_set.get(reaction_name="ANGRY").tally
-
-        response = (response + f"{announcement.announcement_title} by "
+def announcement(request, announcement_id):
+     try:
+        announcement = Announcement.objects.get(pk=announcement_id)
+     except Announcement.DoesNotExist:
+         raise Http404("Announcement doesnt exist")
+     return render(request, "announcements/announcement.html", {"announcement": announcement})
\ No newline at end of file
-            + f"{announcement.author.first_name} {announcement.author.last_name}<br>"
-            + f"dated {announcement.pub_date}: <br><br> {announcement.announcement_body}<br><br>"
-            + f"Like: {like} <br> Love: {love} <br> Angry: {angry} <br><br><br>")
-
-    return HttpResponse(response)
\ No newline at end of file