Skip to content

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

chore: folder cleanup (#703)

bautistaaa48310f31c3b0
diff --git a/apps/web/src/app/[locale]/privacy/page.tsx b/apps/web/src/app/[locale]/(legal)/privacy/page.tsx
similarity index 99%
rename from apps/web/src/app/[locale]/privacy/page.tsx
rename to apps/web/src/app/[locale]/(legal)/privacy/page.tsx
index aace660a..b174ba8c 100644
--- a/apps/web/src/app/[locale]/privacy/page.tsx
+++ b/apps/web/src/app/[locale]/(legal)/privacy/page.tsx
@@ -1,5 +1,5 @@
import type { Metadata } from 'next';
-import { Footsies } from '~/components/ui/footsies';
+import { Footsies } from '~/components/footsies';
export const metadata: Metadata = {
title: 'Privacy | TypeHero',
diff --git a/apps/web/src/app/[locale]/tos/page.tsx b/apps/web/src/app/[locale]/(legal)/tos/page.tsx
similarity index 98%
rename from apps/web/src/app/[locale]/tos/page.tsx
rename to apps/web/src/app/[locale]/(legal)/tos/page.tsx
index 8075ca10..66314510 100644
--- a/apps/web/src/app/[locale]/tos/page.tsx
+++ b/apps/web/src/app/[locale]/(legal)/tos/page.tsx
@@ -1,5 +1,5 @@
import type { Metadata } from 'next';
-import { Footsies } from '~/components/ui/footsies';
+import { Footsies } from '~/components/footsies';
export const metadata: Metadata = {
title: 'ToS | TypeHero',
diff --git a/apps/web/src/components/user/dashboard/in-progress-tab.tsx b/apps/web/src/app/[locale]/[username]/_components/dashboard/in-progress-tab.tsx
similarity index 100%
rename from apps/web/src/components/user/dashboard/in-progress-tab.tsx
rename to apps/web/src/app/[locale]/[username]/_components/dashboard/in-progress-tab.tsx
diff --git a/apps/web/src/components/user/dashboard/index.tsx b/apps/web/src/app/[locale]/[username]/_components/dashboard/index.tsx
similarity index 100%
rename from apps/web/src/components/user/dashboard/index.tsx
rename to apps/web/src/app/[locale]/[username]/_components/dashboard/index.tsx
diff --git a/apps/web/src/components/user/dashboard/overview.tsx b/apps/web/src/app/[locale]/[username]/_components/dashboard/overview.tsx
similarity index 100%
rename from apps/web/src/components/user/dashboard/overview.tsx
rename to apps/web/src/app/[locale]/[username]/_components/dashboard/overview.tsx
diff --git a/apps/web/src/components/user/dashboard/solutions-tab.tsx b/apps/web/src/app/[locale]/[username]/_components/dashboard/solutions-tab.tsx
similarity index 100%
rename from apps/web/src/components/user/dashboard/solutions-tab.tsx
rename to apps/web/src/app/[locale]/[username]/_components/dashboard/solutions-tab.tsx
diff --git a/apps/web/src/components/user/dashboard/user-header.tsx b/apps/web/src/app/[locale]/[username]/_components/dashboard/user-header.tsx
similarity index 100%
rename from apps/web/src/components/user/dashboard/user-header.tsx
rename to apps/web/src/app/[locale]/[username]/_components/dashboard/user-header.tsx
diff --git a/apps/web/src/components/user/profile.tsx b/apps/web/src/app/[locale]/[username]/_components/profile.tsx
similarity index 100%
rename from apps/web/src/components/user/profile.tsx
rename to apps/web/src/app/[locale]/[username]/_components/profile.tsx
diff --git a/apps/web/src/app/[locale]/[username]/page.tsx b/apps/web/src/app/[locale]/[username]/page.tsx
index 2b862bb3..c0e7a2d3 100644
--- a/apps/web/src/app/[locale]/[username]/page.tsx
+++ b/apps/web/src/app/[locale]/[username]/page.tsx
@@ -1,4 +1,4 @@
-import { Profile } from '~/components/user/profile';
+import { Profile } from './_components/profile';
interface Props {
params: {
diff --git a/apps/web/src/app/[locale]/_components/feature-card.tsx b/apps/web/src/app/[locale]/_components/feature-card.tsx
index b7a6ab5c..a9f0dd1a 100644
--- a/apps/web/src/app/[locale]/_components/feature-card.tsx
+++ b/apps/web/src/app/[locale]/_components/feature-card.tsx
@@ -16,9 +16,9 @@ import { useTheme } from 'next-themes';
import Image, { type StaticImageData } from 'next/image';
import { useEffect, useState, type MouseEvent } from 'react';
import { useInView } from 'react-intersection-observer';
-import { Steps } from '~/components/wizard/Steps';
import { useIsMobile } from '~/utils/useIsMobile';
import { MockTrackChallenge } from '../tracks/_components/track-challenge-card';
+import { Steps } from '../wizard/_components/Steps';
type WrapperStyle = MotionStyle & {
'--x': MotionValue<string>;
diff --git a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsx b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsx
index a5550adb..76b2d6f8 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/solutions/_components/solution-editor.tsx
@@ -5,7 +5,7 @@ import { useRouter } from 'next/navigation';
import { useForm } from 'react-hook-form';
import { z } from 'zod';
import { postSolution } from './post-solution.action';
-import { RichMarkdownEditor } from '~/components/ui/rich-markdown-editor';
+import { RichMarkdownEditor } from '~/components/rich-markdown-editor';
import type { ChallengeSolution } from '../getSolutionRouteData';
import { Button } from '@repo/ui/components/button';
import { useToast } from '@repo/ui/components/use-toast';
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-section.tsx b/apps/web/src/app/[locale]/explore/_components/explore-section.tsx
index 36242f55..67502c6a 100644
--- a/apps/web/src/app/[locale]/explore/_components/explore-section.tsx
+++ b/apps/web/src/app/[locale]/explore/_components/explore-section.tsx
@@ -3,7 +3,7 @@ import Link from 'next/link';
import { ExploreCard } from './explore-card';
import type { ExploreChallengeData } from './explore.action';
import { ViewMoreButton } from './view-more-button';
-import { Carousel } from '~/components/ui/carousel';
+import { Carousel } from '~/components/carousel';
interface SectionProps {
title: string;
diff --git a/apps/web/src/app/[locale]/explore/_components/index.tsx b/apps/web/src/app/[locale]/explore/_components/index.tsx
index 08ac5e63..881bd109 100644
--- a/apps/web/src/app/[locale]/explore/_components/index.tsx
+++ b/apps/web/src/app/[locale]/explore/_components/index.tsx
@@ -2,7 +2,7 @@ import { Suspense } from 'react';
import { ExploreSection } from './explore-section';
import { ExploreSectionSkeleton } from './explore-section-skeleton';
import { getChallengesByTagOrDifficulty } from './explore.action';
-import { Footsies } from '~/components/ui/footsies';
+import { Footsies } from '~/components/footsies';
// CI fails without this
export const dynamic = 'force-dynamic';
diff --git a/apps/web/src/app/[locale]/feature-flag-provider.tsx b/apps/web/src/app/[locale]/feature-flag-provider.tsx
deleted file mode 100644
index cab73a23..00000000
--- a/apps/web/src/app/[locale]/feature-flag-provider.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useQuery } from '@tanstack/react-query';
-import { createContext, type ReactNode } from 'react';
-
-export const FeatureFlagContext = createContext<Record<string, boolean>>({});
-
-interface Props {
- children: ReactNode;
-}
-
-export function FeatureFlagProvider({ children }: Props) {
- const { data: featureFlags } = useQuery(['featureFlags'], () => getFeatureFlags());
-
- return <FeatureFlagContext.Provider value={featureFlags}>{children}</FeatureFlagContext.Provider>;
-}
-
-async function getFeatureFlags() {
- return fetch('/api/flags').then((res) => res.json());
-}
diff --git a/apps/web/src/app/[locale]/page.tsx b/apps/web/src/app/[locale]/page.tsx
index 73741e4c..f3f89e8d 100644
--- a/apps/web/src/app/[locale]/page.tsx
+++ b/apps/web/src/app/[locale]/page.tsx
@@ -1,5 +1,5 @@
import type { Metadata } from 'next';
-import { Footsies } from '~/components/ui/footsies';
+import { Footsies } from '~/components/footsies';
import { Community } from './_components/community/community';
import { Features } from './_components/features';
import { Hero } from './_components/hero';
diff --git a/apps/web/src/components/settings/index.tsx b/apps/web/src/app/[locale]/settings/_components/index.tsx
similarity index 98%
rename from apps/web/src/components/settings/index.tsx
rename to apps/web/src/app/[locale]/settings/_components/index.tsx
index f8ddfcad..187a8858 100644
--- a/apps/web/src/components/settings/index.tsx
+++ b/apps/web/src/app/[locale]/settings/_components/index.tsx
@@ -4,7 +4,6 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { useFieldArray, useForm, useWatch } from 'react-hook-form';
import * as z from 'zod';
import Link from 'next/link';
-import { RichMarkdownEditor } from '../ui/rich-markdown-editor';
import { updateProfile } from './settings.action';
import { toast } from '@repo/ui/components/use-toast';
import { Button } from '@repo/ui/components/button';
@@ -12,6 +11,7 @@ import { Form, FormField, FormItem, FormMessage } from '@repo/ui/components/form
import { MagicIcon } from '@repo/ui/components/magic-icon';
import { Input } from '@repo/ui/components/input';
import { createNoProfanitySchemaWithValidate } from '~/utils/antiProfanityZod';
+import { RichMarkdownEditor } from '~/components/rich-markdown-editor';
export interface UserLinkType {
id: string | null;
diff --git a/apps/web/src/components/settings/settings.action.ts b/apps/web/src/app/[locale]/settings/_components/settings.action.ts
similarity index 100%
rename from apps/web/src/components/settings/settings.action.ts
rename to apps/web/src/app/[locale]/settings/_components/settings.action.ts
diff --git a/apps/web/src/app/[locale]/settings/page.tsx b/apps/web/src/app/[locale]/settings/page.tsx
index e352e7a8..e6d01ffc 100644
--- a/apps/web/src/app/[locale]/settings/page.tsx
+++ b/apps/web/src/app/[locale]/settings/page.tsx
@@ -1,7 +1,7 @@
import { getServerAuthSession } from '@repo/auth/server';
import { prisma } from '@repo/db';
import type { Metadata } from 'next';
-import { Settings } from '~/components/settings';
+import { Settings } from '~/app/[locale]/settings/_components';
export default async function SettingsPage() {
// NOTE: what's weird about this API is that it should have the
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx b/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx
index b6182575..bac0a711 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx
@@ -1,7 +1,7 @@
import { getServerAuthSession } from '@repo/auth/server';
import { prisma } from '@repo/db';
import Link from 'next/link';
-import { Carousel } from '~/components/ui/carousel';
+import { Carousel } from '~/components/carousel';
import { PersonalTrackCard } from './personal-track-card';
import { Card } from '@repo/ui/components/card';
import type { HTMLAttributes } from 'react';
diff --git a/apps/web/src/components/wizard/ChallengeCardEditor.tsx b/apps/web/src/app/[locale]/wizard/_components/ChallengeCardEditor.tsx
similarity index 100%
rename from apps/web/src/components/wizard/ChallengeCardEditor.tsx
rename to apps/web/src/app/[locale]/wizard/_components/ChallengeCardEditor.tsx
diff --git a/apps/web/src/components/wizard/DescriptionEditor.tsx b/apps/web/src/app/[locale]/wizard/_components/DescriptionEditor.tsx
similarity index 95%
rename from apps/web/src/components/wizard/DescriptionEditor.tsx
rename to apps/web/src/app/[locale]/wizard/_components/DescriptionEditor.tsx
index 5195569f..1f2878a5 100644
--- a/apps/web/src/components/wizard/DescriptionEditor.tsx
+++ b/apps/web/src/app/[locale]/wizard/_components/DescriptionEditor.tsx
@@ -4,8 +4,8 @@ import { useWatch } from 'react-hook-form';
import { FormField, FormItem, FormMessage } from '@repo/ui/components/form';
import { TypographyH3 } from '@repo/ui/components/typography/h3';
import { Markdown } from '@repo/ui/components/markdown';
-import { RichMarkdownEditor } from '../ui/rich-markdown-editor';
import { type WizardForm } from '.';
+import { RichMarkdownEditor } from '~/components/rich-markdown-editor';
interface Props {
form: WizardForm;
diff --git a/apps/web/src/components/wizard/NextBack.tsx b/apps/web/src/app/[locale]/wizard/_components/NextBack.tsx
similarity index 100%
rename from apps/web/src/components/wizard/NextBack.tsx
rename to apps/web/src/app/[locale]/wizard/_components/NextBack.tsx
diff --git a/apps/web/src/components/wizard/Steps.tsx b/apps/web/src/app/[locale]/wizard/_components/Steps.tsx
similarity index 100%
rename from apps/web/src/components/wizard/Steps.tsx
rename to apps/web/src/app/[locale]/wizard/_components/Steps.tsx
diff --git a/apps/web/src/components/wizard/Summary.tsx b/apps/web/src/app/[locale]/wizard/_components/Summary.tsx
similarity index 100%
rename from apps/web/src/components/wizard/Summary.tsx
rename to apps/web/src/app/[locale]/wizard/_components/Summary.tsx
diff --git a/apps/web/src/components/wizard/TestCasesEditor.tsx b/apps/web/src/app/[locale]/wizard/_components/TestCasesEditor.tsx
similarity index 100%
rename from apps/web/src/components/wizard/TestCasesEditor.tsx
rename to apps/web/src/app/[locale]/wizard/_components/TestCasesEditor.tsx
diff --git a/apps/web/src/components/wizard/create.action.ts b/apps/web/src/app/[locale]/wizard/_components/create.action.ts
similarity index 100%
rename from apps/web/src/components/wizard/create.action.ts
rename to apps/web/src/app/[locale]/wizard/_components/create.action.ts
diff --git a/apps/web/src/components/wizard/default-challenge.md b/apps/web/src/app/[locale]/wizard/_components/default-challenge.md
similarity index 100%
rename from apps/web/src/components/wizard/default-challenge.md
rename to apps/web/src/app/[locale]/wizard/_components/default-challenge.md
diff --git a/apps/web/src/components/wizard/default-description.md b/apps/web/src/app/[locale]/wizard/_components/default-description.md
similarity index 100%
rename from apps/web/src/components/wizard/default-description.md
rename to apps/web/src/app/[locale]/wizard/_components/default-description.md
diff --git a/apps/web/src/components/wizard/default-tests.md b/apps/web/src/app/[locale]/wizard/_components/default-tests.md
similarity index 100%
rename from apps/web/src/components/wizard/default-tests.md
rename to apps/web/src/app/[locale]/wizard/_components/default-tests.md
diff --git a/apps/web/src/components/wizard/index.tsx b/apps/web/src/app/[locale]/wizard/_components/index.tsx
similarity index 100%
rename from apps/web/src/components/wizard/index.tsx
rename to apps/web/src/app/[locale]/wizard/_components/index.tsx
diff --git a/apps/web/src/app/[locale]/wizard/page.tsx b/apps/web/src/app/[locale]/wizard/page.tsx
index 370d2dcc..92bd5e45 100644
--- a/apps/web/src/app/[locale]/wizard/page.tsx
+++ b/apps/web/src/app/[locale]/wizard/page.tsx
@@ -1,7 +1,7 @@
import { getServerAuthSession } from '@repo/auth/server';
import { TypographyH2 } from '@repo/ui/components/typography/h2';
import type { Metadata } from 'next';
-import { Wizard } from '~/components/wizard';
+import { Wizard } from './_components';
export default async function Page() {
const session = await getServerAuthSession();
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index 531a0d6f..1a15eb07 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -7,7 +7,7 @@ import type { Metadata } from 'next';
import { Toaster } from '@repo/ui/components/toaster';
import { Providers } from './providers';
import { buildMetaForDefault } from './metadata';
-import { Navigation } from '~/components/ui/navigation';
+import { Navigation } from '~/components/navigation';
const inter = Inter({ subsets: ['latin'] });
diff --git a/apps/web/src/components/ui/carousel.tsx b/apps/web/src/components/carousel.tsx
similarity index 100%
rename from apps/web/src/components/ui/carousel.tsx
rename to apps/web/src/components/carousel.tsx
diff --git a/apps/web/src/components/ui/footsies.tsx b/apps/web/src/components/footsies.tsx
similarity index 100%
rename from apps/web/src/components/ui/footsies.tsx
rename to apps/web/src/components/footsies.tsx
diff --git a/apps/web/src/components/ui/navigation.tsx b/apps/web/src/components/navigation.tsx
similarity index 98%
rename from apps/web/src/components/ui/navigation.tsx
rename to apps/web/src/components/navigation.tsx
index fb167f45..3770df89 100644
--- a/apps/web/src/components/ui/navigation.tsx
+++ b/apps/web/src/components/navigation.tsx
@@ -9,7 +9,6 @@ import Link from 'next/link';
import { usePathname, useRouter } from 'next/navigation';
import { useContext, useEffect, useState } from 'react';
import { FeatureFlagContext } from '~/app/feature-flag-provider';
-import { useFullscreenSettingsStore } from '../../app/[locale]/challenge/_components/fullscreen';
import { Button } from '@repo/ui/components/button';
import {
DropdownMenu,
@@ -18,6 +17,7 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@repo/ui/components/dropdown-menu';
+import { useFullscreenSettingsStore } from '~/app/[locale]/challenge/_components/fullscreen';
export function getAdminUrl() {
// reference for vercel.com
diff --git a/apps/web/src/components/ui/rich-markdown-editor.tsx b/apps/web/src/components/rich-markdown-editor.tsx
similarity index 100%
rename from apps/web/src/components/ui/rich-markdown-editor.tsx
rename to apps/web/src/components/rich-markdown-editor.tsx
diff --git a/apps/web/src/components/user/dashboard/bookmark-tab.tsx b/apps/web/src/components/user/dashboard/bookmark-tab.tsx
deleted file mode 100644
index bace2354..00000000
--- a/apps/web/src/components/user/dashboard/bookmark-tab.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import {
- Table,
- TableBody,
- TableCaption,
- TableCell,
- TableHead,
- TableHeader,
- TableRow,
-} from '@repo/ui/components/table';
-
-const challengesList = [
- {
- challengeTitle: 'Extreme Challenge 5000',
- challengeStatus: 'N/A',
- },
-];
-
-export function BookmarkTab() {
- return (
- <Table>
- <TableCaption>A list of your recent challenges.</TableCaption>
- <TableHeader>
- <TableRow>
- <TableHead>Challenge</TableHead>
- <TableHead>Status</TableHead>
- </TableRow>
- </TableHeader>
- <TableBody>
- {challengesList.map((challengeTitle) => (
- <TableRow key={challengeTitle.challengeTitle}>
- <TableCell className="font-medium">{challengeTitle.challengeTitle}</TableCell>
- <TableCell>{challengeTitle.challengeStatus}</TableCell>
- </TableRow>
- ))}
- </TableBody>
- </Table>
- );
-}