commit 3f5f3e7664a570e60acdc6e72886abac1513b588
author simon <tran.simon2@gmail.com> Tue Nov 08 21:01:57 2022 -0500
committer Simon Tran <tran.simon2@gmail.com> Thu Nov 10 12:31:28 2022 -0500
tree 8d68c40809257c82414cdd5327778df2a052a7ef
parent ab4eec83f67912757dbf2bb08d7afdb57e5ccdda

Improve client routing

Change-Id: I15f93ddbb21cee0ba868e163723b136d9e8c665f

client/src/components/ConversationListItem.tsx

diff --git a/client/src/components/ConversationListItem.tsx b/client/src/components/ConversationListItem.tsx
index c094d71..5f10f6e 100644
--- a/client/src/components/ConversationListItem.tsx
+++ b/client/src/components/ConversationListItem.tsx
@@ -159,7 +159,7 @@
     closeModalDelete();
   };
 
-  const uri = conversation.getId() ? `/account/conversation/${conversation.getId()}` : `/account/addContact/${userId}`;
+  const uri = conversation.getId() ? `/conversation/${conversation.getId()}` : `/addContact/${userId}`;
   return (
     <div onContextMenu={openMenu}>
       <div>
@@ -206,7 +206,7 @@
           {isSelected && (
             <MenuItem
               onClick={() => {
-                navigate(`/account`);
+                navigate(`/`);
                 closeModal();
               }}
             >

client/src/components/ConversationView.tsx

diff --git a/client/src/components/ConversationView.tsx b/client/src/components/ConversationView.tsx
index 03f0717..b09d24d 100644
--- a/client/src/components/ConversationView.tsx
+++ b/client/src/components/ConversationView.tsx
@@ -128,7 +128,7 @@
   }, [account, members, adminTitle, t]);
 
   const startCall = (withVideo = false) => {
-    let url = `/account/call/${conversationId}`;
+    let url = `/call/${conversationId}`;
     if (withVideo) {
       url += '?video=true';
     }

client/src/components/ConversationsOverviewCard.tsx

diff --git a/client/src/components/ConversationsOverviewCard.tsx b/client/src/components/ConversationsOverviewCard.tsx
index 4ed0ed4..8a73cc2 100644
--- a/client/src/components/ConversationsOverviewCard.tsx
+++ b/client/src/components/ConversationsOverviewCard.tsx
@@ -48,7 +48,7 @@
   }, [token, accountId]);
 
   return (
-    <Card onClick={() => navigate(`/account`)}>
+    <Card onClick={() => navigate(`/`)}>
       <CardActionArea>
         <CardContent>
           <Typography color="textSecondary" gutterBottom>