From 16916db24761c5fa583dfd749a9323712e7b7684 Mon Sep 17 00:00:00 2001
From: Enrico Ros <enrico.ros@gmail.com>
Date: Tue, 21 Nov 2023 22:17:17 -0800
Subject: [PATCH] Improve routing, and move the action pwa action receiver

---
 pages/{launch.tsx => link/share_target.tsx}    | 13 +++++++------
 public/manifest.json                           |  2 +-
 src/apps/chat/components/composer/Composer.tsx |  2 +-
 src/apps/link/AppChatLinkDrawerItems.tsx       |  4 ++--
 src/apps/news/AppNews.tsx                      |  4 ++--
 src/common/app.routes.ts                       | 15 +++++++++++----
 6 files changed, 24 insertions(+), 16 deletions(-)
 rename pages/{launch.tsx => link/share_target.tsx} (91%)

diff --git a/pages/launch.tsx b/pages/link/share_target.tsx
similarity index 91%
rename from pages/launch.tsx
rename to pages/link/share_target.tsx
index a25fbf174..6f05c4000 100644
--- a/pages/launch.tsx
+++ b/pages/link/share_target.tsx
@@ -4,11 +4,12 @@ import { useRouter } from 'next/router';
 import { Alert, Box, Button, Typography } from '@mui/joy';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 
-import { setComposerStartupText } from '../src/apps/chat/components/composer/store-composer';
+import { setComposerStartupText } from '../../src/apps/chat/components/composer/store-composer';
 
 import { AppLayout } from '~/common/layout/AppLayout';
 import { LogoProgress } from '~/common/components/LogoProgress';
 import { asValidURL } from '~/common/util/urlUtils';
+import { navigateToIndex } from '~/common/app.routes';
 
 
 /**
@@ -28,13 +29,13 @@ function AppShareTarget() {
   const [isDownloading, setIsDownloading] = React.useState(false);
 
   // external state
-  const { query, push: routerPush, replace: routerReplace } = useRouter();
+  const { query } = useRouter();
 
 
   const queueComposerTextAndLaunchApp = React.useCallback((text: string) => {
     setComposerStartupText(text);
-    void routerReplace('/');
-  }, [routerReplace]);
+    void navigateToIndex(true);
+  }, []);
 
 
   // Detect the share Intent from the query
@@ -110,7 +111,7 @@ function AppShareTarget() {
         </Alert>
         <Button
           variant='solid' color='danger'
-          onClick={() => routerPush('/')}
+          onClick={() => navigateToIndex()}
           endDecorator={<ArrowBackIcon />}
           sx={{ mt: 2 }}
         >
@@ -130,7 +131,7 @@ function AppShareTarget() {
 
 /**
  * This page will be invoked on mobile when sharing Text/URLs/Files from other APPs
- * Example URL: https://get.big-agi.com/launch?title=This+Title&text=https%3A%2F%2Fexample.com%2Fapp%2Fpath
+ * Example URL: https://localhost:3000/link/share_target?title=This+Title&text=https%3A%2F%2Fexample.com%2Fapp%2Fpath
  */
 export default function LaunchPage() {
   return (
diff --git a/public/manifest.json b/public/manifest.json
index 8f0400359..7f4f7e1ee 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -25,7 +25,7 @@
     }
   ],
   "share_target": {
-    "action": "/launch",
+    "action": "/link/share_target",
     "method": "GET",
     "enctype": "application/x-www-form-urlencoded",
     "params": {
diff --git a/src/apps/chat/components/composer/Composer.tsx b/src/apps/chat/components/composer/Composer.tsx
index bfe2f7d8e..d1d2c4b18 100644
--- a/src/apps/chat/components/composer/Composer.tsx
+++ b/src/apps/chat/components/composer/Composer.tsx
@@ -160,7 +160,7 @@ export function Composer(props: {
   const remainingTokens = tokenLimit - directTokens - historyTokens - responseTokens;
 
 
-  // Effect: load initial text if queued up (e.g. by /launch)
+  // Effect: load initial text if queued up (e.g. by /link/share_targe)
   React.useEffect(() => {
     if (startupText) {
       setStartupText(null);
diff --git a/src/apps/link/AppChatLinkDrawerItems.tsx b/src/apps/link/AppChatLinkDrawerItems.tsx
index 370420044..10f4590a0 100644
--- a/src/apps/link/AppChatLinkDrawerItems.tsx
+++ b/src/apps/link/AppChatLinkDrawerItems.tsx
@@ -9,7 +9,7 @@ import { useChatLinkItems } from '~/modules/trade/store-module-trade';
 import { Brand } from '~/common/app.config';
 import { Link } from '~/common/components/Link';
 import { closeLayoutDrawer } from '~/common/layout/store-applayout';
-import { getChatLinkRelativePath, getHomeLink } from '~/common/app.routes';
+import { getChatLinkRelativePath, ROUTE_INDEX } from '~/common/app.routes';
 
 
 /**
@@ -28,7 +28,7 @@ export function AppChatLinkDrawerItems() {
 
     <MenuItem
       onClick={closeLayoutDrawer}
-      component={Link} href={getHomeLink()} noLinkStyle
+      component={Link} href={ROUTE_INDEX} noLinkStyle
     >
       <ListItemDecorator><ArrowBackIcon /></ListItemDecorator>
       {Brand.Title.Base}
diff --git a/src/apps/news/AppNews.tsx b/src/apps/news/AppNews.tsx
index dcc596774..56b034fdb 100644
--- a/src/apps/news/AppNews.tsx
+++ b/src/apps/news/AppNews.tsx
@@ -5,10 +5,10 @@ import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 
 import { Brand } from '~/common/app.config';
 import { Link } from '~/common/components/Link';
+import { ROUTE_INDEX } from '~/common/app.routes';
 import { capitalizeFirstLetter } from '~/common/util/textUtils';
 
 import { newsCallout, NewsItems } from './news.data';
-import { ROUTE_APP_CHAT } from '~/common/app.routes';
 
 
 export function AppNews() {
@@ -46,7 +46,7 @@ export function AppNews() {
         <Box>
           <Button
             variant='solid' color='neutral' size='lg'
-            component={Link} href={ROUTE_APP_CHAT} noLinkStyle
+            component={Link} href={ROUTE_INDEX} noLinkStyle
             endDecorator='✨'
             sx={{ minWidth: 200 }}
           >
diff --git a/src/common/app.routes.ts b/src/common/app.routes.ts
index d8c8bff20..faf4a0cb3 100644
--- a/src/common/app.routes.ts
+++ b/src/common/app.routes.ts
@@ -6,14 +6,21 @@
 
 import Router from 'next/router';
 
-export const ROUTE_APP_CHAT = '/';
-const APP_LINK_CHAT = '/link/chat/:linkId';
+export const ROUTE_INDEX = '/';
+export const ROUTE_APP_CHAT = '/chat';
+export const ROUTE_APP_LINK_CHAT = '/link/chat/:linkId';
+export const ROUTE_APP_NEWS = '/news';
 
-export const getHomeLink = () => ROUTE_APP_CHAT;
+export const getIndexLink = () => ROUTE_INDEX;
 
-export const getChatLinkRelativePath = (chatLinkId: string) => APP_LINK_CHAT.replace(':linkId', chatLinkId);
+export const getChatLinkRelativePath = (chatLinkId: string) => ROUTE_APP_LINK_CHAT.replace(':linkId', chatLinkId);
 
+const navigateFn = (path: string) => (replace?: boolean): Promise<boolean> =>
+  Router[replace ? 'replace' : 'push'](path);
+
+export const navigateToIndex = navigateFn(ROUTE_INDEX);
 export const navigateToChat = async () => await Router.push(ROUTE_APP_CHAT);
+export const navigateToNews = navigateFn(ROUTE_APP_NEWS);
 
 export const navigateBack = Router.back;