) => {
);
};
-const BackgroundContainer = (props: ComponentProps<"div">) => {
+const BackgroundContainer = (props: ComponentPropsWithoutRef<"div">) => {
return (
{
- return null;
+import { NewExerciseForm } from "./_components/newExerciseForm/newExerciseForm";
+import { getServerAuthSession } from "@/server/auth";
+import { redirect } from "next/navigation";
+import { createSSRHelper } from "@/trpc/server";
+import { HydrationBoundary, dehydrate } from "@tanstack/react-query";
+import { AllExercisesTimeline } from "./_components/allExercisesTimeline/allExercisesTimeline";
+import { MonthlyExercisesTimeline } from "./_components/monthlyExercisesTimeline/monthlyExercisesTimeline";
+
+const Page = async () => {
+ const session = await getServerAuthSession();
+
+ if (!session?.user.id) {
+ return redirect("/");
+ }
+
+ const helpers = await createSSRHelper();
+ await helpers.exercise.all.prefetch();
+
+ return (
+ <>
+
+
+
+
+
+
+ );
};
export default Page;
diff --git a/src/app/dashboard/timelineContainer.tsx b/src/app/dashboard/timelineContainer.tsx
deleted file mode 100644
index 216c11d3..00000000
--- a/src/app/dashboard/timelineContainer.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { cn } from "@/lib/utils";
-import type { ComponentProps } from "react";
-
-export const TimelineContainer = (props: ComponentProps<"div">) => {
- return (
-
- );
-};
diff --git a/src/app/header.tsx b/src/app/header.tsx
index 29d09c35..faedcfe4 100644
--- a/src/app/header.tsx
+++ b/src/app/header.tsx
@@ -453,10 +453,7 @@ export const Header = () => {
const pathname = usePathname().split("/");
const showExecisesPath = pathname[1] === "exercises";
- const showDashboardPath =
- pathname[1] === "dashboard" ||
- pathname[1] === "dashboard-new" ||
- showExecisesPath;
+ const showDashboardPath = pathname[1] === "dashboard" || showExecisesPath;
const exerciseId = pathname[2];
return (
diff --git a/src/app/page.tsx b/src/app/page.tsx
index a4932b13..4f214f00 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,15 +6,6 @@ import { ArrowRight, GripVertical, MoreHorizontal, Tag } from "lucide-react";
import Link from "next/link";
import type { ComponentProps, ComponentPropsWithoutRef } from "react";
import { twMerge } from "tailwind-merge";
-import { TimelineContainer } from "./dashboard/timelineContainer";
-import { GridItem } from "./dashboard/_grid/gridItem";
-import { LineGraph } from "./dashboard/_graphs/lineGraph";
-import { GridLayout } from "./dashboard/_grid/gridLayout";
-import { Badge } from "@/components/ui/badge";
-import { RadarGraph } from "./dashboard/_graphs/radarGraph";
-import { RandomFacts } from "./dashboard/_graphs/randomFacts";
-import { HeatmapGraph } from "./dashboard/_graphs/heatmapGraph";
-import { prepareHeatmapData } from "./dashboard/_graphs/heatmapUtils";
import { mockExercises } from "@/lib/mock-data";
import {
Tooltip,
@@ -26,6 +17,15 @@ import { ExerciseDetailsProvider } from "./exercises/[id]/@exerciseDetails/exerc
import { ExerciseGraphCard } from "./exercises/[id]/@exerciseDetails/_graph/exerciseGraphCard";
import { ExerciseTableCard } from "./exercises/[id]/@exerciseDetails/_table/exerciseTableCard";
import { exerciseTableColumnsWithoutActions } from "./exercises/[id]/@exerciseDetails/_table/_table/columns";
+import { Badge } from "@/components/ui/badge";
+import { GridLayout } from "./dashboard/_components/grid/gridLayout";
+import { GridItem } from "./dashboard/_components/grid/gridItem";
+import { LineGraph } from "./dashboard/_components/graphs/lineGraph";
+import { RadarGraph } from "./dashboard/_components/graphs/radarGraph";
+import { HeatmapGraph } from "./dashboard/_components/graphs/heatmapGraph";
+import { prepareHeatmapData } from "./dashboard/_components/graphs/heatmapUtils";
+import { RandomFacts } from "./dashboard/_components/graphs/randomFacts";
+import { Timeline } from "./dashboard/_components/timeline";
const HomePage = async () => {
await redirectIfSignedIn();
@@ -110,7 +110,7 @@ const FeatureOne = () => {
breakdown of your achievements each month .
-
+
+