Skip to content

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

Refactor/challenge (#370)

bautistaaa73baadf11698
diff --git a/apps/web/src/app/challenge/[id]/layout.tsx b/apps/web/src/app/challenge/[id]/layout.tsx
index 7405867d..ece9c359 100644
--- a/apps/web/src/app/challenge/[id]/layout.tsx
+++ b/apps/web/src/app/challenge/[id]/layout.tsx
@@ -1,9 +1,9 @@
import { getServerAuthSession } from '@repo/auth/server';
import { ForceRenderUntilClient } from '@repo/ui';
+import { ChallengeLayout } from '../_components/challenge-layout';
import { getChallengeRouteData } from './getChallengeRouteData';
import { LeftWrapper } from './left-wrapper';
import { Wrapper } from './wrapper';
-import { ChallengeLayout } from '~/components/challenge/challenge-layout';
export default async function LayoutData({
children,
diff --git a/apps/web/src/app/challenge/[id]/loading.tsx b/apps/web/src/app/challenge/[id]/loading.tsx
index 8b99093f..7d045a8e 100644
--- a/apps/web/src/app/challenge/[id]/loading.tsx
+++ b/apps/web/src/app/challenge/[id]/loading.tsx
@@ -1,5 +1 @@
-import { DescriptionSkeleton } from '~/components/challenge/description/description-skeleton';
-
-export default function Loading() {
- return <DescriptionSkeleton />;
-}
+export { DescriptionSkeleton as default } from '../_components/description/description-skeleton';
diff --git a/apps/web/src/app/challenge/[id]/page.tsx b/apps/web/src/app/challenge/[id]/page.tsx
index 49e06051..c45f3d89 100644
--- a/apps/web/src/app/challenge/[id]/page.tsx
+++ b/apps/web/src/app/challenge/[id]/page.tsx
@@ -1,7 +1,7 @@
import { getServerAuthSession } from '@repo/auth/server';
+import { Description } from '../_components/description';
+import { Comments } from '../_components/comments';
import { getChallengeRouteData } from './getChallengeRouteData';
-import { Comments } from '~/components/challenge/comments';
-import { Description } from '~/components/challenge/description';
interface Props {
params: {
diff --git a/apps/web/src/app/challenge/[id]/solutions/[solutionId]/page.tsx b/apps/web/src/app/challenge/[id]/solutions/[solutionId]/page.tsx
index 3d81045c..9b72840e 100644
--- a/apps/web/src/app/challenge/[id]/solutions/[solutionId]/page.tsx
+++ b/apps/web/src/app/challenge/[id]/solutions/[solutionId]/page.tsx
@@ -1,5 +1,5 @@
import { prisma } from '@repo/db';
-import { SolutionDetails } from '~/components/challenge/solutions/solution-detail';
+import { SolutionDetails } from '../_components/solution-detail';
interface Props {
params: {
diff --git a/apps/web/src/components/challenge/solutions/index.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/index.tsx
similarity index 100%
rename from apps/web/src/components/challenge/solutions/index.tsx
rename to apps/web/src/app/challenge/[id]/solutions/_components/index.tsx
diff --git a/apps/web/src/components/challenge/solutions/nosolutions.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/nosolutions.tsx
similarity index 100%
rename from apps/web/src/components/challenge/solutions/nosolutions.tsx
rename to apps/web/src/app/challenge/[id]/solutions/_components/nosolutions.tsx
diff --git a/apps/web/src/components/challenge/solutions/post-solution.action.ts b/apps/web/src/app/challenge/[id]/solutions/_components/post-solution.action.ts
similarity index 100%
rename from apps/web/src/components/challenge/solutions/post-solution.action.ts
rename to apps/web/src/app/challenge/[id]/solutions/_components/post-solution.action.ts
diff --git a/apps/web/src/components/challenge/solutions/solution-detail.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/solution-detail.tsx
similarity index 98%
rename from apps/web/src/components/challenge/solutions/solution-detail.tsx
rename to apps/web/src/app/challenge/[id]/solutions/_components/solution-detail.tsx
index 863ccd8e..e4cd94c3 100644
--- a/apps/web/src/components/challenge/solutions/solution-detail.tsx
+++ b/apps/web/src/app/challenge/[id]/solutions/_components/solution-detail.tsx
@@ -15,7 +15,7 @@ import {
TooltipContent,
TooltipTrigger,
} from '@repo/ui';
-import { Comments } from '../comments';
+import { Comments } from '~/app/challenge/_components/comments';
import { Markdown } from '~/components/ui/markdown';
import { ReportDialog } from '~/components/report';
import type { ChallengeSolution } from '~/app/challenge/[id]/solutions/[solutionId]/page';
diff --git a/apps/web/src/components/challenge/solutions/solution-editor.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/solution-editor.tsx
similarity index 100%
rename from apps/web/src/components/challenge/solutions/solution-editor.tsx
rename to apps/web/src/app/challenge/[id]/solutions/_components/solution-editor.tsx
diff --git a/apps/web/src/components/challenge/solutions/solution-skeleton.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/solution-skeleton.tsx
similarity index 100%
rename from apps/web/src/components/challenge/solutions/solution-skeleton.tsx
rename to apps/web/src/app/challenge/[id]/solutions/_components/solution-skeleton.tsx
diff --git a/apps/web/src/components/challenge/solutions/submit-solution.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/submit-solution.tsx
similarity index 100%
rename from apps/web/src/components/challenge/solutions/submit-solution.tsx
rename to apps/web/src/app/challenge/[id]/solutions/_components/submit-solution.tsx
diff --git a/apps/web/src/app/challenge/[id]/solutions/loading.tsx b/apps/web/src/app/challenge/[id]/solutions/loading.tsx
index e07889a0..4e32872a 100644
--- a/apps/web/src/app/challenge/[id]/solutions/loading.tsx
+++ b/apps/web/src/app/challenge/[id]/solutions/loading.tsx
@@ -1,5 +1 @@
-import { SolutionsSkeleton } from '~/components/challenge/solutions/solution-skeleton';
-
-export default function Loading() {
- return <SolutionsSkeleton />;
-}
+export { SolutionsSkeleton as default } from './_components/solution-skeleton';
diff --git a/apps/web/src/app/challenge/[id]/solutions/page.tsx b/apps/web/src/app/challenge/[id]/solutions/page.tsx
index 6c917370..f32455c1 100644
--- a/apps/web/src/app/challenge/[id]/solutions/page.tsx
+++ b/apps/web/src/app/challenge/[id]/solutions/page.tsx
@@ -2,7 +2,7 @@ import type { Session } from '@repo/auth/server';
import { notFound } from 'next/navigation';
import { getServerAuthSession } from '@repo/auth/server';
import { prisma } from '@repo/db';
-import { Solutions } from '~/components/challenge/solutions';
+import { Solutions } from './_components';
interface Props {
params: {
diff --git a/apps/web/src/app/challenge/[id]/submissions/[submissionId]/page.tsx b/apps/web/src/app/challenge/[id]/submissions/[submissionId]/page.tsx
index 8f20ff69..1e355895 100644
--- a/apps/web/src/app/challenge/[id]/submissions/[submissionId]/page.tsx
+++ b/apps/web/src/app/challenge/[id]/submissions/[submissionId]/page.tsx
@@ -1,7 +1,7 @@
import { notFound } from 'next/navigation';
import { getServerAuthSession } from '@repo/auth/server';
import { getChallengeSubmissions } from '../getChallengeSubmissions';
-import { Submissions } from '~/components/challenge/submissions';
+import { Submissions } from '../_components';
interface Props {
params: {
diff --git a/apps/web/src/components/challenge/submissions/index.tsx b/apps/web/src/app/challenge/[id]/submissions/_components/index.tsx
similarity index 100%
rename from apps/web/src/components/challenge/submissions/index.tsx
rename to apps/web/src/app/challenge/[id]/submissions/_components/index.tsx
diff --git a/apps/web/src/components/challenge/submissions/nosubmissions.tsx b/apps/web/src/app/challenge/[id]/submissions/_components/nosubmissions.tsx
similarity index 100%
rename from apps/web/src/components/challenge/submissions/nosubmissions.tsx
rename to apps/web/src/app/challenge/[id]/submissions/_components/nosubmissions.tsx
diff --git a/apps/web/src/components/challenge/submissions/overview.tsx b/apps/web/src/app/challenge/[id]/submissions/_components/overview.tsx
similarity index 100%
rename from apps/web/src/components/challenge/submissions/overview.tsx
rename to apps/web/src/app/challenge/[id]/submissions/_components/overview.tsx
diff --git a/apps/web/src/components/challenge/submissions/submissions-skeleton.tsx b/apps/web/src/app/challenge/[id]/submissions/_components/submissions-skeleton.tsx
similarity index 100%
rename from apps/web/src/components/challenge/submissions/submissions-skeleton.tsx
rename to apps/web/src/app/challenge/[id]/submissions/_components/submissions-skeleton.tsx
diff --git a/apps/web/src/app/challenge/[id]/submissions/loading.tsx b/apps/web/src/app/challenge/[id]/submissions/loading.tsx
index d0dfdaa6..85cd9ea0 100644
--- a/apps/web/src/app/challenge/[id]/submissions/loading.tsx
+++ b/apps/web/src/app/challenge/[id]/submissions/loading.tsx
@@ -1,5 +1 @@
-import { SubmissionsSkeleton } from '~/components/challenge/submissions/submissions-skeleton';
-
-export default function Loading() {
- return <SubmissionsSkeleton />;
-}
+export { SubmissionsSkeleton as default } from './_components/submissions-skeleton';
diff --git a/apps/web/src/app/challenge/[id]/submissions/page.tsx b/apps/web/src/app/challenge/[id]/submissions/page.tsx
index eb7859fe..cc2e6829 100644
--- a/apps/web/src/app/challenge/[id]/submissions/page.tsx
+++ b/apps/web/src/app/challenge/[id]/submissions/page.tsx
@@ -1,7 +1,7 @@
import { notFound } from 'next/navigation';
import { getServerAuthSession } from '@repo/auth/server';
import { getChallengeSubmissions } from './getChallengeSubmissions';
-import { Submissions } from '~/components/challenge/submissions';
+import { Submissions } from './_components';
interface Props {
params: {
diff --git a/apps/web/src/components/challenge/save-submission.action.ts b/apps/web/src/app/challenge/[id]/submissions/save-submission.action.ts
similarity index 100%
rename from apps/web/src/components/challenge/save-submission.action.ts
rename to apps/web/src/app/challenge/[id]/submissions/save-submission.action.ts
diff --git a/apps/web/src/app/challenge/[id]/wrapper.tsx b/apps/web/src/app/challenge/[id]/wrapper.tsx
index 7aa87f23..4bdb6479 100644
--- a/apps/web/src/app/challenge/[id]/wrapper.tsx
+++ b/apps/web/src/app/challenge/[id]/wrapper.tsx
@@ -1,8 +1,8 @@
'use client';
import { useSelectedLayoutSegments } from 'next/navigation';
-import { CodePanel } from '~/components/challenge/code-panel';
-import { type ChallengeRouteData } from '~/app/challenge/[id]/getChallengeRouteData';
-import { SubmissionOverview } from '~/components/challenge/submissions/overview';
+import { CodePanel } from '../_components/code-panel';
+import type { ChallengeRouteData } from './getChallengeRouteData';
+import { SubmissionOverview } from './submissions/_components/overview';
export function Wrapper({ challenge }: { challenge: ChallengeRouteData }) {
const segments = useSelectedLayoutSegments();
diff --git a/apps/web/src/components/challenge/bookmark.action.ts b/apps/web/src/app/challenge/_components/bookmark.action.ts
similarity index 100%
rename from apps/web/src/components/challenge/bookmark.action.ts
rename to apps/web/src/app/challenge/_components/bookmark.action.ts
diff --git a/apps/web/src/components/challenge/challenge-layout.tsx b/apps/web/src/app/challenge/_components/challenge-layout.tsx
similarity index 100%
rename from apps/web/src/components/challenge/challenge-layout.tsx
rename to apps/web/src/app/challenge/_components/challenge-layout.tsx
diff --git a/apps/web/src/components/challenge/challenge-store.ts b/apps/web/src/app/challenge/_components/challenge-store.ts
similarity index 100%
rename from apps/web/src/components/challenge/challenge-store.ts
rename to apps/web/src/app/challenge/_components/challenge-store.ts
diff --git a/apps/web/src/components/challenge/code-panel/constants.ts b/apps/web/src/app/challenge/_components/code-panel/constants.ts
similarity index 100%
rename from apps/web/src/components/challenge/code-panel/constants.ts
rename to apps/web/src/app/challenge/_components/code-panel/constants.ts
diff --git a/apps/web/src/components/challenge/code-panel/editor-types.ts b/apps/web/src/app/challenge/_components/code-panel/editor-types.ts
similarity index 100%
rename from apps/web/src/components/challenge/code-panel/editor-types.ts
rename to apps/web/src/app/challenge/_components/code-panel/editor-types.ts
diff --git a/apps/web/src/components/challenge/code-panel/index.tsx b/apps/web/src/app/challenge/_components/code-panel/index.tsx
similarity index 98%
rename from apps/web/src/components/challenge/code-panel/index.tsx
rename to apps/web/src/app/challenge/_components/code-panel/index.tsx
index db7a4311..9c660546 100644
--- a/apps/web/src/components/challenge/code-panel/index.tsx
+++ b/apps/web/src/app/challenge/_components/code-panel/index.tsx
@@ -22,8 +22,8 @@ import {
DialogTitle,
DialogTrigger,
} from '@repo/ui';
-import { saveSubmission } from '../save-submission.action';
import { SettingsForm } from '../settings-form';
+import { saveSubmission } from '../../[id]/submissions/save-submission.action';
import { USER_CODE_START, USER_CODE_START_REGEX } from './constants';
import { libSource } from './editor-types';
import { createTwoslashInlayProvider } from './twoslash';
diff --git a/apps/web/src/components/challenge/code-panel/twoslash.ts b/apps/web/src/app/challenge/_components/code-panel/twoslash.ts
similarity index 100%
rename from apps/web/src/components/challenge/code-panel/twoslash.ts
rename to apps/web/src/app/challenge/_components/code-panel/twoslash.ts
diff --git a/apps/web/src/components/challenge/code-panel/vimMode.tsx b/apps/web/src/app/challenge/_components/code-panel/vimMode.tsx
similarity index 100%
rename from apps/web/src/components/challenge/code-panel/vimMode.tsx
rename to apps/web/src/app/challenge/_components/code-panel/vimMode.tsx
diff --git a/apps/web/src/components/challenge/comments/comment-input.tsx b/apps/web/src/app/challenge/_components/comments/comment-input.tsx
similarity index 100%
rename from apps/web/src/components/challenge/comments/comment-input.tsx
rename to apps/web/src/app/challenge/_components/comments/comment-input.tsx
diff --git a/apps/web/src/components/challenge/comments/comment-skeleton.tsx b/apps/web/src/app/challenge/_components/comments/comment-skeleton.tsx
similarity index 100%
rename from apps/web/src/components/challenge/comments/comment-skeleton.tsx
rename to apps/web/src/app/challenge/_components/comments/comment-skeleton.tsx
diff --git a/apps/web/src/components/challenge/comments/comment.action.ts b/apps/web/src/app/challenge/_components/comments/comment.action.ts
similarity index 100%
rename from apps/web/src/components/challenge/comments/comment.action.ts
rename to apps/web/src/app/challenge/_components/comments/comment.action.ts
diff --git a/apps/web/src/components/challenge/comments/comment.tsx b/apps/web/src/app/challenge/_components/comments/comment.tsx
similarity index 100%
rename from apps/web/src/components/challenge/comments/comment.tsx
rename to apps/web/src/app/challenge/_components/comments/comment.tsx
diff --git a/apps/web/src/components/challenge/comments/delete/index.tsx b/apps/web/src/app/challenge/_components/comments/delete/index.tsx
similarity index 100%
rename from apps/web/src/components/challenge/comments/delete/index.tsx
rename to apps/web/src/app/challenge/_components/comments/delete/index.tsx
diff --git a/apps/web/src/components/challenge/comments/getCommentRouteData.ts b/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts
similarity index 100%
rename from apps/web/src/components/challenge/comments/getCommentRouteData.ts
rename to apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts
diff --git a/apps/web/src/components/challenge/comments/index.tsx b/apps/web/src/app/challenge/_components/comments/index.tsx
similarity index 98%
rename from apps/web/src/components/challenge/comments/index.tsx
rename to apps/web/src/app/challenge/_components/comments/index.tsx
index a8d70f91..6d0badb1 100644
--- a/apps/web/src/components/challenge/comments/index.tsx
+++ b/apps/web/src/app/challenge/_components/comments/index.tsx
@@ -11,7 +11,7 @@ import { CommentSkeleton } from './comment-skeleton';
import { addComment } from './comment.action';
import { getPaginatedComments } from './getCommentRouteData';
import NoComments from './nocomments';
-import { Comment } from '~/components/challenge/comments/comment';
+import { Comment } from './comment';
interface Props {
rootId: number;
diff --git a/apps/web/src/components/challenge/comments/nocomments.tsx b/apps/web/src/app/challenge/_components/comments/nocomments.tsx
similarity index 100%
rename from apps/web/src/components/challenge/comments/nocomments.tsx
rename to apps/web/src/app/challenge/_components/comments/nocomments.tsx
diff --git a/apps/web/src/components/challenge/description/description-skeleton.tsx b/apps/web/src/app/challenge/_components/description/description-skeleton.tsx
similarity index 100%
rename from apps/web/src/components/challenge/description/description-skeleton.tsx
rename to apps/web/src/app/challenge/_components/description/description-skeleton.tsx
diff --git a/apps/web/src/components/challenge/description/index.tsx b/apps/web/src/app/challenge/_components/description/index.tsx
similarity index 100%
rename from apps/web/src/components/challenge/description/index.tsx
rename to apps/web/src/app/challenge/_components/description/index.tsx
diff --git a/apps/web/src/components/challenge/increment.action.ts b/apps/web/src/app/challenge/_components/increment.action.ts
similarity index 100%
rename from apps/web/src/components/challenge/increment.action.ts
rename to apps/web/src/app/challenge/_components/increment.action.ts
diff --git a/apps/web/src/components/challenge/left-panel-skeleton.tsx b/apps/web/src/app/challenge/_components/left-panel-skeleton.tsx
similarity index 100%
rename from apps/web/src/components/challenge/left-panel-skeleton.tsx
rename to apps/web/src/app/challenge/_components/left-panel-skeleton.tsx
diff --git a/apps/web/src/components/challenge/settings-form.tsx b/apps/web/src/app/challenge/_components/settings-form.tsx
similarity index 100%
rename from apps/web/src/components/challenge/settings-form.tsx
rename to apps/web/src/app/challenge/_components/settings-form.tsx
diff --git a/apps/web/src/components/challenge/settings-store.ts b/apps/web/src/app/challenge/_components/settings-store.ts
similarity index 100%
rename from apps/web/src/components/challenge/settings-store.ts
rename to apps/web/src/app/challenge/_components/settings-store.ts
diff --git a/apps/web/src/components/challenge/share-form.tsx b/apps/web/src/app/challenge/_components/share-form.tsx
similarity index 100%
rename from apps/web/src/components/challenge/share-form.tsx
rename to apps/web/src/app/challenge/_components/share-form.tsx
diff --git a/apps/web/src/components/report/types/comment.report.tsx b/apps/web/src/components/report/types/comment.report.tsx
index 423505fb..6ce66758 100644
--- a/apps/web/src/components/report/types/comment.report.tsx
+++ b/apps/web/src/components/report/types/comment.report.tsx
@@ -1,6 +1,6 @@
import Link from 'next/link';
import { type ReportWithInfo } from '~/app/admin/report/[id]/report.action';
-import { Comment } from '~/components/challenge/comments/comment';
+import { Comment } from '~/app/challenge/_components/comments/comment';
export default function CommentReport({ report }: { report: NonNullable<ReportWithInfo> }) {
if (report.type !== 'COMMENT' || report.commentId === null || !report.comment) return null;
diff --git a/apps/web/src/components/report/types/user.report.tsx b/apps/web/src/components/report/types/user.report.tsx
index ea272fe3..82e8a71a 100644
--- a/apps/web/src/components/report/types/user.report.tsx
+++ b/apps/web/src/components/report/types/user.report.tsx
@@ -4,7 +4,7 @@ import { Text, Expandable } from '@repo/ui';
import { getReportedUserInformation } from '../report.action';
import { Markdown } from '~/components/ui/markdown';
import { type ReportWithInfo } from '~/app/admin/report/[id]/report.action';
-import { Comment } from '~/components/challenge/comments/comment';
+import { Comment } from '~/app/challenge/_components/comments/comment';
interface UserReportProps {
report: NonNullable<ReportWithInfo>;
diff --git a/apps/web/src/components/ui/code-editor.tsx b/apps/web/src/components/ui/code-editor.tsx
index bdab7b63..562f458a 100644
--- a/apps/web/src/components/ui/code-editor.tsx
+++ b/apps/web/src/components/ui/code-editor.tsx
@@ -4,7 +4,7 @@ import Editor, { type EditorProps, type OnChange, type OnMount } from '@monaco-e
import type * as monaco from 'monaco-editor';
import { useTheme } from 'next-themes';
import { useMemo } from 'react';
-import { useEditorSettingsStore } from '../challenge/settings-store';
+import { useEditorSettingsStore } from '~/app/challenge/_components/settings-store';
const DEFAULT_OPTIONS = {
lineNumbers: 'on',
diff --git a/apps/web/src/components/wizard/TestCasesEditor.tsx b/apps/web/src/components/wizard/TestCasesEditor.tsx
index de259f33..4e22651d 100644
--- a/apps/web/src/components/wizard/TestCasesEditor.tsx
+++ b/apps/web/src/components/wizard/TestCasesEditor.tsx
@@ -16,11 +16,11 @@ import {
DialogTitle,
DialogTrigger,
} from '@repo/ui';
-import { LIB_URI, type TsErrors } from '../challenge/code-panel';
-import { libSource } from '../challenge/code-panel/editor-types';
-import { SettingsForm } from '../challenge/settings-form';
import { CodeEditor } from '../ui/code-editor';
import type { WizardForm } from '.';
+import { LIB_URI, type TsErrors } from '~/app/challenge/_components/code-panel';
+import { libSource } from '~/app/challenge/_components/code-panel/editor-types';
+import { SettingsForm } from '~/app/challenge/_components/settings-form';
interface Props {
form: WizardForm;
diff --git a/apps/web/src/components/wizard/index.tsx b/apps/web/src/components/wizard/index.tsx
index 07d5edf9..5fc2185c 100644
--- a/apps/web/src/components/wizard/index.tsx
+++ b/apps/web/src/components/wizard/index.tsx
@@ -7,8 +7,6 @@ import { useForm, type UseFormReturn } from 'react-hook-form';
import { z } from 'zod';
import { useSession } from '@repo/auth/react';
import { Form } from '@repo/ui';
-import { USER_CODE_START, USER_CODE_START_REGEX } from '../challenge/code-panel/constants';
-import type { TsErrors } from '../challenge/code-panel';
import { ChallengeCardEditor } from './ChallengeCardEditor';
import { DescriptionEditor } from './DescriptionEditor';
import { Steps } from './Steps';
@@ -18,6 +16,11 @@ import { TestCasesEditor } from './TestCasesEditor';
import { uploadChallenge } from './create.action';
import DEFAULT_CHALLENGE_TEMPLATE from './default-challenge.md';
import DEFAULT_DESCRIPTION from './default-description.md';
+import type { TsErrors } from '~/app/challenge/_components/code-panel';
+import {
+ USER_CODE_START,
+ USER_CODE_START_REGEX,
+} from '~/app/challenge/_components/code-panel/constants';
export const enum STEPS {
ChallengeCard,