diff --git a/.github/workflows/main-deploy-client.yml b/.github/workflows/main-deploy-client.yml index 09d43819..347f5f19 100644 --- a/.github/workflows/main-deploy-client.yml +++ b/.github/workflows/main-deploy-client.yml @@ -22,10 +22,10 @@ jobs: working-directory: client run: | touch .env - echo "REACT_APP_PUBLIC_POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_KEY }}" >> .env - echo "REACT_APP_PUBLIC_POSTHOG_HOST=${{ secrets.REACT_APP_PUBLIC_POSTHOG_HOST }}" >> .env - echo "DISABLE_CAPTURE=${{ env.DISABLE_CAPTURE }}" >> .env - echo "COLLEGE_SCORECARD_KEY=${{ secrets.COLLEGE_SCORECARD_KEY }}" >> .env + echo "VITE_PUBLIC_POSTHOG_KEY=${{ secrets.VITE_PUBLIC_POSTHOG_KEY }}" >> .env + echo "VITE_PUBLIC_POSTHOG_HOST=${{ secrets.VITE_PUBLIC_POSTHOG_HOST }}" >> .env + echo "VITE_POSTHOG_DISABLE_CAPTURE=${{ env.DISABLE_CAPTURE }}" >> .env + echo "VITE_COLLEGE_SCORECARD_KEY=${{ secrets.VITE_COLLEGE_SCORECARD_KEY }}" >> .env echo "BETTER_AUTH_SECRET=${{ secrets.BETTER_AUTH_SECRET }}" >> .env echo "BETTER_AUTH_URL=${{ secrets.BETTER_AUTH_URL }}" >> .env diff --git a/.github/workflows/main-deploy-server.yml b/.github/workflows/main-deploy-server.yml index c012db4e..be0ec819 100644 --- a/.github/workflows/main-deploy-server.yml +++ b/.github/workflows/main-deploy-server.yml @@ -34,7 +34,7 @@ jobs: echo "NODE_ENV=development" >> .env echo "ORCID_PRODUCTION_CLIENT_ID=${{ secrets.ORCID_PRODUCTION_CLIENT_ID }}" >> .env echo "ORCID_PRODUCTION_CLIENT_SECRET=${{ secrets.ORCID_PRODUCTION_CLIENT_SECRET }}" >> .env - echo "POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_KEY }}" >> .env + echo "POSTHOG_KEY=${{ secrets.VITE_PUBLIC_POSTHOG_KEY }}" >> .env echo "DISABLE_CAPTURE=${{ env.DISABLE_CAPTURE }}" >> .env echo "BETTER_AUTH_SECRET=${{ secrets.BETTER_AUTH_SECRET }}" >> .env echo "BETTER_AUTH_URL=${{ secrets.BETTER_AUTH_URL }}" >> .env diff --git a/.github/workflows/main-pr-build-test.yml b/.github/workflows/main-pr-build-test.yml index 16f76e61..753d418d 100644 --- a/.github/workflows/main-pr-build-test.yml +++ b/.github/workflows/main-pr-build-test.yml @@ -37,7 +37,7 @@ jobs: echo "NODE_ENV=development" >> .env echo "ORCID_SANDBOX_CLIENT_ID=${{ secrets.ORCID_SANDBOX_CLIENT_ID }}" >> .env echo "ORCID_SANDBOX_CLIENT_SECRET=${{ secrets.ORCID_SANDBOX_CLIENT_SECRET }}" >> .env - echo "POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_KEY }}" >> .env + echo "POSTHOG_KEY=${{ secrets.VITE_PUBLIC_POSTHOG_KEY }}" >> .env echo "DISABLE_CAPTURE=${{ env.DISABLE_CAPTURE }}" >> .env echo "BETTER_AUTH_SECRET=${{ secrets.BETTER_AUTH_SECRET }}" >> .env echo "BETTER_AUTH_URL=${{ env.BETTER_AUTH_URL }}" >> .env @@ -104,7 +104,7 @@ jobs: echo "NODE_ENV=development" >> .env echo "ORCID_SANDBOX_CLIENT_ID=${{ secrets.ORCID_SANDBOX_CLIENT_ID }}" >> .env echo "ORCID_SANDBOX_CLIENT_SECRET=${{ secrets.ORCID_SANDBOX_CLIENT_SECRET }}" >> .env - echo "POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_KEY }}" >> .env + echo "POSTHOG_KEY=${{ secrets.VITE_PUBLIC_POSTHOG_KEY }}" >> .env echo "DISABLE_CAPTURE=${{ env.DISABLE_CAPTURE }}" >> .env echo "BETTER_AUTH_SECRET=${{ secrets.BETTER_AUTH_SECRET }}" >> .env echo "BETTER_AUTH_URL=${{ env.BETTER_AUTH_URL }}" >> .env @@ -158,7 +158,7 @@ jobs: echo "NODE_ENV=development" >> .env echo "ORCID_SANDBOX_CLIENT_ID=${{ secrets.ORCID_SANDBOX_CLIENT_ID }}" >> .env echo "ORCID_SANDBOX_CLIENT_SECRET=${{ secrets.ORCID_SANDBOX_CLIENT_SECRET }}" >> .env - echo "POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_KEY }}" >> .env + echo "POSTHOG_KEY=${{ secrets.VITE_PUBLIC_POSTHOG_KEY }}" >> .env echo "DISABLE_CAPTURE=${{ env.DISABLE_CAPTURE }}" >> .env echo "BETTER_AUTH_SECRET=${{ secrets.BETTER_AUTH_SECRET }}" >> .env echo "BETTER_AUTH_URL=${{ env.BETTER_AUTH_URL }}" >> .env @@ -174,10 +174,10 @@ jobs: run: | touch .env echo "CONNECTION_STRING=${{ env.CONNECTION_STRING }}" >> .env - echo "REACT_APP_PUBLIC_POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_KEY }}" >> .env - echo "REACT_APP_PUBLIC_POSTHOG_HOST=${{ secrets.REACT_APP_PUBLIC_POSTHOG_HOST }}" >> .env - echo "DISABLE_CAPTURE=${{ env.DISABLE_CAPTURE }}" >> .env - echo "COLLEGE_SCORECARD_KEY=${{ secrets.COLLEGE_SCORECARD_KEY }}" >> .env + echo "VITE_PUBLIC_POSTHOG_KEY=${{ secrets.VITE_PUBLIC_POSTHOG_KEY }}" >> .env + echo "VITE_PUBLIC_POSTHOG_HOST=${{ secrets.VITE_PUBLIC_POSTHOG_HOST }}" >> .env + echo "VITE_POSTHOG_DISABLE_CAPTURE=${{ env.DISABLE_CAPTURE }}" >> .env + echo "VITE_COLLEGE_SCORECARD_KEY=${{ secrets.VITE_COLLEGE_SCORECARD_KEY }}" >> .env echo "BETTER_AUTH_SECRET=${{ secrets.BETTER_AUTH_SECRET }}" >> .env echo "BETTER_AUTH_URL=${{ env.BETTER_AUTH_URL }}" >> .env echo "TEST_USER_EMAIL=${{ env.TEST_USER_EMAIL }}" >> .env diff --git a/client/src/components/SearchSelect/index.tsx b/client/src/components/SearchSelect/index.tsx index 0b40a40c..d1f44246 100644 --- a/client/src/components/SearchSelect/index.tsx +++ b/client/src/components/SearchSelect/index.tsx @@ -125,7 +125,7 @@ const SearchSelect = (props: SearchSelectProps) => { setInstitutionLoading(true); try { const params = new URLSearchParams({ - api_key: import.meta.env.COLLEGE_SCORECARD_KEY || "", + api_key: import.meta.env.VITE_COLLEGE_SCORECARD_KEY || "", fields: "school.name", per_page: "5", "school.operating": "1", @@ -198,7 +198,7 @@ const SearchSelect = (props: SearchSelectProps) => { setInstitutionLoading(true); try { const params = new URLSearchParams({ - api_key: import.meta.env.COLLEGE_SCORECARD_KEY || "", + api_key: import.meta.env.VITE_COLLEGE_SCORECARD_KEY || "", "school.name": query, fields: "school.name", per_page: "20", diff --git a/client/src/index.tsx b/client/src/index.tsx index 2ead627e..80598004 100644 --- a/client/src/index.tsx +++ b/client/src/index.tsx @@ -17,11 +17,11 @@ import UploadHttpLink from "apollo-upload-client/UploadHttpLink.mjs"; import posthog from "posthog-js"; import { PostHogProvider } from "posthog-js/react"; -posthog.init(import.meta.env.REACT_APP_PUBLIC_POSTHOG_KEY as string, { - api_host: import.meta.env.REACT_APP_PUBLIC_POSTHOG_HOST, +posthog.init(import.meta.env.VITE_PUBLIC_POSTHOG_KEY as string, { + api_host: import.meta.env.VITE_PUBLIC_POSTHOG_HOST, person_profiles: "always", loaded: (ph) => { - if (import.meta.env.DISABLE_CAPTURE === "true") { + if (import.meta.env.VITE_POSTHOG_DISABLE_CAPTURE === "true") { // Disable capture when in "development" mode ph.opt_out_capturing(); ph.set_config({ disable_session_recording: true });