+
{subtext &&
{subtext}}
diff --git a/src/context/FormDataContext.jsx b/src/context/FormDataContext.jsx
index af5c4f1..e0fb8af 100644
--- a/src/context/FormDataContext.jsx
+++ b/src/context/FormDataContext.jsx
@@ -1,5 +1,4 @@
import React, { createContext, useState, useEffect } from 'react';
-
export const FormDataContext = createContext();
export const FormDataProvider = ({ children }) => {
diff --git a/src/pages/Appliances.jsx b/src/pages/Appliances.jsx
index 065101c..0502740 100644
--- a/src/pages/Appliances.jsx
+++ b/src/pages/Appliances.jsx
@@ -3,9 +3,9 @@ import { Kitchen, Laundry } from '../components/Appliances';
import BackButton from '../components/BackButton';
import SubmitButton from '../components/Submit';
import { FormDataContext } from '../context/FormDataContext';
-
+import { useSelector } from 'react-redux';
const Appliances = (props) => {
- const { formData } = useContext(FormDataContext);
+ const formData = useSelector(state=>state.formdatacontext);
const [kitchen, setKitchen] = useState(
formData.kitchen || {
diff --git a/src/pages/Cooling.jsx b/src/pages/Cooling.jsx
index bb98543..f82ff5b 100644
--- a/src/pages/Cooling.jsx
+++ b/src/pages/Cooling.jsx
@@ -2,14 +2,13 @@ import React, { useContext, useState } from 'react';
import { CoolingSystem, HasAirCond, InstallationYear } from '../components/Cooling';
import BackButton from '../components/BackButton';
import SubmitButton from '../components/Submit';
-import { FormDataContext } from '../context/FormDataContext';
+import { useSelector } from 'react-redux';
const Cooling = (props) => {
- const { formData } = useContext(FormDataContext);
-
+ const formData = useSelector(state=>state.formdatacontext);
const [hasAirCond, setHasAirCond] = useState(formData.hasAirCond || 'No');
const [coolingInstallYear, setCoolingInstallYear] = useState(formData.coolingInstallYear || '');
- const [coolingSystem, setCoolingSystem] = useState(formData.airCondSystem || '');
+ const [coolingSystem, setCoolingSystem] = useState(formData.coolingSystem || '');
const [error, setError] = useState(null);
const validateAndProceed = () => {
diff --git a/src/pages/Energy.jsx b/src/pages/Energy.jsx
index 5b79064..fb9e9ba 100644
--- a/src/pages/Energy.jsx
+++ b/src/pages/Energy.jsx
@@ -2,10 +2,10 @@ import React, { useState, useContext } from 'react';
import { GreenEnergy, Slider } from '../components/Energy';
import BackButton from '../components/BackButton';
import SubmitButton from '../components/Submit';
-import { FormDataContext } from '../context/FormDataContext';
+import { useSelector } from 'react-redux';
const Energy = (props) => {
- const { formData } = useContext(FormDataContext);
+ const formData = useSelector(state=>state.formdatacontext);
const [energy, setEnergy] = useState(formData.energy || []);
const [slider, setSlider] = useState(formData.slider || 0);
const [error, setError] = useState(null);
diff --git a/src/pages/Heating.jsx b/src/pages/Heating.jsx
index b7ee8a6..cd19081 100644
--- a/src/pages/Heating.jsx
+++ b/src/pages/Heating.jsx
@@ -2,11 +2,10 @@ import React, { useContext, useState } from 'react';
import { HasSecondary, Heat, HeatedFloors, InstallationYear, Source } from '../components/Heating';
import BackButton from '../components/BackButton';
import SubmitButton from '../components/Submit';
-import { FormDataContext } from '../context/FormDataContext';
+import { useSelector } from 'react-redux';
const Heating = (props) => {
- const { formData } = useContext(FormDataContext);
-
+ const formData = useSelector(state=>state.formdatacontext);
const [primaryHeat, setPrimaryHeat] = useState(formData.primaryHeat || '');
const [primarySource, setPrimarySource] = useState(formData.primarySource || '');
const [heatInstallYear, setHeatInstallYear] = useState(formData.heatInstallYear || '');
@@ -23,6 +22,7 @@ const Heating = (props) => {
} else {
setError(null);
props.handleNext();
+ console.log(primaryHeat);
return {
primaryHeat,
primarySource,
diff --git a/src/pages/HomeSize.jsx b/src/pages/HomeSize.jsx
index 15aacc4..6cadd6a 100644
--- a/src/pages/HomeSize.jsx
+++ b/src/pages/HomeSize.jsx
@@ -3,11 +3,9 @@ import BackButton from '../components/BackButton';
import SubmitButton from '../components/Submit';
import '../styles/page.css';
import { SqrFeet, Rooms, Layout, CrawlSpace } from '../components/HomeSize';
-import { FormDataContext } from '../context/FormDataContext';
-
+import { useSelector } from 'react-redux';
const HomeSize = (props) => {
- const { formData } = useContext(FormDataContext);
-
+ const formData = useSelector(state=>state.formdatacontext);
const [sqrfeet, setSqrfeet] = useState(formData.sqrfeet || '');
const [rooms, setRooms] = useState(
formData.rooms || {
diff --git a/src/pages/HomeType.jsx b/src/pages/HomeType.jsx
index 8896159..14c540c 100644
--- a/src/pages/HomeType.jsx
+++ b/src/pages/HomeType.jsx
@@ -3,10 +3,10 @@ import { OwnerType, HomeSize, HomeBuilt } from '../components/HomeType';
import SubmitButton from '../components/Submit';
import '../styles/page.css';
import { FormDataContext } from '../context/FormDataContext';
-
+import { useDispatch, useSelector } from 'react-redux';
const HomeType = (props) => {
- const { formData } = useContext(FormDataContext);
-
+ const formData = useSelector(state=>state.formdatacontext);
+ console.log(formData);
const [owner, setOwner] = useState(formData.owner || '');
const [homeSize, setHomeSize] = useState(formData.homeSize || '');
const [homeBuilt, setHomeBuilt] = useState(formData.homeBuilt || '');
diff --git a/src/pages/Insulation.jsx b/src/pages/Insulation.jsx
index 68be38c..60d0b0d 100644
--- a/src/pages/Insulation.jsx
+++ b/src/pages/Insulation.jsx
@@ -2,11 +2,10 @@ import React, { useState, useContext } from 'react';
import BackButton from '../components/BackButton';
import SubmitButton from '../components/Submit';
import { Siding, HomeInsulation } from '../components/Insulation';
-import { FormDataContext } from '../context/FormDataContext';
+import { useSelector } from 'react-redux';
const Insulation = (props) => {
- const { formData } = useContext(FormDataContext);
-
+ const formData = useSelector(state=>state.formdatacontext);
const [siding, setSiding] = useState(formData.siding || '');
const [insulation, setInsulation] = useState(formData.insulation || '');
const [error, setError] = useState(null);
diff --git a/src/pages/Lighting.jsx b/src/pages/Lighting.jsx
index ea77852..644e460 100644
--- a/src/pages/Lighting.jsx
+++ b/src/pages/Lighting.jsx
@@ -2,10 +2,10 @@ import React, { useState, useContext } from 'react';
import BackButton from '../components/BackButton';
import SubmitButton from '../components/Submit';
import Efficiency from '../components/Lighting';
-import { FormDataContext } from '../context/FormDataContext';
+import { useSelector } from 'react-redux';
const Lighting = (props) => {
- const { formData } = useContext(FormDataContext);
+ const formData = useSelector(state=>state.formdatacontext);
const [efficiency, setEfficiency] = useState(formData.efficiency || '');
const [error, setError] = useState(null);
diff --git a/src/pages/Location.jsx b/src/pages/Location.jsx
index 5d6f99a..610b168 100644
--- a/src/pages/Location.jsx
+++ b/src/pages/Location.jsx
@@ -1,37 +1,49 @@
-import React, { useState, useContext } from 'react';
-import axios from 'axios';
+import React, { useEffect, useState } from 'react';
import BackButton from '../components/BackButton';
import SubmitButton from '../components/Submit';
import Button from '@mui/material/Button';
import { CircularProgress } from '@mui/material';
import { Zipcode, ZipData } from '../components/Location';
-import { FormDataContext } from '../context/FormDataContext';
+import { useSelector } from 'react-redux';
import { validateZipCode } from '../helpers/api';
-import '../styles/page.css';
const Location = (props) => {
- const { formData } = useContext(FormDataContext);
+ const formData = useSelector(state => state.formdatacontext);
const [zipcode, setZipcode] = useState(formData.zipcode || '');
const [hidden, hide] = useState(true);
const [error, setError] = useState(null);
const [loading, setLoading] = useState(false);
- const validateAndProceed = async () => {
+
+ useEffect(() => {
+
+ const handleZipcodeValidation = async () => {
+ if (zipcode) {
+ console.log("starting");
+ setLoading(true);
+ if ((await validateZipCode(zipcode))) { // if valid
+ setLoading(false);
+ setError(null);
+ } else {
+ await findValidZipCode(zipcode)
+ }
+ }
+ };
+
+ handleZipcodeValidation()
+ }, [zipcode]);
+
+ const validateAndProceed = () => {
+
if (!zipcode) {
setError('All fields must be filled out');
return null;
- } else {
- const result = await validateZipCode(zipcode);
- if (result) {
- setLoading(false);
- setError(null);
- setZipcode(zipcode);
- props.handleNext();
- return { zipcode };
- } else {
- findValidZipCode(zipcode);
- }
+ } else if (!loading && !error) {
+ props.handleNext();
+ console.log(`RESULT = ${zipcode}`);
+ return { zipcode };
}
+
};
const findValidZipCode = async (originalZip) => {
@@ -67,10 +79,10 @@ const Location = (props) => {
{loading &&
}
{error &&
{error}
}
- {hidden ? null :
}
- {hidden ? null :
}
+ {!hidden &&
}
+ {!hidden &&
}
);
};
-export default Location;
+export default Location;
\ No newline at end of file
diff --git a/src/pages/Results.jsx b/src/pages/Results.jsx
index a50ae29..d0d2c43 100644
--- a/src/pages/Results.jsx
+++ b/src/pages/Results.jsx
@@ -5,13 +5,13 @@ import { FormDataContext } from '../context/FormDataContext';
import handleCalculation from '../helpers/calculation.js';
import '../styles/page.css';
import Header from '../components/Results/Header';
-import { jsPDF } from 'jspdf'
-import html2canvas from 'html2canvas';
-
+import { Oval } from 'react-loader-spinner';
+import PDFGenerator from '../components/Results/PdfGenerator/pdfgenerator.js';
+import { useSelector } from 'react-redux';
const Results = () => {
- const { formData } = useContext(FormDataContext);
+ const formData = useSelector(state=>state.formdatacontext);
const [ data, setData ] = useState(null);
- const inputRef = useRef(null)
+ const inputRef = useRef(null);
useEffect(() => {
const calculate = async () => {
@@ -21,24 +21,30 @@ const Results = () => {
calculate();
}, [formData]);
+
- const saveToPdf = () => {
- console.log("saving");
- html2canvas(inputRef.current).then((canvas) => {
- const imgData = canvas.toDataURL("image/png");
- const pdf = new jsPDF("landscape", "mm", "a4")
- const width = pdf.internal.pageSize.getWidth();
- const height = pdf.internal.pageSize.getHeight();
- pdf.addImage(imgData, "JPEG", 0, 0, width, height);
- pdf.save("download.pdf");
- })
- }
- if (data === null) {
- return
Loading...
+ )
}
+ const score = Math.floor(100 * (16000 / (data.co2_total + data.avgHome)));
return (
-