From 6049c17aa7bf30efb6039cecca784be18034be1e Mon Sep 17 00:00:00 2001 From: giancarlo Date: Sat, 13 Apr 2024 15:40:52 +0800 Subject: [PATCH] Update environment variables and improve code formatting Added new paths and other configurations to .env files for production, test, and development environments. Removed the requirement for email confirmation from all .env files. In addition, unnecessary spacing in the update-member-role-dialog component was removed for better code readability. --- apps/web/.env.development | 13 +++- apps/web/.env.production | 47 ++++++++++++++- apps/web/.env.test | 8 ++- .../members/update-member-role-dialog.tsx | 59 ++++++++++--------- 4 files changed, 93 insertions(+), 34 deletions(-) diff --git a/apps/web/.env.development b/apps/web/.env.development index ad64067d2..b56af04cf 100644 --- a/apps/web/.env.development +++ b/apps/web/.env.development @@ -1,3 +1,6 @@ +# This file is used to define environment variables for the development environment. +# These values are only used when running the app in development mode. + # 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 "packaages") +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 @@ -23,7 +35,6 @@ NEXT_PUBLIC_BILLING_PROVIDER=stripe # SUPABASE NEXT_PUBLIC_SUPABASE_URL=http://127.0.0.1:54321 NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 -NEXT_PUBLIC_REQUIRE_EMAIL_CONFIRMATION=true ## THIS IS FOR DEVELOPMENT ONLY - DO NOT USE IN PRODUCTION SUPABASE_DB_WEBHOOK_SECRET=WEBHOOKSECRET diff --git a/apps/web/.env.production b/apps/web/.env.production index 7444db1d4..6c50e0284 100644 --- a/apps/web/.env.production +++ b/apps/web/.env.production @@ -1,4 +1,47 @@ -## DO NOT ADD VARS HERE UNLESS THEY ARE PUBLIC (eg. prefixed with NEXT_PUBLIC_) +## DO NOT ADD VARS HERE UNLESS THEY ARE PUBLIC OR NOT SENSITIVE +## THIS ENV IS USED FOR PRODUCTION AND IS COMMITED TO THE REPO +## AVOID PLACING SENSITIVE DATA IN THIS FILE. +## PUBLIC KEYS OR CONFIGURATION ARE OKAY TO BE PLACED HERE. +# SITE +NEXT_PUBLIC_SITE_URL=http://localhost:3000 NEXT_PUBLIC_PRODUCT_NAME=Makerkit -NEXT_PUBLIC_BILLING_PROVIDER=stripe \ No newline at end of file +NEXT_PUBLIC_SITE_TITLE="Makerkit - The easiest way to build and manage your SaaS" +NEXT_PUBLIC_SITE_DESCRIPTION="Makerkit is the easiest way to build and manage your SaaS. It provides you with the tools you need to build your SaaS, without the hassle of building it from scratch." +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 "packaages") +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 + +# KEYSTATIC +NEXT_PUBLIC_KEYSTATIC_CONTENT_PATH=./content + +# AUTH +NEXT_PUBLIC_AUTH_PASSWORD=true +NEXT_PUBLIC_AUTH_MAGIC_LINK=false + +# BILLING +NEXT_PUBLIC_BILLING_PROVIDER=stripe + +# SUPABASE +NEXT_PUBLIC_SUPABASE_URL= + +# STRIPE +NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY= + +# FEATURE FLAGS +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 \ No newline at end of file diff --git a/apps/web/.env.test b/apps/web/.env.test index 4cbdee682..0a9ddfaef 100644 --- a/apps/web/.env.test +++ b/apps/web/.env.test @@ -23,7 +23,6 @@ NEXT_PUBLIC_BILLING_PROVIDER=stripe # SUPABASE NEXT_PUBLIC_SUPABASE_URL=http://127.0.0.1:54321 NEXT_PUBLIC_SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0 -NEXT_PUBLIC_REQUIRE_EMAIL_CONFIRMATION=true ## THIS IS FOR DEVELOPMENT ONLY - DO NOT USE IN PRODUCTION SUPABASE_DB_WEBHOOK_SECRET=WEBHOOKSECRET @@ -44,4 +43,9 @@ NEXT_PUBLIC_ENABLE_PERSONAL_ACCOUNT_BILLING=true NEXT_PUBLIC_ENABLE_ORGANIZATION_DELETION=true NEXT_PUBLIC_ENABLE_ORGANIZATION_BILLING=true -NEXT_PUBLIC_CI=true \ No newline at end of file +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 diff --git a/packages/features/team-accounts/src/components/members/update-member-role-dialog.tsx b/packages/features/team-accounts/src/components/members/update-member-role-dialog.tsx index 3f107c5c2..2926e4155 100644 --- a/packages/features/team-accounts/src/components/members/update-member-role-dialog.tsx +++ b/packages/features/team-accounts/src/components/members/update-member-role-dialog.tsx @@ -47,37 +47,37 @@ export const UpdateMemberRoleDialog: React.FC<{ userRole, userRoleHierarchy, }) => { - return ( - - - - - - + return ( + + + + + + - - - - + + + + - - {(data) => ( - - )} - - - - ); -}; + + {(data) => ( + + )} + + + + ); + }; function UpdateMemberForm({ userId, @@ -130,6 +130,7 @@ function UpdateMemberForm({ return (