diff --git a/web/src/App.tsx b/web/src/App.tsx index 27d98e2..10b293d 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -10,7 +10,7 @@ console.log("api host:", import.meta.env.VITE_API_HOST); type Section = "aggregator" | "fileManager"; const App: Component = () => { - const [getSection, setSection] = createSignal
("fileManager"); + const [getSection, setSection] = createSignal
("aggregator"); const section = () => getSection() === "aggregator" ? : ; diff --git a/web/src/aggregator/Aggregator.tsx b/web/src/aggregator/Aggregator.tsx index a75f8e4..e99dc8e 100644 --- a/web/src/aggregator/Aggregator.tsx +++ b/web/src/aggregator/Aggregator.tsx @@ -1,15 +1,18 @@ +import moment from "moment"; import { createSignal } from "solid-js"; + import { Result } from "./Result"; import { SelectAggregator } from "./SelectAggregator"; import { SelectCity } from "./SelectCity"; import { SelectTimeRange } from "./SelectTimeRange"; -const dayAgoMs = Date.now() - 24 * 60 * 60 * 1000; +const nowRounded = new Date(new Date().setMinutes(30)); +const dayAgo = moment(nowRounded).subtract(1, "days").subtract(30, "minutes").toDate(); export function Aggregator() { const [getCities, setCities] = createSignal>(new Set([])); - const [getStart, setStart] = createSignal(new Date(dayAgoMs)); - const [getEnd, setEnd] = createSignal(new Date()); + const [getStart, setStart] = createSignal(dayAgo); + const [getEnd, setEnd] = createSignal(nowRounded); const [getField, setField] = createSignal("tempMax"); const [getKey, setKey] = createSignal("max"); diff --git a/web/src/aggregator/Result.tsx b/web/src/aggregator/Result.tsx index a00ab74..2f8e1c9 100644 --- a/web/src/aggregator/Result.tsx +++ b/web/src/aggregator/Result.tsx @@ -17,7 +17,6 @@ export const Result: Component<{ const [getTimestamp, setTimestamp] = createSignal(0); const fetchQuery = async (timestamp: number) => { - console.log("query:", new Date(timestamp)); if (cities() === "") return "ERROR: Select cities!"; await new Promise(resolve => setTimeout(resolve, 500)) const response = await fetch(`${apiHost}/api/query/${queryStart()}-${queryEnd()}/${cities()}/${props.getField()}/${props.getKey()}`);