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.tsxindex 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.tsxindex 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.tsxindex 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.tsxindex 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.tsxsimilarity index 100%rename from apps/web/src/components/challenge/solutions/index.tsxrename to apps/web/src/app/challenge/[id]/solutions/_components/index.tsxdiff --git a/apps/web/src/components/challenge/solutions/nosolutions.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/nosolutions.tsxsimilarity index 100%rename from apps/web/src/components/challenge/solutions/nosolutions.tsxrename to apps/web/src/app/challenge/[id]/solutions/_components/nosolutions.tsxdiff --git a/apps/web/src/components/challenge/solutions/post-solution.action.ts b/apps/web/src/app/challenge/[id]/solutions/_components/post-solution.action.tssimilarity index 100%rename from apps/web/src/components/challenge/solutions/post-solution.action.tsrename to apps/web/src/app/challenge/[id]/solutions/_components/post-solution.action.tsdiff --git a/apps/web/src/components/challenge/solutions/solution-detail.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/solution-detail.tsxsimilarity index 98%rename from apps/web/src/components/challenge/solutions/solution-detail.tsxrename to apps/web/src/app/challenge/[id]/solutions/_components/solution-detail.tsxindex 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.tsxsimilarity index 100%rename from apps/web/src/components/challenge/solutions/solution-editor.tsxrename to apps/web/src/app/challenge/[id]/solutions/_components/solution-editor.tsxdiff --git a/apps/web/src/components/challenge/solutions/solution-skeleton.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/solution-skeleton.tsxsimilarity index 100%rename from apps/web/src/components/challenge/solutions/solution-skeleton.tsxrename to apps/web/src/app/challenge/[id]/solutions/_components/solution-skeleton.tsxdiff --git a/apps/web/src/components/challenge/solutions/submit-solution.tsx b/apps/web/src/app/challenge/[id]/solutions/_components/submit-solution.tsxsimilarity index 100%rename from apps/web/src/components/challenge/solutions/submit-solution.tsxrename to apps/web/src/app/challenge/[id]/solutions/_components/submit-solution.tsxdiff --git a/apps/web/src/app/challenge/[id]/solutions/loading.tsx b/apps/web/src/app/challenge/[id]/solutions/loading.tsxindex 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.tsxindex 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.tsxindex 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.tsxsimilarity index 100%rename from apps/web/src/components/challenge/submissions/index.tsxrename to apps/web/src/app/challenge/[id]/submissions/_components/index.tsxdiff --git a/apps/web/src/components/challenge/submissions/nosubmissions.tsx b/apps/web/src/app/challenge/[id]/submissions/_components/nosubmissions.tsxsimilarity index 100%rename from apps/web/src/components/challenge/submissions/nosubmissions.tsxrename to apps/web/src/app/challenge/[id]/submissions/_components/nosubmissions.tsxdiff --git a/apps/web/src/components/challenge/submissions/overview.tsx b/apps/web/src/app/challenge/[id]/submissions/_components/overview.tsxsimilarity index 100%rename from apps/web/src/components/challenge/submissions/overview.tsxrename to apps/web/src/app/challenge/[id]/submissions/_components/overview.tsxdiff --git a/apps/web/src/components/challenge/submissions/submissions-skeleton.tsx b/apps/web/src/app/challenge/[id]/submissions/_components/submissions-skeleton.tsxsimilarity index 100%rename from apps/web/src/components/challenge/submissions/submissions-skeleton.tsxrename to apps/web/src/app/challenge/[id]/submissions/_components/submissions-skeleton.tsxdiff --git a/apps/web/src/app/challenge/[id]/submissions/loading.tsx b/apps/web/src/app/challenge/[id]/submissions/loading.tsxindex 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.tsxindex 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.tssimilarity index 100%rename from apps/web/src/components/challenge/save-submission.action.tsrename to apps/web/src/app/challenge/[id]/submissions/save-submission.action.tsdiff --git a/apps/web/src/app/challenge/[id]/wrapper.tsx b/apps/web/src/app/challenge/[id]/wrapper.tsxindex 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.tssimilarity index 100%rename from apps/web/src/components/challenge/bookmark.action.tsrename to apps/web/src/app/challenge/_components/bookmark.action.tsdiff --git a/apps/web/src/components/challenge/challenge-layout.tsx b/apps/web/src/app/challenge/_components/challenge-layout.tsxsimilarity index 100%rename from apps/web/src/components/challenge/challenge-layout.tsxrename to apps/web/src/app/challenge/_components/challenge-layout.tsxdiff --git a/apps/web/src/components/challenge/challenge-store.ts b/apps/web/src/app/challenge/_components/challenge-store.tssimilarity index 100%rename from apps/web/src/components/challenge/challenge-store.tsrename to apps/web/src/app/challenge/_components/challenge-store.tsdiff --git a/apps/web/src/components/challenge/code-panel/constants.ts b/apps/web/src/app/challenge/_components/code-panel/constants.tssimilarity index 100%rename from apps/web/src/components/challenge/code-panel/constants.tsrename to apps/web/src/app/challenge/_components/code-panel/constants.tsdiff --git a/apps/web/src/components/challenge/code-panel/editor-types.ts b/apps/web/src/app/challenge/_components/code-panel/editor-types.tssimilarity index 100%rename from apps/web/src/components/challenge/code-panel/editor-types.tsrename to apps/web/src/app/challenge/_components/code-panel/editor-types.tsdiff --git a/apps/web/src/components/challenge/code-panel/index.tsx b/apps/web/src/app/challenge/_components/code-panel/index.tsxsimilarity index 98%rename from apps/web/src/components/challenge/code-panel/index.tsxrename to apps/web/src/app/challenge/_components/code-panel/index.tsxindex 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.tssimilarity index 100%rename from apps/web/src/components/challenge/code-panel/twoslash.tsrename to apps/web/src/app/challenge/_components/code-panel/twoslash.tsdiff --git a/apps/web/src/components/challenge/code-panel/vimMode.tsx b/apps/web/src/app/challenge/_components/code-panel/vimMode.tsxsimilarity index 100%rename from apps/web/src/components/challenge/code-panel/vimMode.tsxrename to apps/web/src/app/challenge/_components/code-panel/vimMode.tsxdiff --git a/apps/web/src/components/challenge/comments/comment-input.tsx b/apps/web/src/app/challenge/_components/comments/comment-input.tsxsimilarity index 100%rename from apps/web/src/components/challenge/comments/comment-input.tsxrename to apps/web/src/app/challenge/_components/comments/comment-input.tsxdiff --git a/apps/web/src/components/challenge/comments/comment-skeleton.tsx b/apps/web/src/app/challenge/_components/comments/comment-skeleton.tsxsimilarity index 100%rename from apps/web/src/components/challenge/comments/comment-skeleton.tsxrename to apps/web/src/app/challenge/_components/comments/comment-skeleton.tsxdiff --git a/apps/web/src/components/challenge/comments/comment.action.ts b/apps/web/src/app/challenge/_components/comments/comment.action.tssimilarity index 100%rename from apps/web/src/components/challenge/comments/comment.action.tsrename to apps/web/src/app/challenge/_components/comments/comment.action.tsdiff --git a/apps/web/src/components/challenge/comments/comment.tsx b/apps/web/src/app/challenge/_components/comments/comment.tsxsimilarity index 100%rename from apps/web/src/components/challenge/comments/comment.tsxrename to apps/web/src/app/challenge/_components/comments/comment.tsxdiff --git a/apps/web/src/components/challenge/comments/delete/index.tsx b/apps/web/src/app/challenge/_components/comments/delete/index.tsxsimilarity index 100%rename from apps/web/src/components/challenge/comments/delete/index.tsxrename to apps/web/src/app/challenge/_components/comments/delete/index.tsxdiff --git a/apps/web/src/components/challenge/comments/getCommentRouteData.ts b/apps/web/src/app/challenge/_components/comments/getCommentRouteData.tssimilarity index 100%rename from apps/web/src/components/challenge/comments/getCommentRouteData.tsrename to apps/web/src/app/challenge/_components/comments/getCommentRouteData.tsdiff --git a/apps/web/src/components/challenge/comments/index.tsx b/apps/web/src/app/challenge/_components/comments/index.tsxsimilarity index 98%rename from apps/web/src/components/challenge/comments/index.tsxrename to apps/web/src/app/challenge/_components/comments/index.tsxindex 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.tsxsimilarity index 100%rename from apps/web/src/components/challenge/comments/nocomments.tsxrename to apps/web/src/app/challenge/_components/comments/nocomments.tsxdiff --git a/apps/web/src/components/challenge/description/description-skeleton.tsx b/apps/web/src/app/challenge/_components/description/description-skeleton.tsxsimilarity index 100%rename from apps/web/src/components/challenge/description/description-skeleton.tsxrename to apps/web/src/app/challenge/_components/description/description-skeleton.tsxdiff --git a/apps/web/src/components/challenge/description/index.tsx b/apps/web/src/app/challenge/_components/description/index.tsxsimilarity index 100%rename from apps/web/src/components/challenge/description/index.tsxrename to apps/web/src/app/challenge/_components/description/index.tsxdiff --git a/apps/web/src/components/challenge/increment.action.ts b/apps/web/src/app/challenge/_components/increment.action.tssimilarity index 100%rename from apps/web/src/components/challenge/increment.action.tsrename to apps/web/src/app/challenge/_components/increment.action.tsdiff --git a/apps/web/src/components/challenge/left-panel-skeleton.tsx b/apps/web/src/app/challenge/_components/left-panel-skeleton.tsxsimilarity index 100%rename from apps/web/src/components/challenge/left-panel-skeleton.tsxrename to apps/web/src/app/challenge/_components/left-panel-skeleton.tsxdiff --git a/apps/web/src/components/challenge/settings-form.tsx b/apps/web/src/app/challenge/_components/settings-form.tsxsimilarity index 100%rename from apps/web/src/components/challenge/settings-form.tsxrename to apps/web/src/app/challenge/_components/settings-form.tsxdiff --git a/apps/web/src/components/challenge/settings-store.ts b/apps/web/src/app/challenge/_components/settings-store.tssimilarity index 100%rename from apps/web/src/components/challenge/settings-store.tsrename to apps/web/src/app/challenge/_components/settings-store.tsdiff --git a/apps/web/src/components/challenge/share-form.tsx b/apps/web/src/app/challenge/_components/share-form.tsxsimilarity index 100%rename from apps/web/src/components/challenge/share-form.tsxrename to apps/web/src/app/challenge/_components/share-form.tsxdiff --git a/apps/web/src/components/report/types/comment.report.tsx b/apps/web/src/components/report/types/comment.report.tsxindex 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.tsxindex 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.tsxindex 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-eimport 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.tsxindex 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.tsxindex 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,