Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main-deploy-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-deploy-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main-pr-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/SearchSelect/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions client/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
Loading