small refactor

alan2207 · Oct 28, 2024 · 0a0a1dc · 0a0a1dc
1 parent ae90720
commit 0a0a1dc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/apps/nextjs-app/src/config/paths.ts b/apps/nextjs-app/src/config/paths.ts
@@ -27,14 +27,16 @@ export const paths = {
     discussion: {
       getHref: (id: string) => `/app/discussions/${id}`,
     },
-    publicDiscussion: {
-      getHref: (id: string) => `/public/discussions/${id}`,
-    },
     users: {
       getHref: () => '/app/users',
     },
     profile: {
       getHref: () => '/app/profile',
     },
   },
+  public: {
+    discussion: {
+      getHref: (id: string) => `/public/discussions/${id}`,
+    },
+  },
 } as const;
diff --git a/apps/nextjs-app/src/features/discussions/components/discussion-view.tsx b/apps/nextjs-app/src/features/discussions/components/discussion-view.tsx
@@ -48,7 +48,7 @@ export const DiscussionView = ({ discussionId }: { discussionId: string }) => {
         {!isPublicView && discussion.public && (
           <Link
             className="ml-2 flex items-center gap-2 text-sm font-bold"
-            href={paths.app.publicDiscussion.getHref(discussionId)}
+            href={paths.public.discussion.getHref(discussionId)}
             target="_blank"
           >
             View Public Version <LinkIcon size={16} />

diff --git a/apps/nextjs-app/src/lib/auth.tsx b/apps/nextjs-app/src/lib/auth.tsx
@@ -85,7 +85,6 @@ export const ProtectedRoute = ({ children }: { children: React.ReactNode }) => {
 
   useEffect(() => {
     if (!user.data) {
-      console.log('pathname', pathname);
       router.replace(paths.auth.login.getHref(pathname));
     }
   }, [user.data, router, pathname]);

diff --git a/apps/nextjs-pages/src/config/paths.ts b/apps/nextjs-pages/src/config/paths.ts
@@ -27,14 +27,16 @@ export const paths = {
     discussion: {
       getHref: (id: string) => `/app/discussions/${id}`,
     },
-    publicDiscussion: {
-      getHref: (id: string) => `/public/discussions/${id}`,
-    },
     users: {
       getHref: () => '/app/users',
     },
     profile: {
       getHref: () => '/app/profile',
     },
   },
+  public: {
+    discussion: {
+      getHref: (id: string) => `/public/discussions/${id}`,
+    },
+  },
 } as const;
diff --git a/apps/nextjs-pages/src/features/discussions/components/discussion-view.tsx b/apps/nextjs-pages/src/features/discussions/components/discussion-view.tsx
@@ -46,7 +46,7 @@ export const DiscussionView = ({ discussionId }: { discussionId: string }) => {
         {!isPublicView && discussion.public && (
           <Link
             className="ml-2 flex items-center gap-2 text-sm font-bold"
-            href={paths.app.publicDiscussion.getHref(discussionId)}
+            href={paths.public.discussion.getHref(discussionId)}
             target="_blank"
           >
             View Public Version <LinkIcon size={16} />