6 Commits

Author SHA1 Message Date
ff89115f36 pegasus, more like MEGASUS
All checks were successful
CI / build (push) Successful in 29s
CI / lint (push) Successful in 11s
CI / create-and-publish-docker-image (push) Successful in 1m16s
2025-09-24 19:44:51 +02:00
4f362ca2de quick commit 2025-09-24 19:43:02 +02:00
42066195da fix docker-compose yml
All checks were successful
CI / build (push) Successful in 13s
CI / lint (push) Successful in 10s
CI / create-and-publish-docker-image (push) Successful in 15s
2025-09-03 15:26:54 +02:00
f7c97169d0 check git hash to reset page
All checks were successful
CI / build (push) Successful in 34s
CI / lint (push) Successful in 8s
CI / create-and-publish-docker-image (push) Successful in 13s
2025-09-03 15:15:08 +02:00
5cb323a1d2 remove useless import
Some checks failed
CI / build (push) Has been cancelled
CI / lint (push) Has been cancelled
CI / create-and-publish-docker-image (push) Has been cancelled
2025-09-03 14:57:57 +02:00
8314c4daf8 fix sorting of chores 2025-09-03 14:57:35 +02:00
13 changed files with 273 additions and 176 deletions

View File

@@ -75,7 +75,4 @@ jobs:
docker-compose pull
docker-compose down
docker-compose up -d
export HYPRLAND_INSTANCE_SIGNATURE=$(hyprctl instances -j | jq '.[0].instance' | tr -d "'\"")
hyprctl dispatch exec 'pkill firefox'
hyprctl dispatch exec 'firefox -kiosk localhost:9123'

188
README.md
View File

@@ -1,69 +1,135 @@
# React + TypeScript + Vite
## monitor-im-flur
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
![Build Status](https://git.rivercry.com/wg/monitor-im-flur/badges/master/pipeline.svg)
Currently, two official plugins are available:
Hallway / common-area wall monitor dashboard. A single-page React + Vite app that surfaces useful household + transit + weather + fun data on a passive display.
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
### Key Features
* Realtime-ish autorefresh via git commit hash file (`/git-hash.html`) hot-reloads the deployed page when a new build is published.
* Dynamic theming (day / evening / night) based on current time.
* Public transport departures (KVV) for two nearby stops (IDs 7000044 & 7000045).
* Weather (current, hourly, daily min/max) via OpenMeteo.
* Flatastic chores integration (tasks + flatmates) with API key.
* Home Assistant readings (tent temperature + humidity) displayed in a faux terminal with rotating shitposts.
* 4:20 easter egg card + Amogus sprite + other playful flourishes.
* Docker / Nginx static deployment image (`git.rivercry.com/wg/monitor-im-flur:latest`).
* Strict linting + formatting (ESLint AirBnB + Prettier + Biome optional).
* Zustand + RTK (toolkit present) state management (currently Zustand in active use).
## Expanding the ESLint configuration
### Tech Stack
* React 19 + TypeScript + Vite
* Zustand (with devtools) for app stores (weather, kvv, flatastic, home assistant)
* Nginx (static file serving) inside minimal Docker image
* OpenMeteo, Flatastic, KVV, Home Assistant external APIs
* Git hash pipeline script to trigger client selfreloads
If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
```js
export default tseslint.config([
globalIgnores(["dist"]),
{
files: ["**/*.{ts,tsx}"],
extends: [
// Other configs...
// Remove tseslint.configs.recommended and replace with this
...tseslint.configs.recommendedTypeChecked,
// Alternatively, use this for stricter rules
...tseslint.configs.strictTypeChecked,
// Optionally, add this for stylistic rules
...tseslint.configs.stylisticTypeChecked,
// Other configs...
],
languageOptions: {
parserOptions: {
project: ["./tsconfig.node.json", "./tsconfig.app.json"],
tsconfigRootDir: import.meta.dirname,
},
// other options...
},
},
]);
### Project Structure (abridged)
```
src/
api/ # External data fetchers
components/ # UI building blocks (Cards, Timetable, Weather, Terminal, etc.)
store/ # Zustand stores encapsulating fetch + state
types/ # Type definitions for external data
pipeline/
create-git-hash-html.sh # Injects current commit hash into dist
Dockerfile # Nginx static hosting
docker-compose.yml # Example runtime service definition
```
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
```js
// eslint.config.js
import reactX from "eslint-plugin-react-x";
import reactDom from "eslint-plugin-react-dom";
export default tseslint.config([
globalIgnores(["dist"]),
{
files: ["**/*.{ts,tsx}"],
extends: [
// Other configs...
// Enable lint rules for React
reactX.configs["recommended-typescript"],
// Enable lint rules for React DOM
reactDom.configs.recommended,
],
languageOptions: {
parserOptions: {
project: ["./tsconfig.node.json", "./tsconfig.app.json"],
tsconfigRootDir: import.meta.dirname,
},
// other options...
},
},
]);
### Environment Configuration
Create a `.env` (or `.env.local`) for Vite with the following (only what you need):
```
VITE_FLATTASTIC_API_KEY=your_flatastic_api_key
# (Planned) VITE_HOME_ASSISTANT_TOKEN=your_long_lived_token # NOTE: currently hardcoded see Security section
```
Vite automatically exposes variables prefixed with `VITE_` to the client bundle. Do NOT place secrets without that prefix but remember: anything in the client bundle is public. For sensitive data consider a tiny proxy backend instead of calling APIs directly from the browser.
### Security Notice
`src/api/homeAssistant.ts` currently contains a hardcoded longlived Home Assistant token. This should be refactored before any public deployment:
1. Remove the literal token from the repository.
2. Load it via environment variable during build (`import.meta.env.VITE_HOME_ASSISTANT_TOKEN`) OR
3. Prefer a minimal server proxy so the token never ships to the browser.
### Development
Install dependencies (Bun is inferred from `bun.lock`, but npm/pnpm/yarn also work).
```
bun install
```
Run the dev server (HTTPS support possible with `vite-plugin-mkcert` if certificates are trusted):
```
bun run dev
```
Open: http://localhost:5173
### Lint & Format
```
bun run lint
```
Optionally run Biome (if desired):
```
npx biome check --apply .
```
### Build
```
bun run build
```
Outputs production bundle to `dist/`.
### Docker Image
Build locally:
```
docker build -t monitor-im-flur:local .
```
Run:
```
docker run --rm -p 9123:80 monitor-im-flur:local
```
Or use compose (uses published image):
```
docker compose up -d
```
Visit: http://localhost:9123
### Git Hash AutoReload Mechanism
`pipeline/create-git-hash-html.sh` writes the current commit (`$GITHUB_SHA`) to `dist/git-hash.html` during CI. The dashboard polls `/git-hash.html` every 10s; when the value changes it performs `window.location.reload()`. Ensure your CI runs the script after `vite build` and before creating the Docker image.
Pseudo CI step example:
```
vite build
GITHUB_SHA=$(git rev-parse HEAD) ./pipeline/create-git-hash-html.sh
docker build -t git.rivercry.com/wg/monitor-im-flur:$(git rev-parse --short HEAD) .
```
### Data Sources
* KVV Departures: Public endpoint (JSON) for stop IDs 7000044 / 7000045.
* Weather: OpenMeteo forecast API (lat 49.0094, lon 8.4044, Europe/Berlin TZ).
* Flatastic: Auth via `x-api-key` (user provided).
* Home Assistant: Longlived bearer token (refactor recommended).
### Adding a New Card
1. Create a directory under `src/components/<NewCard>/` with `NewCard.tsx` & optional `style.module.css`.
2. Wrap content with existing `Card` component (`icon` + `name` props).
3. Register inside `Dashboard.tsx` where layout lives (using `CardColumn` / `CardRow`).
### State Management Notes
All data fetching is encapsulated inside zustand store `fetch` methods invoked on an interval within the respective components. Consider centralizing polling or using React Query if complexity grows.
### Potential Improvements / TODO
* Remove hardcoded Home Assistant token.
* Error + loading states (currently optimistic, failures would be silent / console only).
* Retry & backoff strategy for network calls.
* Dark mode override / manual theme toggle.
* Accessibility pass (ARIA, focus management) current dashboard is mostly passive.
* Tests (none yet). Could add Vitest + React Testing Library.
* Switch transit API code to gracefully handle outages (KVV sometimes rate limits).
### License
Add a license file if you plan to share externally (currently unspecified).
### Support / Contact
Internal project (wg). For issues open a ticket on Gitea: https://git.rivercry.com/wg/monitor-im-flur
---
Generated README draft adjust repository paths / badge branch name if different (e.g., replace `master` with your default branch).

View File

@@ -1,11 +1,3 @@
#!/bin/sh
echo "<!DOCTYPE html>
<html>
<head>
<title>Git Hash</title>
</head>
<body>
<pre>GITHUB_SHA = '$GITHUB_SHA';</pre>
</body>
</html>" > dist/git-hash.html
echo "$GITHUB_SHA" > dist/git-hash.html

View File

@@ -39,8 +39,8 @@ const makeCrewmate = (imposter: boolean): Amogus => ({
isImposter: imposter,
posX: randNum(0, width - amogusWidth),
posY: randNum(0, height - amogusHeight),
speedX: Math.random() > 0.5 ? randNum(3, 10) : randNum(-3, -10),
speedY: Math.random() > 0.5 ? randNum(3, 10) : randNum(-3, -10),
speedX: Math.random() > 0.5 ? randNum(1, 2) : randNum(-1, -2),
speedY: Math.random() > 0.5 ? randNum(1, 2) : randNum(-1, -2),
});
const intersect = (c1: Amogus, c2: Amogus): boolean =>

View File

@@ -1,8 +1,13 @@
.container {
z-index: 100;
position: absolute;
scale: 50%;
display: flex;
justify-content: center;
align-items: center;
img {
width: 70px;
height: 70px;
object-fit: contain;
}
}

View File

@@ -1,5 +1,4 @@
import FourTwenty from "@components/FourTwenty/FourTwenty";
import classNames from "classnames";
import { useEffect, useState } from "react";
import Amogus from "@/components/Amogus/Amogus";
import Card from "@/components/Card/Card";
@@ -17,6 +16,28 @@ import Weather from "@/components/Weather/Weather";
import style from "./style.module.css";
export default function Dashboard() {
// '/git-hash.html' contains the current git commit hash, check it every 10 seconds and reload if it isn't the same
const [gitHash, setGitHash] = useState("");
useEffect(() => {
const interval = setInterval(async () => {
const response = await fetch("/git-hash.html");
const text = await response.text();
const newHash = text.trim();
console.log("Fetched git hash:", newHash);
if (gitHash === "") {
setGitHash(newHash);
}
if (gitHash !== "" && newHash !== gitHash) {
setGitHash(newHash);
window.location.reload();
}
}, 10000);
return () => clearInterval(interval);
}, [gitHash]);
const schemes = [style.day, style.evening, style.night];
const [schemeIndex, setSchemeIndex] = useState(0);
const scheme = schemes[schemeIndex];
@@ -44,7 +65,6 @@ export default function Dashboard() {
return (
<div className={`${style.dashboard} ${scheme}`}>
<Amogus />
<div className={style.body}>
<CardColumn>
<Card icon="🚊" name="Timetable">
@@ -74,7 +94,7 @@ export default function Dashboard() {
</Card>
</CardColumn>
</div>
<Amogus />
<Footer />
</div>
);

View File

@@ -9,6 +9,8 @@
height: 100%;
padding: 30px;
overflow: scroll;
scrollbar-width: none;
}
/* 7 to 16 */

View File

@@ -1,7 +1,7 @@
.container {
display: flex;
flex-direction: column;
align-items: stretch;
align-items: ;
padding: 0 10px 20px 10px;
margin-bottom: 20px;
border-top: 2px solid white;
@@ -13,8 +13,7 @@
.departureLists {
display: flex;
flex-direction: row;
justify-content: space-around;
width: 100%;
width: 600px;
}
.heading {

View File

@@ -1,35 +1,10 @@
import classNames from "classnames";
import { useEffect } from "react";
import { useFlatasticStore } from "@/store/flatastic";
import type { FlatasticChore, FlatasticUser } from "@/types/flatasticChore";
import style from "./style.module.css";
export default function Flatastic() {
const fetchFlatasticData = useFlatasticStore((state) => state.fetch);
const flatasticData = useFlatasticStore((state) => state.flatasticData);
const chores = (flatasticData?.chores as FlatasticChore[]) || [];
chores.sort(
(a, b) =>
a.timeLeftNext - b.timeLeftNext && b.rotationTime - a.rotationTime,
);
const users = flatasticData?.users;
const idToNameMap: Record<number, string> = {};
users.forEach((user: FlatasticUser) => {
idToNameMap[user.id] = user.firstName;
});
useEffect(() => {
fetchFlatasticData();
const interval = setInterval(() => {
fetchFlatasticData();
}, 60000);
return () => clearInterval(interval);
}, [fetchFlatasticData]);
const choresRender = chores.map((chore) => {
function choreItem(chore: FlatasticChore, idToNameMap: Record<number, string>) {
let className = "";
let timeLeftInDays = null;
@@ -47,7 +22,7 @@ export default function Flatastic() {
return (
<li
key={chore.id}
className={[style.chore, style[className]].join(" ")}
className={classNames(style.chore, style[className])}
>
<span className={style.userName}>
{`${idToNameMap[chore.currentUser]}`}
@@ -55,12 +30,55 @@ export default function Flatastic() {
: {chore.title} {timeLeftInDays} {"🪙".repeat(chore.points)}
</li>
);
}
export default function Flatastic() {
const fetchFlatasticData = useFlatasticStore((state) => state.fetch);
const flatasticData = useFlatasticStore((state) => state.flatasticData);
const chores = (flatasticData?.chores as FlatasticChore[]) || [];
const regularChores: FlatasticChore[] = [];
const irregularChores: FlatasticChore[] = [];
chores.forEach((chore) => {
if (chore.rotationTime === -1) {
irregularChores.push(chore);
} else {
regularChores.push(chore);
}
});
regularChores.sort((a, b) => a.lastDoneDate - b.lastDoneDate);
const users = flatasticData?.users;
const idToNameMap: Record<number, string> = {};
users.forEach((user: FlatasticUser) => {
idToNameMap[user.id] = user.firstName;
});
useEffect(() => {
fetchFlatasticData();
const interval = setInterval(() => {
fetchFlatasticData();
}, 60000);
return () => clearInterval(interval);
}, [fetchFlatasticData]);
const regularChoresRender = regularChores.map((chore) => {
return choreItem(chore, idToNameMap);
});
const irregularChoresRender = irregularChores.map((chore) => {
return choreItem(chore, idToNameMap);
});
return (
<div className={style.container}>
<h1>Chores</h1>
<ul className={style.choreList}>{choresRender}</ul>
<ul className={style.choreList}>
{[...regularChoresRender, ...irregularChoresRender]}
</ul>
</div>
);
}

View File

@@ -68,7 +68,7 @@ export default function Terminal() {
<span>
<pre>
{" "}NNssussNNN{" "}plants{" "}
<span className={style.plants}>4</span>
<span className={style.plants}>2</span>
</pre>
</span>
<span>

View File

@@ -13,6 +13,8 @@
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
scrollbar-width: none;
}
a {

View File

@@ -6,281 +6,281 @@ const iconNumberToPng = {
"0": {
day: {
description: "Sunny",
image: "http://openweathermap.org/img/wn/01d@2x.png",
image: "https://openweathermap.org/img/wn/01d@2x.png",
},
night: {
description: "Clear",
image: "http://openweathermap.org/img/wn/01n@2x.png",
image: "https://openweathermap.org/img/wn/01n@2x.png",
},
},
"1": {
day: {
description: "Mainly Sunny",
image: "http://openweathermap.org/img/wn/01d@2x.png",
image: "https://openweathermap.org/img/wn/01d@2x.png",
},
night: {
description: "Mainly Clear",
image: "http://openweathermap.org/img/wn/01n@2x.png",
image: "https://openweathermap.org/img/wn/01n@2x.png",
},
},
"2": {
day: {
description: "Partly Cloudy",
image: "http://openweathermap.org/img/wn/02d@2x.png",
image: "https://openweathermap.org/img/wn/02d@2x.png",
},
night: {
description: "Partly Cloudy",
image: "http://openweathermap.org/img/wn/02n@2x.png",
image: "https://openweathermap.org/img/wn/02n@2x.png",
},
},
"3": {
day: {
description: "Cloudy",
image: "http://openweathermap.org/img/wn/03d@2x.png",
image: "https://openweathermap.org/img/wn/03d@2x.png",
},
night: {
description: "Cloudy",
image: "http://openweathermap.org/img/wn/03n@2x.png",
image: "https://openweathermap.org/img/wn/03n@2x.png",
},
},
"45": {
day: {
description: "Foggy",
image: "http://openweathermap.org/img/wn/50d@2x.png",
image: "https://openweathermap.org/img/wn/50d@2x.png",
},
night: {
description: "Foggy",
image: "http://openweathermap.org/img/wn/50n@2x.png",
image: "https://openweathermap.org/img/wn/50n@2x.png",
},
},
"48": {
day: {
description: "Rime Fog",
image: "http://openweathermap.org/img/wn/50d@2x.png",
image: "https://openweathermap.org/img/wn/50d@2x.png",
},
night: {
description: "Rime Fog",
image: "http://openweathermap.org/img/wn/50n@2x.png",
image: "https://openweathermap.org/img/wn/50n@2x.png",
},
},
"51": {
day: {
description: "Light Drizzle",
image: "http://openweathermap.org/img/wn/09d@2x.png",
image: "https://openweathermap.org/img/wn/09d@2x.png",
},
night: {
description: "Light Drizzle",
image: "http://openweathermap.org/img/wn/09n@2x.png",
image: "https://openweathermap.org/img/wn/09n@2x.png",
},
},
"53": {
day: {
description: "Drizzle",
image: "http://openweathermap.org/img/wn/09d@2x.png",
image: "https://openweathermap.org/img/wn/09d@2x.png",
},
night: {
description: "Drizzle",
image: "http://openweathermap.org/img/wn/09n@2x.png",
image: "https://openweathermap.org/img/wn/09n@2x.png",
},
},
"55": {
day: {
description: "Heavy Drizzle",
image: "http://openweathermap.org/img/wn/09d@2x.png",
image: "https://openweathermap.org/img/wn/09d@2x.png",
},
night: {
description: "Heavy Drizzle",
image: "http://openweathermap.org/img/wn/09n@2x.png",
image: "https://openweathermap.org/img/wn/09n@2x.png",
},
},
"56": {
day: {
description: "Light Freezing Drizzle",
image: "http://openweathermap.org/img/wn/09d@2x.png",
image: "https://openweathermap.org/img/wn/09d@2x.png",
},
night: {
description: "Light Freezing Drizzle",
image: "http://openweathermap.org/img/wn/09n@2x.png",
image: "https://openweathermap.org/img/wn/09n@2x.png",
},
},
"57": {
day: {
description: "Freezing Drizzle",
image: "http://openweathermap.org/img/wn/09d@2x.png",
image: "https://openweathermap.org/img/wn/09d@2x.png",
},
night: {
description: "Freezing Drizzle",
image: "http://openweathermap.org/img/wn/09n@2x.png",
image: "https://openweathermap.org/img/wn/09n@2x.png",
},
},
"61": {
day: {
description: "Light Rain",
image: "http://openweathermap.org/img/wn/10d@2x.png",
image: "https://openweathermap.org/img/wn/10d@2x.png",
},
night: {
description: "Light Rain",
image: "http://openweathermap.org/img/wn/10n@2x.png",
image: "https://openweathermap.org/img/wn/10n@2x.png",
},
},
"63": {
day: {
description: "Rain",
image: "http://openweathermap.org/img/wn/10d@2x.png",
image: "https://openweathermap.org/img/wn/10d@2x.png",
},
night: {
description: "Rain",
image: "http://openweathermap.org/img/wn/10n@2x.png",
image: "https://openweathermap.org/img/wn/10n@2x.png",
},
},
"65": {
day: {
description: "Heavy Rain",
image: "http://openweathermap.org/img/wn/10d@2x.png",
image: "https://openweathermap.org/img/wn/10d@2x.png",
},
night: {
description: "Heavy Rain",
image: "http://openweathermap.org/img/wn/10n@2x.png",
image: "https://openweathermap.org/img/wn/10n@2x.png",
},
},
"66": {
day: {
description: "Light Freezing Rain",
image: "http://openweathermap.org/img/wn/10d@2x.png",
image: "https://openweathermap.org/img/wn/10d@2x.png",
},
night: {
description: "Light Freezing Rain",
image: "http://openweathermap.org/img/wn/10n@2x.png",
image: "https://openweathermap.org/img/wn/10n@2x.png",
},
},
"67": {
day: {
description: "Freezing Rain",
image: "http://openweathermap.org/img/wn/10d@2x.png",
image: "https://openweathermap.org/img/wn/10d@2x.png",
},
night: {
description: "Freezing Rain",
image: "http://openweathermap.org/img/wn/10n@2x.png",
image: "https://openweathermap.org/img/wn/10n@2x.png",
},
},
"71": {
day: {
description: "Light Snow",
image: "http://openweathermap.org/img/wn/13d@2x.png",
image: "https://openweathermap.org/img/wn/13d@2x.png",
},
night: {
description: "Light Snow",
image: "http://openweathermap.org/img/wn/13n@2x.png",
image: "https://openweathermap.org/img/wn/13n@2x.png",
},
},
"73": {
day: {
description: "Snow",
image: "http://openweathermap.org/img/wn/13d@2x.png",
image: "https://openweathermap.org/img/wn/13d@2x.png",
},
night: {
description: "Snow",
image: "http://openweathermap.org/img/wn/13n@2x.png",
image: "https://openweathermap.org/img/wn/13n@2x.png",
},
},
"75": {
day: {
description: "Heavy Snow",
image: "http://openweathermap.org/img/wn/13d@2x.png",
image: "https://openweathermap.org/img/wn/13d@2x.png",
},
night: {
description: "Heavy Snow",
image: "http://openweathermap.org/img/wn/13n@2x.png",
image: "https://openweathermap.org/img/wn/13n@2x.png",
},
},
"77": {
day: {
description: "Snow Grains",
image: "http://openweathermap.org/img/wn/13d@2x.png",
image: "https://openweathermap.org/img/wn/13d@2x.png",
},
night: {
description: "Snow Grains",
image: "http://openweathermap.org/img/wn/13n@2x.png",
image: "https://openweathermap.org/img/wn/13n@2x.png",
},
},
"80": {
day: {
description: "Light Showers",
image: "http://openweathermap.org/img/wn/09d@2x.png",
image: "https://openweathermap.org/img/wn/09d@2x.png",
},
night: {
description: "Light Showers",
image: "http://openweathermap.org/img/wn/09n@2x.png",
image: "https://openweathermap.org/img/wn/09n@2x.png",
},
},
"81": {
day: {
description: "Showers",
image: "http://openweathermap.org/img/wn/09d@2x.png",
image: "https://openweathermap.org/img/wn/09d@2x.png",
},
night: {
description: "Showers",
image: "http://openweathermap.org/img/wn/09n@2x.png",
image: "https://openweathermap.org/img/wn/09n@2x.png",
},
},
"82": {
day: {
description: "Heavy Showers",
image: "http://openweathermap.org/img/wn/09d@2x.png",
image: "https://openweathermap.org/img/wn/09d@2x.png",
},
night: {
description: "Heavy Showers",
image: "http://openweathermap.org/img/wn/09n@2x.png",
image: "https://openweathermap.org/img/wn/09n@2x.png",
},
},
"85": {
day: {
description: "Light Snow Showers",
image: "http://openweathermap.org/img/wn/13d@2x.png",
image: "https://openweathermap.org/img/wn/13d@2x.png",
},
night: {
description: "Light Snow Showers",
image: "http://openweathermap.org/img/wn/13n@2x.png",
image: "https://openweathermap.org/img/wn/13n@2x.png",
},
},
"86": {
day: {
description: "Snow Showers",
image: "http://openweathermap.org/img/wn/13d@2x.png",
image: "https://openweathermap.org/img/wn/13d@2x.png",
},
night: {
description: "Snow Showers",
image: "http://openweathermap.org/img/wn/13n@2x.png",
image: "https://openweathermap.org/img/wn/13n@2x.png",
},
},
"95": {
day: {
description: "Thunderstorm",
image: "http://openweathermap.org/img/wn/11d@2x.png",
image: "https://openweathermap.org/img/wn/11d@2x.png",
},
night: {
description: "Thunderstorm",
image: "http://openweathermap.org/img/wn/11n@2x.png",
image: "https://openweathermap.org/img/wn/11n@2x.png",
},
},
"96": {
day: {
description: "Light Thunderstorms With Hail",
image: "http://openweathermap.org/img/wn/11d@2x.png",
image: "https://openweathermap.org/img/wn/11d@2x.png",
},
night: {
description: "Light Thunderstorms With Hail",
image: "http://openweathermap.org/img/wn/11n@2x.png",
image: "https://openweathermap.org/img/wn/11n@2x.png",
},
},
"99": {
day: {
description: "Thunderstorm With Hail",
image: "http://openweathermap.org/img/wn/11d@2x.png",
image: "https://openweathermap.org/img/wn/11d@2x.png",
},
night: {
description: "Thunderstorm With Hail",
image: "http://openweathermap.org/img/wn/11n@2x.png",
image: "https://openweathermap.org/img/wn/11n@2x.png",
},
},
};
@@ -291,8 +291,6 @@ const useWeatherStore = create(
weatherData: {},
fetchWeatherData: async () => {
const data = await fetchWeatherData();
// Process first location. Add a for-loop for multiple locations or weather models
const response = data[0];
if (response === null) {
@@ -300,7 +298,6 @@ const useWeatherStore = create(
return;
}
// Attributes for timezone and location
const utcOffsetSeconds = response.utcOffsetSeconds();
const current = response.current();
const hourly = response.hourly();
@@ -311,7 +308,6 @@ const useWeatherStore = create(
return;
}
// Note: The order of weather variables in the URL query and the indices below need to match!
const weatherData = {
current: {
time: current.time(),

View File

@@ -16,7 +16,7 @@ interface FlatasticChore {
points: number;
rotationTime: number;
currentUser: number;
lastDoneDate: string;
lastDoneDate: number;
timeLeftNext: number;
}