From 32f41a9b20ca2652b3e7ad11fea837d1748c8dbb Mon Sep 17 00:00:00 2001
From: Bojan Mojsilovic <bmojsilovic@itekako.com>
Date: Tue, 12 Sep 2023 13:52:24 +0200
Subject: [PATCH] Add page title to every page

---
 src/components/MissingPage/MissingPage.tsx |  7 +++++++
 src/pages/Downloads.tsx                    |  3 +++
 src/pages/EditProfile.tsx                  |  3 +++
 src/pages/Explore.tsx                      |  3 +++
 src/pages/Home.tsx                         |  4 +++-
 src/pages/Messages.tsx                     |  3 +++
 src/pages/Mutelist.tsx                     |  9 +++++++++
 src/pages/Notifications.tsx                |  9 +++++++--
 src/pages/Search.tsx                       |  8 ++++++++
 src/pages/Settings/Appearance.tsx          |  3 +++
 src/pages/Settings/HomeFeeds.tsx           |  3 +++
 src/pages/Settings/Moderation.tsx          |  3 +++
 src/pages/Settings/Muted.tsx               |  3 +++
 src/pages/Settings/Network.tsx             |  3 +++
 src/pages/Settings/Notifications.tsx       |  3 +++
 src/pages/Settings/Settings.tsx            |  4 +++-
 src/pages/Settings/Zaps.tsx                |  3 +++
 src/pages/Thread.tsx                       |  8 ++++++++
 src/translations.ts                        | 10 ++++++++++
 19 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/src/components/MissingPage/MissingPage.tsx b/src/components/MissingPage/MissingPage.tsx
index de79f51..d0b4305 100644
--- a/src/components/MissingPage/MissingPage.tsx
+++ b/src/components/MissingPage/MissingPage.tsx
@@ -3,6 +3,7 @@ import { Component, JSXElement, Show } from 'solid-js';
 import { hookForDev } from '../../lib/devTools';
 import { placeholders as t } from '../../translations';
 import Branding from '../Branding/Branding';
+import PageTitle from '../PageTitle/PageTitle';
 import Search from '../Search/Search';
 import Wormhole from '../Wormhole/Wormhole';
 import styles from './MissingPage.module.scss';
@@ -14,6 +15,12 @@ const MissingPage: Component<{ title: string, children?: JSXElement, id?: string
 
   return (
     <div id={props.id}>
+      <PageTitle title={intl.formatMessage(
+          t.pageWIPTitle,
+          { title: props.title },
+        )}
+      />
+
       <Wormhole
         to="search_section"
       >
diff --git a/src/pages/Downloads.tsx b/src/pages/Downloads.tsx
index 1009c8a..c6574f4 100644
--- a/src/pages/Downloads.tsx
+++ b/src/pages/Downloads.tsx
@@ -16,6 +16,7 @@ import StickySidebar from '../components/StickySidebar/StickySidebar';
 import { andVersion, andRD, iosVersion, iosRD, today } from '../constants';
 import ExternalLink from '../components/ExternalLink/ExternalLink';
 import PageCaption from '../components/PageCaption/PageCaption';
+import PageTitle from '../components/PageTitle/PageTitle';
 
 const Downloads: Component = () => {
 
@@ -92,6 +93,8 @@ const Downloads: Component = () => {
         </div>
       </StickySidebar>
 
+      <PageTitle title={intl.formatMessage(t.title)} />
+
       <PageCaption title={intl.formatMessage(t.title)} />
 
       <div class={styles.promoHolder}>
diff --git a/src/pages/EditProfile.tsx b/src/pages/EditProfile.tsx
index c8bb904..3747ecb 100644
--- a/src/pages/EditProfile.tsx
+++ b/src/pages/EditProfile.tsx
@@ -23,6 +23,7 @@ import Loader from '../components/Loader/Loader';
 import { useNavigate } from '@solidjs/router';
 import Branding from '../components/Branding/Branding';
 import Wormhole from '../components/Wormhole/Wormhole';
+import PageTitle from '../components/PageTitle/PageTitle';
 
 type AutoSizedTextArea = HTMLTextAreaElement & { _baseScrollHeight: number };
 
@@ -267,6 +268,8 @@ const EditProfile: Component = () => {
 
   return (
     <div class={styles.container}>
+      <PageTitle title={intl.formatMessage(tSettings.profile.title)} />
+
       <PageCaption title={intl.formatMessage(tSettings.profile.title)} />
 
       <div id="central_header" class={styles.fullHeader}>
diff --git a/src/pages/Explore.tsx b/src/pages/Explore.tsx
index 4a74c78..32863ba 100644
--- a/src/pages/Explore.tsx
+++ b/src/pages/Explore.tsx
@@ -18,6 +18,7 @@ import PageCaption from '../components/PageCaption/PageCaption';
 import { titleCase } from '../utils';
 import AddToHomeFeedButton from '../components/AddToHomeFeedButton/AddToHomeFeedButton';
 import { setShowNav } from '../components/Layout/Layout';
+import PageTitle from '../components/PageTitle/PageTitle';
 
 
 const scopes = ['follows', 'tribe', 'network', 'global'];
@@ -70,6 +71,8 @@ const Explore: Component = () => {
 
     return (
       <>
+        <PageTitle title={intl.formatMessage(tExplore.pageTitle)} />
+
         <Wormhole
           to="search_section"
         >
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index e4fdf19..093f50c 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -27,9 +27,10 @@ import { PrimalUser } from '../types/primal';
 import Avatar from '../components/Avatar/Avatar';
 import { userName } from '../stores/profile';
 import { useAccountContext } from '../contexts/AccountContext';
-import { feedNewPosts, placeholders } from '../translations';
+import { feedNewPosts, placeholders, branding } from '../translations';
 import Search from '../components/Search/Search';
 import { setIsHome } from '../components/Layout/Layout';
+import PageTitle from '../components/PageTitle/PageTitle';
 
 
 const Home: Component = () => {
@@ -118,6 +119,7 @@ const Home: Component = () => {
 
   return (
     <div class={styles.homeContent}>
+      <PageTitle title={intl.formatMessage(branding)} />
       <Wormhole
         to="search_section"
       >
diff --git a/src/pages/Messages.tsx b/src/pages/Messages.tsx
index 8d3a339..da62d84 100644
--- a/src/pages/Messages.tsx
+++ b/src/pages/Messages.tsx
@@ -34,6 +34,7 @@ import {
 } from '../translations';
 import PageCaption from '../components/PageCaption/PageCaption';
 import { useMediaContext } from '../contexts/MediaContext';
+import PageTitle from '../components/PageTitle/PageTitle';
 
 type AutoSizedTextArea = HTMLTextAreaElement & { _baseScrollHeight: number };
 
@@ -876,6 +877,8 @@ const Messages: Component = () => {
 
   return (
     <div>
+      <PageTitle title={intl.formatMessage(tMessages.title)} />
+
       <Wormhole
         to="search_section"
       >
diff --git a/src/pages/Mutelist.tsx b/src/pages/Mutelist.tsx
index 556acfb..ffacff6 100644
--- a/src/pages/Mutelist.tsx
+++ b/src/pages/Mutelist.tsx
@@ -18,6 +18,7 @@ import { useIntl } from '@cookbook/solid-intl';
 import { useToastContext } from '../components/Toaster/Toaster';
 import Branding from '../components/Branding/Branding';
 import Wormhole from '../components/Wormhole/Wormhole';
+import PageTitle from '../components/PageTitle/PageTitle';
 
 const lists: Record<string, string> = {
   primal_nsfw: 'nsfw_list',
@@ -105,6 +106,14 @@ const Mutelist: Component = () => {
 
   return (
     <div class={styles.settingsContainer}>
+      <PageTitle title={
+        specialAlgos.includes(params.npub) ?
+          // @ts-ignore
+          intl.formatMessage(t.moderation.algos[params.npub]) :
+          intl.formatMessage(t.moderation.moderationItem, { name: userName(author()) })
+        }
+      />
+
       <PageCaption>
         <div style="display: flex; align-items: center; justify-content: space-between; width: 100%;">
           <div style="display: flex; align-items: center;">
diff --git a/src/pages/Notifications.tsx b/src/pages/Notifications.tsx
index f9eef7c..f874e4d 100644
--- a/src/pages/Notifications.tsx
+++ b/src/pages/Notifications.tsx
@@ -25,6 +25,7 @@ import { notifications as t } from '../translations';
 
 import styles from './Notifications.module.scss';
 import PageCaption from '../components/PageCaption/PageCaption';
+import PageTitle from '../components/PageTitle/PageTitle';
 
 const Notifications: Component = () => {
 
@@ -999,9 +1000,9 @@ const Notifications: Component = () => {
     const knownUsers = Object.keys(users);
 
     const rUsers: Record<string, PrimalNotifUser[]> = notes.reduce((acc, note) => {
-      const pk = note.user.pubkey;
+      const pk: string = note.user.pubkey;
 
-      const rUser = knownUsers.includes(pk) ?
+      const rUser: PrimalUser = knownUsers.includes(pk) ?
         convertToUser(users[pk]) :
         emptyUser(pk);
 
@@ -1050,6 +1051,10 @@ const Notifications: Component = () => {
 
   return (
     <div>
+      <PageTitle title={
+        intl.formatMessage(t.title)}
+      />
+
       <Wormhole
         to="search_section"
       >
diff --git a/src/pages/Search.tsx b/src/pages/Search.tsx
index 9826f81..c172b9d 100644
--- a/src/pages/Search.tsx
+++ b/src/pages/Search.tsx
@@ -22,6 +22,7 @@ import SearchComponent from '../components/Search/Search';
 import { toast as t, search as tSearch, actions as tActions  } from '../translations';
 import PageCaption from '../components/PageCaption/PageCaption';
 import AddToHomeFeedButton from '../components/AddToHomeFeedButton/AddToHomeFeedButton';
+import PageTitle from '../components/PageTitle/PageTitle';
 
 const Search: Component = () => {
   const params = useParams();
@@ -67,6 +68,13 @@ const Search: Component = () => {
 
   return (
     <>
+      <PageTitle title={
+        intl.formatMessage(
+          tSearch.title,
+          { query: query() || '' },
+        )}
+      />
+
       <StickySidebar>
         <SearchSidebar users={search?.contentUsers || []} />
       </StickySidebar>
diff --git a/src/pages/Settings/Appearance.tsx b/src/pages/Settings/Appearance.tsx
index 1743d92..52e96f2 100644
--- a/src/pages/Settings/Appearance.tsx
+++ b/src/pages/Settings/Appearance.tsx
@@ -6,6 +6,7 @@ import { useIntl } from '@cookbook/solid-intl';
 import { settings as t } from '../../translations';
 import PageCaption from '../../components/PageCaption/PageCaption';
 import { Link } from '@solidjs/router';
+import PageTitle from '../../components/PageTitle/PageTitle';
 
 const Appearance: Component = () => {
 
@@ -13,6 +14,8 @@ const Appearance: Component = () => {
 
   return (
     <div>
+      <PageTitle title={`${intl.formatMessage(t.appearance.title)} ${intl.formatMessage(t.title)}`} />
+
       <PageCaption>
         <Link href='/settings' >{intl.formatMessage(t.index.title)}</Link>:&nbsp;
         <div>{intl.formatMessage(t.appearance.title)}</div>
diff --git a/src/pages/Settings/HomeFeeds.tsx b/src/pages/Settings/HomeFeeds.tsx
index ee84b46..91fb880 100644
--- a/src/pages/Settings/HomeFeeds.tsx
+++ b/src/pages/Settings/HomeFeeds.tsx
@@ -8,6 +8,7 @@ import { Link } from '@solidjs/router';
 import ConfirmModal from '../../components/ConfirmModal/ConfirmModal';
 import { useSettingsContext } from '../../contexts/SettingsContext';
 import FeedSorter from '../../components/FeedSorter/FeedSorter';
+import PageTitle from '../../components/PageTitle/PageTitle';
 
 const HomeFeeds: Component = () => {
 
@@ -23,6 +24,8 @@ const HomeFeeds: Component = () => {
 
   return (
     <div>
+      <PageTitle title={`${intl.formatMessage(t.homeFeeds.title)} ${intl.formatMessage(t.title)}`} />
+
       <PageCaption>
         <Link href='/settings' >{intl.formatMessage(t.index.title)}</Link>:&nbsp;
         <div>{intl.formatMessage(t.homeFeeds.title)}</div>
diff --git a/src/pages/Settings/Moderation.tsx b/src/pages/Settings/Moderation.tsx
index e4d0eaf..d5575a5 100644
--- a/src/pages/Settings/Moderation.tsx
+++ b/src/pages/Settings/Moderation.tsx
@@ -7,6 +7,7 @@ import Avatar from '../../components/Avatar/Avatar';
 import Checkbox from '../../components/Checkbox/Checkbox';
 import HelpTip from '../../components/HelpTip/HelpTip';
 import PageCaption from '../../components/PageCaption/PageCaption';
+import PageTitle from '../../components/PageTitle/PageTitle';
 import VerificationCheck from '../../components/VerificationCheck/VerificationCheck';
 import { contentScope, Kind, specialAlgos, trendingScope } from '../../constants';
 import { useAccountContext } from '../../contexts/AccountContext';
@@ -175,6 +176,8 @@ const Moderation: Component = () => {
 
   return (
     <div>
+      <PageTitle title={`${intl.formatMessage(t.moderation.title)} ${intl.formatMessage(t.title)}`} />
+
       <PageCaption>
         <Link href='/settings' >{intl.formatMessage(t.index.title)}</Link>:&nbsp;
         <div>{intl.formatMessage(t.moderation.title)}</div>
diff --git a/src/pages/Settings/Muted.tsx b/src/pages/Settings/Muted.tsx
index e673e0c..9d8c76e 100644
--- a/src/pages/Settings/Muted.tsx
+++ b/src/pages/Settings/Muted.tsx
@@ -15,6 +15,7 @@ import { createStore } from 'solid-js/store';
 import { PrimalUser } from '../../types/primal';
 import Avatar from '../../components/Avatar/Avatar';
 import { hexToNpub } from '../../lib/keys';
+import PageTitle from '../../components/PageTitle/PageTitle';
 
 const Muted: Component = () => {
 
@@ -63,6 +64,8 @@ const Muted: Component = () => {
 
   return (
     <div>
+      <PageTitle title={`${intl.formatMessage(t.muted.title)} ${intl.formatMessage(t.title)}`} />
+
       <PageCaption>
         <Link href='/settings' >{intl.formatMessage(t.index.title)}</Link>:&nbsp;
         <div>{intl.formatMessage(t.muted.title)}</div>
diff --git a/src/pages/Settings/Network.tsx b/src/pages/Settings/Network.tsx
index 8ce96b1..bd5b7e8 100644
--- a/src/pages/Settings/Network.tsx
+++ b/src/pages/Settings/Network.tsx
@@ -22,6 +22,7 @@ import ConfirmModal from '../../components/ConfirmModal/ConfirmModal';
 import { interpretBold } from '../../translationHelpers';
 import { useSettingsContext } from '../../contexts/SettingsContext';
 import HelpTip from '../../components/HelpTip/HelpTip';
+import PageTitle from '../../components/PageTitle/PageTitle';
 
 
 const Network: Component = () => {
@@ -172,6 +173,8 @@ const Network: Component = () => {
 
   return (
     <div>
+      <PageTitle title={`${intl.formatMessage(t.network.title)} ${intl.formatMessage(t.title)}`} />
+
       <PageCaption>
         <Link href='/settings' >{intl.formatMessage(t.index.title)}</Link>:&nbsp;
         <div>{intl.formatMessage(t.network.title)}</div>
diff --git a/src/pages/Settings/Notifications.tsx b/src/pages/Settings/Notifications.tsx
index b2f9011..2ddd84f 100644
--- a/src/pages/Settings/Notifications.tsx
+++ b/src/pages/Settings/Notifications.tsx
@@ -6,6 +6,7 @@ import { settings as t } from '../../translations';
 import PageCaption from '../../components/PageCaption/PageCaption';
 import { Link } from '@solidjs/router';
 import SettingsNotifications from '../../components/SettingsNotifications/SettingsNotifications';
+import PageTitle from '../../components/PageTitle/PageTitle';
 
 const Notifications: Component = () => {
 
@@ -13,6 +14,8 @@ const Notifications: Component = () => {
 
   return (
     <div>
+      <PageTitle title={`${intl.formatMessage(t.notifications.title)} ${intl.formatMessage(t.title)}`} />
+
       <PageCaption>
         <Link href='/settings' >{intl.formatMessage(t.index.title)}</Link>:&nbsp;
         <div>{intl.formatMessage(t.notifications.title)}</div>
diff --git a/src/pages/Settings/Settings.tsx b/src/pages/Settings/Settings.tsx
index 8492be3..05d820b 100644
--- a/src/pages/Settings/Settings.tsx
+++ b/src/pages/Settings/Settings.tsx
@@ -12,14 +12,16 @@ import { Link, Outlet } from '@solidjs/router';
 import HomeSidebar from '../../components/HomeSidebar/HomeSidebar';
 import StickySidebar from '../../components/StickySidebar/StickySidebar';
 import SettingsSidebar from '../../components/SettingsSidebar/SettingsSidebar';
+import PageTitle from '../../components/PageTitle/PageTitle';
 
 const Settings: Component = () => {
 
   const intl = useIntl();
-  const settings = useSettingsContext();
 
   return (
     <div class={styles.settingsContainer}>
+      <PageTitle title={intl.formatMessage(t.title)} />
+
       <Wormhole to="search_section">
         <Search />
       </Wormhole>
diff --git a/src/pages/Settings/Zaps.tsx b/src/pages/Settings/Zaps.tsx
index d5a928a..26eb87c 100644
--- a/src/pages/Settings/Zaps.tsx
+++ b/src/pages/Settings/Zaps.tsx
@@ -6,6 +6,7 @@ import { settings as t } from '../../translations';
 import PageCaption from '../../components/PageCaption/PageCaption';
 import { Link } from '@solidjs/router';
 import SettingsZap from '../../components/SettingsZap/SettingsZap';
+import PageTitle from '../../components/PageTitle/PageTitle';
 
 const Zaps: Component = () => {
 
@@ -13,6 +14,8 @@ const Zaps: Component = () => {
 
   return (
     <div>
+      <PageTitle title={`${intl.formatMessage(t.zaps)} ${intl.formatMessage(t.title)}`} />
+
       <PageCaption>
         <Link href='/settings' >{intl.formatMessage(t.index.title)}</Link>:&nbsp;
         <div>{intl.formatMessage(t.zaps)}</div>
diff --git a/src/pages/Thread.tsx b/src/pages/Thread.tsx
index e7acc49..2c8a624 100644
--- a/src/pages/Thread.tsx
+++ b/src/pages/Thread.tsx
@@ -18,6 +18,8 @@ import { useIntl } from '@cookbook/solid-intl';
 import Search from '../components/Search/Search';
 import { thread as t } from '../translations';
 import { setShowNav } from '../components/Layout/Layout';
+import { userName } from '../stores/profile';
+import PageTitle from '../components/PageTitle/PageTitle';
 
 
 const Thread: Component = () => {
@@ -129,6 +131,12 @@ const Thread: Component = () => {
 
   return (
     <div>
+      <PageTitle title={
+        intl.formatMessage(
+          t.pageTitle,
+          { name: userName(primaryNote()?.user) },
+        )}
+      />
 
       <Wormhole
         to="search_section"
diff --git a/src/translations.ts b/src/translations.ts
index 5f71919..749e751 100644
--- a/src/translations.ts
+++ b/src/translations.ts
@@ -349,6 +349,11 @@ export const explore = {
     defaultMessage: 'explore nostr',
     description: 'Generic caption for the explore page',
   },
+  pageTitle: {
+    id: 'explore.pageTitle',
+    defaultMessage: 'Explore Nostr',
+    description: 'Title of the explore page',
+  },
   title: {
     id: 'explore.title',
     defaultMessage: '{timeframe}: {scope}',
@@ -1372,6 +1377,11 @@ export const thread = {
     defaultMessage: 'People in this thread',
     description: 'Title of the Thread page sidebar',
   },
+  pageTitle: {
+    id: 'thread.page.title',
+    defaultMessage: 'Note by {name}',
+    description: 'Title of the Thread page sidebar',
+  },
 };
 
 export const toast = {