Skip to content

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

chore: remove intl lib (#1461)

bautistaaaed3e902d9c7e
diff --git a/apps/web/package.json b/apps/web/package.json
index 864c42d6..9894cd79 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -54,7 +54,6 @@
"million": "2.6.0-beta.12",
"monaco-vim": "^0.4.0",
"next": "14.0.1",
- "next-international": "1.1.4",
"next-themes": "^0.2.1",
"react": "^18.2.0",
"react-day-picker": "^8.8.0",
diff --git a/apps/web/src/app/[locale]/(email)/newsletter/_components/index.tsx b/apps/web/src/app/(email)/newsletter/_components/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(email)/newsletter/_components/index.tsx
rename to apps/web/src/app/(email)/newsletter/_components/index.tsx
diff --git a/apps/web/src/app/[locale]/(email)/newsletter/_components/newsletter-form.tsx b/apps/web/src/app/(email)/newsletter/_components/newsletter-form.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(email)/newsletter/_components/newsletter-form.tsx
rename to apps/web/src/app/(email)/newsletter/_components/newsletter-form.tsx
diff --git a/apps/web/src/app/[locale]/(email)/newsletter/_components/newsletter.module.css b/apps/web/src/app/(email)/newsletter/_components/newsletter.module.css
similarity index 90%
rename from apps/web/src/app/[locale]/(email)/newsletter/_components/newsletter.module.css
rename to apps/web/src/app/(email)/newsletter/_components/newsletter.module.css
index d38e5757..b1e1871d 100644
--- a/apps/web/src/app/[locale]/(email)/newsletter/_components/newsletter.module.css
+++ b/apps/web/src/app/(email)/newsletter/_components/newsletter.module.css
@@ -17,7 +17,7 @@
}
.mybg {
- background: url('../../../../../assets/images/newsletter-bg.webp');
+ background: url('../../../../assets/images/newsletter-bg.webp');
background-position-y: 33%;
background-position-x: center;
background-repeat: no-repeat;
diff --git a/apps/web/src/app/[locale]/(email)/newsletter/page.tsx b/apps/web/src/app/(email)/newsletter/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(email)/newsletter/page.tsx
rename to apps/web/src/app/(email)/newsletter/page.tsx
diff --git a/apps/web/src/app/[locale]/(legal)/privacy/page.tsx b/apps/web/src/app/(legal)/privacy/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(legal)/privacy/page.tsx
rename to apps/web/src/app/(legal)/privacy/page.tsx
diff --git a/apps/web/src/app/[locale]/(legal)/tos/page.tsx b/apps/web/src/app/(legal)/tos/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(legal)/tos/page.tsx
rename to apps/web/src/app/(legal)/tos/page.tsx
diff --git a/apps/web/src/app/[locale]/(playgrounds)/challenge-playground/challenge-playground-layout-wrapper.tsx b/apps/web/src/app/(playgrounds)/challenge-playground/challenge-playground-layout-wrapper.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(playgrounds)/challenge-playground/challenge-playground-layout-wrapper.tsx
rename to apps/web/src/app/(playgrounds)/challenge-playground/challenge-playground-layout-wrapper.tsx
diff --git a/apps/web/src/app/[locale]/(playgrounds)/challenge-playground/challenge-playground-store.ts b/apps/web/src/app/(playgrounds)/challenge-playground/challenge-playground-store.ts
similarity index 100%
rename from apps/web/src/app/[locale]/(playgrounds)/challenge-playground/challenge-playground-store.ts
rename to apps/web/src/app/(playgrounds)/challenge-playground/challenge-playground-store.ts
diff --git a/apps/web/src/app/[locale]/(playgrounds)/challenge-playground/description.tsx b/apps/web/src/app/(playgrounds)/challenge-playground/description.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(playgrounds)/challenge-playground/description.tsx
rename to apps/web/src/app/(playgrounds)/challenge-playground/description.tsx
diff --git a/apps/web/src/app/[locale]/(playgrounds)/challenge-playground/layout.tsx b/apps/web/src/app/(playgrounds)/challenge-playground/layout.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(playgrounds)/challenge-playground/layout.tsx
rename to apps/web/src/app/(playgrounds)/challenge-playground/layout.tsx
diff --git a/apps/web/src/app/[locale]/(playgrounds)/challenge-playground/left-wrapper.tsx b/apps/web/src/app/(playgrounds)/challenge-playground/left-wrapper.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(playgrounds)/challenge-playground/left-wrapper.tsx
rename to apps/web/src/app/(playgrounds)/challenge-playground/left-wrapper.tsx
diff --git a/apps/web/src/app/[locale]/(playgrounds)/challenge-playground/page.tsx b/apps/web/src/app/(playgrounds)/challenge-playground/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(playgrounds)/challenge-playground/page.tsx
rename to apps/web/src/app/(playgrounds)/challenge-playground/page.tsx
diff --git a/apps/web/src/app/[locale]/(playgrounds)/challenge-playground/wrapper.tsx b/apps/web/src/app/(playgrounds)/challenge-playground/wrapper.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(playgrounds)/challenge-playground/wrapper.tsx
rename to apps/web/src/app/(playgrounds)/challenge-playground/wrapper.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/badges/aot-2023-badge.tsx b/apps/web/src/app/(profile)/[username]/_components/badges/aot-2023-badge.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/badges/aot-2023-badge.tsx
rename to apps/web/src/app/(profile)/[username]/_components/badges/aot-2023-badge.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/_actions.ts b/apps/web/src/app/(profile)/[username]/_components/dashboard/_actions.ts
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/_actions.ts
rename to apps/web/src/app/(profile)/[username]/_components/dashboard/_actions.ts
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/badges.tsx b/apps/web/src/app/(profile)/[username]/_components/dashboard/badges.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/badges.tsx
rename to apps/web/src/app/(profile)/[username]/_components/dashboard/badges.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/challenge-history-columns.tsx b/apps/web/src/app/(profile)/[username]/_components/dashboard/challenge-history-columns.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/challenge-history-columns.tsx
rename to apps/web/src/app/(profile)/[username]/_components/dashboard/challenge-history-columns.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/challenge-history.tsx b/apps/web/src/app/(profile)/[username]/_components/dashboard/challenge-history.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/challenge-history.tsx
rename to apps/web/src/app/(profile)/[username]/_components/dashboard/challenge-history.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/challenges-progress.tsx b/apps/web/src/app/(profile)/[username]/_components/dashboard/challenges-progress.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/challenges-progress.tsx
rename to apps/web/src/app/(profile)/[username]/_components/dashboard/challenges-progress.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/index.tsx b/apps/web/src/app/(profile)/[username]/_components/dashboard/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/index.tsx
rename to apps/web/src/app/(profile)/[username]/_components/dashboard/index.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/overview-tab.tsx b/apps/web/src/app/(profile)/[username]/_components/dashboard/overview-tab.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/overview-tab.tsx
rename to apps/web/src/app/(profile)/[username]/_components/dashboard/overview-tab.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/user-header.tsx b/apps/web/src/app/(profile)/[username]/_components/dashboard/user-header.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/dashboard/user-header.tsx
rename to apps/web/src/app/(profile)/[username]/_components/dashboard/user-header.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/profile-skeleton.tsx b/apps/web/src/app/(profile)/[username]/_components/profile-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/profile-skeleton.tsx
rename to apps/web/src/app/(profile)/[username]/_components/profile-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/_components/profile.tsx b/apps/web/src/app/(profile)/[username]/_components/profile.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/_components/profile.tsx
rename to apps/web/src/app/(profile)/[username]/_components/profile.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/bookmarks/_components/bookmarked-challenges-columns.tsx b/apps/web/src/app/(profile)/[username]/bookmarks/_components/bookmarked-challenges-columns.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/bookmarks/_components/bookmarked-challenges-columns.tsx
rename to apps/web/src/app/(profile)/[username]/bookmarks/_components/bookmarked-challenges-columns.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/bookmarks/loading.tsx b/apps/web/src/app/(profile)/[username]/bookmarks/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/bookmarks/loading.tsx
rename to apps/web/src/app/(profile)/[username]/bookmarks/loading.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/bookmarks/page.tsx b/apps/web/src/app/(profile)/[username]/bookmarks/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/bookmarks/page.tsx
rename to apps/web/src/app/(profile)/[username]/bookmarks/page.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/completed/loading.tsx b/apps/web/src/app/(profile)/[username]/completed/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/completed/loading.tsx
rename to apps/web/src/app/(profile)/[username]/completed/loading.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/completed/page.tsx b/apps/web/src/app/(profile)/[username]/completed/page.tsx
similarity index 92%
rename from apps/web/src/app/[locale]/(profile)/[username]/completed/page.tsx
rename to apps/web/src/app/(profile)/[username]/completed/page.tsx
index a93232fe..0844a2b5 100644
--- a/apps/web/src/app/[locale]/(profile)/[username]/completed/page.tsx
+++ b/apps/web/src/app/(profile)/[username]/completed/page.tsx
@@ -7,7 +7,7 @@ import {
CardTitle,
} from '@repo/ui/components/card';
import { notFound } from 'next/navigation';
-import { createCompletedSubmissionCacheKey } from '~/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/cache-keys';
+import { createCompletedSubmissionCacheKey } from '~/app/challenge/[slug]/submissions/[[...catchAll]]/cache-keys';
import { withUnstableCache } from '~/utils/withUnstableCache';
import { getChallengeHistoryByCategory } from '../_components/dashboard/_actions';
import ChallengeHistory from '../_components/dashboard/challenge-history';
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/in-progress/loading.tsx b/apps/web/src/app/(profile)/[username]/in-progress/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/in-progress/loading.tsx
rename to apps/web/src/app/(profile)/[username]/in-progress/loading.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/in-progress/page.tsx b/apps/web/src/app/(profile)/[username]/in-progress/page.tsx
similarity index 92%
rename from apps/web/src/app/[locale]/(profile)/[username]/in-progress/page.tsx
rename to apps/web/src/app/(profile)/[username]/in-progress/page.tsx
index cff06ff3..69836564 100644
--- a/apps/web/src/app/[locale]/(profile)/[username]/in-progress/page.tsx
+++ b/apps/web/src/app/(profile)/[username]/in-progress/page.tsx
@@ -7,7 +7,7 @@ import {
CardTitle,
} from '@repo/ui/components/card';
import { notFound } from 'next/navigation';
-import { createInProgressSubmissionCacheKey } from '~/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/cache-keys';
+import { createInProgressSubmissionCacheKey } from '~/app/challenge/[slug]/submissions/[[...catchAll]]/cache-keys';
import { withUnstableCache } from '~/utils/withUnstableCache';
import { getChallengeHistoryByCategory } from '../_components/dashboard/_actions';
import ChallengeHistory from '../_components/dashboard/challenge-history';
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/layout.tsx b/apps/web/src/app/(profile)/[username]/layout.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/layout.tsx
rename to apps/web/src/app/(profile)/[username]/layout.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/loading.tsx b/apps/web/src/app/(profile)/[username]/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/loading.tsx
rename to apps/web/src/app/(profile)/[username]/loading.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/page.tsx b/apps/web/src/app/(profile)/[username]/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/page.tsx
rename to apps/web/src/app/(profile)/[username]/page.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/shared-solutions/_components/shared-solutions-columns.tsx b/apps/web/src/app/(profile)/[username]/shared-solutions/_components/shared-solutions-columns.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/shared-solutions/_components/shared-solutions-columns.tsx
rename to apps/web/src/app/(profile)/[username]/shared-solutions/_components/shared-solutions-columns.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/shared-solutions/loading.tsx b/apps/web/src/app/(profile)/[username]/shared-solutions/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/shared-solutions/loading.tsx
rename to apps/web/src/app/(profile)/[username]/shared-solutions/loading.tsx
diff --git a/apps/web/src/app/[locale]/(profile)/[username]/shared-solutions/page.tsx b/apps/web/src/app/(profile)/[username]/shared-solutions/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(profile)/[username]/shared-solutions/page.tsx
rename to apps/web/src/app/(profile)/[username]/shared-solutions/page.tsx
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsx
deleted file mode 100644
index 95359f6e..00000000
--- a/apps/web/src/app/[locale]/layout.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-'use client';
-import { I18nProviderClient } from '~/locales/client';
-
-export default function RootLayout({
- children,
- params: { locale },
-}: {
- children: React.ReactNode;
- params: { locale: string };
-}) {
- return (
- <>
- <I18nProviderClient locale={locale}>
- <main className="flex-1">{children}</main>
- </I18nProviderClient>
- </>
- );
-}
diff --git a/apps/web/src/app/[locale]/_components/community/community.module.css b/apps/web/src/app/_components/community/community.module.css
similarity index 91%
rename from apps/web/src/app/[locale]/_components/community/community.module.css
rename to apps/web/src/app/_components/community/community.module.css
index 24f4ed12..b3a2128e 100644
--- a/apps/web/src/app/[locale]/_components/community/community.module.css
+++ b/apps/web/src/app/_components/community/community.module.css
@@ -14,7 +14,7 @@
hsla(var(--background) / 0.95) 33%,
hsl(var(--background)) 50%
),
- url('../../../../assets/images/background_pattern.webp');
+ url('../../../assets/images/background_pattern.webp');
background-size: cover;
background-position-y: top;
background-position-x: center;
@@ -50,7 +50,7 @@
hsla(var(--background) / 0.95) 15%,
hsl(var(--background)) 30%
),
- url('../../../../assets/images/background_pattern.webp');
+ url('../../../assets/images/background_pattern.webp');
background-size: 1800px;
background-position-y: top;
diff --git a/apps/web/src/app/[locale]/_components/community/community.tsx b/apps/web/src/app/_components/community/community.tsx
similarity index 95%
rename from apps/web/src/app/[locale]/_components/community/community.tsx
rename to apps/web/src/app/_components/community/community.tsx
index 1bbdfdef..9d02acba 100644
--- a/apps/web/src/app/[locale]/_components/community/community.tsx
+++ b/apps/web/src/app/_components/community/community.tsx
@@ -4,16 +4,13 @@ import { GitBranch } from '@repo/ui/icons';
import { clsx } from 'clsx';
import { type CSSProperties } from 'react';
import { useInView } from 'react-intersection-observer';
-import { contributors } from '../../../../../public/contributors';
+import { contributors } from '../../../../public/contributors';
import styles from './community.module.css';
import { useEffect, useRef } from 'react';
import { Contributor } from './contributor';
-import { useScopedI18n } from '~/locales/client';
// million-ignore
export function Community() {
- const t = useScopedI18n('landing.community');
- const gt = useScopedI18n('general');
const innerScrollerRef = useRef<HTMLDivElement | null>(null);
const innerScrollerRef2 = useRef<HTMLDivElement | null>(null);
const innerScrollerRef3 = useRef<HTMLDivElement | null>(null);
@@ -87,13 +84,16 @@ export function Community() {
<div className="rounded-full bg-white/80 px-3 py-1 dark:bg-black/80">
<span className="flex select-none items-center bg-gradient-to-r from-[#31bdc6] to-[#3178c6] bg-clip-text text-transparent">
<GitBranch className="h-4 w-4 stroke-[#31bdc6] stroke-2 sm:mr-2" />
- <span className="hidden sm:block">{t('byDevforDev')}</span>
+ <span className="hidden sm:block">By developers, for developers</span>
</span>
</div>
</div>
- <h2 className="mt-2 text-center text-4xl font-bold lg:text-left">{t('title')}</h2>
+ <h2 className="mt-2 text-center text-4xl font-bold lg:text-left">
+ Built by the community
+ </h2>
<p className="max-w-[55ch] bg-transparent px-8 text-center leading-8 text-black/60 dark:text-white/50 lg:px-0 lg:text-left">
- {t('description')}
+ TypeHero is free, open-source, and built by developers just like you. These are
+ some\nof the contributors who made this possible so far.
</p>
<div className="flex flex-col-reverse gap-3 sm:flex-row">
<a
@@ -112,7 +112,7 @@ export function Community() {
<title>Discord</title>
<path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3933-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z" />
</svg>
- {gt('join.discord')}
+ Join the Discord
</a>
<a
target="_blank"
@@ -130,7 +130,7 @@ export function Community() {
<title>GitHub</title>
<path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
</svg>
- {gt('contribute.github')}
+ Contribute on GitHub
</a>
</div>
</div>
diff --git a/apps/web/src/app/[locale]/_components/community/contributor.tsx b/apps/web/src/app/_components/community/contributor.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/_components/community/contributor.tsx
rename to apps/web/src/app/_components/community/contributor.tsx
diff --git a/apps/web/src/app/[locale]/_components/countdown-timer.tsx b/apps/web/src/app/_components/countdown-timer.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/_components/countdown-timer.tsx
rename to apps/web/src/app/_components/countdown-timer.tsx
diff --git a/apps/web/src/app/[locale]/_components/feature-card.tsx b/apps/web/src/app/_components/feature-card.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/_components/feature-card.tsx
rename to apps/web/src/app/_components/feature-card.tsx
diff --git a/apps/web/src/app/[locale]/_components/features.tsx b/apps/web/src/app/_components/features.tsx
similarity index 91%
rename from apps/web/src/app/[locale]/_components/features.tsx
rename to apps/web/src/app/_components/features.tsx
index 9ef2f2a1..3368bab2 100644
--- a/apps/web/src/app/[locale]/_components/features.tsx
+++ b/apps/web/src/app/_components/features.tsx
@@ -22,10 +22,8 @@ import {
ChallengeCreationCard,
CuratedTracksCard,
} from './feature-card';
-import { getScopedI18n } from '~/locales/server';
export async function Features() {
- const t = await getScopedI18n('landing.features');
return (
<section className="relative overflow-hidden" id="features">
<div className="mx-auto mb-[64px] grid max-w-[1400px] items-center justify-center px-4 sm:px-24 md:px-4 lg:px-24">
@@ -44,7 +42,7 @@ export async function Features() {
>
<path d="m19.2 36.4-4.75-10.45L4 21.2l10.45-4.75L19.2 6l4.75 10.45L34.4 21.2l-10.45 4.75ZM36.4 42l-2.35-5.25-5.25-2.35 5.25-2.4 2.35-5.2 2.4 5.2 5.2 2.4-5.2 2.35Z" />
</svg>
- {t('badge')}{' '}
+ many features, wow{' '}
<Image
className="absolute -bottom-1 right-1 translate-y-7 duration-300 group-hover:translate-y-0"
alt="doge smile"
@@ -56,10 +54,10 @@ export async function Features() {
</div>
</a>
<h1 className="text-4xl font-bold">
- <Balancer>{t('title')}</Balancer>
+ <Balancer>What's in TypeHero?</Balancer>
</h1>
<p className="text-black/60 dark:text-white/50">
- <Balancer>{t('description')}</Balancer>
+ <Balancer>All you need to become a TypeScript menace</Balancer>
</p>
</div>
<div className="relative z-10 grid w-full gap-4 md:grid-cols-2 lg:gap-8 [&>*:nth-child(3)]:hidden md:[&>*:nth-child(3)]:block">
@@ -74,7 +72,7 @@ export async function Features() {
'scale-[190%] sm:scale-[120%] md:scale-100 rounded-2xl max-md:rounded-md left-[50%] sm:top-[49%] top-[69%] md:top-auto w-[50%] sm:left-[39%] md:-bottom-[2%] xl:-bottom-[12%] md:w-[77%]',
'md:group-hover:scale-105 md:group-hover:-translate-x-2',
)}
- description={t('imageCard.description')}
+ description="Engage in TypeScript challenges to strengthen your grasp of the type system and advanced features"
bgClass="md:bg-gradient-to-br"
image={{
dark1: FeatureCardChallengeDark2,
@@ -83,12 +81,12 @@ export async function Features() {
light2: FeatureCardChallengeLight1,
alt: 'Something',
}}
- title={t('imageCard.title')}
+ title="Type Challenges"
/>
<CollaborativeEnvironmentCard
- description={t('collaborativeEnvironment.description')}
+ description="Developers can share solutions and engage in discussions through commenting"
bgClass="md:bg-gradient-to-bl"
- title={t('collaborativeEnvironment.title')}
+ title="Collaborative Environment"
/>
<ChallengeCreationCard
step1img1Class={clsx(
@@ -133,9 +131,9 @@ export async function Features() {
title="Challenge Creation"
/>
<CuratedTracksCard
- description={t('curatedTracks.description')}
+ description="Tracks are curated challenges, spanning various topics and difficulty levels, to advance your TypeScript skills."
bgClass="md:bg-gradient-to-tl"
- title={t('curatedTracks.title')}
+ title="Learning Tracks"
/>
</div>
</div>
diff --git a/apps/web/src/app/[locale]/_components/hero-challenge-card.tsx b/apps/web/src/app/_components/hero-challenge-card.tsx
similarity index 97%
rename from apps/web/src/app/[locale]/_components/hero-challenge-card.tsx
rename to apps/web/src/app/_components/hero-challenge-card.tsx
index 723954f7..19aeb5e4 100644
--- a/apps/web/src/app/[locale]/_components/hero-challenge-card.tsx
+++ b/apps/web/src/app/_components/hero-challenge-card.tsx
@@ -2,7 +2,6 @@ import type { Difficulty } from '@repo/db/types';
import { clsx } from 'clsx';
import { motion, type SVGMotionProps } from 'framer-motion';
import type { ReactNode } from 'react';
-import { useScopedI18n } from '~/locales/client';
function getRandomWidth() {
const min = 100;
@@ -47,8 +46,6 @@ export function HeroChallengeCard({
className,
difficulty = 'HARD',
}: FakeChallengeCardProps) {
- const t = useScopedI18n('general');
-
return (
<div
className={clsx(className, {
@@ -61,7 +58,7 @@ export function HeroChallengeCard({
<div
className={`inline-flex w-fit translate-x-1 items-center rounded-full border border-transparent px-2.5 py-0.5 text-xs font-semibold text-white duration-300 group-hover/card:-translate-x-0 group-hover/card:-translate-y-1 group-hover/card:shadow-[0.5rem_0.5rem_0.25rem_-0.25rem_#0004] dark:text-black ${COLORS_BY_DIFFICULTY[difficulty]}`}
>
- {t(`difficulty.${difficulty}`).toUpperCase()}
+ {difficulty.toUpperCase()}
</div>
<div className="flex w-fit items-center justify-center rounded-full bg-transparent bg-zinc-600 px-2.5 py-1 pl-1.5 pr-2 text-xs font-bold text-neutral-50 duration-300 group-hover/card:-translate-x-1 group-hover/card:-translate-y-1 group-hover/card:shadow-[0.5rem_0.5rem_0.25rem_-0.25rem_#0004] dark:bg-zinc-700 dark:text-white">
@{username}
diff --git a/apps/web/src/app/[locale]/_components/hero-illustration.tsx b/apps/web/src/app/_components/hero-illustration.tsx
similarity index 87%
rename from apps/web/src/app/[locale]/_components/hero-illustration.tsx
rename to apps/web/src/app/_components/hero-illustration.tsx
index 6b9940ad..2ae77c3c 100644
--- a/apps/web/src/app/[locale]/_components/hero-illustration.tsx
+++ b/apps/web/src/app/_components/hero-illustration.tsx
@@ -3,7 +3,6 @@
import { motion } from 'framer-motion';
import { useIsMobile } from '~/utils/useIsMobile';
import { HeroChallengeCard } from './hero-challenge-card';
-import { useScopedI18n } from '~/locales/client';
export function BackgroundGrid() {
return (
@@ -21,7 +20,6 @@ export function BackgroundGrid() {
export function HeroIllustration() {
const isMobile = useIsMobile();
- const t = useScopedI18n('landing.hero');
if (isMobile) {
return null;
@@ -52,8 +50,8 @@ export function HeroIllustration() {
username="bigmang"
className="absolute"
difficulty="EASY"
- prompt={t('challenge1.prompt')}
- title={t('challenge1.title')}
+ prompt="Implement a union type of number and string"
+ title="Implement a union type of number and string"
/>
</motion.div>
<motion.div
@@ -76,8 +74,8 @@ export function HeroIllustration() {
username="matt"
className="absolute"
difficulty="HARD"
- prompt={t('challenge2.prompt')}
- title={t('challenge2.title')}
+ prompt="Convert a string literal to a number"
+ title="String to Number"
/>
</motion.div>
</div>
diff --git a/apps/web/src/app/[locale]/_components/hero.tsx b/apps/web/src/app/_components/hero.tsx
similarity index 96%
rename from apps/web/src/app/[locale]/_components/hero.tsx
rename to apps/web/src/app/_components/hero.tsx
index ebf91214..67a83a4d 100644
--- a/apps/web/src/app/[locale]/_components/hero.tsx
+++ b/apps/web/src/app/_components/hero.tsx
@@ -3,7 +3,6 @@ import Link from 'next/link';
import { Balancer } from 'react-wrap-balancer';
import { Button } from '@repo/ui/components/button';
import { HeroIllustration, BackgroundGrid } from './hero-illustration';
-import { getScopedI18n } from '~/locales/server';
import { auth } from '@repo/auth/server';
function TypeHeroLogo3D() {
@@ -144,7 +143,6 @@ function BeamOfLight() {
}
export async function Hero() {
- const t = await getScopedI18n('landing.hero');
const session = await auth();
return (
<section className="pointer-events-none -mt-[56px] min-h-[calc(100vh)] overflow-hidden lg:min-h-0 lg:pt-[56px]">
@@ -164,7 +162,7 @@ export async function Hero() {
<span className="animate-bg-gradient-to-center relative flex select-none items-center bg-gradient-to-r to-70% bg-[length:420%_420%] bg-clip-text bg-right-bottom text-transparent duration-500 group-hover:bg-left-top dark:from-yellow-500 dark:via-white dark:to-[#3178c6]">
<Sparkle className="animate-oldstar absolute -left-1 top-0.5 mr-2 h-5 w-5 translate-x-0.5 stroke-[#3178c6] stroke-2 duration-500 group-hover:rotate-180 group-hover:scale-110 group-hover:stroke-yellow-600 dark:duration-500 " />
<Sparkle className="animate-newstar mr-2 h-4 w-4 stroke-[#3178c6] stroke-2 duration-500 group-hover:rotate-180 group-hover:scale-110 group-hover:fill-[#3178c6] dark:stroke-white dark:duration-500 dark:group-hover:fill-white" />{' '}
- {t('ghStars')}
+ Star us on GitHub
</span>
</div>
</a>
@@ -180,7 +178,10 @@ export async function Hero() {
</div>
<p className="max-w-[55ch] bg-transparent text-center font-medium leading-8 text-black/60 dark:text-white/50 sm:px-8 lg:px-0 lg:text-left">
- <Balancer>{t('description')}</Balancer>
+ <Balancer>
+ Connect, collaborate, and grow with a community of TypeScript developers. Elevate your
+ skills through interactive coding challenges, discussions, and knowledge sharing
+ </Balancer>
</p>
<div className="flex flex-col-reverse gap-3 md:flex-row">
<Button
@@ -191,7 +192,7 @@ export async function Hero() {
<Link href="/explore">
<span className="inline-flex h-full w-fit items-center gap-2 rounded-xl px-4 py-2 transition-all duration-300 dark:bg-neutral-900 dark:text-white group-hover:dark:bg-black">
<Compass className="h-4 w-4" />
- {session ? t('explore') : t('start_exploring')}
+ {session ? 'Explore' : 'Start exploring'}
</span>
</Link>
</Button>
diff --git a/apps/web/src/app/[locale]/_components/newsletter-banner.tsx b/apps/web/src/app/_components/newsletter-banner.tsx
similarity index 86%
rename from apps/web/src/app/[locale]/_components/newsletter-banner.tsx
rename to apps/web/src/app/_components/newsletter-banner.tsx
index 91abff19..36a5e64e 100644
--- a/apps/web/src/app/[locale]/_components/newsletter-banner.tsx
+++ b/apps/web/src/app/_components/newsletter-banner.tsx
@@ -4,20 +4,20 @@ import { Mail } from '@repo/ui/icons';
import { Balancer } from 'react-wrap-balancer';
import styles from './newsletter.module.css';
import { Button } from '@repo/ui/components/button';
-import { getScopedI18n } from '~/locales/server';
export async function NewsletterBanner() {
- const t = await getScopedI18n('landing.newsletter');
-
return (
<section className={clsx(styles.backdrop, 'relative overflow-hidden')}>
<div className="container relative grid grid-cols-1 items-center justify-center py-[64px] md:grid-cols-2">
<div className="flex flex-col gap-8 px-8 pb-8 pt-48 sm:px-16 sm:pt-20 md:px-0 md:pb-0 md:pt-16">
<h1 className="max-w-[13ch] text-4xl font-bold md:max-w-none">
- <Balancer>{t('title')}</Balancer>
+ <Balancer>Stay Informed</Balancer>
</h1>
<p className="leading-8 text-black/60 dark:text-white/50">
- <Balancer>{t('description')}</Balancer>
+ <Balancer>
+ Interested in the future of the platform? Be the first to get updates on content,
+ new\nfeatures, and more!
+ </Balancer>
</p>
</div>
<Button
@@ -27,7 +27,7 @@ export async function NewsletterBanner() {
<Link href="/newsletter">
<span className="inline-flex h-full w-fit items-center gap-1 rounded-[10px] bg-white/90 px-4 py-2 text-black transition-all duration-300 group-hover:rounded-2xl group-hover:bg-white/0 group-hover:text-white dark:bg-black/80 dark:text-white group-hover:dark:bg-black/0 dark:group-hover:text-black">
<Mail className="mr-1 h-4 w-4 stroke-[3]" />
- {t('subscribe')}
+ Subscribe to our newsletter
</span>
</Link>
</Button>
diff --git a/apps/web/src/app/[locale]/_components/newsletter.module.css b/apps/web/src/app/_components/newsletter.module.css
similarity index 94%
rename from apps/web/src/app/[locale]/_components/newsletter.module.css
rename to apps/web/src/app/_components/newsletter.module.css
index 9ef9be16..adc18965 100644
--- a/apps/web/src/app/[locale]/_components/newsletter.module.css
+++ b/apps/web/src/app/_components/newsletter.module.css
@@ -13,7 +13,7 @@
rgba(59, 131, 199, 0.17) 75.5%,
rgba(49, 120, 198, 0.3) 100%
),
- url('../../../assets/images/background_pattern.webp');
+ url('../../assets/images/background_pattern.webp');
background-size: cover;
background-position-x: center;
background-repeat: no-repeat;
diff --git a/apps/web/src/app/all-challenges.hook.tsx b/apps/web/src/app/all-challenges.hook.tsx
index 569622ad..23149372 100644
--- a/apps/web/src/app/all-challenges.hook.tsx
+++ b/apps/web/src/app/all-challenges.hook.tsx
@@ -1,6 +1,6 @@
'use client';
import { createContext, useState, useContext } from 'react';
-import { type AllChallenges } from './[locale]/explore/_components/explore.action';
+import { type AllChallenges } from './explore/_components/explore.action';
interface AllChallengesContextType {
allChallenges: AllChallenges;
diff --git a/apps/web/src/app/[locale]/aot-2023/_components/about.tsx b/apps/web/src/app/aot-2023/_components/about.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/aot-2023/_components/about.tsx
rename to apps/web/src/app/aot-2023/_components/about.tsx
diff --git a/apps/web/src/app/[locale]/aot-2023/_components/aot-card-skeleton.tsx b/apps/web/src/app/aot-2023/_components/aot-card-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/aot-2023/_components/aot-card-skeleton.tsx
rename to apps/web/src/app/aot-2023/_components/aot-card-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/aot-2023/_components/card-grid.tsx b/apps/web/src/app/aot-2023/_components/card-grid.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/aot-2023/_components/card-grid.tsx
rename to apps/web/src/app/aot-2023/_components/card-grid.tsx
diff --git a/apps/web/src/app/[locale]/aot-2023/_components/index.tsx b/apps/web/src/app/aot-2023/_components/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/aot-2023/_components/index.tsx
rename to apps/web/src/app/aot-2023/_components/index.tsx
diff --git a/apps/web/src/app/[locale]/aot-2023/_components/tiltable-card.tsx b/apps/web/src/app/aot-2023/_components/tiltable-card.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/aot-2023/_components/tiltable-card.tsx
rename to apps/web/src/app/aot-2023/_components/tiltable-card.tsx
diff --git a/apps/web/src/app/[locale]/aot-2023/page.tsx b/apps/web/src/app/aot-2023/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/aot-2023/page.tsx
rename to apps/web/src/app/aot-2023/page.tsx
diff --git a/apps/web/src/app/[locale]/aot-2023/wrapped/_components/hero.tsx b/apps/web/src/app/aot-2023/wrapped/_components/hero.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/aot-2023/wrapped/_components/hero.tsx
rename to apps/web/src/app/aot-2023/wrapped/_components/hero.tsx
diff --git a/apps/web/src/app/[locale]/aot-2023/wrapped/_components/least-solved.tsx b/apps/web/src/app/aot-2023/wrapped/_components/least-solved.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/aot-2023/wrapped/_components/least-solved.tsx
rename to apps/web/src/app/aot-2023/wrapped/_components/least-solved.tsx
diff --git a/apps/web/src/app/[locale]/aot-2023/wrapped/_components/most-solved.tsx b/apps/web/src/app/aot-2023/wrapped/_components/most-solved.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/aot-2023/wrapped/_components/most-solved.tsx
rename to apps/web/src/app/aot-2023/wrapped/_components/most-solved.tsx
diff --git a/apps/web/src/app/[locale]/aot-2023/wrapped/_components/user-summary.tsx b/apps/web/src/app/aot-2023/wrapped/_components/user-summary.tsx
similarity index 97%
rename from apps/web/src/app/[locale]/aot-2023/wrapped/_components/user-summary.tsx
rename to apps/web/src/app/aot-2023/wrapped/_components/user-summary.tsx
index 246e7b5d..6f64e85f 100644
--- a/apps/web/src/app/[locale]/aot-2023/wrapped/_components/user-summary.tsx
+++ b/apps/web/src/app/aot-2023/wrapped/_components/user-summary.tsx
@@ -1,6 +1,6 @@
import { prisma } from '@repo/db';
import Image from 'next/image';
-import { AOT_CHALLENGES } from '~/app/[locale]/challenge/[slug]/aot-slugs';
+import { AOT_CHALLENGES } from '~/app/challenge/[slug]/aot-slugs';
import { MotionDiv } from '~/components/motion';
export async function UserSummary() {
diff --git a/apps/web/src/app/[locale]/aot-2023/wrapped/page.tsx b/apps/web/src/app/aot-2023/wrapped/page.tsx
similarity index 85%
rename from apps/web/src/app/[locale]/aot-2023/wrapped/page.tsx
rename to apps/web/src/app/aot-2023/wrapped/page.tsx
index 464639ef..c38946c8 100644
--- a/apps/web/src/app/[locale]/aot-2023/wrapped/page.tsx
+++ b/apps/web/src/app/aot-2023/wrapped/page.tsx
@@ -1,7 +1,5 @@
import { prisma } from '@repo/db';
import { Prisma } from '@repo/db/types';
-import { setStaticParamsLocale } from 'next-international/server';
-import { getStaticParams } from '~/locales/server';
import { AOT_CHALLENGES } from '../../challenge/[slug]/aot-slugs';
import { Hero } from './_components/hero';
import { LeastSolved } from './_components/least-solved';
@@ -10,18 +8,13 @@ import { UserSummary } from './_components/user-summary';
export const dynamic = 'force-static';
export const dynamicParams = false;
-export function generateStaticParams() {
- return getStaticParams();
-}
export interface AotChallengeData {
challengeId: string;
name: string;
slug: string;
userCount: number;
}
-export default async function Index({ params: { locale } }: { params: { locale: string } }) {
- setStaticParamsLocale(locale);
-
+export default async function Index() {
const topThreeSolved = await prisma.$queryRaw<AotChallengeData[]>`
select name, slug, challengeId, count(T.userId) as userCount
from(
diff --git a/apps/web/src/app/challenge-route-data.hook.tsx b/apps/web/src/app/challenge-route-data.hook.tsx
index 0466bff6..a17208fd 100644
--- a/apps/web/src/app/challenge-route-data.hook.tsx
+++ b/apps/web/src/app/challenge-route-data.hook.tsx
@@ -1,6 +1,6 @@
'use client';
import { createContext, useState, useContext, type PropsWithChildren } from 'react';
-import type { GetCurrentChallengeType } from './[locale]/challenge/[slug]/getChallengeRouteData';
+import type { GetCurrentChallengeType } from './challenge/[slug]/getChallengeRouteData';
interface ChallengeRouteDataContextType {
currentChallenge: GetCurrentChallengeType | null;
diff --git a/apps/web/src/app/[locale]/challenge/.vercel.approvers b/apps/web/src/app/challenge/.vercel.approvers
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/.vercel.approvers
rename to apps/web/src/app/challenge/.vercel.approvers
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/aot-slugs.ts b/apps/web/src/app/challenge/[slug]/aot-slugs.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/aot-slugs.ts
rename to apps/web/src/app/challenge/[slug]/aot-slugs.ts
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/comments/[commentId]/page.tsx b/apps/web/src/app/challenge/[slug]/comments/[commentId]/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/comments/[commentId]/page.tsx
rename to apps/web/src/app/challenge/[slug]/comments/[commentId]/page.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/getChallengeRouteData.ts b/apps/web/src/app/challenge/[slug]/getChallengeRouteData.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/getChallengeRouteData.ts
rename to apps/web/src/app/challenge/[slug]/getChallengeRouteData.ts
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/layout.tsx b/apps/web/src/app/challenge/[slug]/layout.tsx
similarity index 88%
rename from apps/web/src/app/[locale]/challenge/[slug]/layout.tsx
rename to apps/web/src/app/challenge/[slug]/layout.tsx
index 6d1b483b..a2ff1e6d 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/layout.tsx
+++ b/apps/web/src/app/challenge/[slug]/layout.tsx
@@ -1,4 +1,4 @@
-import { ChallengeLayoutWrapper } from '~/app/[locale]/challenge/_components/challenge-layout-wrapper';
+import { ChallengeLayoutWrapper } from '~/app/challenge/_components/challenge-layout-wrapper';
import { auth } from '@repo/auth/server';
import { ForceRenderUntilClient } from '@repo/ui/components/force-render-until-client';
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/left-wrapper.tsx b/apps/web/src/app/challenge/[slug]/left-wrapper.tsx
similarity index 98%
rename from apps/web/src/app/[locale]/challenge/[slug]/left-wrapper.tsx
rename to apps/web/src/app/challenge/[slug]/left-wrapper.tsx
index 9cce9910..c3d2dc0b 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/left-wrapper.tsx
+++ b/apps/web/src/app/challenge/[slug]/left-wrapper.tsx
@@ -3,7 +3,7 @@
import { usePathname, useRouter } from 'next/navigation';
import { useContext, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';
-import { ChallengeTrackNavigation } from '~/app/[locale]/challenge/_components/challenge-track-navigation';
+import { ChallengeTrackNavigation } from '~/app/challenge/_components/challenge-track-navigation';
import { FeatureFlagContext } from '~/app/feature-flag-provider';
import { cn } from '@repo/ui/cn';
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/loading.tsx b/apps/web/src/app/challenge/[slug]/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/loading.tsx
rename to apps/web/src/app/challenge/[slug]/loading.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/page.tsx b/apps/web/src/app/challenge/[slug]/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/page.tsx
rename to apps/web/src/app/challenge/[slug]/page.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/comments/[commentId]/page.tsx b/apps/web/src/app/challenge/[slug]/solutions/[solutionId]/comments/[commentId]/page.tsx
similarity index 74%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/comments/[commentId]/page.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/[solutionId]/comments/[commentId]/page.tsx
index 2c4a4b54..d74a83ff 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/comments/[commentId]/page.tsx
+++ b/apps/web/src/app/challenge/[slug]/solutions/[solutionId]/comments/[commentId]/page.tsx
@@ -1,7 +1,7 @@
import { auth } from '@repo/auth/server';
-import { SolutionDetails } from '~/app/[locale]/challenge/[slug]/solutions/_components/solution-detail';
-import { Comments } from '~/app/[locale]/challenge/_components/comments';
-import { getPreselectedSolutionCommentMetadata } from '~/app/[locale]/challenge/_components/comments/getCommentRouteData';
+import { SolutionDetails } from '~/app/challenge/[slug]/solutions/_components/solution-detail';
+import { Comments } from '~/app/challenge/_components/comments';
+import { getPreselectedSolutionCommentMetadata } from '~/app/challenge/_components/comments/getCommentRouteData';
import { getSolutionIdRouteData } from '../../getSolutionIdRouteData';
interface Props {
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/error.tsx b/apps/web/src/app/challenge/[slug]/solutions/[solutionId]/error.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/error.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/[solutionId]/error.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/getSolutionIdRouteData.ts b/apps/web/src/app/challenge/[slug]/solutions/[solutionId]/getSolutionIdRouteData.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/getSolutionIdRouteData.ts
rename to apps/web/src/app/challenge/[slug]/solutions/[solutionId]/getSolutionIdRouteData.ts
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/page.tsx b/apps/web/src/app/challenge/[slug]/solutions/[solutionId]/page.tsx
similarity index 94%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/page.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/[solutionId]/page.tsx
index e59a9956..962aee79 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/solutions/[solutionId]/page.tsx
+++ b/apps/web/src/app/challenge/[slug]/solutions/[solutionId]/page.tsx
@@ -1,7 +1,7 @@
import { prisma } from '@repo/db';
import { SolutionDetails } from '../_components/solution-detail';
import { auth } from '@repo/auth/server';
-import { Comments } from '~/app/[locale]/challenge/_components/comments';
+import { Comments } from '~/app/challenge/_components/comments';
import { getSolutionIdRouteData } from './getSolutionIdRouteData';
interface Props {
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/_actions.ts b/apps/web/src/app/challenge/[slug]/solutions/_components/_actions.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/_actions.ts
rename to apps/web/src/app/challenge/[slug]/solutions/_components/_actions.ts
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/delete/index.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/delete/index.tsx
similarity index 95%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/delete/index.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/_components/delete/index.tsx
index 158c52a7..08d40bfe 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/delete/index.tsx
+++ b/apps/web/src/app/challenge/[slug]/solutions/_components/delete/index.tsx
@@ -2,7 +2,7 @@ import type { DialogTriggerProps } from '@radix-ui/react-dialog';
import { useState } from 'react';
import { Dialog, DialogContent, DialogTrigger } from '@repo/ui/components/dialog';
import { TypographyLarge } from '@repo/ui/components/typography/large';
-import type { ChallengeSolution } from '~/app/[locale]/challenge/[slug]/solutions/[solutionId]/page';
+import type { ChallengeSolution } from '~/app/challenge/[slug]/solutions/[solutionId]/page';
import { Button } from '@repo/ui/components/button';
import { TypographyP } from '@repo/ui/components/paragraph';
import { deleteSolution } from '../_actions';
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/edit-solution.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/edit-solution.tsx
similarity index 97%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/edit-solution.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/_components/edit-solution.tsx
index 696d9ee1..0a3c9bdf 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/edit-solution.tsx
+++ b/apps/web/src/app/challenge/[slug]/solutions/_components/edit-solution.tsx
@@ -10,7 +10,7 @@ import { useForm } from 'react-hook-form';
import { z } from 'zod';
import { RichMarkdownEditor } from '~/components/rich-markdown-editor';
import { createNoProfanitySchemaWithValidate } from '~/utils/antiProfanityZod';
-import type { ChallengeSolution } from '~/app/[locale]/challenge/[slug]/solutions/[solutionId]/page';
+import type { ChallengeSolution } from '~/app/challenge/[slug]/solutions/[solutionId]/page';
import { updateSolution } from './_actions';
const formSchema = z.object({
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/index.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/index.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/_components/index.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/nosolutions.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/nosolutions.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/nosolutions.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/_components/nosolutions.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/solution-detail.tsx
similarity index 98%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/_components/solution-detail.tsx
index 8f57bdd6..76da0f44 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-detail.tsx
+++ b/apps/web/src/app/challenge/[slug]/solutions/_components/solution-detail.tsx
@@ -12,7 +12,7 @@ import { UserBadge } from '@repo/ui/components/user-badge';
import { Calendar, Flag, Pin, Share, Trash, ArrowLeft, Pencil } from '@repo/ui/icons';
import clsx from 'clsx';
import Link from 'next/link';
-import type { ChallengeSolution } from '~/app/[locale]/challenge/[slug]/solutions/[solutionId]/page';
+import type { ChallengeSolution } from '~/app/challenge/[slug]/solutions/[solutionId]/page';
import { ReportDialog } from '~/components/ReportDialog';
import { getRelativeTime } from '~/utils/relativeTime';
import { Vote } from '../../../_components/vote';
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-editor.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/solution-editor.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-editor.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/_components/solution-editor.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-skeleton.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/solution-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/solution-skeleton.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/_components/solution-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/submit-solution.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/submit-solution.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/submit-solution.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/_components/submit-solution.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useGetQueryString.tsx b/apps/web/src/app/challenge/[slug]/solutions/_components/useGetQueryString.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useGetQueryString.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/_components/useGetQueryString.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useQueryParamState.ts b/apps/web/src/app/challenge/[slug]/solutions/_components/useQueryParamState.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/_components/useQueryParamState.ts
rename to apps/web/src/app/challenge/[slug]/solutions/_components/useQueryParamState.ts
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/getSolutionRouteData.ts b/apps/web/src/app/challenge/[slug]/solutions/getSolutionRouteData.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/getSolutionRouteData.ts
rename to apps/web/src/app/challenge/[slug]/solutions/getSolutionRouteData.ts
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/loading.tsx b/apps/web/src/app/challenge/[slug]/solutions/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/loading.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/loading.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/solutions/page.tsx b/apps/web/src/app/challenge/[slug]/solutions/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/solutions/page.tsx
rename to apps/web/src/app/challenge/[slug]/solutions/page.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/index.tsx b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/index.tsx
rename to apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/index.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/nosubmissions.tsx b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/nosubmissions.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/nosubmissions.tsx
rename to apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/nosubmissions.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/overview.tsx b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/overview.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/overview.tsx
rename to apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/overview.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/submissions-skeleton.tsx b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/submissions-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/submissions-skeleton.tsx
rename to apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/submissions-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/suggestions.tsx b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/suggestions.tsx
similarity index 95%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/suggestions.tsx
rename to apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/suggestions.tsx
index 3490a812..c91990b2 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/_components/suggestions.tsx
+++ b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/_components/suggestions.tsx
@@ -4,8 +4,8 @@ import { ChevronRight, Swords } from '@repo/ui/icons';
import { useQuery } from '@tanstack/react-query';
import Link from 'next/link';
import { useMemo } from 'react';
-import { TrackChallenge } from '~/app/[locale]/tracks/_components/track-challenge-card';
-import { getTrackDetails } from '~/app/[locale]/tracks/_components/track.action';
+import { TrackChallenge } from '~/app/tracks/_components/track-challenge-card';
+import { getTrackDetails } from '~/app/tracks/_components/track.action';
import { getSimilarChallenges } from '~/utils/server/get-similar-challenges';
interface SuggestionsProps {
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/cache-keys.ts b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/cache-keys.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/cache-keys.ts
rename to apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/cache-keys.ts
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/getChallengeSubmissions.ts b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/getChallengeSubmissions.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/getChallengeSubmissions.ts
rename to apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/getChallengeSubmissions.ts
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/page.tsx b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/page.tsx
rename to apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/page.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/save-submission.action.ts b/apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/save-submission.action.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/[[...catchAll]]/save-submission.action.ts
rename to apps/web/src/app/challenge/[slug]/submissions/[[...catchAll]]/save-submission.action.ts
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/submissions/loading.tsx b/apps/web/src/app/challenge/[slug]/submissions/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/submissions/loading.tsx
rename to apps/web/src/app/challenge/[slug]/submissions/loading.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/use-track-visibility.hook.tsx b/apps/web/src/app/challenge/[slug]/use-track-visibility.hook.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/use-track-visibility.hook.tsx
rename to apps/web/src/app/challenge/[slug]/use-track-visibility.hook.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/wrapper.tsx b/apps/web/src/app/challenge/[slug]/wrapper.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[slug]/wrapper.tsx
rename to apps/web/src/app/challenge/[slug]/wrapper.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/bookmark.action.ts b/apps/web/src/app/challenge/_components/bookmark.action.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/bookmark.action.ts
rename to apps/web/src/app/challenge/_components/bookmark.action.ts
diff --git a/apps/web/src/app/[locale]/challenge/_components/challenge-layout-wrapper.tsx b/apps/web/src/app/challenge/_components/challenge-layout-wrapper.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/challenge-layout-wrapper.tsx
rename to apps/web/src/app/challenge/_components/challenge-layout-wrapper.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx b/apps/web/src/app/challenge/_components/challenge-layout.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx
rename to apps/web/src/app/challenge/_components/challenge-layout.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/challenge-store.ts b/apps/web/src/app/challenge/_components/challenge-store.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/challenge-store.ts
rename to apps/web/src/app/challenge/_components/challenge-store.ts
diff --git a/apps/web/src/app/[locale]/challenge/_components/challenge-track-navigation.tsx b/apps/web/src/app/challenge/_components/challenge-track-navigation.tsx
similarity index 95%
rename from apps/web/src/app/[locale]/challenge/_components/challenge-track-navigation.tsx
rename to apps/web/src/app/challenge/_components/challenge-track-navigation.tsx
index 19e60f97..09b14600 100644
--- a/apps/web/src/app/[locale]/challenge/_components/challenge-track-navigation.tsx
+++ b/apps/web/src/app/challenge/_components/challenge-track-navigation.tsx
@@ -4,8 +4,8 @@ import { useQuery } from '@tanstack/react-query';
import { useRouter } from 'next/navigation';
import { useMemo } from 'react';
-import { type ChallengeRouteData } from '~/app/[locale]/challenge/[slug]/getChallengeRouteData';
-import { getTrackDetails } from '~/app/[locale]/tracks/_components/track.action';
+import { type ChallengeRouteData } from '~/app/challenge/[slug]/getChallengeRouteData';
+import { getTrackDetails } from '~/app/tracks/_components/track.action';
import { Button } from '@repo/ui/components/button';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
diff --git a/apps/web/src/app/[locale]/challenge/_components/challenge-track-outline.tsx b/apps/web/src/app/challenge/_components/challenge-track-outline.tsx
similarity index 92%
rename from apps/web/src/app/[locale]/challenge/_components/challenge-track-outline.tsx
rename to apps/web/src/app/challenge/_components/challenge-track-outline.tsx
index 3378e22c..830d4f9d 100644
--- a/apps/web/src/app/[locale]/challenge/_components/challenge-track-outline.tsx
+++ b/apps/web/src/app/challenge/_components/challenge-track-outline.tsx
@@ -4,9 +4,9 @@ import Link from 'next/link';
import { useRouter } from 'next/navigation';
import { type ReactNode } from 'react';
-import type { getTrackDetails } from '~/app/[locale]/tracks/_components/track.action';
-import { TrackChallenge } from '~/app/[locale]/tracks/_components/track-challenge-card';
-import { TrackProgress } from '~/app/[locale]/tracks/_components/track-progress';
+import type { getTrackDetails } from '~/app/tracks/_components/track.action';
+import { TrackChallenge } from '~/app/tracks/_components/track-challenge-card';
+import { TrackProgress } from '~/app/tracks/_components/track-progress';
import { Button } from '@repo/ui/components/button';
import {
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comment-input.tsx b/apps/web/src/app/challenge/_components/comments/comment-input.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/comment-input.tsx
rename to apps/web/src/app/challenge/_components/comments/comment-input.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comment-skeleton.tsx b/apps/web/src/app/challenge/_components/comments/comment-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/comment-skeleton.tsx
rename to apps/web/src/app/challenge/_components/comments/comment-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comment.action.ts b/apps/web/src/app/challenge/_components/comments/comment.action.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/comment.action.ts
rename to apps/web/src/app/challenge/_components/comments/comment.action.ts
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx b/apps/web/src/app/challenge/_components/comments/comment.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/comment.tsx
rename to apps/web/src/app/challenge/_components/comments/comment.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comments.constants.ts b/apps/web/src/app/challenge/_components/comments/comments.constants.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/comments.constants.ts
rename to apps/web/src/app/challenge/_components/comments/comments.constants.ts
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/comments.hooks.tsx b/apps/web/src/app/challenge/_components/comments/comments.hooks.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/comments.hooks.tsx
rename to apps/web/src/app/challenge/_components/comments/comments.hooks.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsx b/apps/web/src/app/challenge/_components/comments/delete/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/delete/index.tsx
rename to apps/web/src/app/challenge/_components/comments/delete/index.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/getCommentRouteData.ts b/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/getCommentRouteData.ts
rename to apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/index.tsx b/apps/web/src/app/challenge/_components/comments/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/index.tsx
rename to apps/web/src/app/challenge/_components/comments/index.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/comments/nocomments.tsx b/apps/web/src/app/challenge/_components/comments/nocomments.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/comments/nocomments.tsx
rename to apps/web/src/app/challenge/_components/comments/nocomments.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/description/description-skeleton.tsx b/apps/web/src/app/challenge/_components/description/description-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/description/description-skeleton.tsx
rename to apps/web/src/app/challenge/_components/description/description-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/description/index.tsx b/apps/web/src/app/challenge/_components/description/index.tsx
similarity index 98%
rename from apps/web/src/app/[locale]/challenge/_components/description/index.tsx
rename to apps/web/src/app/challenge/_components/description/index.tsx
index bdce463b..6f7f5722 100644
--- a/apps/web/src/app/[locale]/challenge/_components/description/index.tsx
+++ b/apps/web/src/app/challenge/_components/description/index.tsx
@@ -21,7 +21,7 @@ import clsx from 'clsx';
import { debounce } from 'lodash';
import Link from 'next/link';
import { useMemo, useRef, useState } from 'react';
-import { type ChallengeRouteData } from '~/app/[locale]/challenge/[slug]/getChallengeRouteData';
+import { type ChallengeRouteData } from '~/app/challenge/[slug]/getChallengeRouteData';
import { ReportDialog } from '~/components/ReportDialog';
import { getRelativeTime } from '~/utils/relativeTime';
import { addOrRemoveBookmark } from '../bookmark.action';
diff --git a/apps/web/src/app/[locale]/challenge/_components/description/suggestions-skeleton.tsx b/apps/web/src/app/challenge/_components/description/suggestions-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/description/suggestions-skeleton.tsx
rename to apps/web/src/app/challenge/_components/description/suggestions-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/description/suggestions.tsx b/apps/web/src/app/challenge/_components/description/suggestions.tsx
similarity index 94%
rename from apps/web/src/app/[locale]/challenge/_components/description/suggestions.tsx
rename to apps/web/src/app/challenge/_components/description/suggestions.tsx
index d03d359e..a91b41e5 100644
--- a/apps/web/src/app/[locale]/challenge/_components/description/suggestions.tsx
+++ b/apps/web/src/app/challenge/_components/description/suggestions.tsx
@@ -1,6 +1,6 @@
import { useQuery } from '@tanstack/react-query';
import Link from 'next/link';
-import { TrackChallenge } from '~/app/[locale]/tracks/_components/track-challenge-card';
+import { TrackChallenge } from '~/app/tracks/_components/track-challenge-card';
import { getSimilarChallenges } from '~/utils/server/get-similar-challenges';
import { SuggestionsSkeleton } from './suggestions-skeleton';
diff --git a/apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsx b/apps/web/src/app/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsx
rename to apps/web/src/app/challenge/_components/editor-shortcuts/editor-shortcuts-button.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-form.tsx b/apps/web/src/app/challenge/_components/editor-shortcuts/editor-shortcuts-form.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/editor-shortcuts/editor-shortcuts-form.tsx
rename to apps/web/src/app/challenge/_components/editor-shortcuts/editor-shortcuts-form.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/explore-drawer.tsx b/apps/web/src/app/challenge/_components/explore-drawer.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/explore-drawer.tsx
rename to apps/web/src/app/challenge/_components/explore-drawer.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/fullscreen.tsx b/apps/web/src/app/challenge/_components/fullscreen.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/fullscreen.tsx
rename to apps/web/src/app/challenge/_components/fullscreen.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/left-panel-skeleton.tsx b/apps/web/src/app/challenge/_components/left-panel-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/left-panel-skeleton.tsx
rename to apps/web/src/app/challenge/_components/left-panel-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/pagination.tsx b/apps/web/src/app/challenge/_components/pagination.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/pagination.tsx
rename to apps/web/src/app/challenge/_components/pagination.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/reset-editor-button.tsx b/apps/web/src/app/challenge/_components/reset-editor-button.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/reset-editor-button.tsx
rename to apps/web/src/app/challenge/_components/reset-editor-button.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/select-dropdown.tsx b/apps/web/src/app/challenge/_components/select-dropdown.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/select-dropdown.tsx
rename to apps/web/src/app/challenge/_components/select-dropdown.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/settings/settings-button.tsx b/apps/web/src/app/challenge/_components/settings/settings-button.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/settings/settings-button.tsx
rename to apps/web/src/app/challenge/_components/settings/settings-button.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx b/apps/web/src/app/challenge/_components/settings/settings-form.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/settings/settings-form.tsx
rename to apps/web/src/app/challenge/_components/settings/settings-form.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/share-form.tsx b/apps/web/src/app/challenge/_components/share-form.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/share-form.tsx
rename to apps/web/src/app/challenge/_components/share-form.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/sheet-content-custom.tsx b/apps/web/src/app/challenge/_components/sheet-content-custom.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/sheet-content-custom.tsx
rename to apps/web/src/app/challenge/_components/sheet-content-custom.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/sort-select.tsx b/apps/web/src/app/challenge/_components/sort-select.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/sort-select.tsx
rename to apps/web/src/app/challenge/_components/sort-select.tsx
diff --git a/apps/web/src/app/[locale]/challenge/_components/usePanelAdjustments.ts b/apps/web/src/app/challenge/_components/usePanelAdjustments.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/usePanelAdjustments.ts
rename to apps/web/src/app/challenge/_components/usePanelAdjustments.ts
diff --git a/apps/web/src/app/[locale]/challenge/_components/vote.tsx b/apps/web/src/app/challenge/_components/vote.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/_components/vote.tsx
rename to apps/web/src/app/challenge/_components/vote.tsx
diff --git a/apps/web/src/app/[locale]/challenge/error.tsx b/apps/web/src/app/challenge/error.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/error.tsx
rename to apps/web/src/app/challenge/error.tsx
diff --git a/apps/web/src/app/[locale]/challenge/increment.action.ts b/apps/web/src/app/challenge/increment.action.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/increment.action.ts
rename to apps/web/src/app/challenge/increment.action.ts
diff --git a/apps/web/src/app/[locale]/context-providers.tsx b/apps/web/src/app/context-providers.tsx
similarity index 78%
rename from apps/web/src/app/[locale]/context-providers.tsx
rename to apps/web/src/app/context-providers.tsx
index c090298f..05c1bf8b 100644
--- a/apps/web/src/app/[locale]/context-providers.tsx
+++ b/apps/web/src/app/context-providers.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { ChallegeRouteDataProvider } from '../challenge-route-data.hook';
-import { ProblemExplorerProvider } from '../problem-explorer.hooks';
-import { AllChallengesProvider } from '../all-challenges.hook';
+import { ChallegeRouteDataProvider } from './challenge-route-data.hook';
+import { ProblemExplorerProvider } from './problem-explorer.hooks';
+import { AllChallengesProvider } from './all-challenges.hook';
import { getAllChallenges } from './explore/_components/explore.action';
import { auth } from '@repo/auth/server';
import { isEnrolledInAnyTrack } from './challenge/[slug]/getChallengeRouteData';
diff --git a/apps/web/src/app/[locale]/explore/[slug]/page.tsx b/apps/web/src/app/explore/[slug]/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/[slug]/page.tsx
rename to apps/web/src/app/explore/[slug]/page.tsx
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-card-skeleton.tsx b/apps/web/src/app/explore/_components/explore-card-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/explore-card-skeleton.tsx
rename to apps/web/src/app/explore/_components/explore-card-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-card.tsx b/apps/web/src/app/explore/_components/explore-card.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/explore-card.tsx
rename to apps/web/src/app/explore/_components/explore-card.tsx
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-challenges-progress.tsx b/apps/web/src/app/explore/_components/explore-challenges-progress.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/explore-challenges-progress.tsx
rename to apps/web/src/app/explore/_components/explore-challenges-progress.tsx
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-section-skeleton.tsx b/apps/web/src/app/explore/_components/explore-section-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/explore-section-skeleton.tsx
rename to apps/web/src/app/explore/_components/explore-section-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-section.tsx b/apps/web/src/app/explore/_components/explore-section.tsx
similarity index 97%
rename from apps/web/src/app/[locale]/explore/_components/explore-section.tsx
rename to apps/web/src/app/explore/_components/explore-section.tsx
index f9ae9838..681081e9 100644
--- a/apps/web/src/app/[locale]/explore/_components/explore-section.tsx
+++ b/apps/web/src/app/explore/_components/explore-section.tsx
@@ -1,7 +1,7 @@
import { auth } from '@repo/auth/server';
import type { Difficulty, Tags } from '@repo/db/types';
import Link from 'next/link';
-import { ExploreChallengesProgression } from '~/app/[locale]/explore/_components/explore-challenges-progress';
+import { ExploreChallengesProgression } from '~/app/explore/_components/explore-challenges-progress';
import { Carousel } from '~/components/carousel';
import { ExploreCard } from './explore-card';
import {
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-slug-skeleton.tsx b/apps/web/src/app/explore/_components/explore-slug-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/explore-slug-skeleton.tsx
rename to apps/web/src/app/explore/_components/explore-slug-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/explore/_components/explore-slug.tsx b/apps/web/src/app/explore/_components/explore-slug.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/explore-slug.tsx
rename to apps/web/src/app/explore/_components/explore-slug.tsx
diff --git a/apps/web/src/app/[locale]/explore/_components/explore.action.ts b/apps/web/src/app/explore/_components/explore.action.ts
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/explore.action.ts
rename to apps/web/src/app/explore/_components/explore.action.ts
diff --git a/apps/web/src/app/[locale]/explore/_components/index.tsx b/apps/web/src/app/explore/_components/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/index.tsx
rename to apps/web/src/app/explore/_components/index.tsx
diff --git a/apps/web/src/app/[locale]/explore/_components/relative-time.tsx b/apps/web/src/app/explore/_components/relative-time.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/relative-time.tsx
rename to apps/web/src/app/explore/_components/relative-time.tsx
diff --git a/apps/web/src/app/[locale]/explore/_components/view-more-button.tsx b/apps/web/src/app/explore/_components/view-more-button.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/_components/view-more-button.tsx
rename to apps/web/src/app/explore/_components/view-more-button.tsx
diff --git a/apps/web/src/app/[locale]/explore/error.tsx b/apps/web/src/app/explore/error.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/error.tsx
rename to apps/web/src/app/explore/error.tsx
diff --git a/apps/web/src/app/[locale]/explore/page.tsx b/apps/web/src/app/explore/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/explore/page.tsx
rename to apps/web/src/app/explore/page.tsx
diff --git a/apps/web/src/app/get-challenges-and-title.tsx b/apps/web/src/app/get-challenges-and-title.tsx
index c30cfcf1..8e392992 100644
--- a/apps/web/src/app/get-challenges-and-title.tsx
+++ b/apps/web/src/app/get-challenges-and-title.tsx
@@ -1,7 +1,7 @@
import type {
AllChallenges,
ChallengesByTagOrDifficulty,
-} from './[locale]/explore/_components/explore.action';
+} from './explore/_components/explore.action';
export const SORT_KEYS = [
{
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index fc3f74f0..b1b6a466 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -2,15 +2,10 @@ import { Toaster } from '@repo/ui/components/toaster';
import { Analytics } from '@vercel/analytics/react';
import { Inter } from 'next/font/google';
import { Navigation } from '~/components/Navigation';
-import { getStaticParams } from '~/locales/server';
import '../styles/globals.css';
-import { Providers } from './[locale]/providers';
import { OG_URL, tagline } from './metadata';
-import { ContextProviders } from './[locale]/context-providers';
-
-export function generateStaticParams() {
- return getStaticParams();
-}
+import { Providers } from './providers';
+import { ContextProviders } from './context-providers';
const inter = Inter({ subsets: ['latin'] });
@@ -64,11 +59,12 @@ export default function RootLayout({ children }: { children: React.ReactNode })
</head>
<body className={`${inter.className} flex flex-col`}>
<Providers>
+ <Navigation />
+ {/* this is broken and need to fix */}
<ContextProviders>
- <Navigation />
- {children}
- <Toaster />
+ <main className="flex-1">{children}</main>
</ContextProviders>
+ <Toaster />
</Providers>
<Analytics />
</body>
diff --git a/apps/web/src/app/[locale]/login/_components/LoginButton.tsx b/apps/web/src/app/login/_components/LoginButton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/login/_components/LoginButton.tsx
rename to apps/web/src/app/login/_components/LoginButton.tsx
diff --git a/apps/web/src/app/[locale]/login/page.tsx b/apps/web/src/app/login/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/login/page.tsx
rename to apps/web/src/app/login/page.tsx
diff --git a/apps/web/src/app/not-found.tsx b/apps/web/src/app/not-found.tsx
index f6c28e35..7a318064 100644
--- a/apps/web/src/app/not-found.tsx
+++ b/apps/web/src/app/not-found.tsx
@@ -1,13 +1,10 @@
import { Button } from '@repo/ui/components/button';
import Image from 'next/image';
-import { getScopedI18n } from '~/locales/server';
import { getRandomChallenge } from '~/utils/server/get-random-challenge';
export const dynamic = 'force-dynamic';
export default async function NotFound() {
- const t = await getScopedI18n('404');
-
const randomChallengeSlug = await getRandomChallenge();
return (
@@ -35,16 +32,14 @@ export default async function NotFound() {
404
</h1>
<p className="px-6 text-center font-mono text-base md:px-0 md:text-xl">
- {/* Looks Like You Took a Wrong Turn at the Interface. <br className="hidden md:inline" />
- Let's Get You Back on Track */}
- {t('message')}
+ Page not found, sus
</p>
</div>
{randomChallengeSlug !== null ? (
<div className="flex flex-col gap-4">
<a href="/explore">
<Button className="w-56" variant="default" size="lg">
- {t('explore')}
+ Go to explore
</Button>
</a>
<a href={`/challenge/${randomChallengeSlug}`}>
@@ -53,7 +48,7 @@ export default async function NotFound() {
size="lg"
className="fancy-border-gradient bg-background relative mx-auto flex w-56 gap-4 border-none"
>
- {t('luck')}
+ I'm feeling lucky
</Button>
</a>
</div>
@@ -61,7 +56,7 @@ export default async function NotFound() {
<div>
<a href="/">
<Button variant="default" size="lg">
- {t('home')}
+ Go to home
</Button>
</a>
</div>
diff --git a/apps/web/src/app/[locale]/page.tsx b/apps/web/src/app/page.tsx
similarity index 56%
rename from apps/web/src/app/[locale]/page.tsx
rename to apps/web/src/app/page.tsx
index d44e6fde..e8a20475 100644
--- a/apps/web/src/app/[locale]/page.tsx
+++ b/apps/web/src/app/page.tsx
@@ -1,18 +1,10 @@
-import { setStaticParamsLocale } from 'next-international/server';
import { Footsies } from '~/components/footsies';
import { Community } from './_components/community/community';
import { Features } from './_components/features';
import { Hero } from './_components/hero';
import { NewsletterBanner } from './_components/newsletter-banner';
-import { getStaticParams } from '~/locales/server';
-
-export function generateStaticParams() {
- return getStaticParams();
-}
-
-export default async function Index({ params: { locale } }: { params: { locale: string } }) {
- setStaticParamsLocale(locale);
+export default async function Index() {
return (
<>
<Hero />
diff --git a/apps/web/src/app/problem-explorer.hooks.tsx b/apps/web/src/app/problem-explorer.hooks.tsx
index 3237db69..98f642f5 100644
--- a/apps/web/src/app/problem-explorer.hooks.tsx
+++ b/apps/web/src/app/problem-explorer.hooks.tsx
@@ -3,7 +3,7 @@ import { createContext, useState, useContext } from 'react';
import type {
AllChallenges,
ChallengesByTagOrDifficulty,
-} from '~/app/[locale]/explore/_components/explore.action';
+} from '~/app/explore/_components/explore.action';
import {
getChallengesAndTitle,
type ChallengeType,
diff --git a/apps/web/src/app/[locale]/providers.tsx b/apps/web/src/app/providers.tsx
similarity index 94%
rename from apps/web/src/app/[locale]/providers.tsx
rename to apps/web/src/app/providers.tsx
index 4e3c3b0f..0ee8eecc 100644
--- a/apps/web/src/app/[locale]/providers.tsx
+++ b/apps/web/src/app/providers.tsx
@@ -7,7 +7,7 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import { ThemeProvider } from 'next-themes';
import React, { Suspense } from 'react';
import { Toolbar } from '~/components/toolbar';
-import { FeatureFlagProvider } from '../feature-flag-provider';
+import { FeatureFlagProvider } from './feature-flag-provider';
interface Props {
children: React.ReactNode;
diff --git a/apps/web/src/app/[locale]/settings/_components/edit-profile-tab.tsx b/apps/web/src/app/settings/_components/edit-profile-tab.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/settings/_components/edit-profile-tab.tsx
rename to apps/web/src/app/settings/_components/edit-profile-tab.tsx
diff --git a/apps/web/src/app/[locale]/settings/_components/schema.ts b/apps/web/src/app/settings/_components/schema.ts
similarity index 100%
rename from apps/web/src/app/[locale]/settings/_components/schema.ts
rename to apps/web/src/app/settings/_components/schema.ts
diff --git a/apps/web/src/app/[locale]/settings/_components/settings-skeleton.tsx b/apps/web/src/app/settings/_components/settings-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/settings/_components/settings-skeleton.tsx
rename to apps/web/src/app/settings/_components/settings-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/settings/_components/settings.action.ts b/apps/web/src/app/settings/_components/settings.action.ts
similarity index 100%
rename from apps/web/src/app/[locale]/settings/_components/settings.action.ts
rename to apps/web/src/app/settings/_components/settings.action.ts
diff --git a/apps/web/src/app/[locale]/settings/_components/settings.tsx b/apps/web/src/app/settings/_components/settings.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/settings/_components/settings.tsx
rename to apps/web/src/app/settings/_components/settings.tsx
diff --git a/apps/web/src/app/[locale]/settings/error.tsx b/apps/web/src/app/settings/error.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/settings/error.tsx
rename to apps/web/src/app/settings/error.tsx
diff --git a/apps/web/src/app/[locale]/settings/loading.tsx b/apps/web/src/app/settings/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/settings/loading.tsx
rename to apps/web/src/app/settings/loading.tsx
diff --git a/apps/web/src/app/[locale]/settings/page.tsx b/apps/web/src/app/settings/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/settings/page.tsx
rename to apps/web/src/app/settings/page.tsx
diff --git a/apps/web/src/app/[locale]/tracks/[slug]/error.tsx b/apps/web/src/app/tracks/[slug]/error.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/[slug]/error.tsx
rename to apps/web/src/app/tracks/[slug]/error.tsx
diff --git a/apps/web/src/app/[locale]/tracks/[slug]/loading.tsx b/apps/web/src/app/tracks/[slug]/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/[slug]/loading.tsx
rename to apps/web/src/app/tracks/[slug]/loading.tsx
diff --git a/apps/web/src/app/[locale]/tracks/[slug]/page.tsx b/apps/web/src/app/tracks/[slug]/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/[slug]/page.tsx
rename to apps/web/src/app/tracks/[slug]/page.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/SkeletonTrack.tsx b/apps/web/src/app/tracks/_components/SkeletonTrack.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/SkeletonTrack.tsx
rename to apps/web/src/app/tracks/_components/SkeletonTrack.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/enroll-button.tsx b/apps/web/src/app/tracks/_components/enroll-button.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/enroll-button.tsx
rename to apps/web/src/app/tracks/_components/enroll-button.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/enrolled-track-card-skeleton.tsx b/apps/web/src/app/tracks/_components/enrolled-track-card-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/enrolled-track-card-skeleton.tsx
rename to apps/web/src/app/tracks/_components/enrolled-track-card-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/enrolled-tracks-skeleton.tsx b/apps/web/src/app/tracks/_components/enrolled-tracks-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/enrolled-tracks-skeleton.tsx
rename to apps/web/src/app/tracks/_components/enrolled-tracks-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/index.tsx b/apps/web/src/app/tracks/_components/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/index.tsx
rename to apps/web/src/app/tracks/_components/index.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsx b/apps/web/src/app/tracks/_components/personal-track-card.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsx
rename to apps/web/src/app/tracks/_components/personal-track-card.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-card-soon.tsx b/apps/web/src/app/tracks/_components/track-card-soon.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track-card-soon.tsx
rename to apps/web/src/app/tracks/_components/track-card-soon.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-card.tsx b/apps/web/src/app/tracks/_components/track-card.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track-card.tsx
rename to apps/web/src/app/tracks/_components/track-card.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-challenge-card.tsx b/apps/web/src/app/tracks/_components/track-challenge-card.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track-challenge-card.tsx
rename to apps/web/src/app/tracks/_components/track-challenge-card.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-details-skeleton.tsx b/apps/web/src/app/tracks/_components/track-details-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track-details-skeleton.tsx
rename to apps/web/src/app/tracks/_components/track-details-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-details.tsx b/apps/web/src/app/tracks/_components/track-details.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track-details.tsx
rename to apps/web/src/app/tracks/_components/track-details.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section-carousel.tsx b/apps/web/src/app/tracks/_components/track-enrolled-section-carousel.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track-enrolled-section-carousel.tsx
rename to apps/web/src/app/tracks/_components/track-enrolled-section-carousel.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx b/apps/web/src/app/tracks/_components/track-enrolled-section.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx
rename to apps/web/src/app/tracks/_components/track-enrolled-section.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx b/apps/web/src/app/tracks/_components/track-grid.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track-grid.tsx
rename to apps/web/src/app/tracks/_components/track-grid.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-progress.tsx b/apps/web/src/app/tracks/_components/track-progress.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track-progress.tsx
rename to apps/web/src/app/tracks/_components/track-progress.tsx
diff --git a/apps/web/src/app/[locale]/tracks/_components/track.action.ts b/apps/web/src/app/tracks/_components/track.action.ts
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/_components/track.action.ts
rename to apps/web/src/app/tracks/_components/track.action.ts
diff --git a/apps/web/src/app/[locale]/tracks/loading.tsx b/apps/web/src/app/tracks/loading.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/loading.tsx
rename to apps/web/src/app/tracks/loading.tsx
diff --git a/apps/web/src/app/[locale]/tracks/page.tsx b/apps/web/src/app/tracks/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/tracks/page.tsx
rename to apps/web/src/app/tracks/page.tsx
diff --git a/apps/web/src/app/[locale]/wizard/_components/ChallengeCardEditor.tsx b/apps/web/src/app/wizard/_components/ChallengeCardEditor.tsx
similarity index 96%
rename from apps/web/src/app/[locale]/wizard/_components/ChallengeCardEditor.tsx
rename to apps/web/src/app/wizard/_components/ChallengeCardEditor.tsx
index 3d295fe1..d839b8a0 100644
--- a/apps/web/src/app/[locale]/wizard/_components/ChallengeCardEditor.tsx
+++ b/apps/web/src/app/wizard/_components/ChallengeCardEditor.tsx
@@ -2,8 +2,8 @@
import { useWatch } from 'react-hook-form';
import type { WizardForm } from '.';
-import type { ExploreChallengeData } from '~/app/[locale]/explore/_components/explore.action';
-import { ExploreCard } from '~/app/[locale]/explore/_components/explore-card';
+import type { ExploreChallengeData } from '~/app/explore/_components/explore.action';
+import { ExploreCard } from '~/app/explore/_components/explore-card';
import { TypographyH3 } from '@repo/ui/components/typography/h3';
import { FormControl, FormField, FormItem, FormLabel, FormMessage } from '@repo/ui/components/form';
import { Textarea } from '@repo/ui/components/textarea';
diff --git a/apps/web/src/app/[locale]/wizard/_components/DescriptionEditor.tsx b/apps/web/src/app/wizard/_components/DescriptionEditor.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/_components/DescriptionEditor.tsx
rename to apps/web/src/app/wizard/_components/DescriptionEditor.tsx
diff --git a/apps/web/src/app/[locale]/wizard/_components/NextBack.tsx b/apps/web/src/app/wizard/_components/NextBack.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/_components/NextBack.tsx
rename to apps/web/src/app/wizard/_components/NextBack.tsx
diff --git a/apps/web/src/app/[locale]/wizard/_components/Steps.tsx b/apps/web/src/app/wizard/_components/Steps.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/_components/Steps.tsx
rename to apps/web/src/app/wizard/_components/Steps.tsx
diff --git a/apps/web/src/app/[locale]/wizard/_components/Summary.tsx b/apps/web/src/app/wizard/_components/Summary.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/_components/Summary.tsx
rename to apps/web/src/app/wizard/_components/Summary.tsx
diff --git a/apps/web/src/app/[locale]/wizard/_components/TestCasesEditor.tsx b/apps/web/src/app/wizard/_components/TestCasesEditor.tsx
similarity index 97%
rename from apps/web/src/app/[locale]/wizard/_components/TestCasesEditor.tsx
rename to apps/web/src/app/wizard/_components/TestCasesEditor.tsx
index ff6ac3c4..f6913ec6 100644
--- a/apps/web/src/app/[locale]/wizard/_components/TestCasesEditor.tsx
+++ b/apps/web/src/app/wizard/_components/TestCasesEditor.tsx
@@ -8,7 +8,7 @@ import { TypographyH3 } from '@repo/ui/components/typography/h3';
import type * as monaco from 'monaco-editor';
import dynamic from 'next/dynamic';
import { useCallback, useState } from 'react';
-import { SettingsButton } from '~/app/[locale]/challenge/_components/settings/settings-button';
+import { SettingsButton } from '~/app/challenge/_components/settings/settings-button';
import type { WizardForm } from '.';
const VimStatusBar = dynamic(() => import('@repo/monaco/vim-mode'), {
diff --git a/apps/web/src/app/[locale]/wizard/_components/create.action.ts b/apps/web/src/app/wizard/_components/create.action.ts
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/_components/create.action.ts
rename to apps/web/src/app/wizard/_components/create.action.ts
diff --git a/apps/web/src/app/[locale]/wizard/_components/default-challenge.md b/apps/web/src/app/wizard/_components/default-challenge.md
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/_components/default-challenge.md
rename to apps/web/src/app/wizard/_components/default-challenge.md
diff --git a/apps/web/src/app/[locale]/wizard/_components/default-description.md b/apps/web/src/app/wizard/_components/default-description.md
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/_components/default-description.md
rename to apps/web/src/app/wizard/_components/default-description.md
diff --git a/apps/web/src/app/[locale]/wizard/_components/default-tests.md b/apps/web/src/app/wizard/_components/default-tests.md
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/_components/default-tests.md
rename to apps/web/src/app/wizard/_components/default-tests.md
diff --git a/apps/web/src/app/[locale]/wizard/_components/index.tsx b/apps/web/src/app/wizard/_components/index.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/_components/index.tsx
rename to apps/web/src/app/wizard/_components/index.tsx
diff --git a/apps/web/src/app/[locale]/wizard/error.tsx b/apps/web/src/app/wizard/error.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/error.tsx
rename to apps/web/src/app/wizard/error.tsx
diff --git a/apps/web/src/app/[locale]/wizard/page.tsx b/apps/web/src/app/wizard/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/wizard/page.tsx
rename to apps/web/src/app/wizard/page.tsx
diff --git a/apps/web/src/components/Navigation/index.tsx b/apps/web/src/components/Navigation/index.tsx
index ad126070..ecc61b5b 100644
--- a/apps/web/src/components/Navigation/index.tsx
+++ b/apps/web/src/components/Navigation/index.tsx
@@ -10,7 +10,6 @@ import {
import { Play, Settings, Settings2, User } from '@repo/ui/icons';
import Link from 'next/link';
import { Suspense } from 'react';
-import { getScopedI18n } from '~/locales/server';
import { isAdminOrModerator } from '~/utils/auth-guards';
import { getAllFlags } from '~/utils/feature-flags';
import { Search } from '../search/search';
@@ -34,16 +33,15 @@ export function getAdminUrl() {
export async function Navigation() {
const session = await auth();
const isAdminOrMod = isAdminOrModerator(session);
- const t = await getScopedI18n('navigation');
const featureFlags = await getAllFlags();
const TopSectionLinks = (
<>
- {featureFlags?.enableExplore ? <NavLink title={t('explore')} href="/explore" /> : null}
- {featureFlags?.enableTracks ? <NavLink title={t('tracks')} href="/tracks" /> : null}
+ {featureFlags?.enableExplore ? <NavLink title="Explore" href="/explore" /> : null}
+ {featureFlags?.enableTracks ? <NavLink title="Tracks" href="/tracks" /> : null}
{featureFlags?.enableHolidayEvent ? (
<div className="flex items-center gap-1">
- <NavLink title={t('advent')} href="/aot-2023" />
+ <NavLink title="Advent of TypeScript" href="/aot-2023" />
<Badge className="h-4 bg-red-600 px-1.5" variant="default">
New
</Badge>
diff --git a/apps/web/src/components/Navigation/nav-wrapper.tsx b/apps/web/src/components/Navigation/nav-wrapper.tsx
index 3f14fefa..6bd8f0e2 100644
--- a/apps/web/src/components/Navigation/nav-wrapper.tsx
+++ b/apps/web/src/components/Navigation/nav-wrapper.tsx
@@ -1,7 +1,7 @@
'use client';
import { usePathname } from 'next/navigation';
-import { useFullscreenSettingsStore } from '~/app/[locale]/challenge/_components/fullscreen';
+import { useFullscreenSettingsStore } from '~/app/challenge/_components/fullscreen';
export function NavWrapper({ children }: { children: React.ReactNode }) {
const { fssettings } = useFullscreenSettingsStore();
diff --git a/apps/web/src/components/Navigation/problem-explorer-nav.tsx b/apps/web/src/components/Navigation/problem-explorer-nav.tsx
index 82bcd130..a462dcf9 100644
--- a/apps/web/src/components/Navigation/problem-explorer-nav.tsx
+++ b/apps/web/src/components/Navigation/problem-explorer-nav.tsx
@@ -2,7 +2,7 @@
import { useChallengeRouteData } from '~/app/challenge-route-data.hook';
import { useProblemExplorerContext } from '~/app/problem-explorer.hooks';
import { useMemo } from 'react';
-import { ExploreDrawer } from '~/app/[locale]/challenge/_components/explore-drawer';
+import { ExploreDrawer } from '~/app/challenge/_components/explore-drawer';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
import Link from 'next/link';
import { ChevronLeft, ChevronRight } from '@repo/ui/icons';
diff --git a/apps/web/src/components/Navigation/problem-explorer-track-nav.tsx b/apps/web/src/components/Navigation/problem-explorer-track-nav.tsx
index 202fcdfe..0e9e3117 100644
--- a/apps/web/src/components/Navigation/problem-explorer-track-nav.tsx
+++ b/apps/web/src/components/Navigation/problem-explorer-track-nav.tsx
@@ -2,7 +2,7 @@
import { useChallengeRouteData } from '~/app/challenge-route-data.hook';
import { useProblemExplorerContext } from '~/app/problem-explorer.hooks';
import { useMemo } from 'react';
-import { ExploreDrawer } from '~/app/[locale]/challenge/_components/explore-drawer';
+import { ExploreDrawer } from '~/app/challenge/_components/explore-drawer';
import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';
import Link from 'next/link';
import { ChevronLeft, ChevronRight, Swords } from '@repo/ui/icons';
diff --git a/apps/web/src/components/cookie-banner.tsx b/apps/web/src/components/cookie-banner.tsx
index 3ef0db69..f5506aa9 100644
--- a/apps/web/src/components/cookie-banner.tsx
+++ b/apps/web/src/components/cookie-banner.tsx
@@ -3,10 +3,8 @@
import { useEffect, useState } from 'react';
import { Button } from '@repo/ui/components/button';
import { useLocalStorage } from '~/utils/useLocalStorage';
-import { useScopedI18n } from '~/locales/client';
export const CookieBanner = () => {
- const t = useScopedI18n('cookieBanner');
const [mounted, setMounted] = useState(false);
const [showCookieBanner, setShowCookieBanner] = useLocalStorage('cookie-banner', 'true');
@@ -20,14 +18,17 @@ export const CookieBanner = () => {
return (
<div className="animate-in fade-in bg-background fixed bottom-0 right-0 z-[999] flex w-full flex-col gap-2 rounded-b-none rounded-t-2xl border p-4 sm:bottom-2 sm:right-2 sm:w-[330px] sm:rounded-2xl">
- <div className="text-center text-xl font-semibold">{t('title')}</div>
- <div className="text-sm">{t('message')}</div>
+ <div className="text-center text-xl font-semibold">TypeHero Uses Cookies 🍪</div>
+ <div className="text-sm">
+ We use cookies to improve your experience. By using TypeHero, you consent to our use of
+ cookies.
+ </div>
<div className="flex gap-2 self-end">
<Button variant="outline" size="sm" onClick={() => setShowCookieBanner('false')}>
- {t('close')}
+ Close
</Button>
<Button variant="outline" size="sm" onClick={() => setShowCookieBanner('false')}>
- {t('ok')}
+ Ok
</Button>
</div>
</div>
diff --git a/apps/web/src/components/footsies.tsx b/apps/web/src/components/footsies.tsx
index 50005405..dc8f078e 100644
--- a/apps/web/src/components/footsies.tsx
+++ b/apps/web/src/components/footsies.tsx
@@ -1,16 +1,14 @@
import Link from 'next/link';
import { Binary, Github, Twitter } from '@repo/ui/icons';
import { ThemeButton } from './Navigation/theme-button';
-import { getScopedI18n } from '~/locales/server';
export async function Footsies() {
- const t = await getScopedI18n('footsies');
-
return (
<footer className="flex flex-col items-center gap-2 px-8 pb-12 text-sm font-light sm:px-16 sm:pb-20 sm:pt-6 md:px-0 md:py-12">
<div className="container flex flex-col-reverse justify-between gap-2 md:flex-row md:items-end">
<span>
- {t('built', { icon: <Binary className="inline-block h-5 w-5 text-[#31bdc6]" /> })}
+ Built with <Binary className="inline-block h-5 w-5 text-[#31bdc6]" /> by the Trash Devs \n
+ community.
</span>
<div className="flex items-center gap-2">
<ThemeButton />
@@ -21,7 +19,7 @@ export async function Footsies() {
className="group rounded-lg p-2"
href="https://github.com/typehero/typehero"
>
- <span className="sr-only">{t('onGithub')}</span>
+ <span className="sr-only">TypeHero on GitHub</span>
<Github className="h-5 w-5 duration-150 group-hover:scale-110 group-hover:fill-black dark:group-hover:fill-white" />
</a>
<a
@@ -30,7 +28,7 @@ export async function Footsies() {
className="group rounded-lg p-2"
href="https://twitter.com/typeheroapp"
>
- <span className="sr-only">{t('onTwitter')}</span>
+ <span className="sr-only">TypeHero on Twitter</span>
<Twitter className="h-5 w-5 duration-150 group-hover:scale-110 group-hover:fill-black dark:group-hover:fill-white" />
</a>
</div>
@@ -41,14 +39,14 @@ export async function Footsies() {
href="/privacy"
className="dark:hover:text-primary-foreground transition-colors duration-300 hover:text-neutral-900 hover:underline"
>
- {t('PrivacyPolicy')}
+ Privacy Policy
</Link>{' '}
|{' '}
<Link
href="/tos"
className="dark:hover:text-primary-foreground transition-colors duration-300 hover:text-neutral-900 hover:underline"
>
- {t('TermsOfService')}
+ Terms of Service
</Link>
</span>
<span>
diff --git a/apps/web/src/locales/client.ts b/apps/web/src/locales/client.ts
deleted file mode 100644
index d9e2c0ee..00000000
--- a/apps/web/src/locales/client.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createI18nClient } from 'next-international/client';
-
-export const { useI18n, useScopedI18n, I18nProviderClient } = createI18nClient({
- en: () => import('./en'),
- fr: () => import('./fr'),
-});
diff --git a/apps/web/src/locales/en.ts b/apps/web/src/locales/en.ts
deleted file mode 100644
index 0cbd09ee..00000000
--- a/apps/web/src/locales/en.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-export default {
- '404.explore': 'Go to explore',
- '404.home': 'Go to home',
- '404.luck': "I'm feeling lucky",
- '404.message': 'Page not found, sus',
- 'cookieBanner.close': 'Close',
- 'cookieBanner.message':
- 'We use cookies to improve your experience. By using TypeHero, you consent to our use of\ncookies.',
- 'cookieBanner.ok': 'Ok',
- 'cookieBanner.title': 'TypeHero Uses Cookies 🍪',
- 'general.contribute.github': 'Contribute on GitHub',
- 'general.difficulty.BEGINNER': 'Beginner',
- 'general.difficulty.EASY': 'Easy',
- 'general.difficulty.EVENT': 'Event',
- 'general.difficulty.EXTREME': 'Extreme',
- 'general.difficulty.HARD': 'Hard',
- 'general.difficulty.MEDIUM': 'Medium',
- 'general.join.discord': 'Join the Discord',
- 'landing.community.byDevforDev': 'By developers, for developers',
- 'landing.community.description':
- 'TypeHero is free, open-source, and built by developers just like you. These are some\nof the contributors who made this possible so far.',
- 'landing.community.title': 'Built by the community',
- 'landing.features.badge': 'many features, wow',
- 'landing.features.collaborativeEnvironment.description':
- 'Developers can share solutions and engage in discussions through commenting',
- 'landing.features.collaborativeEnvironment.title': 'Collaborative Environment',
- 'landing.features.curatedTracks.description':
- 'Tracks are curated challenges, spanning various topics and difficulty levels, to advance your TypeScript skills.',
- 'landing.features.curatedTracks.title': 'Learning Tracks',
- 'landing.features.description': 'All you need to become a TypeScript menace',
- 'landing.features.imageCard.description':
- 'Engage in TypeScript challenges to strengthen your grasp of the type system and advanced features',
- 'landing.features.imageCard.title': 'Type Challenges',
- 'landing.features.title': "What's in TypeHero?",
- 'landing.hero.challenge1.prompt': 'Implement a union type of number and string',
- 'landing.hero.challenge1.title': 'Implement a union type of number and string',
- 'landing.hero.challenge2.prompt': 'Convert a string literal to a number',
- 'landing.hero.challenge2.title': 'String to Number',
- 'landing.hero.description':
- 'Connect, collaborate, and grow with a community of TypeScript developers. Elevate your skills through interactive coding challenges, discussions, and knowledge sharing',
- 'landing.hero.explore': 'Explore',
- 'landing.hero.ghStars': 'Star us on GitHub',
- 'landing.hero.start_exploring': 'Start exploring',
- 'landing.newsletter.description':
- 'Interested in the future of the platform? Be the first to get updates on content, new\nfeatures, and more!',
- 'landing.newsletter.subscribe': 'Subscribe to our newsletter',
- 'landing.newsletter.title': 'Stay Informed',
- 'navigation.advent': 'Advent of TypeScript',
- 'navigation.explore': 'Explore',
- 'navigation.tracks': 'Tracks',
- 'footsies.TermsOfService': 'Terms of Service',
- 'footsies.PrivacyPolicy': 'Privacy Policy',
- 'footsies.built': 'Built with {icon} by the Trash Devs \n community.',
- 'footsies.onGithub': 'TypeHero on GitHub',
- 'footsies.onTwitter': 'TypeHero on Twitter',
-} as const;
diff --git a/apps/web/src/locales/fr.ts b/apps/web/src/locales/fr.ts
deleted file mode 100644
index 31d58e1b..00000000
--- a/apps/web/src/locales/fr.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-export default {
- '404.explore': 'Aller à explorer',
- '404.home': "Aller à la page d'accueil",
- '404.luck': " J'ai de la chance",
- '404.message': 'Page non trouvée, sus',
- 'cookieBanner.close': 'Close',
- 'cookieBanner.message':
- 'We use cookies to improve your experience. By using TypeHero, you consent to our use of\ncookies.',
- 'cookieBanner.ok': 'Ok',
- 'cookieBanner.title': 'TypeHero Uses Cookies 🍪',
- 'general.contribute.github': 'Contribute on GitHub',
- 'general.difficulty.BEGINNER': 'Beginner',
- 'general.difficulty.EASY': 'Easy',
- 'general.difficulty.EVENT': 'Event',
- 'general.difficulty.EXTREME': 'Extreme',
- 'general.difficulty.HARD': 'Hard',
- 'general.difficulty.MEDIUM': 'Medium',
- 'general.join.discord': 'Join the Discord',
- 'landing.community.byDevforDev': 'By developers, for developers',
- 'landing.community.description':
- 'TypeHero is free, open-source, and built by developers just like you. These are some\nof the contributors who made this possible so far.',
- 'landing.community.title': 'Built by the community',
- 'landing.features.badge': 'Nombreuses foncionalité, wow',
- 'landing.features.collaborativeEnvironment.description':
- 'Developers can share solutions and engage in discussions through commenting',
- 'landing.features.collaborativeEnvironment.title': 'Collaborative Environment',
- 'landing.features.curatedTracks.description':
- 'Tracks are curated challenges, spanning various topics and difficulty levels, to advance your TypeScript skills.',
- 'landing.features.curatedTracks.title': 'Learning Tracks',
- 'landing.features.description':
- 'Tout ce dont vous avez besoin pour devenir une menace TypeScript',
- 'landing.features.imageCard.description':
- 'Engage in TypeScript challenges to strengthen your grasp of the type system and advanced features',
- 'landing.features.imageCard.title': 'Type Challenges',
- 'landing.features.title': "Qu'est-ce que TypeHero ?",
- 'landing.hero.challenge1.prompt': 'Implement a union type of number and string',
- 'landing.hero.challenge1.title': 'Implement a union type of number and string',
- 'landing.hero.challenge2.prompt': 'Convert a string literal to a number',
- 'landing.hero.challenge2.title': 'String to Number',
- 'landing.hero.description':
- 'Connectez-vous, collaborez et évoluez avec une communauté de développeurs TypeScript. Améliorez vos compétences grâce à des défis de codage interactifs, des discussions et le partage des connaissances.',
- 'landing.hero.explore': 'Explorer',
- 'landing.hero.ghStars': 'Étoile nous sur GitHub',
- 'landing.hero.start_exploring': 'Commencez à explorer',
- 'landing.newsletter.description':
- 'Interested in the future of the platform? Be the first to get updates on content, new\nfeatures, and more!',
- 'landing.newsletter.subscribe': 'Subscribe to our newsletter',
- 'landing.newsletter.title': 'Stay Informed',
- 'navigation.advent': 'Advent of TypeScript',
- 'navigation.explore': 'Explorer',
- 'navigation.tracks': 'Tracks',
- 'footsies.TermsOfService': 'Terms of Service',
- 'footsies.PrivacyPolicy': 'Privacy Policy',
- 'footsies.built': 'Built with {icon} by the Trash Devs \n community.',
- 'footsies.onGithub': 'TypeHero on GitHub',
- 'footsies.onTwitter': 'TypeHero on Twitter',
-} as const;
diff --git a/apps/web/src/locales/server.ts b/apps/web/src/locales/server.ts
deleted file mode 100644
index 7fd25c65..00000000
--- a/apps/web/src/locales/server.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { createI18nServer } from 'next-international/server';
-
-export const { getI18n, getScopedI18n, getStaticParams } = createI18nServer({
- en: () => import('./en'),
- fr: () => import('./fr'),
-});
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
deleted file mode 100644
index 2f9d95da..00000000
--- a/apps/web/src/middleware.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { createI18nMiddleware } from 'next-international/middleware';
-import { type NextRequest } from 'next/server';
-
-const I18nMiddleware = createI18nMiddleware({
- locales: ['en', 'fr'],
- defaultLocale: 'en',
- urlMappingStrategy: 'rewrite',
-});
-
-export function middleware(req: NextRequest) {
- const { VERCEL_ENV: vercelEnv, STAGING: staging = false } = process.env;
-
- // skip blocking the request if local or preview or staging
- if (!vercelEnv || staging) {
- return I18nMiddleware(req);
- }
-
- return I18nMiddleware(req);
-}
-
-export const config = {
- matcher: ['/((?!api|static|.*\\..*|_next|favicon.ico|robots.txt).*)'],
-};
diff --git a/package.json b/package.json
index 42d501c9..ddb2d345 100644
--- a/package.json
+++ b/package.json
@@ -58,5 +58,8 @@
"@vercel/[email protected]": "patches/@[email protected]"
}
+ },
+ "dependencies": {
+ "pnpm": "^8.15.8"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a6b30171..2c1736f5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,6 +21,10 @@ patchedDependencies:
importers:
.:
+ dependencies:
+ pnpm:
+ specifier: ^8.15.8
+ version: 8.15.9
devDependencies:
ajv:
specifier: ^8.12.0
@@ -343,9 +347,6 @@ importers:
next:
specifier: 14.0.1
- next-international:
- specifier: 1.1.4
- version: 1.1.4
next-themes:
specifier: ^0.2.1
@@ -490,7 +491,7 @@ importers:
version: link:../db
next-auth:
specifier: 5.0.0-beta.4
- version: 5.0.0-beta.4([email protected])([email protected])
+ version: 5.0.0-beta.4([email protected])([email protected])
devDependencies:
'@repo/lint':
specifier: workspace:*
@@ -570,7 +571,7 @@ importers:
version: 1.3.3
'@monaco-editor/react':
specifier: ^4.5.1
- version: 4.5.1(patch_hash=xep4qb27qzc6gvlhv2fxe3r2ka)([email protected])([email protected])
+ version: 4.5.1(patch_hash=xep4qb27qzc6gvlhv2fxe3r2ka)([email protected])([email protected])
'@repo/ui':
specifier: workspace:^
version: link:../ui
@@ -591,10 +592,10 @@ importers:
version: 0.4.0(patch_hash=j3oqxjoadtct3pc6tokddngzsm)
next:
specifier: 14.0.1
next-themes:
specifier: ^0.2.1
prettier:
specifier: ^3.1.1
version: 3.1.1
@@ -625,67 +626,67 @@ importers:
dependencies:
'@radix-ui/react-alert-dialog':
specifier: ^1.0.4
'@radix-ui/react-avatar':
specifier: ^1.0.3
'@radix-ui/react-checkbox':
specifier: ^1.0.4
'@radix-ui/react-dialog':
specifier: ^1.0.4
'@radix-ui/react-dropdown-menu':
specifier: ^2.0.5
'@radix-ui/react-label':
specifier: ^2.0.2
'@radix-ui/react-navigation-menu':
specifier: ^1.1.3
'@radix-ui/react-popover':
specifier: ^1.0.6
'@radix-ui/react-progress':
specifier: ^1.0.3
'@radix-ui/react-radio-group':
specifier: 1.1.3
'@radix-ui/react-scroll-area':
specifier: ^1.0.4
'@radix-ui/react-select':
specifier: ^1.2.2
'@radix-ui/react-separator':
specifier: ^1.0.3
'@radix-ui/react-slot':
specifier: ^1.0.2
version: 1.0.2(@types/[email protected])([email protected])
'@radix-ui/react-switch':
specifier: ^1.0.3
'@radix-ui/react-tabs':
specifier: ^1.0.4
'@radix-ui/react-toast':
specifier: ^1.1.4
'@radix-ui/react-toggle':
specifier: ^1.0.3
'@radix-ui/react-tooltip':
specifier: ^1.0.6
'@repo/db':
specifier: workspace:*
version: link:../db
'@tanstack/react-table':
specifier: ^8.9.3
class-variance-authority:
specifier: ^0.7.0
version: 0.7.0
@@ -697,7 +698,7 @@ importers:
version: 0.260.0([email protected])
next-themes:
specifier: ^0.2.1
react:
specifier: ^18.2.0
version: 18.2.0
@@ -2335,7 +2336,7 @@ packages:
'@floating-ui/core': 1.3.1
dev: false
resolution: {integrity: sha512-rZtAmSht4Lry6gdhAJDrCp/6rKN7++JnL1/Anbr/DdeyYXQPxvg/ivrbYvJulbRf4vL8b212suwMM2lxbv+RQA==}
peerDependencies:
react: '>=16.8.0'
@@ -2343,7 +2344,7 @@ packages:
dependencies:
'@floating-ui/dom': 1.4.5
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
@@ -2533,6 +2534,22 @@ packages:
dev: false
patched: true
+ /@monaco-editor/[email protected](patch_hash=xep4qb27qzc6gvlhv2fxe3r2ka)([email protected])([email protected]):
+ resolution: {integrity: sha512-NNDFdP+2HojtNhCkRfE6/D6ro6pBNihaOzMbGK84lNWzRu+CfBjwzGt4jmnqimLuqp5yE5viHS2vi+QOAnD5FQ==}
+ peerDependencies:
+ monaco-editor: '>= 0.25.0 < 1'
+ react: ^16.8.0 || ^17.0.0 || ^18.0.0
+ react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+ peerDependenciesMeta:
+ monaco-editor:
+ optional: true
+ dependencies:
+ '@monaco-editor/loader': 1.3.3
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ dev: false
+ patched: true
+
/@netlify/[email protected]:
resolution: {integrity: sha512-sRFYBaz6dJP1MdUtk/5QNmshhg5UDmB+DUssmH6v9WUG85MrwyExEfGfJA5eClXATjXm0coTvO5nLAlyCpK7QQ==}
engines: {node: '>=14.0.0'}
@@ -3121,7 +3138,7 @@ packages:
'@babel/runtime': 7.22.6
dev: false
resolution: {integrity: sha512-jbfBCRlKYlhbitueOAv7z74PXYeIQmWpKwm3jllsdkw7fGWNkxqP3v0nY9WmOzcPqpQuoorNtvViBgL46n5gVg==}
peerDependencies:
'@types/react': '*'
@@ -3138,15 +3155,15 @@ packages:
'@radix-ui/primitive': 1.0.1
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-dialog': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-dialog': 1.0.4(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==}
peerDependencies:
'@types/react': '*'
@@ -3160,13 +3177,13 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.22.6
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-9ToF7YNex3Ste45LrAeTlKtONI9yVRt/zOS158iilIkW5K/Apeyb/TUQlcEFTEFvWr8Kzdi2ZYrm1/suiXPajQ==}
peerDependencies:
'@types/react': '*'
@@ -3181,15 +3198,15 @@ packages:
dependencies:
'@babel/runtime': 7.22.6
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-layout-effect': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-CBuGQa52aAYnADZVt/KBQzXrwx6TqnlwtcIPGtVt5JkkzQwMOLJjPukimhfKEr4GQNd43C+djUh5Ikopj8pSLg==}
peerDependencies:
'@types/react': '*'
@@ -3206,17 +3223,17 @@ packages:
'@radix-ui/primitive': 1.0.1
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-previous': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-size': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==}
peerDependencies:
'@types/react': '*'
@@ -3232,11 +3249,11 @@ packages:
'@babel/runtime': 7.22.6
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
@@ -3346,6 +3363,39 @@ packages:
react-remove-scroll: 2.5.5(@types/[email protected])([email protected])
dev: false
+ resolution: {integrity: sha512-hJtRy/jPULGQZceSAP2Re6/4NpKo8im6V8P2hUqZsdFiSL8l35kYsw3qbRI6Ay5mQd2+wlLqje770eq+RJ3yZg==}
+ peerDependencies:
+ '@types/react': '*'
+ '@types/react-dom': '*'
+ react: ^16.8 || ^17.0 || ^18.0
+ react-dom: ^16.8 || ^17.0 || ^18.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ '@types/react-dom':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.22.6
+ '@radix-ui/primitive': 1.0.1
+ '@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-focus-guards': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-focus-scope': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-portal': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
+ '@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
+ '@types/react': 18.2.20
+ aria-hidden: 1.2.3
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ react-remove-scroll: 2.5.5(@types/[email protected])([email protected])
+ dev: false
+
resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==}
peerDependencies:
@@ -3401,7 +3451,31 @@ packages:
react-dom: 18.2.0([email protected])
dev: false
+ resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==}
+ peerDependencies:
+ '@types/react': '*'
+ '@types/react-dom': '*'
+ react: ^16.8 || ^17.0 || ^18.0
+ react-dom: ^16.8 || ^17.0 || ^18.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ '@types/react-dom':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.22.6
+ '@radix-ui/primitive': 1.0.1
+ '@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-use-escape-keydown': 1.0.3(@types/[email protected])([email protected])
+ '@types/react': 18.2.20
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ dev: false
+
resolution: {integrity: sha512-xdOrZzOTocqqkCkYo8yRPCib5OkTkqN7lqNCdxwPOdE466DOaNl4N8PkUIlsXthQvW5Wwkd+aEmWpfWlBoDPEw==}
peerDependencies:
'@types/react': '*'
@@ -3419,12 +3493,12 @@ packages:
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-menu': 2.0.5(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-menu': 2.0.5(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
@@ -3487,6 +3561,28 @@ packages:
react-dom: 18.2.0([email protected])
dev: false
+ resolution: {integrity: sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==}
+ peerDependencies:
+ '@types/react': '*'
+ '@types/react-dom': '*'
+ react: ^16.8 || ^17.0 || ^18.0
+ react-dom: ^16.8 || ^17.0 || ^18.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ '@types/react-dom':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.22.6
+ '@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
+ '@types/react': 18.2.20
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ dev: false
+
resolution: {integrity: sha512-Q6iAB/U7Tq3NTolBBQbHTgclPmGWE3OlktGGqrClPozSw4vkQ1DfQAOtzgRPecKsMdJINE05iaoDUG8tRzCBjw==}
peerDependencies:
@@ -3512,7 +3608,7 @@ packages:
react: 18.2.0
dev: false
resolution: {integrity: sha512-N5ehvlM7qoTLx7nWPodsPYPgMzA5WM8zZChQg8nyFJKnDO5WHdba1vv5/H6IO5LtJMfD2Q3wh1qHFGNtK0w3bQ==}
peerDependencies:
'@types/react': '*'
@@ -3526,13 +3622,13 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.22.6
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-Gw4f9pwdH+w5w+49k0gLjN0PfRDHvxmAgG16AbyJZ7zhwZ6PBHKtWohvnSwfusfnK3L68dpBREHpVkj8wEM7ZA==}
peerDependencies:
'@types/react': '*'
@@ -3547,29 +3643,29 @@ packages:
dependencies:
'@babel/runtime': 7.22.6
'@radix-ui/primitive': 1.0.1
- '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-direction': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-focus-guards': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-focus-scope': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-focus-scope': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-popper': 1.1.2(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-portal': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-roving-focus': 1.0.4(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-popper': 1.1.2(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-portal': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-roving-focus': 1.0.4(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
aria-hidden: 1.2.3
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
react-remove-scroll: 2.5.5(@types/[email protected])([email protected])
dev: false
resolution: {integrity: sha512-x4Uv0N47ABx3/frJazYXxvMpZeKJe0qmRIgQ2o3lhTqnTVg+CaZfVVO4nQLn3QJcDkTz8icElKffhFng47XIBA==}
peerDependencies:
'@types/react': '*'
@@ -3584,25 +3680,25 @@ packages:
dependencies:
'@babel/runtime': 7.22.6
'@radix-ui/primitive': 1.0.1
- '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-direction': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-layout-effect': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-previous': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-visually-hidden': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-visually-hidden': 1.0.3(@types/[email protected])([email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-cZ4defGpkZ0qTRtlIBzJLSzL6ht7ofhhW4i1+pkemjV1IKXm0wgCRnee154qlV6r9Ttunmh2TNZhMfV2bavUyA==}
peerDependencies:
'@types/react': '*'
@@ -3619,24 +3715,24 @@ packages:
'@radix-ui/primitive': 1.0.1
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-focus-guards': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-focus-scope': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-focus-scope': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-popper': 1.1.2(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-portal': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-popper': 1.1.2(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-portal': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
aria-hidden: 1.2.3
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
react-remove-scroll: 2.5.5(@types/[email protected])([email protected])
dev: false
resolution: {integrity: sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==}
peerDependencies:
'@types/react': '*'
@@ -3650,11 +3746,11 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.22.6
- '@floating-ui/react-dom': 2.0.1([email protected])([email protected])
- '@radix-ui/react-arrow': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@floating-ui/react-dom': 2.0.1([email protected])([email protected])
+ '@radix-ui/react-arrow': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-layout-effect': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-rect': 1.0.1(@types/[email protected])([email protected])
@@ -3662,7 +3758,7 @@ packages:
'@radix-ui/rect': 1.0.1
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
@@ -3698,6 +3794,26 @@ packages:
react-dom: 18.2.0([email protected])
dev: false
+ resolution: {integrity: sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==}
+ peerDependencies:
+ '@types/react': '*'
+ '@types/react-dom': '*'
+ react: ^16.8 || ^17.0 || ^18.0
+ react-dom: ^16.8 || ^17.0 || ^18.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ '@types/react-dom':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.22.6
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@types/react': 18.2.20
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ dev: false
+
resolution: {integrity: sha512-A+6XEvN01NfVWiKu38ybawfHsBjWum42MRPnEuqPsBZ4eV7e/7K321B5VgYMPv3Xx5An6o1/l9ZuDBgmcmWK3w==}
peerDependencies:
@@ -3733,6 +3849,27 @@ packages:
react-dom: 18.2.0([email protected])
dev: false
+ resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==}
+ peerDependencies:
+ '@types/react': '*'
+ '@types/react-dom': '*'
+ react: ^16.8 || ^17.0 || ^18.0
+ react-dom: ^16.8 || ^17.0 || ^18.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ '@types/react-dom':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.22.6
+ '@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
+ '@radix-ui/react-use-layout-effect': 1.0.1(@types/[email protected])([email protected])
+ '@types/react': 18.2.20
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ dev: false
+
resolution: {integrity: sha512-EyXe6mnRlHZ8b6f4ilTDrXmkLShICIuOTTj0GX4w1rp+wSxf3+TD05u1UOITC8VsJ2a9nwHvdXtOXEOl0Cw/zQ==}
peerDependencies:
@@ -3766,7 +3903,27 @@ packages:
react-dom: 18.2.0([email protected])
dev: false
+ resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==}
+ peerDependencies:
+ '@types/react': '*'
+ '@types/react-dom': '*'
+ react: ^16.8 || ^17.0 || ^18.0
+ react-dom: ^16.8 || ^17.0 || ^18.0
+ peerDependenciesMeta:
+ '@types/react':
+ optional: true
+ '@types/react-dom':
+ optional: true
+ dependencies:
+ '@babel/runtime': 7.22.6
+ '@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
+ '@types/react': 18.2.20
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ dev: false
+
resolution: {integrity: sha512-5G6Om/tYSxjSeEdrb1VfKkfZfn/1IlPWd731h2RfPuSbIfNUgfqAwbKfJCg/PP6nuUCTrYzalwHSpSinoWoCag==}
peerDependencies:
'@types/react': '*'
@@ -3781,13 +3938,13 @@ packages:
dependencies:
'@babel/runtime': 7.22.6
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-x+yELayyefNeKeTx4fjK6j99Fs6c4qKm3aY38G3swQVTN6xMpsrbigC0uHs2L//g8q4qR7qOcww8430jJmi2ag==}
peerDependencies:
'@types/react': '*'
@@ -3805,18 +3962,18 @@ packages:
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-direction': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-roving-focus': 1.0.4(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-roving-focus': 1.0.4(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-previous': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-size': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==}
peerDependencies:
'@types/react': '*'
@@ -3831,20 +3988,20 @@ packages:
dependencies:
'@babel/runtime': 7.22.6
'@radix-ui/primitive': 1.0.1
- '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-direction': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-OIClwBkwPG+FKvC4OMTRaa/3cfD069nkKFFL/TQzRzaO42Ce5ivKU9VMKgT7UU6UIkjcQqKBrDOIzWtPGw6e6w==}
peerDependencies:
'@types/react': '*'
@@ -3863,16 +4020,16 @@ packages:
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-direction': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-layout-effect': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-zI7McXr8fNaSrUY9mZe4x/HC0jTLY9fWNhO1oLWYMQGDXuV4UCivIGTxwioSzO0ZCYX9iSLyWmAh/1TOmX3Cnw==}
peerDependencies:
'@types/react': '*'
@@ -3888,31 +4045,31 @@ packages:
'@babel/runtime': 7.22.6
'@radix-ui/number': 1.0.1
'@radix-ui/primitive': 1.0.1
- '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-direction': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-focus-guards': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-focus-scope': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-focus-scope': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-popper': 1.1.2(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-portal': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-popper': 1.1.2(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-portal': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-layout-effect': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-previous': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-visually-hidden': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-visually-hidden': 1.0.3(@types/[email protected])([email protected])([email protected])
'@types/react': 18.2.20
aria-hidden: 1.2.3
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
react-remove-scroll: 2.5.5(@types/[email protected])([email protected])
dev: false
resolution: {integrity: sha512-itYmTy/kokS21aiV5+Z56MZB54KrhPgn6eHDKkFeOLR34HMN2s8PaN47qZZAGnvupcjxHaFZnW4pQEh0BvvVuw==}
peerDependencies:
'@types/react': '*'
@@ -3926,10 +4083,10 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.22.6
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
@@ -3957,7 +4114,7 @@ packages:
react: 18.2.0
dev: false
resolution: {integrity: sha512-mxm87F88HyHztsI7N+ZUmEoARGkC22YVW5CaC+Byc+HRpuvCrOBPTAnXgf+tZ/7i0Sg/eOePGdMhUKhPaQEqow==}
peerDependencies:
'@types/react': '*'
@@ -3974,16 +4131,16 @@ packages:
'@radix-ui/primitive': 1.0.1
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-previous': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-size': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-egZfYY/+wRNCflXNHx+dePvnz9FbmssDTJBtgRfDY7e8SE5oIo3Py2eCB1ckAbh1Q7cQ/6yJZThJ++sgbxibog==}
peerDependencies:
'@types/react': '*'
@@ -4001,16 +4158,16 @@ packages:
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-direction': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-roving-focus': 1.0.4(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-roving-focus': 1.0.4(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-wf+fc8DOywrpRK3jlPlWVe+ELYGHdKDaaARJZNuUTWyWYq7+ANCFLp4rTjZ/mcGkJJQ/vZ949Zis9xxEpfq9OA==}
peerDependencies:
'@types/react': '*'
@@ -4025,23 +4182,23 @@ packages:
dependencies:
'@babel/runtime': 7.22.6
'@radix-ui/primitive': 1.0.1
- '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-collection': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-portal': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-portal': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-use-layout-effect': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-visually-hidden': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-visually-hidden': 1.0.3(@types/[email protected])([email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==}
peerDependencies:
'@types/react': '*'
@@ -4056,14 +4213,14 @@ packages:
dependencies:
'@babel/runtime': 7.22.6
'@radix-ui/primitive': 1.0.1
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
resolution: {integrity: sha512-DmNFOiwEc2UDigsYj6clJENma58OelxD24O4IODoZ+3sQc3Zb+L8w1EP+y9laTuKCLAysPw4fD6/v0j4KNV8rg==}
peerDependencies:
'@types/react': '*'
@@ -4080,18 +4237,18 @@ packages:
'@radix-ui/primitive': 1.0.1
'@radix-ui/react-compose-refs': 1.0.1(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-dismissable-layer': 1.0.4(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-id': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-popper': 1.1.2(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-portal': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-presence': 1.0.1(@types/[email protected])(@types/[email protected])([email protected])([email protected])
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-popper': 1.1.2(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-portal': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-presence': 1.0.1(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@radix-ui/react-slot': 1.0.2(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.0.1(@types/[email protected])([email protected])
- '@radix-ui/react-visually-hidden': 1.0.3(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-visually-hidden': 1.0.3(@types/[email protected])([email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
@@ -4234,7 +4391,7 @@ packages:
react: 18.2.0
dev: false
resolution: {integrity: sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==}
peerDependencies:
'@types/react': '*'
@@ -4248,10 +4405,10 @@ packages:
optional: true
dependencies:
'@babel/runtime': 7.22.6
- '@radix-ui/react-primitive': 1.0.3(@types/[email protected])(@types/[email protected])([email protected])([email protected])
+ '@radix-ui/react-primitive': 1.0.3(@types/[email protected])([email protected])([email protected])
'@types/react': 18.2.20
react: 18.2.0
- react-dom: 18.2.0([email protected])
+ react-dom: 18.3.1([email protected])
dev: false
/@radix-ui/[email protected]:
@@ -4855,6 +5012,18 @@ packages:
react-dom: 18.2.0([email protected])
dev: false
+ resolution: {integrity: sha512-Ng9rdm3JPoSCi6cVZvANsYnF+UoGVRxflMb270tVj0+LjeT/ZtZ9ckxF6oLPLcKesza6VKBqtdF9mQ+vaz24Aw==}
+ engines: {node: '>=12'}
+ peerDependencies:
+ react: '>=16'
+ react-dom: '>=16'
+ dependencies:
+ '@tanstack/table-core': 8.9.3
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ dev: false
+
/@tanstack/[email protected]:
resolution: {integrity: sha512-NpHZBoHTfqyJk0m/s/+CSuAiwtebhYK90mDuf5eylTvgViNOujiaOaxNDxJkQQAsVvHWZftUGAx1EfO1rkKtLg==}
engines: {node: '>=12'}
@@ -9114,10 +9283,6 @@ packages:
has: 1.0.3
side-channel: 1.0.4
- resolution: {integrity: sha512-tajBCAHo4I0LIFlmQ9ZWfjMWVyRffzuvfbXCd6ssFt5u1Zw15DN0UBpVTItXdNa1ls+cpQt3Yw8+TxsfGF8JcA==}
- dev: false
-
resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
dependencies:
@@ -10475,7 +10640,7 @@ packages:
resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
resolution: {integrity: sha512-vgocjvwPA8gxd/zrIP/vr9lJ/HeNe+C56lPP1D3sdyenHt8KncQV6ro7q0xCsDp1fcOKx7WAWVZH5o8aMxDzgw==}
peerDependencies:
next: ^14
@@ -10486,16 +10651,8 @@ packages:
optional: true
dependencies:
'@auth/core': 0.19.0
- react: 18.2.0
- dev: false
-
- resolution: {integrity: sha512-peIJXXEC5lM7zZONCgN1uUxCkIHpSW1pZuHoRTp9ND14K7CDdHajDMz9RTxVCmQUGWXSaqruM6XVAuq4d+Gpxg==}
- dependencies:
- client-only: 0.0.1
- international-types: 0.8.1
- server-only: 0.0.1
+ react: 18.3.1
dev: false
@@ -10510,6 +10667,18 @@ packages:
react-dom: 18.2.0([email protected])
dev: false
+ resolution: {integrity: sha512-B+AKNfYNIzh0vqQQKqQItTS8evEouKD7H5Hj3kmuPERwddR2TxvDSFZuTj6T7Jfn1oyeUyJMydPl1Bkxkh0W7A==}
+ peerDependencies:
+ next: '*'
+ react: '*'
+ react-dom: '*'
+ dependencies:
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ dev: false
+
resolution: {integrity: sha512-s4YaLpE4b0gmb3ggtmpmV+wt+lPRuGtANzojMQ2+gmBpgX9w5fTbjsy6dXByBuENsdCX5pukZH/GxdFgO62+pA==}
engines: {node: '>=18.17.0'}
@@ -10549,6 +10718,84 @@ packages:
- babel-plugin-macros
dev: false
+ resolution: {integrity: sha512-s4YaLpE4b0gmb3ggtmpmV+wt+lPRuGtANzojMQ2+gmBpgX9w5fTbjsy6dXByBuENsdCX5pukZH/GxdFgO62+pA==}
+ engines: {node: '>=18.17.0'}
+ hasBin: true
+ peerDependencies:
+ '@opentelemetry/api': ^1.1.0
+ react: ^18.2.0
+ react-dom: ^18.2.0
+ sass: ^1.3.0
+ peerDependenciesMeta:
+ '@opentelemetry/api':
+ optional: true
+ sass:
+ optional: true
+ dependencies:
+ '@next/env': 14.0.1
+ '@swc/helpers': 0.5.2
+ busboy: 1.6.0
+ caniuse-lite: 1.0.30001522
+ postcss: 8.4.31
+ react: 18.2.0
+ react-dom: 18.3.1([email protected])
+ styled-jsx: 5.1.1(@babel/[email protected])([email protected])
+ watchpack: 2.4.0
+ optionalDependencies:
+ '@next/swc-darwin-arm64': 14.0.1
+ '@next/swc-darwin-x64': 14.0.1
+ '@next/swc-linux-arm64-gnu': 14.0.1
+ '@next/swc-linux-arm64-musl': 14.0.1
+ '@next/swc-linux-x64-gnu': 14.0.1
+ '@next/swc-linux-x64-musl': 14.0.1
+ '@next/swc-win32-arm64-msvc': 14.0.1
+ '@next/swc-win32-ia32-msvc': 14.0.1
+ '@next/swc-win32-x64-msvc': 14.0.1
+ transitivePeerDependencies:
+ - '@babel/core'
+ - babel-plugin-macros
+ dev: false
+
+ resolution: {integrity: sha512-s4YaLpE4b0gmb3ggtmpmV+wt+lPRuGtANzojMQ2+gmBpgX9w5fTbjsy6dXByBuENsdCX5pukZH/GxdFgO62+pA==}
+ engines: {node: '>=18.17.0'}
+ hasBin: true
+ peerDependencies:
+ '@opentelemetry/api': ^1.1.0
+ react: ^18.2.0
+ react-dom: ^18.2.0
+ sass: ^1.3.0
+ peerDependenciesMeta:
+ '@opentelemetry/api':
+ optional: true
+ sass:
+ optional: true
+ dependencies:
+ '@next/env': 14.0.1
+ '@swc/helpers': 0.5.2
+ busboy: 1.6.0
+ caniuse-lite: 1.0.30001522
+ postcss: 8.4.31
+ react: 18.3.1
+ react-dom: 18.3.1([email protected])
+ styled-jsx: 5.1.1([email protected])
+ watchpack: 2.4.0
+ optionalDependencies:
+ '@next/swc-darwin-arm64': 14.0.1
+ '@next/swc-darwin-x64': 14.0.1
+ '@next/swc-linux-arm64-gnu': 14.0.1
+ '@next/swc-linux-arm64-musl': 14.0.1
+ '@next/swc-linux-x64-gnu': 14.0.1
+ '@next/swc-linux-x64-musl': 14.0.1
+ '@next/swc-win32-arm64-msvc': 14.0.1
+ '@next/swc-win32-ia32-msvc': 14.0.1
+ '@next/swc-win32-x64-msvc': 14.0.1
+ transitivePeerDependencies:
+ - '@babel/core'
+ - babel-plugin-macros
+ dev: false
+
resolution: {integrity: sha512-pODv2kEEzZSDQR+1UMXbGyNgMedUDq/qUomtiAnQKQvLy52VGlecXO1xDfH3i0kP1yKEcKTnWsx1TAF5gHM7xQ==}
engines: {node: ^16.11.0 || >=17.0.0}
@@ -11156,6 +11403,12 @@ packages:
engines: {node: '>=4'}
dev: false
+ resolution: {integrity: sha512-SZQ0ydj90aJ5Tr9FUrOyXApjOrzuW7Fee13pDzL0e1E6ypjNXP0AHDHw20VLw4BO3M1XhQHkyik6aBYWa72fgQ==}
+ engines: {node: '>=16.14'}
+ hasBin: true
+ dev: false
+
resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
engines: {node: '>=14.0.0'}
@@ -11535,6 +11788,26 @@ packages:
scheduler: 0.23.0
dev: false
+ resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
+ peerDependencies:
+ react: ^18.3.1
+ dependencies:
+ loose-envify: 1.4.0
+ react: 18.2.0
+ scheduler: 0.23.2
+ dev: false
+
+ resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
+ peerDependencies:
+ react: ^18.3.1
+ dependencies:
+ loose-envify: 1.4.0
+ react: 18.3.1
+ scheduler: 0.23.2
+ dev: false
+
resolution: {integrity: sha512-6dWoFJwycbuFfw/iKMcl+RdAOAOHDiF11KWYhNDRN/OkUt+Di5qsZHwA0OwsVnu9y135gkHpTw9DJA+WzCeR9w==}
engines: {node: '>=12.22.0'}
@@ -11758,6 +12031,13 @@ packages:
loose-envify: 1.4.0
dev: false
+ resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
+ engines: {node: '>=0.10.0'}
+ dependencies:
+ loose-envify: 1.4.0
+ dev: false
+
resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
dependencies:
@@ -12199,6 +12479,12 @@ packages:
loose-envify: 1.4.0
dev: false
+ resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
+ dependencies:
+ loose-envify: 1.4.0
+ dev: false
+
resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==}
engines: {node: '>= 10.13.0'}
@@ -12607,6 +12893,23 @@ packages:
react: 18.2.0
dev: false
+ resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}
+ engines: {node: '>= 12.0.0'}
+ peerDependencies:
+ '@babel/core': '*'
+ babel-plugin-macros: '*'
+ react: '>= 16.8.0 || 17.x.x || ^18.0.0-0'
+ peerDependenciesMeta:
+ '@babel/core':
+ optional: true
+ babel-plugin-macros:
+ optional: true
+ dependencies:
+ client-only: 0.0.1
+ react: 18.3.1
+ dev: false
+
resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}
dev: false