Skip to content

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

Added cache and removed skeleton + small refactoring (#727)

Amanuel Odichoa514d9556bc0
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/index.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/_components/index.tsx
similarity index 98%
rename from apps/web/src/app/[locale]/challenge/[id]/submissions/_components/index.tsx
rename to apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/_components/index.tsx
index 19c0206c..3fb2145e 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/index.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/_components/index.tsx
@@ -5,7 +5,7 @@ import clsx from 'clsx';
import Link from 'next/link';
import { useMemo, useState } from 'react';
import NoSubmissions from './nosubmissions';
-import type { ChallengeSubmissions } from '~/app/[locale]/challenge/[id]/submissions/getChallengeSubmissions';
+import type { ChallengeSubmissions } from '~/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/getChallengeSubmissions';
import { getRelativeTime } from '~/utils/relativeTime';
interface Props {
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/nosubmissions.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/_components/nosubmissions.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[id]/submissions/_components/nosubmissions.tsx
rename to apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/_components/nosubmissions.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/_components/overview.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsx
rename to apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/_components/overview.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/submissions-skeleton.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/_components/submissions-skeleton.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[id]/submissions/_components/submissions-skeleton.tsx
rename to apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/_components/submissions-skeleton.tsx
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/getChallengeSubmissions.ts b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/getChallengeSubmissions.ts
similarity index 100%
rename from apps/web/src/app/[locale]/challenge/[id]/submissions/getChallengeSubmissions.ts
rename to apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/getChallengeSubmissions.ts
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/page.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/page.tsx
similarity index 69%
rename from apps/web/src/app/[locale]/challenge/[id]/submissions/page.tsx
rename to apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/page.tsx
index 3a03f2b8..170d63a8 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/page.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/page.tsx
@@ -2,6 +2,7 @@ import { getServerAuthSession } from '@repo/auth/server';
import { notFound } from 'next/navigation';
import { Submissions } from './_components';
import { getChallengeSubmissions } from './getChallengeSubmissions';
+import { withUnstableCache } from '~/utils/withUnstableCache';
interface Props {
params: {
@@ -16,7 +17,12 @@ export const metadata = {
export default async function SubmissionPage({ params: { id } }: Props) {
const session = await getServerAuthSession();
- const submissions = await getChallengeSubmissions(session?.user.id ?? '', id);
+ const submissions = await withUnstableCache({
+ fn: getChallengeSubmissions,
+ args: [session?.user.id ?? '', id],
+ keys: ['all-challenge-submissions'],
+ tags: [`${id}-challenge-submissions`],
+ });
if (!submissions) {
return notFound();
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/save-submission.action.ts b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/save-submission.action.ts
similarity index 74%
rename from apps/web/src/app/[locale]/challenge/[id]/submissions/save-submission.action.ts
rename to apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/save-submission.action.ts
index 0d905f58..0e93261c 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/save-submission.action.ts
+++ b/apps/web/src/app/[locale]/challenge/[id]/submissions/[[...catchAll]]/save-submission.action.ts
@@ -1,5 +1,6 @@
'use server';
import { prisma } from '@repo/db';
+import { revalidateTag } from 'next/cache';
export async function saveSubmission(
challengeId: number,
@@ -15,4 +16,5 @@ export async function saveSubmission(
isSuccessful,
},
});
+ revalidateTag(`${challengeId}-challenge-submissions`);
}
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/_components/submission-skeleton.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/_components/submission-skeleton.tsx
deleted file mode 100644
index 6044b057..00000000
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/_components/submission-skeleton.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Skeleton } from '@repo/ui/components/skeleton';
-
-export function SubmissionSkeleton() {
- return (
- <div className="mb-0 flex flex-col space-y-4 px-4 pt-3">
- {/* ALL / ACCEPTED / REJECTED */}
- <div className="align-center prose-invert prose-h3:text-xl flex">
- <Skeleton className="mr-2 h-8 w-1/6 rounded-lg bg-zinc-300 dark:bg-zinc-700" />
- <Skeleton className="mr-2 h-8 w-1/6 rounded-lg bg-zinc-300 dark:bg-zinc-700" />
- <Skeleton className="mr-2 h-8 w-1/6 rounded-lg bg-zinc-300 dark:bg-zinc-700" />
- </div>
- {/* DIVIDER */}
- <div className="flex flex-col">
- <Skeleton className=" h-1 rounded-lg bg-zinc-300 dark:bg-zinc-700" />
- </div>
- {/* SUBMISSIONS */}
- <div className="prose-invert prose-h3:text-xl flex flex-col space-y-2">
- <Skeleton className="h-12 rounded-lg bg-zinc-300 dark:bg-zinc-700" />
- </div>
- </div>
- );
-}
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/error.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/error.tsx
deleted file mode 100644
index 46ad8d8a..00000000
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/error.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-'use client'; // Error components must be Client Components
-
-import { Button } from '@repo/ui/components/button';
-import { Text } from '@repo/ui/components/typography/typography';
-
-export default function Error({ reset }: { reset: () => void }) {
- return (
- <div className="container flex h-full flex-col items-center justify-center">
- <Text className="mb-6" intent="h2">
- Something went wrong!
- </Text>
- <Button
- onClick={
- // Attempt to recover by trying to re-render the segment
- () => reset()
- }
- >
- Try again
- </Button>
- </div>
- );
-}
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/loading.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/loading.tsx
deleted file mode 100644
index 90bad1b1..00000000
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/loading.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { SubmissionSkeleton as default } from './_components/submission-skeleton';
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/page.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/page.tsx
deleted file mode 100644
index 1e355895..00000000
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/[submissionId]/page.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { notFound } from 'next/navigation';
-import { getServerAuthSession } from '@repo/auth/server';
-import { getChallengeSubmissions } from '../getChallengeSubmissions';
-import { Submissions } from '../_components';
-
-interface Props {
- params: {
- id: string;
- submissionId: string;
- };
-}
-
-export default async function SubmissionPage({ params: { id, submissionId } }: Props) {
- const session = await getServerAuthSession();
- const submissions = await getChallengeSubmissions(session?.user.id ?? '', id);
-
- const isValidSubmission = submissions.some(
- (submission) => submission.id === Number(submissionId),
- );
-
- if (!isValidSubmission) {
- return notFound();
- }
-
- return <Submissions submissions={submissions} />;
-}
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/loading.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/loading.tsx
deleted file mode 100644
index 85cd9ea0..00000000
--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/loading.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { SubmissionsSkeleton as default } from './_components/submissions-skeleton';
diff --git a/apps/web/src/app/[locale]/challenge/[id]/wrapper.tsx b/apps/web/src/app/[locale]/challenge/[id]/wrapper.tsx
index c67dfcbc..b739b26e 100644
--- a/apps/web/src/app/[locale]/challenge/[id]/wrapper.tsx
+++ b/apps/web/src/app/[locale]/challenge/[id]/wrapper.tsx
@@ -3,8 +3,8 @@ import { useSelectedLayoutSegments } from 'next/navigation';
import { CodePanel } from '@repo/monaco';
import { useSession } from '@repo/auth/react';
import type { ChallengeRouteData } from './getChallengeRouteData';
-import { SubmissionOverview } from './submissions/_components/overview';
-import { saveSubmission } from './submissions/save-submission.action';
+import { SubmissionOverview } from './submissions/[[...catchAll]]/_components/overview';
+import { saveSubmission } from './submissions/[[...catchAll]]/save-submission.action';
import { FullscreenButton } from '../_components/fullscreen';
import { ResetEditorButton } from '../_components/reset-editor-button';
import { EditorShortcutsButton } from '../_components/editor-shortcuts/editor-shortcuts-button';