From f5d06d265676481d3e7f99a86e425ea5f6d78141 Mon Sep 17 00:00:00 2001
From: Andrew Godwin <andrew@aeracode.org>
Date: Fri, 23 Dec 2022 23:01:27 -0700
Subject: [PATCH] Move wellness options inside Interface

---
 takahe/urls.py                    |  5 -----
 templates/settings/_menu.html     |  3 ---
 users/views/settings/__init__.py  |  1 -
 users/views/settings/interface.py |  9 ++++++++-
 users/views/settings/wellness.py  | 15 ---------------
 5 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 users/views/settings/wellness.py

diff --git a/takahe/urls.py b/takahe/urls.py
index e413c8b..b12f0a5 100644
--- a/takahe/urls.py
+++ b/takahe/urls.py
@@ -46,11 +46,6 @@ urlpatterns = [
         settings.InterfacePage.as_view(),
         name="settings_interface",
     ),
-    path(
-        "settings/user/",
-        settings.WellnessPage.as_view(),
-        name="settings_wellness",
-    ),
     path(
         "admin/",
         admin.AdminRoot.as_view(),
diff --git a/templates/settings/_menu.html b/templates/settings/_menu.html
index da12c3e..478e5ae 100644
--- a/templates/settings/_menu.html
+++ b/templates/settings/_menu.html
@@ -6,9 +6,6 @@
     <a href="{% url "settings_interface" %}" {% if section == "interface" %}class="selected"{% endif %} title="Interface">
         <i class="fa-solid fa-display"></i> Interface
     </a>
-    <a href="{% url "settings_wellness" %}" {% if section == "wellness" %}class="selected"{% endif %} title="Wellness">
-        <i class="fa-solid fa-staff-snake"></i> Wellness
-    </a>
     <h3>Account</h3>
     <a href="{% url "settings_security" %}" {% if section == "security" %}class="selected"{% endif %} title="Login &amp; Security">
         <i class="fa-solid fa-key"></i> Login &amp; Security
diff --git a/users/views/settings/__init__.py b/users/views/settings/__init__.py
index 808e881..f3332d3 100644
--- a/users/views/settings/__init__.py
+++ b/users/views/settings/__init__.py
@@ -6,7 +6,6 @@ from users.views.settings.interface import InterfacePage  # noqa
 from users.views.settings.profile import ProfilePage  # noqa
 from users.views.settings.security import SecurityPage  # noqa
 from users.views.settings.settings_page import SettingsPage  # noqa
-from users.views.settings.wellness import WellnessPage  # noqa
 
 
 @method_decorator(identity_required, name="dispatch")
diff --git a/users/views/settings/interface.py b/users/views/settings/interface.py
index c8863b2..230fe6f 100644
--- a/users/views/settings/interface.py
+++ b/users/views/settings/interface.py
@@ -16,6 +16,13 @@ class InterfacePage(SettingsPage):
             "help_text": "Visibility to use as default for new posts.",
             "choices": Post.Visibilities.choices,
         },
+        "visible_reaction_counts": {
+            "title": "Show Boost and Like Counts",
+            "help_text": "Disable to hide the number of Likes and Boosts on a 'Post'",
+        },
     }
 
-    layout = {"Posting": ["toot_mode", "default_post_visibility"]}
+    layout = {
+        "Posting": ["toot_mode", "default_post_visibility"],
+        "Wellness": ["visible_reaction_counts"],
+    }
diff --git a/users/views/settings/wellness.py b/users/views/settings/wellness.py
deleted file mode 100644
index 6ea9151..0000000
--- a/users/views/settings/wellness.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from users.views.settings.settings_page import SettingsPage
-
-
-class WellnessPage(SettingsPage):
-
-    section = "wellness"
-
-    options = {
-        "visible_reaction_counts": {
-            "title": "Show Boost and Like Counts",
-            "help_text": "Disable to hide the number of Likes and Boosts on a 'Post'",
-        },
-    }
-
-    layout = {"Wellness": ["visible_reaction_counts"]}