From be0e8779d50f599a2598f43029787c1e97d6b4f2 Mon Sep 17 00:00:00 2001
From: Kalista Payne <sabrecat@gmail.com>
Date: Tue, 21 Jan 2025 12:13:50 -0600
Subject: [PATCH] fix(links): correct Guilds FAQ redirect and Contact Us

---
 website/client/src/components/404.vue            | 10 ++--------
 website/client/src/components/appFooter.vue      |  4 ++--
 website/client/src/components/static/contact.vue |  9 ---------
 website/client/src/components/static/header.vue  |  9 +++------
 website/client/src/router/index.js               |  2 +-
 5 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/website/client/src/components/404.vue b/website/client/src/components/404.vue
index cb8fa43830..e5f713b0ae 100644
--- a/website/client/src/components/404.vue
+++ b/website/client/src/components/404.vue
@@ -25,9 +25,9 @@
           <router-link to="/">
             Homepage
           </router-link>or
-          <router-link :to="contactUsLink">
+          <a href="mailto:admin@habitica.com">
             Contact Us
-          </router-link>about the issue.
+          </a>about the issue.
         </p>
       </div>
     </div>
@@ -40,12 +40,6 @@ import { mapState } from '@/libs/store';
 export default {
   computed: {
     ...mapState(['isUserLoggedIn']),
-    contactUsLink () {
-      if (this.isUserLoggedIn) {
-        return { name: 'guild', params: { groupId: 'a29da26b-37de-4a71-b0c6-48e72a900dac' } };
-      }
-      return { name: 'contact' };
-    },
     retiredChatPage () {
       return this.$route.fullPath.indexOf('/groups') !== -1;
     },
diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue
index 1a08d291a6..d6f2370c4b 100644
--- a/website/client/src/components/appFooter.vue
+++ b/website/client/src/components/appFooter.vue
@@ -37,9 +37,9 @@
         <h3>{{ $t('footerCompany') }}</h3>
         <ul>
           <li>
-            <router-link to="/static/contact">
+            <a href="mailto:admin@habitica.com">
               {{ $t('contactUs') }}
-            </router-link>
+            </a>
           </li>
           <li>
             <router-link to="/static/press-kit">
diff --git a/website/client/src/components/static/contact.vue b/website/client/src/components/static/contact.vue
index 1884880de2..6fc56d698d 100644
--- a/website/client/src/components/static/contact.vue
+++ b/website/client/src/components/static/contact.vue
@@ -31,13 +31,6 @@
           &colon;&nbsp;
           <a href="mailto:admin@habitica.com">admin&commat;habitica&period;com</a>
           <br>
-          {{ $t('generalQuestionsSite') }}
-          &colon;&nbsp;
-          <a
-            target="_blank"
-            @click.prevent="openBugReportModal(true)"
-          > {{ $t('askQuestion') }}</a>
-          <br>
           {{ $t('businessInquiries') }}
           &colon;&nbsp;
           <a href="mailto:admin@habitica.com">admin@habitica.com</a>
@@ -54,10 +47,8 @@
 <script>
 import { mapState } from '@/libs/store';
 import { goToModForm } from '@/libs/modform';
-import reportBug from '@/mixins/reportBug.js';
 
 export default {
-  mixins: [reportBug],
   computed: {
     ...mapState({
       user: 'user.data',
diff --git a/website/client/src/components/static/header.vue b/website/client/src/components/static/header.vue
index 6edf7ac9f5..ac95b88ddc 100644
--- a/website/client/src/components/static/header.vue
+++ b/website/client/src/components/static/header.vue
@@ -66,16 +66,13 @@
             class="nav-link"
           >{{ $t('presskit') }}</a>
         </router-link>
-        <router-link
-          class="nav-item"
-          tag="li"
-          to="/static/contact"
-        >
+        <li class="nav-item">
           <a
             v-once
             class="nav-link"
+            href="mailto:admin@habitica.com"
           >{{ $t('contactUs') }}</a>
-        </router-link>
+        </li>
       </ul>
       <ul
         v-else
diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js
index e7ceec6f31..538b4d6b26 100644
--- a/website/client/src/router/index.js
+++ b/website/client/src/router/index.js
@@ -219,7 +219,7 @@ const router = new VueRouter({
 
     // Only used to handle some redirects
     // See router.beforeEach
-    { path: '/static/faq/tavern-and-guilds', redirect: '/static/tavern-and-guilds' },
+    { path: '/static/tavern-and-guilds', redirect: '/static/faq/tavern-and-guilds' },
     { path: '/redirect/:redirect', name: 'redirect' },
     { path: '*', redirect: { name: 'notFound' } },
   ],