feat: user link now in tweet component (#89)

* fix: router now replace instead of push * feat: user-link now in tweet component
CUexter · Apr 12, 2023 · dddacfd · dddacfd · vercel · Apr 12, 2023
1 parent e8193cd
commit dddacfd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/src/components/layout/header/SearchUser.tsx b/src/components/layout/header/SearchUser.tsx
@@ -80,7 +80,7 @@ const SearchUser = () => {
       data={data}
       onItemSubmit={(item) => {
         const { id } = item as unknown as ItemProps;
-        void router.push("profile/" + id);
+        void router.replace("profile/" + id);
       }}
       filter={(value, item) => {
         const i = item as unknown as ItemProps;

diff --git a/src/components/tweets/Tweet.tsx b/src/components/tweets/Tweet.tsx
@@ -16,6 +16,7 @@ import {
   IconHeart,
 } from "@tabler/icons-react";
 import Head from "next/head";
+import Link from "next/link";
 
 const useStyles = createStyles((theme) => ({
   body: {
@@ -60,15 +61,17 @@ const Tweet = ({ tweetID, tweetData }: TweetProp) => {
       </Head>
       <div className="mx-auto">
         <Card withBorder>
-          <Group>
-            <Avatar src={tweetData.user.image} color={"yellow"} radius="xl" />
-            <div>
-              <Text size="sm">{tweetData.user.display_name}</Text>
-              <Text size="xs" color="dimmed">
-                {tweetData.created_at.toString()}
-              </Text>
-            </div>
-          </Group>
+          <Link href={`/profile/${tweetData.user.id}`}>
+            <Group>
+              <Avatar src={tweetData.user.image} color={"yellow"} radius="xl" />
+              <div>
+                <Text size="sm">{tweetData.user.display_name}</Text>
+                <Text size="xs" color="dimmed">
+                  {tweetData.created_at.toString()}
+                </Text>
+              </div>
+            </Group>
+          </Link>
           <Text className={classes.body} size="sm">
             {tweetData.TweetText[0]?.tweet_text}
           </Text>

diff --git a/src/pages/auth/new-user.page.tsx b/src/pages/auth/new-user.page.tsx
@@ -36,7 +36,7 @@ const NewUserWelcome = () => {
 
   useEffect(() => {
     if (newUser || !session?.user) {
-      void router.push("/");
+      void router.replace("/");
     }
   }, [session, router, newUser]);
 
@@ -84,7 +84,7 @@ const NewUserWelcome = () => {
   const onSubmit = (values: typeof form.values) => {
     updateUser.mutate(values);
     if (updateUser.isSuccess) {
-      void router.push("/");
+      void router.replace("/");
     }
   };
 

diff --git a/src/pages/following.page.tsx b/src/pages/following.page.tsx
@@ -8,7 +8,7 @@ const Following = () => {
   const { data: session } = useSession();
   useEffect(() => {
     if (!session?.user) {
-      void router.push("/");
+      void router.replace("/");
     }
   }, [session, router]);
   const following = ["uid1"];