From 2e807d6d3a4f376dded19379f672c1a104eec4df Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 20 Aug 2024 15:11:47 +0800
Subject: [PATCH 1/2] Simplify the settings menu dropdown

---
 .../components/templates/PrimaryDropdown.tsx  | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/web/components/templates/PrimaryDropdown.tsx b/packages/web/components/templates/PrimaryDropdown.tsx
index 9c8ab53ea..3bdf8ca5a 100644
--- a/packages/web/components/templates/PrimaryDropdown.tsx
+++ b/packages/web/components/templates/PrimaryDropdown.tsx
@@ -196,32 +196,24 @@ export function PrimaryDropdown(props: PrimaryDropdownProps): JSX.Element {
       <DropdownSeparator />
       <ThemeSection {...props} />
       <DropdownOption
-        onSelect={() => headerDropdownActionHandler('navigate-to-install')}
+        onSelect={() => router.push('/settings/installation')}
         title="Install"
       />
       <DropdownOption
-        onSelect={() => headerDropdownActionHandler('navigate-to-feeds')}
+        onSelect={() => router.push('/settings/feeds')}
         title="Feeds"
       />
       <DropdownOption
-        onSelect={() => headerDropdownActionHandler('navigate-to-emails')}
+        onSelect={() => router.push('/settings/emails')}
         title="Emails"
       />
       <DropdownOption
-        onSelect={() => headerDropdownActionHandler('navigate-to-labels')}
+        onSelect={() => router.push('/settings/labels')}
         title="Labels"
       />
       <DropdownOption
-        onSelect={() => headerDropdownActionHandler('navigate-to-rules')}
-        title="Rules"
-      />
-      <DropdownOption
-        onSelect={() => headerDropdownActionHandler('navigate-to-api')}
-        title="API Keys"
-      />
-      <DropdownOption
-        onSelect={() => headerDropdownActionHandler('navigate-to-integrations')}
-        title="Integrations"
+        onSelect={() => router.push('/settings/settings')}
+        title="Settings"
       />
       <DropdownOption
         onSelect={() => window.open('https://docs.omnivore.app', '_blank')}

From ff8d3695606cb4d6e2e4bccfb9281d7259f2b7a0 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 20 Aug 2024 15:12:18 +0800
Subject: [PATCH 2/2] Clean up URLs for page metadata

---
 packages/web/components/patterns/PageMetaData.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web/components/patterns/PageMetaData.tsx b/packages/web/components/patterns/PageMetaData.tsx
index 8c1f038a4..e96f707b5 100644
--- a/packages/web/components/patterns/PageMetaData.tsx
+++ b/packages/web/components/patterns/PageMetaData.tsx
@@ -82,12 +82,12 @@ export function PageMetaData(props: PageMetaDataProps): JSX.Element {
       {props.path && (
         <meta
           property="og:url"
-          content={`https://omnivore.app${props.path}`}
+          content={`${webBaseURL}/${props.path}`}
           key="og-url"
         />
       )}
       {props.path && (
-        <link rel="canonical" href={`https://omnivore.app${props.path}`} />
+        <link rel="canonical" href={`${webBaseURL}/${props.path}`} />
       )}
 
       {/* Custom additional meta tags */}