From b1e64f0a0a96fa443de0a30a6173c2b5a166a3d6 Mon Sep 17 00:00:00 2001
From: Matt Gabrenya <matt@buildyourweb.app>
Date: Thu, 25 May 2023 12:53:44 -0700
Subject: [PATCH] fix(ui): remove abstraction for defining tag routes, fix
 HashtagMewsFeed component import

---
 ui/src/components/HoloLogin.vue             |  2 +-
 ui/src/components/SearchEverythingInput.vue |  8 +++----
 ui/src/pages/AgentProfile.vue               |  5 ++--
 ui/src/pages/NotFound.vue                   |  2 +-
 ui/src/router.ts                            | 26 ++++++++-------------
 ui/src/utils/tags.ts                        |  8 +++----
 6 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/ui/src/components/HoloLogin.vue b/ui/src/components/HoloLogin.vue
index 05d6a542..798b2cf8 100644
--- a/ui/src/components/HoloLogin.vue
+++ b/ui/src/components/HoloLogin.vue
@@ -23,7 +23,7 @@ watch(
   () => client.agent.isAvailable,
   (isLoggedIn) => {
     if (isLoggedIn) {
-      router.replace({ name: ROUTES.home, force: true });
+      router.replace({ name: ROUTES.feed, force: true });
     }
   }
 );
diff --git a/ui/src/components/SearchEverythingInput.vue b/ui/src/components/SearchEverythingInput.vue
index 8f82b164..1bc56704 100644
--- a/ui/src/components/SearchEverythingInput.vue
+++ b/ui/src/components/SearchEverythingInput.vue
@@ -79,9 +79,9 @@
   </QSelect>
 </template>
 <script setup lang="ts">
-import { isHashtag, TAG_SYMBOLS } from "@/utils/tags";
+import { isHashtag } from "@/utils/tags";
 import { SearchResult, SearchResultOption } from "@/types/types";
-import { ROUTES, PATH, router } from "@/router";
+import { ROUTES, router } from "@/router";
 import { useSearchProfiles } from "@/utils/profiles";
 import { showError } from "@/utils/toasts";
 import { AppAgentClient, encodeHashToBase64 } from "@holochain/client";
@@ -148,7 +148,7 @@ const search = (
               return {
                 resultType: SearchResult.Hashtag,
                 value: {
-                  name: ROUTES[PATH[TAG_SYMBOLS.HASHTAG]],
+                  name: ROUTES.hashtag,
                   params: { tag: tag.replace("#", "") },
                 },
                 label: tag,
@@ -157,7 +157,7 @@ const search = (
               return {
                 resultType: SearchResult.Cashtag,
                 value: {
-                  name: ROUTES[PATH[TAG_SYMBOLS.CASHTAG]],
+                  name: ROUTES.cashtag,
                   params: { tag: tag.replace("$", "") },
                 },
                 label: tag,
diff --git a/ui/src/pages/AgentProfile.vue b/ui/src/pages/AgentProfile.vue
index acefde7f..30df0c93 100644
--- a/ui/src/pages/AgentProfile.vue
+++ b/ui/src/pages/AgentProfile.vue
@@ -114,7 +114,7 @@
           color="secondary"
           @click="
             router.push({
-              name: ROUTES[PATH[TAG_SYMBOLS.MENTION]],
+              name: ROUTES.mention,
               params: {
                 tag: profile.nickname,
                 agentPubKey: encodeHashToBase64(agentPubKey),
@@ -138,8 +138,7 @@ import { PROFILE_FIELDS } from "@/types/types";
 import isEqual from "lodash/isEqual";
 import { showError } from "@/utils/toasts";
 import { pageHeightCorrection } from "@/utils/page-layout";
-import { PATH, ROUTES } from "@/router";
-import { TAG_SYMBOLS } from "@/utils/tags";
+import { ROUTES } from "@/router";
 import {
   AgentPubKey,
   decodeHashFromBase64,
diff --git a/ui/src/pages/NotFound.vue b/ui/src/pages/NotFound.vue
index 4525bd77..c9c889bd 100644
--- a/ui/src/pages/NotFound.vue
+++ b/ui/src/pages/NotFound.vue
@@ -6,7 +6,7 @@
       color="accent"
       label="Come back home, Kitty"
       size="md"
-      :to="{ name: ROUTES.home }"
+      :to="{ name: ROUTES.feed }"
     />
   </QPage>
 </template>
diff --git a/ui/src/router.ts b/ui/src/router.ts
index be093888..1e878b2a 100644
--- a/ui/src/router.ts
+++ b/ui/src/router.ts
@@ -5,26 +5,20 @@ import MewsFeed from "./pages/MewsFeed.vue";
 import AgentProfile from "./pages/AgentProfile.vue";
 import MewYarn from "./pages/MewYarn.vue";
 import CashtagMewsFeed from "./pages/CashtagMewsFeed.vue";
-import HashtagMewsFeed from "./pages/CashtagMewsFeed.vue";
+import HashtagMewsFeed from "./pages/HashtagMewsFeed.vue";
 import MentionMewsFeed from "./pages/MentionMewsFeed.vue";
 import NotFound from "./pages/NotFound.vue";
 import MyNotifications from "./pages/MyNotifications.vue";
 
-export const PATH = {
-  [TAG_SYMBOLS.CASHTAG]: "cashtag",
-  [TAG_SYMBOLS.HASHTAG]: "hashtag",
-  [TAG_SYMBOLS.MENTION]: "handle",
-};
-
 export const ROUTES = {
   discover: "discover",
   profile: "profile",
   notifications: "notifications",
   feed: "feed",
   yarn: "yarn",
-  [PATH[TAG_SYMBOLS.CASHTAG]]: PATH[TAG_SYMBOLS.CASHTAG],
-  [PATH[TAG_SYMBOLS.HASHTAG]]: PATH[TAG_SYMBOLS.HASHTAG],
-  [PATH[TAG_SYMBOLS.MENTION]]: PATH[TAG_SYMBOLS.MENTION],
+  hashtag: "hashtag",
+  cashtag: "cashtag",
+  mention: "mention",
 };
 
 export const routes: RouteRecordRaw[] = [
@@ -54,20 +48,20 @@ export const routes: RouteRecordRaw[] = [
     component: MewYarn,
   },
   {
-    path: `/${PATH[TAG_SYMBOLS.CASHTAG]}/:tag`,
-    name: ROUTES[PATH[TAG_SYMBOLS.CASHTAG]],
+    path: `/cashtag/:tag`,
+    name: ROUTES.cashtag,
     component: CashtagMewsFeed,
     meta: { tag: TAG_SYMBOLS.CASHTAG },
   },
   {
-    path: `/${PATH[TAG_SYMBOLS.HASHTAG]}/:tag`,
-    name: ROUTES[PATH[TAG_SYMBOLS.HASHTAG]],
+    path: `/hashtag/:tag`,
+    name: ROUTES.hashtag,
     component: HashtagMewsFeed,
     meta: { tag: TAG_SYMBOLS.HASHTAG },
   },
   {
-    path: `/${PATH[TAG_SYMBOLS.MENTION]}/:tag/:agentPubKey`,
-    name: ROUTES[PATH[TAG_SYMBOLS.MENTION]],
+    path: `/mention/:tag/:agentPubKey`,
+    name: ROUTES.mention,
     component: MentionMewsFeed,
     meta: { tag: TAG_SYMBOLS.MENTION },
   },
diff --git a/ui/src/utils/tags.ts b/ui/src/utils/tags.ts
index 886e46f5..044a39df 100644
--- a/ui/src/utils/tags.ts
+++ b/ui/src/utils/tags.ts
@@ -1,4 +1,4 @@
-import { PATH, ROUTES } from "@/router";
+import { ROUTES } from "@/router";
 import {
   LinkTarget,
   LinkTargetName,
@@ -86,7 +86,7 @@ export const splitMewTextIntoContentParts = (
       ] as AgentPubKey;
 
       const route: RouteLocationRaw = {
-        name: ROUTES[PATH[part[0]]],
+        name: ROUTES.mention,
         params: {
           tag: part.substring(1),
           agentPubKey: encodeHashToBase64(agentPubKey),
@@ -108,7 +108,7 @@ export const splitMewTextIntoContentParts = (
       };
     } else if (partIsTag && part[0] === TAG_SYMBOLS.HASHTAG) {
       const route: RouteLocationRaw = {
-        name: ROUTES[PATH[part[0]]],
+        name: ROUTES.hashtag,
         params: { tag: part.substring(1) },
       };
 
@@ -119,7 +119,7 @@ export const splitMewTextIntoContentParts = (
       };
     } else if (partIsTag && part[0] === TAG_SYMBOLS.CASHTAG) {
       const route: RouteLocationRaw = {
-        name: ROUTES[PATH[part[0]]],
+        name: ROUTES.cashtag,
         params: { tag: part.substring(1) },
       };