From 48c7bfa75081e444f7e3779a5a2fde0f7798d1d1 Mon Sep 17 00:00:00 2001
From: AugustinSorel <sorelaugustin@gmail.com>
Date: Wed, 22 May 2024 19:27:13 +0100
Subject: [PATCH] REFACTOR/new dashboard page

---
 drizzle.config.ts                             |   3 +-
 drizzle/0025_gifted_silver_surfer.sql         |   1 +
 drizzle/0026_hard_orphan.sql                  |   1 +
 drizzle/0027_sloppy_firebrand.sql             |   1 +
 drizzle/meta/0025_snapshot.json               | 460 ++++++++++++++++++
 drizzle/meta/0026_snapshot.json               | 460 ++++++++++++++++++
 drizzle/meta/0027_snapshot.json               | 460 ++++++++++++++++++
 drizzle/meta/_journal.json                    |  21 +
 package.json                                  |   1 +
 src/app/dashboard-new/layout.tsx              |  43 --
 src/app/dashboard-new/page.tsx                |  34 --
 src/app/dashboard/@allExercisesGrid/error.tsx |  47 --
 .../@allExercisesGrid/filtersComponent.tsx    | 184 -------
 .../dashboard/@allExercisesGrid/layout.tsx    |  27 -
 .../dashboard/@allExercisesGrid/loading.tsx   |  19 -
 .../optimisticExerciseItem.tsx                |  39 --
 src/app/dashboard/@allExercisesGrid/page.tsx  | 201 --------
 .../@allExercisesGrid/sortableGrid.tsx        | 172 -------
 .../dashboard/@exercisesByMonthGrid/error.tsx |  48 --
 .../@exercisesByMonthGrid/loading.tsx         |  34 --
 .../dashboard/@exercisesByMonthGrid/page.tsx  | 159 ------
 .../@newExerciseForm/newExerciseNameForm.tsx  |  88 ----
 src/app/dashboard/@newExerciseForm/page.tsx   |   7 -
 .../allExercisesTimeline/allExercisesGrid.tsx |  16 +-
 .../allExercisesTimeline.tsx                  |   0
 .../exerciseMuscleGroups.tsx                  |   0
 .../allExercisesTimeline/filters.tsx          |   0
 .../allExercisesTimeline/sortableGrid.tsx     |   0
 .../graphs}/heatmapGraph.tsx                  |   0
 .../graphs}/heatmapUtils.ts                   |   0
 .../graphs}/lineGraph.tsx                     |   0
 .../graphs}/radarGraph.tsx                    |   0
 .../graphs}/randomFacts.tsx                   |   0
 .../{_grid => _components/grid}/gridItem.tsx  |   0
 .../grid}/gridLayout.tsx                      |   0
 .../modals}/deleteExerciseAlertDialog.tsx     |   0
 .../modals}/updateExerciseNameDialog.tsx      |   0
 .../monthlyExercisesTimeline.tsx              |  20 +-
 .../newExerciseForm/newExerciseForm.tsx       |   0
 .../_components/timeline.tsx                  |   0
 .../_components/useDashboardSearchParams.ts   |   0
 .../_components/useExercises.ts               |   0
 src/app/dashboard/getExercisesWhereClause.ts  |  43 --
 src/app/dashboard/layout.tsx                  |  24 +-
 src/app/dashboard/page.tsx                    |  33 +-
 src/app/dashboard/timelineContainer.tsx       |  14 -
 src/app/header.tsx                            |   5 +-
 src/app/page.tsx                              |  22 +-
 src/db/schema.ts                              |  11 +-
 49 files changed, 1480 insertions(+), 1218 deletions(-)
 create mode 100644 drizzle/0025_gifted_silver_surfer.sql
 create mode 100644 drizzle/0026_hard_orphan.sql
 create mode 100644 drizzle/0027_sloppy_firebrand.sql
 create mode 100644 drizzle/meta/0025_snapshot.json
 create mode 100644 drizzle/meta/0026_snapshot.json
 create mode 100644 drizzle/meta/0027_snapshot.json
 delete mode 100644 src/app/dashboard-new/layout.tsx
 delete mode 100644 src/app/dashboard-new/page.tsx
 delete mode 100644 src/app/dashboard/@allExercisesGrid/error.tsx
 delete mode 100644 src/app/dashboard/@allExercisesGrid/filtersComponent.tsx
 delete mode 100644 src/app/dashboard/@allExercisesGrid/layout.tsx
 delete mode 100644 src/app/dashboard/@allExercisesGrid/loading.tsx
 delete mode 100644 src/app/dashboard/@allExercisesGrid/optimisticExerciseItem.tsx
 delete mode 100644 src/app/dashboard/@allExercisesGrid/page.tsx
 delete mode 100644 src/app/dashboard/@allExercisesGrid/sortableGrid.tsx
 delete mode 100644 src/app/dashboard/@exercisesByMonthGrid/error.tsx
 delete mode 100644 src/app/dashboard/@exercisesByMonthGrid/loading.tsx
 delete mode 100644 src/app/dashboard/@exercisesByMonthGrid/page.tsx
 delete mode 100644 src/app/dashboard/@newExerciseForm/newExerciseNameForm.tsx
 delete mode 100644 src/app/dashboard/@newExerciseForm/page.tsx
 rename src/app/{dashboard-new => dashboard}/_components/allExercisesTimeline/allExercisesGrid.tsx (90%)
 rename src/app/{dashboard-new => dashboard}/_components/allExercisesTimeline/allExercisesTimeline.tsx (100%)
 rename src/app/dashboard/{@allExercisesGrid => _components/allExercisesTimeline}/exerciseMuscleGroups.tsx (100%)
 rename src/app/{dashboard-new => dashboard}/_components/allExercisesTimeline/filters.tsx (100%)
 rename src/app/{dashboard-new => dashboard}/_components/allExercisesTimeline/sortableGrid.tsx (100%)
 rename src/app/dashboard/{_graphs => _components/graphs}/heatmapGraph.tsx (100%)
 rename src/app/dashboard/{_graphs => _components/graphs}/heatmapUtils.ts (100%)
 rename src/app/dashboard/{_graphs => _components/graphs}/lineGraph.tsx (100%)
 rename src/app/dashboard/{_graphs => _components/graphs}/radarGraph.tsx (100%)
 rename src/app/dashboard/{_graphs => _components/graphs}/randomFacts.tsx (100%)
 rename src/app/dashboard/{_grid => _components/grid}/gridItem.tsx (100%)
 rename src/app/dashboard/{_grid => _components/grid}/gridLayout.tsx (100%)
 rename src/app/dashboard/{_modals => _components/modals}/deleteExerciseAlertDialog.tsx (100%)
 rename src/app/dashboard/{_modals => _components/modals}/updateExerciseNameDialog.tsx (100%)
 rename src/app/{dashboard-new => dashboard}/_components/monthlyExercisesTimeline/monthlyExercisesTimeline.tsx (85%)
 rename src/app/{dashboard-new => dashboard}/_components/newExerciseForm/newExerciseForm.tsx (100%)
 rename src/app/{dashboard-new => dashboard}/_components/timeline.tsx (100%)
 rename src/app/{dashboard-new => dashboard}/_components/useDashboardSearchParams.ts (100%)
 rename src/app/{dashboard-new => dashboard}/_components/useExercises.ts (100%)
 delete mode 100644 src/app/dashboard/getExercisesWhereClause.ts
 delete mode 100644 src/app/dashboard/timelineContainer.tsx

diff --git a/drizzle.config.ts b/drizzle.config.ts
index e85917ac..c246563e 100644
--- a/drizzle.config.ts
+++ b/drizzle.config.ts
@@ -3,7 +3,8 @@ import type { Config } from "drizzle-kit";
 export default {
   schema: "./src/db/schema.ts",
   dbCredentials: {
-    connectionString: process.env.DB_URL!,
+    connectionString: "postgres://postgres:postgres@localhost:5432/gym-graphs",
   },
   out: "./drizzle",
+  driver: "pg",
 } satisfies Config;
diff --git a/drizzle/0025_gifted_silver_surfer.sql b/drizzle/0025_gifted_silver_surfer.sql
new file mode 100644
index 00000000..edfe937c
--- /dev/null
+++ b/drizzle/0025_gifted_silver_surfer.sql
@@ -0,0 +1 @@
+ALTER TABLE "exercise" ALTER COLUMN "muscle_groups" SET DEFAULT [];
\ No newline at end of file
diff --git a/drizzle/0026_hard_orphan.sql b/drizzle/0026_hard_orphan.sql
new file mode 100644
index 00000000..2ae86ae5
--- /dev/null
+++ b/drizzle/0026_hard_orphan.sql
@@ -0,0 +1 @@
+ALTER TABLE "exercise" ALTER COLUMN "muscle_groups" SET DEFAULT {};
\ No newline at end of file
diff --git a/drizzle/0027_sloppy_firebrand.sql b/drizzle/0027_sloppy_firebrand.sql
new file mode 100644
index 00000000..ff7791f9
--- /dev/null
+++ b/drizzle/0027_sloppy_firebrand.sql
@@ -0,0 +1 @@
+ALTER TABLE "exercise" ALTER COLUMN "muscle_groups" SET DEFAULT '{}';
\ No newline at end of file
diff --git a/drizzle/meta/0025_snapshot.json b/drizzle/meta/0025_snapshot.json
new file mode 100644
index 00000000..d0503b48
--- /dev/null
+++ b/drizzle/meta/0025_snapshot.json
@@ -0,0 +1,460 @@
+{
+  "version": "5",
+  "dialect": "pg",
+  "id": "81cdace0-e33a-465a-b3f0-3559093b29a7",
+  "prevId": "685d708f-336c-4a19-a7b1-ca11083a3f0f",
+  "tables": {
+    "account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "userId": {
+          "name": "userId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "providerAccountId": {
+          "name": "providerAccountId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_type": {
+          "name": "token_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "session_state": {
+          "name": "session_state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "account_userId_user_id_fk": {
+          "name": "account_userId_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "account_provider_providerAccountId": {
+          "name": "account_provider_providerAccountId",
+          "columns": [
+            "provider",
+            "providerAccountId"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "exercise_grid_position": {
+      "name": "exercise_grid_position",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "exercise_id": {
+          "name": "exercise_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "grid_position": {
+          "name": "grid_position",
+          "type": "serial",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "exercise_grid_position_exercise_id_exercise_id_fk": {
+          "name": "exercise_grid_position_exercise_id_exercise_id_fk",
+          "tableFrom": "exercise_grid_position",
+          "tableTo": "exercise",
+          "columnsFrom": [
+            "exercise_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "exercise_grid_position_user_id_user_id_fk": {
+          "name": "exercise_grid_position_user_id_user_id_fk",
+          "tableFrom": "exercise_grid_position",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "exercise": {
+      "name": "exercise",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "muscle_groups": {
+          "name": "muscle_groups",
+          "type": "muscle_groups[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "[]"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "exercise_user_id_user_id_fk": {
+          "name": "exercise_user_id_user_id_fk",
+          "tableFrom": "exercise",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "exercise_user_id_name_unique": {
+          "name": "exercise_user_id_name_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "user_id",
+            "name"
+          ]
+        }
+      }
+    },
+    "exercise_data": {
+      "name": "exercise_data",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "exercise_id": {
+          "name": "exercise_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_repetitions": {
+          "name": "number_of_repetitions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "weight_lifted": {
+          "name": "weight_lifted",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "done_at": {
+          "name": "done_at",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "exercise_data_exercise_id_exercise_id_fk": {
+          "name": "exercise_data_exercise_id_exercise_id_fk",
+          "tableFrom": "exercise_data",
+          "tableTo": "exercise",
+          "columnsFrom": [
+            "exercise_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "exercise_data_done_at_exercise_id_unique": {
+          "name": "exercise_data_done_at_exercise_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "done_at",
+            "exercise_id"
+          ]
+        }
+      }
+    },
+    "session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "sessionToken": {
+          "name": "sessionToken",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "userId": {
+          "name": "userId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_userId_user_id_fk": {
+          "name": "session_userId_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "verificationToken": {
+      "name": "verificationToken",
+      "schema": "",
+      "columns": {
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "verificationToken_identifier_token": {
+          "name": "verificationToken_identifier_token",
+          "columns": [
+            "identifier",
+            "token"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {
+    "muscle_groups": {
+      "name": "muscle_groups",
+      "values": {
+        "legs": "legs",
+        "chest": "chest",
+        "biceps": "biceps",
+        "triceps": "triceps",
+        "back": "back",
+        "shoulders": "shoulders",
+        "calfs": "calfs",
+        "abs": "abs",
+        "traps": "traps"
+      }
+    }
+  },
+  "schemas": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}
\ No newline at end of file
diff --git a/drizzle/meta/0026_snapshot.json b/drizzle/meta/0026_snapshot.json
new file mode 100644
index 00000000..38d2b1cc
--- /dev/null
+++ b/drizzle/meta/0026_snapshot.json
@@ -0,0 +1,460 @@
+{
+  "version": "5",
+  "dialect": "pg",
+  "id": "51563ec3-f36e-43b8-a180-cf741a2360d9",
+  "prevId": "81cdace0-e33a-465a-b3f0-3559093b29a7",
+  "tables": {
+    "account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "userId": {
+          "name": "userId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "providerAccountId": {
+          "name": "providerAccountId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_type": {
+          "name": "token_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "session_state": {
+          "name": "session_state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "account_userId_user_id_fk": {
+          "name": "account_userId_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "account_provider_providerAccountId": {
+          "name": "account_provider_providerAccountId",
+          "columns": [
+            "provider",
+            "providerAccountId"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "exercise_grid_position": {
+      "name": "exercise_grid_position",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "exercise_id": {
+          "name": "exercise_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "grid_position": {
+          "name": "grid_position",
+          "type": "serial",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "exercise_grid_position_exercise_id_exercise_id_fk": {
+          "name": "exercise_grid_position_exercise_id_exercise_id_fk",
+          "tableFrom": "exercise_grid_position",
+          "tableTo": "exercise",
+          "columnsFrom": [
+            "exercise_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "exercise_grid_position_user_id_user_id_fk": {
+          "name": "exercise_grid_position_user_id_user_id_fk",
+          "tableFrom": "exercise_grid_position",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "exercise": {
+      "name": "exercise",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "muscle_groups": {
+          "name": "muscle_groups",
+          "type": "muscle_groups[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "{}"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "exercise_user_id_user_id_fk": {
+          "name": "exercise_user_id_user_id_fk",
+          "tableFrom": "exercise",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "exercise_user_id_name_unique": {
+          "name": "exercise_user_id_name_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "user_id",
+            "name"
+          ]
+        }
+      }
+    },
+    "exercise_data": {
+      "name": "exercise_data",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "exercise_id": {
+          "name": "exercise_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_repetitions": {
+          "name": "number_of_repetitions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "weight_lifted": {
+          "name": "weight_lifted",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "done_at": {
+          "name": "done_at",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "exercise_data_exercise_id_exercise_id_fk": {
+          "name": "exercise_data_exercise_id_exercise_id_fk",
+          "tableFrom": "exercise_data",
+          "tableTo": "exercise",
+          "columnsFrom": [
+            "exercise_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "exercise_data_done_at_exercise_id_unique": {
+          "name": "exercise_data_done_at_exercise_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "done_at",
+            "exercise_id"
+          ]
+        }
+      }
+    },
+    "session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "sessionToken": {
+          "name": "sessionToken",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "userId": {
+          "name": "userId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_userId_user_id_fk": {
+          "name": "session_userId_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "verificationToken": {
+      "name": "verificationToken",
+      "schema": "",
+      "columns": {
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "verificationToken_identifier_token": {
+          "name": "verificationToken_identifier_token",
+          "columns": [
+            "identifier",
+            "token"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {
+    "muscle_groups": {
+      "name": "muscle_groups",
+      "values": {
+        "legs": "legs",
+        "chest": "chest",
+        "biceps": "biceps",
+        "triceps": "triceps",
+        "back": "back",
+        "shoulders": "shoulders",
+        "calfs": "calfs",
+        "abs": "abs",
+        "traps": "traps"
+      }
+    }
+  },
+  "schemas": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}
\ No newline at end of file
diff --git a/drizzle/meta/0027_snapshot.json b/drizzle/meta/0027_snapshot.json
new file mode 100644
index 00000000..f5df9ff3
--- /dev/null
+++ b/drizzle/meta/0027_snapshot.json
@@ -0,0 +1,460 @@
+{
+  "version": "5",
+  "dialect": "pg",
+  "id": "49ffbdb0-e141-46ad-bcd3-b4137af3470c",
+  "prevId": "51563ec3-f36e-43b8-a180-cf741a2360d9",
+  "tables": {
+    "account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "userId": {
+          "name": "userId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "providerAccountId": {
+          "name": "providerAccountId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_type": {
+          "name": "token_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "session_state": {
+          "name": "session_state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "account_userId_user_id_fk": {
+          "name": "account_userId_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "account_provider_providerAccountId": {
+          "name": "account_provider_providerAccountId",
+          "columns": [
+            "provider",
+            "providerAccountId"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "exercise_grid_position": {
+      "name": "exercise_grid_position",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "exercise_id": {
+          "name": "exercise_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "grid_position": {
+          "name": "grid_position",
+          "type": "serial",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "exercise_grid_position_exercise_id_exercise_id_fk": {
+          "name": "exercise_grid_position_exercise_id_exercise_id_fk",
+          "tableFrom": "exercise_grid_position",
+          "tableTo": "exercise",
+          "columnsFrom": [
+            "exercise_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "exercise_grid_position_user_id_user_id_fk": {
+          "name": "exercise_grid_position_user_id_user_id_fk",
+          "tableFrom": "exercise_grid_position",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "exercise": {
+      "name": "exercise",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "muscle_groups": {
+          "name": "muscle_groups",
+          "type": "muscle_groups[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "exercise_user_id_user_id_fk": {
+          "name": "exercise_user_id_user_id_fk",
+          "tableFrom": "exercise",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "exercise_user_id_name_unique": {
+          "name": "exercise_user_id_name_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "user_id",
+            "name"
+          ]
+        }
+      }
+    },
+    "exercise_data": {
+      "name": "exercise_data",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "exercise_id": {
+          "name": "exercise_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_repetitions": {
+          "name": "number_of_repetitions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "weight_lifted": {
+          "name": "weight_lifted",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "done_at": {
+          "name": "done_at",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "exercise_data_exercise_id_exercise_id_fk": {
+          "name": "exercise_data_exercise_id_exercise_id_fk",
+          "tableFrom": "exercise_data",
+          "tableTo": "exercise",
+          "columnsFrom": [
+            "exercise_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "exercise_data_done_at_exercise_id_unique": {
+          "name": "exercise_data_done_at_exercise_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "done_at",
+            "exercise_id"
+          ]
+        }
+      }
+    },
+    "session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "sessionToken": {
+          "name": "sessionToken",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "userId": {
+          "name": "userId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_userId_user_id_fk": {
+          "name": "session_userId_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "verificationToken": {
+      "name": "verificationToken",
+      "schema": "",
+      "columns": {
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "verificationToken_identifier_token": {
+          "name": "verificationToken_identifier_token",
+          "columns": [
+            "identifier",
+            "token"
+          ]
+        }
+      },
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {
+    "muscle_groups": {
+      "name": "muscle_groups",
+      "values": {
+        "legs": "legs",
+        "chest": "chest",
+        "biceps": "biceps",
+        "triceps": "triceps",
+        "back": "back",
+        "shoulders": "shoulders",
+        "calfs": "calfs",
+        "abs": "abs",
+        "traps": "traps"
+      }
+    }
+  },
+  "schemas": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}
\ No newline at end of file
diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
index b17082c7..776a4be0 100644
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@@ -176,6 +176,27 @@
       "when": 1696585145282,
       "tag": "0024_lowly_blazing_skull",
       "breakpoints": true
+    },
+    {
+      "idx": 25,
+      "version": "5",
+      "when": 1716402185228,
+      "tag": "0025_gifted_silver_surfer",
+      "breakpoints": true
+    },
+    {
+      "idx": 26,
+      "version": "5",
+      "when": 1716402203597,
+      "tag": "0026_hard_orphan",
+      "breakpoints": true
+    },
+    {
+      "idx": 27,
+      "version": "5",
+      "when": 1716402256605,
+      "tag": "0027_sloppy_firebrand",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 358451d2..309e55d4 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,7 @@
     "start": "next start",
     "lint": "next lint",
     "db:generate": "drizzle-kit generate:pg",
+    "db:push": "drizzle-kit push:pg",
     "e2e:ui": "npx playwright test --ui"
   },
   "dependencies": {
diff --git a/src/app/dashboard-new/layout.tsx b/src/app/dashboard-new/layout.tsx
deleted file mode 100644
index d9cbe2c6..00000000
--- a/src/app/dashboard-new/layout.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { DashboardBackground } from "@/components/ui/dashboardBackground";
-import type { ComponentPropsWithoutRef, PropsWithChildren } from "react";
-
-const Layout = (props: PropsWithChildren) => {
-  return (
-    <Container>
-      <ContentContainer>{props.children}</ContentContainer>
-
-      <BackgroundContainer>
-        <DashboardBackground />
-      </BackgroundContainer>
-    </Container>
-  );
-};
-
-export default Layout;
-
-const Container = (props: ComponentPropsWithoutRef<"main">) => {
-  return (
-    <main
-      {...props}
-      className="relative min-h-[calc(100dvh-var(--header-height))] overflow-hidden"
-    />
-  );
-};
-
-const ContentContainer = (props: ComponentPropsWithoutRef<"div">) => {
-  return (
-    <div
-      {...props}
-      className="mx-auto flex max-w-[calc(var(--exercise-card-height)*4+20px*5)] flex-col px-5 py-10"
-    />
-  );
-};
-
-const BackgroundContainer = (props: ComponentPropsWithoutRef<"div">) => {
-  return (
-    <div
-      {...props}
-      className="fixed inset-0 -top-[var(--header-height)] -z-10"
-    />
-  );
-};
diff --git a/src/app/dashboard-new/page.tsx b/src/app/dashboard-new/page.tsx
deleted file mode 100644
index 1f000b84..00000000
--- a/src/app/dashboard-new/page.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-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 (
-    <>
-      <NewExerciseForm />
-
-      <HydrationBoundary state={dehydrate(helpers.queryClient)}>
-        <AllExercisesTimeline />
-      </HydrationBoundary>
-
-      <HydrationBoundary state={dehydrate(helpers.queryClient)}>
-        <MonthlyExercisesTimeline />
-      </HydrationBoundary>
-    </>
-  );
-};
-
-export default Page;
diff --git a/src/app/dashboard/@allExercisesGrid/error.tsx b/src/app/dashboard/@allExercisesGrid/error.tsx
deleted file mode 100644
index 316ce407..00000000
--- a/src/app/dashboard/@allExercisesGrid/error.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-"use client";
-
-import { Button } from "@/components/ui/button";
-import type { ComponentProps } from "react";
-
-type Props = {
-  error: Error;
-  reset: () => void;
-};
-const Error = (props: Props) => {
-  return (
-    <div data-containsError className="flex flex-col gap-5">
-      <ErrorTitle>Something went wrong</ErrorTitle>
-      <ErrorSubText>
-        Sorry, we could not load all your exercises because:
-      </ErrorSubText>
-      <ErrorDescription>{JSON.stringify(props)}</ErrorDescription>
-      <Button onClick={props.reset} className="mx-auto w-max lg:ml-0">
-        try again
-      </Button>
-    </div>
-  );
-};
-
-export default Error;
-
-const ErrorTitle = (props: ComponentProps<"h2">) => {
-  return (
-    <h2
-      className="mx-auto text-xl font-bold text-destructive lg:ml-0 lg:mr-auto"
-      {...props}
-    />
-  );
-};
-
-const ErrorSubText = (props: ComponentProps<"p">) => {
-  return <p className="lg:text-left" {...props} />;
-};
-
-const ErrorDescription = (props: ComponentProps<"code">) => {
-  return (
-    <code
-      className="block rounded-md border border-border bg-primary px-2 py-4 backdrop-blur-md"
-      {...props}
-    />
-  );
-};
diff --git a/src/app/dashboard/@allExercisesGrid/filtersComponent.tsx b/src/app/dashboard/@allExercisesGrid/filtersComponent.tsx
deleted file mode 100644
index 235fadcc..00000000
--- a/src/app/dashboard/@allExercisesGrid/filtersComponent.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-"use client";
-
-import type { Exercise } from "@/db/types";
-import { usePathname, useRouter, useSearchParams } from "next/navigation";
-import { useState, useTransition } from "react";
-import type { ChangeEvent } from "react";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-import {
-  DropdownMenu,
-  DropdownMenuCheckboxItem,
-  DropdownMenuContent,
-  DropdownMenuGroup,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { Button } from "@/components/ui/button";
-import { Filter } from "lucide-react";
-import { Input } from "@/components/ui/input";
-import { Loader } from "@/components/ui/loader";
-import { muscleGroupsEnum } from "@/db/schema";
-
-export const SearchFilter = () => {
-  const router = useRouter();
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-  const [isPending, startTransition] = useTransition();
-  const [exerciseName, setExerciseName] = useState(
-    searchParams.get("search") ?? "",
-  );
-
-  const updateExerciseNameUrlParams = (e: ChangeEvent<HTMLInputElement>) => {
-    const current = new URLSearchParams(Array.from(searchParams.entries()));
-
-    if (!e.target.value) {
-      current.delete("search");
-    } else {
-      current.set("search", e.target.value);
-    }
-
-    const search = current.toString();
-    const query = search ? `?${search}` : "";
-
-    startTransition(() => {
-      router.push(`${pathname}${query}`);
-    });
-  };
-
-  return (
-    <div className="flex items-center gap-2">
-      {isPending && <Loader />}
-      <Input
-        className="h-8 max-w-[10rem] placeholder:select-none"
-        placeholder="filter exercises..."
-        value={exerciseName}
-        onChange={(e) => {
-          updateExerciseNameUrlParams(e);
-          setExerciseName(e.target.value);
-        }}
-      />
-    </div>
-  );
-};
-
-export const MuscleGroupsFilter = () => {
-  const router = useRouter();
-  const pathname = usePathname();
-  const searchParams = useSearchParams();
-  const [isPending, startTransition] = useTransition();
-
-  const muscleGroups = searchParams.get("tags");
-  const selectedValues = muscleGroups
-    ? (muscleGroups
-        .split(",")
-        .filter((muscleGroup) =>
-          (muscleGroupsEnum.enumValues as string[]).includes(muscleGroup),
-        ) as Exercise["muscleGroups"])
-    : [];
-
-  const [lastOptionClicked, setLastOptionClicked] = useState<
-    Exercise["muscleGroups"][number] | null
-  >(null);
-
-  const updateTagsUrlParams = (newMuscleGroups: Exercise["muscleGroups"]) => {
-    const current = new URLSearchParams(Array.from(searchParams.entries()));
-
-    if (newMuscleGroups.length < 1) {
-      current.delete("tags");
-    } else {
-      current.set("tags", newMuscleGroups.join(","));
-    }
-
-    const search = current.toString();
-    const query = search ? `?${search}` : "";
-
-    startTransition(() => {
-      router.push(`${pathname}${query}`);
-    });
-  };
-
-  return (
-    <DropdownMenu>
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <DropdownMenuTrigger asChild>
-              <Button
-                size="icon"
-                data-filters-number={selectedValues.length}
-                className="relative h-8 p-1 backdrop-filter after:absolute after:-right-1/3 after:-top-1/3 after:flex after:h-5 after:w-5 after:items-center after:justify-center after:rounded-full after:border after:border-border after:bg-brand-color-two after:text-xs after:backdrop-blur-md after:content-[attr(data-filters-number)] data-[filters-number='0']:after:hidden"
-                disabled={isPending}
-                aria-label="filters with tags"
-              >
-                {isPending ? (
-                  <Loader className="h-4 w-4" />
-                ) : (
-                  <Filter className="h-4 w-4" />
-                )}
-              </Button>
-            </DropdownMenuTrigger>
-          </TooltipTrigger>
-          <TooltipContent>
-            <p className="capitalize">tags</p>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-
-      <DropdownMenuContent className="w-56">
-        <DropdownMenuLabel className="capitalize">
-          muscle groups
-        </DropdownMenuLabel>
-        <DropdownMenuSeparator />
-
-        <DropdownMenuGroup>
-          {muscleGroupsEnum.enumValues.map((muscleGroup) => {
-            const isSelected = selectedValues.includes(muscleGroup);
-
-            return (
-              <DropdownMenuCheckboxItem
-                key={muscleGroup}
-                checked={isSelected}
-                onSelect={(e) => e.preventDefault()}
-                disabled={isPending && lastOptionClicked === muscleGroup}
-                onCheckedChange={() => {
-                  const filteredMuscleGroups = isSelected
-                    ? selectedValues.filter((v) => v !== muscleGroup)
-                    : [...selectedValues, muscleGroup];
-
-                  updateTagsUrlParams(filteredMuscleGroups);
-                  setLastOptionClicked(muscleGroup);
-                }}
-              >
-                {isPending && lastOptionClicked === muscleGroup && (
-                  <Loader className="mr-1 h-3 w-3" />
-                )}
-                {muscleGroup}
-              </DropdownMenuCheckboxItem>
-            );
-          })}
-        </DropdownMenuGroup>
-
-        {selectedValues.length > 0 && (
-          <>
-            <DropdownMenuSeparator />
-            <DropdownMenuGroup>
-              <DropdownMenuItem
-                onSelect={() => updateTagsUrlParams([])}
-                className="justify-center text-center"
-              >
-                Clear filters
-              </DropdownMenuItem>
-            </DropdownMenuGroup>
-          </>
-        )}
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-};
diff --git a/src/app/dashboard/@allExercisesGrid/layout.tsx b/src/app/dashboard/@allExercisesGrid/layout.tsx
deleted file mode 100644
index a576cb92..00000000
--- a/src/app/dashboard/@allExercisesGrid/layout.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { ComponentProps, PropsWithChildren } from "react";
-import { TimelineContainer } from "../timelineContainer";
-import { Badge } from "@/components/ui/badge";
-import { MuscleGroupsFilter, SearchFilter } from "./filtersComponent";
-
-const Layout = ({ children }: PropsWithChildren) => {
-  return (
-    <TimelineContainer>
-      <TimelineActionsContainer>
-        <Badge variant="accent" className="mr-auto">
-          <time dateTime="all">all</time>
-        </Badge>
-
-        <SearchFilter />
-        <MuscleGroupsFilter />
-      </TimelineActionsContainer>
-
-      {children}
-    </TimelineContainer>
-  );
-};
-
-export default Layout;
-
-const TimelineActionsContainer = (props: ComponentProps<"div">) => {
-  return <div {...props} className="flex items-center gap-2" />;
-};
diff --git a/src/app/dashboard/@allExercisesGrid/loading.tsx b/src/app/dashboard/@allExercisesGrid/loading.tsx
deleted file mode 100644
index 1dba7795..00000000
--- a/src/app/dashboard/@allExercisesGrid/loading.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Skeleton } from "@/components/ui/skeleton";
-import { GridLayout } from "../_grid/gridLayout";
-
-const Loader = () => {
-  return (
-    <GridLayout>
-      {[...Array<unknown>(20)].map((_, i) => (
-        <Skeleton
-          key={i}
-          className="h-exercise-card rounded-md border border-border bg-primary backdrop-blur-md"
-        >
-          <header className="h-11 border-b border-border bg-primary" />
-        </Skeleton>
-      ))}
-    </GridLayout>
-  );
-};
-
-export default Loader;
diff --git a/src/app/dashboard/@allExercisesGrid/optimisticExerciseItem.tsx b/src/app/dashboard/@allExercisesGrid/optimisticExerciseItem.tsx
deleted file mode 100644
index d42ea3ec..00000000
--- a/src/app/dashboard/@allExercisesGrid/optimisticExerciseItem.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-"use client";
-
-import { type MutationState, useMutationState } from "@tanstack/react-query";
-import { GridItem } from "../_grid/gridItem";
-import { getQueryKey } from "@trpc/react-query";
-import { type RouterInputs, api } from "@/trpc/react";
-import { Skeleton } from "@/components/ui/skeleton";
-import { RadarGraph } from "../_graphs/radarGraph";
-
-type CreateExerciseMutationState = MutationState<
-  unknown,
-  Error,
-  RouterInputs["exercise"]["create"]
->;
-
-export const OptimisticExerciseItem = () => {
-  const createExerciseMutations = useMutationState<CreateExerciseMutationState>(
-    {
-      filters: { mutationKey: getQueryKey(api.exercise.create) },
-    },
-  );
-
-  const latestMutation = createExerciseMutations?.at(-1);
-  const newExerciseName = latestMutation?.variables?.name;
-
-  if (!newExerciseName || latestMutation?.status !== "pending") {
-    return null;
-  }
-
-  return (
-    <Skeleton>
-      <GridItem.Root>
-        <GridItem.Header>
-          <GridItem.Title>{newExerciseName}</GridItem.Title>
-        </GridItem.Header>
-      </GridItem.Root>
-    </Skeleton>
-  );
-};
diff --git a/src/app/dashboard/@allExercisesGrid/page.tsx b/src/app/dashboard/@allExercisesGrid/page.tsx
deleted file mode 100644
index 3a973eb7..00000000
--- a/src/app/dashboard/@allExercisesGrid/page.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-import { db } from "@/db";
-import { getServerSession } from "next-auth";
-import { authOptions } from "@/lib/auth";
-import { redirect } from "next/navigation";
-import type { ComponentProps, PropsWithChildren } from "react";
-import type { Exercise, User } from "@/db/types";
-import { GridLayout } from "../_grid/gridLayout";
-import { DragComponent, SortableGrid } from "./sortableGrid";
-import { GridItem } from "../_grid/gridItem";
-import { LineGraph } from "../_graphs/lineGraph";
-import { RadarGraph } from "../_graphs/radarGraph";
-import { MoreHorizontal, Tag } from "lucide-react";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuGroup,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { UpdateExerciseNameDialog } from "../_modals/updateExerciseNameDialog";
-import { DeleteExerciseAlertDialog } from "../_modals/deleteExerciseAlertDialog";
-import { ExerciseMuscleGroupsDropdown } from "./exerciseMuscleGroups";
-import type { DashboardPageProps } from "../getExercisesWhereClause";
-import { getExercisesWhereClause } from "../getExercisesWhereClause";
-import { RandomFacts } from "../_graphs/randomFacts";
-import { OptimisticExerciseItem } from "./optimisticExerciseItem";
-
-const AllExercisesGrid = async (props: DashboardPageProps) => {
-  const session = await getServerSession(authOptions);
-
-  if (!session?.user.id) {
-    return redirect("/");
-  }
-
-  const exercises = await getExercises(session.user.id, props.searchParams);
-
-  if (exercises.length < 1 && props.searchParams?.search) {
-    return (
-      <Container>
-        <Text>
-          no exercises named <PropsText>{props.searchParams.search}</PropsText>{" "}
-          found
-        </Text>
-      </Container>
-    );
-  }
-
-  if (exercises.length < 1 && props.searchParams?.tags) {
-    return (
-      <Container>
-        <Text>
-          no exercises with the tag of{" "}
-          <PropsText>{props.searchParams.tags}</PropsText> found
-        </Text>
-      </Container>
-    );
-  }
-
-  if (exercises.length < 1 && !props.searchParams?.search) {
-    return (
-      <Container>
-        <Text>
-          Your dashboard is empty
-          <br />
-          Start adding new data with the form above
-        </Text>
-      </Container>
-    );
-  }
-
-  return (
-    <GridLayout>
-      <OptimisticExerciseItem />
-
-      <SortableGrid
-        gridItems={exercises.map((exercise) => ({
-          id: exercise.id,
-          render: (
-            <GridItem.Root>
-              <GridItem.Anchor
-                aria-label={`go to ${exercise.name}`}
-                href={`/exercises/${exercise.id}`}
-              />
-              <GridItem.Header>
-                <GridItem.Title>{exercise.name}</GridItem.Title>
-
-                <GridItem.ActionContainer>
-                  <ExerciseMuscleGroupsDropdown exercise={exercise}>
-                    <GridItem.ActionButton aria-label="view exercise tags">
-                      <Tag className="h-4 w-4" />
-                    </GridItem.ActionButton>
-                  </ExerciseMuscleGroupsDropdown>
-
-                  <ExerciseDropDown exercise={exercise}>
-                    <GridItem.ActionButton aria-label="view more">
-                      <MoreHorizontal className="h-4 w-4" />
-                    </GridItem.ActionButton>
-                  </ExerciseDropDown>
-
-                  <DragComponent id={exercise.id} />
-                </GridItem.ActionContainer>
-              </GridItem.Header>
-
-              <LineGraph data={exercise.data} />
-            </GridItem.Root>
-          ),
-        }))}
-      />
-
-      <GridItem.Root>
-        <GridItem.Header>
-          <GridItem.Title>exercises count</GridItem.Title>
-        </GridItem.Header>
-
-        <RadarGraph
-          data={exercises.map((exercise) => ({
-            exerciseName: exercise.name,
-            frequency: exercise.data.length,
-          }))}
-        />
-      </GridItem.Root>
-
-      <GridItem.Root>
-        <GridItem.Header>
-          <GridItem.Title>random facts</GridItem.Title>
-        </GridItem.Header>
-
-        <RandomFacts exercises={exercises} />
-      </GridItem.Root>
-    </GridLayout>
-  );
-};
-
-export default AllExercisesGrid;
-
-const Container = (props: ComponentProps<"div">) => {
-  return (
-    <div
-      {...props}
-      className="mt-10 flex flex-col items-center space-y-5 text-center"
-    />
-  );
-};
-
-const Text = (props: ComponentProps<"p">) => {
-  return <p {...props} className="text-xl text-muted-foreground" />;
-};
-
-const getExercises = async (
-  userId: User["id"],
-  searchParams: DashboardPageProps["searchParams"],
-) => {
-  return (
-    await db.query.exercises.findMany({
-      with: {
-        data: { orderBy: (data, { asc }) => [asc(data.doneAt)] },
-        position: true,
-      },
-      where: () => getExercisesWhereClause({ searchParams, userId }),
-    })
-  ).sort((a, b) => b.position.gridPosition - a.position.gridPosition);
-};
-
-const ExerciseDropDown = ({
-  exercise,
-  children,
-}: { exercise: Exercise } & PropsWithChildren) => {
-  return (
-    <DropdownMenu>
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <DropdownMenuTrigger asChild>{children}</DropdownMenuTrigger>
-          </TooltipTrigger>
-          <TooltipContent>
-            <p className="capitalize">view more</p>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-      <DropdownMenuContent className="w-56">
-        <DropdownMenuLabel className="capitalize">settings</DropdownMenuLabel>
-        <DropdownMenuSeparator />
-        <DropdownMenuGroup>
-          <UpdateExerciseNameDialog exercise={exercise} />
-          <DeleteExerciseAlertDialog exercise={exercise} />
-        </DropdownMenuGroup>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-};
-
-const PropsText = (props: ComponentProps<"span">) => {
-  return <span {...props} className="text-brand-color-two" />;
-};
diff --git a/src/app/dashboard/@allExercisesGrid/sortableGrid.tsx b/src/app/dashboard/@allExercisesGrid/sortableGrid.tsx
deleted file mode 100644
index e5bbe644..00000000
--- a/src/app/dashboard/@allExercisesGrid/sortableGrid.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-"use client";
-
-import {
-  useSensor,
-  useSensors,
-  DndContext,
-  TouchSensor,
-  MouseSensor,
-  KeyboardSensor,
-  closestCenter,
-} from "@dnd-kit/core";
-import type { DragEndEvent } from "@dnd-kit/core";
-import {
-  arrayMove,
-  rectSortingStrategy,
-  SortableContext,
-  sortableKeyboardCoordinates,
-  useSortable,
-} from "@dnd-kit/sortable";
-import { useEffect, useState } from "react";
-import type { PropsWithChildren, ReactNode } from "react";
-import { Slot } from "@radix-ui/react-slot";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { GripVertical } from "lucide-react";
-import { Button } from "@/components/ui/button";
-import { Loader } from "@/components/ui/loader";
-import { api } from "@/trpc/react";
-import { useMutationState } from "@tanstack/react-query";
-import { getQueryKey } from "@trpc/react-query";
-import { useToast } from "@/components/ui/use-toast";
-import { ToastAction } from "@/components/ui/toast";
-
-type Props = {
-  gridItems: { render: ReactNode; id: string }[];
-};
-
-export const SortableGrid = (props: Props) => {
-  const [gridItems, setGridItems] = useState(props.gridItems);
-  const { toast } = useToast();
-  const utils = api.useUtils();
-
-  const moveExercise = api.exercise.move.useMutation({
-    onError: (error, variables) => {
-      toast({
-        variant: "destructive",
-        title: "Something went wrong",
-        description: error.shape?.data.zodError?.fieldErrors?.name?.at(0),
-        action: (
-          <ToastAction
-            altText="Try again"
-            onClick={() => moveExercise.mutate(variables)}
-          >
-            Try again
-          </ToastAction>
-        ),
-      });
-    },
-    onSettled: async () => {
-      await utils.exercise.all.invalidate();
-    },
-  });
-
-  useEffect(() => setGridItems(props.gridItems), [props.gridItems]);
-
-  const sensors = useSensors(
-    useSensor(MouseSensor),
-    useSensor(TouchSensor),
-    useSensor(KeyboardSensor, {
-      coordinateGetter: sortableKeyboardCoordinates,
-    }),
-  );
-
-  const handleDragEnd = (event: DragEndEvent) => {
-    const { active, over } = event;
-
-    if (active.id === over?.id) {
-      return;
-    }
-
-    const oldIndex = gridItems.findIndex((x) => x.id === active?.id);
-    const newIndex = gridItems.findIndex((x) => x.id === over?.id);
-
-    const updatedGridItems = arrayMove(gridItems, oldIndex, newIndex);
-
-    setGridItems(updatedGridItems);
-
-    moveExercise.mutate(updatedGridItems.map((item) => item.id));
-  };
-
-  return (
-    <DndContext
-      sensors={sensors}
-      onDragEnd={(e) => void handleDragEnd(e)}
-      collisionDetection={closestCenter}
-    >
-      <SortableContext items={gridItems} strategy={rectSortingStrategy}>
-        {gridItems.map((item) => (
-          <SortableItem key={item.id} id={item.id}>
-            {item.render}
-          </SortableItem>
-        ))}
-      </SortableContext>
-    </DndContext>
-  );
-};
-
-const SortableItem = (props: { id: string } & PropsWithChildren) => {
-  const { setNodeRef, isDragging, transform, transition } = useSortable({
-    id: props.id,
-  });
-
-  return (
-    <Slot
-      ref={setNodeRef}
-      style={{
-        transition,
-        zIndex: isDragging ? "20" : "1",
-        transform: transform
-          ? `translate3d(${transform?.x}px, ${transform?.y}px, 0) scaleX(${transform?.scaleX})  scaleY(${transform?.scaleY})`
-          : undefined,
-      }}
-    >
-      {props.children}
-    </Slot>
-  );
-};
-
-export const DragComponent = ({ id }: { id: string }) => {
-  const { attributes, listeners } = useSortable({ id });
-
-  const moveExerciseMutationState = useMutationState({
-    filters: {
-      mutationKey: getQueryKey(api.exercise.move),
-    },
-  });
-
-  const isSavingGridState =
-    moveExerciseMutationState.at(-1)?.status === "pending";
-
-  return (
-    <TooltipProvider>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            className="h-8 cursor-grab p-1 active:cursor-grabbing"
-            size="icon"
-            variant="ghost"
-            aria-label="drag exercise in the grid"
-            {...attributes}
-            {...listeners}
-            suppressHydrationWarning
-            disabled={isSavingGridState}
-          >
-            {isSavingGridState ? (
-              <Loader />
-            ) : (
-              <GripVertical className="h-4 w-4" />
-            )}
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent className="active:opacity-0">
-          <p className="capitalize">drag exercise</p>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-};
diff --git a/src/app/dashboard/@exercisesByMonthGrid/error.tsx b/src/app/dashboard/@exercisesByMonthGrid/error.tsx
deleted file mode 100644
index 60e1708b..00000000
--- a/src/app/dashboard/@exercisesByMonthGrid/error.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-"use client";
-
-import { Button } from "@/components/ui/button";
-import { TimelineContainer } from "../timelineContainer";
-import type { ComponentProps } from "react";
-
-type Props = {
-  error: Error;
-  reset: () => void;
-};
-const Error = (props: Props) => {
-  return (
-    <TimelineContainer className="before:bg-destructive after:bg-destructive">
-      <ErrorTitle>Something went wrong</ErrorTitle>
-      <ErrorSubText>
-        Sorry, we could not load your exercises by month because:
-      </ErrorSubText>
-      <ErrorDescription>{JSON.stringify(props)}</ErrorDescription>
-      <Button onClick={props.reset} className="mx-auto w-max lg:ml-0">
-        try again
-      </Button>
-    </TimelineContainer>
-  );
-};
-
-export default Error;
-
-const ErrorTitle = (props: ComponentProps<"h2">) => {
-  return (
-    <h2
-      className="mx-auto text-xl font-bold text-destructive lg:ml-0 lg:mr-auto"
-      {...props}
-    />
-  );
-};
-
-const ErrorSubText = (props: ComponentProps<"p">) => {
-  return <p className="lg:text-left" {...props} />;
-};
-
-const ErrorDescription = (props: ComponentProps<"code">) => {
-  return (
-    <code
-      className="block rounded-md border border-border bg-primary px-2 py-4 backdrop-blur-md"
-      {...props}
-    />
-  );
-};
diff --git a/src/app/dashboard/@exercisesByMonthGrid/loading.tsx b/src/app/dashboard/@exercisesByMonthGrid/loading.tsx
deleted file mode 100644
index 618f98b9..00000000
--- a/src/app/dashboard/@exercisesByMonthGrid/loading.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Skeleton } from "@/components/ui/skeleton";
-import { GridLayout } from "../_grid/gridLayout";
-import { TimelineContainer } from "../timelineContainer";
-import { Badge } from "@/components/ui/badge";
-
-const Loader = () => {
-  return (
-    <>
-      {[...Array<unknown>(3)].map((_, i) => (
-        <TimelineContainer key={i}>
-          <Skeleton className="w-min">
-            <Badge
-              variant="accent"
-              className="mx-auto h-6 w-32 lg:ml-0 lg:mr-auto"
-            />
-          </Skeleton>
-
-          <GridLayout>
-            {[...Array<unknown>(10)].map((_, i) => (
-              <Skeleton
-                key={i}
-                className="h-exercise-card rounded-md border border-border bg-primary backdrop-blur-md"
-              >
-                <header className="h-11 border-b border-border bg-primary" />
-              </Skeleton>
-            ))}
-          </GridLayout>
-        </TimelineContainer>
-      ))}
-    </>
-  );
-};
-
-export default Loader;
diff --git a/src/app/dashboard/@exercisesByMonthGrid/page.tsx b/src/app/dashboard/@exercisesByMonthGrid/page.tsx
deleted file mode 100644
index ed53d5da..00000000
--- a/src/app/dashboard/@exercisesByMonthGrid/page.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import { db } from "@/db";
-import type { ExerciseWithData, User } from "@/db/types";
-import { getServerSession } from "next-auth";
-import { redirect } from "next/navigation";
-import { authOptions } from "@/lib/auth";
-import { dateAsYearMonthDayFormat } from "@/lib/date";
-import { TimelineContainer } from "../timelineContainer";
-import { Badge } from "@/components/ui/badge";
-import { GridLayout } from "../_grid/gridLayout";
-import { GridItem } from "../_grid/gridItem";
-import { LineGraph } from "../_graphs/lineGraph";
-import { RadarGraph } from "../_graphs/radarGraph";
-import { HeatmapGraph } from "../_graphs/heatmapGraph";
-import { prepareHeatmapData } from "../_graphs/heatmapUtils";
-import type { DashboardPageProps } from "../getExercisesWhereClause";
-import { getExercisesWhereClause } from "../getExercisesWhereClause";
-import { RandomFacts } from "../_graphs/randomFacts";
-
-//TODO: infinte scroll
-const ExercisesByMonthGrid = async (props: DashboardPageProps) => {
-  const session = await getServerSession(authOptions);
-
-  if (!session?.user.id) {
-    return redirect("/");
-  }
-
-  const exercises = await getExercises(session.user.id, props.searchParams);
-
-  return (
-    <>
-      {getExercisesByMonth(exercises).map((group) => {
-        return (
-          <TimelineContainer key={group.date}>
-            <Badge variant="accent" className="w-max">
-              <time dateTime={group.date}>
-                {new Date(group.date).toLocaleDateString(undefined, {
-                  month: "long",
-                  year: "numeric",
-                })}
-              </time>
-            </Badge>
-            <GridLayout>
-              {group.exercises.map((exercise) => {
-                return (
-                  <GridItem.Root key={exercise.id}>
-                    <GridItem.Anchor
-                      aria-label={`go to ${exercise.name}`}
-                      href={`/exercises/${exercise.id}?from=${
-                        group.date
-                      }&to=${dateAsYearMonthDayFormat(
-                        new Date(
-                          new Date(group.date).getFullYear(),
-                          new Date(group.date).getMonth() + 1,
-                          0,
-                        ),
-                      )}`}
-                    />
-                    <GridItem.Header>
-                      <GridItem.Title>{exercise.name}</GridItem.Title>
-                    </GridItem.Header>
-
-                    <LineGraph data={exercise.data} />
-                  </GridItem.Root>
-                );
-              })}
-
-              <GridItem.Root>
-                <GridItem.Header>
-                  <GridItem.Title>exercises count</GridItem.Title>
-                </GridItem.Header>
-
-                <RadarGraph
-                  data={group.exercises.map((exercise) => ({
-                    exerciseName: exercise.name,
-                    frequency: exercise.data.length,
-                  }))}
-                />
-              </GridItem.Root>
-
-              <GridItem.Root>
-                <GridItem.Header>
-                  <GridItem.Title>heatmap</GridItem.Title>
-                </GridItem.Header>
-
-                <HeatmapGraph data={prepareHeatmapData(group.exercises)} />
-              </GridItem.Root>
-
-              <GridItem.Root>
-                <GridItem.Header>
-                  <GridItem.Title>random facts</GridItem.Title>
-                </GridItem.Header>
-
-                <RandomFacts exercises={group.exercises} />
-              </GridItem.Root>
-            </GridLayout>
-          </TimelineContainer>
-        );
-      })}
-    </>
-  );
-};
-
-export default ExercisesByMonthGrid;
-
-type ExercisesByMonth = {
-  date: string;
-  exercises: ExerciseWithData[];
-}[];
-
-const getExercisesByMonth = (exercises: ExerciseWithData[]) => {
-  const exercisesByMonth: ExercisesByMonth = [];
-
-  for (const exercise of exercises) {
-    for (const data of exercise.data) {
-      const firstDayOfMonthDate = dateAsYearMonthDayFormat(
-        new Date(new Date(data.doneAt).setDate(1)),
-      );
-
-      const entry = exercisesByMonth.find(
-        (entry) => entry.date === firstDayOfMonthDate,
-      );
-
-      if (!entry) {
-        exercisesByMonth.push({
-          date: firstDayOfMonthDate,
-          exercises: [{ ...exercise, data: [data] }],
-        });
-        continue;
-      }
-
-      const exerciseInEntry = entry.exercises.find(
-        (ex) => ex.id === exercise.id,
-      );
-
-      if (!exerciseInEntry) {
-        entry.exercises.push({ ...exercise, data: [data] });
-        continue;
-      }
-
-      exerciseInEntry.data.push(data);
-    }
-  }
-
-  return exercisesByMonth.sort(
-    (a, b) => new Date(b.date).getTime() - new Date(a.date).getTime(),
-  );
-};
-
-const getExercises = (
-  userId: User["id"],
-  searchParams: DashboardPageProps["searchParams"],
-) => {
-  return db.query.exercises.findMany({
-    with: {
-      data: { orderBy: (data, { desc }) => [desc(data.doneAt)] },
-    },
-    where: () => getExercisesWhereClause({ searchParams, userId }),
-  });
-};
diff --git a/src/app/dashboard/@newExerciseForm/newExerciseNameForm.tsx b/src/app/dashboard/@newExerciseForm/newExerciseNameForm.tsx
deleted file mode 100644
index 79150d0b..00000000
--- a/src/app/dashboard/@newExerciseForm/newExerciseNameForm.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-"use client";
-
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { ToastAction } from "@/components/ui/toast";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { useToast } from "@/components/ui/use-toast";
-import { Plus } from "lucide-react";
-import { experimental_useFormStatus as useFormStatus } from "react-dom";
-import { Loader } from "@/components/ui/loader";
-import { useState } from "react";
-import { api } from "@/trpc/react";
-
-export const NewExerciseForm = () => {
-  const [name, setName] = useState("");
-  const { toast } = useToast();
-  const utils = api.useUtils();
-
-  const createExercise = api.exercise.create.useMutation({
-    onSuccess: () => {
-      setName("");
-    },
-    onError: (error) => {
-      toast({
-        variant: "destructive",
-        title: "Something went wrong",
-        description: error.message,
-        action: (
-          <ToastAction
-            altText="Try again"
-            onClick={() => void createExercise.mutate({ name })}
-          >
-            Try again
-          </ToastAction>
-        ),
-      });
-    },
-    onSettled: async () => {
-      await utils.exercise.all.invalidate();
-    },
-  });
-
-  return (
-    <form
-      action={() => createExercise.mutate({ name })}
-      className="mx-auto flex w-full max-w-2xl gap-2"
-    >
-      <Input
-        name="newExerciseName"
-        placeholder="new exercise name"
-        value={name}
-        onChange={(e) => setName(e.target.value)}
-        autoComplete="off"
-      />
-
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <div>
-              <SubmitButton />
-            </div>
-          </TooltipTrigger>
-          <TooltipContent>
-            <p className="capitalize">add</p>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-    </form>
-  );
-};
-
-const SubmitButton = () => {
-  const formStatus = useFormStatus();
-  return (
-    <Button size="icon" aria-label="add" disabled={formStatus.pending}>
-      {formStatus.pending ? (
-        <Loader className="h-4 w-4" />
-      ) : (
-        <Plus className="h-4 w-4" />
-      )}
-    </Button>
-  );
-};
diff --git a/src/app/dashboard/@newExerciseForm/page.tsx b/src/app/dashboard/@newExerciseForm/page.tsx
deleted file mode 100644
index ff2eed04..00000000
--- a/src/app/dashboard/@newExerciseForm/page.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { NewExerciseForm } from "./newExerciseNameForm";
-
-const GridExercises = () => {
-  return <NewExerciseForm />;
-};
-
-export default GridExercises;
diff --git a/src/app/dashboard-new/_components/allExercisesTimeline/allExercisesGrid.tsx b/src/app/dashboard/_components/allExercisesTimeline/allExercisesGrid.tsx
similarity index 90%
rename from src/app/dashboard-new/_components/allExercisesTimeline/allExercisesGrid.tsx
rename to src/app/dashboard/_components/allExercisesTimeline/allExercisesGrid.tsx
index 4230e82f..4699f700 100644
--- a/src/app/dashboard-new/_components/allExercisesTimeline/allExercisesGrid.tsx
+++ b/src/app/dashboard/_components/allExercisesTimeline/allExercisesGrid.tsx
@@ -2,13 +2,7 @@
 
 import { type RouterInputs, type RouterOutputs, api } from "@/trpc/react";
 import { type ComponentPropsWithoutRef } from "react";
-import { GridLayout } from "@/app/dashboard/_grid/gridLayout";
-import { GridItem } from "@/app/dashboard/_grid/gridItem";
-import { ExerciseMuscleGroupsDropdown } from "@/app/dashboard/@allExercisesGrid/exerciseMuscleGroups";
 import { MoreHorizontal, Tag } from "lucide-react";
-import { LineGraph } from "@/app/dashboard/_graphs/lineGraph";
-import { RadarGraph } from "@/app/dashboard/_graphs/radarGraph";
-import { RandomFacts } from "@/app/dashboard/_graphs/randomFacts";
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -26,12 +20,18 @@ import {
 import { useMutationState } from "@tanstack/react-query";
 import { Skeleton } from "@/components/ui/skeleton";
 import { getQueryKey } from "@trpc/react-query";
-import { UpdateExerciseNameDialog } from "@/app/dashboard/_modals/updateExerciseNameDialog";
-import { DeleteExerciseAlertDialog } from "@/app/dashboard/_modals/deleteExerciseAlertDialog";
 import { DragComponent, SortableGrid } from "./sortableGrid";
 import { pluralize } from "@/lib/utils";
 import { useExercises } from "../useExercises";
 import { useDashboardSearchParams } from "../useDashboardSearchParams";
+import { GridLayout } from "../grid/gridLayout";
+import { GridItem } from "../grid/gridItem";
+import { DeleteExerciseAlertDialog } from "../modals/deleteExerciseAlertDialog";
+import { UpdateExerciseNameDialog } from "../modals/updateExerciseNameDialog";
+import { LineGraph } from "../graphs/lineGraph";
+import { RadarGraph } from "../graphs/radarGraph";
+import { RandomFacts } from "../graphs/randomFacts";
+import { ExerciseMuscleGroupsDropdown } from "./exerciseMuscleGroups";
 
 export const AllExercisesGrid = () => {
   const dashboardShareParams = useDashboardSearchParams();
diff --git a/src/app/dashboard-new/_components/allExercisesTimeline/allExercisesTimeline.tsx b/src/app/dashboard/_components/allExercisesTimeline/allExercisesTimeline.tsx
similarity index 100%
rename from src/app/dashboard-new/_components/allExercisesTimeline/allExercisesTimeline.tsx
rename to src/app/dashboard/_components/allExercisesTimeline/allExercisesTimeline.tsx
diff --git a/src/app/dashboard/@allExercisesGrid/exerciseMuscleGroups.tsx b/src/app/dashboard/_components/allExercisesTimeline/exerciseMuscleGroups.tsx
similarity index 100%
rename from src/app/dashboard/@allExercisesGrid/exerciseMuscleGroups.tsx
rename to src/app/dashboard/_components/allExercisesTimeline/exerciseMuscleGroups.tsx
diff --git a/src/app/dashboard-new/_components/allExercisesTimeline/filters.tsx b/src/app/dashboard/_components/allExercisesTimeline/filters.tsx
similarity index 100%
rename from src/app/dashboard-new/_components/allExercisesTimeline/filters.tsx
rename to src/app/dashboard/_components/allExercisesTimeline/filters.tsx
diff --git a/src/app/dashboard-new/_components/allExercisesTimeline/sortableGrid.tsx b/src/app/dashboard/_components/allExercisesTimeline/sortableGrid.tsx
similarity index 100%
rename from src/app/dashboard-new/_components/allExercisesTimeline/sortableGrid.tsx
rename to src/app/dashboard/_components/allExercisesTimeline/sortableGrid.tsx
diff --git a/src/app/dashboard/_graphs/heatmapGraph.tsx b/src/app/dashboard/_components/graphs/heatmapGraph.tsx
similarity index 100%
rename from src/app/dashboard/_graphs/heatmapGraph.tsx
rename to src/app/dashboard/_components/graphs/heatmapGraph.tsx
diff --git a/src/app/dashboard/_graphs/heatmapUtils.ts b/src/app/dashboard/_components/graphs/heatmapUtils.ts
similarity index 100%
rename from src/app/dashboard/_graphs/heatmapUtils.ts
rename to src/app/dashboard/_components/graphs/heatmapUtils.ts
diff --git a/src/app/dashboard/_graphs/lineGraph.tsx b/src/app/dashboard/_components/graphs/lineGraph.tsx
similarity index 100%
rename from src/app/dashboard/_graphs/lineGraph.tsx
rename to src/app/dashboard/_components/graphs/lineGraph.tsx
diff --git a/src/app/dashboard/_graphs/radarGraph.tsx b/src/app/dashboard/_components/graphs/radarGraph.tsx
similarity index 100%
rename from src/app/dashboard/_graphs/radarGraph.tsx
rename to src/app/dashboard/_components/graphs/radarGraph.tsx
diff --git a/src/app/dashboard/_graphs/randomFacts.tsx b/src/app/dashboard/_components/graphs/randomFacts.tsx
similarity index 100%
rename from src/app/dashboard/_graphs/randomFacts.tsx
rename to src/app/dashboard/_components/graphs/randomFacts.tsx
diff --git a/src/app/dashboard/_grid/gridItem.tsx b/src/app/dashboard/_components/grid/gridItem.tsx
similarity index 100%
rename from src/app/dashboard/_grid/gridItem.tsx
rename to src/app/dashboard/_components/grid/gridItem.tsx
diff --git a/src/app/dashboard/_grid/gridLayout.tsx b/src/app/dashboard/_components/grid/gridLayout.tsx
similarity index 100%
rename from src/app/dashboard/_grid/gridLayout.tsx
rename to src/app/dashboard/_components/grid/gridLayout.tsx
diff --git a/src/app/dashboard/_modals/deleteExerciseAlertDialog.tsx b/src/app/dashboard/_components/modals/deleteExerciseAlertDialog.tsx
similarity index 100%
rename from src/app/dashboard/_modals/deleteExerciseAlertDialog.tsx
rename to src/app/dashboard/_components/modals/deleteExerciseAlertDialog.tsx
diff --git a/src/app/dashboard/_modals/updateExerciseNameDialog.tsx b/src/app/dashboard/_components/modals/updateExerciseNameDialog.tsx
similarity index 100%
rename from src/app/dashboard/_modals/updateExerciseNameDialog.tsx
rename to src/app/dashboard/_components/modals/updateExerciseNameDialog.tsx
diff --git a/src/app/dashboard-new/_components/monthlyExercisesTimeline/monthlyExercisesTimeline.tsx b/src/app/dashboard/_components/monthlyExercisesTimeline/monthlyExercisesTimeline.tsx
similarity index 85%
rename from src/app/dashboard-new/_components/monthlyExercisesTimeline/monthlyExercisesTimeline.tsx
rename to src/app/dashboard/_components/monthlyExercisesTimeline/monthlyExercisesTimeline.tsx
index 7fd78efb..ef05b1fb 100644
--- a/src/app/dashboard-new/_components/monthlyExercisesTimeline/monthlyExercisesTimeline.tsx
+++ b/src/app/dashboard/_components/monthlyExercisesTimeline/monthlyExercisesTimeline.tsx
@@ -1,17 +1,17 @@
 "use client";
 
-import { HeatmapGraph } from "@/app/dashboard/_graphs/heatmapGraph";
-import { prepareHeatmapData } from "@/app/dashboard/_graphs/heatmapUtils";
-import { LineGraph } from "@/app/dashboard/_graphs/lineGraph";
-import { RadarGraph } from "@/app/dashboard/_graphs/radarGraph";
-import { RandomFacts } from "@/app/dashboard/_graphs/randomFacts";
-import { GridItem } from "@/app/dashboard/_grid/gridItem";
-import { GridLayout } from "@/app/dashboard/_grid/gridLayout";
-import { TimelineContainer } from "@/app/dashboard/timelineContainer";
 import { Badge } from "@/components/ui/badge";
 import { dateAsYearMonthDayFormat } from "@/lib/date";
 import type { RouterOutputs } from "@/trpc/react";
 import { useExercises } from "../useExercises";
+import { GridLayout } from "../grid/gridLayout";
+import { GridItem } from "../grid/gridItem";
+import { LineGraph } from "../graphs/lineGraph";
+import { RadarGraph } from "../graphs/radarGraph";
+import { HeatmapGraph } from "../graphs/heatmapGraph";
+import { prepareHeatmapData } from "../graphs/heatmapUtils";
+import { RandomFacts } from "../graphs/randomFacts";
+import { Timeline } from "../timeline";
 
 export const MonthlyExercisesTimeline = () => {
   const exercises = useExercises();
@@ -19,7 +19,7 @@ export const MonthlyExercisesTimeline = () => {
   return (
     <>
       {getExercisesByMonth(exercises).map((group) => (
-        <TimelineContainer key={group.date}>
+        <Timeline key={group.date}>
           <Badge variant="accent" className="w-max">
             <time dateTime={group.date}>
               {new Date(group.date).toLocaleDateString(undefined, {
@@ -82,7 +82,7 @@ export const MonthlyExercisesTimeline = () => {
               <RandomFacts exercises={group.exercises} />
             </GridItem.Root>
           </GridLayout>
-        </TimelineContainer>
+        </Timeline>
       ))}
     </>
   );
diff --git a/src/app/dashboard-new/_components/newExerciseForm/newExerciseForm.tsx b/src/app/dashboard/_components/newExerciseForm/newExerciseForm.tsx
similarity index 100%
rename from src/app/dashboard-new/_components/newExerciseForm/newExerciseForm.tsx
rename to src/app/dashboard/_components/newExerciseForm/newExerciseForm.tsx
diff --git a/src/app/dashboard-new/_components/timeline.tsx b/src/app/dashboard/_components/timeline.tsx
similarity index 100%
rename from src/app/dashboard-new/_components/timeline.tsx
rename to src/app/dashboard/_components/timeline.tsx
diff --git a/src/app/dashboard-new/_components/useDashboardSearchParams.ts b/src/app/dashboard/_components/useDashboardSearchParams.ts
similarity index 100%
rename from src/app/dashboard-new/_components/useDashboardSearchParams.ts
rename to src/app/dashboard/_components/useDashboardSearchParams.ts
diff --git a/src/app/dashboard-new/_components/useExercises.ts b/src/app/dashboard/_components/useExercises.ts
similarity index 100%
rename from src/app/dashboard-new/_components/useExercises.ts
rename to src/app/dashboard/_components/useExercises.ts
diff --git a/src/app/dashboard/getExercisesWhereClause.ts b/src/app/dashboard/getExercisesWhereClause.ts
deleted file mode 100644
index 80df8e3b..00000000
--- a/src/app/dashboard/getExercisesWhereClause.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { exercises, muscleGroupsEnum } from "@/db/schema";
-import type { Exercise, User } from "@/db/types";
-import { and, arrayOverlaps, eq, ilike } from "drizzle-orm";
-
-export type DashboardPageProps = {
-  searchParams: { tags?: string; search?: string };
-};
-
-type Props = DashboardPageProps & { userId: User["id"] };
-
-export const getExercisesWhereClause = ({ searchParams, userId }: Props) => {
-  const muscleGroups = searchParams.tags
-    ? (searchParams.tags
-        .split(",")
-        .filter((item) =>
-          (muscleGroupsEnum.enumValues as string[]).includes(item)
-        ) as Exercise["muscleGroups"])
-    : null;
-
-  if (muscleGroups && searchParams.search) {
-    return and(
-      eq(exercises.userId, userId),
-      arrayOverlaps(exercises.muscleGroups, muscleGroups),
-      ilike(exercises.name, `%${searchParams.search}%`)
-    );
-  }
-
-  if (!searchParams.tags && searchParams.search) {
-    return and(
-      eq(exercises.userId, userId),
-      ilike(exercises.name, `%${searchParams.search}%`)
-    );
-  }
-
-  if (muscleGroups && !searchParams.search) {
-    return and(
-      eq(exercises.userId, userId),
-      arrayOverlaps(exercises.muscleGroups, muscleGroups)
-    );
-  }
-
-  return and(eq(exercises.userId, userId));
-};
diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx
index feb8fd83..d9cbe2c6 100644
--- a/src/app/dashboard/layout.tsx
+++ b/src/app/dashboard/layout.tsx
@@ -1,33 +1,21 @@
 import { DashboardBackground } from "@/components/ui/dashboardBackground";
-import type { ReactNode, ComponentProps, PropsWithChildren } from "react";
+import type { ComponentPropsWithoutRef, PropsWithChildren } from "react";
 
-type Props = {
-  newExerciseForm: ReactNode;
-  allExercisesGrid: ReactNode;
-  exercisesByMonthGrid: ReactNode;
-} & PropsWithChildren;
-
-const Layout = (props: Props) => {
+const Layout = (props: PropsWithChildren) => {
   return (
     <Container>
-      <ContentContainer>
-        {props.newExerciseForm}
-        {props.allExercisesGrid}
-        {props.exercisesByMonthGrid}
-      </ContentContainer>
+      <ContentContainer>{props.children}</ContentContainer>
 
       <BackgroundContainer>
         <DashboardBackground />
       </BackgroundContainer>
-
-      {props.children}
     </Container>
   );
 };
 
 export default Layout;
 
-const Container = (props: ComponentProps<"main">) => {
+const Container = (props: ComponentPropsWithoutRef<"main">) => {
   return (
     <main
       {...props}
@@ -36,7 +24,7 @@ const Container = (props: ComponentProps<"main">) => {
   );
 };
 
-const ContentContainer = (props: ComponentProps<"div">) => {
+const ContentContainer = (props: ComponentPropsWithoutRef<"div">) => {
   return (
     <div
       {...props}
@@ -45,7 +33,7 @@ const ContentContainer = (props: ComponentProps<"div">) => {
   );
 };
 
-const BackgroundContainer = (props: ComponentProps<"div">) => {
+const BackgroundContainer = (props: ComponentPropsWithoutRef<"div">) => {
   return (
     <div
       {...props}
diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index dd4ada82..1f000b84 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -1,5 +1,34 @@
-const Page = () => {
-  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 (
+    <>
+      <NewExerciseForm />
+
+      <HydrationBoundary state={dehydrate(helpers.queryClient)}>
+        <AllExercisesTimeline />
+      </HydrationBoundary>
+
+      <HydrationBoundary state={dehydrate(helpers.queryClient)}>
+        <MonthlyExercisesTimeline />
+      </HydrationBoundary>
+    </>
+  );
 };
 
 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 (
-    <div
-      {...props}
-      className={cn(
-        "relative flex flex-col gap-5 pb-20 text-center before:absolute before:-left-10 before:bottom-0 before:top-0 before:w-1 before:bg-border before:backdrop-blur-md after:absolute after:-left-12 after:top-0 after:aspect-square after:w-5 after:rounded-full after:bg-border after:backdrop-blur-xl first-of-type:mt-10 last-of-type:pb-0 [&:has([data-containsError=true])]:before:bg-destructive [&:has([data-containsError=true])]:after:bg-destructive",
-        props.className
-      )}
-    />
-  );
-};
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 <StrongText>month</StrongText>.
       </Text>
 
-      <TimelineContainer className="w-full max-w-[calc(var(--exercise-card-height)*4+20px*5)] first-of-type:mt-0">
+      <Timeline className="w-full max-w-[calc(var(--exercise-card-height)*4+20px*5)] first-of-type:mt-0">
         <Badge variant="accent" className="mr-auto">
           <time dateTime="all">
             {new Date().toLocaleDateString(undefined, {
@@ -200,7 +200,7 @@ const FeatureOne = () => {
             <RandomFacts exercises={mockExercises} />
           </GridItem.Root>
         </GridLayout>
-      </TimelineContainer>
+      </Timeline>
       <FeaturesGridBackground />
     </FeatureContainer>
   );
diff --git a/src/db/schema.ts b/src/db/schema.ts
index a05e9636..89613539 100644
--- a/src/db/schema.ts
+++ b/src/db/schema.ts
@@ -12,6 +12,7 @@ import {
   pgEnum,
 } from "drizzle-orm/pg-core";
 import type { AdapterAccount } from "@auth/core/adapters";
+import { sql } from "drizzle-orm";
 
 export const users = pgTable("user", {
   id: text("id").notNull().primaryKey(),
@@ -40,7 +41,7 @@ export const accounts = pgTable(
   },
   (account) => ({
     compoundKey: primaryKey(account.provider, account.providerAccountId),
-  })
+  }),
 );
 
 export const sessions = pgTable("session", {
@@ -60,7 +61,7 @@ export const verificationTokens = pgTable(
   },
   (vt) => ({
     compoundKey: primaryKey(vt.identifier, vt.token),
-  })
+  }),
 );
 
 export const muscleGroupsEnum = pgEnum("muscle_groups", [
@@ -89,11 +90,11 @@ export const exercises = pgTable(
     muscleGroups: muscleGroupsEnum("muscle_groups")
       .array()
       .notNull()
-      .default([]),
+      .default(sql`'{}'`),
   },
   (exercise) => ({
     unq: unique().on(exercise.userId, exercise.name),
-  })
+  }),
 );
 
 export const exerciseGridPosition = pgTable("exercise_grid_position", {
@@ -122,5 +123,5 @@ export const exercisesData = pgTable(
   },
   (exerciseData) => ({
     unq: unique().on(exerciseData.doneAt, exerciseData.exerciseId),
-  })
+  }),
 );