From e3ea0e8f431f734fcb8001d62f265d58191372d0 Mon Sep 17 00:00:00 2001
From: Gabe Kangas <gabek@real-ity.com>
Date: Wed, 3 Feb 2021 16:16:05 -0800
Subject: [PATCH] Move tags into the general settings page

---
 web/pages/components/config/edit-social-links.tsx | 1 -
 web/pages/config-public-details.tsx               | 6 ++----
 web/pages/config-social-items.tsx                 | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/web/pages/components/config/edit-social-links.tsx b/web/pages/components/config/edit-social-links.tsx
index d4d431755..4c5f6f92c 100644
--- a/web/pages/components/config/edit-social-links.tsx
+++ b/web/pages/components/config/edit-social-links.tsx
@@ -231,7 +231,6 @@ export default function EditSocialLinks() {
 
   return (
     <div className="social-links-edit-container">
-      <Title level={2}>Social Links</Title>
       <p>Add all your social media handles and links to your other profiles here.</p>
 
       <FormStatusIndicator status={submitStatus} />
diff --git a/web/pages/config-public-details.tsx b/web/pages/config-public-details.tsx
index e4133fb0e..1d54665ff 100644
--- a/web/pages/config-public-details.tsx
+++ b/web/pages/config-public-details.tsx
@@ -4,6 +4,7 @@ import Link from 'next/link';
 
 import EditInstanceDetails from './components/config/edit-instance-details';
 import EditDirectoryDetails from './components/config/edit-directory';
+import EditInstanceTags from './components/config/edit-tags';
 
 const { Title } = Typography;
 
@@ -14,11 +15,8 @@ export default function PublicFacingDetails() {
 
       <div className="edit-public-details-container">
         <EditInstanceDetails />
+        <EditInstanceTags />
         <EditDirectoryDetails />
-
-        <Link href="/admin/config-page-content">
-          <a>Edit your extra page content here.</a>
-        </Link>
       </div>
     </>
   );
diff --git a/web/pages/config-social-items.tsx b/web/pages/config-social-items.tsx
index ea762f5ba..fafe0c169 100644
--- a/web/pages/config-social-items.tsx
+++ b/web/pages/config-social-items.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { Typography } from 'antd';
 import EditSocialLinks from './components/config/edit-social-links';
-import EditInstanceTags from './components/config/edit-tags';
 
 const { Title } = Typography;
 
@@ -11,7 +10,6 @@ export default function ConfigSocialThings() {
       <Title level={2}>Social Items</Title>
 
       <EditSocialLinks />
-      <EditInstanceTags />
     </div>
   );
 }