From 4ed51fed22f858bb26798ff72217fd9b05f9c062 Mon Sep 17 00:00:00 2001 From: giancarlo Date: Sat, 13 Apr 2024 15:48:57 +0800 Subject: [PATCH] Update environment files and modify SQL trigger Environment files have been updated; a typo corrected in .env.development, and new variables added in .env.test. Sequence of variables were also reorganized in .env.test for better readability. Additionally, the name of an SQL trigger in seed.sql file has been changed to align with naming convention. Lastly, the application running command in workflow.yml has been modified for efficiency. --- .github/workflows/workflow.yml | 3 +-- apps/web/.env.development | 2 +- apps/web/.env.test | 21 +++++++++++++-------- apps/web/supabase/seed.sql | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 4c701a0a8..ddc6ea4a4 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -88,8 +88,7 @@ jobs: - name: Run App run: | - pnpm --filter web build:test - pnpm --filter web start:test & + pnpm run dev - name: Run Playwright tests run: pnpm run test diff --git a/apps/web/.env.development b/apps/web/.env.development index b56af04cf..3cf5aea8f 100644 --- a/apps/web/.env.development +++ b/apps/web/.env.development @@ -13,7 +13,7 @@ NEXT_PUBLIC_THEME_COLOR_DARK="#0a0a0a" # LOCALES PATH NEXT_PUBLIC_LOCALES_PATH=apps/web/public/locales -# PATHS (to be used in "packaages") +# PATHS (to be used in "packages") SIGN_IN_PATH=/auth/sign-in SIGN_UP_PATH=/auth/sign-up TEAM_ACCOUNTS_HOME_PATH=/home diff --git a/apps/web/.env.test b/apps/web/.env.test index 0a9ddfaef..9a0355845 100644 --- a/apps/web/.env.test +++ b/apps/web/.env.test @@ -1,3 +1,6 @@ +# TEST ENVIRONMENT VARIABLES +NEXT_PUBLIC_CI=true + # SITE NEXT_PUBLIC_SITE_URL=http://localhost:3000 NEXT_PUBLIC_PRODUCT_NAME=Makerkit @@ -7,6 +10,15 @@ NEXT_PUBLIC_DEFAULT_THEME_MODE=light NEXT_PUBLIC_THEME_COLOR="#ffffff" NEXT_PUBLIC_THEME_COLOR_DARK="#0a0a0a" +# LOCALES PATH +NEXT_PUBLIC_LOCALES_PATH=apps/web/public/locales + +# PATHS (to be used in "packages") +SIGN_IN_PATH=/auth/sign-in +SIGN_UP_PATH=/auth/sign-up +TEAM_ACCOUNTS_HOME_PATH=/home +INVITATION_PAGE_PATH=/join + # CMS CMS_CLIENT=keystatic @@ -41,11 +53,4 @@ NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY= NEXT_PUBLIC_ENABLE_ACCOUNT_DELETION=true NEXT_PUBLIC_ENABLE_PERSONAL_ACCOUNT_BILLING=true NEXT_PUBLIC_ENABLE_ORGANIZATION_DELETION=true -NEXT_PUBLIC_ENABLE_ORGANIZATION_BILLING=true - -NEXT_PUBLIC_CI=true - -SIGN_IN_PATH=/auth/sign-in -SIGN_UP_PATH=/auth/sign-up -TEAM_ACCOUNTS_HOME_PATH=/home -INVITATION_PAGE_PATH=/join \ No newline at end of file +NEXT_PUBLIC_ENABLE_ORGANIZATION_BILLING=true \ No newline at end of file diff --git a/apps/web/supabase/seed.sql b/apps/web/supabase/seed.sql index 526c37c9a..b2cb07042 100644 --- a/apps/web/supabase/seed.sql +++ b/apps/web/supabase/seed.sql @@ -25,7 +25,7 @@ execute function "supabase_functions"."http_request"( ); -- this webhook will be triggered after every delete on the accounts_memberships table -create trigger "account_membership_delete" after delete +create trigger "accounts_memberships_delete" after delete on "public"."accounts_memberships" for each row execute function "supabase_functions"."http_request"( 'http://host.docker.internal:3000/api/db/webhook',