From 41ee9877d239aff8d55c2dcb3a8c1b6567ddd5e8 Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 14 May 2025 15:45:22 +0000 Subject: [PATCH] Removed school/tuition calls from CareerModal --- src/components/CareerModal.js | 85 ++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 25 deletions(-) diff --git a/src/components/CareerModal.js b/src/components/CareerModal.js index 535f019..f052aba 100644 --- a/src/components/CareerModal.js +++ b/src/components/CareerModal.js @@ -1,10 +1,69 @@ import React, { useState, useEffect } from 'react'; import axios from 'axios'; -import { getFullStateName } from '../utils/stateUtils.js'; import { fetchSchools, clientGeocodeZip, haversineDistance} from '../utils/apiUtils.js'; const apiUrl = process.env.REACT_APP_API_URL; +const STATES = [ + { name: 'Alabama', code: 'AL' }, + { name: 'Alaska', code: 'AK' }, + { name: 'Arizona', code: 'AZ' }, + { name: 'Arkansas', code: 'AR' }, + { name: 'California', code: 'CA' }, + { name: 'Colorado', code: 'CO' }, + { name: 'Connecticut', code: 'CT' }, + { name: 'Delaware', code: 'DE' }, + { name: 'District of Columbia', code: 'DC' }, + { name: 'Florida', code: 'FL' }, + { name: 'Georgia', code: 'GA' }, + { name: 'Hawaii', code: 'HI' }, + { name: 'Idaho', code: 'ID' }, + { name: 'Illinois', code: 'IL' }, + { name: 'Indiana', code: 'IN' }, + { name: 'Iowa', code: 'IA' }, + { name: 'Kansas', code: 'KS' }, + { name: 'Kentucky', code: 'KY' }, + { name: 'Louisiana', code: 'LA' }, + { name: 'Maine', code: 'ME' }, + { name: 'Maryland', code: 'MD' }, + { name: 'Massachusetts', code: 'MA' }, + { name: 'Michigan', code: 'MI' }, + { name: 'Minnesota', code: 'MN' }, + { name: 'Mississippi', code: 'MS' }, + { name: 'Missouri', code: 'MO' }, + { name: 'Montana', code: 'MT' }, + { name: 'Nebraska', code: 'NE' }, + { name: 'Nevada', code: 'NV' }, + { name: 'New Hampshire', code: 'NH' }, + { name: 'New Jersey', code: 'NJ' }, + { name: 'New Mexico', code: 'NM' }, + { name: 'New York', code: 'NY' }, + { name: 'North Carolina', code: 'NC' }, + { name: 'North Dakota', code: 'ND' }, + { name: 'Ohio', code: 'OH' }, + { name: 'Oklahoma', code: 'OK' }, + { name: 'Oregon', code: 'OR' }, + { name: 'Pennsylvania', code: 'PA' }, + { name: 'Rhode Island', code: 'RI' }, + { name: 'South Carolina', code: 'SC' }, + { name: 'South Dakota', code: 'SD' }, + { name: 'Tennessee', code: 'TN' }, + { name: 'Texas', code: 'TX' }, + { name: 'Utah', code: 'UT' }, + { name: 'Vermont', code: 'VT' }, + { name: 'Virginia', code: 'VA' }, + { name: 'Washington', code: 'WA' }, + { name: 'West Virginia', code: 'WV' }, + { name: 'Wisconsin', code: 'WI' }, + { name: 'Wyoming', code: 'WY' }, +]; + +// 2) Helper to convert state code => full name +function getFullStateName(code) { + const found = STATES.find((s) => s.code === code?.toUpperCase()); + return found ? found.name : ''; +} + function CareerModal({ career, userState, areaTitle, userZipcode, closeModal, addCareerToList }) { const [careerDetails, setCareerDetails] = useState(null); const [loading, setLoading] = useState(true); @@ -34,29 +93,6 @@ function CareerModal({ career, userState, areaTitle, userZipcode, closeModal, ad params: { state: getFullStateName(userState) }, }).catch(() => ({ data: {} })); - const filteredSchools = await fetchSchools(cleanedCipCode, userState); - - let userLat = null, userLng = null; - if (userZipcode) { - try { - const geocodeResult = await clientGeocodeZip(userZipcode); - userLat = geocodeResult.lat; - userLng = geocodeResult.lng; - } catch (err) { - console.warn('Unable to geocode user ZIP.'); - } - } - - const schoolsWithDistance = filteredSchools.map(sch => { - const lat2 = sch.LATITUDE ? parseFloat(sch.LATITUDE) : null; - const lon2 = sch.LONGITUD ? parseFloat(sch.LONGITUD) : null; - - if (userLat && userLng && lat2 && lon2) { - const distMiles = haversineDistance(userLat, userLng, lat2, lon2); - return { ...sch, distance: `${distMiles.toFixed(1)} mi` }; - } - return { ...sch, distance: 'N/A' }; - }); const sData = salaryResponse.data || {}; @@ -74,7 +110,6 @@ function CareerModal({ career, userState, areaTitle, userZipcode, closeModal, ad tasks, economicProjections: economicResponse.data || {}, salaryData: salaryDataPoints, - schools: schoolsWithDistance, }); } catch (error) { console.error(error);