From fe3f5da5d310bf67f3503126ebb259af58d03625 Mon Sep 17 00:00:00 2001
From: Alisha Mohanty <alishamohanty1416@gmail.com>
Date: Jun 12 2019 19:14:18 +0000
Subject: [PATCH 1/2] Improve side navigation design


---

diff --git a/assets/css/custom.css b/assets/css/custom.css
index b8baa8b..624a8b2 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -60,10 +60,10 @@ aside .sidebar a {
     cursor: pointer;
 }
 
-aside .sidebar .total-packets {
+.total-packets {
     cursor: default;
 }
-aside .sidebar .total-packets:hover{
+.total-packets:hover{
   text-decoration: none;
 }
 
@@ -385,9 +385,9 @@ blockquote {
   text-align: center;
   font-size:1.4rem;
 }
-#search_fasid {
+.search {
     background-color: white;
-    padding: 0 1em;
+    padding: 0.5rem 1em;
     color: var(--secondary-color);
     font-weight: 500;
     cursor: pointer;
@@ -408,3 +408,14 @@ blockquote {
 .fedmenu-content {
     position: absolute !important;
 }
+.total_happiness_sent{
+    text-align: center;
+    font-size: 3rem;
+    padding: 2rem;
+    font-family: 'Montserrat';
+}
+#id_q {
+    height: 3.2rem;
+    padding: 0 0.8rem;
+    border-radius: 2rem;
+}
diff --git a/templates/base.html b/templates/base.html
index f145d07..33d72d4 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -65,21 +65,16 @@
                         </button>
                     </form>
                 {% endif %}
-                {% if packets_sent == 0 %}
-                    <li><a class="total-packets">Total Happiness Spread: <b>{{ packets_sent }} 💔</b></a></li>
-                {% else %}
-                    <li><a class="total-packets">Total Happiness Spread: <b>{{ packets_sent }} 🎉</b></a></li>
-                {% endif %}
                 {% url 'messaging:send' as url %}
                 <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">Send some happiness!</a></li>
-                {% url 'messaging:start' as url %}
-                <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">What are Happiness Packets?</a></li>
+                {% url 'messaging:archive' as url %}
+                <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">Happiness Archive</a></li>
                 {% url 'messaging:inspiration' as url %}
                 <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">Get inspired</a></li>
+                {% url 'messaging:start' as url %}
+                <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">About</a></li>
                 {% url 'messaging:faq' as url %}
                 <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">FAQ</a></li>
-                {% url 'messaging:archive' as url %}
-                <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">Happiness Archive</a></li>
                 {% url 'messaging:search' as url %}
                 <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">Search the Archive</a></li>
               </ul>
diff --git a/templates/messaging/message_send_form.html b/templates/messaging/message_send_form.html
index b5bac76..9265026 100644
--- a/templates/messaging/message_send_form.html
+++ b/templates/messaging/message_send_form.html
@@ -15,7 +15,7 @@
 </div>
 {% crispy form %}
 
-<button id="search_fasid">Search</button>
+<button id="search_fasid" class="search">Search</button>
 
 <script> 
 $("#submit-id-submit").click(function() {
diff --git a/templates/messaging/start.html b/templates/messaging/start.html
index 17dca22..eea0573 100644
--- a/templates/messaging/start.html
+++ b/templates/messaging/start.html
@@ -43,10 +43,15 @@
         If both the sender and the recipient agree, we can
         <a href="{% url 'messaging:archive' %}">publish the Happiness Packet</a> on the website.
         We hope to build an archive of open-source happiness that communities can draw inspiration from.
-    </p><p>
-        As an example, here are two random messages from our archive:
     </p>
 
     {% include 'messaging/_message_list.html' %}
+    <div class="total_happiness_sent">
+        {% if packets_sent == 0 %}
+        <a class="total-packets">Total Happiness Spread: <b>{{ packets_sent }} 💔</b></a>
+        {% else %}
+        <a class="total-packets">Total Happiness Spread: <b>{{ packets_sent }} 🎉</b></a>
+        {% endif %}
+    </div>
     
 {% endblock content %}
diff --git a/templates/search/search.html b/templates/search/search.html
index 8bdf4e0..b353b9d 100644
--- a/templates/search/search.html
+++ b/templates/search/search.html
@@ -11,7 +11,7 @@
         {{ field.label_tag }} {{ field }}
     </div>
     {% endfor %}
-    <input type="submit" value="Search">
+    <input type="submit" value="Search" class="search">
 </form>
 {% if query %}
 <h3>Results</h3>

From 680e449e478dd3b5052a731585f08d24fb1548c6 Mon Sep 17 00:00:00 2001
From: Alisha Mohanty <alishamohanty1416@gmail.com>
Date: Jun 12 2019 19:14:18 +0000
Subject: [PATCH 2/2] Merge archive and search page


---

diff --git a/happinesspackets/messaging/views.py b/happinesspackets/messaging/views.py
index 0c1352b..4cdd63f 100644
--- a/happinesspackets/messaging/views.py
+++ b/happinesspackets/messaging/views.py
@@ -36,6 +36,7 @@ logger = logging.getLogger(__name__)
 class MessageSearchView(SearchView):
     template_name = 'search/search.html'
     form_class = SearchForm
+    paginate_by = 5
 
 class ArchiveListView(ListView):
     model = Message
diff --git a/templates/base.html b/templates/base.html
index 33d72d4..e7b5816 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -65,18 +65,16 @@
                         </button>
                     </form>
                 {% endif %}
+                {% url 'messaging:start' as url %}
+                <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">Home</a></li>
                 {% url 'messaging:send' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">Send some happiness!</a></li>
+                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">Send Happiness</a></li>
                 {% url 'messaging:archive' as url %}
                 <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">Happiness Archive</a></li>
                 {% url 'messaging:inspiration' as url %}
                 <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">Get inspired</a></li>
-                {% url 'messaging:start' as url %}
-                <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">About</a></li>
                 {% url 'messaging:faq' as url %}
                 <li role="presentation" {% ifequal request.path url %}class="active"{% endifequal %}><a href="{{ url }}">FAQ</a></li>
-                {% url 'messaging:search' as url %}
-                <li role="presentation" {% if url in request.path %}class="active"{% endif %}><a href="{{ url }}">Search the Archive</a></li>
               </ul>
         </div>
     </aside>
diff --git a/templates/messaging/archive.html b/templates/messaging/archive.html
index 78cb68d..c9143eb 100644
--- a/templates/messaging/archive.html
+++ b/templates/messaging/archive.html
@@ -8,6 +8,14 @@
         <h2>Happiness Archive</h2>
     </div>
 
+    {% url 'messaging:search' as url %}
+    <form method="get" class="form-inline" action="{{url}}">
+            <div class="form-group" style="font-size: 1.7em;">
+                <input type="search" name="q" id="id_q">
+                <input type="submit" value="Search" class="search">
+            </div>  
+    </form>
+
     <p>
         When you send a Happiness Packet, you can agree to display your message publicly on
         this website. If both sender and recipient select this option, the message is published
diff --git a/templates/messaging/start.html b/templates/messaging/start.html
index eea0573..d72cbb0 100644
--- a/templates/messaging/start.html
+++ b/templates/messaging/start.html
@@ -44,8 +44,6 @@
         <a href="{% url 'messaging:archive' %}">publish the Happiness Packet</a> on the website.
         We hope to build an archive of open-source happiness that communities can draw inspiration from.
     </p>
-
-    {% include 'messaging/_message_list.html' %}
     <div class="total_happiness_sent">
         {% if packets_sent == 0 %}
         <a class="total-packets">Total Happiness Spread: <b>{{ packets_sent }} 💔</b></a>
@@ -53,5 +51,10 @@
         <a class="total-packets">Total Happiness Spread: <b>{{ packets_sent }} 🎉</b></a>
         {% endif %}
     </div>
+    <p>
+        As an example, here are two random messages from our archive:
+    </p>
+
+    {% include 'messaging/_message_list.html' %}
     
 {% endblock content %}