Skip to content

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

chore: move context closer to challenges (#1492)

bautistaaa2ba963b43edd
diff --git a/apps/web/src/app/all-challenges.hook.tsx b/apps/web/src/app/challenge/[slug]/all-challenges.hook.tsx
similarity index 92%
rename from apps/web/src/app/all-challenges.hook.tsx
rename to apps/web/src/app/challenge/[slug]/all-challenges.hook.tsx
index 23149372..051404eb 100644
--- a/apps/web/src/app/all-challenges.hook.tsx
+++ b/apps/web/src/app/challenge/[slug]/all-challenges.hook.tsx
@@ -1,6 +1,6 @@
'use client';
import { createContext, useState, useContext } from 'react';
-import { type AllChallenges } from './explore/_components/explore.action';
+import type { AllChallenges } from '~/app/explore/_components/explore.action';
interface AllChallengesContextType {
allChallenges: AllChallenges;
diff --git a/apps/web/src/app/challenge-route-data.hook.tsx b/apps/web/src/app/challenge/[slug]/challenge-route-data.hook.tsx
similarity index 91%
rename from apps/web/src/app/challenge-route-data.hook.tsx
rename to apps/web/src/app/challenge/[slug]/challenge-route-data.hook.tsx
index a17208fd..5c939725 100644
--- a/apps/web/src/app/challenge-route-data.hook.tsx
+++ b/apps/web/src/app/challenge/[slug]/challenge-route-data.hook.tsx
@@ -1,6 +1,6 @@
'use client';
import { createContext, useState, useContext, type PropsWithChildren } from 'react';
-import type { GetCurrentChallengeType } from './challenge/[slug]/getChallengeRouteData';
+import type { GetCurrentChallengeType } from './getChallengeRouteData';
interface ChallengeRouteDataContextType {
currentChallenge: GetCurrentChallengeType | null;
diff --git a/apps/web/src/app/context-providers.tsx b/apps/web/src/app/challenge/[slug]/context-providers.tsx
similarity index 77%
rename from apps/web/src/app/context-providers.tsx
rename to apps/web/src/app/challenge/[slug]/context-providers.tsx
index 05c1bf8b..50e4908f 100644
--- a/apps/web/src/app/context-providers.tsx
+++ b/apps/web/src/app/challenge/[slug]/context-providers.tsx
@@ -1,10 +1,10 @@
import React from 'react';
-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';
+import { getAllChallenges } from '~/app/explore/_components/explore.action';
+import { isEnrolledInAnyTrack } from './getChallengeRouteData';
+import { AllChallengesProvider } from './all-challenges.hook';
+import { ProblemExplorerProvider } from '~/app/problem-explorer.hooks';
+import { ChallegeRouteDataProvider } from './challenge-route-data.hook';
interface Props {
children: React.ReactNode;
diff --git a/apps/web/src/app/challenge/[slug]/layout.tsx b/apps/web/src/app/challenge/[slug]/layout.tsx
index a2ff1e6d..754bee59 100644
--- a/apps/web/src/app/challenge/[slug]/layout.tsx
+++ b/apps/web/src/app/challenge/[slug]/layout.tsx
@@ -5,6 +5,7 @@ import { ForceRenderUntilClient } from '@repo/ui/components/force-render-until-c
import { getChallengeRouteData } from './getChallengeRouteData';
import { TrackVisibiltyProvider } from './use-track-visibility.hook';
+import { ContextProviders } from './context-providers';
export default async function LayoutData({
children,
@@ -18,11 +19,13 @@ export default async function LayoutData({
return (
<ForceRenderUntilClient>
- <TrackVisibiltyProvider>
- <ChallengeLayoutWrapper challenge={challenge} track={track}>
- {children}
- </ChallengeLayoutWrapper>
- </TrackVisibiltyProvider>
+ <ContextProviders>
+ <TrackVisibiltyProvider>
+ <ChallengeLayoutWrapper challenge={challenge} track={track}>
+ {children}
+ </ChallengeLayoutWrapper>
+ </TrackVisibiltyProvider>
+ </ContextProviders>
</ForceRenderUntilClient>
);
}
diff --git a/apps/web/src/app/challenge/_components/challenge-layout-wrapper.tsx b/apps/web/src/app/challenge/_components/challenge-layout-wrapper.tsx
index 6f8ba15b..4a64ea49 100644
--- a/apps/web/src/app/challenge/_components/challenge-layout-wrapper.tsx
+++ b/apps/web/src/app/challenge/_components/challenge-layout-wrapper.tsx
@@ -5,7 +5,7 @@ import { ChallengeLayout, MOBILE_BREAKPOINT } from './challenge-layout';
import usePanelAdjustments from './usePanelAdjustments';
import { LeftWrapper } from '../[slug]/left-wrapper';
import { Wrapper } from '../[slug]/wrapper';
-import { useChallengeRouteData } from '~/app/challenge-route-data.hook';
+import { useChallengeRouteData } from '../[slug]/challenge-route-data.hook';
interface Props {
challenge: ChallengeRouteData['challenge'];
diff --git a/apps/web/src/app/challenge/_components/sheet-content-custom.tsx b/apps/web/src/app/challenge/_components/sheet-content-custom.tsx
index 4662aaaf..f33f067d 100644
--- a/apps/web/src/app/challenge/_components/sheet-content-custom.tsx
+++ b/apps/web/src/app/challenge/_components/sheet-content-custom.tsx
@@ -4,12 +4,12 @@ import { ChevronRight } from '@repo/ui/icons';
import { TrackChallenge } from '../../tracks/_components/track-challenge-card';
import { TrackProgress } from '../../tracks/_components/track-progress';
import { SelectDropdown } from './select-dropdown';
-import { useChallengeRouteData } from '~/app/challenge-route-data.hook';
import { useProblemExplorerContext } from '~/app/problem-explorer.hooks';
-import { useAllChallengesContext } from '~/app/all-challenges.hook';
import { useLocalStorage } from '~/utils/useLocalStorage';
import { getChallengesAndTitle, type ChallengeType } from '~/app/get-challenges-and-title';
import { useMemo } from 'react';
+import { useChallengeRouteData } from '../[slug]/challenge-route-data.hook';
+import { useAllChallengesContext } from '../[slug]/all-challenges.hook';
export function ExplorerPanel() {
const [, setTrackNameStorage] = useLocalStorage('trackName', 'popular');
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index b1b6a466..74fff7c3 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -5,7 +5,6 @@ import { Navigation } from '~/components/Navigation';
import '../styles/globals.css';
import { OG_URL, tagline } from './metadata';
import { Providers } from './providers';
-import { ContextProviders } from './context-providers';
const inter = Inter({ subsets: ['latin'] });
@@ -60,10 +59,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
<body className={`${inter.className} flex flex-col`}>
<Providers>
<Navigation />
- {/* this is broken and need to fix */}
- <ContextProviders>
- <main className="flex-1">{children}</main>
- </ContextProviders>
+ <main className="flex-1">{children}</main>
<Toaster />
</Providers>
<Analytics />
diff --git a/apps/web/src/components/Navigation/problem-explorer-nav.tsx b/apps/web/src/components/Navigation/problem-explorer-nav.tsx
index a462dcf9..09f6b992 100644
--- a/apps/web/src/components/Navigation/problem-explorer-nav.tsx
+++ b/apps/web/src/components/Navigation/problem-explorer-nav.tsx
@@ -1,11 +1,11 @@
'use client';
-import { useChallengeRouteData } from '~/app/challenge-route-data.hook';
import { useProblemExplorerContext } from '~/app/problem-explorer.hooks';
import { useMemo } from 'react';
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';
+import { useChallengeRouteData } from '~/app/challenge/[slug]/challenge-route-data.hook';
export function ProblemExplorerNav() {
const { currentChallenge } = useChallengeRouteData();
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 0e9e3117..1145fca3 100644
--- a/apps/web/src/components/Navigation/problem-explorer-track-nav.tsx
+++ b/apps/web/src/components/Navigation/problem-explorer-track-nav.tsx
@@ -1,5 +1,4 @@
'use client';
-import { useChallengeRouteData } from '~/app/challenge-route-data.hook';
import { useProblemExplorerContext } from '~/app/problem-explorer.hooks';
import { useMemo } from 'react';
import { ExploreDrawer } from '~/app/challenge/_components/explore-drawer';
@@ -8,6 +7,7 @@ import Link from 'next/link';
import { ChevronLeft, ChevronRight, Swords } from '@repo/ui/icons';
import { cn } from '@repo/ui/cn';
import { Button } from '@repo/ui/components/button';
+import { useChallengeRouteData } from '~/app/challenge/[slug]/challenge-route-data.hook';
interface ProblemExplorerTrackNav {
isCollapsed: boolean;