From 909b64dd67268377dbc8d1a6764750160f7cfa2a Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Tue, 25 Feb 2025 16:18:58 -0700 Subject: [PATCH 01/12] add testing scripts --- test-run.sh | 3 +++ test-setup.sh | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 test-run.sh create mode 100644 test-setup.sh diff --git a/test-run.sh b/test-run.sh new file mode 100644 index 0000000..61c83bb --- /dev/null +++ b/test-run.sh @@ -0,0 +1,3 @@ +#! /bin/bash +npm run start --prefix ./server & +npm run start --prefix ./client -- --host & diff --git a/test-setup.sh b/test-setup.sh new file mode 100644 index 0000000..b27fd66 --- /dev/null +++ b/test-setup.sh @@ -0,0 +1,5 @@ +#! /bin/bash +cp .env.sample .env + +npm ci --prefix ./client +npm ci --prefix ./server From 479398905aee74ddd777a1b2dcf850037e17c154 Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Tue, 25 Feb 2025 16:25:04 -0700 Subject: [PATCH 02/12] update scripts --- test-run.sh | 0 test-setup.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 test-run.sh mode change 100644 => 100755 test-setup.sh diff --git a/test-run.sh b/test-run.sh old mode 100644 new mode 100755 diff --git a/test-setup.sh b/test-setup.sh old mode 100644 new mode 100755 index b27fd66..809496d --- a/test-setup.sh +++ b/test-setup.sh @@ -1,5 +1,5 @@ #! /bin/bash -cp .env.sample .env +cp .env.example .env npm ci --prefix ./client npm ci --prefix ./server From 13183cadfe22d0de770b47d9ffd630343f48192d Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Tue, 25 Feb 2025 16:34:45 -0700 Subject: [PATCH 03/12] update scripts --- test-run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test-run.sh b/test-run.sh index 61c83bb..3e51042 100755 --- a/test-run.sh +++ b/test-run.sh @@ -1,3 +1,5 @@ #! /bin/bash +echo "starting backend" npm run start --prefix ./server & -npm run start --prefix ./client -- --host & +echo "starting frontend" +npm run start --prefix ./client -- --host From b35b1ec2915d7a8f4fc801cf137de184bd1d3b98 Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Tue, 25 Feb 2025 16:53:23 -0700 Subject: [PATCH 04/12] add test env --- .env.test | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .env.test diff --git a/.env.test b/.env.test new file mode 100644 index 0000000..03965df --- /dev/null +++ b/.env.test @@ -0,0 +1,9 @@ +# FRONTEND +PORT=3100 +VITE_METABASE_INSTANCE_URL="http://localhost:4000" +VITE_AUTH_PROVIDER_URI="http://localhost:9090/sso/metabase" + +# BACKEND +BACKEND_PORT=9090 +METABASE_INSTANCE_URL= "http://localhost:4000" +METABASE_JWT_SHARED_SECRET="ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" From 3ff79c4fbae63ba6d6ae7552d8156c3fd7016211 Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Tue, 25 Feb 2025 18:38:07 -0700 Subject: [PATCH 05/12] add test env --- .env.test | 4 ++-- test-setup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.test b/.env.test index 03965df..a027a46 100644 --- a/.env.test +++ b/.env.test @@ -1,9 +1,9 @@ # FRONTEND PORT=3100 -VITE_METABASE_INSTANCE_URL="http://localhost:4000" +VITE_METABASE_INSTANCE_URL="http://host-metabase:3000" VITE_AUTH_PROVIDER_URI="http://localhost:9090/sso/metabase" # BACKEND BACKEND_PORT=9090 -METABASE_INSTANCE_URL= "http://localhost:4000" +METABASE_INSTANCE_URL= "http://host-metabase:3000" METABASE_JWT_SHARED_SECRET="ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" diff --git a/test-setup.sh b/test-setup.sh index 809496d..1600355 100755 --- a/test-setup.sh +++ b/test-setup.sh @@ -1,5 +1,5 @@ #! /bin/bash -cp .env.example .env +cp .env.test .env npm ci --prefix ./client npm ci --prefix ./server From faf5f5b722d645e42d4e4cf37aa233a68690ad9c Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Tue, 25 Feb 2025 18:50:35 -0700 Subject: [PATCH 06/12] add test env --- .env.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.test b/.env.test index a027a46..736571e 100644 --- a/.env.test +++ b/.env.test @@ -1,6 +1,6 @@ # FRONTEND PORT=3100 -VITE_METABASE_INSTANCE_URL="http://host-metabase:3000" +VITE_METABASE_INSTANCE_URL="http://localhost:3000" VITE_AUTH_PROVIDER_URI="http://localhost:9090/sso/metabase" # BACKEND From 0c01f2c325ab19892e0cdf1157fb296e59682bdd Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Wed, 26 Feb 2025 13:01:52 -0700 Subject: [PATCH 07/12] update config --- .env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 3737a7c..a0e7433 100644 --- a/.env.example +++ b/.env.example @@ -1,9 +1,9 @@ # FRONTEND PORT=3100 VITE_METABASE_INSTANCE_URL="http://localhost:3000" -VITE_AUTH_PROVIDER_URI="http://localhost:9090/sso/metabase" +VITE_AUTH_PROVIDER_URI="http://localhost:9091/sso/metabase" # BACKEND -BACKEND_PORT=9090 +BACKEND_PORT=9091 METABASE_INSTANCE_URL= "http://localhost:3000" METABASE_JWT_SHARED_SECRET="TODO" From 0e8b5b88f5f6aed5a88cfd552e5f073d6bb10d37 Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Wed, 26 Feb 2025 13:06:11 -0700 Subject: [PATCH 08/12] update config --- .env.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.test b/.env.test index 736571e..8ed2c87 100644 --- a/.env.test +++ b/.env.test @@ -1,9 +1,9 @@ # FRONTEND PORT=3100 -VITE_METABASE_INSTANCE_URL="http://localhost:3000" +VITE_METABASE_INSTANCE_URL="http://localhost:4000" VITE_AUTH_PROVIDER_URI="http://localhost:9090/sso/metabase" # BACKEND BACKEND_PORT=9090 -METABASE_INSTANCE_URL= "http://host-metabase:3000" +METABASE_INSTANCE_URL= "http://host-metabase:4000" METABASE_JWT_SHARED_SECRET="ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" From af2938c47117d12451b6fae707c7d7200921fada Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Wed, 26 Feb 2025 13:11:02 -0700 Subject: [PATCH 09/12] update config --- .env.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.test b/.env.test index 8ed2c87..80d66af 100644 --- a/.env.test +++ b/.env.test @@ -1,9 +1,9 @@ # FRONTEND PORT=3100 VITE_METABASE_INSTANCE_URL="http://localhost:4000" -VITE_AUTH_PROVIDER_URI="http://localhost:9090/sso/metabase" +VITE_AUTH_PROVIDER_URI="http://localhost:9091/sso/metabase" # BACKEND -BACKEND_PORT=9090 +BACKEND_PORT=9091 METABASE_INSTANCE_URL= "http://host-metabase:4000" METABASE_JWT_SHARED_SECRET="ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" From 2702f91e9bd6242027a220d6bddb1bc1053b379d Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Wed, 26 Feb 2025 14:12:34 -0700 Subject: [PATCH 10/12] update config --- .env.example | 4 ++-- .env.test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index a0e7433..3737a7c 100644 --- a/.env.example +++ b/.env.example @@ -1,9 +1,9 @@ # FRONTEND PORT=3100 VITE_METABASE_INSTANCE_URL="http://localhost:3000" -VITE_AUTH_PROVIDER_URI="http://localhost:9091/sso/metabase" +VITE_AUTH_PROVIDER_URI="http://localhost:9090/sso/metabase" # BACKEND -BACKEND_PORT=9091 +BACKEND_PORT=9090 METABASE_INSTANCE_URL= "http://localhost:3000" METABASE_JWT_SHARED_SECRET="TODO" diff --git a/.env.test b/.env.test index 80d66af..4d43da7 100644 --- a/.env.test +++ b/.env.test @@ -1,9 +1,9 @@ # FRONTEND PORT=3100 -VITE_METABASE_INSTANCE_URL="http://localhost:4000" +VITE_METABASE_INSTANCE_URL="http://localhost:3000" VITE_AUTH_PROVIDER_URI="http://localhost:9091/sso/metabase" # BACKEND BACKEND_PORT=9091 -METABASE_INSTANCE_URL= "http://host-metabase:4000" +METABASE_INSTANCE_URL= "http://host-metabase:3000" METABASE_JWT_SHARED_SECRET="ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" From 3e15ccb34b77858869b44daae93d3532c5e5f70b Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Wed, 26 Feb 2025 15:15:15 -0700 Subject: [PATCH 11/12] update env --- .env.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.test b/.env.test index 4d43da7..80d66af 100644 --- a/.env.test +++ b/.env.test @@ -1,9 +1,9 @@ # FRONTEND PORT=3100 -VITE_METABASE_INSTANCE_URL="http://localhost:3000" +VITE_METABASE_INSTANCE_URL="http://localhost:4000" VITE_AUTH_PROVIDER_URI="http://localhost:9091/sso/metabase" # BACKEND BACKEND_PORT=9091 -METABASE_INSTANCE_URL= "http://host-metabase:3000" +METABASE_INSTANCE_URL= "http://host-metabase:4000" METABASE_JWT_SHARED_SECRET="ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" From a1e56ab74ec081c03a3d97b13ba9a50374f11590 Mon Sep 17 00:00:00 2001 From: Ryan Laurie Date: Wed, 26 Feb 2025 15:25:23 -0700 Subject: [PATCH 12/12] remove run script --- test-run.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100755 test-run.sh diff --git a/test-run.sh b/test-run.sh deleted file mode 100755 index 3e51042..0000000 --- a/test-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! /bin/bash -echo "starting backend" -npm run start --prefix ./server & -echo "starting frontend" -npm run start --prefix ./client -- --host