diff --git a/src/components/main/Root.tsx b/src/components/main/Root.tsx index f5b1f5c..8ea1d69 100644 --- a/src/components/main/Root.tsx +++ b/src/components/main/Root.tsx @@ -50,7 +50,7 @@ const Navigation = function ({ router }) { const id = route.id; const className = id === activeRouteId ? "font-bold" : ""; return ( -
  • +
  • ); diff --git a/src/components/main/lib/state.ts b/src/components/main/lib/state.ts index b0dba70..ff542db 100644 --- a/src/components/main/lib/state.ts +++ b/src/components/main/lib/state.ts @@ -3,7 +3,7 @@ import { modifyPath, mergeDeepRight } from "ramda"; const STORAGE_KEY = "ecoplanet"; const defaultState = { - dateCache: undefined, + dataCache: undefined, options: { lineWidth: undefined, defaultDate: undefined, diff --git a/src/components/main/routes/Dashboard.tsx b/src/components/main/routes/Dashboard.tsx index 4be2917..6519e19 100644 --- a/src/components/main/routes/Dashboard.tsx +++ b/src/components/main/routes/Dashboard.tsx @@ -21,8 +21,6 @@ const fetchWeekForecastData = async function (dateTime, cb) { const data = await Promise.all(forecastRequests); - console.log(data); - const chartData = data.map((forecastData) => { const dayData = forecastData.forecast.forecastday[0]; const date = dayData.date; @@ -52,14 +50,13 @@ const WeatherChart = function ({ data }) { ); }; -export const Dashboard = function ({ state, updateCache }) { +export const Dashboard = function ({ state, updateState }) { const [dateTime, setDateTime] = useState( minDate(state?.options?.startDate || new Date()), ); - const [data, setData] = useState(null); useEffect(() => { - fetchWeekForecastData(dateTime, setData); + fetchWeekForecastData(dateTime, (data) => updateState({ dataCache: data })); }, [dateTime]); return ( @@ -68,7 +65,7 @@ export const Dashboard = function ({ state, updateCache }) {

    Forecast

    - {data ? : "Loading..."} + {state.dataCache ? : "Loading..."} ); };