Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

fix: code share + comment route

bautistaaa27bd8de49036
diff --git a/apps/web/src/app/[locale]/challenge/[id]/comments/[commentId]/page.tsx b/apps/web/src/app/[locale]/challenge/[id]/comments/[commentId]/page.tsx
index 70551faf..82ecf018 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/comments/[commentId]/page.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/comments/[commentId]/page.tsx
@@ -1,5 +1,8 @@
+import { getServerAuthSession } from '@repo/auth/server';
import { Comments } from '../../../_components/comments';
import { getPreselectedCommentMetadata } from '../../../_components/comments/getCommentRouteData';
+import { Description } from '../../../_components/description';
+import { getChallengeRouteData } from '../../getChallengeRouteData';
interface Props {
params: {
@@ -9,13 +12,16 @@ interface Props {
}
export default async function CommentPage({ params: { id, commentId } }: Props) {
+ const session = await getServerAuthSession();
const preselectedCommentMetadata = await getPreselectedCommentMetadata(
Number(id),
Number(commentId),
);
+ const challenge = await getChallengeRouteData(id, session);
return (
<div className="relative h-full">
+ <Description challenge={challenge} />
<Comments
rootId={Number(id)}
preselectedCommentMetadata={preselectedCommentMetadata}
diff --git a/apps/web/src/app/[locale]/challenge/_components/share-form.tsx b/apps/web/src/app/[locale]/challenge/_components/share-form.tsx
index dcabbf60..93aaaf03 100644
--- a/apps/web/src/app/[locale]/challenge/_components/share-form.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/share-form.tsx
@@ -15,7 +15,7 @@ export function ShareForm() {
const url = `${window.location.origin}/challenge/${challengeId}`;
const copyToClipboard = useCallback(async () => {
- const url = window.location.href;
+ const url = `${window.location.origin}/challenge/${challengeId}`;
try {
if (navigator.clipboard && !copied) {
@@ -27,11 +27,11 @@ export function ShareForm() {
console.error('copyToClipboard', e);
setCopied(false);
}
- }, [copied]);
+ }, [challengeId, copied]);
const copyToClipboardWithCode = useCallback(async () => {
const compressedCode = lzstring.compressToEncodedURIComponent(codeToCompress);
- const url = `${window.location.href}?code=${compressedCode}`;
+ const url = `${window.location.origin}/challenge/${challengeId}/?code=${compressedCode}`;
try {
if (navigator.clipboard && !copiedWithCode) {
@@ -43,7 +43,7 @@ export function ShareForm() {
console.error('copyToClipboard', e);
setCopiedWithCode(false);
}
- }, [copiedWithCode, codeToCompress]);
+ }, [challengeId, copiedWithCode, codeToCompress]);
return (
<div className="flex flex-col space-y-4">