From 1fa581e0f3b784e0c16517dbe9701c11fc793435 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Thu, 25 Jun 2026 20:51:09 -0400 Subject: [PATCH 01/19] migration + frontend change --- .../20260625000000_add_estimated_hours_to_task/migration.sql | 2 ++ src/backend/src/prisma/schema.prisma | 1 + src/frontend/index.html | 2 +- src/frontend/src/pages/HomePage/AdminHomePage.tsx | 3 +++ src/frontend/src/pages/HomePage/LeadHomePage.tsx | 3 +++ 5 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/backend/src/prisma/migrations/20260625000000_add_estimated_hours_to_task/migration.sql diff --git a/src/backend/src/prisma/migrations/20260625000000_add_estimated_hours_to_task/migration.sql b/src/backend/src/prisma/migrations/20260625000000_add_estimated_hours_to_task/migration.sql new file mode 100644 index 0000000000..883ed7a1b9 --- /dev/null +++ b/src/backend/src/prisma/migrations/20260625000000_add_estimated_hours_to_task/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "Task" ADD COLUMN "estimatedHours" DOUBLE PRECISION; diff --git a/src/backend/src/prisma/schema.prisma b/src/backend/src/prisma/schema.prisma index 47adf8f79e..f6e5527106 100644 --- a/src/backend/src/prisma/schema.prisma +++ b/src/backend/src/prisma/schema.prisma @@ -693,6 +693,7 @@ model Task { notes String deadline DateTime? startDate DateTime? + estimatedHours Float? assignees User[] @relation(name: "assignedTo") priority Task_Priority status Task_Status diff --git a/src/frontend/index.html b/src/frontend/index.html index 82c96d5870..afe7460839 100644 --- a/src/frontend/index.html +++ b/src/frontend/index.html @@ -11,7 +11,7 @@ - FinishLine + FinishLine | Sandbox diff --git a/src/frontend/src/pages/HomePage/AdminHomePage.tsx b/src/frontend/src/pages/HomePage/AdminHomePage.tsx index dab4afd38e..2e4b5d056d 100644 --- a/src/frontend/src/pages/HomePage/AdminHomePage.tsx +++ b/src/frontend/src/pages/HomePage/AdminHomePage.tsx @@ -20,6 +20,9 @@ const AdminHomePage = ({ user }: AdminHomePageProps) => { Welcome, {user.firstName}! + + 🚧 Sandbox Environment + { Welcome, {user.firstName}! + + 🚧 Sandbox Environment + Date: Thu, 25 Jun 2026 22:03:46 -0400 Subject: [PATCH 02/19] trigger new workflow run From f877af5bdedcbaf6eee0e7ff83365893f9edd5eb Mon Sep 17 00:00:00 2001 From: wavehassman Date: Thu, 25 Jun 2026 22:16:00 -0400 Subject: [PATCH 03/19] trigger new workflow run From 5a34cbad37f86918816938ad68152e9e4e8b8302 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Thu, 25 Jun 2026 22:31:48 -0400 Subject: [PATCH 04/19] trigger new workflow run From ab13e823577a6700ae4bb3a37e7296cd388eb250 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Thu, 25 Jun 2026 22:43:33 -0400 Subject: [PATCH 05/19] trigger new workflow run From a6935d0da13fe0c2545de9e33f6068878e3b0e15 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Fri, 26 Jun 2026 14:58:02 -0400 Subject: [PATCH 06/19] trigger new workflow run From 42c74fb7aa948b315c950ce4c20713293b8d0175 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Fri, 26 Jun 2026 16:03:07 -0400 Subject: [PATCH 07/19] trigger new workflow run From d2534a5164c86fba0dc6730fd53cfe12d38e6566 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Fri, 26 Jun 2026 16:52:42 -0400 Subject: [PATCH 08/19] trigger new workflow run From 63386e8a892bda56c00bb4ae7dd336cc614cd75a Mon Sep 17 00:00:00 2001 From: wavehassman Date: Thu, 2 Jul 2026 22:22:11 -0400 Subject: [PATCH 09/19] trigger new workflow run From 90735ba13b73fd569002c6090cfc3aa39a18232a Mon Sep 17 00:00:00 2001 From: wavehassman Date: Thu, 2 Jul 2026 22:42:33 -0400 Subject: [PATCH 10/19] trigger new workflow run From 5e69584006e5380b2d6291f51cd5fdded3a4a308 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Thu, 2 Jul 2026 23:15:25 -0400 Subject: [PATCH 11/19] trigger new workflow run From bc2f54533177ebcdb73037eba3dbb9413e7a4f6e Mon Sep 17 00:00:00 2001 From: wavehassman Date: Thu, 2 Jul 2026 23:24:37 -0400 Subject: [PATCH 12/19] trigger new workflow run From 4a27ef309dc197b79ecdae37a8cb5866c44f5cc3 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Fri, 3 Jul 2026 10:09:46 -0400 Subject: [PATCH 13/19] trigger new workflow run From 33c079f4b5b41b0fcef0345fd875931a7ac91ece Mon Sep 17 00:00:00 2001 From: wavehassman Date: Fri, 3 Jul 2026 11:49:52 -0400 Subject: [PATCH 14/19] trigger new workflow run From 43fc92215569b89ae1cd620979de6862d64cb566 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Fri, 3 Jul 2026 12:41:29 -0400 Subject: [PATCH 15/19] trigger new workflow run From 3191e5c08a5e0c18fb85c49be41f3e7401e3a3a9 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Fri, 3 Jul 2026 13:14:54 -0400 Subject: [PATCH 16/19] trigger new workflow run From da1e67e87a37dee72a7a6287be33b3336c3fe690 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Fri, 3 Jul 2026 15:53:19 -0400 Subject: [PATCH 17/19] trigger new workflow run From 41b2cc97b1b6e080ff3698b00cc1e3d373487bbd Mon Sep 17 00:00:00 2001 From: wavehassman Date: Fri, 3 Jul 2026 16:34:32 -0400 Subject: [PATCH 18/19] fix CORS/JWT middleware for sandbox to use real Google auth like production --- src/backend/index.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/backend/index.ts b/src/backend/index.ts index 0df1277a2d..729d53894b 100644 --- a/src/backend/index.ts +++ b/src/backend/index.ts @@ -33,9 +33,12 @@ const app = express(); const port = process.env.PORT || 3001; const isProd = process.env.NODE_ENV === 'production'; +// Sandbox's frontend is a real production build, so it always uses the real Google +// login flow (never the dev login) and needs the same auth/CORS handling as prod. +const usesRealGoogleAuth = isProd || process.env.NODE_ENV === 'sandbox'; // cors options -const allowedHeaders = isProd ? prodHeaders : '*'; +const allowedHeaders = usesRealGoogleAuth ? prodHeaders : '*'; // Build list of allowed origins const allowedOrigins = [ @@ -85,7 +88,7 @@ app.use(express.json()); app.use(cors(options)); // ensure each request is authorized using JWT -app.use(isProd ? requireJwtProd : requireJwtDev); +app.use(usesRealGoogleAuth ? requireJwtProd : requireJwtDev); // get user and organization app.use(getUserAndOrganization); From 3c0bcdf88be8f652d909d95e0ce05082d4107dd7 Mon Sep 17 00:00:00 2001 From: wavehassman Date: Sun, 5 Jul 2026 11:21:34 -0400 Subject: [PATCH 19/19] trigger new workflow run