From dd2b7e22b8d3feaeff16153f60989ae062bf7135 Mon Sep 17 00:00:00 2001 From: Calum Murphy Date: Tue, 25 Aug 2026 10:23:26 +0100 Subject: [PATCH 1/2] Small styling changes --- backend/example.env | 5 ---- frontend/app/components/ClusterSettings.jsx | 6 ++-- frontend/app/components/PoolSettingsPage.jsx | 2 +- .../components/{Options.jsx => Settings.jsx} | 28 +++++++++++-------- frontend/app/components/TeamsSettingsPage.jsx | 8 +++--- frontend/app/layout.tsx | 2 +- frontend/app/options/page.tsx | 2 +- frontend/example.env | 1 - frontend/setup.sh | 6 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 backend/example.env rename frontend/app/components/{Options.jsx => Settings.jsx} (96%) delete mode 100644 frontend/example.env diff --git a/backend/example.env b/backend/example.env deleted file mode 100644 index 0109561..0000000 --- a/backend/example.env +++ /dev/null @@ -1,5 +0,0 @@ -MONGO_URI= -MONGO_DATABASE=daily -PORT=3000 -CLUSTERS_PER_PERSON=1 -PEOPLE_PER_DAY=1 \ No newline at end of file diff --git a/frontend/app/components/ClusterSettings.jsx b/frontend/app/components/ClusterSettings.jsx index 833db7b..2c762e3 100644 --- a/frontend/app/components/ClusterSettings.jsx +++ b/frontend/app/components/ClusterSettings.jsx @@ -434,7 +434,7 @@ export default function ClusterSettingsPage() { {activeTab === 'instructions' && ( -
+

Instructions

@@ -948,9 +948,9 @@ export default function ClusterSettingsPage() { )} {activeTab === 'results' && ( -
+
-

Recent Results

+

Recent Results

Reports from the last 7 days for this cluster. diff --git a/frontend/app/components/PoolSettingsPage.jsx b/frontend/app/components/PoolSettingsPage.jsx index e9c03c7..b98ab7e 100644 --- a/frontend/app/components/PoolSettingsPage.jsx +++ b/frontend/app/components/PoolSettingsPage.jsx @@ -135,7 +135,7 @@ export default function PoolClustersPage() { ); return ( -

+
diff --git a/frontend/app/components/Options.jsx b/frontend/app/components/Settings.jsx similarity index 96% rename from frontend/app/components/Options.jsx rename to frontend/app/components/Settings.jsx index f34c11f..4e2452d 100644 --- a/frontend/app/components/Options.jsx +++ b/frontend/app/components/Settings.jsx @@ -400,18 +400,17 @@ export default function Options() { {portalEl && confirmPrompt && createPortal( -
-
-

{confirmPrompt.message}

+
+
+
+ ! +
+

Confirmation required

-
- +

{confirmPrompt.message}

+ +
+ +
, diff --git a/frontend/app/components/TeamsSettingsPage.jsx b/frontend/app/components/TeamsSettingsPage.jsx index 1fe9ef6..2d8aaf9 100644 --- a/frontend/app/components/TeamsSettingsPage.jsx +++ b/frontend/app/components/TeamsSettingsPage.jsx @@ -679,7 +679,7 @@ export default function TeamSettingsPage() {

Remove pool from team?

-

+

This will remove{' '} {pendingRemovalPool.name}{' '} from this team. @@ -689,7 +689,7 @@ export default function TeamSettingsPage() { @@ -697,8 +697,8 @@ export default function TeamSettingsPage() {

diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx index b1f919e..ce63d02 100644 --- a/frontend/app/layout.tsx +++ b/frontend/app/layout.tsx @@ -30,7 +30,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
-
{children}
+
{children}
diff --git a/frontend/app/options/page.tsx b/frontend/app/options/page.tsx index 3c22cfd..465c9f3 100644 --- a/frontend/app/options/page.tsx +++ b/frontend/app/options/page.tsx @@ -1,4 +1,4 @@ -import Options from '../components/Options'; +import Options from '../components/Settings'; export const metadata = { title: 'Options' diff --git a/frontend/example.env b/frontend/example.env deleted file mode 100644 index 4b73e25..0000000 --- a/frontend/example.env +++ /dev/null @@ -1 +0,0 @@ -NEXT_PUBLIC_API_URL= \ No newline at end of file diff --git a/frontend/setup.sh b/frontend/setup.sh index 55cc8c7..98a4a9f 100755 --- a/frontend/setup.sh +++ b/frontend/setup.sh @@ -2,7 +2,7 @@ npm i -npm run build -npm run start +# npm run build +# npm run start -#npm run dev \ No newline at end of file +npm run dev \ No newline at end of file From d2da897fccf8404f5ee6f7c042fea4f07421b4ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Aug 2026 09:34:49 +0000 Subject: [PATCH 2/2] chore: apply formatting --- frontend/app/components/Settings.jsx | 22 ++++++++++--------- frontend/app/components/TeamsSettingsPage.jsx | 6 ++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/frontend/app/components/Settings.jsx b/frontend/app/components/Settings.jsx index 4e2452d..f5a534d 100644 --- a/frontend/app/components/Settings.jsx +++ b/frontend/app/components/Settings.jsx @@ -400,18 +400,20 @@ export default function Options() { {portalEl && confirmPrompt && createPortal( -
-
-
- ! -
-

Confirmation required

+
+
+
+ ! +
+

+ Confirmation required +

-

{confirmPrompt.message}

+

+ {confirmPrompt.message} +

- - - @@ -697,8 +697,8 @@ export default function TeamSettingsPage() {