Skip to content

Commit

Permalink
bugfix: change default value for jotform const and also fix the font …
Browse files Browse the repository at this point in the history
…family error
  • Loading branch information
cgarcia-lightit committed Sep 28, 2023
1 parent 0c63221 commit 3368cb2
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 22 deletions.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/eo_web/dist/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"css": [
"assets/main-6104ee8d.css"
],
"file": "assets/main-281f57f2.js",
"file": "assets/main-eec3ef83.js",
"isEntry": true,
"src": "src/main.tsx"
}
Expand Down
6 changes: 3 additions & 3 deletions apps/eo_web/src/api/auth.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { api } from "~/api/axios";
import { API_URL } from "~/configs/env";
import { API_ELIXIR } from "~/configs/env";
import {
useProfileStore,
type Profile,
Expand All @@ -15,7 +15,7 @@ export const login = async (credential: {
email: string;
password: string;
}) => {
return await api.post<LoginResponse>(`${API_URL}/v2/profile/login`, {
return await api.post<LoginResponse>(`${API_ELIXIR}/v2/profile/login`, {
email: credential.email,
password: credential.password,
});
Expand All @@ -29,7 +29,7 @@ export interface RegisterRequest {
}

export const register = async (registrationForm: RegisterRequest) => {
return await api.post<string>(`${API_URL}/v2/profile`, registrationForm);
return await api.post<string>(`${API_ELIXIR}/v2/profile`, registrationForm);
};

export const GetToken = () => {
Expand Down
4 changes: 2 additions & 2 deletions apps/eo_web/src/api/email.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { api } from "~/api/axios";
import { API_URL } from "~/configs/env";
import { API_ELIXIR } from "~/configs/env";



Expand All @@ -11,7 +11,7 @@ export interface ResendEmailVerificationResponse {

export const resendEmailVerification = async (email: string) => {
return await api.post<ResendEmailVerificationResponse>(
`${API_URL}/v2/profile/resend_confirmation_email`,
`${API_ELIXIR}/v2/profile/resend_confirmation_email`,
{ email },
);
};
18 changes: 9 additions & 9 deletions apps/eo_web/src/api/useElixirApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
type WorseSymptomsMoment,
} from "~/api/PrePlanTypes";
import { api } from "~/api/axios";
import { API_LARAVEL, API_URL } from "~/configs/env";
import { API_ELIXIR, API_LARAVEL } from "~/configs/env";
import { useProfileStore, type Profile } from "~/stores/useProfileStore";

export interface ZipCodeValidationResponseError {
Expand Down Expand Up @@ -57,7 +57,7 @@ export const useElixirApi = () => {
};
const validateZipCode = async (zipCode: string) => {
return api.post<Profile | ZipCodeValidationResponseError>(
`${API_URL}/v2/profile/validate_zip_code`,
`${API_ELIXIR}/v2/profile/validate_zip_code`,
{
zip: zipCode,
},
Expand All @@ -67,7 +67,7 @@ export const useElixirApi = () => {

const combineProfileOne = async (submissionId: string) => {
return api.post(
`${API_URL}/v2/profile/submit_profiling_one`,
`${API_ELIXIR}/v2/profile/submit_profiling_one`,
{
submission_id: submissionId,
},
Expand All @@ -77,7 +77,7 @@ export const useElixirApi = () => {

const combineProfileTwo = async (submissionId: string) => {
return api.post(
`${API_URL}/v2/profile/combine_profile_two`,
`${API_ELIXIR}/v2/profile/combine_profile_two`,
{
submission_id: submissionId,
},
Expand All @@ -86,31 +86,31 @@ export const useElixirApi = () => {
};

const sendEmailToRecoveryPassword = async (email: string) => {
return api.post(`${API_URL}/v2/profile/request_password_reset`, {
return api.post(`${API_ELIXIR}/v2/profile/request_password_reset`, {
email,
});
};

const resetPassword = async (data: { password: string; token: string }) => {
return api.post(`${API_URL}/v2/profile/reset_password`, data);
return api.post(`${API_ELIXIR}/v2/profile/reset_password`, data);
};
const getSubmission = async () => {
return await api.get<ProfileOne>(
`${API_URL}/v2/profile/profiling_one`,
`${API_ELIXIR}/v2/profile/profiling_one`,
authHeader,
);
};

const getSubmissionById = async (submissionId: string) => {
return await api.get<ProfileOneV2>(
`${API_URL}/v2/submission/profiling_one?submission_id=${submissionId}`,
`${API_ELIXIR}/v2/submission/profiling_one?submission_id=${submissionId}`,
authHeader,
);
};

const eligibleEmail = async (email: string) => {
return await api.get<{ success: boolean; message: string }>(
`${API_URL}/v2/profiles/eligible?email=${email}`,
`${API_ELIXIR}/v2/profiles/eligible?email=${email}`,
authHeader,
);
};
Expand Down
7 changes: 4 additions & 3 deletions apps/eo_web/src/configs/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ export const ZUKO_SLUG_ID =
export const CANCER_USER_PROFILE =
window.data.getEnv("CANCER_USER_DATA") || 232256418562659;
export const CANCER_PROFILE_PATIENT_ID =
window.data.getEnv("CANCER_PROFILE_PATIENT_ID") || 232545133592657;
window.data.getEnv("CANCER_PROFILE_PATIENT_ID") || 232564063321650;
export const CANCER_PROFILE_CAREGIVER_ID =
window.data.getEnv("CANCER_PROFILE_CAREGIVER_ID") || 232545861869672;
window.data.getEnv("CANCER_PROFILE_CAREGIVER_ID") || 232564208467662;
export const CANCER_SURVEY_ID =
window.data.getEnv("CANCER_SURVEY_FORM") || 232395615249664;

export const API_URL = window.data.getEnv("API_URL") || "http://localhost:4200";
export const API_ELIXIR =
window.data.getEnv("API_URL") || "http://localhost:4200";
export const API_LARAVEL =
window.data.getEnv("API_LARAVEL") || "http://localhost";
4 changes: 2 additions & 2 deletions apps/eo_web/src/screens/Cancer/UserTypeSelectorDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ export const UserTypeSelectorDemo = () => {
d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18"
/>
</svg>
<Typography className="text-nunito text-lg font-normal">
<Typography className="font-nunito text-lg font-normal">
Which best describes you? <span className="text-red-600">*</span>
</Typography>
<div className="mt-6 flex flex-row gap-5">
<button
className="text-nunito h-[41px] w-1/2 border border-solid border-[#a5c4ff] bg-[#a5c4ff] bg-opacity-10 px-[15px] py-[9px] "
className="h-[41px] w-1/2 border border-solid border-[#a5c4ff] bg-[#a5c4ff] bg-opacity-10 px-[15px] py-[9px] font-nunito "
onClick={() => redirectForm("Patient")}
>
Patient
Expand Down

0 comments on commit 3368cb2

Please sign in to comment.