diff --git a/api/.env.development b/api/.env.development index 8e2eb2b..20ef2b3 100644 --- a/api/.env.development +++ b/api/.env.development @@ -6,7 +6,8 @@ STREAM_CHAT_API_SECRET=zrr32sqenw3atpv9rnz2nhhyyncf7bunr7fmfqy9r7e69fcw978dhzevm XTABLO_URL="https://app-staging.xtablo.com" -CORS_ORIGIN="http://localhost:5173" + +CORS_ORIGIN="http://localhost:5173,http://localhost:5174" R2_ACCOUNT_ID="9715fa14c5e5d1612301572cf1c6bbee" R2_ACCESS_KEY_ID="caeb987bbcd601708a93c6aa562064ef" diff --git a/api/src/config.ts b/api/src/config.ts index b2cf36f..f2d688e 100644 --- a/api/src/config.ts +++ b/api/src/config.ts @@ -16,7 +16,7 @@ export interface AppConfig { R2_ACCOUNT_ID: string; R2_ACCESS_KEY_ID: string; R2_SECRET_ACCESS_KEY: string; - CORS_ORIGIN: string[]; + CORS_ORIGIN: string; LOG_LEVEL: "debug" | "info" | "warn" | "error"; SYNC_CALS_SECRET: string; } @@ -47,20 +47,38 @@ function createConfig(): AppConfig { process.env.SUPABASE_SERVICE_ROLE_KEY ), SUPABASE_CONNECTION_STRING: process.env.SUPABASE_CONNECTION_STRING || "", - STREAM_CHAT_API_KEY: validateEnvVar("STREAM_CHAT_API_KEY", process.env.STREAM_CHAT_API_KEY), + STREAM_CHAT_API_KEY: validateEnvVar( + "STREAM_CHAT_API_KEY", + process.env.STREAM_CHAT_API_KEY + ), STREAM_CHAT_API_SECRET: validateEnvVar( "STREAM_CHAT_API_SECRET", process.env.STREAM_CHAT_API_SECRET ), EMAIL_USER: validateEnvVar("EMAIL_USER", process.env.EMAIL_USER), - EMAIL_CLIENT_ID: validateEnvVar("EMAIL_CLIENT_ID", process.env.EMAIL_CLIENT_ID), - EMAIL_CLIENT_SECRET: validateEnvVar("EMAIL_CLIENT_SECRET", process.env.EMAIL_CLIENT_SECRET), - EMAIL_REFRESH_TOKEN: validateEnvVar("EMAIL_REFRESH_TOKEN", process.env.EMAIL_REFRESH_TOKEN), - CORS_ORIGIN: [process.env.CORS_ORIGIN || "https://app.xtablo.com"], + EMAIL_CLIENT_ID: validateEnvVar( + "EMAIL_CLIENT_ID", + process.env.EMAIL_CLIENT_ID + ), + EMAIL_CLIENT_SECRET: validateEnvVar( + "EMAIL_CLIENT_SECRET", + process.env.EMAIL_CLIENT_SECRET + ), + EMAIL_REFRESH_TOKEN: validateEnvVar( + "EMAIL_REFRESH_TOKEN", + process.env.EMAIL_REFRESH_TOKEN + ), + CORS_ORIGIN: process.env.CORS_ORIGIN || "https://app.xtablo.com", XTABLO_URL: process.env.XTABLO_URL || "https://app.xtablo.com", R2_ACCOUNT_ID: validateEnvVar("R2_ACCOUNT_ID", process.env.R2_ACCOUNT_ID), - R2_ACCESS_KEY_ID: validateEnvVar("R2_ACCESS_KEY_ID", process.env.R2_ACCESS_KEY_ID), - R2_SECRET_ACCESS_KEY: validateEnvVar("R2_SECRET_ACCESS_KEY", process.env.R2_SECRET_ACCESS_KEY), + R2_ACCESS_KEY_ID: validateEnvVar( + "R2_ACCESS_KEY_ID", + process.env.R2_ACCESS_KEY_ID + ), + R2_SECRET_ACCESS_KEY: validateEnvVar( + "R2_SECRET_ACCESS_KEY", + process.env.R2_SECRET_ACCESS_KEY + ), SYNC_CALS_SECRET: process.env.SYNC_CALS_SECRET || "", LOG_LEVEL: "info", }; diff --git a/api/src/index.ts b/api/src/index.ts index 3b46319..3c23040 100644 --- a/api/src/index.ts +++ b/api/src/index.ts @@ -17,7 +17,7 @@ app.use(logger()); app.use("*", async (c, next) => { const corsMiddleware = cors({ - origin: config.CORS_ORIGIN, + origin: config.CORS_ORIGIN.split(","), allowHeaders: [ "Authorization", "Content-Type", diff --git a/apps/external/tsconfig.tsbuildinfo b/apps/external/tsconfig.tsbuildinfo new file mode 100644 index 0000000..bf0b063 --- /dev/null +++ b/apps/external/tsconfig.tsbuildinfo @@ -0,0 +1 @@ +{"root":["./src/custommodal.tsx","./src/embeddedbookingpage.tsx","./src/floatingbookingwidget.tsx","./src/loadingspinner.tsx","./src/userstoreprovider.tsx","./src/main.tsx","./src/routes.tsx","./src/vite-env.d.ts","./src/lib/api.ts","./src/lib/supabase.ts"],"version":"5.9.3"} \ No newline at end of file diff --git a/apps/main/stats.html b/apps/main/stats.html index 32b6cbf..42cf62f 100644 --- a/apps/main/stats.html +++ b/apps/main/stats.html @@ -4929,7 +4929,7 @@ var drawChart = (function (exports) {