wg/monitor-im-flur
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wg:windows95
Branches Tags
wg:main wg:windows95 wg:better-deploy wg:flatmates-times wg:ui-update
..
compare: wg:42066195daef2292399b86385664d86ef40e43f2
Branches Tags
wg:main wg:windows95 wg:better-deploy wg:flatmates-times wg:ui-update

4 Commits
windows95 ... 42066195da

Author SHA1 Message Date
Arif Hasanic
42066195da fix docker-compose yml
All checks were successful
CI / build (push) Successful in 13s
Details
CI / lint (push) Successful in 10s
Details
CI / create-and-publish-docker-image (push) Successful in 15s
Details
2025-09-03 15:26:54 +02:00
Arif Hasanic
f7c97169d0 check git hash to reset page
All checks were successful
CI / build (push) Successful in 34s
Details
CI / lint (push) Successful in 8s
Details
CI / create-and-publish-docker-image (push) Successful in 13s
Details
2025-09-03 15:15:08 +02:00
Arif Hasanic
5cb323a1d2 remove useless import
Some checks failed
CI / build (push) Has been cancelled
Details
CI / lint (push) Has been cancelled
Details
CI / create-and-publish-docker-image (push) Has been cancelled
Details
2025-09-03 14:57:57 +02:00
Arif Hasanic
8314c4daf8 fix sorting of chores 2025-09-03 14:57:35 +02:00
6 changed files with 130 additions and 106 deletions
Expand all files Collapse all files

3
.gitea/workflows/ci.yml
View File

@@ -75,7 +75,4 @@ jobs:
docker-compose pull docker-compose pull
docker-compose down docker-compose down
docker-compose up -d 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'

10
pipeline/create-git-hash-html.sh
View File

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

23
src/components/Dashboard/Dashboard.tsx
View File

@@ -1,5 +1,4 @@
import FourTwenty from "@components/FourTwenty/FourTwenty"; import FourTwenty from "@components/FourTwenty/FourTwenty";
import classNames from "classnames";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import Amogus from "@/components/Amogus/Amogus"; import Amogus from "@/components/Amogus/Amogus";
import Card from "@/components/Card/Card"; import Card from "@/components/Card/Card";
@@ -17,6 +16,28 @@ import Weather from "@/components/Weather/Weather";
import style from "./style.module.css"; import style from "./style.module.css";
export default function Dashboard() { 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 schemes = [style.day, style.evening, style.night];
const [schemeIndex, setSchemeIndex] = useState(0); const [schemeIndex, setSchemeIndex] = useState(0);
const scheme = schemes[schemeIndex]; const scheme = schemes[schemeIndex];

82
src/components/Flatastic/Flatastic.tsx
View File

@@ -1,19 +1,53 @@
import classNames from "classnames";
import { useEffect } from "react"; import { useEffect } from "react";
import { useFlatasticStore } from "@/store/flatastic"; import { useFlatasticStore } from "@/store/flatastic";
import type { FlatasticChore, FlatasticUser } from "@/types/flatasticChore"; import type { FlatasticChore, FlatasticUser } from "@/types/flatasticChore";
import style from "./style.module.css"; import style from "./style.module.css";
function choreItem(chore: FlatasticChore, idToNameMap: Record<number, string>) {
let className = "";
let timeLeftInDays = null;
if (chore.rotationTime === -1) {
className = "irregular";
} else {
className = chore.timeLeftNext <= 0 ? "due" : "notDue";
timeLeftInDays = (
<span className={style.timeLeft}>
{Math.abs(Math.floor(chore.timeLeftNext / (60 * 60 * 24)))}d
</span>
);
}
return (
<li
key={chore.id}
className={classNames(style.chore, style[className])}
>
<span className={style.userName}>
{`${idToNameMap[chore.currentUser]}`}
</span>
: {chore.title} {timeLeftInDays} {"🪙".repeat(chore.points)}
</li>
);
}
export default function Flatastic() { export default function Flatastic() {
const fetchFlatasticData = useFlatasticStore((state) => state.fetch); const fetchFlatasticData = useFlatasticStore((state) => state.fetch);
const flatasticData = useFlatasticStore((state) => state.flatasticData); const flatasticData = useFlatasticStore((state) => state.flatasticData);
const chores = (flatasticData?.chores as FlatasticChore[]) || []; const chores = (flatasticData?.chores as FlatasticChore[]) || [];
const regularChores: FlatasticChore[] = [];
const irregularChores: FlatasticChore[] = [];
chores.sort( chores.forEach((chore) => {
(a, b) => if (chore.rotationTime === -1) {
a.timeLeftNext - b.timeLeftNext && b.rotationTime - a.rotationTime, irregularChores.push(chore);
); } else {
regularChores.push(chore);
}
});
regularChores.sort((a, b) => a.lastDoneDate - b.lastDoneDate);
const users = flatasticData?.users; const users = flatasticData?.users;
const idToNameMap: Record<number, string> = {}; const idToNameMap: Record<number, string> = {};
@@ -23,44 +57,28 @@ export default function Flatastic() {
useEffect(() => { useEffect(() => {
fetchFlatasticData(); fetchFlatasticData();
const interval = setInterval(() => { const interval = setInterval(() => {
fetchFlatasticData(); fetchFlatasticData();
}, 60000); }, 60000);
return () => clearInterval(interval); return () => clearInterval(interval);
}, [fetchFlatasticData]); }, [fetchFlatasticData]);
const choresRender = chores.map((chore) => { const regularChoresRender = regularChores.map((chore) => {
let className = ""; return choreItem(chore, idToNameMap);
let timeLeftInDays = null; });
if (chore.rotationTime === -1) { const irregularChoresRender = irregularChores.map((chore) => {
className = "irregular"; return choreItem(chore, idToNameMap);
} else {
className = chore.timeLeftNext <= 0 ? "due" : "notDue";
timeLeftInDays = (
<span className={style.timeLeft}>
{Math.abs(Math.floor(chore.timeLeftNext / (60 * 60 * 24)))}d
</span>
);
}
return (
<li
key={chore.id}
className={[style.chore, style[className]].join(" ")}
>
<span className={style.userName}>
{`${idToNameMap[chore.currentUser]}`}
</span>
: {chore.title} {timeLeftInDays} {"🪙".repeat(chore.points)}
</li>
);
}); });
return ( return (
<div className={style.container}> <div className={style.container}>
<h1>Chores</h1> <h1>Chores</h1>
<ul className={style.choreList}>{choresRender}</ul> <ul className={style.choreList}>
{[...regularChoresRender, ...irregularChoresRender]}
</ul>
</div> </div>
); );
} }

116
src/store/weather.ts
View File

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

2
src/types/flatasticChore.ts
View File

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