From 3a7271309e9ff23bae05aa7bfa421929ed3b4cab Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 16 Jan 2021 08:19:54 -0800
Subject: [PATCH] Adds markup for set goal status on feed page

---
 bookwyrm/templates/feed.html                  | 39 ++++++++++++++++++-
 .../snippets/finish_reading_modal.html        |  4 +-
 bookwyrm/templates/snippets/goal_form.html    | 32 +++++++++++++++
 .../snippets/start_reading_modal.html         |  4 +-
 bookwyrm/views/landing.py                     |  7 ++++
 5 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/goal_form.html

diff --git a/bookwyrm/templates/feed.html b/bookwyrm/templates/feed.html
index b77da819b..750576c1a 100644
--- a/bookwyrm/templates/feed.html
+++ b/bookwyrm/templates/feed.html
@@ -47,8 +47,8 @@
                 <div class="card">
                     <div class="card-header">
                         <p class="card-header-title">
-                        <span>{% include 'snippets/book_titleby.html' with book=book %}</span>
-                        </>
+                            <span>{% include 'snippets/book_titleby.html' with book=book %}</span>
+                        </p>
                         <div class="card-header-icon is-hidden-tablet">
                             {% include 'snippets/toggle/toggle_button.html' with label="close" controls_text="no-book" class="delete" %}
                         </div>
@@ -67,6 +67,14 @@
             <input class="toggle-control" type="radio" name="recent-books" id="no-book">
         </div>
         {% endif %}
+
+        {% if goal %}
+        <section class="section">
+            <div class="block">
+                {{ goal }} hi
+            </div>
+        </section>
+        {% endif %}
     </div>
 
     <div class="column is-two-thirds" id="feed">
@@ -85,6 +93,33 @@
             </ul>
         </div>
 
+        {# announcements and system messages #}
+        {% if not goal and tab == 'home' %}
+        <section class="block" aria-title="Announcements">
+            {% now 'Y' as year %}
+            <article class="card">
+                <header class="card-header">
+                    <h3 class="card-header-title has-background-primary has-text-white">
+                        {{ year }} reading goal
+                    </h3>
+                </header>
+                <section class="card-content content">
+                    <p>Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.</p>
+
+                    {% include 'snippets/goal_form.html' %}
+                </section>
+                <footer class="card-footer has-background-white-bis">
+                    <div class="card-footer-item is-flex-direction-column">
+                        <button class="button is-danger is-light is-block">Dismiss message</button>
+                        <p class="help">You can set or change your reading goal any time from your <a href="{{ request.user.local_path }}">profile page</a></p>
+                    </div>
+                </footer>
+            </article>
+        </section>
+        {% endif %}
+        <hr>
+
+        {# activity feed #}
         {% if not activities %}
         <p>There aren't any activities right now! Try following a user to get started</p>
         {% endif %}
diff --git a/bookwyrm/templates/snippets/finish_reading_modal.html b/bookwyrm/templates/snippets/finish_reading_modal.html
index 06874c069..79bcd9449 100644
--- a/bookwyrm/templates/snippets/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/finish_reading_modal.html
@@ -29,8 +29,8 @@
                 <footer class="modal-card-foot">
                     <div class="columns">
                         <div class="column field">
-                            <label for="post-status">
-                                <input type="checkbox" name="post-status" class="checkbox" checked>
+                            <label for="post_status-{{ uuid }}">
+                                <input type="checkbox" name="post-status" class="checkbox" id="post_status-{{ uuid }}" checked>
                                 Post to feed
                             </label>
                             {% include 'snippets/privacy_select.html' %}
diff --git a/bookwyrm/templates/snippets/goal_form.html b/bookwyrm/templates/snippets/goal_form.html
new file mode 100644
index 000000000..d5236f90a
--- /dev/null
+++ b/bookwyrm/templates/snippets/goal_form.html
@@ -0,0 +1,32 @@
+<form method="post" name="goal" action="/goal/{{ year }}">
+    {% csrf_token %}
+    <input type="hidden" name="year" value="{{ year }}">
+    <input type="hidden" name="user" value="{{ request.user.id }}">
+
+    <div class="columns">
+        <div class="column">
+            <label class="label" for="id_goal">Reading goal:</label>
+            <div class="field has-addons">
+                <div class="control">
+                    <input type="number" class="input" name="goal" id="id_goal" value="12">
+                </div>
+                <p class="button is-static">books</p>
+            </div>
+        </div>
+
+        <div class="column">
+            <label for="post_status" class="label">
+                <input type="checkbox" name="post-status" id="post_status" class="checkbox" checked>
+                Post to feed
+            </label>
+
+            <div class="field">
+                {% include 'snippets/privacy_select.html' %}
+            </div>
+        </div>
+    </div>
+
+    <p>
+        <button type="submit" class="button is-link">Set goal</button>
+    </p>
+</form>
diff --git a/bookwyrm/templates/snippets/start_reading_modal.html b/bookwyrm/templates/snippets/start_reading_modal.html
index 158f56623..796f09844 100644
--- a/bookwyrm/templates/snippets/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/start_reading_modal.html
@@ -20,8 +20,8 @@
                 <footer class="modal-card-foot">
                     <div class="columns">
                         <div class="column field">
-                            <label for="post-status">
-                                <input type="checkbox" name="post-status" class="checkbox" checked>
+                            <label for="post_status-{{ uuid }}">
+                                <input type="checkbox" name="post-status" class="checkbox" id="post_status-{{ uuid }}" checked>
                                 Post to feed
                             </label>
                             {% include 'snippets/privacy_select.html' %}
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 7917c5b48..8305e0063 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -3,6 +3,7 @@ from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.db.models import Avg, Max
 from django.template.response import TemplateResponse
+from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views import View
 
@@ -86,12 +87,18 @@ class Feed(View):
             activities = get_activity_feed(
                 request.user, ['public', 'followers'])
         paginated = Paginator(activities, PAGE_LENGTH)
+
+        goal = models.AnnualGoal.objects.filter(
+            user=request.user, year=timezone.now().year
+        ).first()
         data = {
             'title': 'Updates Feed',
             'user': request.user,
             'suggested_books': suggested_books,
             'activities': paginated.page(page),
             'tab': tab,
+            'goal': goal,
+            'goal_form': forms.GoalForm(),
         }
         return TemplateResponse(request, 'feed.html', data)